diff options
147 files changed, 4075 insertions, 3413 deletions
diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php index 010947467..8db4e000f 100644 --- a/Zotlabs/Lib/Apps.php +++ b/Zotlabs/Lib/Apps.php @@ -271,6 +271,10 @@ class Apps { if(! can_view_public_stream()) unset($ret); break; + case 'custom_role': + if(get_pconfig(local_channel(),'system','permissions_role') != 'custom') + unset($ret); + break; case 'observer': if(! $observer) unset($ret); @@ -337,7 +341,20 @@ class Apps { 'Profiles' => t('Profiles'), 'Privacy Groups' => t('Privacy Groups'), 'Notifications' => t('Notifications'), - 'Order Apps' => t('Order Apps') + 'Order Apps' => t('Order Apps'), + 'CalDAV' => t('CalDAV'), + 'CardDAV' => t('CardDAV'), + 'Channel Sources' => t('Channel Sources'), + 'Gallery' => t('Gallery'), + 'Guest Access' => t('Guest Access'), + 'Notes' => t('Notes'), + 'OAuth Apps Manager' => t('OAuth Apps Manager'), + 'OAuth2 Apps Manager' => t('OAuth2 Apps Manager'), + 'PDL Editor' => t('PDL Editor'), + 'Permission Categories' => t('Permission Categories'), + 'Premium Channel' => t('Premium Channel'), + 'Public Stream' => t('Public Stream'), + 'My Chatrooms' => t('My Chatrooms') ); if(array_key_exists('name',$arr)) { @@ -349,6 +366,9 @@ class Apps { for($x = 0; $x < count($arr); $x++) { if(array_key_exists($arr[$x]['name'],$apps)) { $arr[$x]['name'] = $apps[$arr[$x]['name']]; + } else { + // Try to guess by app name if not in list + $arr[$x]['name'] = t(trim($arr[$x]['name'])); } } } @@ -452,6 +472,10 @@ class Apps { if(! can_view_public_stream()) return ''; break; + case 'custom_role': + if(get_pconfig(local_channel(),'system','permissions_role') != 'custom') + return ''; + break; case 'observer': $observer = \App::get_observer(); if(! $observer) @@ -530,9 +554,20 @@ class Apps { } static public function app_install($uid,$app) { + + if(! is_array($app)) { + $r = q("select * from app where app_name = '%s' and app_channel = 0", + dbesc($app) + ); + if(! $r) + return false; + + $app = self::app_encode($r[0]); + } + $app['uid'] = $uid; - if(self::app_installed($uid,$app)) + if(self::app_installed($uid,$app,true)) $x = self::app_update($app); else $x = self::app_store($app); @@ -596,6 +631,7 @@ class Apps { intval(TERM_OBJ_APP), intval($x[0]['id']) ); + call_hooks('app_destroy', $x[0]); } else { $r = q("update app set app_deleted = 1 where app_id = '%s' and app_channel = %d", @@ -660,33 +696,60 @@ class Apps { } } - static public function app_installed($uid,$app) { + static public function app_installed($uid,$app,$bypass_filter=false) { $r = q("select id from app where app_id = '%s' and app_channel = %d limit 1", dbesc((array_key_exists('guid',$app)) ? $app['guid'] : ''), intval($uid) ); + if (!$bypass_filter) { + $filter_arr = [ + 'uid'=>$uid, + 'app'=>$app, + 'installed'=>$r + ]; + call_hooks('app_installed_filter',$filter_arr); + $r = $filter_arr['installed']; + } return(($r) ? true : false); } - static public function addon_app_installed($uid,$app) { + static public function addon_app_installed($uid,$app,$bypass_filter=false) { $r = q("select id from app where app_plugin = '%s' and app_channel = %d limit 1", dbesc($app), intval($uid) ); + if (!$bypass_filter) { + $filter_arr = [ + 'uid'=>$uid, + 'app'=>$app, + 'installed'=>$r + ]; + call_hooks('addon_app_installed_filter',$filter_arr); + $r = $filter_arr['installed']; + } return(($r) ? true : false); } - static public function system_app_installed($uid,$app) { + static public function system_app_installed($uid,$app,$bypass_filter=false) { $r = q("select id from app where app_id = '%s' and app_channel = %d limit 1", dbesc(hash('whirlpool',$app)), intval($uid) ); + if (!$bypass_filter) { + $filter_arr = [ + 'uid'=>$uid, + 'app'=>$app, + 'installed'=>$r + ]; + call_hooks('system_app_installed_filter',$filter_arr); + $r = $filter_arr['installed']; + } return(($r) ? true : false); } diff --git a/Zotlabs/Lib/Group.php b/Zotlabs/Lib/Group.php index f136a3614..a4ff4fced 100644 --- a/Zotlabs/Lib/Group.php +++ b/Zotlabs/Lib/Group.php @@ -20,11 +20,11 @@ class Group { // access lists. What we're doing here is reviving the dead group, but old content which // was restricted to this group may now be seen by the new group members. - $z = q("SELECT * FROM groups WHERE id = %d LIMIT 1", + $z = q("SELECT * FROM pgrp WHERE id = %d LIMIT 1", intval($r) ); if(($z) && $z[0]['deleted']) { - q('UPDATE groups SET deleted = 0 WHERE id = %d', intval($z[0]['id'])); + q('UPDATE pgrp SET deleted = 0 WHERE id = %d', intval($z[0]['id'])); notice( t('A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name.') . EOL); } return true; @@ -34,13 +34,13 @@ class Group { $dups = false; $hash = random_string(32) . str_replace(['<','>'],['.','.'], $name); - $r = q("SELECT id FROM groups WHERE hash = '%s' LIMIT 1", dbesc($hash)); + $r = q("SELECT id FROM pgrp WHERE hash = '%s' LIMIT 1", dbesc($hash)); if($r) $dups = true; } while($dups == true); - $r = q("INSERT INTO groups ( hash, uid, visible, gname ) + $r = q("INSERT INTO pgrp ( hash, uid, visible, gname ) VALUES( '%s', %d, %d, '%s' ) ", dbesc($hash), intval($uid), @@ -58,7 +58,7 @@ class Group { static function remove($uid,$name) { $ret = false; if(x($uid) && x($name)) { - $r = q("SELECT id, hash FROM groups WHERE uid = %d AND gname = '%s' LIMIT 1", + $r = q("SELECT id, hash FROM pgrp WHERE uid = %d AND gname = '%s' LIMIT 1", intval($uid), dbesc($name) ); @@ -103,13 +103,13 @@ class Group { } // remove all members - $r = q("DELETE FROM group_member WHERE uid = %d AND gid = %d ", + $r = q("DELETE FROM pgrp_member WHERE uid = %d AND gid = %d ", intval($uid), intval($group_id) ); // remove group - $r = q("UPDATE groups SET deleted = 1 WHERE uid = %d AND gname = '%s'", + $r = q("UPDATE pgrp SET deleted = 1 WHERE uid = %d AND gname = '%s'", intval($uid), dbesc($name) ); @@ -127,7 +127,7 @@ class Group { static function byname($uid,$name) { if((! $uid) || (! strlen($name))) return false; - $r = q("SELECT * FROM groups WHERE uid = %d AND gname = '%s' LIMIT 1", + $r = q("SELECT * FROM pgrp WHERE uid = %d AND gname = '%s' LIMIT 1", intval($uid), dbesc($name) ); @@ -140,7 +140,7 @@ class Group { static function rec_byhash($uid,$hash) { if((! $uid) || (! strlen($hash))) return false; - $r = q("SELECT * FROM groups WHERE uid = %d AND hash = '%s' LIMIT 1", + $r = q("SELECT * FROM pgrp WHERE uid = %d AND hash = '%s' LIMIT 1", intval($uid), dbesc($hash) ); @@ -156,7 +156,7 @@ class Group { return false; if(! ( $uid && $gid && $member)) return false; - $r = q("DELETE FROM group_member WHERE uid = %d AND gid = %d AND xchan = '%s' ", + $r = q("DELETE FROM pgrp_member WHERE uid = %d AND gid = %d AND xchan = '%s' ", intval($uid), intval($gid), dbesc($member) @@ -174,7 +174,7 @@ class Group { if((! $gid) || (! $uid) || (! $member)) return false; - $r = q("SELECT * FROM group_member WHERE uid = %d AND gid = %d AND xchan = '%s' LIMIT 1", + $r = q("SELECT * FROM pgrp_member WHERE uid = %d AND gid = %d AND xchan = '%s' LIMIT 1", intval($uid), intval($gid), dbesc($member) @@ -184,7 +184,7 @@ class Group { // we indicate success because the group member was in fact created // -- It was just created at another time if(! $r) - $r = q("INSERT INTO group_member (uid, gid, xchan) + $r = q("INSERT INTO pgrp_member (uid, gid, xchan) VALUES( %d, %d, '%s' ) ", intval($uid), intval($gid), @@ -200,9 +200,9 @@ class Group { static function members($gid) { $ret = array(); if(intval($gid)) { - $r = q("SELECT * FROM group_member - LEFT JOIN abook ON abook_xchan = group_member.xchan left join xchan on xchan_hash = abook_xchan - WHERE gid = %d AND abook_channel = %d and group_member.uid = %d and xchan_deleted = 0 and abook_self = 0 and abook_blocked = 0 and abook_pending = 0 ORDER BY xchan_name ASC ", + $r = q("SELECT * FROM pgrp_member + LEFT JOIN abook ON abook_xchan = pgrp_member.xchan left join xchan on xchan_hash = abook_xchan + WHERE gid = %d AND abook_channel = %d and pgrp_member.uid = %d and xchan_deleted = 0 and abook_self = 0 and abook_blocked = 0 and abook_pending = 0 ORDER BY xchan_name ASC ", intval($gid), intval(local_channel()), intval(local_channel()) @@ -216,7 +216,7 @@ class Group { static function members_xchan($gid) { $ret = []; if(intval($gid)) { - $r = q("SELECT xchan FROM group_member WHERE gid = %d AND uid = %d", + $r = q("SELECT xchan FROM pgrp_member WHERE gid = %d AND uid = %d", intval($gid), intval(local_channel()) ); @@ -254,7 +254,7 @@ class Group { $grps = []; $o = ''; - $r = q("SELECT * FROM groups WHERE deleted = 0 AND uid = %d ORDER BY gname ASC", + $r = q("SELECT * FROM pgrp WHERE deleted = 0 AND uid = %d ORDER BY gname ASC", intval($uid) ); $grps[] = array('name' => '', 'hash' => '0', 'selected' => ''); @@ -286,7 +286,7 @@ class Group { $groups = array(); - $r = q("SELECT * FROM groups WHERE deleted = 0 AND uid = %d ORDER BY gname ASC", + $r = q("SELECT * FROM pgrp WHERE deleted = 0 AND uid = %d ORDER BY gname ASC", intval($_SESSION['uid']) ); $member_of = array(); @@ -366,7 +366,7 @@ class Group { stringify_array_elms($x,true); $groups = implode(',', $x); if($groups) { - $r = q("SELECT xchan FROM group_member WHERE gid IN ( select id from groups where hash in ( $groups ))"); + $r = q("SELECT xchan FROM pgrp_member WHERE gid IN ( select id from pgrp where hash in ( $groups ))"); if($r) { foreach($r as $rr) { $ret[] = $rr['xchan']; @@ -379,7 +379,7 @@ class Group { static function member_of($c) { - $r = q("SELECT groups.gname, groups.id FROM groups LEFT JOIN group_member ON group_member.gid = groups.id WHERE group_member.xchan = '%s' AND groups.deleted = 0 ORDER BY groups.gname ASC ", + $r = q("SELECT pgrp.gname, pgrp.id FROM pgrp LEFT JOIN pgrp_member ON pgrp_member.gid = pgrp.id WHERE pgrp_member.xchan = '%s' AND pgrp.deleted = 0 ORDER BY pgrp.gname ASC ", dbesc($c) ); @@ -389,7 +389,7 @@ class Group { static function containing($uid,$c) { - $r = q("SELECT gid FROM group_member WHERE uid = %d AND group_member.xchan = '%s' ", + $r = q("SELECT gid FROM pgrp_member WHERE uid = %d AND pgrp_member.xchan = '%s' ", intval($uid), dbesc($c) ); diff --git a/Zotlabs/Lib/Libsync.php b/Zotlabs/Lib/Libsync.php index 938d484b7..d037a0058 100644 --- a/Zotlabs/Lib/Libsync.php +++ b/Zotlabs/Lib/Libsync.php @@ -122,13 +122,13 @@ class Libsync { } if($groups_changed) { - $r = q("select hash as collection, visible, deleted, gname as name from groups where uid = %d", + $r = q("select hash as collection, visible, deleted, gname as name from pgrp where uid = %d", intval($uid) ); if($r) $info['collections'] = $r; - $r = q("select groups.hash as collection, group_member.xchan as member from groups left join group_member on groups.id = group_member.gid where group_member.uid = %d", + $r = q("select pgrp.hash as collection, pgrp_member.xchan as member from pgrp left join pgrp_member on pgrp.id = pgrp_member.gid where pgrp_member.uid = %d", intval($uid) ); if($r) @@ -464,7 +464,7 @@ class Libsync { // sync collections (privacy groups) oh joy... if(array_key_exists('collections',$arr) && is_array($arr['collections']) && count($arr['collections'])) { - $x = q("select * from groups where uid = %d", + $x = q("select * from pgrp where uid = %d", intval($channel['channel_id']) ); foreach($arr['collections'] as $cl) { @@ -480,7 +480,7 @@ class Libsync { if(($y['gname'] != $cl['name']) || ($y['visible'] != $cl['visible']) || ($y['deleted'] != $cl['deleted'])) { - q("update groups set gname = '%s', visible = %d, deleted = %d where hash = '%s' and uid = %d", + q("update pgrp set gname = '%s', visible = %d, deleted = %d where hash = '%s' and uid = %d", dbesc($cl['name']), intval($cl['visible']), intval($cl['deleted']), @@ -489,14 +489,14 @@ class Libsync { ); } if(intval($cl['deleted']) && (! intval($y['deleted']))) { - q("delete from group_member where gid = %d", + q("delete from pgrp_member where gid = %d", intval($y['id']) ); } } } if(! $found) { - $r = q("INSERT INTO groups ( hash, uid, visible, deleted, gname ) + $r = q("INSERT INTO pgrp ( hash, uid, visible, deleted, gname ) VALUES( '%s', %d, %d, %d, '%s' ) ", dbesc($cl['collection']), intval($channel['channel_id']), @@ -520,10 +520,10 @@ class Libsync { } } if(! $found_local) { - q("delete from group_member where gid = %d", + q("delete from pgrp_member where gid = %d", intval($y['id']) ); - q("update groups set deleted = 1 where id = %d and uid = %d", + q("update pgrp set deleted = 1 where id = %d and uid = %d", intval($y['id']), intval($channel['channel_id']) ); @@ -533,7 +533,7 @@ class Libsync { } // reload the group list with any updates - $x = q("select * from groups where uid = %d", + $x = q("select * from pgrp where uid = %d", intval($channel['channel_id']) ); @@ -560,7 +560,7 @@ class Libsync { if(isset($y['hash']) && isset($members[$y['hash']])) { foreach($members[$y['hash']] as $member) { $found = false; - $z = q("select xchan from group_member where gid = %d and uid = %d and xchan = '%s' limit 1", + $z = q("select xchan from pgrp_member where gid = %d and uid = %d and xchan = '%s' limit 1", intval($y['id']), intval($channel['channel_id']), dbesc($member) @@ -571,7 +571,7 @@ class Libsync { // if somebody is in the group that wasn't before - add them if(! $found) { - q("INSERT INTO group_member (uid, gid, xchan) + q("INSERT INTO pgrp_member (uid, gid, xchan) VALUES( %d, %d, '%s' ) ", intval($channel['channel_id']), intval($y['id']), @@ -582,7 +582,7 @@ class Libsync { } // now retrieve a list of members we have on this site - $m = q("select xchan from group_member where gid = %d and uid = %d", + $m = q("select xchan from pgrp_member where gid = %d and uid = %d", intval($y['id']), intval($channel['channel_id']) ); @@ -590,7 +590,7 @@ class Libsync { foreach($m as $mm) { // if the local existing member isn't in the list we just received - remove them if(! in_array($mm['xchan'],$members[$y['hash']])) { - q("delete from group_member where xchan = '%s' and gid = %d and uid = %d", + q("delete from pgrp_member where xchan = '%s' and gid = %d and uid = %d", dbesc($mm['xchan']), intval($y['id']), intval($channel['channel_id']) diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index f8a7366f8..48018f66c 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -259,7 +259,7 @@ class ThreadItem { $forged = ((($item['sig']) && (! intval($item['item_verified']))) ? t('Message signature incorrect') : ''); $unverified = '' ; // (($this->is_wall_to_wall() && (! intval($item['item_verified']))) ? t('Message cannot be verified') : ''); - + $settings = ''; // FIXME - check this permission if($conv->get_profile_owner() == local_channel()) { @@ -267,12 +267,14 @@ class ThreadItem { 'tagit' => t("Add Tag"), 'classtagger' => "", ); + + $settings = t('Conversation Tools'); } $has_bookmarks = false; if(is_array($item['term'])) { foreach($item['term'] as $t) { - if((get_account_techlevel() > 0) && ($t['ttype'] == TERM_BOOKMARK)) + if(($t['ttype'] == TERM_BOOKMARK)) $has_bookmarks = true; } } @@ -436,7 +438,8 @@ class ThreadItem { 'preview_lbl' => t('This is an unsaved preview'), 'wait' => t('Please wait'), 'submid' => str_replace(['+','='], ['',''], base64_encode($item['mid'])), - 'thread_level' => $thread_level + 'thread_level' => $thread_level, + 'settings' => $settings ); $arr = array('item' => $item, 'output' => $tmp_item); diff --git a/Zotlabs/Module/Acl.php b/Zotlabs/Module/Acl.php index 0c2ad7522..ea131e08c 100644 --- a/Zotlabs/Module/Acl.php +++ b/Zotlabs/Module/Acl.php @@ -81,7 +81,7 @@ class Acl extends \Zotlabs\Web\Controller { if($search) { - $sql_extra = " AND groups.gname LIKE " . protect_sprintf( "'%" . dbesc($search) . "%'" ) . " "; + $sql_extra = " AND pgrp.gname LIKE " . protect_sprintf( "'%" . dbesc($search) . "%'" ) . " "; $sql_extra2 = "AND ( xchan_name LIKE " . protect_sprintf( "'%" . dbesc($search) . "%'" ) . " OR xchan_addr LIKE " . protect_sprintf( "'%" . dbesc(punify($search)) . ((strpos($search,'@') === false) ? "%@%'" : "%'")) . ") "; // This horrible mess is needed because position also returns 0 if nothing is found. @@ -128,13 +128,13 @@ class Acl extends \Zotlabs\Web\Controller { // Normal privacy groups - $r = q("SELECT groups.id, groups.hash, groups.gname - FROM groups, group_member - WHERE groups.deleted = 0 AND groups.uid = %d - AND group_member.gid = groups.id + $r = q("SELECT pgrp.id, pgrp.hash, pgrp.gname + FROM pgrp, pgrp_member + WHERE pgrp.deleted = 0 AND pgrp.uid = %d + AND pgrp_member.gid = pgrp.id $sql_extra - GROUP BY groups.id - ORDER BY groups.gname + GROUP BY pgrp.id + ORDER BY pgrp.gname LIMIT %d OFFSET %d", intval(local_channel()), intval($count), diff --git a/Zotlabs/Module/Admin/Account_edit.php b/Zotlabs/Module/Admin/Account_edit.php index 6dfadf183..0300fb10c 100644 --- a/Zotlabs/Module/Admin/Account_edit.php +++ b/Zotlabs/Module/Admin/Account_edit.php @@ -31,7 +31,7 @@ class Account_edit { } $service_class = trim($_REQUEST['service_class']); - $account_level = intval(trim($_REQUEST['account_level'])); + $account_level = 5; $account_language = trim($_REQUEST['account_language']); $r = q("update account set account_service_class = '%s', account_level = %d, account_language = '%s' @@ -68,7 +68,6 @@ class Account_edit { '$title' => t('Account Edit'), '$pass1' => [ 'pass1', t('New Password'), ' ','' ], '$pass2' => [ 'pass2', t('New Password again'), ' ','' ], - '$account_level' => [ 'account_level', t('Technical skill level'), $x[0]['account_level'], '', \Zotlabs\Lib\Techlevels::levels() ], '$account_language' => [ 'account_language' , t('Account language (for emails)'), $x[0]['account_language'], '', language_list() ], '$service_class' => [ 'service_class', t('Service class'), $x[0]['account_service_class'], '' ], '$submit' => t('Submit'), @@ -81,4 +80,4 @@ class Account_edit { } -}
\ No newline at end of file +} diff --git a/Zotlabs/Module/Admin/Site.php b/Zotlabs/Module/Admin/Site.php index 5912a7c97..e67f9f165 100644 --- a/Zotlabs/Module/Admin/Site.php +++ b/Zotlabs/Module/Admin/Site.php @@ -72,7 +72,6 @@ class Site { $maxloadavg = ((x($_POST,'maxloadavg')) ? intval(trim($_POST['maxloadavg'])) : 50); $feed_contacts = ((x($_POST,'feed_contacts')) ? intval($_POST['feed_contacts']) : 0); $verify_email = ((x($_POST,'verify_email')) ? 1 : 0); - $techlevel_lock = ((x($_POST,'techlock')) ? intval($_POST['techlock']) : 0); $imagick_path = ((x($_POST,'imagick_path')) ? trim($_POST['imagick_path']) : ''); $thumbnail_security = ((x($_POST,'thumbnail_security')) ? intval($_POST['thumbnail_security']) : 0); $force_queue = ((intval($_POST['force_queue']) > 0) ? intval($_POST['force_queue']) : 3000); @@ -81,10 +80,6 @@ class Site { $permissions_role = escape_tags(trim($_POST['permissions_role'])); - $techlevel = null; - if(array_key_exists('techlevel', $_POST)) - $techlevel = intval($_POST['techlevel']); - set_config('system', 'feed_contacts', $feed_contacts); set_config('system', 'delivery_interval', $delivery_interval); set_config('system', 'delivery_batch_count', $delivery_batch_count); @@ -110,12 +105,6 @@ class Site { set_config('system', 'pubstream_incl',$pub_incl); set_config('system', 'pubstream_excl',$pub_excl); - set_config('system', 'techlevel_lock', $techlevel_lock); - - - - if(! is_null($techlevel)) - set_config('system', 'techlevel', $techlevel); if($directory_server) set_config('system','directory_server',$directory_server); @@ -284,15 +273,6 @@ class Site { // now invert the logic for the setting. $discover_tab = (1 - $discover_tab); - $techlevels = [ - '0' => t('Beginner/Basic'), - '1' => t('Novice - not skilled but willing to learn'), - '2' => t('Intermediate - somewhat comfortable'), - '3' => t('Advanced - very comfortable'), - '4' => t('Expert - I can write computer code'), - '5' => t('Wizard - I probably know more than you do') - ]; - $perm_roles = \Zotlabs\Access\PermissionRoles::roles(); $default_role = get_config('system','default_permissions_role','social'); @@ -316,10 +296,6 @@ class Site { // name, label, value, help string, extra data... '$sitename' => array('sitename', t("Site name"), htmlspecialchars(get_config('system','sitename'), ENT_QUOTES, 'UTF-8'),''), - '$techlevel' => [ 'techlevel', t('Site default technical skill level'), get_config('system','techlevel'), t('Used to provide a member experience matched to technical comfort level'), $techlevels ], - - '$techlock' => [ 'techlock', t('Lock the technical skill level setting'), get_config('system','techlevel_lock'), t('Members can set their own technical comfort level by default') ], - '$banner' => array('banner', t("Banner/Logo"), $banner, t('Unfiltered HTML/CSS/JS is allowed')), '$admininfo' => array('admininfo', t("Administrator Information"), $admininfo, t("Contact information for site administrators. Displayed on siteinfo page. BBCode can be used here")), '$siteinfo' => array('siteinfo', t('Site Information'), get_config('system','siteinfo'), t("Publicly visible description of this site. Displayed on siteinfo page. BBCode can be used here")), diff --git a/Zotlabs/Module/Appman.php b/Zotlabs/Module/Appman.php index 3ebafafa4..f50dcc2ab 100644 --- a/Zotlabs/Module/Appman.php +++ b/Zotlabs/Module/Appman.php @@ -113,10 +113,12 @@ class Appman extends \Zotlabs\Web\Controller { if($r) { $app = $r[0]; - $term = q("select * from term where otype = %d and oid = %d", + $term = q("select * from term where otype = %d and oid = %d and uid = %d", intval(TERM_OBJ_APP), - intval($r[0]['id']) + intval($r[0]['id']), + intval(local_channel()) ); + if($term) { $app['categories'] = ''; foreach($term as $t) { diff --git a/Zotlabs/Module/Article_edit.php b/Zotlabs/Module/Article_edit.php index 89abccc40..d3cce343f 100644 --- a/Zotlabs/Module/Article_edit.php +++ b/Zotlabs/Module/Article_edit.php @@ -122,7 +122,7 @@ class Article_edit extends \Zotlabs\Web\Controller { 'bbcode' => (($mimetype == 'text/bbcode') ? true : false) ); - $editor = status_editor($a, $x); + $editor = status_editor($a, $x, false, 'Article_edit'); $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( '$title' => t('Edit Article'), diff --git a/Zotlabs/Module/Articles.php b/Zotlabs/Module/Articles.php index 7af1ab6b8..58c16be45 100644 --- a/Zotlabs/Module/Articles.php +++ b/Zotlabs/Module/Articles.php @@ -40,7 +40,7 @@ class Articles extends Controller { //Do not display any associated widgets at this point App::$pdl = ''; - $o = '<b>Articles App (Not Installed):</b><br>'; + $o = '<b>' . t('Articles App') . ' (' . t('Not Installed') . '):</b><br>'; $o .= t('Create interactive articles'); return $o; } @@ -132,7 +132,7 @@ class Articles extends Controller { $x['title'] = $_REQUEST['title']; if($_REQUEST['body']) $x['body'] = $_REQUEST['body']; - $editor = status_editor($a,$x); + $editor = status_editor($a,$x,false,'Articles'); } else { diff --git a/Zotlabs/Module/Blocks.php b/Zotlabs/Module/Blocks.php index e6a97794d..fde30a6dd 100644 --- a/Zotlabs/Module/Blocks.php +++ b/Zotlabs/Module/Blocks.php @@ -109,7 +109,7 @@ class Blocks extends \Zotlabs\Web\Controller { if($_REQUEST['pagetitle']) $x['pagetitle'] = $_REQUEST['pagetitle']; - $editor = status_editor($a,$x); + $editor = status_editor($a,$x,false,'Blocks'); $r = q("select iconfig.iid, iconfig.k, iconfig.v, mid, title, body, mimetype, created, edited from iconfig diff --git a/Zotlabs/Module/Card_edit.php b/Zotlabs/Module/Card_edit.php index 694bdc4ea..e01e70fdb 100644 --- a/Zotlabs/Module/Card_edit.php +++ b/Zotlabs/Module/Card_edit.php @@ -122,7 +122,7 @@ class Card_edit extends \Zotlabs\Web\Controller { 'bbcode' => (($mimetype == 'text/bbcode') ? true : false) ); - $editor = status_editor($a, $x); + $editor = status_editor($a, $x, false, 'Card_edit'); $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( '$title' => t('Edit Card'), diff --git a/Zotlabs/Module/Cards.php b/Zotlabs/Module/Cards.php index 78cbad5fd..b66de158b 100644 --- a/Zotlabs/Module/Cards.php +++ b/Zotlabs/Module/Cards.php @@ -43,7 +43,7 @@ class Cards extends Controller { //Do not display any associated widgets at this point App::$pdl = ''; - $o = '<b>Cards App (Not Installed):</b><br>'; + $o = '<b>' . t('Cards App') . ' (' . t('Not Installed') . '):</b><br>'; $o .= t('Create personal planning cards'); return $o; } @@ -133,7 +133,7 @@ class Cards extends Controller { if($_REQUEST['body']) $x['body'] = $_REQUEST['body']; - $editor = status_editor($a, $x); + $editor = status_editor($a, $x, false, 'Cards'); } else { $editor = ''; diff --git a/Zotlabs/Module/Cdav.php b/Zotlabs/Module/Cdav.php index 7142615d5..d644e48b1 100644 --- a/Zotlabs/Module/Cdav.php +++ b/Zotlabs/Module/Cdav.php @@ -836,7 +836,7 @@ class Cdav extends Controller { //Do not display any associated widgets at this point App::$pdl = ''; - $o = '<b>CalDAV App (Not Installed):</b><br>'; + $o = '<b>' . t('CalDAV App') . ' (' . t('Not Installed') . '):</b><br>'; $o .= t('CalDAV capable calendar'); return $o; } @@ -845,7 +845,7 @@ class Cdav extends Controller { //Do not display any associated widgets at this point App::$pdl = ''; - $o = '<b>CardDAV App (Not Installed):</b><br>'; + $o = '<b>' . t('CardDAV App') . ' (' . t('Not Installed') . '):</b><br>'; $o .= t('CalDAV capable addressbook'); return $o; } diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php index 74fdc1cb4..f1537ed15 100644 --- a/Zotlabs/Module/Channel.php +++ b/Zotlabs/Module/Channel.php @@ -168,7 +168,7 @@ class Channel extends Controller { 'reset' => t('Reset form') ); - $o .= status_editor($a,$x); + $o .= status_editor($a,$x,false,'Channel'); } } @@ -182,7 +182,7 @@ class Channel extends Controller { $item_normal_update = item_normal_update(); $sql_extra = item_permissions_sql(App::$profile['profile_uid']); - if(get_pconfig(App::$profile['profile_uid'],'system','channel_list_mode') && (! $mid)) + if(feature_enabled(App::$profile['profile_uid'], 'channel_list_mode') && (! $mid)) $page_mode = 'list'; else $page_mode = 'client'; diff --git a/Zotlabs/Module/Chat.php b/Zotlabs/Module/Chat.php index 551dc5e2a..db77e2612 100644 --- a/Zotlabs/Module/Chat.php +++ b/Zotlabs/Module/Chat.php @@ -99,7 +99,7 @@ class Chat extends Controller { //Do not display any associated widgets at this point App::$pdl = ''; - $o = '<b>Chatrooms App (Not Installed):</b><br>'; + $o = '<b>' . t('Chatrooms App') . ' (' . t('Not Installed') . '):</b><br>'; $o .= t('Access Controlled Chatrooms'); return $o; } diff --git a/Zotlabs/Module/Connect.php b/Zotlabs/Module/Connect.php index cd43ea290..62d3af840 100644 --- a/Zotlabs/Module/Connect.php +++ b/Zotlabs/Module/Connect.php @@ -1,21 +1,21 @@ <?php namespace Zotlabs\Module; /** @file */ - +use App; +use Zotlabs\Web\Controller; +use Zotlabs\Lib\Apps; require_once('include/contact_widgets.php'); require_once('include/items.php'); - - -class Connect extends \Zotlabs\Web\Controller { +class Connect extends Controller { function init() { if(argc() > 1) $which = argv(1); else { notice( t('Requested profile is not available.') . EOL ); - \App::$error = 404; + App::$error = 404; return; } @@ -24,20 +24,32 @@ class Connect extends \Zotlabs\Web\Controller { ); if($r) - \App::$data['channel'] = $r[0]; + App::$data['channel'] = $r[0]; + + $channel_id = App::$data['channel']['channel_id']; + + if(! Apps::system_app_installed($channel_id, 'Premium Channel')) { + return; + } profile_load($which,''); } function post() { - if(! array_key_exists('channel', \App::$data)) + if(! array_key_exists('channel', App::$data)) + return; + + $channel_id = App::$data['channel']['channel_id']; + + if(! Apps::system_app_installed($channel_id, 'Premium Channel')) { return; + } - $edit = ((local_channel() && (local_channel() == \App::$data['channel']['channel_id'])) ? true : false); + $edit = ((local_channel() && (local_channel() == $channel_id)) ? true : false); if($edit) { - $has_premium = ((\App::$data['channel']['channel_pageflags'] & PAGE_PREMIUM) ? 1 : 0); + $has_premium = ((App::$data['channel']['channel_pageflags'] & PAGE_PREMIUM) ? 1 : 0); $premium = (($_POST['premium']) ? intval($_POST['premium']) : 0); $text = escape_tags($_POST['text']); @@ -48,25 +60,25 @@ class Connect extends \Zotlabs\Web\Controller { intval(local_channel()) ); - \Zotlabs\Daemon\Master::Summon(array('Notifier','refresh_all',\App::$data['channel']['channel_id'])); + \Zotlabs\Daemon\Master::Summon(array('Notifier','refresh_all',$channel_id)); } - set_pconfig(\App::$data['channel']['channel_id'],'system','selltext',$text); + set_pconfig($channel_id,'system','selltext',$text); // reload the page completely to get fresh data - goaway(z_root() . '/' . \App::$query_string); + goaway(z_root() . '/' . App::$query_string); } $url = ''; - $observer = \App::get_observer(); + $observer = App::get_observer(); if(($observer) && ($_POST['submit'] === t('Continue'))) { if($observer['xchan_follow']) - $url = sprintf($observer['xchan_follow'],urlencode(channel_reddress(\App::$data['channel']))); + $url = sprintf($observer['xchan_follow'],urlencode(channel_reddress(App::$data['channel']))); if(! $url) { $r = q("select * from hubloc where hubloc_hash = '%s' order by hubloc_id desc limit 1", dbesc($observer['xchan_hash']) ); if($r) - $url = $r[0]['hubloc_url'] . '/follow?f=&url=' . urlencode(channel_reddress(\App::$data['channel'])); + $url = $r[0]['hubloc_url'] . '/follow?f=&url=' . urlencode(channel_reddress(App::$data['channel'])); } } if($url) @@ -79,17 +91,31 @@ class Connect extends \Zotlabs\Web\Controller { function get() { + + if(! array_key_exists('channel', App::$data)) + return; + + $channel_id = App::$data['channel']['channel_id']; + + if(! Apps::system_app_installed($channel_id, 'Premium Channel')) { + //Do not display any associated widgets at this point + App::$pdl = ''; + + $o = '<b>' . t('Premium Channel App') . ' (' . t('Not Installed') . '):</b><br>'; + $o .= t('Allows you to set restrictions and terms on those that connect with your channel'); + return $o; + } - $edit = ((local_channel() && (local_channel() == \App::$data['channel']['channel_id'])) ? true : false); + $edit = ((local_channel() && (local_channel() == $channel_id)) ? true : false); - $text = get_pconfig(\App::$data['channel']['channel_id'],'system','selltext'); + $text = get_pconfig($channel_id,'system','selltext'); if($edit) { $o = replace_macros(get_markup_template('sellpage_edit.tpl'),array( '$header' => t('Premium Channel Setup'), - '$address' => \App::$data['channel']['channel_address'], - '$premium' => array('premium', t('Enable premium channel connection restrictions'),((\App::$data['channel']['channel_pageflags'] & PAGE_PREMIUM) ? '1' : ''),''), + '$address' => App::$data['channel']['channel_address'], + '$premium' => array('premium', t('Enable premium channel connection restrictions'),((App::$data['channel']['channel_pageflags'] & PAGE_PREMIUM) ? '1' : ''),''), '$lbl_about' => t('Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc.'), '$text' => $text, '$desc' => t('This channel may require additional steps or acknowledgement of the following conditions prior to connecting:'), @@ -107,7 +133,7 @@ class Connect extends \Zotlabs\Web\Controller { $submit = replace_macros(get_markup_template('sellpage_submit.tpl'), array( '$continue' => t('Continue'), - '$address' => \App::$data['channel']['channel_address'] + '$address' => App::$data['channel']['channel_address'] )); $o = replace_macros(get_markup_template('sellpage_view.tpl'),array( @@ -120,7 +146,7 @@ class Connect extends \Zotlabs\Web\Controller { )); - $arr = array('channel' => \App::$data['channel'],'observer' => \App::get_observer(), 'sellpage' => $o, 'submit' => $submit); + $arr = array('channel' => App::$data['channel'],'observer' => App::get_observer(), 'sellpage' => $o, 'submit' => $submit); call_hooks('connect_premium', $arr); $o = $arr['sellpage']; diff --git a/Zotlabs/Module/Connections.php b/Zotlabs/Module/Connections.php index 0e5f1dfe2..967e9521d 100644 --- a/Zotlabs/Module/Connections.php +++ b/Zotlabs/Module/Connections.php @@ -220,7 +220,7 @@ class Connections extends \Zotlabs\Web\Controller { $sql_extra .= (($searching) ? protect_sprintf(" AND xchan_name like '%$search_txt%' ") : ""); if($_REQUEST['gid']) { - $sql_extra .= " and xchan_hash in ( select xchan from group_member where gid = " . intval($_REQUEST['gid']) . " and uid = " . intval(local_channel()) . " ) "; + $sql_extra .= " and xchan_hash in ( select xchan from pgrp_member where gid = " . intval($_REQUEST['gid']) . " and uid = " . intval(local_channel()) . " ) "; } $r = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php index 712215bc3..3d7ee449a 100644 --- a/Zotlabs/Module/Connedit.php +++ b/Zotlabs/Module/Connedit.php @@ -7,6 +7,7 @@ namespace Zotlabs\Module; * */ +use Zotlabs\Lib\Apps; require_once('include/socgraph.php'); require_once('include/selectors.php'); @@ -851,7 +852,7 @@ class Connedit extends \Zotlabs\Web\Controller { '$autoperms' => array('autoperms',t('Apply these permissions automatically'), ((get_pconfig(local_channel(),'system','autoperms')) ? 1 : 0), t('Connection requests will be approved without your interaction'), $yes_no), '$permcat' => [ 'permcat', t('Permission role'), '', '<span class="loading invisible">' . t('Loading') . '<span class="jumping-dots"><span class="dot-1">.</span><span class="dot-2">.</span><span class="dot-3">.</span></span></span>',$permcats ], '$permcat_new' => t('Add permission role'), - '$permcat_enable' => feature_enabled(local_channel(),'permcats'), + '$permcat_enable' => Apps::system_app_installed(local_channel(), 'Permission Categories'), '$addr' => unpunify($contact['xchan_addr']), '$primeurl' => unpunify($contact['xchan_url']), '$section' => $section, diff --git a/Zotlabs/Module/Contactgroup.php b/Zotlabs/Module/Contactgroup.php index 2ba53517f..36aaf7da0 100644 --- a/Zotlabs/Module/Contactgroup.php +++ b/Zotlabs/Module/Contactgroup.php @@ -23,7 +23,7 @@ class Contactgroup extends \Zotlabs\Web\Controller { if((argc() > 1) && (intval(argv(1)))) { - $r = q("SELECT * FROM groups WHERE id = %d AND uid = %d AND deleted = 0 LIMIT 1", + $r = q("SELECT * FROM pgrp WHERE id = %d AND uid = %d AND deleted = 0 LIMIT 1", intval(argv(1)), intval(local_channel()) ); diff --git a/Zotlabs/Module/Defperms.php b/Zotlabs/Module/Defperms.php index 63acc9795..463ecb57a 100644 --- a/Zotlabs/Module/Defperms.php +++ b/Zotlabs/Module/Defperms.php @@ -1,14 +1,16 @@ <?php namespace Zotlabs\Module; +use App; +use Zotlabs\Lib\Apps; +use Zotlabs\Web\Controller; require_once('include/socgraph.php'); require_once('include/selectors.php'); require_once('include/group.php'); require_once('include/photos.php'); - -class Defperms extends \Zotlabs\Web\Controller { +class Defperms extends Controller { /* @brief Initialize the connection-editor * @@ -19,6 +21,9 @@ class Defperms extends \Zotlabs\Web\Controller { if(! local_channel()) return; + + if(! Apps::system_app_installed(local_channel(), 'Default Permissions')) + return; $r = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash @@ -26,10 +31,10 @@ class Defperms extends \Zotlabs\Web\Controller { intval(local_channel()) ); if($r) { - \App::$poi = $r[0]; + App::$poi = $r[0]; } - $channel = \App::get_channel(); + $channel = App::get_channel(); if($channel) head_set_icon($channel['xchan_photo_s']); } @@ -43,12 +48,15 @@ class Defperms extends \Zotlabs\Web\Controller { if(! local_channel()) return; + + if(! Apps::system_app_installed(local_channel(), 'Default Permissions')) + return; $contact_id = intval(argv(1)); if(! $contact_id) return; - $channel = \App::get_channel(); + $channel = App::get_channel(); $orig_record = q("SELECT * FROM abook WHERE abook_id = %d AND abook_channel = %d LIMIT 1", intval($contact_id), @@ -112,7 +120,7 @@ class Defperms extends \Zotlabs\Web\Controller { intval($contact_id) ); if($r) { - \App::$poi = $r[0]; + App::$poi = $r[0]; } @@ -131,22 +139,22 @@ class Defperms extends \Zotlabs\Web\Controller { function defperms_clone(&$a) { - if(! \App::$poi) + if(! App::$poi) return; - $channel = \App::get_channel(); + $channel = App::get_channel(); $r = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d and abook_id = %d LIMIT 1", intval(local_channel()), - intval(\App::$poi['abook_id']) + intval(App::$poi['abook_id']) ); if($r) { - \App::$poi = array_shift($r); + App::$poi = array_shift($r); } - $clone = \App::$poi; + $clone = App::$poi; unset($clone['abook_id']); unset($clone['abook_account']); @@ -173,9 +181,18 @@ class Defperms extends \Zotlabs\Web\Controller { notice( t('Permission denied.') . EOL); return login(); } + + if(! Apps::system_app_installed(local_channel(), 'Default Permissions')) { + //Do not display any associated widgets at this point + App::$pdl = ''; + + $o = '<b>' . t('Default Permissions App') . ' (' . t('Not Installed') . '):</b><br>'; + $o .= t('Set custom default permissions for new connections'); + return $o; + } $section = ((array_key_exists('section',$_REQUEST)) ? $_REQUEST['section'] : ''); - $channel = \App::get_channel(); + $channel = App::get_channel(); $yes_no = array(t('No'),t('Yes')); @@ -193,7 +210,7 @@ class Defperms extends \Zotlabs\Web\Controller { } $o .= " }\n</script>\n"; - if(\App::$poi) { + if(App::$poi) { $sections = []; @@ -203,9 +220,9 @@ class Defperms extends \Zotlabs\Web\Controller { $perms = array(); - $channel = \App::get_channel(); + $channel = App::get_channel(); - $contact = \App::$poi; + $contact = App::$poi; $global_perms = \Zotlabs\Access\Permissions::Perms(); @@ -238,7 +255,7 @@ class Defperms extends \Zotlabs\Web\Controller { '$autoperms' => array('autoperms',t('Apply these permissions automatically'), ((get_pconfig(local_channel(),'system','autoperms')) ? 1 : 0), t('If enabled, connection requests will be approved without your interaction'), $yes_no), '$permcat' => [ 'permcat', t('Permission role'), '', '<span class="loading invisible">' . t('Loading') . '<span class="jumping-dots"><span class="dot-1">.</span><span class="dot-2">.</span><span class="dot-3">.</span></span></span>',$permcats ], '$permcat_new' => t('Add permission role'), - '$permcat_enable' => feature_enabled(local_channel(),'permcats'), + '$permcat_enable' => Apps::system_app_installed(local_channel(), 'Permission Categories'), '$section' => $section, '$sections' => $sections, '$autolbl' => t('The permissions indicated on this page will be applied to all new connections.'), diff --git a/Zotlabs/Module/Directory.php b/Zotlabs/Module/Directory.php index 8a7c6baf6..c29fa8326 100644 --- a/Zotlabs/Module/Directory.php +++ b/Zotlabs/Module/Directory.php @@ -12,13 +12,16 @@ class Directory extends \Zotlabs\Web\Controller { function init() { \App::set_pager_itemspage(60); - if(x($_GET,'ignore')) { + if(local_channel() && x($_GET,'ignore')) { q("insert into xign ( uid, xchan ) values ( %d, '%s' ) ", intval(local_channel()), dbesc($_GET['ignore']) ); goaway(z_root() . '/directory?f=&suggest=1'); } + + if(local_channel()) + \App::$profile_uid = local_channel(); $observer = get_observer_hash(); $global_changed = false; @@ -55,6 +58,7 @@ class Directory extends \Zotlabs\Web\Controller { if($observer) set_xconfig($observer,'directory','pubforums',$pubforums); } + } function get() { diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php index 1d21b64ac..8b46ebb79 100644 --- a/Zotlabs/Module/Display.php +++ b/Zotlabs/Module/Display.php @@ -81,7 +81,7 @@ class Display extends \Zotlabs\Web\Controller { ); $o = '<div id="jot-popup">'; - $o .= status_editor($a,$x); + $o .= status_editor($a,$x,false,'Display'); $o .= '</div>'; } diff --git a/Zotlabs/Module/Editblock.php b/Zotlabs/Module/Editblock.php index 563ad9ca2..c031f32a1 100644 --- a/Zotlabs/Module/Editblock.php +++ b/Zotlabs/Module/Editblock.php @@ -132,7 +132,7 @@ class Editblock extends \Zotlabs\Web\Controller { 'bbcode' => (($mimetype == 'text/bbcode') ? true : false) ); - $editor = status_editor($a, $x); + $editor = status_editor($a, $x, false, 'Editblock'); $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( '$title' => t('Edit Block'), diff --git a/Zotlabs/Module/Editlayout.php b/Zotlabs/Module/Editlayout.php index 67e0bcd32..50096f1a1 100644 --- a/Zotlabs/Module/Editlayout.php +++ b/Zotlabs/Module/Editlayout.php @@ -131,7 +131,7 @@ class Editlayout extends \Zotlabs\Web\Controller { 'profile_uid' => intval($owner), ); - $editor = status_editor($a, $x); + $editor = status_editor($a, $x, false, 'Editlayout'); $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( '$title' => t('Edit Layout'), diff --git a/Zotlabs/Module/Editpost.php b/Zotlabs/Module/Editpost.php index 45d8e7644..1c9068e07 100644 --- a/Zotlabs/Module/Editpost.php +++ b/Zotlabs/Module/Editpost.php @@ -102,7 +102,7 @@ class Editpost extends \Zotlabs\Web\Controller { 'bbcode' => true ); - $editor = status_editor($a, $x); + $editor = status_editor($a, $x, false, 'Editpost'); $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( '$title' => t('Edit post'), diff --git a/Zotlabs/Module/Editwebpage.php b/Zotlabs/Module/Editwebpage.php index b67421cd5..785eeb4ec 100644 --- a/Zotlabs/Module/Editwebpage.php +++ b/Zotlabs/Module/Editwebpage.php @@ -160,7 +160,7 @@ class Editwebpage extends \Zotlabs\Web\Controller { 'bbcode' => (($mimetype == 'text/bbcode') ? true : false) ); - $editor = status_editor($a, $x); + $editor = status_editor($a, $x, false, 'Editwebpage'); $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( '$title' => t('Edit Webpage'), diff --git a/Zotlabs/Module/Group.php b/Zotlabs/Module/Group.php index acebe995d..c8ccaa2cb 100644 --- a/Zotlabs/Module/Group.php +++ b/Zotlabs/Module/Group.php @@ -1,11 +1,13 @@ <?php namespace Zotlabs\Module; -require_once('include/group.php'); - +use App; +use Zotlabs\Web\Controller; +use Zotlabs\Lib\Apps; +require_once('include/group.php'); -class Group extends \Zotlabs\Web\Controller { +class Group extends Controller { function init() { if(! local_channel()) { @@ -13,7 +15,11 @@ class Group extends \Zotlabs\Web\Controller { return; } - \App::$profile_uid = local_channel(); + if(! Apps::system_app_installed(local_channel(), 'Privacy Groups')) { + return; + } + + App::$profile_uid = local_channel(); nav_set_selected('Privacy Groups'); } @@ -24,6 +30,10 @@ class Group extends \Zotlabs\Web\Controller { notice( t('Permission denied.') . EOL); return; } + + if(! Apps::system_app_installed(local_channel(), 'Privacy Groups')) { + return; + } if((argc() == 2) && (argv(1) === 'new')) { check_form_security_token_redirectOnErr('/group/new', 'group_edit'); @@ -43,7 +53,7 @@ class Group extends \Zotlabs\Web\Controller { if((argc() == 2) && (intval(argv(1)))) { check_form_security_token_redirectOnErr('/group', 'group_edit'); - $r = q("SELECT * FROM groups WHERE id = %d AND uid = %d LIMIT 1", + $r = q("SELECT * FROM pgrp WHERE id = %d AND uid = %d LIMIT 1", intval(argv(1)), intval(local_channel()) ); @@ -57,7 +67,7 @@ class Group extends \Zotlabs\Web\Controller { $public = intval($_POST['public']); if((strlen($groupname)) && (($groupname != $group['gname']) || ($public != $group['visible']))) { - $r = q("UPDATE groups SET gname = '%s', visible = %d WHERE uid = %d AND id = %d", + $r = q("UPDATE pgrp SET gname = '%s', visible = %d WHERE uid = %d AND id = %d", dbesc($groupname), intval($public), intval(local_channel()), @@ -77,13 +87,22 @@ class Group extends \Zotlabs\Web\Controller { $change = false; - logger('mod_group: ' . \App::$cmd,LOGGER_DEBUG); + logger('mod_group: ' . App::$cmd,LOGGER_DEBUG); if(! local_channel()) { notice( t('Permission denied') . EOL); return; } + if(! Apps::system_app_installed(local_channel(), 'Privacy Groups')) { + //Do not display any associated widgets at this point + App::$pdl = ''; + + $o = '<b>' . t('Privacy Groups App') . ' (' . t('Not Installed') . '):</b><br>'; + $o .= t('Management of privacy groups'); + return $o; + } + // Switch to text mode interface if we have more than 'n' contacts or group members $switchtotext = get_pconfig(local_channel(),'system','groupedit_image_limit'); if($switchtotext === false) @@ -96,7 +115,7 @@ class Group extends \Zotlabs\Web\Controller { $new = (((argc() == 2) && (argv(1) === 'new')) ? true : false); - $groups = q("SELECT id, gname FROM groups WHERE deleted = 0 AND uid = %d ORDER BY gname ASC", + $groups = q("SELECT id, gname FROM pgrp WHERE deleted = 0 AND uid = %d ORDER BY gname ASC", intval(local_channel()) ); @@ -141,7 +160,7 @@ class Group extends \Zotlabs\Web\Controller { check_form_security_token_redirectOnErr('/group', 'group_drop', 't'); if(intval(argv(2))) { - $r = q("SELECT gname FROM groups WHERE id = %d AND uid = %d LIMIT 1", + $r = q("SELECT gname FROM pgrp WHERE id = %d AND uid = %d LIMIT 1", intval(argv(2)), intval(local_channel()) ); @@ -173,7 +192,7 @@ class Group extends \Zotlabs\Web\Controller { if((argc() > 1) && (intval(argv(1)))) { require_once('include/acl_selectors.php'); - $r = q("SELECT * FROM groups WHERE id = %d AND uid = %d AND deleted = 0 LIMIT 1", + $r = q("SELECT * FROM pgrp WHERE id = %d AND uid = %d AND deleted = 0 LIMIT 1", intval(argv(1)), intval(local_channel()) ); diff --git a/Zotlabs/Module/Home.php b/Zotlabs/Module/Home.php index 647a6412a..7f2d6424d 100644 --- a/Zotlabs/Module/Home.php +++ b/Zotlabs/Module/Home.php @@ -13,14 +13,12 @@ class Home extends \Zotlabs\Web\Controller { $ret = array(); call_hooks('home_init',$ret); - + $splash = ((argc() > 1 && argv(1) === 'splash') ? true : false); $channel = \App::get_channel(); if(local_channel() && $channel && $channel['xchan_url'] && ! $splash) { - $dest = $channel['channel_startpage']; - if(! $dest) - $dest = get_pconfig(local_channel(),'system','startpage'); + $dest = (($ret['startpage']) ? $ret['startpage'] : ''); if(! $dest) $dest = get_config('system','startpage'); if(! $dest) diff --git a/Zotlabs/Module/Hq.php b/Zotlabs/Module/Hq.php index fee4246c0..3535ac71a 100644 --- a/Zotlabs/Module/Hq.php +++ b/Zotlabs/Module/Hq.php @@ -138,7 +138,7 @@ class Hq extends \Zotlabs\Web\Controller { [ '$no_messages' => (($target_item) ? false : true), '$no_messages_label' => [ t('Welcome to Hubzilla!'), t('You have got no unseen posts...') ], - '$editor' => status_editor($a,$x) + '$editor' => status_editor($a,$x,false,'Hq') ] ); diff --git a/Zotlabs/Module/Import.php b/Zotlabs/Module/Import.php index d031bf16b..c5c52674a 100644 --- a/Zotlabs/Module/Import.php +++ b/Zotlabs/Module/Import.php @@ -428,7 +428,7 @@ class Import extends \Zotlabs\Web\Controller { create_table_from_array('groups', $group); } - $r = q("select * from groups where uid = %d", + $r = q("select * from pgrp where uid = %d", intval($channel['channel_id']) ); if($r) { diff --git a/Zotlabs/Module/Invite.php b/Zotlabs/Module/Invite.php index 234802746..6359da54c 100644 --- a/Zotlabs/Module/Invite.php +++ b/Zotlabs/Module/Invite.php @@ -107,7 +107,7 @@ class Invite extends Controller { //Do not display any associated widgets at this point App::$pdl = ''; - $o = '<b>Invite App (Not Installed):</b><br>'; + $o = '<b>' . t('Invite App') . ' (' . t('Not Installed') . '):</b><br>'; $o .= t('Send email invitations to join this network'); return $o; } diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php index a24d6da9c..2ee639874 100644 --- a/Zotlabs/Module/Item.php +++ b/Zotlabs/Module/Item.php @@ -1165,28 +1165,6 @@ class Item extends \Zotlabs\Web\Controller { return $ret; } - // auto-upgrade beginner (techlevel 0) accounts - if they have at least two friends and ten posts - // and have uploaded something (like a profile photo), promote them to level 1. - - $a = q("select account_id, account_level from account where account_id = (select channel_account_id from channel where channel_id = %d limit 1)", - intval($channel_id) - ); - if((! intval($a[0]['account_level'])) && intval($r[0]['total']) > 10) { - $x = q("select count(abook_id) as total from abook where abook_channel = %d", - intval($channel_id) - ); - if($x && intval($x[0]['total']) > 2) { - $y = q("select count(id) as total from attach where uid = %d", - intval($channel_id) - ); - if($y && intval($y[0]['total']) > 1) { - q("update account set account_level = 1 where account_id = %d limit 1", - intval($a[0]['account_id']) - ); - } - } - } - if (!$iswebpage) { $max = engr_units_to_bytes(service_class_fetch($channel_id,'total_items')); if(! service_class_allows($channel_id,'total_items',$r[0]['total'])) { diff --git a/Zotlabs/Module/Lang.php b/Zotlabs/Module/Lang.php index 9858beecd..a32f933a6 100644 --- a/Zotlabs/Module/Lang.php +++ b/Zotlabs/Module/Lang.php @@ -14,7 +14,7 @@ class Lang extends Controller { //Do not display any associated widgets at this point App::$pdl = ''; - $o = '<b>Language App (Not Installed):</b><br>'; + $o = '<b>' . t('Language App') . ' (' . t('Not Installed') . '):</b><br>'; $o .= t('Change UI language'); return $o; } diff --git a/Zotlabs/Module/Layouts.php b/Zotlabs/Module/Layouts.php index 19efb37fd..25e27d226 100644 --- a/Zotlabs/Module/Layouts.php +++ b/Zotlabs/Module/Layouts.php @@ -141,7 +141,7 @@ class Layouts extends \Zotlabs\Web\Controller { if($_REQUEST['pagetitle']) $x['pagetitle'] = $_REQUEST['pagetitle']; - $editor = status_editor($a,$x); + $editor = status_editor($a,$x,false,'Layouts'); $r = q("select iconfig.iid, iconfig.v, mid, title, body, mimetype, created, edited, item_type from iconfig left join item on iconfig.iid = item.id diff --git a/Zotlabs/Module/Lockview.php b/Zotlabs/Module/Lockview.php index 466d16997..d7ed07a53 100644 --- a/Zotlabs/Module/Lockview.php +++ b/Zotlabs/Module/Lockview.php @@ -118,7 +118,7 @@ class Lockview extends \Zotlabs\Web\Controller { } if(count($allowed_groups)) { - $r = q("SELECT gname FROM groups WHERE hash IN ( " . implode(', ', $allowed_groups) . " )"); + $r = q("SELECT gname FROM pgrp WHERE hash IN ( " . implode(', ', $allowed_groups) . " )"); if($r) foreach($r as $rr) $l[] = '<div class="dropdown-item"><b>' . $rr['gname'] . '</b></div>'; @@ -156,7 +156,7 @@ class Lockview extends \Zotlabs\Web\Controller { if(count($deny_groups)) { - $r = q("SELECT gname FROM groups WHERE hash IN ( " . implode(', ', $deny_groups) . " )"); + $r = q("SELECT gname FROM pgrp WHERE hash IN ( " . implode(', ', $deny_groups) . " )"); if($r) foreach($r as $rr) $l[] = '<div class="dropdown-item"><b><strike>' . $rr['gname'] . '</strike></b></div>'; diff --git a/Zotlabs/Module/Mail.php b/Zotlabs/Module/Mail.php index ca183f644..d38c1d88c 100644 --- a/Zotlabs/Module/Mail.php +++ b/Zotlabs/Module/Mail.php @@ -393,7 +393,7 @@ class Mail extends \Zotlabs\Web\Controller { 'delete' => t('Delete message'), 'dreport' => t('Delivery report'), 'recall' => t('Recall message'), - 'can_recall' => (($channel['channel_hash'] == $message['from_xchan'] && get_account_techlevel() > 0) ? true : false), + 'can_recall' => ($channel['channel_hash'] == $message['from_xchan']), 'is_recalled' => (intval($message['mail_recalled']) ? t('Message has been recalled.') : ''), 'date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'], 'c'), ); diff --git a/Zotlabs/Module/Manage.php b/Zotlabs/Module/Manage.php index ea24bbf61..20d5b0449 100644 --- a/Zotlabs/Module/Manage.php +++ b/Zotlabs/Module/Manage.php @@ -129,7 +129,7 @@ class Manage extends \Zotlabs\Web\Controller { } } - + $r = q("select count(channel_id) as total from channel where channel_account_id = %d and channel_removed = 0", intval(get_account_id()) ); @@ -170,7 +170,7 @@ class Manage extends \Zotlabs\Web\Controller { '$header' => t('Channel Manager'), '$msg_selected' => t('Current Channel'), '$selected' => local_channel(), - '$desc' => t('Switch to one of your channels by selecting it.'), + '$desc' => ((count($channels) > 1 || $delegates) ? t('Switch to one of your channels by selecting it.') : ''), '$msg_default' => t('Default Channel'), '$msg_make_default' => t('Make Default'), '$create' => $create, diff --git a/Zotlabs/Module/Mood.php b/Zotlabs/Module/Mood.php index cceef5ffa..16ef0b171 100644 --- a/Zotlabs/Module/Mood.php +++ b/Zotlabs/Module/Mood.php @@ -129,7 +129,7 @@ class Mood extends Controller { //Do not display any associated widgets at this point App::$pdl = ''; - $o = '<b>Mood App (Not Installed):</b><br>'; + $o = '<b>' . t('Mood App') . ' (' . t('Not Installed') . '):</b><br>'; $o .= t('Set your current mood and tell your friends'); return $o; } diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index ffe605538..015351cbf 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -84,20 +84,9 @@ class Network extends \Zotlabs\Web\Controller { $search = (($_GET['search']) ? $_GET['search'] : ''); if($search) { - $_GET['netsearch'] = escape_tags($search); - if(strpos($search,'@') === 0) { - $r = q("select abook_id from abook left join xchan on abook_xchan = xchan_hash where xchan_name = '%s' and abook_channel = %d limit 1", - dbesc(substr($search,1)), - intval(local_channel()) - ); - if($r) { - $_GET['cid'] = $r[0]['abook_id']; - $search = $_GET['search'] = ''; - } - } - elseif(strpos($search,'#') === 0) { + if(strpos($search,'#') === 0) { $hashtags = substr($search,1); - $search = $_GET['search'] = ''; + $search = ''; } } @@ -108,7 +97,7 @@ class Network extends \Zotlabs\Web\Controller { // filter by collection (e.g. group) if($gid) { - $r = q("SELECT * FROM groups WHERE id = %d AND uid = %d LIMIT 1", + $r = q("SELECT * FROM pgrp WHERE id = %d AND uid = %d LIMIT 1", intval($gid), intval(local_channel()) ); @@ -143,7 +132,7 @@ class Network extends \Zotlabs\Web\Controller { $deftag = ''; - if(x($_GET,'search') || $file || (!$pf && $cid)) + if(x($_GET,'search') || $file || (!$pf && $cid) || $hashtags || $verb || $category) $nouveau = true; if($cid) { @@ -169,9 +158,9 @@ class Network extends \Zotlabs\Web\Controller { if(! $update) { // search terms header - if($search) { + if($search || $hashtags) { $o .= replace_macros(get_markup_template("section_title.tpl"),array( - '$title' => t('Search Results For:') . ' ' . htmlspecialchars($search, ENT_COMPAT,'UTF-8') + '$title' => t('Search Results For:') . ' ' . (($search) ? htmlspecialchars($search, ENT_COMPAT,'UTF-8') : '#' . htmlspecialchars($hashtags, ENT_COMPAT,'UTF-8')) )); } @@ -207,7 +196,7 @@ class Network extends \Zotlabs\Web\Controller { $x['pretext'] = $deftag; - $status_editor = status_editor($a,$x); + $status_editor = status_editor($a,$x,false,'Network'); $o .= $status_editor; $static = channel_manual_conv_update(local_channel()); @@ -448,7 +437,7 @@ class Network extends \Zotlabs\Web\Controller { $abook_uids = " and abook.abook_channel = " . local_channel() . " "; $uids = " and item.uid = " . local_channel() . " "; - if(get_pconfig(local_channel(),'system','network_list_mode')) + if(feature_enabled(local_channel(), 'network_list_mode')) $page_mode = 'list'; else $page_mode = 'client'; diff --git a/Zotlabs/Module/New_channel.php b/Zotlabs/Module/New_channel.php index 97a46a43e..a9022a03a 100644 --- a/Zotlabs/Module/New_channel.php +++ b/Zotlabs/Module/New_channel.php @@ -142,9 +142,12 @@ class New_channel extends \Zotlabs\Web\Controller { } $limit = account_service_class_fetch(get_account_id(),'total_identities'); - + $canadd = true; if($r && ($limit !== false)) { $channel_usage_message = sprintf( t("You have created %1$.0f of %2$.0f allowed channels."), $r[0]['total'], $limit); + if ($r[0]['total'] >= $limit) { + $canadd = false; + } } else { $channel_usage_message = ''; @@ -168,8 +171,6 @@ class New_channel extends \Zotlabs\Web\Controller { $privacy_role = ((x($_REQUEST,'permissions_role')) ? $_REQUEST['permissions_role'] : "" ); $perm_roles = \Zotlabs\Access\PermissionRoles::roles(); - if((get_account_techlevel() < 4) && $privacy_role !== 'custom') - unset($perm_roles[t('Other')]); $name = array('name', t('Channel name'), ((x($_REQUEST,'name')) ? $_REQUEST['name'] : ''), $name_help, "*"); $nickhub = '@' . \App::get_hostname(); @@ -186,7 +187,8 @@ class New_channel extends \Zotlabs\Web\Controller { '$nickname' => $nickname, '$validate' => t('Validate'), '$submit' => t('Create'), - '$channel_usage_message' => $channel_usage_message + '$channel_usage_message' => $channel_usage_message, + '$canadd' => $canadd )); return $o; diff --git a/Zotlabs/Module/Notes.php b/Zotlabs/Module/Notes.php index e530e6ff4..178a6bce0 100644 --- a/Zotlabs/Module/Notes.php +++ b/Zotlabs/Module/Notes.php @@ -1,13 +1,19 @@ <?php namespace Zotlabs\Module; /** @file */ +use App; +use Zotlabs\Web\Controller; +use Zotlabs\Lib\Apps; -class Notes extends \Zotlabs\Web\Controller { +class Notes extends Controller { - function init() { + function post() { if(! local_channel()) - return; + return EMPTY_STR; + + if(! Apps::system_app_installed(local_channel(), 'Notes')) + return EMPTY_STR; $ret = array('success' => true); if(array_key_exists('note_text',$_REQUEST)) { @@ -24,17 +30,38 @@ class Notes extends \Zotlabs\Web\Controller { } set_pconfig(local_channel(),'notes','text',$body); } - + // push updates to channel clones - + if((argc() > 1) && (argv(1) === 'sync')) { require_once('include/zot.php'); build_sync_packet(); } - + logger('notes saved.', LOGGER_DEBUG); json_return_and_die($ret); - + + } + + function get() { + + if(! local_channel()) + return EMPTY_STR; + + if(! Apps::system_app_installed(local_channel(), 'Notes')) { + //Do not display any associated widgets at this point + App::$pdl = EMPTY_STR; + + $o = '<b>' . t('Notes App') . ' (' . t('Not Installed') . '):</b><br>'; + $o .= t('A simple notes app with a widget (note: notes are not encrypted)'); + return $o; + } + + $w = new \Zotlabs\Widget\Notes; + $arr = ['app' => true]; + + return $w->widget($arr); + } } diff --git a/Zotlabs/Module/Settings/Oauth.php b/Zotlabs/Module/Oauth.php index d6576c6de..27c062df2 100644 --- a/Zotlabs/Module/Settings/Oauth.php +++ b/Zotlabs/Module/Oauth.php @@ -1,27 +1,37 @@ <?php -namespace Zotlabs\Module\Settings; +namespace Zotlabs\Module; +use App; +use Zotlabs\Lib\Apps; +use Zotlabs\Web\Controller; -class Oauth { +class Oauth extends Controller { function post() { + + if(! local_channel()) + return; + + + if(! Apps::system_app_installed(local_channel(), 'OAuth Apps Manager')) + return; if(x($_POST,'remove')){ - check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth'); + check_form_security_token_redirectOnErr('/oauth', 'oauth'); $key = $_POST['remove']; q("DELETE FROM tokens WHERE id='%s' AND uid=%d", dbesc($key), local_channel()); - goaway(z_root()."/settings/oauth/"); + goaway(z_root()."/oauth"); return; } - if((argc() > 2) && (argv(2) === 'edit' || argv(2) === 'add') && x($_POST,'submit')) { + if((argc() > 1) && (argv(1) === 'edit' || argv(1) === 'add') && x($_POST,'submit')) { - check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth'); + check_form_security_token_redirectOnErr('oauth', 'oauth'); $name = ((x($_POST,'name')) ? escape_tags($_POST['name']) : ''); $key = ((x($_POST,'key')) ? escape_tags($_POST['key']) : ''); @@ -73,17 +83,30 @@ class Oauth { ); } } - goaway(z_root()."/settings/oauth/"); + goaway(z_root()."/oauth"); return; } } function get() { + + if(! local_channel()) + return; + + if(! Apps::system_app_installed(local_channel(), 'OAuth Apps Manager')) { + //Do not display any associated widgets at this point + App::$pdl = ''; + + $o = '<b>' . t('OAuth Apps Manager App') . ' (' . t('Not Installed') . '):</b><br>'; + $o .= t('OAuth authentication tokens for mobile and remote apps'); + return $o; + } + - if((argc() > 2) && (argv(2) === 'add')) { - $tpl = get_markup_template("settings_oauth_edit.tpl"); + if((argc() > 1) && (argv(1) === 'add')) { + $tpl = get_markup_template("oauth_edit.tpl"); $o .= replace_macros($tpl, array( - '$form_security_token' => get_form_security_token("settings_oauth"), + '$form_security_token' => get_form_security_token("oauth"), '$title' => t('Add application'), '$submit' => t('Submit'), '$cancel' => t('Cancel'), @@ -96,9 +119,9 @@ class Oauth { return $o; } - if((argc() > 3) && (argv(2) === 'edit')) { + if((argc() > 2) && (argv(1) === 'edit')) { $r = q("SELECT * FROM clients WHERE client_id='%s' AND uid=%d", - dbesc(argv(3)), + dbesc(argv(2)), local_channel()); if (!count($r)){ @@ -107,9 +130,9 @@ class Oauth { } $app = $r[0]; - $tpl = get_markup_template("settings_oauth_edit.tpl"); + $tpl = get_markup_template("oauth_edit.tpl"); $o .= replace_macros($tpl, array( - '$form_security_token' => get_form_security_token("settings_oauth"), + '$form_security_token' => get_form_security_token("oauth"), '$title' => t('Add application'), '$submit' => t('Update'), '$cancel' => t('Cancel'), @@ -122,13 +145,13 @@ class Oauth { return $o; } - if((argc() > 3) && (argv(2) === 'delete')) { - check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth', 't'); + if((argc() > 2) && (argv(1) === 'delete')) { + check_form_security_token_redirectOnErr('/oauth', 'oauth', 't'); $r = q("DELETE FROM clients WHERE client_id='%s' AND uid=%d", - dbesc(argv(3)), + dbesc(argv(2)), local_channel()); - goaway(z_root()."/settings/oauth/"); + goaway(z_root()."/oauth"); return; } @@ -141,11 +164,11 @@ class Oauth { local_channel()); - $tpl = get_markup_template("settings_oauth.tpl"); + $tpl = get_markup_template("oauth.tpl"); $o .= replace_macros($tpl, array( - '$form_security_token' => get_form_security_token("settings_oauth"), + '$form_security_token' => get_form_security_token("oauth"), '$baseurl' => z_root(), - '$title' => t('Connected Apps'), + '$title' => t('Connected OAuth Apps'), '$add' => t('Add application'), '$edit' => t('Edit'), '$delete' => t('Delete'), @@ -158,4 +181,4 @@ class Oauth { } -}
\ No newline at end of file +} diff --git a/Zotlabs/Module/Settings/Oauth2.php b/Zotlabs/Module/Oauth2.php index 70fd3a5c3..db2687b4c 100644 --- a/Zotlabs/Module/Settings/Oauth2.php +++ b/Zotlabs/Module/Oauth2.php @@ -1,15 +1,24 @@ <?php -namespace Zotlabs\Module\Settings; +namespace Zotlabs\Module; +use App; +use Zotlabs\Lib\Apps; +use Zotlabs\Web\Controller; -class Oauth2 { +class Oauth2 extends Controller { function post() { + + if(! local_channel()) + return; + + if(! Apps::system_app_installed(local_channel(), 'OAuth2 Apps Manager')) + return; if(x($_POST,'remove')){ - check_form_security_token_redirectOnErr('/settings/oauth2', 'settings_oauth2'); + check_form_security_token_redirectOnErr('oauth2', 'oauth2'); $name = ((x($_POST,'name')) ? escape_tags(trim($_POST['name'])) : ''); logger("REMOVE! ".$name." uid: ".local_channel()); $key = $_POST['remove']; @@ -25,13 +34,13 @@ class Oauth2 { dbesc($name), intval(local_channel()) ); - goaway(z_root()."/settings/oauth2/"); + goaway(z_root()."/oauth2"); return; } - if((argc() > 2) && (argv(2) === 'edit' || argv(2) === 'add') && x($_POST,'submit')) { + if((argc() > 1) && (argv(1) === 'edit' || argv(1) === 'add') && x($_POST,'submit')) { - check_form_security_token_redirectOnErr('/settings/oauth2', 'settings_oauth2'); + check_form_security_token_redirectOnErr('oauth2', 'oauth2'); $name = ((x($_POST,'name')) ? escape_tags(trim($_POST['name'])) : ''); $secret = ((x($_POST,'secret')) ? escape_tags(trim($_POST['secret'])) : ''); @@ -80,17 +89,29 @@ class Oauth2 { ); } } - goaway(z_root()."/settings/oauth2/"); + goaway(z_root()."/oauth2"); return; } } function get() { + + if(! local_channel()) + return; + + if(! Apps::system_app_installed(local_channel(), 'OAuth2 Apps Manager')) { + //Do not display any associated widgets at this point + App::$pdl = ''; + + $o = '<b>' . t('OAuth2 Apps Manager App') . ' (' . t('Not Installed') . '):</b><br>'; + $o .= t('OAuth2 authenticatication tokens for mobile and remote apps'); + return $o; + } - if((argc() > 2) && (argv(2) === 'add')) { - $tpl = get_markup_template("settings_oauth2_edit.tpl"); + if((argc() > 1) && (argv(1) === 'add')) { + $tpl = get_markup_template("oauth2_edit.tpl"); $o .= replace_macros($tpl, array( - '$form_security_token' => get_form_security_token("settings_oauth2"), + '$form_security_token' => get_form_security_token("oauth2"), '$title' => t('Add OAuth2 application'), '$submit' => t('Submit'), '$cancel' => t('Cancel'), @@ -103,9 +124,9 @@ class Oauth2 { return $o; } - if((argc() > 3) && (argv(2) === 'edit')) { + if((argc() > 2) && (argv(1) === 'edit')) { $r = q("SELECT * FROM oauth_clients WHERE client_id='%s' AND user_id= %d", - dbesc(argv(3)), + dbesc(argv(2)), intval(local_channel()) ); @@ -116,9 +137,9 @@ class Oauth2 { $app = $r[0]; - $tpl = get_markup_template("settings_oauth2_edit.tpl"); + $tpl = get_markup_template("oauth2_edit.tpl"); $o .= replace_macros($tpl, array( - '$form_security_token' => get_form_security_token("settings_oauth2"), + '$form_security_token' => get_form_security_token("oauth2"), '$title' => t('Add application'), '$submit' => t('Update'), '$cancel' => t('Cancel'), @@ -131,26 +152,26 @@ class Oauth2 { return $o; } - if((argc() > 3) && (argv(2) === 'delete')) { - check_form_security_token_redirectOnErr('/settings/oauth2', 'settings_oauth2', 't'); + if((argc() > 2) && (argv(1) === 'delete')) { + check_form_security_token_redirectOnErr('oauth2', 'oauth2', 't'); $r = q("DELETE FROM oauth_clients WHERE client_id = '%s' AND user_id = %d", - dbesc(argv(3)), + dbesc(argv(2)), intval(local_channel()) ); $r = q("DELETE FROM oauth_access_tokens WHERE client_id = '%s' AND user_id = %d", - dbesc(argv(3)), + dbesc(argv(2)), intval(local_channel()) ); $r = q("DELETE FROM oauth_authorization_codes WHERE client_id = '%s' AND user_id = %d", - dbesc(argv(3)), + dbesc(argv(2)), intval(local_channel()) ); $r = q("DELETE FROM oauth_refresh_tokens WHERE client_id = '%s' AND user_id = %d", - dbesc(argv(3)), + dbesc(argv(2)), intval(local_channel()) ); - goaway(z_root()."/settings/oauth2/"); + goaway(z_root()."/oauth2"); return; } @@ -164,9 +185,9 @@ class Oauth2 { intval(local_channel()) ); - $tpl = get_markup_template("settings_oauth2.tpl"); + $tpl = get_markup_template("oauth2.tpl"); $o .= replace_macros($tpl, array( - '$form_security_token' => get_form_security_token("settings_oauth2"), + '$form_security_token' => get_form_security_token("oauth2"), '$baseurl' => z_root(), '$title' => t('Connected OAuth2 Apps'), '$add' => t('Add application'), diff --git a/Zotlabs/Module/Pdledit.php b/Zotlabs/Module/Pdledit.php index 9b86b599b..5cedb29a8 100644 --- a/Zotlabs/Module/Pdledit.php +++ b/Zotlabs/Module/Pdledit.php @@ -1,15 +1,20 @@ <?php namespace Zotlabs\Module; +use App; +use Zotlabs\Web\Controller; +use Zotlabs\Lib\Apps; -class Pdledit extends \Zotlabs\Web\Controller { +class Pdledit extends Controller { function post() { if(! local_channel()) return; - if(! $_REQUEST['module']) + + if(! Apps::system_app_installed(local_channel(), 'PDL Editor')) return; - if(! feature_enabled(local_channel(),'advanced_theming')) + + if(! $_REQUEST['module']) return; if(! trim($_REQUEST['content'])) { @@ -30,9 +35,13 @@ class Pdledit extends \Zotlabs\Web\Controller { return; } - if(! feature_enabled(local_channel(),'advanced_theming')) { - notice( t('Feature disabled.') . EOL); - return; + if(! Apps::system_app_installed(local_channel(), 'PDL Editor')) { + //Do not display any associated widgets at this point + App::$pdl = ''; + + $o = '<b>' . t('PDL Editor App') . ' (' . t('Not Installed') . '):</b><br>'; + $o .= t('Provides the ability to edit system page layouts'); + return $o; } if(argc() > 2 && argv(2) === 'reset') { diff --git a/Zotlabs/Module/Settings/Permcats.php b/Zotlabs/Module/Permcats.php index 40641c3f2..75ac2ac87 100644 --- a/Zotlabs/Module/Settings/Permcats.php +++ b/Zotlabs/Module/Permcats.php @@ -1,26 +1,31 @@ <?php -namespace Zotlabs\Module\Settings; +namespace Zotlabs\Module; +use App; +use Zotlabs\Web\Controller; +use Zotlabs\Lib\Apps; - -class Permcats { +class Permcats extends Controller { function post() { if(! local_channel()) return; - $channel = \App::get_channel(); + if(! Apps::system_app_installed(local_channel(), 'Permission Categories')) + return; + + $channel = App::get_channel(); - check_form_security_token_redirectOnErr('/settings/permcats', 'settings_permcats'); + check_form_security_token_redirectOnErr('/permcats', 'permcats'); $all_perms = \Zotlabs\Access\Permissions::Perms(); $name = escape_tags(trim($_POST['name'])); if(! $name) { - notice( t('Permission Name is required.') . EOL); + notice( t('Permission category name is required.') . EOL); return; } @@ -50,13 +55,21 @@ class Permcats { if(! local_channel()) return; - $channel = \App::get_channel(); + if(! Apps::system_app_installed(local_channel(), 'Permission Categories')) { + //Do not display any associated widgets at this point + App::$pdl = ''; + + $o = '<b>' . t('Permission Categories App') . ' (' . t('Not Installed') . '):</b><br>'; + $o .= t('Create custom connection permission limits'); + return $o; + } + $channel = App::get_channel(); - if(argc() > 2) - $name = hex2bin(argv(2)); + if(argc() > 1) + $name = hex2bin(argv(1)); - if(argc() > 3 && argv(3) === 'drop') { + if(argc() > 2 && argv(2) === 'drop') { \Zotlabs\Lib\Permcat::delete(local_channel(),$name); build_sync_packet(); json_return_and_die([ 'success' => true ]); @@ -93,9 +106,9 @@ class Permcats { - $tpl = get_markup_template("settings_permcats.tpl"); + $tpl = get_markup_template("permcats.tpl"); $o .= replace_macros($tpl, array( - '$form_security_token' => get_form_security_token("settings_permcats"), + '$form_security_token' => get_form_security_token("permcats"), '$title' => t('Permission Categories'), '$desc' => $desc, '$desc2' => $desc2, @@ -104,7 +117,7 @@ class Permcats { '$atoken' => $atoken, '$url1' => z_root() . '/channel/' . $channel['channel_address'], '$url2' => z_root() . '/photos/' . $channel['channel_address'], - '$name' => array('name', t('Permission Name') . ' <span class="required">*</span>', (($name) ? $name : ''), ''), + '$name' => array('name', t('Permission category name') . ' <span class="required">*</span>', (($name) ? $name : ''), ''), '$me' => t('My Settings'), '$perms' => $perms, '$inherited' => t('inherited'), diff --git a/Zotlabs/Module/Poke.php b/Zotlabs/Module/Poke.php index 46dcf6dd3..1f1edfa18 100644 --- a/Zotlabs/Module/Poke.php +++ b/Zotlabs/Module/Poke.php @@ -162,7 +162,7 @@ class Poke extends Controller { //Do not display any associated widgets at this point App::$pdl = ''; - $o = '<b>Poke App (Not Installed):</b><br>'; + $o = '<b>' . t('Poke App') . ' (' . t('Not Installed') . '):</b><br>'; $o .= t('Poke somebody in your addressbook'); return $o; } diff --git a/Zotlabs/Module/Pubstream.php b/Zotlabs/Module/Pubstream.php index 7b80a3978..19cb72b5b 100644 --- a/Zotlabs/Module/Pubstream.php +++ b/Zotlabs/Module/Pubstream.php @@ -81,7 +81,7 @@ class Pubstream extends \Zotlabs\Web\Controller { ); $o = '<div id="jot-popup">'; - $o .= status_editor($a,$x); + $o .= status_editor($a,$x,false,'Pubstream'); $o .= '</div>'; } diff --git a/Zotlabs/Module/Register.php b/Zotlabs/Module/Register.php index 3dded19c7..f9d81be0c 100644 --- a/Zotlabs/Module/Register.php +++ b/Zotlabs/Module/Register.php @@ -227,11 +227,6 @@ class Register extends \Zotlabs\Web\Controller { $perm_roles = \Zotlabs\Access\PermissionRoles::roles(); - // A new account will not have a techlevel, but accounts can also be created by the administrator. - - if((get_account_techlevel() < 4) && $privacy_role !== 'custom') - unset($perm_roles[t('Other')]); - // Configurable terms of service link $tosurl = get_config('system','tos_url'); diff --git a/Zotlabs/Module/Rpost.php b/Zotlabs/Module/Rpost.php index 86ee296ec..f03dae2bf 100644 --- a/Zotlabs/Module/Rpost.php +++ b/Zotlabs/Module/Rpost.php @@ -138,7 +138,7 @@ class Rpost extends \Zotlabs\Web\Controller { 'jotnets' => true ); - $editor = status_editor($a,$x); + $editor = status_editor($a,$x,false,'Rpost'); $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( '$title' => t('Edit post'), diff --git a/Zotlabs/Module/Settings/Account.php b/Zotlabs/Module/Settings/Account.php index 9643c5958..b40f516ca 100644 --- a/Zotlabs/Module/Settings/Account.php +++ b/Zotlabs/Module/Settings/Account.php @@ -12,7 +12,6 @@ class Account { $errs = array(); $email = ((x($_POST,'email')) ? trim(notags($_POST['email'])) : ''); - $techlevel = ((array_key_exists('techlevel',$_POST)) ? intval($_POST['techlevel']) : 0); $account = \App::get_account(); if($email != $account['account_email']) { @@ -32,13 +31,6 @@ class Account { $errs[] = t('System failure storing new email. Please try again.'); } } - if($techlevel != $account['account_level']) { - $r = q("update account set account_level = %d where account_id = %d", - intval($techlevel), - intval($account['account_id']) - ); - info( t('Technical skill level updated') . EOL); - } if($errs) { foreach($errs as $err) @@ -101,11 +93,6 @@ class Account { $email = \App::$account['account_email']; - $techlevels = \Zotlabs\Lib\Techlevels::levels(); - - $def_techlevel = \App::$account['account_level']; - $techlock = get_config('system','techlevel_lock'); - $tpl = get_markup_template("settings_account.tpl"); $o .= replace_macros($tpl, array( '$form_security_token' => get_form_security_token("settings_account"), @@ -113,8 +100,6 @@ class Account { '$origpass' => array('origpass', t('Current Password'), ' ',''), '$password1'=> array('npassword', t('Enter New Password'), '', ''), '$password2'=> array('confirm', t('Confirm New Password'), '', t('Leave password fields blank unless changing')), - '$techlevel' => [ 'techlevel', t('Your technical skill level'), $def_techlevel, t('Used to provide a member experience and additional features consistent with your comfort level'), $techlevels ], - '$techlock' => $techlock, '$submit' => t('Submit'), '$email' => array('email', t('Email Address:'), $email, ''), '$removeme' => t('Remove Account'), diff --git a/Zotlabs/Module/Settings/Calendar.php b/Zotlabs/Module/Settings/Calendar.php index b3a611cdf..a27bf0fa5 100644 --- a/Zotlabs/Module/Settings/Calendar.php +++ b/Zotlabs/Module/Settings/Calendar.php @@ -16,6 +16,10 @@ class Calendar { process_module_features_post(local_channel(), $features, $_POST); build_sync_packet(); + + if($_POST['rpath']) + goaway($_POST['rpath']); + return; } diff --git a/Zotlabs/Module/Settings/Channel.php b/Zotlabs/Module/Settings/Channel.php index 27a8e695d..6b49f165d 100644 --- a/Zotlabs/Module/Settings/Channel.php +++ b/Zotlabs/Module/Settings/Channel.php @@ -2,6 +2,8 @@ namespace Zotlabs\Module\Settings; +use Zotlabs\Lib\Apps; + require_once('include/selectors.php'); @@ -63,7 +65,7 @@ class Channel { } $hide_presence = 1 - (intval($role_permissions['online'])); if($role_permissions['default_collection']) { - $r = q("select hash from groups where uid = %d and gname = '%s' limit 1", + $r = q("select hash from pgrp where uid = %d and gname = '%s' limit 1", intval(local_channel()), dbesc( t('Friends') ) ); @@ -71,7 +73,7 @@ class Channel { require_once('include/group.php'); group_add(local_channel(), t('Friends')); group_add_member(local_channel(),t('Friends'),$channel['channel_hash']); - $r = q("select hash from groups where uid = %d and gname = '%s' limit 1", + $r = q("select hash from pgrp where uid = %d and gname = '%s' limit 1", intval(local_channel()), dbesc( t('Friends') ) ); @@ -432,7 +434,7 @@ class Channel { '$nickname' => (($intl_nickname === $webbie) ? $webbie : $intl_nickname . ' (' . $webbie . ')'), '$subdir' => $subdir, '$davdesc' => t('Your files/photos are accessible via WebDAV at'), - '$davpath' => ((get_account_techlevel() > 3) ? z_root() . '/dav/' . $nickname : ''), + '$davpath' => z_root() . '/dav/' . $nickname, '$basepath' => \App::get_hostname() )); @@ -490,11 +492,6 @@ class Channel { $permissions_set = (($permissions_role != 'custom') ? true : false); $perm_roles = \Zotlabs\Access\PermissionRoles::roles(); - if((get_account_techlevel() < 4) && $permissions_role !== 'custom') - unset($perm_roles[t('Other')]); - - - $vnotify = get_pconfig(local_channel(),'system','vnotify'); $always_show_in_notices = get_pconfig(local_channel(),'system','always_show_in_notices'); @@ -556,8 +553,8 @@ class Channel { '$suggestme' => $suggestme, '$group_select' => $group_select, '$role' => array('permissions_role' , t('Channel role and privacy'), $permissions_role, '', $perm_roles), - '$defpermcat' => [ 'defpermcat', t('Default Permissions Group'), $default_permcat, '', $permcats ], - '$permcat_enable' => feature_enabled(local_channel(),'permcats'), + '$defpermcat' => [ 'defpermcat', t('Default permissions category'), $default_permcat, '', $permcats ], + '$permcat_enable' => Apps::system_app_installed(local_channel(), 'Permission Categories'), '$profile_in_dir' => $profile_in_dir, '$hide_friends' => $hide_friends, '$hide_wall' => $hide_wall, diff --git a/Zotlabs/Module/Settings/Channel_home.php b/Zotlabs/Module/Settings/Channel_home.php new file mode 100644 index 000000000..0e916d530 --- /dev/null +++ b/Zotlabs/Module/Settings/Channel_home.php @@ -0,0 +1,67 @@ +<?php + +namespace Zotlabs\Module\Settings; + + +class Channel_home { + + function post() { + + $module = substr(strrchr(strtolower(static::class), '\\'), 1); + + check_form_security_token_redirectOnErr('/settings/' . $module, 'settings_' . $module); + + $features = get_module_features($module); + + process_module_features_post(local_channel(), $features, $_POST); + + $channel_divmore_height = ((x($_POST,'channel_divmore_height')) ? intval($_POST['channel_divmore_height']) : 400); + if($channel_divmore_height < 50) + $channel_divmore_height = 50; + + set_pconfig(local_channel(),'system','channel_divmore_height', $channel_divmore_height); + + build_sync_packet(); + + if($_POST['rpath']) + goaway($_POST['rpath']); + + return; + } + + function get() { + + $module = substr(strrchr(strtolower(static::class), '\\'), 1); + + $features = get_module_features($module); + $rpath = (($_GET['rpath']) ? $_GET['rpath'] : ''); + + $channel_divmore_height = [ + 'channel_divmore_height', + t('Max height of content (in pixels)'), + ((get_pconfig(local_channel(),'system','channel_divmore_height')) ? get_pconfig(local_channel(),'system','channel_divmore_height') : 400), + t('Click to expand content exceeding this height') + ]; + + $extra_settings_html = replace_macros(get_markup_template('field_input.tpl'), + [ + '$field' => $channel_divmore_height + ] + ); + + $tpl = get_markup_template("settings_module.tpl"); + + $o .= replace_macros($tpl, array( + '$rpath' => $rpath, + '$action_url' => 'settings/' . $module, + '$form_security_token' => get_form_security_token('settings_' . $module), + '$title' => t('Channel Home Settings'), + '$features' => process_module_features_get(local_channel(), $features), + '$extra_settings_html' => $extra_settings_html, + '$submit' => t('Submit') + )); + + return $o; + } + +} diff --git a/Zotlabs/Module/Settings/Connections.php b/Zotlabs/Module/Settings/Connections.php index 70b4daa42..cac357791 100644 --- a/Zotlabs/Module/Settings/Connections.php +++ b/Zotlabs/Module/Settings/Connections.php @@ -16,6 +16,10 @@ class Connections { process_module_features_post(local_channel(), $features, $_POST); build_sync_packet(); + + if($_POST['rpath']) + goaway($_POST['rpath']); + return; } diff --git a/Zotlabs/Module/Settings/Conversation.php b/Zotlabs/Module/Settings/Conversation.php new file mode 100644 index 000000000..43e59a3c2 --- /dev/null +++ b/Zotlabs/Module/Settings/Conversation.php @@ -0,0 +1,60 @@ +<?php + +namespace Zotlabs\Module\Settings; + + +class Conversation { + + function post() { + + $module = substr(strrchr(strtolower(static::class), '\\'), 1); + + check_form_security_token_redirectOnErr('/settings/' . $module, 'settings_' . $module); + + $features = get_module_features($module); + + process_module_features_post(local_channel(), $features, $_POST); + + build_sync_packet(); + + if($_POST['aj']) { + if($_POST['auto_update'] == 1) + info(t('Settings saved.') . EOL); + else + info(t('Settings saved. Reload page please.') . EOL); + + killme(); + } + else { + return; + } + } + + function get() { + + $aj = ((isset($_GET['aj'])) ? true : false); + + $module = substr(strrchr(strtolower(static::class), '\\'), 1); + + $features = get_module_features($module); + + $tpl = (($aj) ? get_markup_template("settings_module_ajax.tpl") : get_markup_template("settings_module.tpl")); + + $o .= replace_macros($tpl, array( + '$action_url' => 'settings/' . $module, + '$form_security_token' => get_form_security_token('settings_' . $module), + '$title' => t('Conversation Settings'), + '$features' => process_module_features_get(local_channel(), $features), + '$submit' => t('Submit') + )); + + if($aj) { + echo $o; + killme(); + } + else { + return $o; + } + } + +} diff --git a/Zotlabs/Module/Settings/Directory.php b/Zotlabs/Module/Settings/Directory.php new file mode 100644 index 000000000..13fe6eb79 --- /dev/null +++ b/Zotlabs/Module/Settings/Directory.php @@ -0,0 +1,47 @@ +<?php + +namespace Zotlabs\Module\Settings; + + +class Directory { + + function post() { + + $module = substr(strrchr(strtolower(static::class), '\\'), 1); + + check_form_security_token_redirectOnErr('/settings/' . $module, 'settings_' . $module); + + $features = get_module_features($module); + + process_module_features_post(local_channel(), $features, $_POST); + + build_sync_packet(); + + if($_POST['rpath']) + goaway($_POST['rpath']); + + return; + } + + function get() { + + $module = substr(strrchr(strtolower(static::class), '\\'), 1); + + $features = get_module_features($module); + $rpath = (($_GET['rpath']) ? $_GET['rpath'] : ''); + + $tpl = get_markup_template("settings_module.tpl"); + + $o .= replace_macros($tpl, array( + '$rpath' => $rpath, + '$action_url' => 'settings/' . $module, + '$form_security_token' => get_form_security_token('settings_' . $module), + '$title' => t('Directory Settings'), + '$features' => process_module_features_get(local_channel(), $features), + '$submit' => t('Submit') + )); + + return $o; + } + +} diff --git a/Zotlabs/Module/Settings/Display.php b/Zotlabs/Module/Settings/Display.php index 340b3c0bb..45d80e011 100644 --- a/Zotlabs/Module/Settings/Display.php +++ b/Zotlabs/Module/Settings/Display.php @@ -27,16 +27,8 @@ class Display { $user_scalable = ((x($_POST,'user_scalable')) ? intval($_POST['user_scalable']) : 0); $nosmile = ((x($_POST,'nosmile')) ? intval($_POST['nosmile']) : 0); $title_tosource = ((x($_POST,'title_tosource')) ? intval($_POST['title_tosource']) : 0); - $channel_list_mode = ((x($_POST,'channel_list_mode')) ? intval($_POST['channel_list_mode']) : 0); - $network_list_mode = ((x($_POST,'network_list_mode')) ? intval($_POST['network_list_mode']) : 0); $manual_update = ((array_key_exists('manual_update',$_POST)) ? intval($_POST['manual_update']) : 0); - - $channel_divmore_height = ((x($_POST,'channel_divmore_height')) ? intval($_POST['channel_divmore_height']) : 400); - if($channel_divmore_height < 50) - $channel_divmore_height = 50; - $network_divmore_height = ((x($_POST,'network_divmore_height')) ? intval($_POST['network_divmore_height']) : 400); - if($network_divmore_height < 50) - $network_divmore_height = 50; + $start_menu = ((x($_POST,'start_menu')) ? intval($_POST['start_menu']) : 0); $browser_update = ((x($_POST,'browser_update')) ? intval($_POST['browser_update']) : 0); $browser_update = $browser_update * 1000; @@ -54,12 +46,9 @@ class Display { set_pconfig(local_channel(),'system','itemspage', $itemspage); set_pconfig(local_channel(),'system','no_smilies',1-intval($nosmile)); set_pconfig(local_channel(),'system','title_tosource',$title_tosource); - set_pconfig(local_channel(),'system','channel_list_mode', $channel_list_mode); - set_pconfig(local_channel(),'system','network_list_mode', $network_list_mode); - set_pconfig(local_channel(),'system','channel_divmore_height', $channel_divmore_height); - set_pconfig(local_channel(),'system','network_divmore_height', $network_divmore_height); set_pconfig(local_channel(),'system','manual_conversation_update', $manual_update); set_pconfig(local_channel(),'system','channel_menu', $channel_menu); + set_pconfig(local_channel(),'system','start_menu', $start_menu); $newschema = ''; if($theme){ @@ -150,6 +139,14 @@ class Display { $theme_selected = explode(':', $theme_selected)[0]; } + $account = \App::get_account(); + + if($account['account_created'] > datetime_convert('','','now - 60 days')) { + $start_menu = get_pconfig(local_channel(), 'system', 'start_menu', 1); + } + else { + $start_menu = get_pconfig(local_channel(), 'system', 'start_menu', 0); + } $preload_images = get_pconfig(local_channel(),'system','preload_images'); $preload_images = (($preload_images===false)? '0': $preload_images); // default if not set: 0 @@ -204,15 +201,8 @@ class Display { '$channel_menu' => [ 'channel_menu', t('Provide channel menu in navigation bar'), get_pconfig(local_channel(),'system','channel_menu',get_config('system','channel_menu',0)), t('Default: channel menu located in app menu'),$yes_no ], '$manual_update' => array('manual_update', t('Manual conversation updates'), channel_manual_conv_update(local_channel()), t('Default is on, turning this off may increase screen jumping'), $yes_no), '$title_tosource' => array('title_tosource', t("Link post titles to source"), $title_tosource, '', $yes_no), - '$layout_editor' => t('System Page Layout Editor - (advanced)'), '$theme_config' => $theme_config, - '$expert' => feature_enabled(local_channel(),'advanced_theming'), - '$channel_list_mode' => array('channel_list_mode', t('Use blog/list mode on channel page'), get_pconfig(local_channel(),'system','channel_list_mode'), t('(comments displayed separately)'), $yes_no), - '$network_list_mode' => array('network_list_mode', t('Use blog/list mode on grid page'), get_pconfig(local_channel(),'system','network_list_mode'), t('(comments displayed separately)'), $yes_no), - '$channel_divmore_height' => array('channel_divmore_height', t('Channel page max height of content (in pixels)'), ((get_pconfig(local_channel(),'system','channel_divmore_height')) ? get_pconfig(local_channel(),'system','channel_divmore_height') : 400), t('click to expand content exceeding this height')), - '$network_divmore_height' => array('network_divmore_height', t('Grid page max height of content (in pixels)'), ((get_pconfig(local_channel(),'system','network_divmore_height')) ? get_pconfig(local_channel(),'system','network_divmore_height') : 400) , t('click to expand content exceeding this height')), - - + '$start_menu' => ['start_menu', t('New Member Links'), $start_menu, t('Display new member quick links menu'), $yes_no] )); call_hooks('display_settings',$o); diff --git a/Zotlabs/Module/Settings/Editor.php b/Zotlabs/Module/Settings/Editor.php index 93e3ce602..5e7a9473a 100644 --- a/Zotlabs/Module/Settings/Editor.php +++ b/Zotlabs/Module/Settings/Editor.php @@ -16,6 +16,10 @@ class Editor { process_module_features_post(local_channel(), $features, $_POST); build_sync_packet(); + + if($_POST['rpath']) + goaway($_POST['rpath']); + return; } diff --git a/Zotlabs/Module/Settings/Events.php b/Zotlabs/Module/Settings/Events.php index fcb4441e1..eb6dda99b 100644 --- a/Zotlabs/Module/Settings/Events.php +++ b/Zotlabs/Module/Settings/Events.php @@ -16,6 +16,10 @@ class Events { process_module_features_post(local_channel(), $features, $_POST); build_sync_packet(); + + if($_POST['rpath']) + goaway($_POST['rpath']); + return; } diff --git a/Zotlabs/Module/Settings/Features.php b/Zotlabs/Module/Settings/Features.php index 888032c28..6a3ab104b 100644 --- a/Zotlabs/Module/Settings/Features.php +++ b/Zotlabs/Module/Settings/Features.php @@ -26,44 +26,14 @@ class Features { function get() { $arr = []; - $harr = []; - if(intval($_REQUEST['techlevel'])) - $level = intval($_REQUEST['techlevel']); - else { - $level = get_account_techlevel(); - } - - if(! intval($level)) { - notice( t('Permission denied.') . EOL); - return; - } - - $techlevels = \Zotlabs\Lib\Techlevels::levels(); - - // This page isn't accessible at techlevel 0 - - unset($techlevels[0]); - - $def_techlevel = (($level > 0) ? $level : 1); - $techlock = get_config('system','techlevel_lock'); - - $all_features_raw = get_features(false); - - foreach($all_features_raw as $fname => $fdata) { - foreach(array_slice($fdata,1) as $f) { - $harr[$f[0]] = ((intval(feature_enabled(local_channel(),$f[0]))) ? "1" : ''); - } - } - - $features = get_features(true,$level); + $features = get_features(false); foreach($features as $fname => $fdata) { $arr[$fname] = array(); $arr[$fname][0] = $fdata[0]; foreach(array_slice($fdata,1) as $f) { $arr[$fname][1][] = array('feature_' . $f[0],$f[1],((intval(feature_enabled(local_channel(),$f[0]))) ? "1" : ''),$f[2],array(t('Off'),t('On'))); - unset($harr[$f[0]]); } } @@ -71,10 +41,7 @@ class Features { $o .= replace_macros($tpl, array( '$form_security_token' => get_form_security_token("settings_features"), '$title' => t('Additional Features'), - '$techlevel' => [ 'techlevel', t('Your technical skill level'), $def_techlevel, t('Used to provide a member experience and additional features consistent with your comfort level'), $techlevels ], - '$techlock' => $techlock, '$features' => $arr, - '$hiddens' => $harr, '$baseurl' => z_root(), '$submit' => t('Submit'), )); diff --git a/Zotlabs/Module/Settings/Manage.php b/Zotlabs/Module/Settings/Manage.php index 15d3216e9..9bae12022 100644 --- a/Zotlabs/Module/Settings/Manage.php +++ b/Zotlabs/Module/Settings/Manage.php @@ -16,6 +16,10 @@ class Manage { process_module_features_post(local_channel(), $features, $_POST); build_sync_packet(); + + if($_POST['rpath']) + goaway($_POST['rpath']); + return; } diff --git a/Zotlabs/Module/Settings/Network.php b/Zotlabs/Module/Settings/Network.php index c51b780f1..aaafe9255 100644 --- a/Zotlabs/Module/Settings/Network.php +++ b/Zotlabs/Module/Settings/Network.php @@ -14,8 +14,18 @@ class Network { $features = get_module_features($module); process_module_features_post(local_channel(), $features, $_POST); + + $network_divmore_height = ((x($_POST,'network_divmore_height')) ? intval($_POST['network_divmore_height']) : 400); + if($network_divmore_height < 50) + $network_divmore_height = 50; + + set_pconfig(local_channel(),'system','network_divmore_height', $network_divmore_height); build_sync_packet(); + + if($_POST['rpath']) + goaway($_POST['rpath']); + return; } @@ -26,6 +36,19 @@ class Network { $features = get_module_features($module); $rpath = (($_GET['rpath']) ? $_GET['rpath'] : ''); + $network_divmore_height = [ + 'network_divmore_height', + t('Max height of content (in pixels)'), + ((get_pconfig(local_channel(),'system','network_divmore_height')) ? get_pconfig(local_channel(),'system','network_divmore_height') : 400), + t('Click to expand content exceeding this height') + ]; + + $extra_settings_html = replace_macros(get_markup_template('field_input.tpl'), + [ + '$field' => $network_divmore_height + ] + ); + $tpl = get_markup_template("settings_module.tpl"); $o .= replace_macros($tpl, array( @@ -33,8 +56,9 @@ class Network { '$action_url' => 'settings/' . $module, '$form_security_token' => get_form_security_token('settings_' . $module), '$title' => t('Activity Settings'), - '$features' => process_module_features_get(local_channel(), $features), - '$submit' => t('Submit') + '$features' => process_module_features_get(local_channel(), $features), + '$extra_settings_html' => $extra_settings_html, + '$submit' => t('Submit') )); return $o; diff --git a/Zotlabs/Module/Settings/Photos.php b/Zotlabs/Module/Settings/Photos.php index f403b4d38..9edbaa929 100644 --- a/Zotlabs/Module/Settings/Photos.php +++ b/Zotlabs/Module/Settings/Photos.php @@ -16,6 +16,10 @@ class Photos { process_module_features_post(local_channel(), $features, $_POST); build_sync_packet(); + + if($_POST['rpath']) + goaway($_POST['rpath']); + return; } diff --git a/Zotlabs/Module/Settings/Profiles.php b/Zotlabs/Module/Settings/Profiles.php index 78dc0160e..2dc037317 100644 --- a/Zotlabs/Module/Settings/Profiles.php +++ b/Zotlabs/Module/Settings/Profiles.php @@ -16,6 +16,10 @@ class Profiles { process_module_features_post(local_channel(), $features, $_POST); build_sync_packet(); + + if($_POST['rpath']) + goaway($_POST['rpath']); + return; } diff --git a/Zotlabs/Module/Sources.php b/Zotlabs/Module/Sources.php index 5d05244a7..e535f6ebf 100644 --- a/Zotlabs/Module/Sources.php +++ b/Zotlabs/Module/Sources.php @@ -85,7 +85,7 @@ class Sources extends Controller { //Do not display any associated widgets at this point App::$pdl = ''; - $o = '<b>Sources App (Not Installed):</b><br>'; + $o = '<b>' . t('Sources App') . ' (' . t('Not Installed') . '):</b><br>'; $o .= t('Automatically import channel content from other channels or feeds'); return $o; } diff --git a/Zotlabs/Module/Settings/Tokens.php b/Zotlabs/Module/Tokens.php index e59cf8d1c..1ba41dcc5 100644 --- a/Zotlabs/Module/Settings/Tokens.php +++ b/Zotlabs/Module/Tokens.php @@ -1,16 +1,24 @@ <?php -namespace Zotlabs\Module\Settings; +namespace Zotlabs\Module; +use App; +use Zotlabs\Web\Controller; +use Zotlabs\Lib\Apps; - -class Tokens { +class Tokens extends Controller { function post() { - $channel = \App::get_channel(); + if(! local_channel()) + return; + + if(! Apps::system_app_installed(local_channel(), 'Guest Access')) + return; + + $channel = App::get_channel(); - check_form_security_token_redirectOnErr('/settings/tokens', 'settings_tokens'); + check_form_security_token_redirectOnErr('tokens', 'tokens'); $token_errs = 0; if(array_key_exists('token',$_POST)) { $atoken_id = (($_POST['atoken_id']) ? intval($_POST['atoken_id']) : 0); @@ -81,13 +89,25 @@ class Tokens { function get() { - $channel = \App::get_channel(); + if(! local_channel()) + return; + + if(! Apps::system_app_installed(local_channel(), 'Guest Access')) { + //Do not display any associated widgets at this point + App::$pdl = ''; + + $o = '<b>' . t('Guest Access App') . ' (' . t('Not Installed') . '):</b><br>'; + $o .= t('Create access tokens so that non-members can access private content'); + return $o; + } + + $channel = App::get_channel(); $atoken = null; $atoken_xchan = ''; - if(argc() > 2) { - $id = argv(2); + if(argc() > 1) { + $id = argv(1); $atoken = q("select * from atoken where atoken_id = %d and atoken_uid = %d", intval($id), @@ -99,7 +119,7 @@ class Tokens { $atoken_xchan = substr($channel['channel_hash'],0,16) . '.' . $atoken['atoken_name']; } - if($atoken && argc() > 3 && argv(3) === 'drop') { + if($atoken && argc() > 2 && argv(2) === 'drop') { atoken_delete($id); $atoken = null; $atoken_xchan = ''; @@ -144,9 +164,9 @@ class Tokens { - $tpl = get_markup_template("settings_tokens.tpl"); + $tpl = get_markup_template("tokens.tpl"); $o .= replace_macros($tpl, array( - '$form_security_token' => get_form_security_token("settings_tokens"), + '$form_security_token' => get_form_security_token("tokens"), '$title' => t('Guest Access Tokens'), '$desc' => $desc, '$desc2' => $desc2, diff --git a/Zotlabs/Module/Uexport.php b/Zotlabs/Module/Uexport.php index 9af1887dc..3d1587b87 100644 --- a/Zotlabs/Module/Uexport.php +++ b/Zotlabs/Module/Uexport.php @@ -1,18 +1,24 @@ <?php namespace Zotlabs\Module; +use App; +use Zotlabs\Lib\Apps; +use Zotlabs\Web\Controller; -class Uexport extends \Zotlabs\Web\Controller { +class Uexport extends Controller { function init() { if(! local_channel()) killme(); - + + if(! Apps::system_app_installed(local_channel(), 'Channel Export')) + return; + if(argc() > 1) { $sections = (($_REQUEST['sections']) ? explode(',',$_REQUEST['sections']) : ''); - $channel = \App::get_channel(); + $channel = App::get_channel(); if(argc() > 1 && intval(argv(1)) > 1900) { $year = intval(argv(1)); @@ -47,6 +53,15 @@ class Uexport extends \Zotlabs\Web\Controller { } function get() { + + if(! Apps::system_app_installed(local_channel(), 'Channel Export')) { + //Do not display any associated widgets at this point + App::$pdl = ''; + + $o = '<b>' . t('Channel Export App') . ' (' . t('Not Installed') . '):</b><br>'; + $o .= t('Export your channel'); + return $o; + } $y = datetime_convert('UTC',date_default_timezone_get(),'now','Y'); diff --git a/Zotlabs/Module/Webpages.php b/Zotlabs/Module/Webpages.php index c6599db3b..787ed5850 100644 --- a/Zotlabs/Module/Webpages.php +++ b/Zotlabs/Module/Webpages.php @@ -45,7 +45,7 @@ class Webpages extends Controller { //Do not display any associated widgets at this point App::$pdl = ''; - $o = '<b>Webpages App (Not Installed):</b><br>'; + $o = '<b>' . t('Webpages App') . ' (' . t('Not Installed') . '):</b><br>'; $o .= t('Provide managed web pages on your channel'); return $o; } @@ -208,7 +208,7 @@ class Webpages extends Controller { if(! $r) $x['pagetitle'] = 'home'; - $editor = status_editor($a,$x); + $editor = status_editor($a,$x,false,'Webpages'); $pages = null; diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index 0fb5a4605..6be39214e 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -49,7 +49,7 @@ class Wiki extends Controller { //Do not display any associated widgets at this point App::$pdl = ''; - $o = '<b>Wiki App (Not Installed):</b><br>'; + $o = '<b>' . t('Wiki App') . ' (' . t('Not Installed') . '):</b><br>'; $o .= t('Provide a wiki for your channel'); return $o; } diff --git a/Zotlabs/Update/_1221.php b/Zotlabs/Update/_1221.php new file mode 100644 index 000000000..75b400adc --- /dev/null +++ b/Zotlabs/Update/_1221.php @@ -0,0 +1,25 @@ +<?php + +namespace Zotlabs\Update; + +class _1221 { + + function run() { + + q("START TRANSACTION"); + + $r1 = q("ALTER table " . TQUOT . 'groups' . TQUOT . " rename to pgrp "); + $r2 = q("ALTER table " . TQUOT . 'group_member' . TQUOT . " rename to pgrp_member "); + + + if($r1 && $r2) { + q("COMMIT"); + return UPDATE_SUCCESS; + } + + q("ROLLBACK"); + return UPDATE_FAILED; + + } + +} diff --git a/Zotlabs/Widget/Activity_filter.php b/Zotlabs/Widget/Activity_filter.php index d725f8b55..c27a5d48b 100644 --- a/Zotlabs/Widget/Activity_filter.php +++ b/Zotlabs/Widget/Activity_filter.php @@ -2,6 +2,8 @@ namespace Zotlabs\Widget; +use Zotlabs\Lib\Apps; + class Activity_filter { function widget($arr) { @@ -44,8 +46,8 @@ class Activity_filter { ]; } - if(feature_enabled(local_channel(),'groups')) { - $groups = q("SELECT * FROM groups WHERE deleted = 0 AND uid = %d ORDER BY gname ASC", + if(Apps::system_app_installed(local_channel(), 'Privacy Groups')) { + $groups = q("SELECT * FROM pgrp WHERE deleted = 0 AND uid = %d ORDER BY gname ASC", intval(local_channel()) ); diff --git a/Zotlabs/Widget/Activity_order.php b/Zotlabs/Widget/Activity_order.php index 2dceee70e..d9dbcc91f 100644 --- a/Zotlabs/Widget/Activity_order.php +++ b/Zotlabs/Widget/Activity_order.php @@ -55,7 +55,7 @@ class Activity_order { } // override order for search, filer and cid results - if(x($_GET,'search') || x($_GET,'file') || (! x($_GET,'pf') && x($_GET,'cid'))) { + if(x($_GET,'search') || x($_GET,'file') || (! x($_GET,'pf') && x($_GET,'cid')) || x($_GET,'verb') || x($_GET,'tag') || x($_GET,'cat')) { $unthreaded_active = 'active'; $commentord_active = $postord_active = 'disabled'; } diff --git a/Zotlabs/Widget/Newmember.php b/Zotlabs/Widget/Newmember.php index 1a4b575b9..e57cf5171 100644 --- a/Zotlabs/Widget/Newmember.php +++ b/Zotlabs/Widget/Newmember.php @@ -17,7 +17,14 @@ class Newmember { if(! $a) return EMPTY_STR; - if(! feature_enabled(local_channel(),'start_menu')) + if($a['account_created'] > datetime_convert('','','now - 60 days')) { + $enabled = get_pconfig(local_channel(), 'system', 'start_menu', 1); + } + else { + $enabled = get_pconfig(local_channel(), 'system', 'start_menu', 0); + } + + if(! $enabled) return EMPTY_STR; $options = [ diff --git a/Zotlabs/Widget/Notes.php b/Zotlabs/Widget/Notes.php index 5c83a550f..238008d81 100644 --- a/Zotlabs/Widget/Notes.php +++ b/Zotlabs/Widget/Notes.php @@ -2,20 +2,26 @@ namespace Zotlabs\Widget; +use Zotlabs\Lib\Apps; + class Notes { function widget($arr) { if(! local_channel()) - return ''; - if(! feature_enabled(local_channel(),'private_notes')) - return ''; + return EMPTY_STR; + + if(! Apps::system_app_installed(local_channel(), 'Notes')) + return EMPTY_STR; $text = get_pconfig(local_channel(),'notes','text'); - $o = replace_macros(get_markup_template('notes.tpl'), array( + $tpl = get_markup_template('notes.tpl'); + + $o = replace_macros($tpl, array( '$banner' => t('Notes'), '$text' => $text, '$save' => t('Save'), + '$app' => ((isset($arr['app'])) ? true : false) )); return $o; diff --git a/Zotlabs/Widget/Notifications.php b/Zotlabs/Widget/Notifications.php index a4cf4e706..0f9f609e4 100644 --- a/Zotlabs/Widget/Notifications.php +++ b/Zotlabs/Widget/Notifications.php @@ -160,7 +160,7 @@ class Notifications { '$notifications' => $notifications, '$no_notifications' => t('Sorry, you have got no notifications at the moment'), '$loading' => t('Loading'), - '$startpage' => get_pconfig(local_channel(), 'system', 'startpage') + '$startpage' => $channel['channel_startpage'] )); return $o; diff --git a/Zotlabs/Widget/Settings_menu.php b/Zotlabs/Widget/Settings_menu.php index f35d6f147..c537c3835 100644 --- a/Zotlabs/Widget/Settings_menu.php +++ b/Zotlabs/Widget/Settings_menu.php @@ -9,15 +9,12 @@ class Settings_menu { if(! local_channel()) return; - $channel = \App::get_channel(); $abook_self_id = 0; // Retrieve the 'self' address book entry for use in the auto-permissions link - $role = get_pconfig(local_channel(),'system','permissions_role'); - $abk = q("select abook_id from abook where abook_channel = %d and abook_self = 1 limit 1", intval(local_channel()) ); @@ -45,19 +42,6 @@ class Settings_menu { ); - if(get_account_techlevel() > 0 && get_features()) { - $tabs[] = array( - 'label' => t('Additional features'), - 'url' => z_root().'/settings/features', - 'selected' => ((argv(1) === 'features') ? 'active' : ''), - ); - } - - $tabs[] = array( - 'label' => t('Addon settings'), - 'url' => z_root().'/settings/featured', - 'selected' => ((argv(1) === 'featured') ? 'active' : ''), - ); $tabs[] = array( 'label' => t('Display settings'), @@ -65,6 +49,12 @@ class Settings_menu { 'selected' => ((argv(1) === 'display') ? 'active' : ''), ); + $tabs[] = array( + 'label' => t('Addon settings'), + 'url' => z_root().'/settings/featured', + 'selected' => ((argv(1) === 'featured') ? 'active' : ''), + ); + if($hublocs) { $tabs[] = array( 'label' => t('Manage locations'), @@ -73,69 +63,6 @@ class Settings_menu { ); } - $tabs[] = array( - 'label' => t('Export channel'), - 'url' => z_root() . '/uexport', - 'selected' => '' - ); - - if(feature_enabled(local_channel(),'oauth_clients')) { - $tabs[] = array( - 'label' => t('OAuth1 apps'), - 'url' => z_root() . '/settings/oauth', - 'selected' => ((argv(1) === 'oauth') ? 'active' : ''), - ); - } - - if(feature_enabled(local_channel(),'oauth2_clients')) { - $tabs[] = array( - 'label' => t('OAuth2 apps'), - 'url' => z_root() . '/settings/oauth2', - 'selected' => ((argv(1) === 'oauth2') ? 'active' : ''), - ); - } - - if(feature_enabled(local_channel(),'access_tokens')) { - $tabs[] = array( - 'label' => t('Guest Access Tokens'), - 'url' => z_root() . '/settings/tokens', - 'selected' => ((argv(1) === 'tokens') ? 'active' : ''), - ); - } - - if(feature_enabled(local_channel(),'permcats')) { - $tabs[] = array( - 'label' => t('Permission Categories'), - 'url' => z_root() . '/settings/permcats', - 'selected' => ((argv(1) === 'permcats') ? 'active' : ''), - ); - } - - - if($role === false || $role === 'custom') { - $tabs[] = array( - 'label' => t('Connection Default Permissions'), - 'url' => z_root() . '/defperms', - 'selected' => '' - ); - } - - if(feature_enabled(local_channel(),'premium_channel')) { - $tabs[] = array( - 'label' => t('Premium Channel Settings'), - 'url' => z_root() . '/connect/' . $channel['channel_address'], - 'selected' => '' - ); - } - - if(feature_enabled(local_channel(),'channel_sources')) { - $tabs[] = array( - 'label' => t('Channel Sources'), - 'url' => z_root() . '/sources', - 'selected' => '' - ); - } - $tabtpl = get_markup_template("generic_links_widget.tpl"); return replace_macros($tabtpl, array( '$title' => t('Settings'), @@ -144,4 +71,4 @@ class Settings_menu { )); } -}
\ No newline at end of file +} diff --git a/app/channel.apd b/app/channel.apd index ab79e7047..f0f435ef5 100644 --- a/app/channel.apd +++ b/app/channel.apd @@ -1,5 +1,5 @@ -version: 1 -url: $baseurl/channel/$nick +version: 1.1 +url: $baseurl/channel/$nick, $baseurl/settings/channel_home requires: local_channel name: Channel Home photo: icon:home diff --git a/app/defperm.apd b/app/defperm.apd new file mode 100644 index 000000000..9be554543 --- /dev/null +++ b/app/defperm.apd @@ -0,0 +1,6 @@ +version: 1 +url: $baseurl/defperms +requires: local_channel, custom_role +name: Default Permissions +photo: icon:unlock-alt +categories: Access Control diff --git a/app/directory.apd b/app/directory.apd index 03a93f042..0c723c16b 100644 --- a/app/directory.apd +++ b/app/directory.apd @@ -1,5 +1,5 @@ -version: 1 -url: $baseurl/directory +version: 1.1 +url: $baseurl/directory, $baseurl/settings/directory name: Directory photo: icon:sitemap categories: nav_featured_app, Networking diff --git a/app/grid.apd b/app/grid.apd index 026b3c349..8688f852c 100644 --- a/app/grid.apd +++ b/app/grid.apd @@ -1,4 +1,4 @@ -version: 1.1 +version: 1.2 url: $baseurl/network, $baseurl/settings/network requires: local_channel name: Grid diff --git a/app/notes.apd b/app/notes.apd new file mode 100644 index 000000000..ba7e2bbc1 --- /dev/null +++ b/app/notes.apd @@ -0,0 +1,6 @@ +version: 1 +url: $baseurl/notes +requires: local_channel +name: Notes +photo: icon:sticky-note-o +categories: Personal, Productivity diff --git a/app/oauth.apd b/app/oauth.apd new file mode 100644 index 000000000..4771773ed --- /dev/null +++ b/app/oauth.apd @@ -0,0 +1,6 @@ +version: 1 +url: $baseurl/oauth +requires: local_channel +name: OAuth Apps Manager +photo: icon:chevron-circle-up +categories: Access Control diff --git a/app/oauth2.apd b/app/oauth2.apd new file mode 100644 index 000000000..21fa44c97 --- /dev/null +++ b/app/oauth2.apd @@ -0,0 +1,6 @@ +version: 1 +url: $baseurl/oauth2 +requires: local_channel +name: OAuth2 Apps Manager +photo: icon:chevron-circle-up +categories: Access Control diff --git a/app/pdledit.apd b/app/pdledit.apd new file mode 100644 index 000000000..ae62d4ff3 --- /dev/null +++ b/app/pdledit.apd @@ -0,0 +1,6 @@ +version: 1 +url: $baseurl/pdledit +requires: local_channel +name: PDL Editor +photo: icon:object-group +categories: Appearance diff --git a/app/permcats.apd b/app/permcats.apd new file mode 100644 index 000000000..6a961b87e --- /dev/null +++ b/app/permcats.apd @@ -0,0 +1,6 @@ +version: 1 +url: $baseurl/permcats +requires: local_channel +name: Permission Categories +photo: icon:unlock-alt +categories: Access Control diff --git a/app/premium_channel.apd b/app/premium_channel.apd new file mode 100644 index 000000000..263dd5701 --- /dev/null +++ b/app/premium_channel.apd @@ -0,0 +1,6 @@ +version: 1 +url: $baseurl/connect/$nick +requires: local_channel +name: Premium Channel +photo: icon:check-circle-o +categories: Networking diff --git a/app/tokens.apd b/app/tokens.apd new file mode 100644 index 000000000..6cb66cbd7 --- /dev/null +++ b/app/tokens.apd @@ -0,0 +1,6 @@ +version: 1 +url: $baseurl/tokens +requires: local_channel +name: Guest Access +photo: icon:user-secret +categories: Access Control diff --git a/app/uexport.apd b/app/uexport.apd new file mode 100644 index 000000000..c7723fa26 --- /dev/null +++ b/app/uexport.apd @@ -0,0 +1,6 @@ +version: 1 +url: $baseurl/uexport +requires: local_channel +name: Channel Export +photo: icon:download +categories: Personal, System @@ -50,11 +50,11 @@ require_once('include/attach.php'); require_once('include/bbcode.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '3.7.3' ); +define ( 'STD_VERSION', '3.9' ); define ( 'ZOT_REVISION', '6.0a' ); -define ( 'DB_UPDATE_VERSION', 1220 ); +define ( 'DB_UPDATE_VERSION', 1221 ); define ( 'PROJECT_BASE', __DIR__ ); @@ -1056,7 +1056,6 @@ class App { self::$observer = $xchan; } - public static function get_observer() { return self::$observer; } diff --git a/doc/hook/addon_app_installed_filter.bb b/doc/hook/addon_app_installed_filter.bb new file mode 100644 index 000000000..e610b3205 --- /dev/null +++ b/doc/hook/addon_app_installed_filter.bb @@ -0,0 +1,18 @@ +[h2]addon_app_installed_filter[/h2] + +Allow plugins to filter the result of addon_app_installed. + +Code excerpt: + +[code] + $filter_arr = [ + 'uid'=>$uid, + 'app'=>$app, + 'installed'=>$r + ]; + call_hooks('addon_app_installed_filter',$filter_arr); + $r = $filter_arr['installed']; +[/code] + +cxref: Zotlabs/Lib/Apps.php + diff --git a/doc/hook/app_destroy.bb b/doc/hook/app_destroy.bb new file mode 100644 index 000000000..386d7af16 --- /dev/null +++ b/doc/hook/app_destroy.bb @@ -0,0 +1,4 @@ +[h2]app_destroy[/h2] + +Allows addons to perform some post delete actions. + diff --git a/doc/hook/app_installed_filter.bb b/doc/hook/app_installed_filter.bb new file mode 100644 index 000000000..f0d91d6f0 --- /dev/null +++ b/doc/hook/app_installed_filter.bb @@ -0,0 +1,17 @@ +[h2]app_installed_filter[/h2] + +Allow plugins to filter the result of app_installed. + +Code excerpt: + +[code] + $filter_arr = [ + 'uid'=>$uid, + 'app'=>$app, + 'installed'=>$r + ]; + call_hooks('app_installed_filter',$filter_arr); + $r = $filter_arr['installed']; +[/code] + +cxref: Zotlabs/Lib/Apps.php diff --git a/doc/hook/status_editor.bb b/doc/hook/status_editor.bb new file mode 100644 index 000000000..00e97a7c9 --- /dev/null +++ b/doc/hook/status_editor.bb @@ -0,0 +1,31 @@ +[h2]status_editor[/h2] + +Replace the default status_editor (jot). + +Allow plugins to replace the default status editor in a context dependent manner. + +It is fed an array of ['editor_html' => '', 'x' => $x, 'popup' => $popup, 'module' => $module]. + +All calls to the status_editor at the time of the creation of this hook have been updated +to set $module at invocation. This allows addon developers to have a context dependent editor +based on the Hubzilla module/addon. + +Calls to status_editor() are in the form of: + status_editor($a, $x, $popup, $module). + +Future module/addon developers are encouraged to set $popup and $module when invoking the +status_editor. + + +[code] + $hook_info = ['editor_html' => '', 'x' => $x, 'popup' => $popup, 'module' => $module]; + call_hooks('status_editor',$hook_info); + if ($hook_info['editor_html'] == '') { + return hz_status_editor($a, $x, $popup); + } else { + return $hook_info['editor_html']; + } + +[/code] + +see: include/conversation.php diff --git a/doc/hook/system_app_installed_filter.bb b/doc/hook/system_app_installed_filter.bb new file mode 100644 index 000000000..a269a79a8 --- /dev/null +++ b/doc/hook/system_app_installed_filter.bb @@ -0,0 +1,18 @@ +[h2]system_app_installed_filter[/h2] + +Allow plugins to filter the result of system_app_installed. + +Code excerpt: + +[code] + $filter_arr = [ + 'uid'=>$uid, + 'app'=>$app, + 'installed'=>$r + ]; + call_hooks('system_app_installed_filter',$filter_arr); + $r = $filter_arr['installed']; +[/code] + +cxref: Zotlabs/Lib/Apps.php + diff --git a/doc/hooklist.bb b/doc/hooklist.bb index d7fe633ba..d493e4feb 100644 --- a/doc/hooklist.bb +++ b/doc/hooklist.bb @@ -37,6 +37,9 @@ Hooks allow plugins/addons to "hook into" the code at many points and alter the [zrl=[baseurl]/help/hook/activity_order]activity_order[/zrl] Called when generating the list of order options for the network page +[zrl=[baseurl]/help/hook/addon_app_installed_filter]addon_app_installed_filter[/zrl] + Called when determining whether an addon_app is installed + [zrl=[baseurl]/help/hook/activity_received]activity_received[/zrl] Called when an activity (post, comment, like, etc.) has been received from a zot source @@ -49,6 +52,12 @@ Hooks allow plugins/addons to "hook into" the code at many points and alter the [zrl=[baseurl]/help/hook/api_perm_is_allowed]api_perm_is_allowed[/zrl] Called when perm_is_allowed() is executed from an API call. +[zrl=[baseurl]/help/hook/app_destroy]app_destroy[/zrl] + Called when an app is deleted + +[zrl=[baseurl]/help/hook/app_installed_filter]app_installed_filter[/zrl] + Called when determining whether an app is installed + [zrl=[baseurl]/help/hook/app_menu]app_menu[/zrl] Called when generating the app_menu dropdown (may be obsolete) @@ -589,9 +598,15 @@ Hooks allow plugins/addons to "hook into" the code at many points and alter the [zrl=[baseurl]/help/hook/smilie]smilie[/zrl] Called when translating emoticons +[zrl=[baseurl]/help/hook/status_editor]status_editor[/zrl] + Called when generating the status_editor. + [zrl=[baseurl]/help/hook/stream_item]stream_item[/zrl] Called for each item which is rendered for viewing via conversation() +[zrl=[baseurl]/help/hook/system_app_installed_filter]system_app_installed_filter[/zrl] + Called when determining whether a system app is installed + [zrl=[baseurl]/help/hook/tagged]tagged[/zrl] Called when a delivery is processed which results in you being tagged diff --git a/include/account.php b/include/account.php index 51118c3c5..2ab99ce19 100644 --- a/include/account.php +++ b/include/account.php @@ -124,7 +124,7 @@ function account_store_lowlevel($arr) { 'account_expires' => ((array_key_exists('account_expires',$arr)) ? $arr['account_expires'] : '0001-01-01 00:00:00'), 'account_expire_notified' => ((array_key_exists('account_expire_notified',$arr)) ? $arr['account_expire_notified'] : '0001-01-01 00:00:00'), 'account_service_class' => ((array_key_exists('account_service_class',$arr)) ? $arr['account_service_class'] : ''), - 'account_level' => ((array_key_exists('account_level',$arr)) ? $arr['account_level'] : '0'), + 'account_level' => '5', 'account_password_changed' => ((array_key_exists('account_password_changed',$arr)) ? $arr['account_password_changed'] : '0001-01-01 00:00:00') ]; @@ -215,7 +215,7 @@ function create_account($arr) { 'account_created' => datetime_convert(), 'account_flags' => intval($flags), 'account_roles' => intval($roles), - 'account_level' => intval($techlevel), + 'account_level' => 5, 'account_expires' => $expires, 'account_service_class' => $default_service_class ] @@ -821,13 +821,6 @@ function upgrade_bool_message($bbcode = false) { function get_account_techlevel($account_id = 0) { - if(! $account_id) { - $x = \App::get_account(); - } - else { - $x = get_account_by_id($account_id); - } - - return (($x) ? intval($x['account_level']) : 0); + return (5); } diff --git a/include/acl_selectors.php b/include/acl_selectors.php index bada3e528..c7a87afee 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -89,7 +89,7 @@ function populate_acl($defaults = null,$show_jotnets = true, $emptyACL_descripti } } - $r = q("SELECT id, hash, gname FROM groups WHERE deleted = 0 AND uid = %d ORDER BY gname ASC", + $r = q("SELECT id, hash, gname FROM pgrp WHERE deleted = 0 AND uid = %d ORDER BY gname ASC", intval(local_channel()) ); diff --git a/include/api_zot.php b/include/api_zot.php index 921242152..6a5b9a268 100644 --- a/include/api_zot.php +++ b/include/api_zot.php @@ -350,20 +350,20 @@ $r = null; if($_REQUEST['group_id']) { - $r = q("select * from groups where uid = %d and id = %d limit 1", + $r = q("select * from pgrp where uid = %d and id = %d limit 1", intval(api_user()), intval($_REQUEST['group_id']) ); } elseif($_REQUEST['group_name']) { - $r = q("select * from groups where uid = %d and gname = '%s' limit 1", + $r = q("select * from pgrp where uid = %d and gname = '%s' limit 1", intval(api_user()), dbesc($_REQUEST['group_name']) ); } if($r) { - $x = q("select * from group_member left join abook on abook_xchan = xchan and abook_channel = group_member.uid left join xchan on group_member.xchan = xchan.xchan_hash + $x = q("select * from pgrp_member left join abook on abook_xchan = xchan and abook_channel = pgrp_member.uid left join xchan on pgrp_member.xchan = xchan.xchan_hash where gid = %d", intval($r[0]['id']) ); @@ -376,7 +376,7 @@ if(api_user() === false) return false; - $r = q("select * from groups where uid = %d", + $r = q("select * from pgrp where uid = %d", intval(api_user()) ); json_return_and_die($r); diff --git a/include/bbcode.php b/include/bbcode.php index 6f22509e6..137e25a9c 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -968,9 +968,6 @@ function bbcode($Text, $options = []) { $Text = preg_replace("/\[zrl\=([$URLSearchString]*)\](.*?)\[\/zrl\]/ism", '<a class="zrl" href="$1" ' . $target . ' rel="nofollow noopener" >$2</a>', $Text); } - if (get_account_techlevel() < 2) - $Text = str_replace('<span class="bookmark-identifier">#^</span>', '', $Text); - // Perform MAIL Search if (strpos($Text,'[/mail]') !== false) { $Text = preg_replace("/\[mail\]([$MAILSearchString]*)\[\/mail\]/", '<a href="mailto:$1" ' . $target . ' rel="nofollow noopener" >$1</a>', $Text); diff --git a/include/channel.php b/include/channel.php index 74c213fcd..6a934cb82 100644 --- a/include/channel.php +++ b/include/channel.php @@ -447,7 +447,7 @@ function create_identity($arr) { // if our role_permissions indicate that we're using a default collection ACL, add it. if(is_array($role_permissions) && $role_permissions['default_collection']) { - $r = q("select hash from groups where uid = %d and gname = '%s' limit 1", + $r = q("select hash from pgrp where uid = %d and gname = '%s' limit 1", intval($newuid), dbesc( t('Friends') ) ); @@ -837,14 +837,14 @@ function identity_basic_export($channel_id, $sections = null) { $ret['hubloc'] = $r; } - $r = q("select * from groups where uid = %d ", + $r = q("select * from pgrp where uid = %d ", intval($channel_id) ); if($r) $ret['group'] = $r; - $r = q("select * from group_member where uid = %d ", + $r = q("select * from pgrp_member where uid = %d ", intval($channel_id) ); if($r) @@ -2579,8 +2579,8 @@ function channel_remove($channel_id, $local = true, $unset_session = false) { q("DELETE FROM chatroom WHERE cr_uid = %d", intval($channel_id)); q("DELETE FROM conv WHERE uid = %d", intval($channel_id)); - q("DELETE FROM groups WHERE uid = %d", intval($channel_id)); - q("DELETE FROM group_member WHERE uid = %d", intval($channel_id)); + q("DELETE FROM pgrp WHERE uid = %d", intval($channel_id)); + q("DELETE FROM pgrp_member WHERE uid = %d", intval($channel_id)); q("DELETE FROM event WHERE uid = %d", intval($channel_id)); q("DELETE FROM mail WHERE channel_id = %d", intval($channel_id)); q("DELETE FROM menu WHERE menu_channel_id = %d", intval($channel_id)); diff --git a/include/connections.php b/include/connections.php index 129bcdc8d..d97ea3887 100644 --- a/include/connections.php +++ b/include/connections.php @@ -296,7 +296,7 @@ function remove_all_xchan_resources($xchan, $channel_id = 0) { $r = q("delete from event where event_xchan = '%s'", dbesc($xchan) ); - $r = q("delete from group_member where xchan = '%s'", + $r = q("delete from pgrp_member where xchan = '%s'", dbesc($xchan) ); $r = q("delete from mail where ( from_xchan = '%s' or to_xchan = '%s' )", @@ -402,7 +402,7 @@ function contact_remove($channel_id, $abook_id) { intval($channel_id) ); - $r = q("delete from group_member where xchan = '%s' and uid = %d", + $r = q("delete from pgrp_member where xchan = '%s' and uid = %d", dbesc($abook['abook_xchan']), intval($channel_id) ); diff --git a/include/conversation.php b/include/conversation.php index 28a339479..041994b90 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -888,6 +888,7 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa '$user' => App::$user, '$threads' => $threads, '$wait' => t('Loading...'), + '$conversation_tools' => t('Conversation Tools'), '$dropping' => ($page_dropping?t('Delete Selected Items'):False), )); @@ -1231,13 +1232,27 @@ function format_like($cnt, $arr, $type, $id) { return $o; } + +/** + * Wrapper to allow addons to replace the status editor if desired. + */ +function status_editor($a, $x, $popup = false, $module='') { + $hook_info = ['editor_html' => '', 'x' => $x, 'popup' => $popup, 'module' => $module]; + call_hooks('status_editor',$hook_info); + if ($hook_info['editor_html'] == '') { + return hz_status_editor($a, $x, $popup); + } else { + return $hook_info['editor_html']; + } +} + /** * This is our general purpose content editor. * It was once nicknamed "jot" and you may see references to "jot" littered throughout the code. * They are referring to the content editor or components thereof. */ -function status_editor($a, $x, $popup = false) { +function hz_status_editor($a, $x, $popup = false) { $o = ''; @@ -1447,7 +1462,8 @@ function status_editor($a, $x, $popup = false) { '$expanded' => ((x($x, 'expanded')) ? $x['expanded'] : false), '$bbcode' => ((x($x, 'bbcode')) ? $x['bbcode'] : false), '$parent' => ((array_key_exists('parent',$x) && $x['parent']) ? $x['parent'] : 0), - '$reset' => $reset + '$reset' => $reset, + '$is_owner' => ((local_channel() && (local_channel() == $x['profile_uid'])) ? true : false) )); if ($popup === true) { diff --git a/include/features.php b/include/features.php index 37445c643..05ce3db32 100644 --- a/include/features.php +++ b/include/features.php @@ -47,7 +47,15 @@ function feature_level($feature,$def) { function process_module_features_get($uid, $features) { unset($features[0]); foreach($features as $f) { - $arr[] = array('feature_' . $f[0],$f[1],((intval(feature_enabled($uid, $f[0]))) ? "1" : ''),$f[2],array(t('Off'),t('On'))); + $arr[] = [ + 'feature_' . $f[0], + $f[1], + ((intval(feature_enabled($uid, $f[0]))) ? "1" : ''), + $f[2], + [t('Off'),t('On')], + (($f[4] === false) ? '' : 'disabled'), + $f[5] + ]; } return $arr; } @@ -61,8 +69,6 @@ function process_module_features_post($uid, $features, $post_arr) { else set_pconfig($uid,'feature', $k, ''); } - if($post_arr['rpath']) - goaway($post_arr['rpath']); } function get_features($filtered = true, $level = (-1)) { @@ -71,123 +77,65 @@ function get_features($filtered = true, $level = (-1)) { $arr = [ - // General - 'general' => [ - - t('General Features'), - - [ - 'start_menu', - t('New Member Links'), - t('Display new member quick links menu'), - (($account['account_created'] > datetime_convert('','','now - 60 days')) ? true : false), - get_config('feature_lock','start_menu'), - feature_level('start_menu',1), - ], + 'calendar' => [ -/* - [ - 'hide_rating', - t('Hide Rating'), - t('Hide the rating buttons on your channel and profile pages. Note: People can still rate you somewhere else.'), - false, - get_config('feature_lock','hide_rating'), - feature_level('hide_rating',3), - ], -*/ - [ - 'private_notes', - t('Private Notes'), - t('Enables a tool to store notes and reminders (note: not encrypted)'), - false, - get_config('feature_lock','private_notes'), - feature_level('private_notes',1), - ], + t('CalDAV'), [ - 'premium_channel', - t('Premium Channel'), - t('Allows you to set restrictions and terms on those that connect with your channel'), + 'cal_first_day', + t('Start calendar week on Monday'), + t('Default is Sunday'), false, - get_config('feature_lock','premium_channel'), - feature_level('premium_channel',4), - ], - - [ - 'advanced_dirsearch', - t('Advanced Directory Search'), - t('Allows creation of complex directory search queries'), - false, - get_config('feature_lock','advanced_dirsearch'), - feature_level('advanced_dirsearch',4), - ], + get_config('feature_lock','cal_first_day') + ] - [ - 'advanced_theming', - t('Advanced Theme and Layout Settings'), - t('Allows fine tuning of themes and page layouts'), - false, - get_config('feature_lock','advanced_theming'), - feature_level('advanced_theming',4), - ], ], + 'channel_home' => [ - 'access_control' => [ - t('Access Control and Permissions'), - - [ - 'groups', - t('Privacy Groups'), - t('Enable management and selection of privacy groups'), - true, - get_config('feature_lock','groups'), - feature_level('groups',0), - ], + t('Channel Home'), [ - 'permcats', - t('Permission Categories'), - t('Create custom connection permission limits'), + 'archives', + t('Search by Date'), + t('Ability to select posts by date ranges'), false, - get_config('feature_lock','permcats'), - feature_level('permcats',2), + get_config('feature_lock','archives') ], [ - 'oauth_clients', - t('OAuth1 Clients'), - t('Manage OAuth1 authenticatication tokens for mobile and remote apps.'), + 'tagadelic', + t('Tag Cloud'), + t('Provide a personal tag cloud on your channel page'), false, - get_config('feature_lock','oauth_clients'), - feature_level('oauth_clients',1), + get_config('feature_lock','tagadelic'), ], [ - 'oauth2_clients', - t('OAuth2 Clients'), - t('Manage OAuth2 authenticatication tokens for mobile and remote apps.'), + 'channel_list_mode', + t('Use blog/list mode'), + t('Comments will be displayed separately'), false, - get_config('feature_lock','oauth2_clients'), - feature_level('oauth2_clients',1), - ], + get_config('feature_lock','channel_list_mode'), + ] + ], + + 'connections' => [ + + t('Connections'), [ - 'access_tokens', - t('Access Tokens'), - t('Create access tokens so that non-members can access private content.'), + 'connfilter', + t('Connection Filtering'), + t('Filter incoming posts from connections based on keywords/content'), false, - get_config('feature_lock','access_tokens'), - feature_level('access_tokens',2), - ], - + get_config('feature_lock','connfilter') + ] ], + 'conversation' => [ - // Item tools - 'tools' => [ - - t('Post/Comment Tools'), + t('Conversation'), [ 'commtag', @@ -195,16 +143,6 @@ function get_features($filtered = true, $level = (-1)) { t('Ability to tag existing posts'), false, get_config('feature_lock','commtag'), - feature_level('commtag',1), - ], - - [ - 'categories', - t('Post Categories'), - t('Add categories to your posts'), - false, - get_config('feature_lock','categories'), - feature_level('categories',1), ], [ @@ -213,16 +151,6 @@ function get_features($filtered = true, $level = (-1)) { t('Add emoji reaction ability to posts'), true, get_config('feature_lock','emojis'), - feature_level('emojis',1), - ], - - [ - 'filing', - t('Saved Folders'), - t('Ability to file posts under folders'), - false, - get_config('feature_lock','filing'), - feature_level('filing',2), ], [ @@ -231,7 +159,6 @@ function get_features($filtered = true, $level = (-1)) { t('Ability to dislike posts/comments'), false, get_config('feature_lock','dislike'), - feature_level('dislike',1), ], [ @@ -240,52 +167,36 @@ function get_features($filtered = true, $level = (-1)) { t('Ability to mark special posts with a star indicator'), false, get_config('feature_lock','star_posts'), - feature_level('star_posts',1), - ], + ] - [ - 'tagadelic', - t('Tag Cloud'), - t('Provide a personal tag cloud on your channel page'), - false, - get_config('feature_lock','tagadelic'), - feature_level('tagadelic',2), - ], ], -############################################ -############################################ + 'directory' => [ - 'calendar' => [ - - t('CalDAV'), + t('Directory'), [ - 'cal_first_day', - t('Start calendar week on Monday'), - t('Default is Sunday'), + 'advanced_dirsearch', + t('Advanced Directory Search'), + t('Allows creation of complex directory search queries'), false, - get_config('feature_lock','cal_first_day') + get_config('feature_lock','advanced_dirsearch'), ] ], - 'connections' => [ + 'editor' => [ - t('Connections'), + t('Editor'), [ - 'connfilter', - t('Connection Filtering'), - t('Filter incoming posts from connections based on keywords/content'), + 'categories', + t('Post Categories'), + t('Add categories to your posts'), false, - get_config('feature_lock','connfilter') - ] - ], - - 'editor' => [ - - t('Editor'), + get_config('feature_lock','categories'), + feature_level('categories',1), + ], [ 'large_photos', @@ -391,7 +302,7 @@ function get_features($filtered = true, $level = (-1)) { 'nav_channel_select', t('Navigation Channel Select'), t('Change channels directly from within the navigation dropdown menu'), - true, + false, get_config('feature_lock','nav_channel_select'), ] @@ -402,14 +313,6 @@ function get_features($filtered = true, $level = (-1)) { t('Network'), [ - 'archives', - t('Search by Date'), - t('Ability to select posts by date ranges'), - false, - get_config('feature_lock','archives') - ], - - [ 'savedsearch', t('Saved Searches'), t('Save search terms for re-use'), @@ -418,6 +321,14 @@ function get_features($filtered = true, $level = (-1)) { ], [ + 'filing', + t('Saved Folders'), + t('Ability to file posts under folders'), + false, + get_config('feature_lock','filing'), + ], + + [ 'order_tab', t('Alternate Stream Order'), t('Ability to order the stream by last post date, last comment date or unthreaded activities'), @@ -463,6 +374,14 @@ function get_features($filtered = true, $level = (-1)) { t('Show friend and connection suggestions'), false, get_config('feature_lock','suggest') + ], + + [ + 'network_list_mode', + t('Use blog/list mode'), + t('Comments will be displayed separately'), + false, + get_config('feature_lock','network_list_mode'), ] ], @@ -519,8 +438,6 @@ function get_features($filtered = true, $level = (-1)) { $arr = $x['features']; - $techlevel = (($level >= 0) ? $level : get_account_techlevel()); - // removed any locked features and remove the entire category if this makes it empty if($filtered) { @@ -531,9 +448,6 @@ function get_features($filtered = true, $level = (-1)) { for($y = 0; $y < count($arr[$k]); $y ++) { $disabled = false; if(is_array($arr[$k][$y])) { - if($arr[$k][$y][5] > $techlevel) { - $disabled = true; - } if($arr[$k][$y][4] !== false) { $disabled = true; } diff --git a/include/group.php b/include/group.php index 56bf210ff..6011af08f 100644 --- a/include/group.php +++ b/include/group.php @@ -14,11 +14,11 @@ function group_add($uid,$name,$public = 0) { // access lists. What we're doing here is reviving the dead group, but old content which // was restricted to this group may now be seen by the new group members. - $z = q("SELECT * FROM groups WHERE id = %d LIMIT 1", + $z = q("SELECT * FROM pgrp WHERE id = %d LIMIT 1", intval($r) ); if(($z) && $z[0]['deleted']) { - q('UPDATE groups SET deleted = 0 WHERE id = %d', intval($z[0]['id'])); + q('UPDATE pgrp SET deleted = 0 WHERE id = %d', intval($z[0]['id'])); notice( t('A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name.') . EOL); } return true; @@ -28,13 +28,13 @@ function group_add($uid,$name,$public = 0) { $dups = false; $hash = random_string() . $name; - $r = q("SELECT id FROM groups WHERE hash = '%s' LIMIT 1", dbesc($hash)); + $r = q("SELECT id FROM pgrp WHERE hash = '%s' LIMIT 1", dbesc($hash)); if($r) $dups = true; } while($dups == true); - $r = q("INSERT INTO groups ( hash, uid, visible, gname ) + $r = q("INSERT INTO pgrp ( hash, uid, visible, gname ) VALUES( '%s', %d, %d, '%s' ) ", dbesc($hash), intval($uid), @@ -53,7 +53,7 @@ function group_add($uid,$name,$public = 0) { function group_rmv($uid,$name) { $ret = false; if(x($uid) && x($name)) { - $r = q("SELECT id, hash FROM groups WHERE uid = %d AND gname = '%s' LIMIT 1", + $r = q("SELECT id, hash FROM pgrp WHERE uid = %d AND gname = '%s' LIMIT 1", intval($uid), dbesc($name) ); @@ -98,13 +98,13 @@ function group_rmv($uid,$name) { } // remove all members - $r = q("DELETE FROM group_member WHERE uid = %d AND gid = %d ", + $r = q("DELETE FROM pgrp_member WHERE uid = %d AND gid = %d ", intval($uid), intval($group_id) ); // remove group - $r = q("UPDATE groups SET deleted = 1 WHERE uid = %d AND gname = '%s'", + $r = q("UPDATE pgrp SET deleted = 1 WHERE uid = %d AND gname = '%s'", intval($uid), dbesc($name) ); @@ -121,7 +121,7 @@ function group_rmv($uid,$name) { function group_byname($uid,$name) { if((! $uid) || (! strlen($name))) return false; - $r = q("SELECT * FROM groups WHERE uid = %d AND gname = '%s' LIMIT 1", + $r = q("SELECT * FROM pgrp WHERE uid = %d AND gname = '%s' LIMIT 1", intval($uid), dbesc($name) ); @@ -134,7 +134,7 @@ function group_byname($uid,$name) { function group_rec_byhash($uid,$hash) { if((! $uid) || (! strlen($hash))) return false; - $r = q("SELECT * FROM groups WHERE uid = %d AND hash = '%s' LIMIT 1", + $r = q("SELECT * FROM pgrp WHERE uid = %d AND hash = '%s' LIMIT 1", intval($uid), dbesc($hash) ); @@ -149,7 +149,7 @@ function group_rmv_member($uid,$name,$member) { return false; if(! ( $uid && $gid && $member)) return false; - $r = q("DELETE FROM group_member WHERE uid = %d AND gid = %d AND xchan = '%s' ", + $r = q("DELETE FROM pgrp_member WHERE uid = %d AND gid = %d AND xchan = '%s' ", intval($uid), intval($gid), dbesc($member) @@ -169,7 +169,7 @@ function group_add_member($uid,$name,$member,$gid = 0) { if((! $gid) || (! $uid) || (! $member)) return false; - $r = q("SELECT * FROM group_member WHERE uid = %d AND gid = %d AND xchan = '%s' LIMIT 1", + $r = q("SELECT * FROM pgrp_member WHERE uid = %d AND gid = %d AND xchan = '%s' LIMIT 1", intval($uid), intval($gid), dbesc($member) @@ -179,7 +179,7 @@ function group_add_member($uid,$name,$member,$gid = 0) { // we indicate success because the group member was in fact created // -- It was just created at another time if(! $r) - $r = q("INSERT INTO group_member (uid, gid, xchan) + $r = q("INSERT INTO pgrp_member (uid, gid, xchan) VALUES( %d, %d, '%s' ) ", intval($uid), intval($gid), @@ -194,9 +194,9 @@ function group_add_member($uid,$name,$member,$gid = 0) { function group_get_members($gid) { $ret = array(); if(intval($gid)) { - $r = q("SELECT * FROM group_member - LEFT JOIN abook ON abook_xchan = group_member.xchan left join xchan on xchan_hash = abook_xchan - WHERE gid = %d AND abook_channel = %d and group_member.uid = %d and xchan_deleted = 0 and abook_self = 0 and abook_blocked = 0 and abook_pending = 0 ORDER BY xchan_name ASC ", + $r = q("SELECT * FROM pgrp_member + LEFT JOIN abook ON abook_xchan = pgrp_member.xchan left join xchan on xchan_hash = abook_xchan + WHERE gid = %d AND abook_channel = %d and pgrp_member.uid = %d and xchan_deleted = 0 and abook_self = 0 and abook_blocked = 0 and abook_pending = 0 ORDER BY xchan_name ASC ", intval($gid), intval(local_channel()), intval(local_channel()) @@ -210,7 +210,7 @@ function group_get_members($gid) { function group_get_members_xchan($gid) { $ret = array(); if(intval($gid)) { - $r = q("SELECT xchan FROM group_member WHERE gid = %d AND uid = %d", + $r = q("SELECT xchan FROM pgrp_member WHERE gid = %d AND uid = %d", intval($gid), intval(local_channel()) ); @@ -248,7 +248,7 @@ function mini_group_select($uid,$group = '') { $grps = array(); $o = ''; - $r = q("SELECT * FROM groups WHERE deleted = 0 AND uid = %d ORDER BY gname ASC", + $r = q("SELECT * FROM pgrp WHERE deleted = 0 AND uid = %d ORDER BY gname ASC", intval($uid) ); $grps[] = array('name' => '', 'hash' => '0', 'selected' => ''); @@ -274,13 +274,13 @@ function group_side($every="connections",$each="group",$edit = false, $group_id $o = ''; - if(! (local_channel() && feature_enabled(local_channel(),'groups'))) { + if(! (local_channel() && \Zotlabs\Lib\Apps::system_app_installed(local_channel(), 'Privacy Groups'))) { return ''; } $groups = array(); - $r = q("SELECT * FROM groups WHERE deleted = 0 AND uid = %d ORDER BY gname ASC", + $r = q("SELECT * FROM pgrp WHERE deleted = 0 AND uid = %d ORDER BY gname ASC", intval($_SESSION['uid']) ); $member_of = array(); @@ -361,7 +361,7 @@ function expand_groups($g) { stringify_array_elms($x,true); $groups = implode(',', $x); if($groups) { - $r = q("SELECT xchan FROM group_member WHERE gid IN ( select id from groups where hash in ( $groups ))"); + $r = q("SELECT xchan FROM pgrp_member WHERE gid IN ( select id from pgrp where hash in ( $groups ))"); if($r) { foreach($r as $rr) { $ret[] = $rr['xchan']; @@ -375,7 +375,7 @@ function expand_groups($g) { function member_of($c) { - $r = q("SELECT groups.gname, groups.id FROM groups LEFT JOIN group_member ON group_member.gid = groups.id WHERE group_member.xchan = '%s' AND groups.deleted = 0 ORDER BY groups.gname ASC ", + $r = q("SELECT pgrp.gname, pgrp.id FROM pgrp LEFT JOIN pgrp_member ON pgrp_member.gid = pgrp.id WHERE pgrp_member.xchan = '%s' AND pgrp.deleted = 0 ORDER BY pgrp.gname ASC ", dbesc($c) ); @@ -385,7 +385,7 @@ function member_of($c) { function groups_containing($uid,$c) { - $r = q("SELECT gid FROM group_member WHERE uid = %d AND group_member.xchan = '%s' ", + $r = q("SELECT gid FROM pgrp_member WHERE uid = %d AND pgrp_member.xchan = '%s' ", intval($uid), dbesc($c) ); diff --git a/include/items.php b/include/items.php index c817c5afb..58461cc3a 100755 --- a/include/items.php +++ b/include/items.php @@ -4159,7 +4159,7 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C $sql_extra .= protect_sprintf(term_query('item', $arr['cat'], TERM_CATEGORY)); if($arr['gid'] && $uid) { - $r = q("SELECT * FROM groups WHERE id = %d AND uid = %d LIMIT 1", + $r = q("SELECT * FROM pgrp WHERE id = %d AND uid = %d LIMIT 1", intval($arr['group']), intval($uid) ); diff --git a/include/nav.php b/include/nav.php index 1eef8dc07..b5592d7aa 100644 --- a/include/nav.php +++ b/include/nav.php @@ -60,8 +60,6 @@ function nav($template = 'default') { //we could additionally use this to display important system notifications e.g. for updates )); - $techlevel = get_account_techlevel(); - // nav links: array of array('href', 'text', 'extra css classes', 'title') $nav = []; @@ -93,7 +91,7 @@ function nav($template = 'default') { if(! $_SESSION['delegate']) { $nav['manage'] = array('manage', t('Channel Manager'), "", t('Manage your channels'),'manage_nav_btn'); } - if(feature_enabled(local_channel(),'groups')) + if(Apps::system_app_installed(local_channel(), 'Privacy Groups')) $nav['group'] = array('group', t('Privacy Groups'),"", t('Manage your privacy groups'),'group_nav_btn'); $nav['settings'] = array('settings', t('Settings'),"", t('Account/Channel Settings'),'settings_nav_btn'); diff --git a/include/security.php b/include/security.php index ffdd1d7ea..493d34699 100644 --- a/include/security.php +++ b/include/security.php @@ -577,7 +577,7 @@ function init_groups_visitor($contact_id) { // physical groups this channel is a member of - $r = q("SELECT hash FROM groups left join group_member on groups.id = group_member.gid WHERE xchan = '%s' ", + $r = q("SELECT hash FROM pgrp left join pgrp_member on pgrp.id = pgrp_member.gid WHERE xchan = '%s' ", dbesc($contact_id) ); if($r) { diff --git a/include/text.php b/include/text.php index 4b5442985..f03d0b860 100644 --- a/include/text.php +++ b/include/text.php @@ -41,7 +41,7 @@ function replace_macros($s, $r) { try { $output = $t->replace_macros($arr['template'], $arr['params']); } catch (Exception $e) { - logger("Unable to render template: ",$e->getMessage()); + logger("Unable to render template: ".$e->getMessage()); $output = "<h3>ERROR: there was an error creating the output.</h3>"; } @@ -2737,7 +2737,7 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag, $i $grp = group_byname($profile_uid,$name); if($grp) { - $g = q("select hash from groups where id = %d and visible = 1 limit 1", + $g = q("select hash from pgrp where id = %d and visible = 1 limit 1", intval($grp) ); if($g && $exclusive) { diff --git a/include/xchan.php b/include/xchan.php index 8c9c09c72..aad56063f 100644 --- a/include/xchan.php +++ b/include/xchan.php @@ -176,7 +176,7 @@ function xchan_change_key($oldx,$newx,$data) { $tables = [ 'abook' => 'abook_xchan', 'abconfig' => 'xchan', - 'group_member' => 'xchan', + 'pgrp_member' => 'xchan', 'chat' => 'chat_xchan', 'chatpresence' => 'cp_xchan', 'event' => 'event_xchan', diff --git a/include/zot.php b/include/zot.php index e31d650d2..1a632cf87 100644 --- a/include/zot.php +++ b/include/zot.php @@ -3320,13 +3320,13 @@ function build_sync_packet($uid = 0, $packet = null, $groups_changed = false) { } if($groups_changed) { - $r = q("select hash as collection, visible, deleted, gname as name from groups where uid = %d", + $r = q("select hash as collection, visible, deleted, gname as name from pgrp where uid = %d", intval($uid) ); if($r) $info['collections'] = $r; - $r = q("select groups.hash as collection, group_member.xchan as member from groups left join group_member on groups.id = group_member.gid where group_member.uid = %d", + $r = q("select pgrp.hash as collection, pgrp_member.xchan as member from pgrp left join pgrp_member on pgrp.id = pgrp_member.gid where pgrp_member.uid = %d", intval($uid) ); if($r) @@ -3734,7 +3734,7 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) { // sync collections (privacy groups) oh joy... if(array_key_exists('collections',$arr) && is_array($arr['collections']) && count($arr['collections'])) { - $x = q("select * from groups where uid = %d", + $x = q("select * from pgrp where uid = %d", intval($channel['channel_id']) ); foreach($arr['collections'] as $cl) { @@ -3750,7 +3750,7 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) { if(($y['gname'] != $cl['name']) || ($y['visible'] != $cl['visible']) || ($y['deleted'] != $cl['deleted'])) { - q("update groups set gname = '%s', visible = %d, deleted = %d where hash = '%s' and uid = %d", + q("update pgrp set gname = '%s', visible = %d, deleted = %d where hash = '%s' and uid = %d", dbesc($cl['name']), intval($cl['visible']), intval($cl['deleted']), @@ -3759,14 +3759,14 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) { ); } if(intval($cl['deleted']) && (! intval($y['deleted']))) { - q("delete from group_member where gid = %d", + q("delete from pgrp_member where gid = %d", intval($y['id']) ); } } } if(! $found) { - $r = q("INSERT INTO groups ( hash, uid, visible, deleted, gname ) + $r = q("INSERT INTO pgrp ( hash, uid, visible, deleted, gname ) VALUES( '%s', %d, %d, %d, '%s' ) ", dbesc($cl['collection']), intval($channel['channel_id']), @@ -3790,10 +3790,10 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) { } } if(! $found_local) { - q("delete from group_member where gid = %d", + q("delete from pgrp_member where gid = %d", intval($y['id']) ); - q("update groups set deleted = 1 where id = %d and uid = %d", + q("update pgrp set deleted = 1 where id = %d and uid = %d", intval($y['id']), intval($channel['channel_id']) ); @@ -3803,7 +3803,7 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) { } // reload the group list with any updates - $x = q("select * from groups where uid = %d", + $x = q("select * from pgrp where uid = %d", intval($channel['channel_id']) ); @@ -3830,7 +3830,7 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) { if(isset($y['hash']) && isset($members[$y['hash']])) { foreach($members[$y['hash']] as $member) { $found = false; - $z = q("select xchan from group_member where gid = %d and uid = %d and xchan = '%s' limit 1", + $z = q("select xchan from pgrp_member where gid = %d and uid = %d and xchan = '%s' limit 1", intval($y['id']), intval($channel['channel_id']), dbesc($member) @@ -3841,7 +3841,7 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) { // if somebody is in the group that wasn't before - add them if(! $found) { - q("INSERT INTO group_member (uid, gid, xchan) + q("INSERT INTO pgrp_member (uid, gid, xchan) VALUES( %d, %d, '%s' ) ", intval($channel['channel_id']), intval($y['id']), @@ -3852,7 +3852,7 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) { } // now retrieve a list of members we have on this site - $m = q("select xchan from group_member where gid = %d and uid = %d", + $m = q("select xchan from pgrp_member where gid = %d and uid = %d", intval($y['id']), intval($channel['channel_id']) ); @@ -3860,7 +3860,7 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) { foreach($m as $mm) { // if the local existing member isn't in the list we just received - remove them if(! in_array($mm['xchan'],$members[$y['hash']])) { - q("delete from group_member where xchan = '%s' and gid = %d and uid = %d", + q("delete from pgrp_member where xchan = '%s' and gid = %d and uid = %d", dbesc($mm['xchan']), intval($y['id']), intval($channel['channel_id']) diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql index 9b78ae8d4..a5db8e184 100644 --- a/install/schema_mysql.sql +++ b/install/schema_mysql.sql @@ -1,4 +1,3 @@ - CREATE TABLE IF NOT EXISTS `abconfig` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `chan` int(10) unsigned NOT NULL DEFAULT 0 , @@ -462,7 +461,7 @@ CREATE TABLE IF NOT EXISTS `event` ( KEY `event_priority` (`event_priority`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; -CREATE TABLE IF NOT EXISTS `groups` ( +CREATE TABLE IF NOT EXISTS `pgrp` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `hash` char(191) NOT NULL DEFAULT '', `uid` int(10) unsigned NOT NULL DEFAULT 0 , @@ -477,7 +476,7 @@ CREATE TABLE IF NOT EXISTS `groups` ( KEY `gname` (`gname`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; -CREATE TABLE IF NOT EXISTS `group_member` ( +CREATE TABLE IF NOT EXISTS `pgrp_member` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `uid` int(10) unsigned NOT NULL DEFAULT 0 , `gid` int(10) unsigned NOT NULL DEFAULT 0 , diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql index 7f118646e..cb4476628 100644 --- a/install/schema_postgres.sql +++ b/install/schema_postgres.sql @@ -434,18 +434,18 @@ create index "event_status_idx" on event ("event_status"); create index "event_sequence_idx" on event ("event_sequence"); create index "event_priority_idx" on event ("event_priority"); -CREATE TABLE "group_member" ( +CREATE TABLE "pgrp_member" ( "id" serial NOT NULL, "uid" bigint NOT NULL, "gid" bigint NOT NULL, "xchan" text NOT NULL DEFAULT '', PRIMARY KEY ("id") ); -create index "groupmember_uid" on group_member ("uid"); -create index "groupmember_gid" on group_member ("gid"); -create index "groupmember_xchan" on group_member ("xchan"); +create index "groupmember_uid" on pgrp_member ("uid"); +create index "groupmember_gid" on pgrp_member ("gid"); +create index "groupmember_xchan" on pgrp_member ("xchan"); -CREATE TABLE "groups" ( +CREATE TABLE "pgrp" ( "id" serial NOT NULL, "hash" text NOT NULL DEFAULT '', "uid" bigint NOT NULL, @@ -455,10 +455,10 @@ CREATE TABLE "groups" ( PRIMARY KEY ("id") ); -create index "groups_uid_idx" on groups ("uid"); -create index "groups_visible_idx" on groups ("visible"); -create index "groups_deleted_idx" on groups ("deleted"); -create index "groups_hash_idx" on groups ("hash"); +create index "groups_uid_idx" on pgrp ("uid"); +create index "groups_visible_idx" on pgrp ("visible"); +create index "groups_deleted_idx" on pgrp ("deleted"); +create index "groups_hash_idx" on pgrp ("hash"); CREATE TABLE "hook" ( "id" serial NOT NULL, diff --git a/util/hmessages.po b/util/hmessages.po index 98dbc59e6..9239b0e44 100644 --- a/util/hmessages.po +++ b/util/hmessages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.6RC\n" +"Project-Id-Version: 3.8RC\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-18 11:47+0200\n" +"POT-Creation-Date: 2018-10-05 11:25+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -150,10 +150,8 @@ msgid "Special - Group Repository" msgstr "" #: ../../Zotlabs/Access/PermissionRoles.php:306 -#: ../../Zotlabs/Module/Cdav.php:1182 ../../Zotlabs/Module/New_channel.php:172 -#: ../../Zotlabs/Module/Settings/Channel.php:496 -#: ../../Zotlabs/Module/Connedit.php:918 ../../Zotlabs/Module/Profiles.php:795 -#: ../../Zotlabs/Module/Register.php:233 ../../include/selectors.php:49 +#: ../../Zotlabs/Module/Cdav.php:1227 ../../Zotlabs/Module/Connedit.php:919 +#: ../../Zotlabs/Module/Profiles.php:795 ../../include/selectors.php:49 #: ../../include/selectors.php:66 ../../include/selectors.php:104 #: ../../include/selectors.php:140 ../../include/event.php:1315 #: ../../include/event.php:1322 ../../include/connections.php:703 @@ -165,22 +163,22 @@ msgstr "" msgid "Custom/Expert Mode" msgstr "" -#: ../../Zotlabs/Module/Blocks.php:33 ../../Zotlabs/Module/Articles.php:29 +#: ../../Zotlabs/Module/Blocks.php:33 ../../Zotlabs/Module/Articles.php:34 #: ../../Zotlabs/Module/Editlayout.php:31 ../../Zotlabs/Module/Connect.php:17 #: ../../Zotlabs/Module/Achievements.php:15 ../../Zotlabs/Module/Hcard.php:12 #: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Profile.php:20 #: ../../Zotlabs/Module/Menu.php:91 ../../Zotlabs/Module/Layouts.php:31 -#: ../../Zotlabs/Module/Editwebpage.php:32 ../../Zotlabs/Module/Cards.php:33 -#: ../../Zotlabs/Module/Webpages.php:33 ../../Zotlabs/Module/Filestorage.php:51 -#: ../../include/channel.php:1197 +#: ../../Zotlabs/Module/Editwebpage.php:32 ../../Zotlabs/Module/Cards.php:37 +#: ../../Zotlabs/Module/Webpages.php:39 ../../Zotlabs/Module/Filestorage.php:51 +#: ../../addon/gallery/Mod_Gallery.php:47 ../../include/channel.php:1204 msgid "Requested profile is not available." msgstr "" #: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80 -#: ../../Zotlabs/Module/Invite.php:17 ../../Zotlabs/Module/Invite.php:94 -#: ../../Zotlabs/Module/Articles.php:68 ../../Zotlabs/Module/Editlayout.php:67 -#: ../../Zotlabs/Module/Editlayout.php:90 ../../Zotlabs/Module/Channel.php:115 -#: ../../Zotlabs/Module/Channel.php:281 ../../Zotlabs/Module/Channel.php:320 +#: ../../Zotlabs/Module/Invite.php:21 ../../Zotlabs/Module/Invite.php:102 +#: ../../Zotlabs/Module/Articles.php:80 ../../Zotlabs/Module/Editlayout.php:67 +#: ../../Zotlabs/Module/Editlayout.php:90 ../../Zotlabs/Module/Channel.php:119 +#: ../../Zotlabs/Module/Channel.php:286 ../../Zotlabs/Module/Channel.php:325 #: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Locs.php:87 #: ../../Zotlabs/Module/Mitem.php:129 ../../Zotlabs/Module/Events.php:271 #: ../../Zotlabs/Module/Appman.php:87 ../../Zotlabs/Module/Regmod.php:20 @@ -189,42 +187,41 @@ msgstr "" #: ../../Zotlabs/Module/New_channel.php:130 #: ../../Zotlabs/Module/Sharedwithme.php:16 ../../Zotlabs/Module/Setup.php:209 #: ../../Zotlabs/Module/Moderate.php:13 -#: ../../Zotlabs/Module/Settings/Features.php:38 #: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Thing.php:280 #: ../../Zotlabs/Module/Thing.php:300 ../../Zotlabs/Module/Thing.php:341 #: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Editblock.php:67 #: ../../Zotlabs/Module/Profile.php:85 ../../Zotlabs/Module/Profile.php:101 -#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Connections.php:29 +#: ../../Zotlabs/Module/Mood.php:124 ../../Zotlabs/Module/Connections.php:32 #: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Bookmarks.php:64 -#: ../../Zotlabs/Module/Photos.php:69 ../../Zotlabs/Module/Wiki.php:50 -#: ../../Zotlabs/Module/Wiki.php:273 ../../Zotlabs/Module/Wiki.php:404 -#: ../../Zotlabs/Module/Pdledit.php:29 ../../Zotlabs/Module/Poke.php:149 +#: ../../Zotlabs/Module/Photos.php:69 ../../Zotlabs/Module/Wiki.php:59 +#: ../../Zotlabs/Module/Wiki.php:282 ../../Zotlabs/Module/Wiki.php:415 +#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Poke.php:157 #: ../../Zotlabs/Module/Profile_photo.php:302 #: ../../Zotlabs/Module/Profile_photo.php:315 #: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Item.php:229 -#: ../../Zotlabs/Module/Item.php:246 ../../Zotlabs/Module/Item.php:256 -#: ../../Zotlabs/Module/Item.php:1108 ../../Zotlabs/Module/Page.php:34 -#: ../../Zotlabs/Module/Page.php:133 ../../Zotlabs/Module/Connedit.php:389 -#: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Chat.php:105 +#: ../../Zotlabs/Module/Item.php:248 ../../Zotlabs/Module/Item.php:258 +#: ../../Zotlabs/Module/Item.php:1110 ../../Zotlabs/Module/Page.php:34 +#: ../../Zotlabs/Module/Page.php:133 ../../Zotlabs/Module/Connedit.php:390 +#: ../../Zotlabs/Module/Chat.php:115 ../../Zotlabs/Module/Chat.php:120 #: ../../Zotlabs/Module/Menu.php:129 ../../Zotlabs/Module/Menu.php:140 #: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78 #: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Cloud.php:40 -#: ../../Zotlabs/Module/Defperms.php:173 ../../Zotlabs/Module/Group.php:12 -#: ../../Zotlabs/Module/Group.php:24 ../../Zotlabs/Module/Profiles.php:198 +#: ../../Zotlabs/Module/Defperms.php:181 ../../Zotlabs/Module/Group.php:14 +#: ../../Zotlabs/Module/Group.php:30 ../../Zotlabs/Module/Profiles.php:198 #: ../../Zotlabs/Module/Profiles.php:635 #: ../../Zotlabs/Module/Editwebpage.php:68 #: ../../Zotlabs/Module/Editwebpage.php:89 #: ../../Zotlabs/Module/Editwebpage.php:107 #: ../../Zotlabs/Module/Editwebpage.php:121 ../../Zotlabs/Module/Manage.php:10 -#: ../../Zotlabs/Module/Cards.php:72 ../../Zotlabs/Module/Webpages.php:118 +#: ../../Zotlabs/Module/Cards.php:81 ../../Zotlabs/Module/Webpages.php:133 #: ../../Zotlabs/Module/Block.php:24 ../../Zotlabs/Module/Block.php:74 -#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Sources.php:77 +#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Sources.php:80 #: ../../Zotlabs/Module/Like.php:185 ../../Zotlabs/Module/Suggest.php:28 #: ../../Zotlabs/Module/Message.php:18 ../../Zotlabs/Module/Mail.php:146 #: ../../Zotlabs/Module/Register.php:77 #: ../../Zotlabs/Module/Cover_photo.php:313 #: ../../Zotlabs/Module/Cover_photo.php:326 -#: ../../Zotlabs/Module/Display.php:449 ../../Zotlabs/Module/Network.php:15 +#: ../../Zotlabs/Module/Display.php:449 ../../Zotlabs/Module/Network.php:17 #: ../../Zotlabs/Module/Filestorage.php:15 #: ../../Zotlabs/Module/Filestorage.php:70 #: ../../Zotlabs/Module/Filestorage.php:96 @@ -241,7 +238,7 @@ msgstr "" #: ../../include/attach.php:393 ../../include/attach.php:400 #: ../../include/attach.php:482 ../../include/attach.php:1042 #: ../../include/attach.php:1116 ../../include/attach.php:1281 -#: ../../include/items.php:3653 ../../include/photos.php:27 +#: ../../include/items.php:3675 ../../include/photos.php:27 msgid "Permission denied." msgstr "" @@ -250,7 +247,7 @@ msgstr "" msgid "Block Name" msgstr "" -#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2458 +#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2465 msgid "Blocks" msgstr "" @@ -259,20 +256,20 @@ msgid "Block Title" msgstr "" #: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Menu.php:177 -#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Webpages.php:251 +#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Webpages.php:266 msgid "Created" msgstr "" #: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Menu.php:178 -#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Webpages.php:252 +#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Webpages.php:267 msgid "Edited" msgstr "" -#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Articles.php:96 -#: ../../Zotlabs/Module/Cdav.php:1185 ../../Zotlabs/Module/New_channel.php:188 -#: ../../Zotlabs/Module/Connedit.php:921 ../../Zotlabs/Module/Menu.php:181 +#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Articles.php:108 +#: ../../Zotlabs/Module/Cdav.php:1230 ../../Zotlabs/Module/New_channel.php:189 +#: ../../Zotlabs/Module/Connedit.php:922 ../../Zotlabs/Module/Menu.php:181 #: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Module/Profiles.php:798 -#: ../../Zotlabs/Module/Cards.php:100 ../../Zotlabs/Module/Webpages.php:239 +#: ../../Zotlabs/Module/Cards.php:109 ../../Zotlabs/Module/Webpages.php:254 #: ../../Zotlabs/Storage/Browser.php:276 ../../Zotlabs/Storage/Browser.php:390 #: ../../Zotlabs/Widget/Cdav.php:128 ../../Zotlabs/Widget/Cdav.php:165 msgid "Create" @@ -280,216 +277,252 @@ msgstr "" #: ../../Zotlabs/Module/Blocks.php:160 ../../Zotlabs/Module/Editlayout.php:114 #: ../../Zotlabs/Module/Article_edit.php:99 -#: ../../Zotlabs/Module/Admin/Profs.php:175 -#: ../../Zotlabs/Module/Settings/Oauth2.php:150 -#: ../../Zotlabs/Module/Settings/Oauth.php:150 -#: ../../Zotlabs/Module/Thing.php:266 ../../Zotlabs/Module/Editblock.php:114 -#: ../../Zotlabs/Module/Connections.php:281 -#: ../../Zotlabs/Module/Connections.php:319 -#: ../../Zotlabs/Module/Connections.php:339 ../../Zotlabs/Module/Wiki.php:202 -#: ../../Zotlabs/Module/Wiki.php:362 ../../Zotlabs/Module/Menu.php:175 -#: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Module/Group.php:216 +#: ../../Zotlabs/Module/Admin/Profs.php:175 ../../Zotlabs/Module/Thing.php:266 +#: ../../Zotlabs/Module/Oauth2.php:194 ../../Zotlabs/Module/Editblock.php:114 +#: ../../Zotlabs/Module/Connections.php:284 +#: ../../Zotlabs/Module/Connections.php:322 +#: ../../Zotlabs/Module/Connections.php:342 ../../Zotlabs/Module/Wiki.php:211 +#: ../../Zotlabs/Module/Wiki.php:371 ../../Zotlabs/Module/Menu.php:175 +#: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Module/Group.php:235 #: ../../Zotlabs/Module/Editwebpage.php:142 -#: ../../Zotlabs/Module/Webpages.php:240 ../../Zotlabs/Module/Card_edit.php:99 -#: ../../Zotlabs/Lib/Apps.php:475 ../../Zotlabs/Lib/ThreadItem.php:128 -#: ../../Zotlabs/Storage/Browser.php:290 ../../Zotlabs/Widget/Cdav.php:126 -#: ../../Zotlabs/Widget/Cdav.php:162 ../../include/channel.php:1296 -#: ../../include/channel.php:1300 ../../include/menu.php:118 +#: ../../Zotlabs/Module/Webpages.php:255 ../../Zotlabs/Module/Card_edit.php:99 +#: ../../Zotlabs/Module/Oauth.php:173 ../../Zotlabs/Lib/Apps.php:537 +#: ../../Zotlabs/Lib/ThreadItem.php:128 ../../Zotlabs/Storage/Browser.php:290 +#: ../../Zotlabs/Widget/Cdav.php:126 ../../Zotlabs/Widget/Cdav.php:162 +#: ../../include/channel.php:1303 ../../include/channel.php:1307 +#: ../../include/menu.php:118 msgid "Edit" msgstr "" -#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1107 -#: ../../Zotlabs/Module/Wiki.php:287 ../../Zotlabs/Module/Layouts.php:194 -#: ../../Zotlabs/Module/Webpages.php:241 ../../Zotlabs/Widget/Cdav.php:124 -#: ../../include/conversation.php:1374 +#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1104 +#: ../../Zotlabs/Module/Wiki.php:296 ../../Zotlabs/Module/Layouts.php:194 +#: ../../Zotlabs/Module/Webpages.php:256 ../../Zotlabs/Widget/Cdav.php:124 +#: ../../addon/hsse/hsse.php:186 ../../include/conversation.php:1389 msgid "Share" msgstr "" #: ../../Zotlabs/Module/Blocks.php:162 ../../Zotlabs/Module/Editlayout.php:138 -#: ../../Zotlabs/Module/Cdav.php:897 ../../Zotlabs/Module/Cdav.php:1187 +#: ../../Zotlabs/Module/Cdav.php:942 ../../Zotlabs/Module/Cdav.php:1232 #: ../../Zotlabs/Module/Article_edit.php:129 #: ../../Zotlabs/Module/Admin/Accounts.php:175 #: ../../Zotlabs/Module/Admin/Channels.php:149 -#: ../../Zotlabs/Module/Admin/Profs.php:176 -#: ../../Zotlabs/Module/Settings/Oauth2.php:151 -#: ../../Zotlabs/Module/Settings/Oauth.php:151 -#: ../../Zotlabs/Module/Thing.php:267 ../../Zotlabs/Module/Editblock.php:139 -#: ../../Zotlabs/Module/Connections.php:289 -#: ../../Zotlabs/Module/Photos.php:1208 ../../Zotlabs/Module/Connedit.php:654 -#: ../../Zotlabs/Module/Connedit.php:923 ../../Zotlabs/Module/Profiles.php:800 +#: ../../Zotlabs/Module/Admin/Profs.php:176 ../../Zotlabs/Module/Thing.php:267 +#: ../../Zotlabs/Module/Oauth2.php:195 ../../Zotlabs/Module/Editblock.php:139 +#: ../../Zotlabs/Module/Connections.php:292 +#: ../../Zotlabs/Module/Photos.php:1205 ../../Zotlabs/Module/Connedit.php:655 +#: ../../Zotlabs/Module/Connedit.php:924 ../../Zotlabs/Module/Profiles.php:800 #: ../../Zotlabs/Module/Editwebpage.php:167 -#: ../../Zotlabs/Module/Webpages.php:242 ../../Zotlabs/Module/Card_edit.php:129 -#: ../../Zotlabs/Lib/Apps.php:476 ../../Zotlabs/Lib/ThreadItem.php:148 -#: ../../Zotlabs/Storage/Browser.php:291 ../../include/conversation.php:691 -#: ../../include/conversation.php:736 +#: ../../Zotlabs/Module/Webpages.php:257 ../../Zotlabs/Module/Card_edit.php:129 +#: ../../Zotlabs/Module/Oauth.php:174 ../../Zotlabs/Lib/Apps.php:538 +#: ../../Zotlabs/Lib/ThreadItem.php:148 ../../Zotlabs/Storage/Browser.php:291 +#: ../../include/conversation.php:691 ../../include/conversation.php:736 msgid "Delete" msgstr "" -#: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Events.php:694 -#: ../../Zotlabs/Module/Wiki.php:204 ../../Zotlabs/Module/Layouts.php:198 -#: ../../Zotlabs/Module/Webpages.php:246 ../../Zotlabs/Module/Pubsites.php:60 +#: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Events.php:695 +#: ../../Zotlabs/Module/Wiki.php:213 ../../Zotlabs/Module/Wiki.php:396 +#: ../../Zotlabs/Module/Layouts.php:198 ../../Zotlabs/Module/Webpages.php:261 +#: ../../Zotlabs/Module/Pubsites.php:60 msgid "View" msgstr "" -#: ../../Zotlabs/Module/Invite.php:29 +#: ../../Zotlabs/Module/Invite.php:37 msgid "Total invitation limit exceeded." msgstr "" -#: ../../Zotlabs/Module/Invite.php:53 +#: ../../Zotlabs/Module/Invite.php:61 #, php-format msgid "%s : Not a valid email address." msgstr "" -#: ../../Zotlabs/Module/Invite.php:67 +#: ../../Zotlabs/Module/Invite.php:75 msgid "Please join us on $Projectname" msgstr "" -#: ../../Zotlabs/Module/Invite.php:77 +#: ../../Zotlabs/Module/Invite.php:85 msgid "Invitation limit exceeded. Please contact your site administrator." msgstr "" -#: ../../Zotlabs/Module/Invite.php:82 +#: ../../Zotlabs/Module/Invite.php:90 #: ../../addon/notifyadmin/notifyadmin.php:40 #, php-format msgid "%s : Message delivery failed." msgstr "" -#: ../../Zotlabs/Module/Invite.php:86 +#: ../../Zotlabs/Module/Invite.php:94 #, php-format msgid "%d message sent." msgid_plural "%d messages sent." msgstr[0] "" msgstr[1] "" -#: ../../Zotlabs/Module/Invite.php:107 +#: ../../Zotlabs/Module/Invite.php:110 +msgid "Invite App" +msgstr "" + +#: ../../Zotlabs/Module/Invite.php:110 ../../Zotlabs/Module/Articles.php:43 +#: ../../Zotlabs/Module/Cdav.php:839 ../../Zotlabs/Module/Cdav.php:848 +#: ../../Zotlabs/Module/Permcats.php:62 ../../Zotlabs/Module/Lang.php:17 +#: ../../Zotlabs/Module/Uexport.php:61 ../../Zotlabs/Module/Connect.php:104 +#: ../../Zotlabs/Module/Tokens.php:99 ../../Zotlabs/Module/Oauth2.php:106 +#: ../../Zotlabs/Module/Mood.php:132 ../../Zotlabs/Module/Wiki.php:52 +#: ../../Zotlabs/Module/Pdledit.php:42 ../../Zotlabs/Module/Poke.php:165 +#: ../../Zotlabs/Module/Chat.php:102 ../../Zotlabs/Module/Notes.php:55 +#: ../../Zotlabs/Module/Defperms.php:189 ../../Zotlabs/Module/Group.php:101 +#: ../../Zotlabs/Module/Cards.php:46 ../../Zotlabs/Module/Webpages.php:48 +#: ../../Zotlabs/Module/Sources.php:88 ../../Zotlabs/Module/Oauth.php:100 +msgid "Not Installed" +msgstr "" + +#: ../../Zotlabs/Module/Invite.php:111 +msgid "Send email invitations to join this network" +msgstr "" + +#: ../../Zotlabs/Module/Invite.php:124 msgid "You have no more invitations available" msgstr "" -#: ../../Zotlabs/Module/Invite.php:138 +#: ../../Zotlabs/Module/Invite.php:155 msgid "Send invitations" msgstr "" -#: ../../Zotlabs/Module/Invite.php:139 +#: ../../Zotlabs/Module/Invite.php:156 msgid "Enter email addresses, one per line:" msgstr "" -#: ../../Zotlabs/Module/Invite.php:140 ../../Zotlabs/Module/Mail.php:285 +#: ../../Zotlabs/Module/Invite.php:157 ../../Zotlabs/Module/Mail.php:285 msgid "Your message:" msgstr "" -#: ../../Zotlabs/Module/Invite.php:141 +#: ../../Zotlabs/Module/Invite.php:158 msgid "Please join my community on $Projectname." msgstr "" -#: ../../Zotlabs/Module/Invite.php:143 +#: ../../Zotlabs/Module/Invite.php:160 msgid "You will need to supply this invitation code:" msgstr "" -#: ../../Zotlabs/Module/Invite.php:144 +#: ../../Zotlabs/Module/Invite.php:161 msgid "1. Register at any $Projectname location (they are all inter-connected)" msgstr "" -#: ../../Zotlabs/Module/Invite.php:146 +#: ../../Zotlabs/Module/Invite.php:163 msgid "2. Enter my $Projectname network address into the site searchbar." msgstr "" -#: ../../Zotlabs/Module/Invite.php:147 +#: ../../Zotlabs/Module/Invite.php:164 msgid "or visit" msgstr "" -#: ../../Zotlabs/Module/Invite.php:149 +#: ../../Zotlabs/Module/Invite.php:166 msgid "3. Click [Connect]" msgstr "" -#: ../../Zotlabs/Module/Invite.php:151 ../../Zotlabs/Module/Locs.php:121 -#: ../../Zotlabs/Module/Mitem.php:259 ../../Zotlabs/Module/Events.php:493 -#: ../../Zotlabs/Module/Appman.php:153 +#: ../../Zotlabs/Module/Invite.php:168 ../../Zotlabs/Module/Permcats.php:128 +#: ../../Zotlabs/Module/Locs.php:121 ../../Zotlabs/Module/Mitem.php:259 +#: ../../Zotlabs/Module/Events.php:495 ../../Zotlabs/Module/Appman.php:155 #: ../../Zotlabs/Module/Import_items.php:129 ../../Zotlabs/Module/Setup.php:308 -#: ../../Zotlabs/Module/Setup.php:349 ../../Zotlabs/Module/Connect.php:98 +#: ../../Zotlabs/Module/Setup.php:349 ../../Zotlabs/Module/Connect.php:124 #: ../../Zotlabs/Module/Admin/Features.php:66 #: ../../Zotlabs/Module/Admin/Accounts.php:168 #: ../../Zotlabs/Module/Admin/Logs.php:84 #: ../../Zotlabs/Module/Admin/Channels.php:147 #: ../../Zotlabs/Module/Admin/Themes.php:158 -#: ../../Zotlabs/Module/Admin/Site.php:309 +#: ../../Zotlabs/Module/Admin/Site.php:289 #: ../../Zotlabs/Module/Admin/Addons.php:438 #: ../../Zotlabs/Module/Admin/Profs.php:178 -#: ../../Zotlabs/Module/Admin/Account_edit.php:74 +#: ../../Zotlabs/Module/Admin/Account_edit.php:73 #: ../../Zotlabs/Module/Admin/Security.php:112 -#: ../../Zotlabs/Module/Settings/Permcats.php:115 -#: ../../Zotlabs/Module/Settings/Channel.php:516 -#: ../../Zotlabs/Module/Settings/Features.php:79 -#: ../../Zotlabs/Module/Settings/Tokens.php:168 -#: ../../Zotlabs/Module/Settings/Oauth2.php:85 -#: ../../Zotlabs/Module/Settings/Account.php:118 +#: ../../Zotlabs/Module/Settings/Channel.php:511 +#: ../../Zotlabs/Module/Settings/Features.php:46 +#: ../../Zotlabs/Module/Settings/Events.php:41 +#: ../../Zotlabs/Module/Settings/Calendar.php:41 +#: ../../Zotlabs/Module/Settings/Conversation.php:48 +#: ../../Zotlabs/Module/Settings/Connections.php:41 +#: ../../Zotlabs/Module/Settings/Photos.php:41 +#: ../../Zotlabs/Module/Settings/Account.php:103 +#: ../../Zotlabs/Module/Settings/Profiles.php:41 +#: ../../Zotlabs/Module/Settings/Manage.php:41 #: ../../Zotlabs/Module/Settings/Featured.php:54 -#: ../../Zotlabs/Module/Settings/Display.php:192 -#: ../../Zotlabs/Module/Settings/Oauth.php:88 -#: ../../Zotlabs/Module/Thing.php:326 ../../Zotlabs/Module/Thing.php:379 -#: ../../Zotlabs/Module/Import.php:565 ../../Zotlabs/Module/Cal.php:345 -#: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Photos.php:1087 -#: ../../Zotlabs/Module/Photos.php:1127 ../../Zotlabs/Module/Photos.php:1245 -#: ../../Zotlabs/Module/Wiki.php:206 ../../Zotlabs/Module/Pdledit.php:98 -#: ../../Zotlabs/Module/Poke.php:200 ../../Zotlabs/Module/Connedit.php:887 -#: ../../Zotlabs/Module/Chat.php:196 ../../Zotlabs/Module/Chat.php:242 +#: ../../Zotlabs/Module/Settings/Channel_home.php:61 +#: ../../Zotlabs/Module/Settings/Directory.php:41 +#: ../../Zotlabs/Module/Settings/Editor.php:41 +#: ../../Zotlabs/Module/Settings/Display.php:189 +#: ../../Zotlabs/Module/Settings/Network.php:61 +#: ../../Zotlabs/Module/Tokens.php:188 ../../Zotlabs/Module/Thing.php:326 +#: ../../Zotlabs/Module/Thing.php:379 ../../Zotlabs/Module/Import.php:565 +#: ../../Zotlabs/Module/Oauth2.php:116 ../../Zotlabs/Module/Cal.php:344 +#: ../../Zotlabs/Module/Mood.php:156 ../../Zotlabs/Module/Photos.php:1084 +#: ../../Zotlabs/Module/Photos.php:1124 ../../Zotlabs/Module/Photos.php:1242 +#: ../../Zotlabs/Module/Wiki.php:215 ../../Zotlabs/Module/Pdledit.php:107 +#: ../../Zotlabs/Module/Poke.php:217 ../../Zotlabs/Module/Connedit.php:888 +#: ../../Zotlabs/Module/Chat.php:211 ../../Zotlabs/Module/Chat.php:250 #: ../../Zotlabs/Module/Email_validation.php:40 -#: ../../Zotlabs/Module/Pconfig.php:107 ../../Zotlabs/Module/Defperms.php:249 -#: ../../Zotlabs/Module/Group.php:121 ../../Zotlabs/Module/Group.php:137 +#: ../../Zotlabs/Module/Pconfig.php:107 ../../Zotlabs/Module/Defperms.php:265 +#: ../../Zotlabs/Module/Group.php:140 ../../Zotlabs/Module/Group.php:156 #: ../../Zotlabs/Module/Profiles.php:723 ../../Zotlabs/Module/Editpost.php:85 -#: ../../Zotlabs/Module/Sources.php:117 ../../Zotlabs/Module/Sources.php:154 +#: ../../Zotlabs/Module/Sources.php:125 ../../Zotlabs/Module/Sources.php:162 #: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Module/Mail.php:431 #: ../../Zotlabs/Module/Filestorage.php:183 ../../Zotlabs/Module/Rate.php:166 -#: ../../Zotlabs/Lib/ThreadItem.php:757 ../../Zotlabs/Widget/Eventstools.php:16 +#: ../../Zotlabs/Module/Oauth.php:111 ../../Zotlabs/Lib/ThreadItem.php:765 +#: ../../Zotlabs/Widget/Eventstools.php:16 #: ../../Zotlabs/Widget/Wiki_pages.php:40 #: ../../Zotlabs/Widget/Wiki_pages.php:97 #: ../../view/theme/redbasic_c/php/config.php:95 -#: ../../view/theme/redbasic/php/config.php:93 -#: ../../addon/skeleton/skeleton.php:65 ../../addon/gnusoc/gnusoc.php:284 -#: ../../addon/planets/planets.php:153 +#: ../../view/theme/redbasic/php/config.php:94 +#: ../../addon/skeleton/skeleton.php:65 ../../addon/planets/planets.php:153 #: ../../addon/openclipatar/openclipatar.php:53 -#: ../../addon/wppost/wppost.php:113 ../../addon/nsfw/nsfw.php:92 +#: ../../addon/wppost/Mod_Wppost.php:97 ../../addon/nsfw/Mod_Nsfw.php:61 #: ../../addon/ijpost/ijpost.php:89 ../../addon/dwpost/dwpost.php:89 #: ../../addon/likebanner/likebanner.php:57 #: ../../addon/redphotos/redphotos.php:136 ../../addon/irc/irc.php:53 -#: ../../addon/ljpost/ljpost.php:86 ../../addon/startpage/startpage.php:113 -#: ../../addon/diaspora/diaspora.php:830 -#: ../../addon/rainbowtag/rainbowtag.php:85 ../../addon/hzfiles/hzfiles.php:84 +#: ../../addon/ljpost/ljpost.php:86 ../../addon/startpage/Mod_Startpage.php:73 +#: ../../addon/diaspora/Mod_Diaspora.php:99 ../../addon/hzfiles/hzfiles.php:84 #: ../../addon/visage/visage.php:170 ../../addon/nsabait/nsabait.php:161 #: ../../addon/mailtest/mailtest.php:100 #: ../../addon/openstreetmap/openstreetmap.php:168 #: ../../addon/fuzzloc/fuzzloc.php:191 ../../addon/rtof/rtof.php:101 #: ../../addon/jappixmini/jappixmini.php:371 -#: ../../addon/superblock/superblock.php:120 ../../addon/nofed/nofed.php:80 -#: ../../addon/redred/redred.php:119 ../../addon/logrot/logrot.php:35 -#: ../../addon/frphotos/frphotos.php:97 ../../addon/pubcrawl/pubcrawl.php:1159 +#: ../../addon/channelreputation/channelreputation.php:139 +#: ../../addon/nofed/nofed.php:80 ../../addon/redred/redred.php:119 +#: ../../addon/logrot/logrot.php:35 ../../addon/frphotos/frphotos.php:97 +#: ../../addon/pubcrawl/Mod_Pubcrawl.php:63 #: ../../addon/chords/Mod_Chords.php:60 ../../addon/libertree/libertree.php:85 #: ../../addon/flattrwidget/flattrwidget.php:124 #: ../../addon/statusnet/statusnet.php:322 #: ../../addon/statusnet/statusnet.php:380 #: ../../addon/statusnet/statusnet.php:432 -#: ../../addon/statusnet/statusnet.php:900 ../../addon/twitter/twitter.php:218 -#: ../../addon/twitter/twitter.php:265 -#: ../../addon/smileybutton/smileybutton.php:219 ../../addon/cart/cart.php:1251 -#: ../../addon/cart/submodules/paypalbutton.php:144 -#: ../../addon/cart/submodules/hzservices.php:78 -#: ../../addon/cart/submodules/hzservices.php:647 +#: ../../addon/statusnet/statusnet.php:900 ../../addon/twitter/twitter.php:221 +#: ../../addon/twitter/twitter.php:268 +#: ../../addon/smileybutton/smileybutton.php:219 +#: ../../addon/cart/Settings/Cart.php:114 ../../addon/cart/cart.php:1261 +#: ../../addon/cart/submodules/manualcat.php:249 +#: ../../addon/cart/submodules/hzservices.php:639 +#: ../../addon/cart/submodules/subscriptions.php:399 #: ../../addon/piwik/piwik.php:95 ../../addon/pageheader/pageheader.php:48 -#: ../../addon/authchoose/authchoose.php:71 ../../addon/xmpp/xmpp.php:69 -#: ../../addon/pumpio/pumpio.php:237 ../../addon/redfiles/redfiles.php:124 -#: ../../addon/hubwall/hubwall.php:95 ../../include/js_strings.php:22 +#: ../../addon/xmpp/xmpp.php:69 ../../addon/pumpio/pumpio.php:237 +#: ../../addon/redfiles/redfiles.php:124 ../../addon/hubwall/hubwall.php:95 +#: ../../include/js_strings.php:22 msgid "Submit" msgstr "" -#: ../../Zotlabs/Module/Articles.php:38 ../../Zotlabs/Module/Articles.php:191 -#: ../../Zotlabs/Lib/Apps.php:292 ../../include/features.php:133 -#: ../../include/nav.php:461 -msgid "Articles" +#: ../../Zotlabs/Module/Articles.php:43 +msgid "Articles App" msgstr "" -#: ../../Zotlabs/Module/Articles.php:95 +#: ../../Zotlabs/Module/Articles.php:44 +msgid "Create interactive articles" +msgstr "" + +#: ../../Zotlabs/Module/Articles.php:107 msgid "Add Article" msgstr "" +#: ../../Zotlabs/Module/Articles.php:214 ../../Zotlabs/Lib/Apps.php:305 +#: ../../include/nav.php:477 +msgid "Articles" +msgstr "" + #: ../../Zotlabs/Module/Editlayout.php:79 #: ../../Zotlabs/Module/Article_edit.php:17 #: ../../Zotlabs/Module/Article_edit.php:33 @@ -512,32 +545,31 @@ msgstr "" msgid "Edit Layout" msgstr "" -#: ../../Zotlabs/Module/Editlayout.php:140 ../../Zotlabs/Module/Cdav.php:899 -#: ../../Zotlabs/Module/Cdav.php:1188 ../../Zotlabs/Module/Article_edit.php:131 +#: ../../Zotlabs/Module/Editlayout.php:140 ../../Zotlabs/Module/Cdav.php:944 +#: ../../Zotlabs/Module/Cdav.php:1233 ../../Zotlabs/Module/Article_edit.php:131 #: ../../Zotlabs/Module/Admin/Addons.php:423 -#: ../../Zotlabs/Module/Settings/Oauth2.php:86 -#: ../../Zotlabs/Module/Settings/Oauth2.php:114 -#: ../../Zotlabs/Module/Settings/Oauth.php:89 -#: ../../Zotlabs/Module/Settings/Oauth.php:115 -#: ../../Zotlabs/Module/Editblock.php:141 ../../Zotlabs/Module/Wiki.php:347 -#: ../../Zotlabs/Module/Wiki.php:379 ../../Zotlabs/Module/Profile_photo.php:465 -#: ../../Zotlabs/Module/Connedit.php:924 ../../Zotlabs/Module/Fbrowser.php:66 +#: ../../Zotlabs/Module/Oauth2.php:117 ../../Zotlabs/Module/Oauth2.php:145 +#: ../../Zotlabs/Module/Editblock.php:141 ../../Zotlabs/Module/Wiki.php:356 +#: ../../Zotlabs/Module/Wiki.php:388 ../../Zotlabs/Module/Profile_photo.php:465 +#: ../../Zotlabs/Module/Connedit.php:925 ../../Zotlabs/Module/Fbrowser.php:66 #: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Profiles.php:801 #: ../../Zotlabs/Module/Editwebpage.php:169 #: ../../Zotlabs/Module/Editpost.php:109 ../../Zotlabs/Module/Filer.php:55 #: ../../Zotlabs/Module/Cover_photo.php:399 ../../Zotlabs/Module/Tagrm.php:15 #: ../../Zotlabs/Module/Tagrm.php:138 ../../Zotlabs/Module/Card_edit.php:131 -#: ../../include/conversation.php:1397 ../../include/conversation.php:1446 +#: ../../Zotlabs/Module/Oauth.php:112 ../../Zotlabs/Module/Oauth.php:138 +#: ../../addon/hsse/hsse.php:209 ../../addon/hsse/hsse.php:258 +#: ../../include/conversation.php:1412 ../../include/conversation.php:1461 msgid "Cancel" msgstr "" #: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:86 #: ../../Zotlabs/Module/Import_items.php:120 ../../Zotlabs/Module/Cloud.php:126 -#: ../../Zotlabs/Module/Group.php:83 ../../Zotlabs/Module/Dreport.php:10 +#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Dreport.php:10 #: ../../Zotlabs/Module/Dreport.php:68 ../../Zotlabs/Module/Like.php:296 #: ../../Zotlabs/Web/WebServer.php:122 ../../addon/redphotos/redphotos.php:119 #: ../../addon/hzfiles/hzfiles.php:73 ../../addon/frphotos/frphotos.php:82 -#: ../../addon/redfiles/redfiles.php:109 ../../include/items.php:364 +#: ../../addon/redfiles/redfiles.php:109 ../../include/items.php:384 msgid "Permission denied" msgstr "" @@ -549,7 +581,8 @@ msgstr "" msgid "Profile Visibility Editor" msgstr "" -#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1644 +#: ../../Zotlabs/Module/Profperm.php:113 ../../Zotlabs/Lib/Apps.php:340 +#: ../../include/channel.php:1651 msgid "Profile" msgstr "" @@ -562,144 +595,159 @@ msgid "Visible To" msgstr "" #: ../../Zotlabs/Module/Profperm.php:140 -#: ../../Zotlabs/Module/Connections.php:200 +#: ../../Zotlabs/Module/Connections.php:203 msgid "All Connections" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:785 +#: ../../Zotlabs/Module/Cdav.php:810 msgid "INVALID EVENT DISMISSED!" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:786 +#: ../../Zotlabs/Module/Cdav.php:811 msgid "Summary: " msgstr "" -#: ../../Zotlabs/Module/Cdav.php:786 ../../Zotlabs/Module/Cdav.php:787 -#: ../../Zotlabs/Module/Cdav.php:794 ../../Zotlabs/Module/Embedphotos.php:146 -#: ../../Zotlabs/Module/Photos.php:822 ../../Zotlabs/Module/Photos.php:1278 -#: ../../Zotlabs/Lib/Apps.php:819 ../../Zotlabs/Lib/Apps.php:898 -#: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Widget/Portfolio.php:95 -#: ../../Zotlabs/Widget/Album.php:84 ../../addon/pubcrawl/as.php:961 -#: ../../include/conversation.php:1165 +#: ../../Zotlabs/Module/Cdav.php:811 ../../Zotlabs/Module/Cdav.php:812 +#: ../../Zotlabs/Module/Cdav.php:819 ../../Zotlabs/Module/Embedphotos.php:146 +#: ../../Zotlabs/Module/Photos.php:819 ../../Zotlabs/Module/Photos.php:1275 +#: ../../Zotlabs/Lib/Activity.php:858 ../../Zotlabs/Lib/Apps.php:997 +#: ../../Zotlabs/Lib/Apps.php:1081 ../../Zotlabs/Storage/Browser.php:164 +#: ../../Zotlabs/Widget/Portfolio.php:95 ../../Zotlabs/Widget/Album.php:84 +#: ../../addon/pubcrawl/as.php:964 ../../include/conversation.php:1166 msgid "Unknown" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:787 +#: ../../Zotlabs/Module/Cdav.php:812 msgid "Date: " msgstr "" -#: ../../Zotlabs/Module/Cdav.php:788 ../../Zotlabs/Module/Cdav.php:795 +#: ../../Zotlabs/Module/Cdav.php:813 ../../Zotlabs/Module/Cdav.php:820 msgid "Reason: " msgstr "" -#: ../../Zotlabs/Module/Cdav.php:793 +#: ../../Zotlabs/Module/Cdav.php:818 msgid "INVALID CARD DISMISSED!" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:794 +#: ../../Zotlabs/Module/Cdav.php:819 msgid "Name: " msgstr "" -#: ../../Zotlabs/Module/Cdav.php:868 ../../Zotlabs/Module/Events.php:460 +#: ../../Zotlabs/Module/Cdav.php:839 +msgid "CalDAV App" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:840 +msgid "CalDAV capable calendar" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:848 +msgid "CardDAV App" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:849 +msgid "CalDAV capable addressbook" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:913 ../../Zotlabs/Module/Events.php:462 msgid "Event title" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:869 ../../Zotlabs/Module/Events.php:466 +#: ../../Zotlabs/Module/Cdav.php:914 ../../Zotlabs/Module/Events.php:468 msgid "Start date and time" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:869 ../../Zotlabs/Module/Cdav.php:870 +#: ../../Zotlabs/Module/Cdav.php:914 ../../Zotlabs/Module/Cdav.php:915 msgid "Example: YYYY-MM-DD HH:mm" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:870 +#: ../../Zotlabs/Module/Cdav.php:915 msgid "End date and time" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:871 ../../Zotlabs/Module/Events.php:473 -#: ../../Zotlabs/Module/Appman.php:143 ../../Zotlabs/Module/Rbmark.php:101 +#: ../../Zotlabs/Module/Cdav.php:916 ../../Zotlabs/Module/Events.php:475 +#: ../../Zotlabs/Module/Appman.php:145 ../../Zotlabs/Module/Rbmark.php:101 #: ../../addon/rendezvous/rendezvous.php:173 -#: ../../addon/cart/submodules/hzservices.php:659 +#: ../../addon/cart/submodules/manualcat.php:261 +#: ../../addon/cart/submodules/hzservices.php:651 msgid "Description" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:872 ../../Zotlabs/Module/Locs.php:117 -#: ../../Zotlabs/Module/Events.php:475 ../../Zotlabs/Module/Profiles.php:509 +#: ../../Zotlabs/Module/Cdav.php:917 ../../Zotlabs/Module/Locs.php:117 +#: ../../Zotlabs/Module/Events.php:477 ../../Zotlabs/Module/Profiles.php:509 #: ../../Zotlabs/Module/Profiles.php:734 ../../Zotlabs/Module/Pubsites.php:52 #: ../../include/js_strings.php:25 msgid "Location" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:879 ../../Zotlabs/Module/Events.php:689 -#: ../../Zotlabs/Module/Events.php:698 ../../Zotlabs/Module/Cal.php:339 -#: ../../Zotlabs/Module/Cal.php:346 ../../Zotlabs/Module/Photos.php:976 +#: ../../Zotlabs/Module/Cdav.php:924 ../../Zotlabs/Module/Events.php:690 +#: ../../Zotlabs/Module/Events.php:699 ../../Zotlabs/Module/Cal.php:338 +#: ../../Zotlabs/Module/Cal.php:345 ../../Zotlabs/Module/Photos.php:973 msgid "Previous" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:880 ../../Zotlabs/Module/Events.php:690 -#: ../../Zotlabs/Module/Events.php:699 ../../Zotlabs/Module/Setup.php:263 -#: ../../Zotlabs/Module/Cal.php:340 ../../Zotlabs/Module/Cal.php:347 -#: ../../Zotlabs/Module/Photos.php:985 +#: ../../Zotlabs/Module/Cdav.php:925 ../../Zotlabs/Module/Events.php:691 +#: ../../Zotlabs/Module/Events.php:700 ../../Zotlabs/Module/Setup.php:263 +#: ../../Zotlabs/Module/Cal.php:339 ../../Zotlabs/Module/Cal.php:346 +#: ../../Zotlabs/Module/Photos.php:982 msgid "Next" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:881 ../../Zotlabs/Module/Events.php:700 -#: ../../Zotlabs/Module/Cal.php:348 +#: ../../Zotlabs/Module/Cdav.php:926 ../../Zotlabs/Module/Events.php:701 +#: ../../Zotlabs/Module/Cal.php:347 msgid "Today" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:882 ../../Zotlabs/Module/Events.php:695 +#: ../../Zotlabs/Module/Cdav.php:927 ../../Zotlabs/Module/Events.php:696 msgid "Month" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:883 ../../Zotlabs/Module/Events.php:696 +#: ../../Zotlabs/Module/Cdav.php:928 ../../Zotlabs/Module/Events.php:697 msgid "Week" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:884 ../../Zotlabs/Module/Events.php:697 +#: ../../Zotlabs/Module/Cdav.php:929 ../../Zotlabs/Module/Events.php:698 msgid "Day" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:885 +#: ../../Zotlabs/Module/Cdav.php:930 msgid "List month" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:886 +#: ../../Zotlabs/Module/Cdav.php:931 msgid "List week" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:887 +#: ../../Zotlabs/Module/Cdav.php:932 msgid "List day" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:894 +#: ../../Zotlabs/Module/Cdav.php:939 msgid "More" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:895 +#: ../../Zotlabs/Module/Cdav.php:940 msgid "Less" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:896 +#: ../../Zotlabs/Module/Cdav.php:941 msgid "Select calendar" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:898 +#: ../../Zotlabs/Module/Cdav.php:943 msgid "Delete all" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:900 +#: ../../Zotlabs/Module/Cdav.php:945 msgid "Sorry! Editing of recurrent events is not yet implemented." msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1170 ../../Zotlabs/Module/Sharedwithme.php:105 +#: ../../Zotlabs/Module/Cdav.php:1215 ../../Zotlabs/Module/Sharedwithme.php:104 #: ../../Zotlabs/Module/Admin/Channels.php:159 -#: ../../Zotlabs/Module/Settings/Oauth2.php:87 -#: ../../Zotlabs/Module/Settings/Oauth2.php:115 -#: ../../Zotlabs/Module/Settings/Oauth.php:90 -#: ../../Zotlabs/Module/Settings/Oauth.php:116 -#: ../../Zotlabs/Module/Wiki.php:209 ../../Zotlabs/Module/Connedit.php:906 -#: ../../Zotlabs/Module/Chat.php:251 ../../Zotlabs/Module/Group.php:125 +#: ../../Zotlabs/Module/Oauth2.php:118 ../../Zotlabs/Module/Oauth2.php:146 +#: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Module/Connedit.php:907 +#: ../../Zotlabs/Module/Chat.php:259 ../../Zotlabs/Module/Group.php:144 +#: ../../Zotlabs/Module/Oauth.php:113 ../../Zotlabs/Module/Oauth.php:139 #: ../../Zotlabs/Lib/NativeWikiPage.php:558 #: ../../Zotlabs/Storage/Browser.php:285 #: ../../Zotlabs/Widget/Wiki_page_history.php:22 @@ -707,124 +755,122 @@ msgstr "" msgid "Name" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1171 ../../Zotlabs/Module/Connedit.php:907 +#: ../../Zotlabs/Module/Cdav.php:1216 ../../Zotlabs/Module/Connedit.php:908 msgid "Organisation" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1172 ../../Zotlabs/Module/Connedit.php:908 +#: ../../Zotlabs/Module/Cdav.php:1217 ../../Zotlabs/Module/Connedit.php:909 msgid "Title" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1173 ../../Zotlabs/Module/Connedit.php:909 +#: ../../Zotlabs/Module/Cdav.php:1218 ../../Zotlabs/Module/Connedit.php:910 #: ../../Zotlabs/Module/Profiles.php:786 msgid "Phone" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1174 +#: ../../Zotlabs/Module/Cdav.php:1219 #: ../../Zotlabs/Module/Admin/Accounts.php:171 #: ../../Zotlabs/Module/Admin/Accounts.php:183 -#: ../../Zotlabs/Module/Connedit.php:910 ../../Zotlabs/Module/Profiles.php:787 +#: ../../Zotlabs/Module/Connedit.php:911 ../../Zotlabs/Module/Profiles.php:787 #: ../../addon/openid/MysqlProvider.php:56 #: ../../addon/openid/MysqlProvider.php:57 ../../addon/rtof/rtof.php:93 #: ../../addon/redred/redred.php:107 ../../include/network.php:1769 msgid "Email" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1175 ../../Zotlabs/Module/Connedit.php:911 +#: ../../Zotlabs/Module/Cdav.php:1220 ../../Zotlabs/Module/Connedit.php:912 #: ../../Zotlabs/Module/Profiles.php:788 msgid "Instant messenger" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1176 ../../Zotlabs/Module/Connedit.php:912 +#: ../../Zotlabs/Module/Cdav.php:1221 ../../Zotlabs/Module/Connedit.php:913 #: ../../Zotlabs/Module/Profiles.php:789 msgid "Website" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1177 ../../Zotlabs/Module/Locs.php:118 +#: ../../Zotlabs/Module/Cdav.php:1222 ../../Zotlabs/Module/Locs.php:118 #: ../../Zotlabs/Module/Admin/Channels.php:160 -#: ../../Zotlabs/Module/Connedit.php:913 ../../Zotlabs/Module/Profiles.php:502 +#: ../../Zotlabs/Module/Connedit.php:914 ../../Zotlabs/Module/Profiles.php:502 #: ../../Zotlabs/Module/Profiles.php:790 msgid "Address" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1178 ../../Zotlabs/Module/Connedit.php:914 +#: ../../Zotlabs/Module/Cdav.php:1223 ../../Zotlabs/Module/Connedit.php:915 #: ../../Zotlabs/Module/Profiles.php:791 msgid "Note" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1179 ../../Zotlabs/Module/Connedit.php:915 +#: ../../Zotlabs/Module/Cdav.php:1224 ../../Zotlabs/Module/Connedit.php:916 #: ../../Zotlabs/Module/Profiles.php:792 ../../include/event.php:1308 #: ../../include/connections.php:696 msgid "Mobile" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1180 ../../Zotlabs/Module/Connedit.php:916 +#: ../../Zotlabs/Module/Cdav.php:1225 ../../Zotlabs/Module/Connedit.php:917 #: ../../Zotlabs/Module/Profiles.php:793 ../../include/event.php:1309 #: ../../include/connections.php:697 msgid "Home" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1181 ../../Zotlabs/Module/Connedit.php:917 +#: ../../Zotlabs/Module/Cdav.php:1226 ../../Zotlabs/Module/Connedit.php:918 #: ../../Zotlabs/Module/Profiles.php:794 ../../include/event.php:1312 #: ../../include/connections.php:700 msgid "Work" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1183 ../../Zotlabs/Module/Connedit.php:919 +#: ../../Zotlabs/Module/Cdav.php:1228 ../../Zotlabs/Module/Connedit.php:920 #: ../../Zotlabs/Module/Profiles.php:796 #: ../../addon/jappixmini/jappixmini.php:368 msgid "Add Contact" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1184 ../../Zotlabs/Module/Connedit.php:920 +#: ../../Zotlabs/Module/Cdav.php:1229 ../../Zotlabs/Module/Connedit.php:921 #: ../../Zotlabs/Module/Profiles.php:797 msgid "Add Field" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1186 ../../Zotlabs/Module/Admin/Addons.php:453 -#: ../../Zotlabs/Module/Settings/Oauth2.php:40 -#: ../../Zotlabs/Module/Settings/Oauth2.php:113 -#: ../../Zotlabs/Module/Settings/Oauth.php:43 -#: ../../Zotlabs/Module/Settings/Oauth.php:114 -#: ../../Zotlabs/Module/Connedit.php:922 ../../Zotlabs/Module/Profiles.php:799 -#: ../../Zotlabs/Lib/Apps.php:456 +#: ../../Zotlabs/Module/Cdav.php:1231 ../../Zotlabs/Module/Admin/Addons.php:453 +#: ../../Zotlabs/Module/Oauth2.php:58 ../../Zotlabs/Module/Oauth2.php:144 +#: ../../Zotlabs/Module/Connedit.php:923 ../../Zotlabs/Module/Profiles.php:799 +#: ../../Zotlabs/Module/Oauth.php:53 ../../Zotlabs/Module/Oauth.php:137 +#: ../../Zotlabs/Lib/Apps.php:516 msgid "Update" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1189 ../../Zotlabs/Module/Connedit.php:925 +#: ../../Zotlabs/Module/Cdav.php:1234 ../../Zotlabs/Module/Connedit.php:926 msgid "P.O. Box" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1190 ../../Zotlabs/Module/Connedit.php:926 +#: ../../Zotlabs/Module/Cdav.php:1235 ../../Zotlabs/Module/Connedit.php:927 msgid "Additional" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1191 ../../Zotlabs/Module/Connedit.php:927 +#: ../../Zotlabs/Module/Cdav.php:1236 ../../Zotlabs/Module/Connedit.php:928 msgid "Street" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1192 ../../Zotlabs/Module/Connedit.php:928 +#: ../../Zotlabs/Module/Cdav.php:1237 ../../Zotlabs/Module/Connedit.php:929 msgid "Locality" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1193 ../../Zotlabs/Module/Connedit.php:929 +#: ../../Zotlabs/Module/Cdav.php:1238 ../../Zotlabs/Module/Connedit.php:930 msgid "Region" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1194 ../../Zotlabs/Module/Connedit.php:930 +#: ../../Zotlabs/Module/Cdav.php:1239 ../../Zotlabs/Module/Connedit.php:931 msgid "ZIP Code" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1195 ../../Zotlabs/Module/Connedit.php:931 +#: ../../Zotlabs/Module/Cdav.php:1240 ../../Zotlabs/Module/Connedit.php:932 #: ../../Zotlabs/Module/Profiles.php:757 msgid "Country" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1242 +#: ../../Zotlabs/Module/Cdav.php:1287 msgid "Default Calendar" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1252 +#: ../../Zotlabs/Module/Cdav.php:1297 msgid "Default Addressbook" msgstr "" @@ -832,51 +878,125 @@ msgstr "" msgid "This site is not a directory server" msgstr "" -#: ../../Zotlabs/Module/Channel.php:35 ../../Zotlabs/Module/Ochannel.php:32 -#: ../../Zotlabs/Module/Chat.php:25 ../../addon/chess/chess.php:508 +#: ../../Zotlabs/Module/Permcats.php:28 +msgid "Permission category name is required." +msgstr "" + +#: ../../Zotlabs/Module/Permcats.php:47 +msgid "Permission category saved." +msgstr "" + +#: ../../Zotlabs/Module/Permcats.php:62 +msgid "Permission Categories App" +msgstr "" + +#: ../../Zotlabs/Module/Permcats.php:63 +msgid "Create custom connection permission limits" +msgstr "" + +#: ../../Zotlabs/Module/Permcats.php:79 +msgid "" +"Use this form to create permission rules for various classes of people or " +"connections." +msgstr "" + +#: ../../Zotlabs/Module/Permcats.php:112 ../../Zotlabs/Lib/Apps.php:354 +msgid "Permission Categories" +msgstr "" + +#: ../../Zotlabs/Module/Permcats.php:120 +msgid "Permission category name" +msgstr "" + +#: ../../Zotlabs/Module/Permcats.php:121 ../../Zotlabs/Module/Tokens.php:181 +#: ../../Zotlabs/Module/Connedit.php:892 ../../Zotlabs/Module/Defperms.php:266 +msgid "My Settings" +msgstr "" + +#: ../../Zotlabs/Module/Permcats.php:123 ../../Zotlabs/Module/Tokens.php:183 +#: ../../Zotlabs/Module/Connedit.php:887 ../../Zotlabs/Module/Defperms.php:264 +msgid "inherited" +msgstr "" + +#: ../../Zotlabs/Module/Permcats.php:126 ../../Zotlabs/Module/Tokens.php:186 +#: ../../Zotlabs/Module/Connedit.php:894 ../../Zotlabs/Module/Defperms.php:269 +msgid "Individual Permissions" +msgstr "" + +#: ../../Zotlabs/Module/Permcats.php:127 ../../Zotlabs/Module/Tokens.php:187 +#: ../../Zotlabs/Module/Connedit.php:895 +msgid "" +"Some permissions may be inherited from your channel's <a href=\"settings" +"\"><strong>privacy settings</strong></a>, which have higher priority than " +"individual settings. You can <strong>not</strong> change those settings here." +msgstr "" + +#: ../../Zotlabs/Module/Channel.php:39 ../../Zotlabs/Module/Ochannel.php:32 +#: ../../Zotlabs/Module/Chat.php:31 ../../addon/chess/chess.php:508 msgid "You must be logged in to see this page." msgstr "" -#: ../../Zotlabs/Module/Channel.php:50 ../../Zotlabs/Module/Hcard.php:37 +#: ../../Zotlabs/Module/Channel.php:54 ../../Zotlabs/Module/Hcard.php:37 #: ../../Zotlabs/Module/Profile.php:45 msgid "Posts and comments" msgstr "" -#: ../../Zotlabs/Module/Channel.php:57 ../../Zotlabs/Module/Hcard.php:44 +#: ../../Zotlabs/Module/Channel.php:61 ../../Zotlabs/Module/Hcard.php:44 #: ../../Zotlabs/Module/Profile.php:52 msgid "Only posts" msgstr "" -#: ../../Zotlabs/Module/Channel.php:112 +#: ../../Zotlabs/Module/Channel.php:116 msgid "Insufficient permissions. Request redirected to profile page." msgstr "" -#: ../../Zotlabs/Module/Channel.php:129 ../../Zotlabs/Module/Network.php:174 +#: ../../Zotlabs/Module/Channel.php:133 ../../Zotlabs/Module/Network.php:163 msgid "Search Results For:" msgstr "" -#: ../../Zotlabs/Module/Channel.php:164 ../../Zotlabs/Module/Hq.php:134 -#: ../../Zotlabs/Module/Pubstream.php:80 ../../Zotlabs/Module/Display.php:81 -#: ../../Zotlabs/Module/Network.php:204 +#: ../../Zotlabs/Module/Channel.php:168 ../../Zotlabs/Module/Hq.php:134 +#: ../../Zotlabs/Module/Pubstream.php:80 ../../Zotlabs/Module/Display.php:80 +#: ../../Zotlabs/Module/Network.php:193 msgid "Reset form" msgstr "" -#: ../../Zotlabs/Module/Uexport.php:57 ../../Zotlabs/Module/Uexport.php:58 +#: ../../Zotlabs/Module/Channel.php:424 ../../Zotlabs/Module/Display.php:375 +msgid "" +"You must enable javascript for your browser to be able to view this content." +msgstr "" + +#: ../../Zotlabs/Module/Lang.php:17 +msgid "Language App" +msgstr "" + +#: ../../Zotlabs/Module/Lang.php:18 +msgid "Change UI language" +msgstr "" + +#: ../../Zotlabs/Module/Uexport.php:61 +msgid "Channel Export App" +msgstr "" + +#: ../../Zotlabs/Module/Uexport.php:62 +msgid "Export your channel" +msgstr "" + +#: ../../Zotlabs/Module/Uexport.php:72 ../../Zotlabs/Module/Uexport.php:73 msgid "Export Channel" msgstr "" -#: ../../Zotlabs/Module/Uexport.php:59 +#: ../../Zotlabs/Module/Uexport.php:74 msgid "" "Export your basic channel information to a file. This acts as a backup of " "your connections, permissions, profile and basic data, which can be used to " "import your data to a new server hub, but does not contain your content." msgstr "" -#: ../../Zotlabs/Module/Uexport.php:60 +#: ../../Zotlabs/Module/Uexport.php:75 msgid "Export Content" msgstr "" -#: ../../Zotlabs/Module/Uexport.php:61 +#: ../../Zotlabs/Module/Uexport.php:76 msgid "" "Export your channel information and recent content to a JSON backup that can " "be restored or imported to another server hub. This backs up all of your " @@ -885,11 +1005,11 @@ msgid "" "this download to begin." msgstr "" -#: ../../Zotlabs/Module/Uexport.php:63 +#: ../../Zotlabs/Module/Uexport.php:78 msgid "Export your posts from a given year." msgstr "" -#: ../../Zotlabs/Module/Uexport.php:65 +#: ../../Zotlabs/Module/Uexport.php:80 msgid "" "You may also export your posts and conversations for a particular year or " "month. Adjust the date in your browser location bar to select other dates. " @@ -897,21 +1017,21 @@ msgid "" "please try again selecting a more limited date range." msgstr "" -#: ../../Zotlabs/Module/Uexport.php:66 +#: ../../Zotlabs/Module/Uexport.php:81 #, php-format msgid "" "To select all posts for a given year, such as this year, visit <a href=\"%1$s" "\">%2$s</a>" msgstr "" -#: ../../Zotlabs/Module/Uexport.php:67 +#: ../../Zotlabs/Module/Uexport.php:82 #, php-format msgid "" "To select all posts for a given month, such as January of this year, visit " "<a href=\"%1$s\">%2$s</a>" msgstr "" -#: ../../Zotlabs/Module/Uexport.php:68 +#: ../../Zotlabs/Module/Uexport.php:83 #, php-format msgid "" "These content files may be imported or restored by visiting <a href=\"%1$s\">" @@ -928,17 +1048,17 @@ msgid "You have got no unseen posts..." msgstr "" #: ../../Zotlabs/Module/Search.php:17 ../../Zotlabs/Module/Photos.php:545 -#: ../../Zotlabs/Module/Ratings.php:83 ../../Zotlabs/Module/Directory.php:63 -#: ../../Zotlabs/Module/Directory.php:68 ../../Zotlabs/Module/Display.php:30 +#: ../../Zotlabs/Module/Ratings.php:83 ../../Zotlabs/Module/Directory.php:67 +#: ../../Zotlabs/Module/Directory.php:72 ../../Zotlabs/Module/Display.php:29 #: ../../Zotlabs/Module/Viewconnections.php:23 msgid "Public access denied." msgstr "" -#: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:335 -#: ../../Zotlabs/Lib/Apps.php:318 ../../Zotlabs/Widget/Sitesearch.php:31 -#: ../../Zotlabs/Widget/Activity_filter.php:148 ../../include/text.php:1062 -#: ../../include/text.php:1074 ../../include/acl_selectors.php:118 -#: ../../include/nav.php:185 +#: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:338 +#: ../../Zotlabs/Lib/Apps.php:331 ../../Zotlabs/Widget/Sitesearch.php:31 +#: ../../Zotlabs/Widget/Activity_filter.php:150 ../../include/text.php:1068 +#: ../../include/text.php:1080 ../../include/acl_selectors.php:118 +#: ../../include/nav.php:183 msgid "Search" msgstr "" @@ -952,7 +1072,7 @@ msgstr "" msgid "Search results for: %s" msgstr "" -#: ../../Zotlabs/Module/Pubstream.php:95 +#: ../../Zotlabs/Module/Pubstream.php:95 ../../Zotlabs/Lib/Apps.php:356 #: ../../Zotlabs/Widget/Notifications.php:142 msgid "Public Stream" msgstr "" @@ -1053,7 +1173,7 @@ msgid "Menu Item Permissions" msgstr "" #: ../../Zotlabs/Module/Mitem.php:168 ../../Zotlabs/Module/Mitem.php:247 -#: ../../Zotlabs/Module/Settings/Channel.php:549 +#: ../../Zotlabs/Module/Settings/Channel.php:544 msgid "(click to open/close)" msgstr "" @@ -1075,118 +1195,134 @@ msgstr "" #: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:177 #: ../../Zotlabs/Module/Mitem.php:256 ../../Zotlabs/Module/Mitem.php:257 -#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471 -#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Admin/Site.php:266 +#: ../../Zotlabs/Module/Events.php:472 ../../Zotlabs/Module/Events.php:473 +#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Admin/Site.php:255 #: ../../Zotlabs/Module/Settings/Channel.php:315 -#: ../../Zotlabs/Module/Settings/Display.php:100 +#: ../../Zotlabs/Module/Settings/Display.php:89 #: ../../Zotlabs/Module/Import.php:554 ../../Zotlabs/Module/Import.php:558 #: ../../Zotlabs/Module/Import.php:559 ../../Zotlabs/Module/Api.php:99 -#: ../../Zotlabs/Module/Photos.php:702 ../../Zotlabs/Module/Wiki.php:218 -#: ../../Zotlabs/Module/Wiki.php:219 ../../Zotlabs/Module/Connedit.php:396 -#: ../../Zotlabs/Module/Connedit.php:779 ../../Zotlabs/Module/Menu.php:162 -#: ../../Zotlabs/Module/Menu.php:221 ../../Zotlabs/Module/Defperms.php:180 -#: ../../Zotlabs/Module/Profiles.php:681 ../../Zotlabs/Module/Sources.php:116 -#: ../../Zotlabs/Module/Sources.php:151 +#: ../../Zotlabs/Module/Photos.php:699 ../../Zotlabs/Module/Wiki.php:227 +#: ../../Zotlabs/Module/Wiki.php:228 ../../Zotlabs/Module/Connedit.php:397 +#: ../../Zotlabs/Module/Connedit.php:780 ../../Zotlabs/Module/Menu.php:162 +#: ../../Zotlabs/Module/Menu.php:221 ../../Zotlabs/Module/Defperms.php:197 +#: ../../Zotlabs/Module/Profiles.php:681 ../../Zotlabs/Module/Sources.php:124 +#: ../../Zotlabs/Module/Sources.php:159 #: ../../Zotlabs/Module/Filestorage.php:178 -#: ../../Zotlabs/Module/Filestorage.php:186 -#: ../../Zotlabs/Storage/Browser.php:405 ../../boot.php:1618 +#: ../../Zotlabs/Module/Filestorage.php:186 ../../Zotlabs/Lib/Libzotdir.php:162 +#: ../../Zotlabs/Lib/Libzotdir.php:163 ../../Zotlabs/Lib/Libzotdir.php:165 +#: ../../Zotlabs/Storage/Browser.php:405 ../../boot.php:1630 #: ../../view/theme/redbasic_c/php/config.php:100 #: ../../view/theme/redbasic_c/php/config.php:115 -#: ../../view/theme/redbasic/php/config.php:98 -#: ../../addon/planets/planets.php:149 ../../addon/wppost/wppost.php:82 -#: ../../addon/wppost/wppost.php:105 ../../addon/wppost/wppost.php:109 -#: ../../addon/nsfw/nsfw.php:84 ../../addon/ijpost/ijpost.php:73 +#: ../../view/theme/redbasic/php/config.php:99 +#: ../../view/theme/redbasic/php/config.php:116 +#: ../../addon/planets/planets.php:149 ../../addon/wppost/Mod_Wppost.php:82 +#: ../../addon/wppost/Mod_Wppost.php:86 ../../addon/ijpost/ijpost.php:73 #: ../../addon/ijpost/ijpost.php:85 ../../addon/dwpost/dwpost.php:73 #: ../../addon/dwpost/dwpost.php:85 ../../addon/ljpost/ljpost.php:70 -#: ../../addon/ljpost/ljpost.php:82 ../../addon/rainbowtag/rainbowtag.php:81 -#: ../../addon/visage/visage.php:166 ../../addon/nsabait/nsabait.php:157 -#: ../../addon/fuzzloc/fuzzloc.php:178 ../../addon/rtof/rtof.php:81 -#: ../../addon/rtof/rtof.php:85 ../../addon/jappixmini/jappixmini.php:309 +#: ../../addon/ljpost/ljpost.php:82 ../../addon/visage/visage.php:166 +#: ../../addon/nsabait/nsabait.php:157 ../../addon/fuzzloc/fuzzloc.php:178 +#: ../../addon/rtof/rtof.php:81 ../../addon/rtof/rtof.php:85 +#: ../../addon/jappixmini/jappixmini.php:309 #: ../../addon/jappixmini/jappixmini.php:313 #: ../../addon/jappixmini/jappixmini.php:343 #: ../../addon/jappixmini/jappixmini.php:351 #: ../../addon/jappixmini/jappixmini.php:355 -#: ../../addon/jappixmini/jappixmini.php:359 ../../addon/nofed/nofed.php:72 -#: ../../addon/nofed/nofed.php:76 ../../addon/redred/redred.php:95 -#: ../../addon/redred/redred.php:99 ../../addon/libertree/libertree.php:69 +#: ../../addon/jappixmini/jappixmini.php:359 +#: ../../addon/channelreputation/channelreputation.php:111 +#: ../../addon/nofed/nofed.php:72 ../../addon/nofed/nofed.php:76 +#: ../../addon/redred/redred.php:95 ../../addon/redred/redred.php:99 +#: ../../addon/libertree/libertree.php:69 #: ../../addon/libertree/libertree.php:81 #: ../../addon/flattrwidget/flattrwidget.php:120 #: ../../addon/statusnet/statusnet.php:389 #: ../../addon/statusnet/statusnet.php:411 #: ../../addon/statusnet/statusnet.php:415 -#: ../../addon/statusnet/statusnet.php:424 ../../addon/twitter/twitter.php:243 -#: ../../addon/twitter/twitter.php:252 ../../addon/twitter/twitter.php:261 +#: ../../addon/statusnet/statusnet.php:424 ../../addon/twitter/twitter.php:246 +#: ../../addon/twitter/twitter.php:255 ../../addon/twitter/twitter.php:264 #: ../../addon/smileybutton/smileybutton.php:211 -#: ../../addon/smileybutton/smileybutton.php:215 ../../addon/cart/cart.php:1206 -#: ../../addon/cart/cart.php:1213 ../../addon/cart/cart.php:1221 -#: ../../addon/cart/submodules/paypalbutton.php:99 -#: ../../addon/cart/submodules/paypalbutton.php:104 -#: ../../addon/cart/submodules/hzservices.php:73 -#: ../../addon/cart/submodules/hzservices.php:653 -#: ../../addon/cart/submodules/hzservices.php:657 -#: ../../addon/authchoose/authchoose.php:67 ../../addon/xmpp/xmpp.php:53 -#: ../../addon/pumpio/pumpio.php:219 ../../addon/pumpio/pumpio.php:223 -#: ../../addon/pumpio/pumpio.php:227 ../../addon/pumpio/pumpio.php:231 -#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144 -#: ../../include/dir_fns.php:145 +#: ../../addon/smileybutton/smileybutton.php:215 +#: ../../addon/cart/Settings/Cart.php:59 ../../addon/cart/Settings/Cart.php:71 +#: ../../addon/cart/cart.php:1255 +#: ../../addon/cart/submodules/paypalbutton.php:86 +#: ../../addon/cart/submodules/paypalbutton.php:94 +#: ../../addon/cart/submodules/manualcat.php:62 +#: ../../addon/cart/submodules/manualcat.php:255 +#: ../../addon/cart/submodules/manualcat.php:259 +#: ../../addon/cart/submodules/hzservices.php:63 +#: ../../addon/cart/submodules/hzservices.php:645 +#: ../../addon/cart/submodules/hzservices.php:649 +#: ../../addon/cart/submodules/subscriptions.php:152 +#: ../../addon/cart/submodules/subscriptions.php:414 +#: ../../addon/xmpp/xmpp.php:53 ../../addon/pumpio/pumpio.php:219 +#: ../../addon/pumpio/pumpio.php:223 ../../addon/pumpio/pumpio.php:227 +#: ../../addon/pumpio/pumpio.php:231 ../../include/dir_fns.php:143 +#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145 msgid "No" msgstr "" #: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:177 #: ../../Zotlabs/Module/Mitem.php:256 ../../Zotlabs/Module/Mitem.php:257 -#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471 -#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Admin/Site.php:268 +#: ../../Zotlabs/Module/Events.php:472 ../../Zotlabs/Module/Events.php:473 +#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Admin/Site.php:257 #: ../../Zotlabs/Module/Settings/Channel.php:315 -#: ../../Zotlabs/Module/Settings/Display.php:100 +#: ../../Zotlabs/Module/Settings/Display.php:89 #: ../../Zotlabs/Module/Import.php:554 ../../Zotlabs/Module/Import.php:558 #: ../../Zotlabs/Module/Import.php:559 ../../Zotlabs/Module/Api.php:98 -#: ../../Zotlabs/Module/Photos.php:702 ../../Zotlabs/Module/Wiki.php:218 -#: ../../Zotlabs/Module/Wiki.php:219 ../../Zotlabs/Module/Connedit.php:396 +#: ../../Zotlabs/Module/Photos.php:699 ../../Zotlabs/Module/Wiki.php:227 +#: ../../Zotlabs/Module/Wiki.php:228 ../../Zotlabs/Module/Connedit.php:397 #: ../../Zotlabs/Module/Menu.php:162 ../../Zotlabs/Module/Menu.php:221 -#: ../../Zotlabs/Module/Defperms.php:180 ../../Zotlabs/Module/Profiles.php:681 -#: ../../Zotlabs/Module/Sources.php:116 ../../Zotlabs/Module/Sources.php:151 +#: ../../Zotlabs/Module/Defperms.php:197 ../../Zotlabs/Module/Profiles.php:681 +#: ../../Zotlabs/Module/Sources.php:124 ../../Zotlabs/Module/Sources.php:159 #: ../../Zotlabs/Module/Filestorage.php:178 -#: ../../Zotlabs/Module/Filestorage.php:186 -#: ../../Zotlabs/Storage/Browser.php:405 ../../boot.php:1618 +#: ../../Zotlabs/Module/Filestorage.php:186 ../../Zotlabs/Lib/Libzotdir.php:162 +#: ../../Zotlabs/Lib/Libzotdir.php:163 ../../Zotlabs/Lib/Libzotdir.php:165 +#: ../../Zotlabs/Storage/Browser.php:405 ../../boot.php:1630 #: ../../view/theme/redbasic_c/php/config.php:100 #: ../../view/theme/redbasic_c/php/config.php:115 -#: ../../view/theme/redbasic/php/config.php:98 -#: ../../addon/planets/planets.php:149 ../../addon/wppost/wppost.php:82 -#: ../../addon/wppost/wppost.php:105 ../../addon/wppost/wppost.php:109 -#: ../../addon/nsfw/nsfw.php:84 ../../addon/ijpost/ijpost.php:73 +#: ../../view/theme/redbasic/php/config.php:99 +#: ../../view/theme/redbasic/php/config.php:116 +#: ../../addon/planets/planets.php:149 ../../addon/wppost/Mod_Wppost.php:82 +#: ../../addon/wppost/Mod_Wppost.php:86 ../../addon/ijpost/ijpost.php:73 #: ../../addon/ijpost/ijpost.php:85 ../../addon/dwpost/dwpost.php:73 #: ../../addon/dwpost/dwpost.php:85 ../../addon/ljpost/ljpost.php:70 -#: ../../addon/ljpost/ljpost.php:82 ../../addon/rainbowtag/rainbowtag.php:81 -#: ../../addon/visage/visage.php:166 ../../addon/nsabait/nsabait.php:157 -#: ../../addon/fuzzloc/fuzzloc.php:178 ../../addon/rtof/rtof.php:81 -#: ../../addon/rtof/rtof.php:85 ../../addon/jappixmini/jappixmini.php:309 +#: ../../addon/ljpost/ljpost.php:82 ../../addon/visage/visage.php:166 +#: ../../addon/nsabait/nsabait.php:157 ../../addon/fuzzloc/fuzzloc.php:178 +#: ../../addon/rtof/rtof.php:81 ../../addon/rtof/rtof.php:85 +#: ../../addon/jappixmini/jappixmini.php:309 #: ../../addon/jappixmini/jappixmini.php:313 #: ../../addon/jappixmini/jappixmini.php:343 #: ../../addon/jappixmini/jappixmini.php:351 #: ../../addon/jappixmini/jappixmini.php:355 -#: ../../addon/jappixmini/jappixmini.php:359 ../../addon/nofed/nofed.php:72 -#: ../../addon/nofed/nofed.php:76 ../../addon/redred/redred.php:95 -#: ../../addon/redred/redred.php:99 ../../addon/libertree/libertree.php:69 +#: ../../addon/jappixmini/jappixmini.php:359 +#: ../../addon/channelreputation/channelreputation.php:111 +#: ../../addon/nofed/nofed.php:72 ../../addon/nofed/nofed.php:76 +#: ../../addon/redred/redred.php:95 ../../addon/redred/redred.php:99 +#: ../../addon/libertree/libertree.php:69 #: ../../addon/libertree/libertree.php:81 #: ../../addon/flattrwidget/flattrwidget.php:120 #: ../../addon/statusnet/statusnet.php:389 #: ../../addon/statusnet/statusnet.php:411 #: ../../addon/statusnet/statusnet.php:415 -#: ../../addon/statusnet/statusnet.php:424 ../../addon/twitter/twitter.php:243 -#: ../../addon/twitter/twitter.php:252 ../../addon/twitter/twitter.php:261 +#: ../../addon/statusnet/statusnet.php:424 ../../addon/twitter/twitter.php:246 +#: ../../addon/twitter/twitter.php:255 ../../addon/twitter/twitter.php:264 #: ../../addon/smileybutton/smileybutton.php:211 -#: ../../addon/smileybutton/smileybutton.php:215 ../../addon/cart/cart.php:1206 -#: ../../addon/cart/cart.php:1213 ../../addon/cart/cart.php:1221 -#: ../../addon/cart/submodules/paypalbutton.php:99 -#: ../../addon/cart/submodules/paypalbutton.php:104 -#: ../../addon/cart/submodules/hzservices.php:73 -#: ../../addon/cart/submodules/hzservices.php:653 -#: ../../addon/cart/submodules/hzservices.php:657 -#: ../../addon/authchoose/authchoose.php:67 ../../addon/xmpp/xmpp.php:53 -#: ../../addon/pumpio/pumpio.php:219 ../../addon/pumpio/pumpio.php:223 -#: ../../addon/pumpio/pumpio.php:227 ../../addon/pumpio/pumpio.php:231 -#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144 -#: ../../include/dir_fns.php:145 +#: ../../addon/smileybutton/smileybutton.php:215 +#: ../../addon/cart/Settings/Cart.php:59 ../../addon/cart/Settings/Cart.php:71 +#: ../../addon/cart/cart.php:1255 +#: ../../addon/cart/submodules/paypalbutton.php:86 +#: ../../addon/cart/submodules/paypalbutton.php:94 +#: ../../addon/cart/submodules/manualcat.php:62 +#: ../../addon/cart/submodules/manualcat.php:255 +#: ../../addon/cart/submodules/manualcat.php:259 +#: ../../addon/cart/submodules/hzservices.php:63 +#: ../../addon/cart/submodules/hzservices.php:645 +#: ../../addon/cart/submodules/hzservices.php:649 +#: ../../addon/cart/submodules/subscriptions.php:152 +#: ../../addon/cart/submodules/subscriptions.php:414 +#: ../../addon/xmpp/xmpp.php:53 ../../addon/pumpio/pumpio.php:219 +#: ../../addon/pumpio/pumpio.php:223 ../../addon/pumpio/pumpio.php:227 +#: ../../addon/pumpio/pumpio.php:231 ../../include/dir_fns.php:143 +#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145 msgid "Yes" msgstr "" @@ -1297,124 +1433,125 @@ msgstr "" #: ../../Zotlabs/Module/Events.php:260 ../../Zotlabs/Module/Tagger.php:73 #: ../../Zotlabs/Module/Like.php:386 ../../include/conversation.php:119 -#: ../../include/text.php:2025 ../../include/event.php:1153 +#: ../../include/text.php:2031 ../../include/event.php:1153 msgid "event" msgstr "" -#: ../../Zotlabs/Module/Events.php:460 +#: ../../Zotlabs/Module/Events.php:462 msgid "Edit event title" msgstr "" -#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:465 -#: ../../Zotlabs/Module/Appman.php:141 ../../Zotlabs/Module/Appman.php:142 +#: ../../Zotlabs/Module/Events.php:462 ../../Zotlabs/Module/Events.php:467 +#: ../../Zotlabs/Module/Appman.php:143 ../../Zotlabs/Module/Appman.php:144 #: ../../Zotlabs/Module/Profiles.php:745 ../../Zotlabs/Module/Profiles.php:749 #: ../../include/datetime.php:211 msgid "Required" msgstr "" -#: ../../Zotlabs/Module/Events.php:462 +#: ../../Zotlabs/Module/Events.php:464 msgid "Categories (comma-separated list)" msgstr "" -#: ../../Zotlabs/Module/Events.php:463 +#: ../../Zotlabs/Module/Events.php:465 msgid "Edit Category" msgstr "" -#: ../../Zotlabs/Module/Events.php:463 +#: ../../Zotlabs/Module/Events.php:465 msgid "Category" msgstr "" -#: ../../Zotlabs/Module/Events.php:466 +#: ../../Zotlabs/Module/Events.php:468 msgid "Edit start date and time" msgstr "" -#: ../../Zotlabs/Module/Events.php:467 ../../Zotlabs/Module/Events.php:470 +#: ../../Zotlabs/Module/Events.php:469 ../../Zotlabs/Module/Events.php:472 msgid "Finish date and time are not known or not relevant" msgstr "" -#: ../../Zotlabs/Module/Events.php:469 +#: ../../Zotlabs/Module/Events.php:471 msgid "Edit finish date and time" msgstr "" -#: ../../Zotlabs/Module/Events.php:469 +#: ../../Zotlabs/Module/Events.php:471 msgid "Finish date and time" msgstr "" -#: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Module/Events.php:472 +#: ../../Zotlabs/Module/Events.php:473 ../../Zotlabs/Module/Events.php:474 msgid "Adjust for viewer timezone" msgstr "" -#: ../../Zotlabs/Module/Events.php:471 +#: ../../Zotlabs/Module/Events.php:473 msgid "" "Important for events that happen in a particular place. Not practical for " "global holidays." msgstr "" -#: ../../Zotlabs/Module/Events.php:473 +#: ../../Zotlabs/Module/Events.php:475 msgid "Edit Description" msgstr "" -#: ../../Zotlabs/Module/Events.php:475 +#: ../../Zotlabs/Module/Events.php:477 msgid "Edit Location" msgstr "" -#: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Photos.php:1128 -#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/ThreadItem.php:767 -#: ../../include/conversation.php:1341 +#: ../../Zotlabs/Module/Events.php:480 ../../Zotlabs/Module/Photos.php:1125 +#: ../../Zotlabs/Module/Webpages.php:262 ../../Zotlabs/Lib/ThreadItem.php:775 +#: ../../addon/hsse/hsse.php:153 ../../include/conversation.php:1356 msgid "Preview" msgstr "" -#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1413 +#: ../../Zotlabs/Module/Events.php:481 ../../addon/hsse/hsse.php:225 +#: ../../include/conversation.php:1428 msgid "Permission settings" msgstr "" -#: ../../Zotlabs/Module/Events.php:489 +#: ../../Zotlabs/Module/Events.php:491 msgid "Timezone:" msgstr "" -#: ../../Zotlabs/Module/Events.php:494 +#: ../../Zotlabs/Module/Events.php:496 msgid "Advanced Options" msgstr "" -#: ../../Zotlabs/Module/Events.php:605 ../../Zotlabs/Module/Cal.php:266 +#: ../../Zotlabs/Module/Events.php:607 ../../Zotlabs/Module/Cal.php:264 msgid "l, F j" msgstr "" -#: ../../Zotlabs/Module/Events.php:633 +#: ../../Zotlabs/Module/Events.php:635 msgid "Edit event" msgstr "" -#: ../../Zotlabs/Module/Events.php:635 +#: ../../Zotlabs/Module/Events.php:637 msgid "Delete event" msgstr "" -#: ../../Zotlabs/Module/Events.php:660 ../../Zotlabs/Module/Cal.php:315 -#: ../../include/text.php:1844 +#: ../../Zotlabs/Module/Events.php:663 ../../Zotlabs/Module/Cal.php:314 +#: ../../include/text.php:1850 msgid "Link to Source" msgstr "" -#: ../../Zotlabs/Module/Events.php:669 +#: ../../Zotlabs/Module/Events.php:670 msgid "calendar" msgstr "" -#: ../../Zotlabs/Module/Events.php:688 ../../Zotlabs/Module/Cal.php:338 +#: ../../Zotlabs/Module/Events.php:689 ../../Zotlabs/Module/Cal.php:337 msgid "Edit Event" msgstr "" -#: ../../Zotlabs/Module/Events.php:688 ../../Zotlabs/Module/Cal.php:338 +#: ../../Zotlabs/Module/Events.php:689 ../../Zotlabs/Module/Cal.php:337 msgid "Create Event" msgstr "" -#: ../../Zotlabs/Module/Events.php:691 ../../Zotlabs/Module/Cal.php:341 -#: ../../include/channel.php:1647 +#: ../../Zotlabs/Module/Events.php:692 ../../Zotlabs/Module/Cal.php:340 +#: ../../include/channel.php:1654 msgid "Export" msgstr "" -#: ../../Zotlabs/Module/Events.php:731 +#: ../../Zotlabs/Module/Events.php:732 msgid "Event removed" msgstr "" -#: ../../Zotlabs/Module/Events.php:734 +#: ../../Zotlabs/Module/Events.php:735 msgid "Failed to remove event" msgstr "" @@ -1426,47 +1563,47 @@ msgstr "" msgid "Malformed app." msgstr "" -#: ../../Zotlabs/Module/Appman.php:130 +#: ../../Zotlabs/Module/Appman.php:132 msgid "Embed code" msgstr "" -#: ../../Zotlabs/Module/Appman.php:136 +#: ../../Zotlabs/Module/Appman.php:138 msgid "Edit App" msgstr "" -#: ../../Zotlabs/Module/Appman.php:136 +#: ../../Zotlabs/Module/Appman.php:138 msgid "Create App" msgstr "" -#: ../../Zotlabs/Module/Appman.php:141 +#: ../../Zotlabs/Module/Appman.php:143 msgid "Name of app" msgstr "" -#: ../../Zotlabs/Module/Appman.php:142 +#: ../../Zotlabs/Module/Appman.php:144 msgid "Location (URL) of app" msgstr "" -#: ../../Zotlabs/Module/Appman.php:144 +#: ../../Zotlabs/Module/Appman.php:146 msgid "Photo icon URL" msgstr "" -#: ../../Zotlabs/Module/Appman.php:144 +#: ../../Zotlabs/Module/Appman.php:146 msgid "80 x 80 pixels - optional" msgstr "" -#: ../../Zotlabs/Module/Appman.php:145 +#: ../../Zotlabs/Module/Appman.php:147 msgid "Categories (optional, comma separated list)" msgstr "" -#: ../../Zotlabs/Module/Appman.php:146 +#: ../../Zotlabs/Module/Appman.php:148 msgid "Version ID" msgstr "" -#: ../../Zotlabs/Module/Appman.php:147 +#: ../../Zotlabs/Module/Appman.php:149 msgid "Price of app" msgstr "" -#: ../../Zotlabs/Module/Appman.php:148 +#: ../../Zotlabs/Module/Appman.php:150 msgid "Location (URL) to purchase app" msgstr "" @@ -1479,16 +1616,17 @@ msgid "Hub not found." msgstr "" #: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Tagger.php:69 -#: ../../Zotlabs/Module/Like.php:384 +#: ../../Zotlabs/Module/Like.php:384 ../../Zotlabs/Lib/Activity.php:1570 #: ../../addon/redphotos/redphotohelper.php:71 -#: ../../addon/diaspora/Receiver.php:1530 ../../addon/pubcrawl/as.php:1509 -#: ../../include/conversation.php:116 ../../include/text.php:2022 +#: ../../addon/diaspora/Receiver.php:1539 ../../addon/pubcrawl/as.php:1512 +#: ../../include/conversation.php:116 ../../include/text.php:2028 msgid "photo" msgstr "" #: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Like.php:384 -#: ../../addon/diaspora/Receiver.php:1530 ../../addon/pubcrawl/as.php:1509 -#: ../../include/conversation.php:144 ../../include/text.php:2028 +#: ../../Zotlabs/Lib/Activity.php:1570 ../../addon/diaspora/Receiver.php:1539 +#: ../../addon/pubcrawl/as.php:1512 ../../include/conversation.php:144 +#: ../../include/text.php:2034 msgid "status" msgstr "" @@ -1502,7 +1640,7 @@ msgstr "" msgid "%1$s stopped following %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Article_edit.php:44 ../../Zotlabs/Module/Cal.php:62 +#: ../../Zotlabs/Module/Article_edit.php:44 ../../Zotlabs/Module/Cal.php:63 #: ../../Zotlabs/Module/Chanview.php:96 ../../Zotlabs/Module/Page.php:75 #: ../../Zotlabs/Module/Wall_upload.php:31 ../../Zotlabs/Module/Block.php:41 #: ../../Zotlabs/Module/Card_edit.php:44 @@ -1510,17 +1648,17 @@ msgid "Channel not found." msgstr "" #: ../../Zotlabs/Module/Article_edit.php:101 -#: ../../Zotlabs/Module/Editblock.php:116 ../../Zotlabs/Module/Chat.php:207 +#: ../../Zotlabs/Module/Editblock.php:116 ../../Zotlabs/Module/Chat.php:222 #: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Mail.php:288 #: ../../Zotlabs/Module/Mail.php:430 ../../Zotlabs/Module/Card_edit.php:101 -#: ../../include/conversation.php:1283 +#: ../../addon/hsse/hsse.php:95 ../../include/conversation.php:1298 msgid "Insert web link" msgstr "" #: ../../Zotlabs/Module/Article_edit.php:117 -#: ../../Zotlabs/Module/Editblock.php:129 ../../Zotlabs/Module/Photos.php:703 -#: ../../Zotlabs/Module/Photos.php:1073 ../../Zotlabs/Module/Card_edit.php:117 -#: ../../include/conversation.php:1409 +#: ../../Zotlabs/Module/Editblock.php:129 ../../Zotlabs/Module/Photos.php:700 +#: ../../Zotlabs/Module/Photos.php:1070 ../../Zotlabs/Module/Card_edit.php:117 +#: ../../addon/hsse/hsse.php:221 ../../include/conversation.php:1424 msgid "Title (optional)" msgstr "" @@ -1568,75 +1706,75 @@ msgstr "" msgid "You have created %1$.0f of %2$.0f allowed channels." msgstr "" -#: ../../Zotlabs/Module/New_channel.php:154 -#: ../../Zotlabs/Module/New_channel.php:161 -#: ../../Zotlabs/Module/Connedit.php:852 ../../Zotlabs/Module/Defperms.php:240 -#: ../../Zotlabs/Widget/Notifications.php:162 ../../include/nav.php:276 +#: ../../Zotlabs/Module/New_channel.php:157 +#: ../../Zotlabs/Module/New_channel.php:164 +#: ../../Zotlabs/Module/Connedit.php:853 ../../Zotlabs/Module/Defperms.php:256 +#: ../../Zotlabs/Widget/Notifications.php:162 ../../include/nav.php:288 msgid "Loading" msgstr "" -#: ../../Zotlabs/Module/New_channel.php:156 +#: ../../Zotlabs/Module/New_channel.php:159 msgid "Your real name is recommended." msgstr "" -#: ../../Zotlabs/Module/New_channel.php:157 +#: ../../Zotlabs/Module/New_channel.php:160 msgid "" "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation " "Group\"" msgstr "" -#: ../../Zotlabs/Module/New_channel.php:162 +#: ../../Zotlabs/Module/New_channel.php:165 msgid "" "This will be used to create a unique network address (like an email address)." msgstr "" -#: ../../Zotlabs/Module/New_channel.php:164 +#: ../../Zotlabs/Module/New_channel.php:167 msgid "Allowed characters are a-z 0-9, - and _" msgstr "" -#: ../../Zotlabs/Module/New_channel.php:174 +#: ../../Zotlabs/Module/New_channel.php:175 msgid "Channel name" msgstr "" -#: ../../Zotlabs/Module/New_channel.php:176 -#: ../../Zotlabs/Module/Register.php:265 +#: ../../Zotlabs/Module/New_channel.php:177 +#: ../../Zotlabs/Module/Register.php:260 msgid "Choose a short nickname" msgstr "" -#: ../../Zotlabs/Module/New_channel.php:177 -#: ../../Zotlabs/Module/Settings/Channel.php:560 -#: ../../Zotlabs/Module/Register.php:266 +#: ../../Zotlabs/Module/New_channel.php:178 +#: ../../Zotlabs/Module/Settings/Channel.php:555 +#: ../../Zotlabs/Module/Register.php:261 msgid "Channel role and privacy" msgstr "" -#: ../../Zotlabs/Module/New_channel.php:177 +#: ../../Zotlabs/Module/New_channel.php:178 msgid "" "Select a channel permission role compatible with your usage needs and " "privacy requirements." msgstr "" -#: ../../Zotlabs/Module/New_channel.php:177 -#: ../../Zotlabs/Module/Register.php:266 +#: ../../Zotlabs/Module/New_channel.php:178 +#: ../../Zotlabs/Module/Register.php:261 msgid "Read more about channel permission roles" msgstr "" -#: ../../Zotlabs/Module/New_channel.php:180 +#: ../../Zotlabs/Module/New_channel.php:181 msgid "Create a Channel" msgstr "" -#: ../../Zotlabs/Module/New_channel.php:181 +#: ../../Zotlabs/Module/New_channel.php:182 msgid "" "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." msgstr "" -#: ../../Zotlabs/Module/New_channel.php:182 +#: ../../Zotlabs/Module/New_channel.php:183 msgid "" "or <a href=\"import\">import an existing channel</a> from another location." msgstr "" -#: ../../Zotlabs/Module/New_channel.php:187 +#: ../../Zotlabs/Module/New_channel.php:188 msgid "Validate" msgstr "" @@ -1682,33 +1820,33 @@ msgid "" msgstr "" #: ../../Zotlabs/Module/Removeme.php:64 -#: ../../Zotlabs/Module/Settings/Channel.php:622 +#: ../../Zotlabs/Module/Settings/Channel.php:617 msgid "Remove Channel" msgstr "" -#: ../../Zotlabs/Module/Sharedwithme.php:104 +#: ../../Zotlabs/Module/Sharedwithme.php:103 msgid "Files: shared with me" msgstr "" -#: ../../Zotlabs/Module/Sharedwithme.php:106 +#: ../../Zotlabs/Module/Sharedwithme.php:105 msgid "NEW" msgstr "" -#: ../../Zotlabs/Module/Sharedwithme.php:107 -#: ../../Zotlabs/Storage/Browser.php:287 ../../include/text.php:1451 +#: ../../Zotlabs/Module/Sharedwithme.php:106 +#: ../../Zotlabs/Storage/Browser.php:287 ../../include/text.php:1457 msgid "Size" msgstr "" -#: ../../Zotlabs/Module/Sharedwithme.php:108 +#: ../../Zotlabs/Module/Sharedwithme.php:107 #: ../../Zotlabs/Storage/Browser.php:288 msgid "Last Modified" msgstr "" -#: ../../Zotlabs/Module/Sharedwithme.php:109 +#: ../../Zotlabs/Module/Sharedwithme.php:108 msgid "Remove all files" msgstr "" -#: ../../Zotlabs/Module/Sharedwithme.php:110 +#: ../../Zotlabs/Module/Sharedwithme.php:109 msgid "Remove this file" msgstr "" @@ -1741,7 +1879,7 @@ msgid "" msgstr "" #: ../../Zotlabs/Module/Setup.php:198 ../../Zotlabs/Module/Setup.php:262 -#: ../../Zotlabs/Module/Setup.php:749 +#: ../../Zotlabs/Module/Setup.php:756 msgid "Please see the file \"install/INSTALL.txt\"." msgstr "" @@ -1979,129 +2117,135 @@ msgstr "" #: ../../Zotlabs/Module/Setup.php:531 msgid "" -"Error: GD graphics PHP module with JPEG support required but not installed." +"Error: GD PHP module with JPEG support or ImageMagick graphics library " +"required but not installed." msgstr "" #: ../../Zotlabs/Module/Setup.php:535 msgid "Error: openssl PHP module required but not installed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:539 +#: ../../Zotlabs/Module/Setup.php:541 +msgid "" +"Error: PDO database PHP module missing a driver for either mysql or pgsql." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:546 msgid "Error: PDO database PHP module required but not installed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:543 +#: ../../Zotlabs/Module/Setup.php:550 msgid "Error: mb_string PHP module required but not installed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:547 +#: ../../Zotlabs/Module/Setup.php:554 msgid "Error: xml PHP module required for DAV but not installed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:551 +#: ../../Zotlabs/Module/Setup.php:558 msgid "Error: zip PHP module required but not installed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:570 ../../Zotlabs/Module/Setup.php:579 +#: ../../Zotlabs/Module/Setup.php:577 ../../Zotlabs/Module/Setup.php:586 msgid ".htconfig.php is writable" msgstr "" -#: ../../Zotlabs/Module/Setup.php:575 +#: ../../Zotlabs/Module/Setup.php:582 msgid "" "The web installer needs to be able to create a file called \".htconfig.php\" " "in the top folder of your web server and it is unable to do so." msgstr "" -#: ../../Zotlabs/Module/Setup.php:576 +#: ../../Zotlabs/Module/Setup.php:583 msgid "" "This is most often a permission setting, as the web server may not be able " "to write files in your folder - even if you can." msgstr "" -#: ../../Zotlabs/Module/Setup.php:577 +#: ../../Zotlabs/Module/Setup.php:584 msgid "Please see install/INSTALL.txt for additional information." msgstr "" -#: ../../Zotlabs/Module/Setup.php:593 +#: ../../Zotlabs/Module/Setup.php:600 msgid "" "This software uses the Smarty3 template engine to render its web views. " "Smarty3 compiles templates to PHP to speed up rendering." msgstr "" -#: ../../Zotlabs/Module/Setup.php:594 +#: ../../Zotlabs/Module/Setup.php:601 #, php-format msgid "" "In order to store these compiled templates, the web server needs to have " "write access to the directory %s under the top level web folder." msgstr "" -#: ../../Zotlabs/Module/Setup.php:595 ../../Zotlabs/Module/Setup.php:616 +#: ../../Zotlabs/Module/Setup.php:602 ../../Zotlabs/Module/Setup.php:623 msgid "" "Please ensure that the user that your web server runs as (e.g. www-data) has " "write access to this folder." msgstr "" -#: ../../Zotlabs/Module/Setup.php:596 +#: ../../Zotlabs/Module/Setup.php:603 #, php-format msgid "" "Note: as a security measure, you should give the web server write access to " "%s only--not the template files (.tpl) that it contains." msgstr "" -#: ../../Zotlabs/Module/Setup.php:599 +#: ../../Zotlabs/Module/Setup.php:606 #, php-format msgid "%s is writable" msgstr "" -#: ../../Zotlabs/Module/Setup.php:615 +#: ../../Zotlabs/Module/Setup.php:622 msgid "" "This software uses the store directory to save uploaded files. The web " "server needs to have write access to the store directory under the top level " "web folder" msgstr "" -#: ../../Zotlabs/Module/Setup.php:619 +#: ../../Zotlabs/Module/Setup.php:626 msgid "store is writable" msgstr "" -#: ../../Zotlabs/Module/Setup.php:651 +#: ../../Zotlabs/Module/Setup.php:658 msgid "" "SSL certificate cannot be validated. Fix certificate or disable https access " "to this site." msgstr "" -#: ../../Zotlabs/Module/Setup.php:652 +#: ../../Zotlabs/Module/Setup.php:659 msgid "" "If you have https access to your website or allow connections to TCP port " "443 (the https: port), you MUST use a browser-valid certificate. You MUST " "NOT use self-signed certificates!" msgstr "" -#: ../../Zotlabs/Module/Setup.php:653 +#: ../../Zotlabs/Module/Setup.php:660 msgid "" "This restriction is incorporated because public posts from you may for " "example contain references to images on your own hub." msgstr "" -#: ../../Zotlabs/Module/Setup.php:654 +#: ../../Zotlabs/Module/Setup.php:661 msgid "" "If your certificate is not recognized, members of other sites (who may " "themselves have valid certificates) will get a warning message on their own " "site complaining about security issues." msgstr "" -#: ../../Zotlabs/Module/Setup.php:655 +#: ../../Zotlabs/Module/Setup.php:662 msgid "" "This can cause usability issues elsewhere (not just on your own site) so we " "must insist on this requirement." msgstr "" -#: ../../Zotlabs/Module/Setup.php:656 +#: ../../Zotlabs/Module/Setup.php:663 msgid "" "Providers are available that issue free certificates which are browser-valid." msgstr "" -#: ../../Zotlabs/Module/Setup.php:658 +#: ../../Zotlabs/Module/Setup.php:665 msgid "" "If you are confident that the certificate is valid and signed by a trusted " "authority, check to see if you have failed to install an intermediate cert. " @@ -2109,80 +2253,90 @@ msgid "" "server communications." msgstr "" -#: ../../Zotlabs/Module/Setup.php:660 +#: ../../Zotlabs/Module/Setup.php:667 msgid "SSL certificate validation" msgstr "" -#: ../../Zotlabs/Module/Setup.php:666 +#: ../../Zotlabs/Module/Setup.php:673 msgid "" "Url rewrite in .htaccess is not working. Check your server configuration." "Test: " msgstr "" -#: ../../Zotlabs/Module/Setup.php:669 +#: ../../Zotlabs/Module/Setup.php:676 msgid "Url rewrite is working" msgstr "" -#: ../../Zotlabs/Module/Setup.php:683 +#: ../../Zotlabs/Module/Setup.php:690 msgid "" "The database configuration file \".htconfig.php\" could not be written. " "Please use the enclosed text to create a configuration file in your web " "server root." msgstr "" -#: ../../Zotlabs/Module/Setup.php:707 ../../addon/rendezvous/rendezvous.php:401 +#: ../../Zotlabs/Module/Setup.php:714 ../../addon/rendezvous/rendezvous.php:401 msgid "Errors encountered creating database tables." msgstr "" -#: ../../Zotlabs/Module/Setup.php:747 +#: ../../Zotlabs/Module/Setup.php:754 msgid "<h1>What next?</h1>" msgstr "" -#: ../../Zotlabs/Module/Setup.php:748 +#: ../../Zotlabs/Module/Setup.php:755 msgid "" "IMPORTANT: You will need to [manually] setup a scheduled task for the poller." msgstr "" -#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109 +#: ../../Zotlabs/Module/Connect.php:73 ../../Zotlabs/Module/Connect.php:135 msgid "Continue" msgstr "" -#: ../../Zotlabs/Module/Connect.php:90 +#: ../../Zotlabs/Module/Connect.php:104 +msgid "Premium Channel App" +msgstr "" + +#: ../../Zotlabs/Module/Connect.php:105 +msgid "" +"Allows you to set restrictions and terms on those that connect with your " +"channel" +msgstr "" + +#: ../../Zotlabs/Module/Connect.php:116 msgid "Premium Channel Setup" msgstr "" -#: ../../Zotlabs/Module/Connect.php:92 +#: ../../Zotlabs/Module/Connect.php:118 msgid "Enable premium channel connection restrictions" msgstr "" -#: ../../Zotlabs/Module/Connect.php:93 +#: ../../Zotlabs/Module/Connect.php:119 msgid "" "Please enter your restrictions or conditions, such as paypal receipt, usage " "guidelines, etc." msgstr "" -#: ../../Zotlabs/Module/Connect.php:95 ../../Zotlabs/Module/Connect.php:115 +#: ../../Zotlabs/Module/Connect.php:121 ../../Zotlabs/Module/Connect.php:141 msgid "" "This channel may require additional steps or acknowledgement of the " "following conditions prior to connecting:" msgstr "" -#: ../../Zotlabs/Module/Connect.php:96 +#: ../../Zotlabs/Module/Connect.php:122 msgid "" "Potential connections will then see the following text before proceeding:" msgstr "" -#: ../../Zotlabs/Module/Connect.php:97 ../../Zotlabs/Module/Connect.php:118 +#: ../../Zotlabs/Module/Connect.php:123 ../../Zotlabs/Module/Connect.php:144 msgid "" "By continuing, I certify that I have complied with any instructions provided " "on this page." msgstr "" -#: ../../Zotlabs/Module/Connect.php:106 +#: ../../Zotlabs/Module/Connect.php:132 msgid "(No specific instructions have been provided by the channel owner.)" msgstr "" -#: ../../Zotlabs/Module/Connect.php:114 +#: ../../Zotlabs/Module/Connect.php:140 msgid "Restricted or Premium Channel" msgstr "" @@ -2216,13 +2370,13 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Features.php:55 #: ../../Zotlabs/Module/Admin/Features.php:56 -#: ../../Zotlabs/Module/Settings/Features.php:65 +#: ../../Zotlabs/Module/Settings/Features.php:36 ../../include/features.php:55 msgid "Off" msgstr "" #: ../../Zotlabs/Module/Admin/Features.php:55 #: ../../Zotlabs/Module/Admin/Features.php:56 -#: ../../Zotlabs/Module/Settings/Features.php:65 +#: ../../Zotlabs/Module/Settings/Features.php:36 ../../include/features.php:55 msgid "On" msgstr "" @@ -2293,7 +2447,7 @@ msgstr[1] "" msgid "Account not found" msgstr "" -#: ../../Zotlabs/Module/Admin/Accounts.php:91 ../../include/channel.php:2490 +#: ../../Zotlabs/Module/Admin/Accounts.php:91 ../../include/channel.php:2497 #, php-format msgid "Account '%s' deleted" msgstr "" @@ -2313,7 +2467,7 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Channels.php:145 #: ../../Zotlabs/Module/Admin/Themes.php:122 #: ../../Zotlabs/Module/Admin/Themes.php:156 -#: ../../Zotlabs/Module/Admin/Site.php:307 +#: ../../Zotlabs/Module/Admin/Site.php:287 #: ../../Zotlabs/Module/Admin/Addons.php:341 #: ../../Zotlabs/Module/Admin/Addons.php:436 #: ../../Zotlabs/Module/Admin/Security.php:92 @@ -2345,22 +2499,22 @@ msgid "No registrations." msgstr "" #: ../../Zotlabs/Module/Admin/Accounts.php:173 -#: ../../Zotlabs/Module/Connections.php:303 ../../include/conversation.php:735 +#: ../../Zotlabs/Module/Connections.php:306 ../../include/conversation.php:735 msgid "Approve" msgstr "" #: ../../Zotlabs/Module/Admin/Accounts.php:174 -#: ../../Zotlabs/Module/Authorize.php:26 +#: ../../Zotlabs/Module/Authorize.php:33 msgid "Deny" msgstr "" #: ../../Zotlabs/Module/Admin/Accounts.php:176 -#: ../../Zotlabs/Module/Connedit.php:622 +#: ../../Zotlabs/Module/Connedit.php:623 msgid "Block" msgstr "" #: ../../Zotlabs/Module/Admin/Accounts.php:177 -#: ../../Zotlabs/Module/Connedit.php:622 +#: ../../Zotlabs/Module/Connedit.php:623 msgid "Unblock" msgstr "" @@ -2502,8 +2656,7 @@ msgstr "" msgid "Disallow Code" msgstr "" -#: ../../Zotlabs/Module/Admin/Channels.php:154 -#: ../../include/conversation.php:1820 ../../include/nav.php:370 +#: ../../Zotlabs/Module/Admin/Channels.php:154 ../../include/nav.php:386 msgid "Channel" msgstr "" @@ -2533,9 +2686,9 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Themes.php:72 #: ../../Zotlabs/Module/Admin/Addons.php:259 ../../Zotlabs/Module/Thing.php:94 -#: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:46 +#: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:45 #: ../../Zotlabs/Module/Display.php:453 ../../Zotlabs/Module/Filestorage.php:24 -#: ../../Zotlabs/Module/Admin.php:62 ../../include/items.php:3566 +#: ../../Zotlabs/Module/Admin.php:62 ../../include/items.php:3587 msgid "Item not found." msgstr "" @@ -2564,9 +2717,9 @@ msgid "Toggle" msgstr "" #: ../../Zotlabs/Module/Admin/Themes.php:125 -#: ../../Zotlabs/Module/Admin/Addons.php:344 ../../Zotlabs/Lib/Apps.php:304 -#: ../../Zotlabs/Widget/Newmember.php:46 -#: ../../Zotlabs/Widget/Settings_menu.php:141 ../../include/nav.php:99 +#: ../../Zotlabs/Module/Admin/Addons.php:344 ../../Zotlabs/Lib/Apps.php:317 +#: ../../Zotlabs/Widget/Newmember.php:53 +#: ../../Zotlabs/Widget/Settings_menu.php:68 ../../include/nav.php:97 msgid "Settings" msgstr "" @@ -2588,488 +2741,452 @@ msgstr "" msgid "[Unsupported]" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:172 +#: ../../Zotlabs/Module/Admin/Site.php:161 msgid "Site settings updated." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:198 +#: ../../Zotlabs/Module/Admin/Site.php:187 #: ../../view/theme/redbasic_c/php/config.php:15 -#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3078 +#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3085 msgid "Default" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:209 -#: ../../Zotlabs/Module/Settings/Display.php:130 +#: ../../Zotlabs/Module/Admin/Site.php:198 +#: ../../Zotlabs/Module/Settings/Display.php:119 #, php-format msgid "%s - (Incompatible)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:216 +#: ../../Zotlabs/Module/Admin/Site.php:205 msgid "mobile" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:218 +#: ../../Zotlabs/Module/Admin/Site.php:207 msgid "experimental" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:220 +#: ../../Zotlabs/Module/Admin/Site.php:209 msgid "unsupported" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:267 +#: ../../Zotlabs/Module/Admin/Site.php:256 msgid "Yes - with approval" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:273 +#: ../../Zotlabs/Module/Admin/Site.php:262 msgid "My site is not a public server" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:274 +#: ../../Zotlabs/Module/Admin/Site.php:263 msgid "My site has paid access only" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:275 +#: ../../Zotlabs/Module/Admin/Site.php:264 msgid "My site has free access only" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:276 +#: ../../Zotlabs/Module/Admin/Site.php:265 msgid "My site offers free accounts with optional paid upgrades" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:288 -msgid "Beginner/Basic" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Site.php:289 -msgid "Novice - not skilled but willing to learn" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Site.php:290 -msgid "Intermediate - somewhat comfortable" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Site.php:291 -msgid "Advanced - very comfortable" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Site.php:292 -msgid "Expert - I can write computer code" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Site.php:293 -msgid "Wizard - I probably know more than you do" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Site.php:299 +#: ../../Zotlabs/Module/Admin/Site.php:279 msgid "Default permission role for new accounts" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:299 +#: ../../Zotlabs/Module/Admin/Site.php:279 msgid "" "This role will be used for the first channel created after registration." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:308 ../../Zotlabs/Widget/Admin.php:22 +#: ../../Zotlabs/Module/Admin/Site.php:288 ../../Zotlabs/Widget/Admin.php:22 msgid "Site" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:310 -#: ../../Zotlabs/Module/Register.php:278 +#: ../../Zotlabs/Module/Admin/Site.php:290 +#: ../../Zotlabs/Module/Register.php:273 msgid "Registration" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:311 +#: ../../Zotlabs/Module/Admin/Site.php:291 msgid "File upload" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:312 +#: ../../Zotlabs/Module/Admin/Site.php:292 msgid "Policies" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:313 ../../include/contact_widgets.php:16 +#: ../../Zotlabs/Module/Admin/Site.php:293 ../../include/contact_widgets.php:16 msgid "Advanced" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:317 +#: ../../Zotlabs/Module/Admin/Site.php:297 #: ../../addon/statusnet/statusnet.php:891 msgid "Site name" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:319 -msgid "Site default technical skill level" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Site.php:319 -msgid "Used to provide a member experience matched to technical comfort level" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Site.php:321 -msgid "Lock the technical skill level setting" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Site.php:321 -msgid "Members can set their own technical comfort level by default" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Site.php:323 +#: ../../Zotlabs/Module/Admin/Site.php:299 msgid "Banner/Logo" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:323 +#: ../../Zotlabs/Module/Admin/Site.php:299 msgid "Unfiltered HTML/CSS/JS is allowed" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:324 +#: ../../Zotlabs/Module/Admin/Site.php:300 msgid "Administrator Information" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:324 +#: ../../Zotlabs/Module/Admin/Site.php:300 msgid "" "Contact information for site administrators. Displayed on siteinfo page. " "BBCode can be used here" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:325 ../../Zotlabs/Module/Siteinfo.php:24 +#: ../../Zotlabs/Module/Admin/Site.php:301 ../../Zotlabs/Module/Siteinfo.php:24 msgid "Site Information" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:325 +#: ../../Zotlabs/Module/Admin/Site.php:301 msgid "" "Publicly visible description of this site. Displayed on siteinfo page. " "BBCode can be used here" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:326 +#: ../../Zotlabs/Module/Admin/Site.php:302 msgid "System language" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:327 +#: ../../Zotlabs/Module/Admin/Site.php:303 msgid "System theme" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:327 +#: ../../Zotlabs/Module/Admin/Site.php:303 msgid "" "Default system theme - may be over-ridden by user profiles - <a href='#' " "id='cnftheme'>change theme settings</a>" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:330 +#: ../../Zotlabs/Module/Admin/Site.php:306 msgid "Allow Feeds as Connections" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:330 +#: ../../Zotlabs/Module/Admin/Site.php:306 msgid "(Heavy system resource usage)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:331 +#: ../../Zotlabs/Module/Admin/Site.php:307 msgid "Maximum image size" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:331 +#: ../../Zotlabs/Module/Admin/Site.php:307 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:332 +#: ../../Zotlabs/Module/Admin/Site.php:308 msgid "Does this site allow new member registration?" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:333 +#: ../../Zotlabs/Module/Admin/Site.php:309 msgid "Invitation only" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:333 +#: ../../Zotlabs/Module/Admin/Site.php:309 msgid "" "Only allow new member registrations with an invitation code. Above register " "policy must be set to Yes." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:334 +#: ../../Zotlabs/Module/Admin/Site.php:310 msgid "Minimum age" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:334 +#: ../../Zotlabs/Module/Admin/Site.php:310 msgid "Minimum age (in years) for who may register on this site." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:335 +#: ../../Zotlabs/Module/Admin/Site.php:311 msgid "Which best describes the types of account offered by this hub?" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:336 +#: ../../Zotlabs/Module/Admin/Site.php:311 +msgid "This is displayed on the public server site list." +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:312 msgid "Register text" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:336 +#: ../../Zotlabs/Module/Admin/Site.php:312 msgid "Will be displayed prominently on the registration page." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:338 +#: ../../Zotlabs/Module/Admin/Site.php:314 msgid "Site homepage to show visitors (default: login box)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:338 +#: ../../Zotlabs/Module/Admin/Site.php:314 msgid "" "example: 'public' to show public stream, 'page/sys/home' to show a system " "webpage called 'home' or 'include:home.html' to include a file." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:339 +#: ../../Zotlabs/Module/Admin/Site.php:315 msgid "Preserve site homepage URL" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:339 +#: ../../Zotlabs/Module/Admin/Site.php:315 msgid "" "Present the site homepage in a frame at the original location instead of " "redirecting" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:340 +#: ../../Zotlabs/Module/Admin/Site.php:316 msgid "Accounts abandoned after x days" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:340 +#: ../../Zotlabs/Module/Admin/Site.php:316 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:341 +#: ../../Zotlabs/Module/Admin/Site.php:317 msgid "Allowed friend domains" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:341 +#: ../../Zotlabs/Module/Admin/Site.php:317 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:342 +#: ../../Zotlabs/Module/Admin/Site.php:318 msgid "Verify Email Addresses" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:342 +#: ../../Zotlabs/Module/Admin/Site.php:318 msgid "" "Check to verify email addresses used in account registration (recommended)." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:343 +#: ../../Zotlabs/Module/Admin/Site.php:319 msgid "Force publish" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:343 +#: ../../Zotlabs/Module/Admin/Site.php:319 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:344 +#: ../../Zotlabs/Module/Admin/Site.php:320 msgid "Import Public Streams" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:344 +#: ../../Zotlabs/Module/Admin/Site.php:320 msgid "" "Import and allow access to public content pulled from other sites. Warning: " "this content is unmoderated." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:345 +#: ../../Zotlabs/Module/Admin/Site.php:321 msgid "Site only Public Streams" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:345 +#: ../../Zotlabs/Module/Admin/Site.php:321 msgid "" "Allow access to public content originating only from this site if Imported " "Public Streams are disabled." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:346 +#: ../../Zotlabs/Module/Admin/Site.php:322 msgid "Allow anybody on the internet to access the Public streams" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:346 +#: ../../Zotlabs/Module/Admin/Site.php:322 msgid "" "Disable to require authentication before viewing. Warning: this content is " "unmoderated." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:347 +#: ../../Zotlabs/Module/Admin/Site.php:323 msgid "Only import Public stream posts with this text" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:347 -#: ../../Zotlabs/Module/Admin/Site.php:348 -#: ../../Zotlabs/Module/Connedit.php:875 ../../Zotlabs/Module/Connedit.php:876 +#: ../../Zotlabs/Module/Admin/Site.php:323 +#: ../../Zotlabs/Module/Admin/Site.php:324 +#: ../../Zotlabs/Module/Connedit.php:876 ../../Zotlabs/Module/Connedit.php:877 msgid "" "words one per line or #tags or /patterns/ or lang=xx, leave blank to import " "all posts" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:348 +#: ../../Zotlabs/Module/Admin/Site.php:324 msgid "Do not import Public stream posts with this text" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:351 +#: ../../Zotlabs/Module/Admin/Site.php:327 msgid "Login on Homepage" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:351 +#: ../../Zotlabs/Module/Admin/Site.php:327 msgid "" "Present a login box to visitors on the home page if no other content has " "been configured." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:352 +#: ../../Zotlabs/Module/Admin/Site.php:328 msgid "Enable context help" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:352 +#: ../../Zotlabs/Module/Admin/Site.php:328 msgid "" "Display contextual help for the current page when the help button is pressed." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:354 +#: ../../Zotlabs/Module/Admin/Site.php:330 msgid "Reply-to email address for system generated email." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:355 +#: ../../Zotlabs/Module/Admin/Site.php:331 msgid "Sender (From) email address for system generated email." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:356 +#: ../../Zotlabs/Module/Admin/Site.php:332 msgid "Name of email sender for system generated email." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:358 +#: ../../Zotlabs/Module/Admin/Site.php:334 msgid "Directory Server URL" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:358 +#: ../../Zotlabs/Module/Admin/Site.php:334 msgid "Default directory server" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:360 +#: ../../Zotlabs/Module/Admin/Site.php:336 msgid "Proxy user" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:361 +#: ../../Zotlabs/Module/Admin/Site.php:337 msgid "Proxy URL" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:362 +#: ../../Zotlabs/Module/Admin/Site.php:338 msgid "Network timeout" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:362 +#: ../../Zotlabs/Module/Admin/Site.php:338 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:363 +#: ../../Zotlabs/Module/Admin/Site.php:339 msgid "Delivery interval" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:363 +#: ../../Zotlabs/Module/Admin/Site.php:339 msgid "" "Delay background delivery processes by this many seconds to reduce system " "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " "for large dedicated servers." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:364 +#: ../../Zotlabs/Module/Admin/Site.php:340 msgid "Deliveries per process" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:364 +#: ../../Zotlabs/Module/Admin/Site.php:340 msgid "" "Number of deliveries to attempt in a single operating system process. Adjust " "if necessary to tune system performance. Recommend: 1-5." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:365 +#: ../../Zotlabs/Module/Admin/Site.php:341 msgid "Queue Threshold" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:365 +#: ../../Zotlabs/Module/Admin/Site.php:341 msgid "" "Always defer immediate delivery if queue contains more than this number of " "entries." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:366 +#: ../../Zotlabs/Module/Admin/Site.php:342 msgid "Poll interval" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:366 +#: ../../Zotlabs/Module/Admin/Site.php:342 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:367 +#: ../../Zotlabs/Module/Admin/Site.php:343 msgid "Path to ImageMagick convert program" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:367 +#: ../../Zotlabs/Module/Admin/Site.php:343 msgid "" "If set, use this program to generate photo thumbnails for huge images ( > " "4000 pixels in either dimension), otherwise memory exhaustion may occur. " "Example: /usr/bin/convert" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:368 +#: ../../Zotlabs/Module/Admin/Site.php:344 msgid "Allow SVG thumbnails in file browser" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:368 +#: ../../Zotlabs/Module/Admin/Site.php:344 msgid "WARNING: SVG images may contain malicious code." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:369 +#: ../../Zotlabs/Module/Admin/Site.php:345 msgid "Maximum Load Average" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:369 +#: ../../Zotlabs/Module/Admin/Site.php:345 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:370 +#: ../../Zotlabs/Module/Admin/Site.php:346 msgid "Expiration period in days for imported (grid/network) content" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:370 +#: ../../Zotlabs/Module/Admin/Site.php:346 msgid "0 for no expiration of imported content" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:371 +#: ../../Zotlabs/Module/Admin/Site.php:347 msgid "" "Do not expire any posts which have comments less than this many days ago" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:373 +#: ../../Zotlabs/Module/Admin/Site.php:349 msgid "" "Public servers: Optional landing (marketing) webpage for new registrants" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:373 +#: ../../Zotlabs/Module/Admin/Site.php:349 #, php-format msgid "Create this page first. Default is %s/register" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:374 +#: ../../Zotlabs/Module/Admin/Site.php:350 msgid "Page to display after creating a new channel" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:374 +#: ../../Zotlabs/Module/Admin/Site.php:350 msgid "Default: profiles" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:376 +#: ../../Zotlabs/Module/Admin/Site.php:352 msgid "Optional: site location" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:376 +#: ../../Zotlabs/Module/Admin/Site.php:352 msgid "Region or country" msgstr "" @@ -3137,7 +3254,7 @@ msgstr "" msgid "Install new repo" msgstr "" -#: ../../Zotlabs/Module/Admin/Addons.php:422 ../../Zotlabs/Lib/Apps.php:456 +#: ../../Zotlabs/Module/Admin/Addons.php:422 ../../Zotlabs/Lib/Apps.php:516 msgid "Install" msgstr "" @@ -3158,8 +3275,8 @@ msgid "Switch branch" msgstr "" #: ../../Zotlabs/Module/Admin/Addons.php:455 -#: ../../Zotlabs/Module/Photos.php:1025 ../../Zotlabs/Module/Tagrm.php:137 -#: ../../addon/superblock/superblock.php:116 +#: ../../Zotlabs/Module/Photos.php:1022 ../../Zotlabs/Module/Tagrm.php:137 +#: ../../addon/superblock/Mod_Superblock.php:91 msgid "Remove" msgstr "" @@ -3205,8 +3322,8 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Profs.php:94 #: ../../Zotlabs/Module/Admin/Profs.php:114 ../../Zotlabs/Module/Rbmark.php:32 #: ../../Zotlabs/Module/Rbmark.php:104 ../../Zotlabs/Module/Filer.php:53 -#: ../../Zotlabs/Widget/Notes.php:18 ../../include/text.php:1063 -#: ../../include/text.php:1075 +#: ../../Zotlabs/Widget/Notes.php:23 ../../include/text.php:1069 +#: ../../include/text.php:1081 msgid "Save" msgstr "" @@ -3272,14 +3389,10 @@ msgid "New Password again" msgstr "" #: ../../Zotlabs/Module/Admin/Account_edit.php:71 -msgid "Technical skill level" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Account_edit.php:72 msgid "Account language (for emails)" msgstr "" -#: ../../Zotlabs/Module/Admin/Account_edit.php:73 +#: ../../Zotlabs/Module/Admin/Account_edit.php:72 msgid "Service class" msgstr "" @@ -3429,73 +3542,23 @@ msgstr "" msgid "Comment deleted" msgstr "" -#: ../../Zotlabs/Module/Settings/Permcats.php:23 -msgid "Permission Name is required." -msgstr "" - -#: ../../Zotlabs/Module/Settings/Permcats.php:42 -msgid "Permission category saved." -msgstr "" - -#: ../../Zotlabs/Module/Settings/Permcats.php:66 -msgid "" -"Use this form to create permission rules for various classes of people or " -"connections." -msgstr "" - -#: ../../Zotlabs/Module/Settings/Permcats.php:99 -#: ../../Zotlabs/Widget/Settings_menu.php:108 ../../include/features.php:240 -msgid "Permission Categories" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Permcats.php:107 -msgid "Permission Name" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Permcats.php:108 -#: ../../Zotlabs/Module/Settings/Tokens.php:161 -#: ../../Zotlabs/Module/Connedit.php:891 ../../Zotlabs/Module/Defperms.php:250 -msgid "My Settings" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Permcats.php:110 -#: ../../Zotlabs/Module/Settings/Tokens.php:163 -#: ../../Zotlabs/Module/Connedit.php:886 ../../Zotlabs/Module/Defperms.php:248 -msgid "inherited" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Permcats.php:113 -#: ../../Zotlabs/Module/Settings/Tokens.php:166 -#: ../../Zotlabs/Module/Connedit.php:893 ../../Zotlabs/Module/Defperms.php:253 -msgid "Individual Permissions" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Permcats.php:114 -#: ../../Zotlabs/Module/Settings/Tokens.php:167 -#: ../../Zotlabs/Module/Connedit.php:894 -msgid "" -"Some permissions may be inherited from your channel's <a href=\"settings" -"\"><strong>privacy settings</strong></a>, which have higher priority than " -"individual settings. You can <strong>not</strong> change those settings here." -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:68 -#: ../../Zotlabs/Module/Settings/Channel.php:72 -#: ../../Zotlabs/Module/Settings/Channel.php:73 -#: ../../Zotlabs/Module/Settings/Channel.php:76 -#: ../../Zotlabs/Module/Settings/Channel.php:87 -#: ../../Zotlabs/Module/Connedit.php:711 ../../Zotlabs/Widget/Affinity.php:24 -#: ../../include/selectors.php:123 ../../include/channel.php:437 -#: ../../include/channel.php:438 ../../include/channel.php:445 +#: ../../Zotlabs/Module/Settings/Channel.php:70 +#: ../../Zotlabs/Module/Settings/Channel.php:74 +#: ../../Zotlabs/Module/Settings/Channel.php:75 +#: ../../Zotlabs/Module/Settings/Channel.php:78 +#: ../../Zotlabs/Module/Settings/Channel.php:89 +#: ../../Zotlabs/Module/Connedit.php:712 ../../Zotlabs/Widget/Affinity.php:24 +#: ../../include/selectors.php:123 ../../include/channel.php:444 +#: ../../include/channel.php:445 ../../include/channel.php:452 msgid "Friends" msgstr "" #: ../../Zotlabs/Module/Settings/Channel.php:272 -#: ../../Zotlabs/Module/Defperms.php:103 +#: ../../Zotlabs/Module/Defperms.php:111 #: ../../addon/rendezvous/rendezvous.php:82 #: ../../addon/openstreetmap/openstreetmap.php:184 #: ../../addon/msgfooter/msgfooter.php:54 ../../addon/logrot/logrot.php:54 -#: ../../addon/twitter/twitter.php:772 ../../addon/piwik/piwik.php:116 +#: ../../addon/twitter/twitter.php:775 ../../addon/piwik/piwik.php:116 #: ../../addon/xmpp/xmpp.php:102 msgid "Settings updated." msgstr "" @@ -3557,581 +3620,457 @@ msgid "Automatic membership approval" msgstr "" #: ../../Zotlabs/Module/Settings/Channel.php:488 -#: ../../Zotlabs/Module/Defperms.php:239 +#: ../../Zotlabs/Module/Defperms.php:255 msgid "" "If enabled, connection requests will be approved without your interaction" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:514 +#: ../../Zotlabs/Module/Settings/Channel.php:509 msgid "Channel Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:521 +#: ../../Zotlabs/Module/Settings/Channel.php:516 msgid "Basic Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:522 ../../include/channel.php:1521 +#: ../../Zotlabs/Module/Settings/Channel.php:517 ../../include/channel.php:1528 msgid "Full Name:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:523 -#: ../../Zotlabs/Module/Settings/Account.php:119 +#: ../../Zotlabs/Module/Settings/Channel.php:518 +#: ../../Zotlabs/Module/Settings/Account.php:104 msgid "Email Address:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:524 +#: ../../Zotlabs/Module/Settings/Channel.php:519 msgid "Your Timezone:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:525 +#: ../../Zotlabs/Module/Settings/Channel.php:520 msgid "Default Post Location:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:525 +#: ../../Zotlabs/Module/Settings/Channel.php:520 msgid "Geographical location to display on your posts" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:526 +#: ../../Zotlabs/Module/Settings/Channel.php:521 msgid "Use Browser Location:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:528 +#: ../../Zotlabs/Module/Settings/Channel.php:523 msgid "Adult Content" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:528 +#: ../../Zotlabs/Module/Settings/Channel.php:523 msgid "" "This channel frequently or regularly publishes adult content. (Please tag " "any adult material and/or nudity with #NSFW)" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:530 +#: ../../Zotlabs/Module/Settings/Channel.php:525 msgid "Security and Privacy Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:532 +#: ../../Zotlabs/Module/Settings/Channel.php:527 msgid "Your permissions are already configured. Click to view/adjust" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:534 +#: ../../Zotlabs/Module/Settings/Channel.php:529 msgid "Hide my online presence" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:534 +#: ../../Zotlabs/Module/Settings/Channel.php:529 msgid "Prevents displaying in your profile that you are online" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:536 +#: ../../Zotlabs/Module/Settings/Channel.php:531 msgid "Simple Privacy Settings:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:537 +#: ../../Zotlabs/Module/Settings/Channel.php:532 msgid "" "Very Public - <em>extremely permissive (should be used with caution)</em>" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:538 +#: ../../Zotlabs/Module/Settings/Channel.php:533 msgid "" "Typical - <em>default public, privacy when desired (similar to social " "network permissions but with improved privacy)</em>" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:539 +#: ../../Zotlabs/Module/Settings/Channel.php:534 msgid "Private - <em>default private, never open or public</em>" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:540 +#: ../../Zotlabs/Module/Settings/Channel.php:535 msgid "Blocked - <em>default blocked to/from everybody</em>" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:542 +#: ../../Zotlabs/Module/Settings/Channel.php:537 msgid "Allow others to tag your posts" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:542 +#: ../../Zotlabs/Module/Settings/Channel.php:537 msgid "" "Often used by the community to retro-actively flag inappropriate content" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:544 +#: ../../Zotlabs/Module/Settings/Channel.php:539 msgid "Channel Permission Limits" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:546 +#: ../../Zotlabs/Module/Settings/Channel.php:541 msgid "Expire other channel content after this many days" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:546 +#: ../../Zotlabs/Module/Settings/Channel.php:541 msgid "0 or blank to use the website limit." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:546 +#: ../../Zotlabs/Module/Settings/Channel.php:541 #, php-format msgid "This website expires after %d days." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:546 +#: ../../Zotlabs/Module/Settings/Channel.php:541 msgid "This website does not expire imported content." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:546 +#: ../../Zotlabs/Module/Settings/Channel.php:541 msgid "The website limit takes precedence if lower than your limit." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:547 +#: ../../Zotlabs/Module/Settings/Channel.php:542 msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:547 +#: ../../Zotlabs/Module/Settings/Channel.php:542 msgid "May reduce spam activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:548 +#: ../../Zotlabs/Module/Settings/Channel.php:543 msgid "Default Privacy Group" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:550 +#: ../../Zotlabs/Module/Settings/Channel.php:545 msgid "Use my default audience setting for the type of object published" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:551 +#: ../../Zotlabs/Module/Settings/Channel.php:546 msgid "Profile to assign new connections" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:561 -msgid "Default Permissions Group" +#: ../../Zotlabs/Module/Settings/Channel.php:556 +msgid "Default permissions category" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:567 +#: ../../Zotlabs/Module/Settings/Channel.php:562 msgid "Maximum private messages per day from unknown people:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:567 +#: ../../Zotlabs/Module/Settings/Channel.php:562 msgid "Useful to reduce spamming" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:570 +#: ../../Zotlabs/Module/Settings/Channel.php:565 #: ../../Zotlabs/Lib/Enotify.php:68 msgid "Notification Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:571 +#: ../../Zotlabs/Module/Settings/Channel.php:566 msgid "By default post a status message when:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:572 +#: ../../Zotlabs/Module/Settings/Channel.php:567 msgid "accepting a friend request" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:573 +#: ../../Zotlabs/Module/Settings/Channel.php:568 msgid "joining a forum/community" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:574 +#: ../../Zotlabs/Module/Settings/Channel.php:569 msgid "making an <em>interesting</em> profile change" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:575 +#: ../../Zotlabs/Module/Settings/Channel.php:570 msgid "Send a notification email when:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:576 +#: ../../Zotlabs/Module/Settings/Channel.php:571 msgid "You receive a connection request" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:577 +#: ../../Zotlabs/Module/Settings/Channel.php:572 msgid "Your connections are confirmed" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:578 +#: ../../Zotlabs/Module/Settings/Channel.php:573 msgid "Someone writes on your profile wall" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:579 +#: ../../Zotlabs/Module/Settings/Channel.php:574 msgid "Someone writes a followup comment" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:580 +#: ../../Zotlabs/Module/Settings/Channel.php:575 msgid "You receive a private message" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:581 +#: ../../Zotlabs/Module/Settings/Channel.php:576 msgid "You receive a friend suggestion" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:582 +#: ../../Zotlabs/Module/Settings/Channel.php:577 msgid "You are tagged in a post" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:583 +#: ../../Zotlabs/Module/Settings/Channel.php:578 msgid "You are poked/prodded/etc. in a post" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:585 +#: ../../Zotlabs/Module/Settings/Channel.php:580 msgid "Someone likes your post/comment" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:588 +#: ../../Zotlabs/Module/Settings/Channel.php:583 msgid "Show visual notifications including:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:590 +#: ../../Zotlabs/Module/Settings/Channel.php:585 msgid "Unseen grid activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:591 +#: ../../Zotlabs/Module/Settings/Channel.php:586 msgid "Unseen channel activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:592 +#: ../../Zotlabs/Module/Settings/Channel.php:587 msgid "Unseen private messages" msgstr "" +#: ../../Zotlabs/Module/Settings/Channel.php:587 #: ../../Zotlabs/Module/Settings/Channel.php:592 -#: ../../Zotlabs/Module/Settings/Channel.php:597 -#: ../../Zotlabs/Module/Settings/Channel.php:598 -#: ../../Zotlabs/Module/Settings/Channel.php:599 +#: ../../Zotlabs/Module/Settings/Channel.php:593 +#: ../../Zotlabs/Module/Settings/Channel.php:594 #: ../../addon/jappixmini/jappixmini.php:343 msgid "Recommended" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:593 +#: ../../Zotlabs/Module/Settings/Channel.php:588 msgid "Upcoming events" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:594 +#: ../../Zotlabs/Module/Settings/Channel.php:589 msgid "Events today" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:595 +#: ../../Zotlabs/Module/Settings/Channel.php:590 msgid "Upcoming birthdays" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:595 +#: ../../Zotlabs/Module/Settings/Channel.php:590 msgid "Not available in all themes" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:596 +#: ../../Zotlabs/Module/Settings/Channel.php:591 msgid "System (personal) notifications" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:597 +#: ../../Zotlabs/Module/Settings/Channel.php:592 msgid "System info messages" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:598 +#: ../../Zotlabs/Module/Settings/Channel.php:593 msgid "System critical alerts" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:599 +#: ../../Zotlabs/Module/Settings/Channel.php:594 msgid "New connections" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:600 +#: ../../Zotlabs/Module/Settings/Channel.php:595 msgid "System Registrations" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:601 +#: ../../Zotlabs/Module/Settings/Channel.php:596 msgid "Unseen shared files" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:602 +#: ../../Zotlabs/Module/Settings/Channel.php:597 msgid "Unseen public activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:603 +#: ../../Zotlabs/Module/Settings/Channel.php:598 msgid "Unseen likes and dislikes" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:604 +#: ../../Zotlabs/Module/Settings/Channel.php:599 msgid "Unseen forum posts" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:605 +#: ../../Zotlabs/Module/Settings/Channel.php:600 msgid "Email notification hub (hostname)" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:605 +#: ../../Zotlabs/Module/Settings/Channel.php:600 #, php-format msgid "" "If your channel is mirrored to multiple hubs, set this to your preferred " "location. This will prevent duplicate email notifications. Example: %s" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:606 +#: ../../Zotlabs/Module/Settings/Channel.php:601 msgid "Show new wall posts, private messages and connections under Notices" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:608 +#: ../../Zotlabs/Module/Settings/Channel.php:603 msgid "Notify me of events this many days in advance" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:608 +#: ../../Zotlabs/Module/Settings/Channel.php:603 msgid "Must be greater than 0" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:614 +#: ../../Zotlabs/Module/Settings/Channel.php:609 msgid "Advanced Account/Page Type Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:615 +#: ../../Zotlabs/Module/Settings/Channel.php:610 msgid "Change the behaviour of this account for special situations" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:617 +#: ../../Zotlabs/Module/Settings/Channel.php:612 msgid "Miscellaneous Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:618 +#: ../../Zotlabs/Module/Settings/Channel.php:613 msgid "Default photo upload folder" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:618 -#: ../../Zotlabs/Module/Settings/Channel.php:619 +#: ../../Zotlabs/Module/Settings/Channel.php:613 +#: ../../Zotlabs/Module/Settings/Channel.php:614 msgid "%Y - current year, %m - current month" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:619 +#: ../../Zotlabs/Module/Settings/Channel.php:614 msgid "Default file upload folder" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:621 +#: ../../Zotlabs/Module/Settings/Channel.php:616 msgid "Personal menu to display in your channel pages" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:623 +#: ../../Zotlabs/Module/Settings/Channel.php:618 msgid "Remove this channel." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:624 +#: ../../Zotlabs/Module/Settings/Channel.php:619 msgid "Firefox Share $Projectname provider" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:625 -msgid "Start calendar week on Monday" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Features.php:73 +#: ../../Zotlabs/Module/Settings/Features.php:43 msgid "Additional Features" msgstr "" -#: ../../Zotlabs/Module/Settings/Features.php:74 -#: ../../Zotlabs/Module/Settings/Account.php:116 -msgid "Your technical skill level" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Features.php:74 -#: ../../Zotlabs/Module/Settings/Account.php:116 -msgid "" -"Used to provide a member experience and additional features consistent with " -"your comfort level" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Tokens.php:31 -#, php-format -msgid "This channel is limited to %d tokens" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Tokens.php:37 -msgid "Name and Password are required." -msgstr "" - -#: ../../Zotlabs/Module/Settings/Tokens.php:77 -msgid "Token saved." -msgstr "" - -#: ../../Zotlabs/Module/Settings/Tokens.php:113 -msgid "" -"Use this form to create temporary access identifiers to share things with " -"non-members. These identities may be used in Access Control Lists and " -"visitors may login using these credentials to access private content." -msgstr "" - -#: ../../Zotlabs/Module/Settings/Tokens.php:115 -msgid "" -"You may also provide <em>dropbox</em> style access links to friends and " -"associates by adding the Login Password to any specific site URL as shown. " -"Examples:" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Tokens.php:150 -#: ../../Zotlabs/Widget/Settings_menu.php:100 -msgid "Guest Access Tokens" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Tokens.php:157 -msgid "Login Name" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Tokens.php:158 -msgid "Login Password" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Tokens.php:159 -msgid "Expires (yyyy-mm-dd)" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Tokens.php:160 -#: ../../Zotlabs/Module/Connedit.php:890 -msgid "Their Settings" +#: ../../Zotlabs/Module/Settings/Events.php:39 +msgid "Events Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth2.php:36 -msgid "Name and Secret are required" +#: ../../Zotlabs/Module/Settings/Calendar.php:39 +msgid "CalDAV Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth2.php:84 -msgid "Add OAuth2 application" +#: ../../Zotlabs/Module/Settings/Conversation.php:22 +msgid "Settings saved." msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth2.php:87 -#: ../../Zotlabs/Module/Settings/Oauth2.php:115 -#: ../../Zotlabs/Module/Settings/Oauth.php:90 -msgid "Name of application" +#: ../../Zotlabs/Module/Settings/Conversation.php:24 +msgid "Settings saved. Reload page please." msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth2.php:88 -#: ../../Zotlabs/Module/Settings/Oauth2.php:116 -#: ../../Zotlabs/Module/Settings/Oauth.php:92 -#: ../../Zotlabs/Module/Settings/Oauth.php:118 -#: ../../addon/statusnet/statusnet.php:893 ../../addon/twitter/twitter.php:782 -msgid "Consumer Secret" +#: ../../Zotlabs/Module/Settings/Conversation.php:46 +msgid "Conversation Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth2.php:88 -#: ../../Zotlabs/Module/Settings/Oauth2.php:116 -#: ../../Zotlabs/Module/Settings/Oauth.php:91 -#: ../../Zotlabs/Module/Settings/Oauth.php:92 -msgid "Automatically generated - change if desired. Max length 20" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Oauth2.php:89 -#: ../../Zotlabs/Module/Settings/Oauth2.php:117 -#: ../../Zotlabs/Module/Settings/Oauth.php:93 -#: ../../Zotlabs/Module/Settings/Oauth.php:119 -msgid "Redirect" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Oauth2.php:89 -#: ../../Zotlabs/Module/Settings/Oauth2.php:117 -#: ../../Zotlabs/Module/Settings/Oauth.php:93 -msgid "" -"Redirect URI - leave blank unless your application specifically requires this" +#: ../../Zotlabs/Module/Settings/Connections.php:39 +msgid "Connections Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth2.php:90 -#: ../../Zotlabs/Module/Settings/Oauth2.php:118 -msgid "Grant Types" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Oauth2.php:90 -#: ../../Zotlabs/Module/Settings/Oauth2.php:91 -#: ../../Zotlabs/Module/Settings/Oauth2.php:118 -#: ../../Zotlabs/Module/Settings/Oauth2.php:119 -msgid "leave blank unless your application sepcifically requires this" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Oauth2.php:91 -#: ../../Zotlabs/Module/Settings/Oauth2.php:119 -msgid "Authorization scope" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Oauth2.php:103 -msgid "OAuth2 Application not found." -msgstr "" - -#: ../../Zotlabs/Module/Settings/Oauth2.php:112 -#: ../../Zotlabs/Module/Settings/Oauth2.php:149 -#: ../../Zotlabs/Module/Settings/Oauth.php:87 -#: ../../Zotlabs/Module/Settings/Oauth.php:113 -#: ../../Zotlabs/Module/Settings/Oauth.php:149 -msgid "Add application" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Oauth2.php:148 -msgid "Connected OAuth2 Apps" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Oauth2.php:152 -#: ../../Zotlabs/Module/Settings/Oauth.php:152 -msgid "Client key starts with" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Oauth2.php:153 -#: ../../Zotlabs/Module/Settings/Oauth.php:153 -msgid "No name" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Oauth2.php:154 -#: ../../Zotlabs/Module/Settings/Oauth.php:154 -msgid "Remove authorization" +#: ../../Zotlabs/Module/Settings/Photos.php:39 +msgid "Photos Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:20 +#: ../../Zotlabs/Module/Settings/Account.php:19 msgid "Not valid email." msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:23 +#: ../../Zotlabs/Module/Settings/Account.php:22 msgid "Protected email address. Cannot change to that email." msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:32 +#: ../../Zotlabs/Module/Settings/Account.php:31 msgid "System failure storing new email. Please try again." msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:40 -msgid "Technical skill level updated" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Account.php:56 +#: ../../Zotlabs/Module/Settings/Account.php:48 msgid "Password verification failed." msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:63 +#: ../../Zotlabs/Module/Settings/Account.php:55 msgid "Passwords do not match. Password unchanged." msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:67 +#: ../../Zotlabs/Module/Settings/Account.php:59 msgid "Empty passwords are not allowed. Password unchanged." msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:81 +#: ../../Zotlabs/Module/Settings/Account.php:73 msgid "Password changed." msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:83 +#: ../../Zotlabs/Module/Settings/Account.php:75 msgid "Password update failed. Please try again." msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:112 +#: ../../Zotlabs/Module/Settings/Account.php:99 msgid "Account Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:113 +#: ../../Zotlabs/Module/Settings/Account.php:100 msgid "Current Password" msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:114 +#: ../../Zotlabs/Module/Settings/Account.php:101 msgid "Enter New Password" msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:115 +#: ../../Zotlabs/Module/Settings/Account.php:102 msgid "Confirm New Password" msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:115 +#: ../../Zotlabs/Module/Settings/Account.php:102 msgid "Leave password fields blank unless changing" msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:120 +#: ../../Zotlabs/Module/Settings/Account.php:105 #: ../../Zotlabs/Module/Removeaccount.php:61 msgid "Remove Account" msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:121 +#: ../../Zotlabs/Module/Settings/Account.php:106 msgid "Remove this account including all its channels" msgstr "" +#: ../../Zotlabs/Module/Settings/Profiles.php:39 +msgid "Profiles Settings" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Manage.php:39 +msgid "Channel Manager Settings" +msgstr "" + #: ../../Zotlabs/Module/Settings/Featured.php:23 msgid "Affinity Slider settings updated." msgstr "" @@ -4168,169 +4107,197 @@ msgstr "" msgid "Please save/submit changes to any panel before opening another." msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:139 +#: ../../Zotlabs/Module/Settings/Channel_home.php:41 +#: ../../Zotlabs/Module/Settings/Network.php:41 +msgid "Max height of content (in pixels)" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel_home.php:43 +#: ../../Zotlabs/Module/Settings/Network.php:43 +msgid "Click to expand content exceeding this height" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Channel_home.php:58 +msgid "Channel Home Settings" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Directory.php:39 +msgid "Directory Settings" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Editor.php:39 +msgid "Editor Settings" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Display.php:128 #, php-format msgid "%s - (Experimental)" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:187 +#: ../../Zotlabs/Module/Settings/Display.php:184 msgid "Display Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:188 +#: ../../Zotlabs/Module/Settings/Display.php:185 msgid "Theme Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:189 +#: ../../Zotlabs/Module/Settings/Display.php:186 msgid "Custom Theme Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:190 +#: ../../Zotlabs/Module/Settings/Display.php:187 msgid "Content Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:196 +#: ../../Zotlabs/Module/Settings/Display.php:193 msgid "Display Theme:" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:197 +#: ../../Zotlabs/Module/Settings/Display.php:194 msgid "Select scheme" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:199 +#: ../../Zotlabs/Module/Settings/Display.php:196 msgid "Preload images before rendering the page" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:199 +#: ../../Zotlabs/Module/Settings/Display.php:196 msgid "" "The subjective page load time will be longer but the page will be ready when " "displayed" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:200 +#: ../../Zotlabs/Module/Settings/Display.php:197 msgid "Enable user zoom on mobile devices" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:201 +#: ../../Zotlabs/Module/Settings/Display.php:198 msgid "Update browser every xx seconds" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:201 +#: ../../Zotlabs/Module/Settings/Display.php:198 msgid "Minimum of 10 seconds, no maximum" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:202 +#: ../../Zotlabs/Module/Settings/Display.php:199 msgid "Maximum number of conversations to load at any time:" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:202 +#: ../../Zotlabs/Module/Settings/Display.php:199 msgid "Maximum of 100 items" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:203 +#: ../../Zotlabs/Module/Settings/Display.php:200 msgid "Show emoticons (smilies) as images" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:204 +#: ../../Zotlabs/Module/Settings/Display.php:201 msgid "Provide channel menu in navigation bar" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:204 +#: ../../Zotlabs/Module/Settings/Display.php:201 msgid "Default: channel menu located in app menu" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:205 +#: ../../Zotlabs/Module/Settings/Display.php:202 msgid "Manual conversation updates" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:205 +#: ../../Zotlabs/Module/Settings/Display.php:202 msgid "Default is on, turning this off may increase screen jumping" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:206 +#: ../../Zotlabs/Module/Settings/Display.php:203 msgid "Link post titles to source" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:207 -msgid "System Page Layout Editor - (advanced)" +#: ../../Zotlabs/Module/Settings/Display.php:205 +#: ../../Zotlabs/Widget/Newmember.php:69 +msgid "New Member Links" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:210 -msgid "Use blog/list mode on channel page" +#: ../../Zotlabs/Module/Settings/Display.php:205 +msgid "Display new member quick links menu" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:210 -#: ../../Zotlabs/Module/Settings/Display.php:211 -msgid "(comments displayed separately)" +#: ../../Zotlabs/Module/Settings/Network.php:58 +msgid "Activity Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:211 -msgid "Use blog/list mode on grid page" +#: ../../Zotlabs/Module/Embedphotos.php:140 ../../Zotlabs/Module/Photos.php:813 +#: ../../Zotlabs/Module/Photos.php:1352 ../../Zotlabs/Widget/Portfolio.php:87 +#: ../../Zotlabs/Widget/Album.php:78 +msgid "View Photo" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:212 -msgid "Channel page max height of content (in pixels)" +#: ../../Zotlabs/Module/Embedphotos.php:156 ../../Zotlabs/Module/Photos.php:844 +#: ../../Zotlabs/Widget/Portfolio.php:108 ../../Zotlabs/Widget/Album.php:95 +msgid "Edit Album" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:212 -#: ../../Zotlabs/Module/Settings/Display.php:213 -msgid "click to expand content exceeding this height" +#: ../../Zotlabs/Module/Embedphotos.php:158 ../../Zotlabs/Module/Photos.php:714 +#: ../../Zotlabs/Module/Profile_photo.php:459 +#: ../../Zotlabs/Module/Cover_photo.php:395 +#: ../../Zotlabs/Storage/Browser.php:392 ../../Zotlabs/Widget/Cdav.php:133 +#: ../../Zotlabs/Widget/Cdav.php:169 ../../Zotlabs/Widget/Portfolio.php:110 +#: ../../Zotlabs/Widget/Album.php:97 +msgid "Upload" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:213 -msgid "Grid page max height of content (in pixels)" +#: ../../Zotlabs/Module/Tokens.php:39 +#, php-format +msgid "This channel is limited to %d tokens" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth.php:35 -msgid "Name is required" +#: ../../Zotlabs/Module/Tokens.php:45 +msgid "Name and Password are required." msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth.php:39 -msgid "Key and Secret are required" +#: ../../Zotlabs/Module/Tokens.php:85 +msgid "Token saved." msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth.php:91 -#: ../../Zotlabs/Module/Settings/Oauth.php:117 -#: ../../addon/statusnet/statusnet.php:894 ../../addon/twitter/twitter.php:781 -msgid "Consumer Key" +#: ../../Zotlabs/Module/Tokens.php:99 +msgid "Guest Access App" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth.php:94 -#: ../../Zotlabs/Module/Settings/Oauth.php:120 -msgid "Icon url" +#: ../../Zotlabs/Module/Tokens.php:100 +msgid "Create access tokens so that non-members can access private content" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth.php:94 -#: ../../Zotlabs/Module/Sources.php:115 ../../Zotlabs/Module/Sources.php:150 -msgid "Optional" +#: ../../Zotlabs/Module/Tokens.php:133 +msgid "" +"Use this form to create temporary access identifiers to share things with " +"non-members. These identities may be used in Access Control Lists and " +"visitors may login using these credentials to access private content." msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth.php:105 -msgid "Application not found." +#: ../../Zotlabs/Module/Tokens.php:135 +msgid "" +"You may also provide <em>dropbox</em> style access links to friends and " +"associates by adding the Login Password to any specific site URL as shown. " +"Examples:" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth.php:148 -msgid "Connected Apps" +#: ../../Zotlabs/Module/Tokens.php:170 +msgid "Guest Access Tokens" msgstr "" -#: ../../Zotlabs/Module/Embedphotos.php:140 ../../Zotlabs/Module/Photos.php:816 -#: ../../Zotlabs/Module/Photos.php:1355 ../../Zotlabs/Widget/Portfolio.php:87 -#: ../../Zotlabs/Widget/Album.php:78 -msgid "View Photo" +#: ../../Zotlabs/Module/Tokens.php:177 +msgid "Login Name" msgstr "" -#: ../../Zotlabs/Module/Embedphotos.php:156 ../../Zotlabs/Module/Photos.php:847 -#: ../../Zotlabs/Widget/Portfolio.php:108 ../../Zotlabs/Widget/Album.php:95 -msgid "Edit Album" +#: ../../Zotlabs/Module/Tokens.php:178 +msgid "Login Password" msgstr "" -#: ../../Zotlabs/Module/Embedphotos.php:158 ../../Zotlabs/Module/Photos.php:717 -#: ../../Zotlabs/Module/Profile_photo.php:459 -#: ../../Zotlabs/Module/Cover_photo.php:395 -#: ../../Zotlabs/Storage/Browser.php:392 ../../Zotlabs/Widget/Cdav.php:133 -#: ../../Zotlabs/Widget/Cdav.php:169 ../../Zotlabs/Widget/Portfolio.php:110 -#: ../../Zotlabs/Widget/Album.php:97 -msgid "Upload" +#: ../../Zotlabs/Module/Tokens.php:179 +msgid "Expires (yyyy-mm-dd)" +msgstr "" + +#: ../../Zotlabs/Module/Tokens.php:180 ../../Zotlabs/Module/Connedit.php:891 +msgid "Their Settings" msgstr "" #: ../../Zotlabs/Module/Achievements.php:38 @@ -4391,8 +4358,8 @@ msgid "URL for photo of thing (optional)" msgstr "" #: ../../Zotlabs/Module/Thing.php:319 ../../Zotlabs/Module/Thing.php:372 -#: ../../Zotlabs/Module/Photos.php:707 ../../Zotlabs/Module/Photos.php:1076 -#: ../../Zotlabs/Module/Connedit.php:676 ../../Zotlabs/Module/Chat.php:235 +#: ../../Zotlabs/Module/Photos.php:704 ../../Zotlabs/Module/Photos.php:1073 +#: ../../Zotlabs/Module/Connedit.php:677 ../../Zotlabs/Module/Chat.php:243 #: ../../Zotlabs/Module/Filestorage.php:170 ../../include/acl_selectors.php:123 msgid "Permissions" msgstr "" @@ -4423,7 +4390,7 @@ msgid "No channel. Import failed." msgstr "" #: ../../Zotlabs/Module/Import.php:513 -#: ../../addon/diaspora/import_diaspora.php:139 +#: ../../addon/diaspora/import_diaspora.php:141 msgid "Import completed." msgstr "" @@ -4498,24 +4465,109 @@ msgstr "" msgid "Authentication failed." msgstr "" -#: ../../Zotlabs/Module/Rmagic.php:75 ../../boot.php:1614 -#: ../../include/channel.php:2334 +#: ../../Zotlabs/Module/Rmagic.php:75 ../../boot.php:1626 +#: ../../include/channel.php:2341 msgid "Remote Authentication" msgstr "" -#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:2335 +#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:2342 msgid "Enter your channel address (e.g. channel@example.com)" msgstr "" -#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:2336 +#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:2343 msgid "Authenticate" msgstr "" -#: ../../Zotlabs/Module/Cal.php:69 +#: ../../Zotlabs/Module/Oauth2.php:54 +msgid "Name and Secret are required" +msgstr "" + +#: ../../Zotlabs/Module/Oauth2.php:106 +msgid "OAuth2 Apps Manager App" +msgstr "" + +#: ../../Zotlabs/Module/Oauth2.php:107 +msgid "OAuth2 authenticatication tokens for mobile and remote apps" +msgstr "" + +#: ../../Zotlabs/Module/Oauth2.php:115 +msgid "Add OAuth2 application" +msgstr "" + +#: ../../Zotlabs/Module/Oauth2.php:118 ../../Zotlabs/Module/Oauth2.php:146 +#: ../../Zotlabs/Module/Oauth.php:113 +msgid "Name of application" +msgstr "" + +#: ../../Zotlabs/Module/Oauth2.php:119 ../../Zotlabs/Module/Oauth2.php:147 +#: ../../Zotlabs/Module/Oauth.php:115 ../../Zotlabs/Module/Oauth.php:141 +#: ../../addon/statusnet/statusnet.php:893 ../../addon/twitter/twitter.php:785 +msgid "Consumer Secret" +msgstr "" + +#: ../../Zotlabs/Module/Oauth2.php:119 ../../Zotlabs/Module/Oauth2.php:147 +#: ../../Zotlabs/Module/Oauth.php:114 ../../Zotlabs/Module/Oauth.php:115 +msgid "Automatically generated - change if desired. Max length 20" +msgstr "" + +#: ../../Zotlabs/Module/Oauth2.php:120 ../../Zotlabs/Module/Oauth2.php:148 +#: ../../Zotlabs/Module/Oauth.php:116 ../../Zotlabs/Module/Oauth.php:142 +msgid "Redirect" +msgstr "" + +#: ../../Zotlabs/Module/Oauth2.php:120 ../../Zotlabs/Module/Oauth2.php:148 +#: ../../Zotlabs/Module/Oauth.php:116 +msgid "" +"Redirect URI - leave blank unless your application specifically requires this" +msgstr "" + +#: ../../Zotlabs/Module/Oauth2.php:121 ../../Zotlabs/Module/Oauth2.php:149 +msgid "Grant Types" +msgstr "" + +#: ../../Zotlabs/Module/Oauth2.php:121 ../../Zotlabs/Module/Oauth2.php:122 +msgid "leave blank unless your application sepcifically requires this" +msgstr "" + +#: ../../Zotlabs/Module/Oauth2.php:122 ../../Zotlabs/Module/Oauth2.php:150 +msgid "Authorization scope" +msgstr "" + +#: ../../Zotlabs/Module/Oauth2.php:134 +msgid "OAuth2 Application not found." +msgstr "" + +#: ../../Zotlabs/Module/Oauth2.php:143 ../../Zotlabs/Module/Oauth2.php:193 +#: ../../Zotlabs/Module/Oauth.php:110 ../../Zotlabs/Module/Oauth.php:136 +#: ../../Zotlabs/Module/Oauth.php:172 +msgid "Add application" +msgstr "" + +#: ../../Zotlabs/Module/Oauth2.php:149 ../../Zotlabs/Module/Oauth2.php:150 +msgid "leave blank unless your application specifically requires this" +msgstr "" + +#: ../../Zotlabs/Module/Oauth2.php:192 +msgid "Connected OAuth2 Apps" +msgstr "" + +#: ../../Zotlabs/Module/Oauth2.php:196 ../../Zotlabs/Module/Oauth.php:175 +msgid "Client key starts with" +msgstr "" + +#: ../../Zotlabs/Module/Oauth2.php:197 ../../Zotlabs/Module/Oauth.php:176 +msgid "No name" +msgstr "" + +#: ../../Zotlabs/Module/Oauth2.php:198 ../../Zotlabs/Module/Oauth.php:177 +msgid "Remove authorization" +msgstr "" + +#: ../../Zotlabs/Module/Cal.php:70 msgid "Permissions denied." msgstr "" -#: ../../Zotlabs/Module/Cal.php:344 ../../include/text.php:2482 +#: ../../Zotlabs/Module/Cal.php:343 ../../include/text.php:2489 msgid "Import" msgstr "" @@ -4549,189 +4601,196 @@ msgstr "" msgid "vcard" msgstr "" -#: ../../Zotlabs/Module/Apps.php:50 ../../Zotlabs/Lib/Apps.php:291 -msgid "Apps" +#: ../../Zotlabs/Module/Apps.php:50 ../../Zotlabs/Widget/Appstore.php:14 +msgid "Available Apps" +msgstr "" + +#: ../../Zotlabs/Module/Apps.php:50 +msgid "Installed Apps" msgstr "" #: ../../Zotlabs/Module/Apps.php:53 -msgid "Manage apps" +msgid "Manage Apps" msgstr "" #: ../../Zotlabs/Module/Apps.php:54 -msgid "Create new app" +msgid "Create Custom App" msgstr "" -#: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:268 +#: ../../Zotlabs/Module/Mood.php:75 ../../include/conversation.php:268 #, php-format msgctxt "mood" msgid "%1$s is %2$s" msgstr "" -#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:315 -msgid "Mood" +#: ../../Zotlabs/Module/Mood.php:132 +msgid "Mood App" msgstr "" -#: ../../Zotlabs/Module/Mood.php:136 +#: ../../Zotlabs/Module/Mood.php:133 ../../Zotlabs/Module/Mood.php:153 msgid "Set your current mood and tell your friends" msgstr "" -#: ../../Zotlabs/Module/Connections.php:55 -#: ../../Zotlabs/Module/Connections.php:112 -#: ../../Zotlabs/Module/Connections.php:256 +#: ../../Zotlabs/Module/Mood.php:152 ../../Zotlabs/Lib/Apps.php:328 +msgid "Mood" +msgstr "" + +#: ../../Zotlabs/Module/Connections.php:58 +#: ../../Zotlabs/Module/Connections.php:115 +#: ../../Zotlabs/Module/Connections.php:259 msgid "Active" msgstr "" -#: ../../Zotlabs/Module/Connections.php:60 -#: ../../Zotlabs/Module/Connections.php:164 -#: ../../Zotlabs/Module/Connections.php:261 +#: ../../Zotlabs/Module/Connections.php:63 +#: ../../Zotlabs/Module/Connections.php:167 +#: ../../Zotlabs/Module/Connections.php:264 msgid "Blocked" msgstr "" -#: ../../Zotlabs/Module/Connections.php:65 -#: ../../Zotlabs/Module/Connections.php:171 -#: ../../Zotlabs/Module/Connections.php:260 +#: ../../Zotlabs/Module/Connections.php:68 +#: ../../Zotlabs/Module/Connections.php:174 +#: ../../Zotlabs/Module/Connections.php:263 msgid "Ignored" msgstr "" -#: ../../Zotlabs/Module/Connections.php:70 -#: ../../Zotlabs/Module/Connections.php:185 -#: ../../Zotlabs/Module/Connections.php:259 +#: ../../Zotlabs/Module/Connections.php:73 +#: ../../Zotlabs/Module/Connections.php:188 +#: ../../Zotlabs/Module/Connections.php:262 msgid "Hidden" msgstr "" -#: ../../Zotlabs/Module/Connections.php:75 -#: ../../Zotlabs/Module/Connections.php:178 +#: ../../Zotlabs/Module/Connections.php:78 +#: ../../Zotlabs/Module/Connections.php:181 msgid "Archived/Unreachable" msgstr "" -#: ../../Zotlabs/Module/Connections.php:80 -#: ../../Zotlabs/Module/Connections.php:89 ../../Zotlabs/Module/Menu.php:179 +#: ../../Zotlabs/Module/Connections.php:83 +#: ../../Zotlabs/Module/Connections.php:92 ../../Zotlabs/Module/Menu.php:179 #: ../../Zotlabs/Module/Notifications.php:50 -#: ../../include/conversation.php:1726 msgid "New" msgstr "" -#: ../../Zotlabs/Module/Connections.php:94 -#: ../../Zotlabs/Module/Connections.php:108 -#: ../../Zotlabs/Module/Connedit.php:713 ../../Zotlabs/Widget/Affinity.php:26 +#: ../../Zotlabs/Module/Connections.php:97 +#: ../../Zotlabs/Module/Connections.php:111 +#: ../../Zotlabs/Module/Connedit.php:714 ../../Zotlabs/Widget/Affinity.php:26 msgid "All" msgstr "" -#: ../../Zotlabs/Module/Connections.php:140 +#: ../../Zotlabs/Module/Connections.php:143 msgid "Active Connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:143 +#: ../../Zotlabs/Module/Connections.php:146 msgid "Show active connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:147 +#: ../../Zotlabs/Module/Connections.php:150 #: ../../Zotlabs/Widget/Notifications.php:84 msgid "New Connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:150 +#: ../../Zotlabs/Module/Connections.php:153 msgid "Show pending (new) connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:167 +#: ../../Zotlabs/Module/Connections.php:170 msgid "Only show blocked connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:174 +#: ../../Zotlabs/Module/Connections.php:177 msgid "Only show ignored connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:181 +#: ../../Zotlabs/Module/Connections.php:184 msgid "Only show archived/unreachable connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:188 +#: ../../Zotlabs/Module/Connections.php:191 msgid "Only show hidden connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:203 +#: ../../Zotlabs/Module/Connections.php:206 msgid "Show all connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:257 +#: ../../Zotlabs/Module/Connections.php:260 msgid "Pending approval" msgstr "" -#: ../../Zotlabs/Module/Connections.php:258 +#: ../../Zotlabs/Module/Connections.php:261 msgid "Archived" msgstr "" -#: ../../Zotlabs/Module/Connections.php:262 +#: ../../Zotlabs/Module/Connections.php:265 msgid "Not connected at this location" msgstr "" -#: ../../Zotlabs/Module/Connections.php:279 +#: ../../Zotlabs/Module/Connections.php:282 #, php-format msgid "%1$s [%2$s]" msgstr "" -#: ../../Zotlabs/Module/Connections.php:280 +#: ../../Zotlabs/Module/Connections.php:283 msgid "Edit connection" msgstr "" -#: ../../Zotlabs/Module/Connections.php:282 +#: ../../Zotlabs/Module/Connections.php:285 msgid "Delete connection" msgstr "" -#: ../../Zotlabs/Module/Connections.php:291 +#: ../../Zotlabs/Module/Connections.php:294 msgid "Channel address" msgstr "" -#: ../../Zotlabs/Module/Connections.php:293 +#: ../../Zotlabs/Module/Connections.php:296 ../../include/features.php:313 msgid "Network" msgstr "" -#: ../../Zotlabs/Module/Connections.php:296 +#: ../../Zotlabs/Module/Connections.php:299 msgid "Call" msgstr "" -#: ../../Zotlabs/Module/Connections.php:298 +#: ../../Zotlabs/Module/Connections.php:301 msgid "Status" msgstr "" -#: ../../Zotlabs/Module/Connections.php:300 +#: ../../Zotlabs/Module/Connections.php:303 msgid "Connected" msgstr "" -#: ../../Zotlabs/Module/Connections.php:302 +#: ../../Zotlabs/Module/Connections.php:305 msgid "Approve connection" msgstr "" -#: ../../Zotlabs/Module/Connections.php:304 +#: ../../Zotlabs/Module/Connections.php:307 msgid "Ignore connection" msgstr "" -#: ../../Zotlabs/Module/Connections.php:305 -#: ../../Zotlabs/Module/Connedit.php:630 +#: ../../Zotlabs/Module/Connections.php:308 +#: ../../Zotlabs/Module/Connedit.php:631 msgid "Ignore" msgstr "" -#: ../../Zotlabs/Module/Connections.php:306 +#: ../../Zotlabs/Module/Connections.php:309 msgid "Recent activity" msgstr "" -#: ../../Zotlabs/Module/Connections.php:331 ../../Zotlabs/Lib/Apps.php:298 -#: ../../include/text.php:975 +#: ../../Zotlabs/Module/Connections.php:334 ../../Zotlabs/Lib/Apps.php:311 +#: ../../include/text.php:981 ../../include/features.php:125 msgid "Connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:336 +#: ../../Zotlabs/Module/Connections.php:339 msgid "Search your connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:337 +#: ../../Zotlabs/Module/Connections.php:340 msgid "Connections search" msgstr "" -#: ../../Zotlabs/Module/Connections.php:338 -#: ../../Zotlabs/Module/Directory.php:401 -#: ../../Zotlabs/Module/Directory.php:406 ../../include/contact_widgets.php:23 +#: ../../Zotlabs/Module/Connections.php:341 +#: ../../Zotlabs/Module/Directory.php:405 +#: ../../Zotlabs/Module/Directory.php:410 ../../include/contact_widgets.php:23 msgid "Find" msgstr "" @@ -4743,11 +4802,11 @@ msgstr "" msgid "Bookmark added" msgstr "" -#: ../../Zotlabs/Module/Bookmarks.php:79 +#: ../../Zotlabs/Module/Bookmarks.php:78 msgid "My Bookmarks" msgstr "" -#: ../../Zotlabs/Module/Bookmarks.php:90 +#: ../../Zotlabs/Module/Bookmarks.php:89 msgid "My Connections Bookmarks" msgstr "" @@ -4791,7 +4850,7 @@ msgstr "" msgid "Delete Album" msgstr "" -#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1088 +#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1085 msgid "Delete Photo" msgstr "" @@ -4803,178 +4862,178 @@ msgstr "" msgid "Access to this item is restricted." msgstr "" -#: ../../Zotlabs/Module/Photos.php:651 +#: ../../Zotlabs/Module/Photos.php:648 #, php-format msgid "%1$.2f MB of %2$.2f MB photo storage used." msgstr "" -#: ../../Zotlabs/Module/Photos.php:654 +#: ../../Zotlabs/Module/Photos.php:651 #, php-format msgid "%1$.2f MB photo storage used." msgstr "" -#: ../../Zotlabs/Module/Photos.php:696 +#: ../../Zotlabs/Module/Photos.php:693 msgid "Upload Photos" msgstr "" -#: ../../Zotlabs/Module/Photos.php:700 +#: ../../Zotlabs/Module/Photos.php:697 msgid "Enter an album name" msgstr "" -#: ../../Zotlabs/Module/Photos.php:701 +#: ../../Zotlabs/Module/Photos.php:698 msgid "or select an existing album (doubleclick)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:702 +#: ../../Zotlabs/Module/Photos.php:699 msgid "Create a status post for this upload" msgstr "" -#: ../../Zotlabs/Module/Photos.php:704 +#: ../../Zotlabs/Module/Photos.php:701 msgid "Description (optional)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:790 +#: ../../Zotlabs/Module/Photos.php:787 msgid "Show Newest First" msgstr "" -#: ../../Zotlabs/Module/Photos.php:792 +#: ../../Zotlabs/Module/Photos.php:789 msgid "Show Oldest First" msgstr "" -#: ../../Zotlabs/Module/Photos.php:849 ../../Zotlabs/Module/Photos.php:1386 +#: ../../Zotlabs/Module/Photos.php:846 ../../Zotlabs/Module/Photos.php:1383 msgid "Add Photos" msgstr "" -#: ../../Zotlabs/Module/Photos.php:897 +#: ../../Zotlabs/Module/Photos.php:894 msgid "Permission denied. Access to this item may be restricted." msgstr "" -#: ../../Zotlabs/Module/Photos.php:899 +#: ../../Zotlabs/Module/Photos.php:896 msgid "Photo not available" msgstr "" -#: ../../Zotlabs/Module/Photos.php:957 +#: ../../Zotlabs/Module/Photos.php:954 msgid "Use as profile photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:958 +#: ../../Zotlabs/Module/Photos.php:955 msgid "Use as cover photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:965 +#: ../../Zotlabs/Module/Photos.php:962 msgid "Private Photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:980 +#: ../../Zotlabs/Module/Photos.php:977 msgid "View Full Size" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1062 +#: ../../Zotlabs/Module/Photos.php:1059 msgid "Edit photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1064 +#: ../../Zotlabs/Module/Photos.php:1061 msgid "Rotate CW (right)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1065 +#: ../../Zotlabs/Module/Photos.php:1062 msgid "Rotate CCW (left)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1068 +#: ../../Zotlabs/Module/Photos.php:1065 msgid "Move photo to album" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1069 +#: ../../Zotlabs/Module/Photos.php:1066 msgid "Enter a new album name" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1070 +#: ../../Zotlabs/Module/Photos.php:1067 msgid "or select an existing one (doubleclick)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1075 +#: ../../Zotlabs/Module/Photos.php:1072 msgid "Add a Tag" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1083 +#: ../../Zotlabs/Module/Photos.php:1080 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1086 +#: ../../Zotlabs/Module/Photos.php:1083 msgid "Flag as adult in album view" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1105 ../../Zotlabs/Lib/ThreadItem.php:285 +#: ../../Zotlabs/Module/Photos.php:1102 ../../Zotlabs/Lib/ThreadItem.php:287 msgid "I like this (toggle)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1106 ../../Zotlabs/Lib/ThreadItem.php:286 +#: ../../Zotlabs/Module/Photos.php:1103 ../../Zotlabs/Lib/ThreadItem.php:288 msgid "I don't like this (toggle)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1108 ../../Zotlabs/Lib/ThreadItem.php:432 +#: ../../Zotlabs/Module/Photos.php:1105 ../../Zotlabs/Lib/ThreadItem.php:439 #: ../../include/conversation.php:787 msgid "Please wait" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1124 ../../Zotlabs/Module/Photos.php:1242 -#: ../../Zotlabs/Lib/ThreadItem.php:754 +#: ../../Zotlabs/Module/Photos.php:1121 ../../Zotlabs/Module/Photos.php:1239 +#: ../../Zotlabs/Lib/ThreadItem.php:762 msgid "This is you" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1126 ../../Zotlabs/Module/Photos.php:1244 -#: ../../Zotlabs/Lib/ThreadItem.php:756 ../../include/js_strings.php:6 +#: ../../Zotlabs/Module/Photos.php:1123 ../../Zotlabs/Module/Photos.php:1241 +#: ../../Zotlabs/Lib/ThreadItem.php:764 ../../include/js_strings.php:6 msgid "Comment" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1142 ../../include/conversation.php:619 +#: ../../Zotlabs/Module/Photos.php:1139 ../../include/conversation.php:619 msgctxt "title" msgid "Likes" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1142 ../../include/conversation.php:619 +#: ../../Zotlabs/Module/Photos.php:1139 ../../include/conversation.php:619 msgctxt "title" msgid "Dislikes" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1143 ../../include/conversation.php:620 +#: ../../Zotlabs/Module/Photos.php:1140 ../../include/conversation.php:620 msgctxt "title" msgid "Agree" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1143 ../../include/conversation.php:620 +#: ../../Zotlabs/Module/Photos.php:1140 ../../include/conversation.php:620 msgctxt "title" msgid "Disagree" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1143 ../../include/conversation.php:620 +#: ../../Zotlabs/Module/Photos.php:1140 ../../include/conversation.php:620 msgctxt "title" msgid "Abstain" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1144 ../../include/conversation.php:621 +#: ../../Zotlabs/Module/Photos.php:1141 ../../include/conversation.php:621 msgctxt "title" msgid "Attending" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1144 ../../include/conversation.php:621 +#: ../../Zotlabs/Module/Photos.php:1141 ../../include/conversation.php:621 msgctxt "title" msgid "Not attending" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1144 ../../include/conversation.php:621 +#: ../../Zotlabs/Module/Photos.php:1141 ../../include/conversation.php:621 msgctxt "title" msgid "Might attend" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1161 ../../Zotlabs/Module/Photos.php:1173 +#: ../../Zotlabs/Module/Photos.php:1158 ../../Zotlabs/Module/Photos.php:1170 #: ../../Zotlabs/Lib/ThreadItem.php:212 ../../Zotlabs/Lib/ThreadItem.php:224 msgid "View all" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1165 ../../Zotlabs/Lib/ThreadItem.php:216 -#: ../../include/conversation.php:1990 ../../include/channel.php:1539 +#: ../../Zotlabs/Module/Photos.php:1162 ../../Zotlabs/Lib/ThreadItem.php:216 +#: ../../include/conversation.php:1693 ../../include/channel.php:1546 #: ../../include/taxonomy.php:661 msgctxt "noun" msgid "Like" @@ -4982,262 +5041,278 @@ msgid_plural "Likes" msgstr[0] "" msgstr[1] "" -#: ../../Zotlabs/Module/Photos.php:1170 ../../Zotlabs/Lib/ThreadItem.php:221 -#: ../../include/conversation.php:1993 +#: ../../Zotlabs/Module/Photos.php:1167 ../../Zotlabs/Lib/ThreadItem.php:221 +#: ../../include/conversation.php:1696 msgctxt "noun" msgid "Dislike" msgid_plural "Dislikes" msgstr[0] "" msgstr[1] "" -#: ../../Zotlabs/Module/Photos.php:1270 +#: ../../Zotlabs/Module/Photos.php:1267 msgid "Photo Tools" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1279 +#: ../../Zotlabs/Module/Photos.php:1276 msgid "In This Photo:" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1284 +#: ../../Zotlabs/Module/Photos.php:1281 msgid "Map" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1292 ../../Zotlabs/Lib/ThreadItem.php:420 +#: ../../Zotlabs/Module/Photos.php:1289 ../../Zotlabs/Lib/ThreadItem.php:427 msgctxt "noun" msgid "Likes" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1293 ../../Zotlabs/Lib/ThreadItem.php:421 +#: ../../Zotlabs/Module/Photos.php:1290 ../../Zotlabs/Lib/ThreadItem.php:428 msgctxt "noun" msgid "Dislikes" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1298 ../../Zotlabs/Lib/ThreadItem.php:426 +#: ../../Zotlabs/Module/Photos.php:1295 ../../Zotlabs/Lib/ThreadItem.php:433 #: ../../include/acl_selectors.php:125 msgid "Close" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1370 ../../Zotlabs/Module/Photos.php:1383 -#: ../../Zotlabs/Module/Photos.php:1384 ../../include/photos.php:668 +#: ../../Zotlabs/Module/Photos.php:1367 ../../Zotlabs/Module/Photos.php:1380 +#: ../../Zotlabs/Module/Photos.php:1381 ../../include/photos.php:668 msgid "Recent Photos" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:30 ../../addon/cart/cart.php:1293 +#: ../../Zotlabs/Module/Wiki.php:35 ../../addon/cart/cart.php:1295 msgid "Profile Unavailable." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:44 ../../Zotlabs/Module/Cloud.php:123 -msgid "Not found" +#: ../../Zotlabs/Module/Wiki.php:52 +msgid "Wiki App" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:68 ../../addon/cart/myshop.php:51 -#: ../../addon/cart/cart.php:1420 -#: ../../addon/cart/submodules/paypalbutton.php:481 -#: ../../addon/cart/manual_payments.php:62 +#: ../../Zotlabs/Module/Wiki.php:53 +msgid "Provide a wiki for your channel" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:77 ../../addon/cart/myshop.php:37 +#: ../../addon/cart/cart.php:1438 +#: ../../addon/cart/submodules/paypalbutton.php:455 +#: ../../addon/cart/manual_payments.php:63 msgid "Invalid channel" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:124 +#: ../../Zotlabs/Module/Wiki.php:133 msgid "Error retrieving wiki" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:131 +#: ../../Zotlabs/Module/Wiki.php:140 msgid "Error creating zip file export folder" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:182 +#: ../../Zotlabs/Module/Wiki.php:191 msgid "Error downloading wiki: " msgstr "" -#: ../../Zotlabs/Module/Wiki.php:197 ../../include/conversation.php:1937 -#: ../../include/nav.php:486 +#: ../../Zotlabs/Module/Wiki.php:206 ../../Zotlabs/Widget/Wiki_list.php:19 +#: ../../include/nav.php:501 msgid "Wikis" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:203 +#: ../../Zotlabs/Module/Wiki.php:212 msgid "Download" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:205 ../../Zotlabs/Module/Chat.php:256 +#: ../../Zotlabs/Module/Wiki.php:214 ../../Zotlabs/Module/Chat.php:264 #: ../../Zotlabs/Module/Profiles.php:831 ../../Zotlabs/Module/Manage.php:145 msgid "Create New" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:207 +#: ../../Zotlabs/Module/Wiki.php:216 msgid "Wiki name" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:208 +#: ../../Zotlabs/Module/Wiki.php:217 msgid "Content type" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:350 +#: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Module/Wiki.php:359 #: ../../Zotlabs/Widget/Wiki_pages.php:36 -#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../addon/mdpost/mdpost.php:40 -#: ../../include/text.php:1886 +#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../addon/mdpost/mdpost.php:41 +#: ../../include/text.php:1892 msgid "Markdown" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Module/Wiki.php:350 +#: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Module/Wiki.php:359 #: ../../Zotlabs/Widget/Wiki_pages.php:36 -#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1884 +#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1890 msgid "BBcode" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:208 ../../Zotlabs/Widget/Wiki_pages.php:36 -#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1887 +#: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Widget/Wiki_pages.php:36 +#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1893 msgid "Text" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:210 ../../Zotlabs/Storage/Browser.php:286 +#: ../../Zotlabs/Module/Wiki.php:219 ../../Zotlabs/Storage/Browser.php:286 msgid "Type" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:211 +#: ../../Zotlabs/Module/Wiki.php:220 msgid "Any type" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:218 +#: ../../Zotlabs/Module/Wiki.php:227 msgid "Lock content type" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:219 +#: ../../Zotlabs/Module/Wiki.php:228 msgid "Create a status post for this wiki" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:220 +#: ../../Zotlabs/Module/Wiki.php:229 msgid "Edit Wiki Name" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:262 +#: ../../Zotlabs/Module/Wiki.php:271 msgid "Wiki not found" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:286 +#: ../../Zotlabs/Module/Wiki.php:295 msgid "Rename page" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:307 +#: ../../Zotlabs/Module/Wiki.php:316 msgid "Error retrieving page content" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:315 ../../Zotlabs/Module/Wiki.php:317 +#: ../../Zotlabs/Module/Wiki.php:324 ../../Zotlabs/Module/Wiki.php:326 msgid "New page" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:345 +#: ../../Zotlabs/Module/Wiki.php:354 msgid "Revision Comparison" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:346 +#: ../../Zotlabs/Module/Wiki.php:355 ../../Zotlabs/Lib/NativeWikiPage.php:561 +#: ../../Zotlabs/Widget/Wiki_page_history.php:25 msgid "Revert" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:353 +#: ../../Zotlabs/Module/Wiki.php:362 msgid "Short description of your changes (optional)" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:362 +#: ../../Zotlabs/Module/Wiki.php:371 msgid "Source" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:372 +#: ../../Zotlabs/Module/Wiki.php:381 msgid "New page name" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:377 +#: ../../Zotlabs/Module/Wiki.php:386 msgid "Embed image from photo albums" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:378 ../../include/conversation.php:1396 +#: ../../Zotlabs/Module/Wiki.php:387 ../../addon/hsse/hsse.php:208 +#: ../../include/conversation.php:1411 msgid "Embed an image from your albums" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:380 ../../Zotlabs/Module/Profile_photo.php:466 -#: ../../Zotlabs/Module/Cover_photo.php:400 ../../include/conversation.php:1398 -#: ../../include/conversation.php:1445 +#: ../../Zotlabs/Module/Wiki.php:389 ../../Zotlabs/Module/Profile_photo.php:466 +#: ../../Zotlabs/Module/Cover_photo.php:400 ../../addon/hsse/hsse.php:210 +#: ../../addon/hsse/hsse.php:257 ../../include/conversation.php:1413 +#: ../../include/conversation.php:1460 msgid "OK" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:381 ../../Zotlabs/Module/Profile_photo.php:467 -#: ../../Zotlabs/Module/Cover_photo.php:401 ../../include/conversation.php:1327 +#: ../../Zotlabs/Module/Wiki.php:390 ../../Zotlabs/Module/Profile_photo.php:467 +#: ../../Zotlabs/Module/Cover_photo.php:401 ../../addon/hsse/hsse.php:139 +#: ../../include/conversation.php:1342 msgid "Choose images to embed" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:382 ../../Zotlabs/Module/Profile_photo.php:468 -#: ../../Zotlabs/Module/Cover_photo.php:402 ../../include/conversation.php:1328 +#: ../../Zotlabs/Module/Wiki.php:391 ../../Zotlabs/Module/Profile_photo.php:468 +#: ../../Zotlabs/Module/Cover_photo.php:402 ../../addon/hsse/hsse.php:140 +#: ../../include/conversation.php:1343 msgid "Choose an album" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:383 ../../Zotlabs/Module/Profile_photo.php:469 +#: ../../Zotlabs/Module/Wiki.php:392 ../../Zotlabs/Module/Profile_photo.php:469 #: ../../Zotlabs/Module/Cover_photo.php:403 msgid "Choose a different album" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:384 ../../Zotlabs/Module/Profile_photo.php:470 -#: ../../Zotlabs/Module/Cover_photo.php:404 ../../include/conversation.php:1330 +#: ../../Zotlabs/Module/Wiki.php:393 ../../Zotlabs/Module/Profile_photo.php:470 +#: ../../Zotlabs/Module/Cover_photo.php:404 ../../addon/hsse/hsse.php:142 +#: ../../include/conversation.php:1345 msgid "Error getting album list" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:385 ../../Zotlabs/Module/Profile_photo.php:471 -#: ../../Zotlabs/Module/Cover_photo.php:405 ../../include/conversation.php:1331 +#: ../../Zotlabs/Module/Wiki.php:394 ../../Zotlabs/Module/Profile_photo.php:471 +#: ../../Zotlabs/Module/Cover_photo.php:405 ../../addon/hsse/hsse.php:143 +#: ../../include/conversation.php:1346 msgid "Error getting photo link" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:386 ../../Zotlabs/Module/Profile_photo.php:472 -#: ../../Zotlabs/Module/Cover_photo.php:406 ../../include/conversation.php:1332 +#: ../../Zotlabs/Module/Wiki.php:395 ../../Zotlabs/Module/Profile_photo.php:472 +#: ../../Zotlabs/Module/Cover_photo.php:406 ../../addon/hsse/hsse.php:144 +#: ../../include/conversation.php:1347 msgid "Error getting album" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:462 +#: ../../Zotlabs/Module/Wiki.php:397 +msgid "History" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:473 msgid "Error creating wiki. Invalid name." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:469 +#: ../../Zotlabs/Module/Wiki.php:480 msgid "A wiki with this name already exists." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:482 +#: ../../Zotlabs/Module/Wiki.php:493 msgid "Wiki created, but error creating Home page." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:489 +#: ../../Zotlabs/Module/Wiki.php:500 msgid "Error creating wiki" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:512 +#: ../../Zotlabs/Module/Wiki.php:523 msgid "Error updating wiki. Invalid name." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:532 +#: ../../Zotlabs/Module/Wiki.php:543 msgid "Error updating wiki" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:547 +#: ../../Zotlabs/Module/Wiki.php:558 msgid "Wiki delete permission denied." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:557 +#: ../../Zotlabs/Module/Wiki.php:568 msgid "Error deleting wiki" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:590 +#: ../../Zotlabs/Module/Wiki.php:601 msgid "New page created" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:711 +#: ../../Zotlabs/Module/Wiki.php:722 msgid "Cannot delete Home" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:775 +#: ../../Zotlabs/Module/Wiki.php:786 msgid "Current Revision" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:775 +#: ../../Zotlabs/Module/Wiki.php:786 msgid "Selected Revision" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:825 +#: ../../Zotlabs/Module/Wiki.php:836 msgid "You must be authenticated." msgstr "" @@ -5245,72 +5320,84 @@ msgstr "" msgid "toggle full screen mode" msgstr "" -#: ../../Zotlabs/Module/Pdledit.php:21 +#: ../../Zotlabs/Module/Pdledit.php:26 msgid "Layout updated." msgstr "" -#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Chat.php:219 -msgid "Feature disabled." +#: ../../Zotlabs/Module/Pdledit.php:42 +msgid "PDL Editor App" msgstr "" -#: ../../Zotlabs/Module/Pdledit.php:47 ../../Zotlabs/Module/Pdledit.php:90 +#: ../../Zotlabs/Module/Pdledit.php:43 +msgid "Provides the ability to edit system page layouts" +msgstr "" + +#: ../../Zotlabs/Module/Pdledit.php:56 ../../Zotlabs/Module/Pdledit.php:99 msgid "Edit System Page Description" msgstr "" -#: ../../Zotlabs/Module/Pdledit.php:68 +#: ../../Zotlabs/Module/Pdledit.php:77 msgid "(modified)" msgstr "" -#: ../../Zotlabs/Module/Pdledit.php:68 ../../Zotlabs/Module/Lostpass.php:133 +#: ../../Zotlabs/Module/Pdledit.php:77 ../../Zotlabs/Module/Lostpass.php:133 msgid "Reset" msgstr "" -#: ../../Zotlabs/Module/Pdledit.php:85 +#: ../../Zotlabs/Module/Pdledit.php:94 msgid "Layout not found." msgstr "" -#: ../../Zotlabs/Module/Pdledit.php:91 +#: ../../Zotlabs/Module/Pdledit.php:100 msgid "Module Name:" msgstr "" -#: ../../Zotlabs/Module/Pdledit.php:92 +#: ../../Zotlabs/Module/Pdledit.php:101 msgid "Layout Help" msgstr "" -#: ../../Zotlabs/Module/Pdledit.php:93 +#: ../../Zotlabs/Module/Pdledit.php:102 msgid "Edit another layout" msgstr "" -#: ../../Zotlabs/Module/Pdledit.php:94 +#: ../../Zotlabs/Module/Pdledit.php:103 msgid "System layout" msgstr "" -#: ../../Zotlabs/Module/Poke.php:182 ../../Zotlabs/Lib/Apps.php:316 -#: ../../include/conversation.php:1097 +#: ../../Zotlabs/Module/Poke.php:165 +msgid "Poke App" +msgstr "" + +#: ../../Zotlabs/Module/Poke.php:166 +msgid "Poke somebody in your addressbook" +msgstr "" + +#: ../../Zotlabs/Module/Poke.php:199 ../../Zotlabs/Lib/Apps.php:329 +#: ../../include/conversation.php:1098 msgid "Poke" msgstr "" -#: ../../Zotlabs/Module/Poke.php:183 +#: ../../Zotlabs/Module/Poke.php:200 msgid "Poke somebody" msgstr "" -#: ../../Zotlabs/Module/Poke.php:186 +#: ../../Zotlabs/Module/Poke.php:203 msgid "Poke/Prod" msgstr "" -#: ../../Zotlabs/Module/Poke.php:187 +#: ../../Zotlabs/Module/Poke.php:204 msgid "Poke, prod or do other things to somebody" msgstr "" -#: ../../Zotlabs/Module/Poke.php:194 +#: ../../Zotlabs/Module/Poke.php:211 msgid "Recipient" msgstr "" -#: ../../Zotlabs/Module/Poke.php:195 +#: ../../Zotlabs/Module/Poke.php:212 msgid "Choose what you wish to do to recipient" msgstr "" -#: ../../Zotlabs/Module/Poke.php:198 ../../Zotlabs/Module/Poke.php:199 +#: ../../Zotlabs/Module/Poke.php:215 ../../Zotlabs/Module/Poke.php:216 msgid "Make this post private" msgstr "" @@ -5432,32 +5519,32 @@ msgstr "" msgid "Unable to locate original post." msgstr "" -#: ../../Zotlabs/Module/Item.php:477 +#: ../../Zotlabs/Module/Item.php:479 msgid "Empty post discarded." msgstr "" -#: ../../Zotlabs/Module/Item.php:864 +#: ../../Zotlabs/Module/Item.php:866 msgid "Duplicate post suppressed." msgstr "" -#: ../../Zotlabs/Module/Item.php:1009 +#: ../../Zotlabs/Module/Item.php:1011 msgid "System error. Post not saved." msgstr "" -#: ../../Zotlabs/Module/Item.php:1045 +#: ../../Zotlabs/Module/Item.php:1047 msgid "Your comment is awaiting approval." msgstr "" -#: ../../Zotlabs/Module/Item.php:1162 +#: ../../Zotlabs/Module/Item.php:1164 msgid "Unable to obtain post information from database." msgstr "" -#: ../../Zotlabs/Module/Item.php:1191 +#: ../../Zotlabs/Module/Item.php:1171 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "" -#: ../../Zotlabs/Module/Item.php:1198 +#: ../../Zotlabs/Module/Item.php:1178 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "" @@ -5503,10 +5590,10 @@ msgid "Invalid item." msgstr "" #: ../../Zotlabs/Module/Page.php:136 ../../Zotlabs/Module/Block.php:77 -#: ../../Zotlabs/Module/Display.php:141 ../../Zotlabs/Module/Display.php:158 -#: ../../Zotlabs/Module/Display.php:175 -#: ../../Zotlabs/Lib/NativeWikiPage.php:519 ../../Zotlabs/Web/Router.php:167 -#: ../../include/help.php:81 +#: ../../Zotlabs/Module/Display.php:140 ../../Zotlabs/Module/Display.php:157 +#: ../../Zotlabs/Module/Display.php:174 +#: ../../Zotlabs/Lib/NativeWikiPage.php:519 ../../Zotlabs/Web/Router.php:185 +#: ../../include/help.php:132 msgid "Page not found." msgstr "" @@ -5520,303 +5607,302 @@ msgid "" "non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:79 ../../Zotlabs/Module/Defperms.php:59 +#: ../../Zotlabs/Module/Connedit.php:80 ../../Zotlabs/Module/Defperms.php:67 msgid "Could not access contact record." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:109 +#: ../../Zotlabs/Module/Connedit.php:110 msgid "Could not locate selected profile." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:246 +#: ../../Zotlabs/Module/Connedit.php:247 msgid "Connection updated." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:248 +#: ../../Zotlabs/Module/Connedit.php:249 msgid "Failed to update connection record." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:302 +#: ../../Zotlabs/Module/Connedit.php:303 msgid "is now connected to" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:427 +#: ../../Zotlabs/Module/Connedit.php:428 msgid "Could not access address book record." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:475 +#: ../../Zotlabs/Module/Connedit.php:476 msgid "Refresh failed - channel is currently unavailable." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:490 ../../Zotlabs/Module/Connedit.php:499 -#: ../../Zotlabs/Module/Connedit.php:508 ../../Zotlabs/Module/Connedit.php:517 -#: ../../Zotlabs/Module/Connedit.php:530 +#: ../../Zotlabs/Module/Connedit.php:491 ../../Zotlabs/Module/Connedit.php:500 +#: ../../Zotlabs/Module/Connedit.php:509 ../../Zotlabs/Module/Connedit.php:518 +#: ../../Zotlabs/Module/Connedit.php:531 msgid "Unable to set address book parameters." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:554 +#: ../../Zotlabs/Module/Connedit.php:555 msgid "Connection has been removed." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:594 ../../Zotlabs/Lib/Apps.php:309 +#: ../../Zotlabs/Module/Connedit.php:595 ../../Zotlabs/Lib/Apps.php:322 #: ../../addon/openclipatar/openclipatar.php:57 -#: ../../include/conversation.php:1037 ../../include/nav.php:108 +#: ../../include/conversation.php:1038 ../../include/nav.php:106 msgid "View Profile" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:597 +#: ../../Zotlabs/Module/Connedit.php:598 #, php-format msgid "View %s's profile" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:601 +#: ../../Zotlabs/Module/Connedit.php:602 msgid "Refresh Permissions" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:604 +#: ../../Zotlabs/Module/Connedit.php:605 msgid "Fetch updated permissions" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:608 +#: ../../Zotlabs/Module/Connedit.php:609 msgid "Refresh Photo" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:611 +#: ../../Zotlabs/Module/Connedit.php:612 msgid "Fetch updated photo" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:615 ../../include/conversation.php:1047 +#: ../../Zotlabs/Module/Connedit.php:616 ../../include/conversation.php:1048 msgid "Recent Activity" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:618 +#: ../../Zotlabs/Module/Connedit.php:619 msgid "View recent posts and comments" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:625 +#: ../../Zotlabs/Module/Connedit.php:626 msgid "Block (or Unblock) all communications with this connection" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:626 +#: ../../Zotlabs/Module/Connedit.php:627 msgid "This connection is blocked!" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:630 +#: ../../Zotlabs/Module/Connedit.php:631 msgid "Unignore" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:633 +#: ../../Zotlabs/Module/Connedit.php:634 msgid "Ignore (or Unignore) all inbound communications from this connection" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:634 +#: ../../Zotlabs/Module/Connedit.php:635 msgid "This connection is ignored!" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:638 +#: ../../Zotlabs/Module/Connedit.php:639 msgid "Unarchive" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:638 +#: ../../Zotlabs/Module/Connedit.php:639 msgid "Archive" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:641 +#: ../../Zotlabs/Module/Connedit.php:642 msgid "" "Archive (or Unarchive) this connection - mark channel dead but keep content" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:642 +#: ../../Zotlabs/Module/Connedit.php:643 msgid "This connection is archived!" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:646 +#: ../../Zotlabs/Module/Connedit.php:647 msgid "Unhide" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:646 +#: ../../Zotlabs/Module/Connedit.php:647 msgid "Hide" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:649 +#: ../../Zotlabs/Module/Connedit.php:650 msgid "Hide or Unhide this connection from your other connections" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:650 +#: ../../Zotlabs/Module/Connedit.php:651 msgid "This connection is hidden!" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:657 +#: ../../Zotlabs/Module/Connedit.php:658 msgid "Delete this connection" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:665 +#: ../../Zotlabs/Module/Connedit.php:666 msgid "Fetch Vcard" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:668 +#: ../../Zotlabs/Module/Connedit.php:669 msgid "Fetch electronic calling card for this connection" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:679 +#: ../../Zotlabs/Module/Connedit.php:680 msgid "Open Individual Permissions section by default" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:702 +#: ../../Zotlabs/Module/Connedit.php:703 msgid "Affinity" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:705 +#: ../../Zotlabs/Module/Connedit.php:706 msgid "Open Set Affinity section by default" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:709 ../../Zotlabs/Widget/Affinity.php:22 +#: ../../Zotlabs/Module/Connedit.php:710 ../../Zotlabs/Widget/Affinity.php:22 msgid "Me" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:710 ../../Zotlabs/Widget/Affinity.php:23 +#: ../../Zotlabs/Module/Connedit.php:711 ../../Zotlabs/Widget/Affinity.php:23 msgid "Family" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:712 ../../Zotlabs/Widget/Affinity.php:25 +#: ../../Zotlabs/Module/Connedit.php:713 ../../Zotlabs/Widget/Affinity.php:25 msgid "Acquaintances" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:739 +#: ../../Zotlabs/Module/Connedit.php:740 msgid "Filter" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:742 +#: ../../Zotlabs/Module/Connedit.php:743 msgid "Open Custom Filter section by default" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:779 +#: ../../Zotlabs/Module/Connedit.php:780 msgid "Approve this connection" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:779 +#: ../../Zotlabs/Module/Connedit.php:780 msgid "Accept connection to allow communication" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:784 +#: ../../Zotlabs/Module/Connedit.php:785 msgid "Set Affinity" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:787 +#: ../../Zotlabs/Module/Connedit.php:788 msgid "Set Profile" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:790 +#: ../../Zotlabs/Module/Connedit.php:791 msgid "Set Affinity & Profile" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:838 +#: ../../Zotlabs/Module/Connedit.php:839 msgid "This connection is unreachable from this location." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:839 +#: ../../Zotlabs/Module/Connedit.php:840 msgid "This connection may be unreachable from other channel locations." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:841 +#: ../../Zotlabs/Module/Connedit.php:842 msgid "Location independence is not supported by their network." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:847 +#: ../../Zotlabs/Module/Connedit.php:848 msgid "" "This connection is unreachable from this location. Location independence is " "not supported by their network." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:850 ../../Zotlabs/Module/Defperms.php:238 -#: ../../Zotlabs/Widget/Settings_menu.php:117 +#: ../../Zotlabs/Module/Connedit.php:851 ../../Zotlabs/Module/Defperms.php:254 msgid "Connection Default Permissions" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:850 ../../include/items.php:4158 +#: ../../Zotlabs/Module/Connedit.php:851 ../../include/items.php:4200 #, php-format msgid "Connection: %s" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:851 ../../Zotlabs/Module/Defperms.php:239 +#: ../../Zotlabs/Module/Connedit.php:852 ../../Zotlabs/Module/Defperms.php:255 msgid "Apply these permissions automatically" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:851 +#: ../../Zotlabs/Module/Connedit.php:852 msgid "Connection requests will be approved without your interaction" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:852 ../../Zotlabs/Module/Defperms.php:240 +#: ../../Zotlabs/Module/Connedit.php:853 ../../Zotlabs/Module/Defperms.php:256 msgid "Permission role" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:853 ../../Zotlabs/Module/Defperms.php:241 +#: ../../Zotlabs/Module/Connedit.php:854 ../../Zotlabs/Module/Defperms.php:257 msgid "Add permission role" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:860 +#: ../../Zotlabs/Module/Connedit.php:861 msgid "This connection's primary address is" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:861 +#: ../../Zotlabs/Module/Connedit.php:862 msgid "Available locations:" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:866 ../../Zotlabs/Module/Defperms.php:245 +#: ../../Zotlabs/Module/Connedit.php:867 ../../Zotlabs/Module/Defperms.php:261 msgid "" "The permissions indicated on this page will be applied to all new " "connections." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:867 +#: ../../Zotlabs/Module/Connedit.php:868 msgid "Connection Tools" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:869 +#: ../../Zotlabs/Module/Connedit.php:870 msgid "Slide to adjust your degree of friendship" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:870 ../../Zotlabs/Module/Rate.php:155 +#: ../../Zotlabs/Module/Connedit.php:871 ../../Zotlabs/Module/Rate.php:155 #: ../../include/js_strings.php:20 msgid "Rating" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:871 +#: ../../Zotlabs/Module/Connedit.php:872 msgid "Slide to adjust your rating" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:872 ../../Zotlabs/Module/Connedit.php:877 +#: ../../Zotlabs/Module/Connedit.php:873 ../../Zotlabs/Module/Connedit.php:878 msgid "Optionally explain your rating" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:874 +#: ../../Zotlabs/Module/Connedit.php:875 msgid "Custom Filter" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:875 +#: ../../Zotlabs/Module/Connedit.php:876 msgid "Only import posts with this text" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:876 +#: ../../Zotlabs/Module/Connedit.php:877 msgid "Do not import posts with this text" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:878 +#: ../../Zotlabs/Module/Connedit.php:879 msgid "This information is public!" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:883 +#: ../../Zotlabs/Module/Connedit.php:884 msgid "Connection Pending Approval" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:888 +#: ../../Zotlabs/Module/Connedit.php:889 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:895 +#: ../../Zotlabs/Module/Connedit.php:896 msgid "" "Some permissions may be inherited from your channel's <a href=\"settings" "\"><strong>privacy settings</strong></a>, which have higher priority than " @@ -5824,86 +5910,94 @@ msgid "" "any impact unless the inherited setting changes." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:896 +#: ../../Zotlabs/Module/Connedit.php:897 msgid "Last update:" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:904 +#: ../../Zotlabs/Module/Connedit.php:905 msgid "Details" msgstr "" -#: ../../Zotlabs/Module/Chat.php:181 +#: ../../Zotlabs/Module/Chat.php:102 +msgid "Chatrooms App" +msgstr "" + +#: ../../Zotlabs/Module/Chat.php:103 +msgid "Access Controlled Chatrooms" +msgstr "" + +#: ../../Zotlabs/Module/Chat.php:196 msgid "Room not found" msgstr "" -#: ../../Zotlabs/Module/Chat.php:197 +#: ../../Zotlabs/Module/Chat.php:212 msgid "Leave Room" msgstr "" -#: ../../Zotlabs/Module/Chat.php:198 +#: ../../Zotlabs/Module/Chat.php:213 msgid "Delete Room" msgstr "" -#: ../../Zotlabs/Module/Chat.php:199 +#: ../../Zotlabs/Module/Chat.php:214 msgid "I am away right now" msgstr "" -#: ../../Zotlabs/Module/Chat.php:200 +#: ../../Zotlabs/Module/Chat.php:215 msgid "I am online" msgstr "" -#: ../../Zotlabs/Module/Chat.php:202 +#: ../../Zotlabs/Module/Chat.php:217 msgid "Bookmark this room" msgstr "" -#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:241 -#: ../../Zotlabs/Module/Mail.php:362 ../../include/conversation.php:1322 +#: ../../Zotlabs/Module/Chat.php:220 ../../Zotlabs/Module/Mail.php:241 +#: ../../Zotlabs/Module/Mail.php:362 ../../addon/hsse/hsse.php:134 +#: ../../include/conversation.php:1337 msgid "Please enter a link URL:" msgstr "" -#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:294 -#: ../../Zotlabs/Module/Mail.php:436 ../../Zotlabs/Lib/ThreadItem.php:771 -#: ../../include/conversation.php:1443 +#: ../../Zotlabs/Module/Chat.php:221 ../../Zotlabs/Module/Mail.php:294 +#: ../../Zotlabs/Module/Mail.php:436 ../../Zotlabs/Lib/ThreadItem.php:779 +#: ../../addon/hsse/hsse.php:255 ../../include/conversation.php:1458 msgid "Encrypt text" msgstr "" -#: ../../Zotlabs/Module/Chat.php:232 +#: ../../Zotlabs/Module/Chat.php:240 msgid "New Chatroom" msgstr "" -#: ../../Zotlabs/Module/Chat.php:233 +#: ../../Zotlabs/Module/Chat.php:241 msgid "Chatroom name" msgstr "" -#: ../../Zotlabs/Module/Chat.php:234 +#: ../../Zotlabs/Module/Chat.php:242 msgid "Expiration of chats (minutes)" msgstr "" -#: ../../Zotlabs/Module/Chat.php:250 +#: ../../Zotlabs/Module/Chat.php:258 #, php-format msgid "%1$s's Chatrooms" msgstr "" -#: ../../Zotlabs/Module/Chat.php:255 +#: ../../Zotlabs/Module/Chat.php:263 msgid "No chatrooms available" msgstr "" -#: ../../Zotlabs/Module/Chat.php:259 +#: ../../Zotlabs/Module/Chat.php:267 msgid "Expiration" msgstr "" -#: ../../Zotlabs/Module/Chat.php:260 +#: ../../Zotlabs/Module/Chat.php:268 msgid "min" msgstr "" -#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:310 -#: ../../include/conversation.php:1843 ../../include/nav.php:393 +#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:323 +#: ../../include/features.php:391 ../../include/nav.php:409 msgid "Photos" msgstr "" -#: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:305 -#: ../../Zotlabs/Storage/Browser.php:272 ../../include/conversation.php:1851 -#: ../../include/nav.php:401 +#: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:318 +#: ../../Zotlabs/Storage/Browser.php:272 ../../include/nav.php:417 msgid "Files" msgstr "" @@ -5943,7 +6037,7 @@ msgstr "" msgid "Submit and proceed" msgstr "" -#: ../../Zotlabs/Module/Menu.php:170 ../../include/text.php:2459 +#: ../../Zotlabs/Module/Menu.php:170 ../../include/text.php:2466 msgid "Menus" msgstr "" @@ -5995,13 +6089,13 @@ msgstr "" msgid "Allow bookmarks" msgstr "" -#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2460 +#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2467 msgid "Layouts" msgstr "" -#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:313 -#: ../../include/nav.php:170 ../../include/nav.php:272 -#: ../../include/help.php:68 ../../include/help.php:74 +#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:326 +#: ../../include/nav.php:168 ../../include/nav.php:284 +#: ../../include/help.php:117 ../../include/help.php:125 msgid "Help" msgstr "" @@ -6017,6 +6111,18 @@ msgstr "" msgid "Download PDL file" msgstr "" +#: ../../Zotlabs/Module/Notes.php:55 +msgid "Notes App" +msgstr "" + +#: ../../Zotlabs/Module/Notes.php:56 +msgid "A simple notes app with a widget (note: notes are not encrypted)" +msgstr "" + +#: ../../Zotlabs/Module/Cloud.php:123 +msgid "Not found" +msgstr "" + #: ../../Zotlabs/Module/Cloud.php:129 msgid "Please refresh page" msgstr "" @@ -6054,13 +6160,13 @@ msgstr "" msgid "Post not found." msgstr "" -#: ../../Zotlabs/Module/Tagger.php:77 ../../include/markdown.php:160 +#: ../../Zotlabs/Module/Tagger.php:77 ../../include/markdown.php:202 #: ../../include/bbcode.php:354 msgid "post" msgstr "" #: ../../Zotlabs/Module/Tagger.php:79 ../../include/conversation.php:146 -#: ../../include/text.php:2030 +#: ../../include/text.php:2036 msgid "comment" msgstr "" @@ -6084,11 +6190,19 @@ msgid "" "to correctly use this feature." msgstr "" -#: ../../Zotlabs/Module/Defperms.php:246 +#: ../../Zotlabs/Module/Defperms.php:189 +msgid "Default Permissions App" +msgstr "" + +#: ../../Zotlabs/Module/Defperms.php:190 +msgid "Set custom default permissions for new connections" +msgstr "" + +#: ../../Zotlabs/Module/Defperms.php:262 msgid "Automatic approval settings" msgstr "" -#: ../../Zotlabs/Module/Defperms.php:254 +#: ../../Zotlabs/Module/Defperms.php:270 msgid "" "Some individual permissions may have been preset or locked based on your " "channel type and privacy settings." @@ -6098,88 +6212,97 @@ msgstr "" msgid "Unknown App" msgstr "" -#: ../../Zotlabs/Module/Authorize.php:22 +#: ../../Zotlabs/Module/Authorize.php:29 msgid "Authorize" msgstr "" -#: ../../Zotlabs/Module/Authorize.php:23 +#: ../../Zotlabs/Module/Authorize.php:30 #, php-format msgid "Do you authorize the app %s to access your channel data?" msgstr "" -#: ../../Zotlabs/Module/Authorize.php:25 +#: ../../Zotlabs/Module/Authorize.php:32 msgid "Allow" msgstr "" -#: ../../Zotlabs/Module/Group.php:35 +#: ../../Zotlabs/Module/Group.php:45 msgid "Privacy group created." msgstr "" -#: ../../Zotlabs/Module/Group.php:38 +#: ../../Zotlabs/Module/Group.php:48 msgid "Could not create privacy group." msgstr "" -#: ../../Zotlabs/Module/Group.php:51 ../../Zotlabs/Module/Group.php:181 -#: ../../include/items.php:4125 +#: ../../Zotlabs/Module/Group.php:61 ../../Zotlabs/Module/Group.php:200 +#: ../../include/items.php:4167 msgid "Privacy group not found." msgstr "" -#: ../../Zotlabs/Module/Group.php:67 +#: ../../Zotlabs/Module/Group.php:77 msgid "Privacy group updated." msgstr "" -#: ../../Zotlabs/Module/Group.php:113 ../../Zotlabs/Module/Group.php:124 -#: ../../Zotlabs/Widget/Activity_filter.php:68 ../../include/features.php:221 -#: ../../include/nav.php:97 ../../include/group.php:320 +#: ../../Zotlabs/Module/Group.php:101 +msgid "Privacy Groups App" +msgstr "" + +#: ../../Zotlabs/Module/Group.php:102 +msgid "Management of privacy groups" +msgstr "" + +#: ../../Zotlabs/Module/Group.php:132 ../../Zotlabs/Module/Group.php:143 +#: ../../Zotlabs/Lib/Apps.php:342 ../../Zotlabs/Lib/Group.php:324 +#: ../../Zotlabs/Widget/Activity_filter.php:70 ../../include/nav.php:95 +#: ../../include/group.php:320 msgid "Privacy Groups" msgstr "" -#: ../../Zotlabs/Module/Group.php:114 +#: ../../Zotlabs/Module/Group.php:133 msgid "Add Group" msgstr "" -#: ../../Zotlabs/Module/Group.php:118 +#: ../../Zotlabs/Module/Group.php:137 msgid "Privacy group name" msgstr "" -#: ../../Zotlabs/Module/Group.php:119 ../../Zotlabs/Module/Group.php:220 +#: ../../Zotlabs/Module/Group.php:138 ../../Zotlabs/Module/Group.php:239 msgid "Members are visible to other channels" msgstr "" -#: ../../Zotlabs/Module/Group.php:126 ../../Zotlabs/Module/Help.php:81 +#: ../../Zotlabs/Module/Group.php:145 ../../Zotlabs/Module/Help.php:81 msgid "Members" msgstr "" -#: ../../Zotlabs/Module/Group.php:151 +#: ../../Zotlabs/Module/Group.php:170 msgid "Privacy group removed." msgstr "" -#: ../../Zotlabs/Module/Group.php:153 +#: ../../Zotlabs/Module/Group.php:172 msgid "Unable to remove privacy group." msgstr "" -#: ../../Zotlabs/Module/Group.php:215 +#: ../../Zotlabs/Module/Group.php:234 #, php-format msgid "Privacy Group: %s" msgstr "" -#: ../../Zotlabs/Module/Group.php:217 +#: ../../Zotlabs/Module/Group.php:236 msgid "Privacy group name: " msgstr "" -#: ../../Zotlabs/Module/Group.php:222 +#: ../../Zotlabs/Module/Group.php:241 msgid "Delete Group" msgstr "" -#: ../../Zotlabs/Module/Group.php:232 +#: ../../Zotlabs/Module/Group.php:251 msgid "Group members" msgstr "" -#: ../../Zotlabs/Module/Group.php:234 +#: ../../Zotlabs/Module/Group.php:253 msgid "Not in this group" msgstr "" -#: ../../Zotlabs/Module/Group.php:266 +#: ../../Zotlabs/Module/Group.php:285 msgid "Click a channel to toggle membership" msgstr "" @@ -6274,7 +6397,7 @@ msgid "View this profile" msgstr "" #: ../../Zotlabs/Module/Profiles.php:725 ../../Zotlabs/Module/Profiles.php:824 -#: ../../include/channel.php:1319 +#: ../../include/channel.php:1326 msgid "Edit visibility" msgstr "" @@ -6286,7 +6409,7 @@ msgstr "" msgid "Change cover photo" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:728 ../../include/channel.php:1289 +#: ../../Zotlabs/Module/Profiles.php:728 ../../include/channel.php:1296 msgid "Change profile photo" msgstr "" @@ -6306,7 +6429,7 @@ msgstr "" msgid "Add profile things" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:733 ../../include/conversation.php:1717 +#: ../../Zotlabs/Module/Profiles.php:733 msgid "Personal" msgstr "" @@ -6314,7 +6437,7 @@ msgstr "" msgid "Relationship" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:736 ../../Zotlabs/Widget/Newmember.php:44 +#: ../../Zotlabs/Module/Profiles.php:736 ../../Zotlabs/Widget/Newmember.php:51 #: ../../include/datetime.php:58 msgid "Miscellaneous" msgstr "" @@ -6452,12 +6575,12 @@ msgstr "" msgid "Communications" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:820 ../../include/channel.php:1315 +#: ../../Zotlabs/Module/Profiles.php:820 ../../include/channel.php:1322 msgid "Profile Image" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:830 ../../include/channel.php:1296 -#: ../../include/nav.php:111 +#: ../../Zotlabs/Module/Profiles.php:830 ../../include/channel.php:1303 +#: ../../include/nav.php:109 msgid "Edit Profiles" msgstr "" @@ -6490,7 +6613,7 @@ msgstr "" msgid "Edit your default profile" msgstr "" -#: ../../Zotlabs/Module/Go.php:38 ../../Zotlabs/Widget/Newmember.php:34 +#: ../../Zotlabs/Module/Go.php:38 ../../Zotlabs/Widget/Newmember.php:41 msgid "View friend suggestions" msgstr "" @@ -6536,8 +6659,8 @@ msgstr "" msgid "Create a new channel" msgstr "" -#: ../../Zotlabs/Module/Manage.php:170 ../../Zotlabs/Lib/Apps.php:302 -#: ../../include/nav.php:94 +#: ../../Zotlabs/Module/Manage.php:170 ../../Zotlabs/Lib/Apps.php:315 +#: ../../include/nav.php:92 msgid "Channel Manager" msgstr "" @@ -6571,16 +6694,23 @@ msgstr "" msgid "Delegated Channel" msgstr "" -#: ../../Zotlabs/Module/Cards.php:42 ../../Zotlabs/Module/Cards.php:194 -#: ../../Zotlabs/Lib/Apps.php:293 ../../include/conversation.php:1902 -#: ../../include/features.php:123 ../../include/nav.php:450 -msgid "Cards" +#: ../../Zotlabs/Module/Cards.php:46 +msgid "Cards App" +msgstr "" + +#: ../../Zotlabs/Module/Cards.php:47 +msgid "Create personal planning cards" msgstr "" -#: ../../Zotlabs/Module/Cards.php:99 +#: ../../Zotlabs/Module/Cards.php:108 msgid "Add Card" msgstr "" +#: ../../Zotlabs/Module/Cards.php:203 ../../Zotlabs/Lib/Apps.php:306 +#: ../../include/nav.php:466 +msgid "Cards" +msgstr "" + #: ../../Zotlabs/Module/Dirsearch.php:33 msgid "This directory server requires an access token" msgstr "" @@ -6597,7 +6727,7 @@ msgstr "" msgid "Administrator" msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:28 ../../Zotlabs/Module/Register.php:241 +#: ../../Zotlabs/Module/Siteinfo.php:28 ../../Zotlabs/Module/Register.php:236 msgid "Terms of Service" msgstr "" @@ -6636,7 +6766,7 @@ msgid "No ratings" msgstr "" #: ../../Zotlabs/Module/Ratings.php:97 ../../Zotlabs/Module/Pubsites.php:35 -#: ../../include/conversation.php:1087 +#: ../../include/conversation.php:1088 msgid "Ratings" msgstr "" @@ -6652,56 +6782,64 @@ msgstr "" msgid "Description: " msgstr "" -#: ../../Zotlabs/Module/Webpages.php:54 +#: ../../Zotlabs/Module/Webpages.php:48 +msgid "Webpages App" +msgstr "" + +#: ../../Zotlabs/Module/Webpages.php:49 +msgid "Provide managed web pages on your channel" +msgstr "" + +#: ../../Zotlabs/Module/Webpages.php:69 msgid "Import Webpage Elements" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:55 +#: ../../Zotlabs/Module/Webpages.php:70 msgid "Import selected" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:78 +#: ../../Zotlabs/Module/Webpages.php:93 msgid "Export Webpage Elements" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:79 +#: ../../Zotlabs/Module/Webpages.php:94 msgid "Export selected" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:237 ../../Zotlabs/Lib/Apps.php:306 -#: ../../include/conversation.php:1924 ../../include/nav.php:473 +#: ../../Zotlabs/Module/Webpages.php:252 ../../Zotlabs/Lib/Apps.php:319 +#: ../../include/nav.php:489 msgid "Webpages" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:248 +#: ../../Zotlabs/Module/Webpages.php:263 msgid "Actions" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:249 +#: ../../Zotlabs/Module/Webpages.php:264 msgid "Page Link" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:250 +#: ../../Zotlabs/Module/Webpages.php:265 msgid "Page Title" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:280 +#: ../../Zotlabs/Module/Webpages.php:295 msgid "Invalid file type." msgstr "" -#: ../../Zotlabs/Module/Webpages.php:292 +#: ../../Zotlabs/Module/Webpages.php:307 msgid "Error opening zip file" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:303 +#: ../../Zotlabs/Module/Webpages.php:318 msgid "Invalid folder path." msgstr "" -#: ../../Zotlabs/Module/Webpages.php:330 +#: ../../Zotlabs/Module/Webpages.php:345 msgid "No webpage elements detected." msgstr "" -#: ../../Zotlabs/Module/Webpages.php:405 +#: ../../Zotlabs/Module/Webpages.php:420 msgid "Import complete." msgstr "" @@ -6711,13 +6849,13 @@ msgid "" "password." msgstr "" -#: ../../Zotlabs/Module/Changeaddr.php:46 ../../include/channel.php:214 -#: ../../include/channel.php:599 +#: ../../Zotlabs/Module/Changeaddr.php:46 ../../include/channel.php:221 +#: ../../include/channel.php:606 msgid "Reserved nickname. Please choose another." msgstr "" -#: ../../Zotlabs/Module/Changeaddr.php:51 ../../include/channel.php:219 -#: ../../include/channel.php:604 +#: ../../Zotlabs/Module/Changeaddr.php:51 ../../include/channel.php:226 +#: ../../include/channel.php:611 msgid "" "Nickname has unsupported characters or is already being used on this site." msgstr "" @@ -6812,84 +6950,96 @@ msgstr "" msgid "Redeliver" msgstr "" -#: ../../Zotlabs/Module/Sources.php:38 +#: ../../Zotlabs/Module/Sources.php:41 msgid "Failed to create source. No channel selected." msgstr "" -#: ../../Zotlabs/Module/Sources.php:54 +#: ../../Zotlabs/Module/Sources.php:57 msgid "Source created." msgstr "" -#: ../../Zotlabs/Module/Sources.php:67 +#: ../../Zotlabs/Module/Sources.php:70 msgid "Source updated." msgstr "" -#: ../../Zotlabs/Module/Sources.php:93 +#: ../../Zotlabs/Module/Sources.php:88 +msgid "Sources App" +msgstr "" + +#: ../../Zotlabs/Module/Sources.php:89 +msgid "Automatically import channel content from other channels or feeds" +msgstr "" + +#: ../../Zotlabs/Module/Sources.php:101 msgid "*" msgstr "" -#: ../../Zotlabs/Module/Sources.php:99 -#: ../../Zotlabs/Widget/Settings_menu.php:133 ../../include/features.php:292 +#: ../../Zotlabs/Module/Sources.php:107 ../../Zotlabs/Lib/Apps.php:347 msgid "Channel Sources" msgstr "" -#: ../../Zotlabs/Module/Sources.php:100 +#: ../../Zotlabs/Module/Sources.php:108 msgid "Manage remote sources of content for your channel." msgstr "" -#: ../../Zotlabs/Module/Sources.php:101 ../../Zotlabs/Module/Sources.php:111 +#: ../../Zotlabs/Module/Sources.php:109 ../../Zotlabs/Module/Sources.php:119 msgid "New Source" msgstr "" -#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:146 +#: ../../Zotlabs/Module/Sources.php:120 ../../Zotlabs/Module/Sources.php:154 msgid "" "Import all or selected content from the following channel into this channel " "and distribute it according to your channel settings." msgstr "" -#: ../../Zotlabs/Module/Sources.php:113 ../../Zotlabs/Module/Sources.php:147 +#: ../../Zotlabs/Module/Sources.php:121 ../../Zotlabs/Module/Sources.php:155 msgid "Only import content with these words (one per line)" msgstr "" -#: ../../Zotlabs/Module/Sources.php:113 ../../Zotlabs/Module/Sources.php:147 +#: ../../Zotlabs/Module/Sources.php:121 ../../Zotlabs/Module/Sources.php:155 msgid "Leave blank to import all public content" msgstr "" -#: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:153 +#: ../../Zotlabs/Module/Sources.php:122 ../../Zotlabs/Module/Sources.php:161 msgid "Channel Name" msgstr "" -#: ../../Zotlabs/Module/Sources.php:115 ../../Zotlabs/Module/Sources.php:150 +#: ../../Zotlabs/Module/Sources.php:123 ../../Zotlabs/Module/Sources.php:158 msgid "" "Add the following categories to posts imported from this source (comma " "separated)" msgstr "" -#: ../../Zotlabs/Module/Sources.php:116 ../../Zotlabs/Module/Sources.php:151 +#: ../../Zotlabs/Module/Sources.php:123 ../../Zotlabs/Module/Sources.php:158 +#: ../../Zotlabs/Module/Oauth.php:117 +msgid "Optional" +msgstr "" + +#: ../../Zotlabs/Module/Sources.php:124 ../../Zotlabs/Module/Sources.php:159 msgid "Resend posts with this channel as author" msgstr "" -#: ../../Zotlabs/Module/Sources.php:116 ../../Zotlabs/Module/Sources.php:151 +#: ../../Zotlabs/Module/Sources.php:124 ../../Zotlabs/Module/Sources.php:159 msgid "Copyrights may apply" msgstr "" -#: ../../Zotlabs/Module/Sources.php:136 ../../Zotlabs/Module/Sources.php:166 +#: ../../Zotlabs/Module/Sources.php:144 ../../Zotlabs/Module/Sources.php:174 msgid "Source not found." msgstr "" -#: ../../Zotlabs/Module/Sources.php:143 +#: ../../Zotlabs/Module/Sources.php:151 msgid "Edit Source" msgstr "" -#: ../../Zotlabs/Module/Sources.php:144 +#: ../../Zotlabs/Module/Sources.php:152 msgid "Delete Source" msgstr "" -#: ../../Zotlabs/Module/Sources.php:174 +#: ../../Zotlabs/Module/Sources.php:182 msgid "Source removed" msgstr "" -#: ../../Zotlabs/Module/Sources.php:176 +#: ../../Zotlabs/Module/Sources.php:184 msgid "Unable to remove source." msgstr "" @@ -6928,14 +7078,15 @@ msgstr "" msgid "Previous action reversed." msgstr "" -#: ../../Zotlabs/Module/Like.php:438 ../../addon/diaspora/Receiver.php:1559 -#: ../../addon/pubcrawl/as.php:1544 ../../include/conversation.php:160 +#: ../../Zotlabs/Module/Like.php:438 ../../Zotlabs/Lib/Activity.php:1605 +#: ../../addon/diaspora/Receiver.php:1568 ../../addon/pubcrawl/as.php:1547 +#: ../../include/conversation.php:160 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:440 ../../addon/pubcrawl/as.php:1546 -#: ../../include/conversation.php:163 +#: ../../Zotlabs/Module/Like.php:440 ../../Zotlabs/Lib/Activity.php:1607 +#: ../../addon/pubcrawl/as.php:1549 ../../include/conversation.php:163 #, php-format msgid "%1$s doesn't like %2$s's %3$s" msgstr "" @@ -6955,17 +7106,17 @@ msgstr "" msgid "%1$s abstains from a decision on %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:448 ../../addon/diaspora/Receiver.php:2102 +#: ../../Zotlabs/Module/Like.php:448 ../../addon/diaspora/Receiver.php:2111 #, php-format msgid "%1$s is attending %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:450 ../../addon/diaspora/Receiver.php:2104 +#: ../../Zotlabs/Module/Like.php:450 ../../addon/diaspora/Receiver.php:2113 #, php-format msgid "%1$s is not attending %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:452 ../../addon/diaspora/Receiver.php:2106 +#: ../../Zotlabs/Module/Like.php:452 ../../addon/diaspora/Receiver.php:2115 #, php-format msgid "%1$s may attend %2$s's %3$s" msgstr "" @@ -6978,119 +7129,119 @@ msgstr "" msgid "Thank you." msgstr "" -#: ../../Zotlabs/Module/Directory.php:106 +#: ../../Zotlabs/Module/Directory.php:110 msgid "No default suggestions were found." msgstr "" -#: ../../Zotlabs/Module/Directory.php:255 +#: ../../Zotlabs/Module/Directory.php:259 #, php-format msgid "%d rating" msgid_plural "%d ratings" msgstr[0] "" msgstr[1] "" -#: ../../Zotlabs/Module/Directory.php:266 +#: ../../Zotlabs/Module/Directory.php:270 msgid "Gender: " msgstr "" -#: ../../Zotlabs/Module/Directory.php:268 +#: ../../Zotlabs/Module/Directory.php:272 msgid "Status: " msgstr "" -#: ../../Zotlabs/Module/Directory.php:270 +#: ../../Zotlabs/Module/Directory.php:274 msgid "Homepage: " msgstr "" -#: ../../Zotlabs/Module/Directory.php:319 ../../include/channel.php:1564 +#: ../../Zotlabs/Module/Directory.php:323 ../../include/channel.php:1571 msgid "Age:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:324 ../../include/channel.php:1391 +#: ../../Zotlabs/Module/Directory.php:328 ../../include/channel.php:1398 #: ../../include/event.php:54 ../../include/event.php:86 msgid "Location:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:330 +#: ../../Zotlabs/Module/Directory.php:334 msgid "Description:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:335 ../../include/channel.php:1593 +#: ../../Zotlabs/Module/Directory.php:339 ../../include/channel.php:1600 msgid "Hometown:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:337 ../../include/channel.php:1599 +#: ../../Zotlabs/Module/Directory.php:341 ../../include/channel.php:1606 msgid "About:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:338 ../../Zotlabs/Module/Suggest.php:56 +#: ../../Zotlabs/Module/Directory.php:342 ../../Zotlabs/Module/Suggest.php:56 #: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Widget/Suggestions.php:44 -#: ../../include/conversation.php:1057 ../../include/channel.php:1376 +#: ../../include/conversation.php:1058 ../../include/channel.php:1383 #: ../../include/connections.php:110 msgid "Connect" msgstr "" -#: ../../Zotlabs/Module/Directory.php:339 +#: ../../Zotlabs/Module/Directory.php:343 msgid "Public Forum:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:342 +#: ../../Zotlabs/Module/Directory.php:346 msgid "Keywords: " msgstr "" -#: ../../Zotlabs/Module/Directory.php:345 +#: ../../Zotlabs/Module/Directory.php:349 msgid "Don't suggest" msgstr "" -#: ../../Zotlabs/Module/Directory.php:347 +#: ../../Zotlabs/Module/Directory.php:351 msgid "Common connections (estimated):" msgstr "" -#: ../../Zotlabs/Module/Directory.php:396 +#: ../../Zotlabs/Module/Directory.php:400 msgid "Global Directory" msgstr "" -#: ../../Zotlabs/Module/Directory.php:396 +#: ../../Zotlabs/Module/Directory.php:400 msgid "Local Directory" msgstr "" -#: ../../Zotlabs/Module/Directory.php:402 +#: ../../Zotlabs/Module/Directory.php:406 msgid "Finding:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:405 ../../Zotlabs/Module/Suggest.php:64 +#: ../../Zotlabs/Module/Directory.php:409 ../../Zotlabs/Module/Suggest.php:64 #: ../../include/contact_widgets.php:24 msgid "Channel Suggestions" msgstr "" -#: ../../Zotlabs/Module/Directory.php:407 +#: ../../Zotlabs/Module/Directory.php:411 msgid "next page" msgstr "" -#: ../../Zotlabs/Module/Directory.php:407 +#: ../../Zotlabs/Module/Directory.php:411 msgid "previous page" msgstr "" -#: ../../Zotlabs/Module/Directory.php:408 +#: ../../Zotlabs/Module/Directory.php:412 msgid "Sort options" msgstr "" -#: ../../Zotlabs/Module/Directory.php:409 +#: ../../Zotlabs/Module/Directory.php:413 msgid "Alphabetic" msgstr "" -#: ../../Zotlabs/Module/Directory.php:410 +#: ../../Zotlabs/Module/Directory.php:414 msgid "Reverse Alphabetic" msgstr "" -#: ../../Zotlabs/Module/Directory.php:411 +#: ../../Zotlabs/Module/Directory.php:415 msgid "Newest to Oldest" msgstr "" -#: ../../Zotlabs/Module/Directory.php:412 +#: ../../Zotlabs/Module/Directory.php:416 msgid "Oldest to Newest" msgstr "" -#: ../../Zotlabs/Module/Directory.php:429 +#: ../../Zotlabs/Module/Directory.php:433 msgid "No entries (some entries may be hidden)." msgstr "" @@ -7181,7 +7332,7 @@ msgid "Send" msgstr "" #: ../../Zotlabs/Module/Mail.php:292 ../../Zotlabs/Module/Mail.php:434 -#: ../../include/conversation.php:1438 +#: ../../addon/hsse/hsse.php:250 ../../include/conversation.php:1453 msgid "Set expiration date" msgstr "" @@ -7311,11 +7462,6 @@ msgstr "" msgid "Save to Folder" msgstr "" -#: ../../Zotlabs/Module/Probe.php:30 ../../Zotlabs/Module/Probe.php:34 -#, php-format -msgid "Fetching URL returns error: %1$s" -msgstr "" - #: ../../Zotlabs/Module/Register.php:49 msgid "Maximum daily site registrations exceeded. Please try again tomorrow." msgstr "" @@ -7368,67 +7514,67 @@ msgid "" "Please try again tomorrow." msgstr "" -#: ../../Zotlabs/Module/Register.php:247 +#: ../../Zotlabs/Module/Register.php:242 #, php-format msgid "I accept the %s for this website" msgstr "" -#: ../../Zotlabs/Module/Register.php:254 +#: ../../Zotlabs/Module/Register.php:249 #, php-format msgid "I am over %s years of age and accept the %s for this website" msgstr "" -#: ../../Zotlabs/Module/Register.php:259 +#: ../../Zotlabs/Module/Register.php:254 msgid "Your email address" msgstr "" -#: ../../Zotlabs/Module/Register.php:260 +#: ../../Zotlabs/Module/Register.php:255 msgid "Choose a password" msgstr "" -#: ../../Zotlabs/Module/Register.php:261 +#: ../../Zotlabs/Module/Register.php:256 msgid "Please re-enter your password" msgstr "" -#: ../../Zotlabs/Module/Register.php:262 +#: ../../Zotlabs/Module/Register.php:257 msgid "Please enter your invitation code" msgstr "" -#: ../../Zotlabs/Module/Register.php:263 +#: ../../Zotlabs/Module/Register.php:258 msgid "Your Name" msgstr "" -#: ../../Zotlabs/Module/Register.php:263 +#: ../../Zotlabs/Module/Register.php:258 msgid "Real names are preferred." msgstr "" -#: ../../Zotlabs/Module/Register.php:265 +#: ../../Zotlabs/Module/Register.php:260 #, php-format msgid "" "Your nickname will be used to create an easy to remember channel address e." "g. nickname%s" msgstr "" -#: ../../Zotlabs/Module/Register.php:266 +#: ../../Zotlabs/Module/Register.php:261 msgid "" "Select a channel permission role for your usage needs and privacy " "requirements." msgstr "" -#: ../../Zotlabs/Module/Register.php:267 +#: ../../Zotlabs/Module/Register.php:262 msgid "no" msgstr "" -#: ../../Zotlabs/Module/Register.php:267 +#: ../../Zotlabs/Module/Register.php:262 msgid "yes" msgstr "" -#: ../../Zotlabs/Module/Register.php:294 ../../boot.php:1593 -#: ../../include/nav.php:158 +#: ../../Zotlabs/Module/Register.php:289 ../../boot.php:1605 +#: ../../include/nav.php:156 msgid "Register" msgstr "" -#: ../../Zotlabs/Module/Register.php:295 +#: ../../Zotlabs/Module/Register.php:290 msgid "" "This site requires email verification. After completing this form, please " "check your email for further instructions." @@ -7439,30 +7585,30 @@ msgstr "" msgid "Cover Photos" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:269 ../../include/items.php:4502 +#: ../../Zotlabs/Module/Cover_photo.php:269 ../../include/items.php:4544 msgid "female" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:270 ../../include/items.php:4503 +#: ../../Zotlabs/Module/Cover_photo.php:270 ../../include/items.php:4545 #, php-format msgid "%1$s updated her %2$s" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:271 ../../include/items.php:4504 +#: ../../Zotlabs/Module/Cover_photo.php:271 ../../include/items.php:4546 msgid "male" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:272 ../../include/items.php:4505 +#: ../../Zotlabs/Module/Cover_photo.php:272 ../../include/items.php:4547 #, php-format msgid "%1$s updated his %2$s" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:274 ../../include/items.php:4507 +#: ../../Zotlabs/Module/Cover_photo.php:274 ../../include/items.php:4549 #, php-format msgid "%1$s updated their %2$s" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:276 ../../include/channel.php:2081 +#: ../../Zotlabs/Module/Cover_photo.php:276 ../../include/channel.php:2088 msgid "cover photo" msgstr "" @@ -7478,8 +7624,7 @@ msgstr "" msgid "Documentation Search" msgstr "" -#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1833 -#: ../../include/nav.php:383 +#: ../../Zotlabs/Module/Help.php:80 ../../include/nav.php:399 msgid "About" msgstr "" @@ -7523,23 +7668,23 @@ msgstr "" msgid "Select a tag to remove: " msgstr "" -#: ../../Zotlabs/Module/Network.php:116 +#: ../../Zotlabs/Module/Network.php:107 msgid "No such group" msgstr "" -#: ../../Zotlabs/Module/Network.php:157 +#: ../../Zotlabs/Module/Network.php:148 msgid "No such channel" msgstr "" -#: ../../Zotlabs/Module/Network.php:242 +#: ../../Zotlabs/Module/Network.php:231 msgid "Privacy group is empty" msgstr "" -#: ../../Zotlabs/Module/Network.php:253 +#: ../../Zotlabs/Module/Network.php:242 msgid "Privacy group: " msgstr "" -#: ../../Zotlabs/Module/Network.php:304 ../../addon/redred/redred.php:65 +#: ../../Zotlabs/Module/Network.php:291 ../../addon/redred/redred.php:65 msgid "Invalid channel." msgstr "" @@ -7547,12 +7692,12 @@ msgstr "" msgid "network" msgstr "" -#: ../../Zotlabs/Module/Home.php:74 ../../Zotlabs/Module/Home.php:82 +#: ../../Zotlabs/Module/Home.php:72 ../../Zotlabs/Module/Home.php:80 #: ../../Zotlabs/Lib/Enotify.php:66 ../../addon/opensearch/opensearch.php:42 msgid "$Projectname" msgstr "" -#: ../../Zotlabs/Module/Home.php:92 +#: ../../Zotlabs/Module/Home.php:90 #, php-format msgid "Welcome to %s" msgstr "" @@ -7740,7 +7885,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1622 +#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1634 msgid "Password Reset" msgstr "" @@ -7785,11 +7930,51 @@ msgstr "" msgid "Email Address" msgstr "" +#: ../../Zotlabs/Module/Oauth.php:45 +msgid "Name is required" +msgstr "" + +#: ../../Zotlabs/Module/Oauth.php:49 +msgid "Key and Secret are required" +msgstr "" + +#: ../../Zotlabs/Module/Oauth.php:100 +msgid "OAuth Apps Manager App" +msgstr "" + +#: ../../Zotlabs/Module/Oauth.php:101 +msgid "OAuth authentication tokens for mobile and remote apps" +msgstr "" + +#: ../../Zotlabs/Module/Oauth.php:114 ../../Zotlabs/Module/Oauth.php:140 +#: ../../addon/statusnet/statusnet.php:894 ../../addon/twitter/twitter.php:784 +msgid "Consumer Key" +msgstr "" + +#: ../../Zotlabs/Module/Oauth.php:117 ../../Zotlabs/Module/Oauth.php:143 +msgid "Icon url" +msgstr "" + +#: ../../Zotlabs/Module/Oauth.php:128 +msgid "Application not found." +msgstr "" + +#: ../../Zotlabs/Module/Oauth.php:171 +msgid "Connected OAuth Apps" +msgstr "" + #: ../../Zotlabs/Module/Notifications.php:60 -#: ../../Zotlabs/Lib/ThreadItem.php:413 +#: ../../Zotlabs/Lib/ThreadItem.php:420 msgid "Mark all seen" msgstr "" +#: ../../Zotlabs/Lib/Activity.php:1417 ../../Zotlabs/Lib/Activity.php:1614 +#: ../../widget/Netselect/Netselect.php:42 ../../addon/pubcrawl/as.php:1222 +#: ../../addon/pubcrawl/as.php:1377 ../../addon/pubcrawl/as.php:1556 +#: ../../include/network.php:1768 +msgid "ActivityPub" +msgstr "" + #: ../../Zotlabs/Lib/Techlevels.php:10 msgid "0. Beginner/Basic" msgstr "" @@ -7814,120 +7999,180 @@ msgstr "" msgid "5. Wizard - I probably know more than you do" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:294 +#: ../../Zotlabs/Lib/Libzot.php:663 ../../include/zot.php:800 +msgid "Unable to verify channel signature" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:304 +msgid "Apps" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:307 msgid "Site Admin" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:295 ../../addon/buglink/buglink.php:16 +#: ../../Zotlabs/Lib/Apps.php:308 ../../addon/buglink/buglink.php:16 msgid "Report Bug" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:296 +#: ../../Zotlabs/Lib/Apps.php:309 msgid "View Bookmarks" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:297 -msgid "My Chatrooms" +#: ../../Zotlabs/Lib/Apps.php:310 ../../Zotlabs/Widget/Chatroom_list.php:16 +#: ../../include/nav.php:442 ../../include/nav.php:445 +msgid "Chatrooms" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:299 +#: ../../Zotlabs/Lib/Apps.php:312 msgid "Remote Diagnostics" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:300 ../../include/features.php:435 +#: ../../Zotlabs/Lib/Apps.php:313 ../../include/features.php:373 msgid "Suggest Channels" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:301 ../../boot.php:1613 ../../include/nav.php:120 -#: ../../include/nav.php:124 +#: ../../Zotlabs/Lib/Apps.php:314 ../../boot.php:1625 ../../include/nav.php:118 +#: ../../include/nav.php:122 msgid "Login" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:303 +#: ../../Zotlabs/Lib/Apps.php:316 msgid "Activity" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:307 ../../include/conversation.php:1940 -#: ../../include/features.php:96 ../../include/nav.php:489 +#: ../../Zotlabs/Lib/Apps.php:320 ../../include/nav.php:504 msgid "Wiki" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:308 +#: ../../Zotlabs/Lib/Apps.php:321 ../../include/features.php:96 msgid "Channel Home" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:311 ../../include/conversation.php:1862 -#: ../../include/conversation.php:1865 +#: ../../Zotlabs/Lib/Apps.php:324 ../../include/features.php:269 msgid "Events" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:312 +#: ../../Zotlabs/Lib/Apps.php:325 ../../include/features.php:176 msgid "Directory" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:314 +#: ../../Zotlabs/Lib/Apps.php:327 msgid "Mail" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:317 +#: ../../Zotlabs/Lib/Apps.php:330 msgid "Chat" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:319 +#: ../../Zotlabs/Lib/Apps.php:332 msgid "Probe" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:320 +#: ../../Zotlabs/Lib/Apps.php:333 msgid "Suggest" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:321 +#: ../../Zotlabs/Lib/Apps.php:334 msgid "Random Channel" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:322 +#: ../../Zotlabs/Lib/Apps.php:335 msgid "Invite" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:323 ../../Zotlabs/Widget/Admin.php:26 +#: ../../Zotlabs/Lib/Apps.php:336 ../../Zotlabs/Widget/Admin.php:26 msgid "Features" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:324 ../../addon/openid/MysqlProvider.php:69 +#: ../../Zotlabs/Lib/Apps.php:337 ../../addon/openid/MysqlProvider.php:69 msgid "Language" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:325 +#: ../../Zotlabs/Lib/Apps.php:338 msgid "Post" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:326 ../../addon/openid/MysqlProvider.php:58 +#: ../../Zotlabs/Lib/Apps.php:339 ../../addon/openid/MysqlProvider.php:58 #: ../../addon/openid/MysqlProvider.php:59 #: ../../addon/openid/MysqlProvider.php:60 msgid "Profile Photo" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:473 +#: ../../Zotlabs/Lib/Apps.php:341 ../../include/features.php:405 +msgid "Profiles" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:343 +msgid "Notifications" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:344 +msgid "Order Apps" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:345 ../../include/features.php:82 +msgid "CalDAV" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:346 +msgid "CardDAV" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:348 ../../addon/gallery/gallery.php:47 +#: ../../addon/gallery/Mod_Gallery.php:115 +msgid "Gallery" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:349 +msgid "Guest Access" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:350 ../../Zotlabs/Widget/Notes.php:21 +msgid "Notes" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:351 +msgid "OAuth Apps Manager" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:352 +msgid "OAuth2 Apps Manager" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:353 +msgid "PDL Editor" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:355 +msgid "Premium Channel" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:357 +msgid "My Chatrooms" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:534 msgid "Purchase" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:477 +#: ../../Zotlabs/Lib/Apps.php:539 msgid "Undelete" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:485 +#: ../../Zotlabs/Lib/Apps.php:548 msgid "Add to app-tray" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:486 +#: ../../Zotlabs/Lib/Apps.php:549 msgid "Remove from app-tray" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:487 +#: ../../Zotlabs/Lib/Apps.php:550 msgid "Pin to navbar" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:488 +#: ../../Zotlabs/Lib/Apps.php:551 msgid "Unpin from navbar" msgstr "" @@ -8014,7 +8259,17 @@ msgctxt "wiki_history" msgid "Message" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:597 ../../include/bbcode.php:746 +#: ../../Zotlabs/Lib/NativeWikiPage.php:560 +#: ../../Zotlabs/Widget/Wiki_page_history.php:24 +msgid "Date" +msgstr "" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:562 +#: ../../Zotlabs/Widget/Wiki_page_history.php:26 +msgid "Compare" +msgstr "" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:600 ../../include/bbcode.php:746 #: ../../include/bbcode.php:916 msgid "Different viewers will see this text differently" msgstr "" @@ -8082,6 +8337,54 @@ msgstr "" msgid "This is your default setting for the audience of your webpages" msgstr "" +#: ../../Zotlabs/Lib/Libzotdir.php:160 ../../include/dir_fns.php:141 +msgid "Directory Options" +msgstr "" + +#: ../../Zotlabs/Lib/Libzotdir.php:162 ../../include/dir_fns.php:143 +msgid "Safe Mode" +msgstr "" + +#: ../../Zotlabs/Lib/Libzotdir.php:163 ../../include/dir_fns.php:144 +msgid "Public Forums Only" +msgstr "" + +#: ../../Zotlabs/Lib/Libzotdir.php:165 ../../include/dir_fns.php:145 +msgid "This Website Only" +msgstr "" + +#: ../../Zotlabs/Lib/Group.php:28 ../../include/group.php:22 +msgid "" +"A deleted group with this name was revived. Existing item permissions " +"<strong>may</strong> apply to this group and any future members. If this is " +"not what you intended, please create another group with a different name." +msgstr "" + +#: ../../Zotlabs/Lib/Group.php:270 ../../include/group.php:264 +msgid "Add new connections to this privacy group" +msgstr "" + +#: ../../Zotlabs/Lib/Group.php:302 ../../include/group.php:298 +msgid "edit" +msgstr "" + +#: ../../Zotlabs/Lib/Group.php:325 ../../include/group.php:321 +msgid "Edit group" +msgstr "" + +#: ../../Zotlabs/Lib/Group.php:326 ../../include/group.php:322 +msgid "Add privacy group" +msgstr "" + +#: ../../Zotlabs/Lib/Group.php:327 ../../include/group.php:323 +msgid "Channels not in any privacy group" +msgstr "" + +#: ../../Zotlabs/Lib/Group.php:329 ../../Zotlabs/Widget/Savedsearch.php:84 +#: ../../include/group.php:325 +msgid "add" +msgstr "" + #: ../../Zotlabs/Lib/Chatroom.php:23 msgid "Missing room name" msgstr "" @@ -8102,6 +8405,11 @@ msgstr "" msgid "Room is full" msgstr "" +#: ../../Zotlabs/Lib/Libsync.php:733 ../../include/zot.php:2571 +#, php-format +msgid "Unable to verify site signature for %s" +msgstr "" + #: ../../Zotlabs/Lib/Enotify.php:60 msgid "$Projectname Notification" msgstr "" @@ -8439,148 +8747,158 @@ msgstr "" msgid "Add Tag" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:285 ../../include/taxonomy.php:575 +#: ../../Zotlabs/Lib/ThreadItem.php:271 ../../include/conversation.php:891 +msgid "Conversation Tools" +msgstr "" + +#: ../../Zotlabs/Lib/ThreadItem.php:287 ../../include/taxonomy.php:575 msgid "like" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:286 ../../include/taxonomy.php:576 +#: ../../Zotlabs/Lib/ThreadItem.php:288 ../../include/taxonomy.php:576 msgid "dislike" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:290 +#: ../../Zotlabs/Lib/ThreadItem.php:292 msgid "Share This" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:290 +#: ../../Zotlabs/Lib/ThreadItem.php:292 msgid "share" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:299 +#: ../../Zotlabs/Lib/ThreadItem.php:301 msgid "Delivery Report" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:317 +#: ../../Zotlabs/Lib/ThreadItem.php:319 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: ../../Zotlabs/Lib/ThreadItem.php:347 ../../Zotlabs/Lib/ThreadItem.php:348 +#: ../../Zotlabs/Lib/ThreadItem.php:353 ../../Zotlabs/Lib/ThreadItem.php:354 #, php-format msgid "View %s's profile - %s" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:351 +#: ../../Zotlabs/Lib/ThreadItem.php:357 msgid "to" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:352 +#: ../../Zotlabs/Lib/ThreadItem.php:358 msgid "via" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:353 +#: ../../Zotlabs/Lib/ThreadItem.php:359 msgid "Wall-to-Wall" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:354 +#: ../../Zotlabs/Lib/ThreadItem.php:360 msgid "via Wall-To-Wall:" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:367 ../../include/conversation.php:766 +#: ../../Zotlabs/Lib/ThreadItem.php:373 ../../include/conversation.php:766 #, php-format msgid "from %s" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:370 ../../include/conversation.php:769 +#: ../../Zotlabs/Lib/ThreadItem.php:376 ../../include/conversation.php:769 #, php-format msgid "last edited: %s" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:371 ../../include/conversation.php:770 +#: ../../Zotlabs/Lib/ThreadItem.php:377 ../../include/conversation.php:770 #, php-format msgid "Expires: %s" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:379 +#: ../../Zotlabs/Lib/ThreadItem.php:385 msgid "Attend" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:380 +#: ../../Zotlabs/Lib/ThreadItem.php:386 msgid "Attendance Options" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:381 +#: ../../Zotlabs/Lib/ThreadItem.php:387 msgid "Vote" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:382 +#: ../../Zotlabs/Lib/ThreadItem.php:388 msgid "Voting Options" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:403 +#: ../../Zotlabs/Lib/ThreadItem.php:409 #: ../../addon/bookmarker/bookmarker.php:38 msgid "Save Bookmarks" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:404 +#: ../../Zotlabs/Lib/ThreadItem.php:410 msgid "Add to Calendar" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:431 ../../include/conversation.php:483 +#: ../../Zotlabs/Lib/ThreadItem.php:438 ../../include/conversation.php:483 msgid "This is an unsaved preview" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:463 ../../include/js_strings.php:7 +#: ../../Zotlabs/Lib/ThreadItem.php:471 ../../include/js_strings.php:7 #, php-format msgid "%s show all" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:758 ../../include/conversation.php:1388 +#: ../../Zotlabs/Lib/ThreadItem.php:766 ../../addon/hsse/hsse.php:200 +#: ../../include/conversation.php:1403 msgid "Bold" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:759 ../../include/conversation.php:1389 +#: ../../Zotlabs/Lib/ThreadItem.php:767 ../../addon/hsse/hsse.php:201 +#: ../../include/conversation.php:1404 msgid "Italic" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:760 ../../include/conversation.php:1390 +#: ../../Zotlabs/Lib/ThreadItem.php:768 ../../addon/hsse/hsse.php:202 +#: ../../include/conversation.php:1405 msgid "Underline" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:761 ../../include/conversation.php:1391 +#: ../../Zotlabs/Lib/ThreadItem.php:769 ../../addon/hsse/hsse.php:203 +#: ../../include/conversation.php:1406 msgid "Quote" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:762 ../../include/conversation.php:1392 +#: ../../Zotlabs/Lib/ThreadItem.php:770 ../../addon/hsse/hsse.php:204 +#: ../../include/conversation.php:1407 msgid "Code" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:763 +#: ../../Zotlabs/Lib/ThreadItem.php:771 msgid "Image" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:764 ../../include/conversation.php:1393 +#: ../../Zotlabs/Lib/ThreadItem.php:772 ../../addon/hsse/hsse.php:205 +#: ../../include/conversation.php:1408 msgid "Attach/Upload file" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:765 +#: ../../Zotlabs/Lib/ThreadItem.php:773 msgid "Insert Link" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:766 +#: ../../Zotlabs/Lib/ThreadItem.php:774 msgid "Video" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:776 +#: ../../Zotlabs/Lib/ThreadItem.php:784 msgid "Your full name (required)" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:777 +#: ../../Zotlabs/Lib/ThreadItem.php:785 msgid "Your email address (required)" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:778 +#: ../../Zotlabs/Lib/ThreadItem.php:786 msgid "Your website URL (optional)" msgstr "" @@ -8600,7 +8918,7 @@ msgstr "" msgid "parent" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2817 +#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2824 msgid "Collection" msgstr "" @@ -8612,8 +8930,8 @@ msgstr "" msgid "Addressbook" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:140 ../../include/nav.php:412 -#: ../../include/nav.php:415 +#: ../../Zotlabs/Storage/Browser.php:140 ../../include/nav.php:428 +#: ../../include/nav.php:431 msgid "Calendar" msgstr "" @@ -8664,7 +8982,7 @@ msgid "Drop files here to immediately upload" msgstr "" #: ../../Zotlabs/Widget/Forums.php:100 -#: ../../Zotlabs/Widget/Activity_filter.php:100 +#: ../../Zotlabs/Widget/Activity_filter.php:102 #: ../../Zotlabs/Widget/Notifications.php:119 #: ../../Zotlabs/Widget/Notifications.php:120 msgid "Forums" @@ -8755,9 +9073,9 @@ msgid "Categories" msgstr "" #: ../../Zotlabs/Widget/Appcategories.php:46 ../../Zotlabs/Widget/Filer.php:31 -#: ../../widgets/Netselect/Netselect.php:26 -#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:100 -#: ../../include/contact_widgets.php:144 ../../include/contact_widgets.php:189 +#: ../../widget/Netselect/Netselect.php:26 ../../include/contact_widgets.php:56 +#: ../../include/contact_widgets.php:100 ../../include/contact_widgets.php:144 +#: ../../include/contact_widgets.php:189 msgid "Everything" msgstr "" @@ -8805,12 +9123,6 @@ msgstr "" msgid "New Message" msgstr "" -#: ../../Zotlabs/Widget/Chatroom_list.php:16 -#: ../../include/conversation.php:1876 ../../include/conversation.php:1879 -#: ../../include/nav.php:426 ../../include/nav.php:429 -msgid "Chatrooms" -msgstr "" - #: ../../Zotlabs/Widget/Chatroom_list.php:20 msgid "Overview" msgstr "" @@ -8832,59 +9144,59 @@ msgctxt "widget" msgid "Activity" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:24 +#: ../../Zotlabs/Widget/Activity_filter.php:26 msgid "Personal Posts" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:28 +#: ../../Zotlabs/Widget/Activity_filter.php:30 msgid "Show posts that mention or involve me" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:39 +#: ../../Zotlabs/Widget/Activity_filter.php:41 msgid "Starred Posts" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:43 +#: ../../Zotlabs/Widget/Activity_filter.php:45 msgid "Show posts that I have starred" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:63 +#: ../../Zotlabs/Widget/Activity_filter.php:65 #, php-format msgid "Show posts related to the %s privacy group" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:72 +#: ../../Zotlabs/Widget/Activity_filter.php:74 msgid "Show my privacy groups" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:93 +#: ../../Zotlabs/Widget/Activity_filter.php:95 msgid "Show posts to this forum" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:104 +#: ../../Zotlabs/Widget/Activity_filter.php:106 msgid "Show forums" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:128 +#: ../../Zotlabs/Widget/Activity_filter.php:130 #, php-format msgid "Show posts that I have filed to %s" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:134 +#: ../../Zotlabs/Widget/Activity_filter.php:136 #: ../../Zotlabs/Widget/Filer.php:28 ../../include/contact_widgets.php:53 -#: ../../include/features.php:488 +#: ../../include/features.php:325 msgid "Saved Folders" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:138 +#: ../../Zotlabs/Widget/Activity_filter.php:140 msgid "Show filed post categories" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:152 +#: ../../Zotlabs/Widget/Activity_filter.php:154 msgid "Panel search" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:162 +#: ../../Zotlabs/Widget/Activity_filter.php:164 #: ../../Zotlabs/Widget/Notifications.php:27 #: ../../Zotlabs/Widget/Notifications.php:46 #: ../../Zotlabs/Widget/Notifications.php:122 @@ -8892,11 +9204,11 @@ msgstr "" msgid "Filter by name" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:177 +#: ../../Zotlabs/Widget/Activity_filter.php:179 msgid "Remove active filter" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:193 +#: ../../Zotlabs/Widget/Activity_filter.php:195 msgid "Activity Filters" msgstr "" @@ -8917,10 +9229,6 @@ msgstr "" msgid "Examples: bob@example.com, https://example.com/barbara" msgstr "" -#: ../../Zotlabs/Widget/Wiki_list.php:15 -msgid "Wiki List" -msgstr "" - #: ../../Zotlabs/Widget/Archive.php:43 msgid "Archives" msgstr "" @@ -8957,18 +9265,10 @@ msgstr "" msgid "Remove term" msgstr "" -#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:381 +#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:317 msgid "Saved Searches" msgstr "" -#: ../../Zotlabs/Widget/Savedsearch.php:84 ../../include/group.php:325 -msgid "add" -msgstr "" - -#: ../../Zotlabs/Widget/Notes.php:16 -msgid "Notes" -msgstr "" - #: ../../Zotlabs/Widget/Wiki_pages.php:32 #: ../../Zotlabs/Widget/Wiki_pages.php:89 msgid "Add new page" @@ -8998,35 +9298,35 @@ msgstr "" msgid "See more..." msgstr "" -#: ../../Zotlabs/Widget/Activity_order.php:86 +#: ../../Zotlabs/Widget/Activity_order.php:90 msgid "Commented Date" msgstr "" -#: ../../Zotlabs/Widget/Activity_order.php:90 +#: ../../Zotlabs/Widget/Activity_order.php:94 msgid "Order by last commented date" msgstr "" -#: ../../Zotlabs/Widget/Activity_order.php:93 +#: ../../Zotlabs/Widget/Activity_order.php:97 msgid "Posted Date" msgstr "" -#: ../../Zotlabs/Widget/Activity_order.php:97 +#: ../../Zotlabs/Widget/Activity_order.php:101 msgid "Order by last posted date" msgstr "" -#: ../../Zotlabs/Widget/Activity_order.php:100 +#: ../../Zotlabs/Widget/Activity_order.php:104 msgid "Date Unthreaded" msgstr "" -#: ../../Zotlabs/Widget/Activity_order.php:104 +#: ../../Zotlabs/Widget/Activity_order.php:108 msgid "Order unthreaded by date" msgstr "" -#: ../../Zotlabs/Widget/Activity_order.php:119 +#: ../../Zotlabs/Widget/Activity_order.php:123 msgid "Activity Order" msgstr "" -#: ../../Zotlabs/Widget/Cover_photo.php:54 +#: ../../Zotlabs/Widget/Cover_photo.php:65 msgid "Click to show more" msgstr "" @@ -9040,65 +9340,57 @@ msgid "App Collections" msgstr "" #: ../../Zotlabs/Widget/Appstore.php:13 -msgid "Available Apps" -msgstr "" - -#: ../../Zotlabs/Widget/Appstore.php:14 msgid "Installed apps" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:24 +#: ../../Zotlabs/Widget/Newmember.php:31 msgid "Profile Creation" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:26 +#: ../../Zotlabs/Widget/Newmember.php:33 msgid "Upload profile photo" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:27 +#: ../../Zotlabs/Widget/Newmember.php:34 msgid "Upload cover photo" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:28 ../../include/nav.php:113 +#: ../../Zotlabs/Widget/Newmember.php:35 ../../include/nav.php:111 msgid "Edit your profile" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:31 +#: ../../Zotlabs/Widget/Newmember.php:38 msgid "Find and Connect with others" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:33 +#: ../../Zotlabs/Widget/Newmember.php:40 msgid "View the directory" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:35 +#: ../../Zotlabs/Widget/Newmember.php:42 msgid "Manage your connections" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:38 +#: ../../Zotlabs/Widget/Newmember.php:45 msgid "Communicate" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:40 +#: ../../Zotlabs/Widget/Newmember.php:47 msgid "View your channel homepage" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:41 +#: ../../Zotlabs/Widget/Newmember.php:48 msgid "View your network stream" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:47 +#: ../../Zotlabs/Widget/Newmember.php:54 msgid "Documentation" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:58 +#: ../../Zotlabs/Widget/Newmember.php:65 msgid "View public stream" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:62 ../../include/features.php:60 -msgid "New Member Links" -msgstr "" - #: ../../Zotlabs/Widget/Admin.php:23 ../../Zotlabs/Widget/Admin.php:60 msgid "Member registrations waiting for confirmation" msgstr "" @@ -9111,7 +9403,7 @@ msgstr "" msgid "DB updates" msgstr "" -#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:191 +#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:189 msgid "Admin" msgstr "" @@ -9119,46 +9411,26 @@ msgstr "" msgid "Addon Features" msgstr "" -#: ../../Zotlabs/Widget/Settings_menu.php:35 +#: ../../Zotlabs/Widget/Settings_menu.php:32 msgid "Account settings" msgstr "" -#: ../../Zotlabs/Widget/Settings_menu.php:41 +#: ../../Zotlabs/Widget/Settings_menu.php:38 msgid "Channel settings" msgstr "" -#: ../../Zotlabs/Widget/Settings_menu.php:50 -msgid "Additional features" +#: ../../Zotlabs/Widget/Settings_menu.php:47 +msgid "Display settings" msgstr "" -#: ../../Zotlabs/Widget/Settings_menu.php:57 +#: ../../Zotlabs/Widget/Settings_menu.php:53 msgid "Addon settings" msgstr "" -#: ../../Zotlabs/Widget/Settings_menu.php:63 -msgid "Display settings" -msgstr "" - -#: ../../Zotlabs/Widget/Settings_menu.php:70 +#: ../../Zotlabs/Widget/Settings_menu.php:60 msgid "Manage locations" msgstr "" -#: ../../Zotlabs/Widget/Settings_menu.php:77 -msgid "Export channel" -msgstr "" - -#: ../../Zotlabs/Widget/Settings_menu.php:84 -msgid "OAuth1 apps" -msgstr "" - -#: ../../Zotlabs/Widget/Settings_menu.php:92 -msgid "OAuth2 apps" -msgstr "" - -#: ../../Zotlabs/Widget/Settings_menu.php:125 -msgid "Premium Channel Settings" -msgstr "" - #: ../../Zotlabs/Widget/Bookmarkedchats.php:24 msgid "Bookmarked Chatrooms" msgstr "" @@ -9287,53 +9559,78 @@ msgstr "" msgid "Source channel not found." msgstr "" -#: ../../boot.php:1592 +#: ../../widget/Netselect/Netselect.php:24 +msgid "Network/Protocol" +msgstr "" + +#: ../../widget/Netselect/Netselect.php:28 ../../include/network.php:1772 +msgid "Zot" +msgstr "" + +#: ../../widget/Netselect/Netselect.php:31 ../../include/network.php:1770 +msgid "Diaspora" +msgstr "" + +#: ../../widget/Netselect/Netselect.php:33 ../../include/network.php:1763 +#: ../../include/network.php:1764 +msgid "Friendica" +msgstr "" + +#: ../../widget/Netselect/Netselect.php:38 ../../include/network.php:1765 +msgid "OStatus" +msgstr "" + +#: ../../boot.php:1604 msgid "Create an account to access services and applications" msgstr "" -#: ../../boot.php:1612 ../../include/nav.php:105 ../../include/nav.php:134 -#: ../../include/nav.php:153 +#: ../../boot.php:1624 ../../include/nav.php:103 ../../include/nav.php:132 +#: ../../include/nav.php:151 msgid "Logout" msgstr "" -#: ../../boot.php:1616 +#: ../../boot.php:1628 msgid "Login/Email" msgstr "" -#: ../../boot.php:1617 +#: ../../boot.php:1629 msgid "Password" msgstr "" -#: ../../boot.php:1618 +#: ../../boot.php:1630 msgid "Remember me" msgstr "" -#: ../../boot.php:1621 +#: ../../boot.php:1633 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:2405 +#: ../../boot.php:2431 #, php-format msgid "[$Projectname] Website SSL error for %s" msgstr "" -#: ../../boot.php:2410 +#: ../../boot.php:2436 msgid "Website SSL certificate is not valid. Please correct." msgstr "" -#: ../../boot.php:2526 +#: ../../boot.php:2552 #, php-format msgid "[$Projectname] Cron tasks not running on %s" msgstr "" -#: ../../boot.php:2531 +#: ../../boot.php:2557 msgid "Cron/Scheduled tasks not running." msgstr "" -#: ../../boot.php:2532 ../../include/datetime.php:238 +#: ../../boot.php:2558 ../../include/datetime.php:238 msgid "never" msgstr "" +#: ../../store/[data]/smarty3/compiled/a0a1289f91f53b2c12e4e0b45ffe8291540ba895_0.file.cover_photo.tpl.php:127 +msgid "Cover Photo" +msgstr "" + #: ../../view/theme/redbasic_c/php/config.php:16 #: ../../view/theme/redbasic_c/php/config.php:19 #: ../../view/theme/redbasic/php/config.php:16 @@ -9342,97 +9639,97 @@ msgid "Focus (Hubzilla default)" msgstr "" #: ../../view/theme/redbasic_c/php/config.php:99 -#: ../../view/theme/redbasic/php/config.php:97 +#: ../../view/theme/redbasic/php/config.php:98 msgid "Theme settings" msgstr "" #: ../../view/theme/redbasic_c/php/config.php:100 -#: ../../view/theme/redbasic/php/config.php:98 +#: ../../view/theme/redbasic/php/config.php:99 msgid "Narrow navbar" msgstr "" #: ../../view/theme/redbasic_c/php/config.php:101 -#: ../../view/theme/redbasic/php/config.php:99 +#: ../../view/theme/redbasic/php/config.php:100 msgid "Navigation bar background color" msgstr "" #: ../../view/theme/redbasic_c/php/config.php:102 -#: ../../view/theme/redbasic/php/config.php:100 +#: ../../view/theme/redbasic/php/config.php:101 msgid "Navigation bar icon color " msgstr "" #: ../../view/theme/redbasic_c/php/config.php:103 -#: ../../view/theme/redbasic/php/config.php:101 +#: ../../view/theme/redbasic/php/config.php:102 msgid "Navigation bar active icon color " msgstr "" #: ../../view/theme/redbasic_c/php/config.php:104 -#: ../../view/theme/redbasic/php/config.php:102 +#: ../../view/theme/redbasic/php/config.php:103 msgid "Link color" msgstr "" #: ../../view/theme/redbasic_c/php/config.php:105 -#: ../../view/theme/redbasic/php/config.php:103 +#: ../../view/theme/redbasic/php/config.php:104 msgid "Set font-color for banner" msgstr "" #: ../../view/theme/redbasic_c/php/config.php:106 -#: ../../view/theme/redbasic/php/config.php:104 +#: ../../view/theme/redbasic/php/config.php:105 msgid "Set the background color" msgstr "" #: ../../view/theme/redbasic_c/php/config.php:107 -#: ../../view/theme/redbasic/php/config.php:105 +#: ../../view/theme/redbasic/php/config.php:106 msgid "Set the background image" msgstr "" #: ../../view/theme/redbasic_c/php/config.php:108 -#: ../../view/theme/redbasic/php/config.php:106 +#: ../../view/theme/redbasic/php/config.php:107 msgid "Set the background color of items" msgstr "" #: ../../view/theme/redbasic_c/php/config.php:109 -#: ../../view/theme/redbasic/php/config.php:107 +#: ../../view/theme/redbasic/php/config.php:108 msgid "Set the background color of comments" msgstr "" #: ../../view/theme/redbasic_c/php/config.php:110 -#: ../../view/theme/redbasic/php/config.php:108 +#: ../../view/theme/redbasic/php/config.php:109 msgid "Set font-size for the entire application" msgstr "" #: ../../view/theme/redbasic_c/php/config.php:110 -#: ../../view/theme/redbasic/php/config.php:108 +#: ../../view/theme/redbasic/php/config.php:109 msgid "Examples: 1rem, 100%, 16px" msgstr "" #: ../../view/theme/redbasic_c/php/config.php:111 -#: ../../view/theme/redbasic/php/config.php:109 +#: ../../view/theme/redbasic/php/config.php:110 msgid "Set font-color for posts and comments" msgstr "" #: ../../view/theme/redbasic_c/php/config.php:112 -#: ../../view/theme/redbasic/php/config.php:110 +#: ../../view/theme/redbasic/php/config.php:111 msgid "Set radius of corners" msgstr "" #: ../../view/theme/redbasic_c/php/config.php:112 -#: ../../view/theme/redbasic/php/config.php:110 +#: ../../view/theme/redbasic/php/config.php:111 msgid "Example: 4px" msgstr "" #: ../../view/theme/redbasic_c/php/config.php:113 -#: ../../view/theme/redbasic/php/config.php:111 +#: ../../view/theme/redbasic/php/config.php:112 msgid "Set shadow depth of photos" msgstr "" #: ../../view/theme/redbasic_c/php/config.php:114 -#: ../../view/theme/redbasic/php/config.php:112 +#: ../../view/theme/redbasic/php/config.php:113 msgid "Set maximum width of content region in pixel" msgstr "" #: ../../view/theme/redbasic_c/php/config.php:114 -#: ../../view/theme/redbasic/php/config.php:112 +#: ../../view/theme/redbasic/php/config.php:113 msgid "Leave empty for default width" msgstr "" @@ -9441,47 +9738,24 @@ msgid "Left align page content" msgstr "" #: ../../view/theme/redbasic_c/php/config.php:116 -#: ../../view/theme/redbasic/php/config.php:113 +#: ../../view/theme/redbasic/php/config.php:114 msgid "Set size of conversation author photo" msgstr "" #: ../../view/theme/redbasic_c/php/config.php:117 -#: ../../view/theme/redbasic/php/config.php:114 +#: ../../view/theme/redbasic/php/config.php:115 msgid "Set size of followup author photos" msgstr "" -#: ../../widgets/Netselect/Netselect.php:24 -msgid "Network/Protocol" -msgstr "" - -#: ../../widgets/Netselect/Netselect.php:28 ../../include/network.php:1772 -msgid "Zot" -msgstr "" - -#: ../../widgets/Netselect/Netselect.php:31 ../../include/network.php:1770 -msgid "Diaspora" -msgstr "" - -#: ../../widgets/Netselect/Netselect.php:33 ../../include/network.php:1763 -#: ../../include/network.php:1764 -msgid "Friendica" -msgstr "" - -#: ../../widgets/Netselect/Netselect.php:38 ../../include/network.php:1765 -msgid "OStatus" -msgstr "" - -#: ../../widgets/Netselect/Netselect.php:42 ../../addon/pubcrawl/as.php:1219 -#: ../../addon/pubcrawl/as.php:1374 ../../addon/pubcrawl/as.php:1553 -#: ../../include/network.php:1768 -msgid "ActivityPub" +#: ../../view/theme/redbasic/php/config.php:116 +msgid "Show advanced settings" msgstr "" #: ../../addon/rendezvous/rendezvous.php:57 msgid "Errors encountered deleting database table " msgstr "" -#: ../../addon/rendezvous/rendezvous.php:95 ../../addon/twitter/twitter.php:779 +#: ../../addon/rendezvous/rendezvous.php:95 ../../addon/twitter/twitter.php:782 msgid "Submit Settings" msgstr "" @@ -9618,30 +9892,22 @@ msgstr "" msgid "Skeleton Settings" msgstr "" -#: ../../addon/gnusoc/gnusoc.php:258 -msgid "GNU-Social Protocol Settings updated." -msgstr "" - -#: ../../addon/gnusoc/gnusoc.php:277 +#: ../../addon/gnusoc/Mod_Gnusoc.php:16 msgid "" "The GNU-Social protocol does not support location independence. Connections " "you make within that network may be unreachable from alternate channel " "locations." msgstr "" -#: ../../addon/gnusoc/gnusoc.php:280 -msgid "Enable the GNU-Social protocol for this channel" -msgstr "" - -#: ../../addon/gnusoc/gnusoc.php:284 -msgid "GNU-Social Protocol Settings" +#: ../../addon/gnusoc/Mod_Gnusoc.php:34 +msgid "GNU-Social Protocol" msgstr "" -#: ../../addon/gnusoc/gnusoc.php:480 +#: ../../addon/gnusoc/gnusoc.php:451 msgid "Follow" msgstr "" -#: ../../addon/gnusoc/gnusoc.php:483 +#: ../../addon/gnusoc/gnusoc.php:454 #, php-format msgid "%1$s is now following %2$s" msgstr "" @@ -9687,8 +9953,8 @@ msgstr "" msgid "Page to load after image selection." msgstr "" -#: ../../addon/openclipatar/openclipatar.php:58 ../../include/channel.php:1300 -#: ../../include/nav.php:113 +#: ../../addon/openclipatar/openclipatar.php:58 ../../include/channel.php:1307 +#: ../../include/nav.php:111 msgid "Edit Profile" msgstr "" @@ -9776,95 +10042,91 @@ msgid "" "view" msgstr "" -#: ../../addon/wppost/wppost.php:45 -msgid "Post to WordPress" +#: ../../addon/wppost/Mod_Wppost.php:28 +msgid "Wordpress Settings saved." msgstr "" -#: ../../addon/wppost/wppost.php:82 -msgid "Enable WordPress Post Plugin" +#: ../../addon/wppost/Mod_Wppost.php:42 +msgid "Post to WordPress or anything else which uses the wordpress XMLRPC API" msgstr "" -#: ../../addon/wppost/wppost.php:86 +#: ../../addon/wppost/Mod_Wppost.php:65 msgid "WordPress username" msgstr "" -#: ../../addon/wppost/wppost.php:90 +#: ../../addon/wppost/Mod_Wppost.php:69 msgid "WordPress password" msgstr "" -#: ../../addon/wppost/wppost.php:94 +#: ../../addon/wppost/Mod_Wppost.php:73 msgid "WordPress API URL" msgstr "" -#: ../../addon/wppost/wppost.php:95 +#: ../../addon/wppost/Mod_Wppost.php:74 msgid "Typically https://your-blog.tld/xmlrpc.php" msgstr "" -#: ../../addon/wppost/wppost.php:98 +#: ../../addon/wppost/Mod_Wppost.php:77 msgid "WordPress blogid" msgstr "" -#: ../../addon/wppost/wppost.php:99 +#: ../../addon/wppost/Mod_Wppost.php:78 msgid "For multi-user sites such as wordpress.com, otherwise leave blank" msgstr "" -#: ../../addon/wppost/wppost.php:105 +#: ../../addon/wppost/Mod_Wppost.php:82 msgid "Post to WordPress by default" msgstr "" -#: ../../addon/wppost/wppost.php:109 +#: ../../addon/wppost/Mod_Wppost.php:86 msgid "Forward comments (requires hubzilla_wp plugin)" msgstr "" -#: ../../addon/wppost/wppost.php:113 -msgid "WordPress Post Settings" +#: ../../addon/wppost/Mod_Wppost.php:94 +msgid "Wordpress Post" msgstr "" -#: ../../addon/wppost/wppost.php:129 -msgid "Wordpress Settings saved." -msgstr "" - -#: ../../addon/nsfw/nsfw.php:80 -msgid "" -"This plugin looks in posts for the words/text you specify below, and " -"collapses any content containing those keywords so it is not displayed at " -"inappropriate times, such as sexual innuendo that may be improper in a work " -"setting. It is polite and recommended to tag any content containing nudity " -"with #NSFW. This filter can also match any other word/text you specify, and " -"can thereby be used as a general purpose content filter." +#: ../../addon/wppost/wppost.php:46 +msgid "Post to WordPress" msgstr "" -#: ../../addon/nsfw/nsfw.php:84 -msgid "Enable Content filter" +#: ../../addon/nsfw/nsfw.php:152 +msgid "Possible adult content" msgstr "" -#: ../../addon/nsfw/nsfw.php:88 -msgid "Comma separated list of keywords to hide" +#: ../../addon/nsfw/nsfw.php:167 +#, php-format +msgid "%s - view" msgstr "" -#: ../../addon/nsfw/nsfw.php:88 -msgid "Word, /regular-expression/, lang=xx, lang!=xx" +#: ../../addon/nsfw/Mod_Nsfw.php:22 +msgid "NSFW Settings saved." msgstr "" -#: ../../addon/nsfw/nsfw.php:92 -msgid "Not Safe For Work Settings" +#: ../../addon/nsfw/Mod_Nsfw.php:34 +msgid "Collapse content that contains predefined words" msgstr "" -#: ../../addon/nsfw/nsfw.php:92 -msgid "General Purpose Content Filter" +#: ../../addon/nsfw/Mod_Nsfw.php:44 +msgid "" +"This app looks in posts for the words/text you specify below, and collapses " +"any content containing those keywords so it is not displayed at " +"inappropriate times, such as sexual innuendo that may be improper in a work " +"setting. It is polite and recommended to tag any content containing nudity " +"with #NSFW. This filter can also match any other word/text you specify, and " +"can thereby be used as a general purpose content filter." msgstr "" -#: ../../addon/nsfw/nsfw.php:110 -msgid "NSFW Settings saved." +#: ../../addon/nsfw/Mod_Nsfw.php:49 +msgid "Comma separated list of keywords to hide" msgstr "" -#: ../../addon/nsfw/nsfw.php:207 -msgid "Possible adult content" +#: ../../addon/nsfw/Mod_Nsfw.php:49 +msgid "Word, /regular-expression/, lang=xx, lang!=xx" msgstr "" -#: ../../addon/nsfw/nsfw.php:222 -#, php-format -msgid "%s - view" +#: ../../addon/nsfw/Mod_Nsfw.php:58 +msgid "NSFW" msgstr "" #: ../../addon/ijpost/ijpost.php:42 @@ -10074,12 +10336,12 @@ msgstr "" msgid "IRC Chatroom" msgstr "" -#: ../../addon/gallery/gallery.php:42 ../../addon/gallery/Mod_Gallery.php:111 -msgid "Gallery" +#: ../../addon/gallery/gallery.php:50 +msgid "Photo Gallery" msgstr "" -#: ../../addon/gallery/gallery.php:45 -msgid "Photo Gallery" +#: ../../addon/gallery/Mod_Gallery.php:57 +msgid "A simple gallery for your photo albums" msgstr "" #: ../../addon/ljpost/ljpost.php:42 @@ -10189,12 +10451,12 @@ msgid "Login failed." msgstr "" #: ../../addon/openid/Mod_Id.php:85 ../../include/selectors.php:49 -#: ../../include/selectors.php:66 ../../include/channel.php:1480 +#: ../../include/selectors.php:66 ../../include/channel.php:1487 msgid "Male" msgstr "" #: ../../addon/openid/Mod_Id.php:87 ../../include/selectors.php:49 -#: ../../include/selectors.php:66 ../../include/channel.php:1478 +#: ../../include/selectors.php:66 ../../include/channel.php:1485 msgid "Female" msgstr "" @@ -10214,19 +10476,23 @@ msgstr "" msgid "<blush>" msgstr "" -#: ../../addon/startpage/startpage.php:109 +#: ../../addon/startpage/Mod_Startpage.php:51 +msgid "Set a preferred page to load on login from home page" +msgstr "" + +#: ../../addon/startpage/Mod_Startpage.php:62 msgid "Page to load after login" msgstr "" -#: ../../addon/startpage/startpage.php:109 +#: ../../addon/startpage/Mod_Startpage.php:62 msgid "" "Examples: "apps", "network?f=&gid=37" (privacy " "collection), "channel" or "notifications/system" (leave " "blank for default network page (grid)." msgstr "" -#: ../../addon/startpage/startpage.php:113 -msgid "Startpage Settings" +#: ../../addon/startpage/Mod_Startpage.php:70 +msgid "Startpage" msgstr "" #: ../../addon/morepokes/morepokes.php:19 @@ -10381,46 +10647,42 @@ msgstr "" msgid "declared undying love for" msgstr "" -#: ../../addon/diaspora/diaspora.php:786 +#: ../../addon/diaspora/Mod_Diaspora.php:40 msgid "Diaspora Protocol Settings updated." msgstr "" -#: ../../addon/diaspora/diaspora.php:805 +#: ../../addon/diaspora/Mod_Diaspora.php:49 msgid "" -"The Diaspora protocol does not support location independence. Connections " +"The diaspora protocol does not support location independence. Connections " "you make within that network may be unreachable from alternate channel " "locations." msgstr "" -#: ../../addon/diaspora/diaspora.php:808 -msgid "Enable the Diaspora protocol for this channel" -msgstr "" - -#: ../../addon/diaspora/diaspora.php:812 +#: ../../addon/diaspora/Mod_Diaspora.php:74 msgid "Allow any Diaspora member to comment on your public posts" msgstr "" -#: ../../addon/diaspora/diaspora.php:816 +#: ../../addon/diaspora/Mod_Diaspora.php:78 msgid "Prevent your hashtags from being redirected to other sites" msgstr "" -#: ../../addon/diaspora/diaspora.php:820 +#: ../../addon/diaspora/Mod_Diaspora.php:82 msgid "Sign and forward posts and comments with no existing Diaspora signature" msgstr "" -#: ../../addon/diaspora/diaspora.php:825 +#: ../../addon/diaspora/Mod_Diaspora.php:87 msgid "Followed hashtags (comma separated, do not include the #)" msgstr "" -#: ../../addon/diaspora/diaspora.php:830 -msgid "Diaspora Protocol Settings" +#: ../../addon/diaspora/Mod_Diaspora.php:96 +msgid "Diaspora Protocol" msgstr "" -#: ../../addon/diaspora/import_diaspora.php:16 +#: ../../addon/diaspora/import_diaspora.php:18 msgid "No username found in import file." msgstr "" -#: ../../addon/diaspora/import_diaspora.php:41 ../../include/import.php:72 +#: ../../addon/diaspora/import_diaspora.php:43 ../../include/import.php:72 msgid "Unable to create a unique channel address. Import failed." msgstr "" @@ -10433,16 +10695,12 @@ msgstr "" msgid "Your $Productname test account is about to expire." msgstr "" -#: ../../addon/rainbowtag/rainbowtag.php:81 -msgid "Enable Rainbowtag" -msgstr "" - -#: ../../addon/rainbowtag/rainbowtag.php:85 -msgid "Rainbowtag Settings" +#: ../../addon/rainbowtag/Mod_Rainbowtag.php:15 +msgid "Add some colour to tag clouds" msgstr "" -#: ../../addon/rainbowtag/rainbowtag.php:101 -msgid "Rainbowtag Settings saved." +#: ../../addon/rainbowtag/Mod_Rainbowtag.php:34 +msgid "Rainbow Tag" msgstr "" #: ../../addon/upload_limits/upload_limits.php:25 @@ -10606,7 +10864,7 @@ msgstr "" msgid "Message subject" msgstr "" -#: ../../addon/mdpost/mdpost.php:41 +#: ../../addon/mdpost/mdpost.php:42 msgid "Use markdown for editing posts" msgstr "" @@ -10717,8 +10975,8 @@ msgstr "" msgid "Hubzilla to Friendica Post Settings" msgstr "" -#: ../../addon/jappixmini/jappixmini.php:305 ../../include/channel.php:1396 -#: ../../include/channel.php:1567 +#: ../../addon/jappixmini/jappixmini.php:305 ../../include/channel.php:1403 +#: ../../include/channel.php:1574 msgid "Status:" msgstr "" @@ -10771,26 +11029,97 @@ msgstr "" msgid "Jappix Mini Settings" msgstr "" -#: ../../addon/superblock/superblock.php:112 -msgid "Currently blocked" +#: ../../addon/channelreputation/channelreputation.php:101 +#: ../../addon/channelreputation/channelreputation.php:102 +#: ../../addon/cart/myshop.php:141 ../../addon/cart/myshop.php:177 +#: ../../addon/cart/myshop.php:211 ../../addon/cart/myshop.php:259 +#: ../../addon/cart/myshop.php:294 ../../addon/cart/myshop.php:317 +msgid "Access Denied" msgstr "" -#: ../../addon/superblock/superblock.php:114 -msgid "No channels currently blocked" +#: ../../addon/channelreputation/channelreputation.php:109 +msgid "Enable Community Moderation" +msgstr "" + +#: ../../addon/channelreputation/channelreputation.php:117 +msgid "Reputation automatically given to new members" +msgstr "" + +#: ../../addon/channelreputation/channelreputation.php:118 +msgid "Reputation will never fall below this value" +msgstr "" + +#: ../../addon/channelreputation/channelreputation.php:119 +msgid "Minimum reputation before posting is allowed" msgstr "" -#: ../../addon/superblock/superblock.php:120 -msgid "Superblock Settings" +#: ../../addon/channelreputation/channelreputation.php:120 +msgid "Minimum reputation before commenting is allowed" msgstr "" -#: ../../addon/superblock/superblock.php:345 +#: ../../addon/channelreputation/channelreputation.php:121 +msgid "Minimum reputation before a member is able to moderate other posts" +msgstr "" + +#: ../../addon/channelreputation/channelreputation.php:122 +msgid "" +"Max ratio of moderator's reputation that can be added to/deducted from " +"reputation of person being moderated" +msgstr "" + +#: ../../addon/channelreputation/channelreputation.php:123 +msgid "Reputation \"cost\" to post" +msgstr "" + +#: ../../addon/channelreputation/channelreputation.php:124 +msgid "Reputation \"cost\" to comment" +msgstr "" + +#: ../../addon/channelreputation/channelreputation.php:125 +msgid "" +"Reputation automatically recovers at this rate per hour until it reaches " +"minimum_to_post" +msgstr "" + +#: ../../addon/channelreputation/channelreputation.php:126 +msgid "" +"When minimum_to_moderate > reputation > minimum_to_post reputation recovers " +"at this rate per hour" +msgstr "" + +#: ../../addon/channelreputation/channelreputation.php:138 +msgid "Community Moderation Settings" +msgstr "" + +#: ../../addon/channelreputation/channelreputation.php:359 +msgid "Can moderate reputation on my channel." +msgstr "" + +#: ../../addon/channelreputation/channelreputation.php:544 +#: ../../addon/channelreputation/channelreputation.php:547 +msgid "Channel Reputation" +msgstr "" + +#: ../../addon/superblock/superblock.php:318 msgid "Block Completely" msgstr "" -#: ../../addon/superblock/superblock.php:394 +#: ../../addon/superblock/Mod_Superblock.php:21 +msgid "Block channels" +msgstr "" + +#: ../../addon/superblock/Mod_Superblock.php:63 msgid "superblock settings updated" msgstr "" +#: ../../addon/superblock/Mod_Superblock.php:87 +msgid "Currently blocked" +msgstr "" + +#: ../../addon/superblock/Mod_Superblock.php:89 +msgid "No channels currently blocked" +msgstr "" + #: ../../addon/nofed/nofed.php:42 msgid "Federate" msgstr "" @@ -10883,41 +11212,109 @@ msgstr "" msgid "Friendica Login Password" msgstr "" -#: ../../addon/pubcrawl/pubcrawl.php:1136 +#: ../../addon/hsse/Mod_Hsse.php:15 +msgid "WYSIWG status editor" +msgstr "" + +#: ../../addon/hsse/Mod_Hsse.php:34 +msgid "WYSIWG Status" +msgstr "" + +#: ../../addon/hsse/hsse.php:82 ../../include/conversation.php:1285 +msgid "Set your location" +msgstr "" + +#: ../../addon/hsse/hsse.php:83 ../../include/conversation.php:1286 +msgid "Clear browser location" +msgstr "" + +#: ../../addon/hsse/hsse.php:99 ../../include/conversation.php:1302 +msgid "Embed (existing) photo from your photo albums" +msgstr "" + +#: ../../addon/hsse/hsse.php:135 ../../include/conversation.php:1338 +msgid "Tag term:" +msgstr "" + +#: ../../addon/hsse/hsse.php:136 ../../include/conversation.php:1339 +msgid "Where are you right now?" +msgstr "" + +#: ../../addon/hsse/hsse.php:141 ../../include/conversation.php:1344 +msgid "Choose a different album..." +msgstr "" + +#: ../../addon/hsse/hsse.php:145 ../../include/conversation.php:1348 +msgid "Comments enabled" +msgstr "" + +#: ../../addon/hsse/hsse.php:146 ../../include/conversation.php:1349 +msgid "Comments disabled" +msgstr "" + +#: ../../addon/hsse/hsse.php:195 ../../include/conversation.php:1398 +msgid "Page link name" +msgstr "" + +#: ../../addon/hsse/hsse.php:198 ../../include/conversation.php:1401 +msgid "Post as" +msgstr "" + +#: ../../addon/hsse/hsse.php:212 ../../include/conversation.php:1415 +msgid "Toggle voting" +msgstr "" + +#: ../../addon/hsse/hsse.php:215 ../../include/conversation.php:1418 +msgid "Disable comments" +msgstr "" + +#: ../../addon/hsse/hsse.php:216 ../../include/conversation.php:1419 +msgid "Toggle comments" +msgstr "" + +#: ../../addon/hsse/hsse.php:224 ../../include/conversation.php:1427 +msgid "Categories (optional, comma-separated list)" +msgstr "" + +#: ../../addon/hsse/hsse.php:247 ../../include/conversation.php:1450 +msgid "Other networks and post services" +msgstr "" + +#: ../../addon/hsse/hsse.php:253 ../../include/conversation.php:1456 +msgid "Set publish date" +msgstr "" + +#: ../../addon/pubcrawl/Mod_Pubcrawl.php:25 msgid "ActivityPub Protocol Settings updated." msgstr "" -#: ../../addon/pubcrawl/pubcrawl.php:1145 +#: ../../addon/pubcrawl/Mod_Pubcrawl.php:34 msgid "" -"The ActivityPub protocol does not support location independence. Connections " +"The activitypub protocol does not support location independence. Connections " "you make within that network may be unreachable from alternate channel " "locations." msgstr "" -#: ../../addon/pubcrawl/pubcrawl.php:1148 -msgid "Enable the ActivityPub protocol for this channel" -msgstr "" - -#: ../../addon/pubcrawl/pubcrawl.php:1151 +#: ../../addon/pubcrawl/Mod_Pubcrawl.php:48 msgid "Deliver to ActivityPub recipients in privacy groups" msgstr "" -#: ../../addon/pubcrawl/pubcrawl.php:1151 +#: ../../addon/pubcrawl/Mod_Pubcrawl.php:48 msgid "" "May result in a large number of mentions and expose all the members of your " "privacy group" msgstr "" -#: ../../addon/pubcrawl/pubcrawl.php:1155 +#: ../../addon/pubcrawl/Mod_Pubcrawl.php:52 msgid "Send multi-media HTML articles" msgstr "" -#: ../../addon/pubcrawl/pubcrawl.php:1155 +#: ../../addon/pubcrawl/Mod_Pubcrawl.php:52 msgid "Not supported by some microblog services such as Mastodon" msgstr "" -#: ../../addon/pubcrawl/pubcrawl.php:1159 -msgid "ActivityPub Protocol Settings" +#: ../../addon/pubcrawl/Mod_Pubcrawl.php:60 +msgid "Activitypub Protocol" msgstr "" #: ../../addon/donate/donate.php:21 @@ -11221,7 +11618,7 @@ msgstr "" msgid "Cancel GNU social Connection" msgstr "" -#: ../../addon/statusnet/statusnet.php:401 ../../addon/twitter/twitter.php:233 +#: ../../addon/statusnet/statusnet.php:401 ../../addon/twitter/twitter.php:236 msgid "Currently connected to: " msgstr "" @@ -11253,7 +11650,7 @@ msgid "" "account by default" msgstr "" -#: ../../addon/statusnet/statusnet.php:424 ../../addon/twitter/twitter.php:261 +#: ../../addon/statusnet/statusnet.php:424 ../../addon/twitter/twitter.php:264 msgid "Clear OAuth configuration" msgstr "" @@ -11305,7 +11702,7 @@ msgstr "" msgid "Error creating new game." msgstr "" -#: ../../addon/chess/chess.php:486 ../../include/channel.php:1151 +#: ../../addon/chess/chess.php:486 ../../include/channel.php:1158 msgid "Requested channel is not available." msgstr "" @@ -11317,21 +11714,21 @@ msgstr "" msgid "Enable notifications" msgstr "" -#: ../../addon/twitter/twitter.php:99 +#: ../../addon/twitter/twitter.php:102 msgid "Post to Twitter" msgstr "" -#: ../../addon/twitter/twitter.php:155 +#: ../../addon/twitter/twitter.php:158 msgid "Twitter settings updated." msgstr "" -#: ../../addon/twitter/twitter.php:184 +#: ../../addon/twitter/twitter.php:187 msgid "" "No consumer key pair for Twitter found. Please contact your site " "administrator." msgstr "" -#: ../../addon/twitter/twitter.php:206 +#: ../../addon/twitter/twitter.php:209 msgid "" "At this Hubzilla instance the Twitter plugin was enabled but you have not " "yet connected your account to your Twitter account. To do so click the " @@ -11340,15 +11737,15 @@ msgid "" "be posted to Twitter." msgstr "" -#: ../../addon/twitter/twitter.php:208 +#: ../../addon/twitter/twitter.php:211 msgid "Log in with Twitter" msgstr "" -#: ../../addon/twitter/twitter.php:211 +#: ../../addon/twitter/twitter.php:214 msgid "Copy the PIN from Twitter here" msgstr "" -#: ../../addon/twitter/twitter.php:238 +#: ../../addon/twitter/twitter.php:241 msgid "" "<strong>Note:</strong> Due your privacy settings (<em>Hide your profile " "details from unknown viewers?</em>) the link potentially included in public " @@ -11356,35 +11753,35 @@ msgid "" "the visitor that the access to your profile has been restricted." msgstr "" -#: ../../addon/twitter/twitter.php:243 +#: ../../addon/twitter/twitter.php:246 msgid "Allow posting to Twitter" msgstr "" -#: ../../addon/twitter/twitter.php:243 +#: ../../addon/twitter/twitter.php:246 msgid "" "If enabled your public postings can be posted to the associated Twitter " "account" msgstr "" -#: ../../addon/twitter/twitter.php:247 +#: ../../addon/twitter/twitter.php:250 msgid "Twitter post length" msgstr "" -#: ../../addon/twitter/twitter.php:247 +#: ../../addon/twitter/twitter.php:250 msgid "Maximum tweet length" msgstr "" -#: ../../addon/twitter/twitter.php:252 +#: ../../addon/twitter/twitter.php:255 msgid "Send public postings to Twitter by default" msgstr "" -#: ../../addon/twitter/twitter.php:252 +#: ../../addon/twitter/twitter.php:255 msgid "" "If enabled your public postings will be posted to the associated Twitter " "account by default" msgstr "" -#: ../../addon/twitter/twitter.php:270 +#: ../../addon/twitter/twitter.php:273 msgid "Twitter Post Settings" msgstr "" @@ -11400,206 +11797,250 @@ msgstr "" msgid "Smileybutton Settings" msgstr "" -#: ../../addon/cart/myshop.php:44 -msgid "Access Denied." +#: ../../addon/cart/Settings/Cart.php:56 +msgid "Enable Test Catalog" msgstr "" -#: ../../addon/cart/myshop.php:125 ../../addon/cart/cart.php:1324 -msgid "Order Not Found" +#: ../../addon/cart/Settings/Cart.php:68 +msgid "Enable Manual Payments" msgstr "" -#: ../../addon/cart/myshop.php:155 ../../addon/cart/myshop.php:191 -#: ../../addon/cart/myshop.php:225 ../../addon/cart/myshop.php:273 -#: ../../addon/cart/myshop.php:308 ../../addon/cart/myshop.php:331 -msgid "Access Denied" +#: ../../addon/cart/Settings/Cart.php:88 +msgid "Base Merchant Currency" msgstr "" -#: ../../addon/cart/myshop.php:200 ../../addon/cart/myshop.php:234 -#: ../../addon/cart/myshop.php:283 ../../addon/cart/myshop.php:341 -msgid "Invalid Item" +#: ../../addon/cart/Settings/Cart.php:111 ../../addon/cart/cart.php:1260 +msgid "Cart Settings" msgstr "" -#: ../../addon/cart/cart.php:467 -msgid "[cart] Item Added" +#: ../../addon/cart/myshop.php:30 +msgid "Access Denied." msgstr "" -#: ../../addon/cart/cart.php:851 -msgid "Order already checked out." +#: ../../addon/cart/myshop.php:111 ../../addon/cart/cart.php:1328 +msgid "Order Not Found" msgstr "" -#: ../../addon/cart/cart.php:1204 -msgid "Enable Shopping Cart" +#: ../../addon/cart/myshop.php:186 ../../addon/cart/myshop.php:220 +#: ../../addon/cart/myshop.php:269 ../../addon/cart/myshop.php:327 +msgid "Invalid Item" msgstr "" -#: ../../addon/cart/cart.php:1211 -msgid "Enable Test Catalog" +#: ../../addon/cart/cart.php:159 +msgid "DB Cleanup Failure" msgstr "" -#: ../../addon/cart/cart.php:1219 -msgid "Enable Manual Payments" +#: ../../addon/cart/cart.php:563 +msgid "[cart] Item Added" msgstr "" -#: ../../addon/cart/cart.php:1238 -msgid "Base Merchant Currency" +#: ../../addon/cart/cart.php:951 +msgid "Order already checked out." msgstr "" -#: ../../addon/cart/cart.php:1250 -msgid "Cart - Base Settings" +#: ../../addon/cart/cart.php:1253 +msgid "Drop database tables when uninstalling." msgstr "" -#: ../../addon/cart/cart.php:1271 ../../addon/cart/cart.php:1274 +#: ../../addon/cart/cart.php:1272 ../../addon/cart/cart.php:1275 msgid "Shop" msgstr "" -#: ../../addon/cart/cart.php:1401 -msgid "You must be logged into the Grid to shop." +#: ../../addon/cart/cart.php:1389 +msgid "Cart utilities for orders and payments" msgstr "" -#: ../../addon/cart/cart.php:1411 -msgid "Cart Not Enabled (profile: " +#: ../../addon/cart/cart.php:1427 +msgid "You must be logged into the Grid to shop." msgstr "" -#: ../../addon/cart/cart.php:1442 -#: ../../addon/cart/submodules/paypalbutton.php:417 -#: ../../addon/cart/manual_payments.php:37 +#: ../../addon/cart/cart.php:1460 +#: ../../addon/cart/submodules/paypalbutton.php:391 +#: ../../addon/cart/manual_payments.php:38 msgid "Order not found." msgstr "" -#: ../../addon/cart/cart.php:1451 +#: ../../addon/cart/cart.php:1468 msgid "Access denied." msgstr "" -#: ../../addon/cart/cart.php:1503 ../../addon/cart/cart.php:1647 +#: ../../addon/cart/cart.php:1520 ../../addon/cart/cart.php:1663 msgid "No Order Found" msgstr "" -#: ../../addon/cart/cart.php:1512 +#: ../../addon/cart/cart.php:1529 msgid "An unknown error has occurred Please start again." msgstr "" -#: ../../addon/cart/cart.php:1680 +#: ../../addon/cart/cart.php:1696 msgid "Invalid Payment Type. Please start again." msgstr "" -#: ../../addon/cart/cart.php:1687 +#: ../../addon/cart/cart.php:1703 msgid "Order not found" msgstr "" -#: ../../addon/cart/submodules/paypalbutton.php:97 +#: ../../addon/cart/submodules/paypalbutton.php:84 msgid "Enable Paypal Button Module" msgstr "" -#: ../../addon/cart/submodules/paypalbutton.php:102 +#: ../../addon/cart/submodules/paypalbutton.php:92 msgid "Use Production Key" msgstr "" -#: ../../addon/cart/submodules/paypalbutton.php:109 +#: ../../addon/cart/submodules/paypalbutton.php:99 msgid "Paypal Sandbox Client Key" msgstr "" -#: ../../addon/cart/submodules/paypalbutton.php:116 +#: ../../addon/cart/submodules/paypalbutton.php:106 msgid "Paypal Sandbox Secret Key" msgstr "" -#: ../../addon/cart/submodules/paypalbutton.php:122 +#: ../../addon/cart/submodules/paypalbutton.php:112 msgid "Paypal Production Client Key" msgstr "" -#: ../../addon/cart/submodules/paypalbutton.php:129 +#: ../../addon/cart/submodules/paypalbutton.php:119 msgid "Paypal Production Secret Key" msgstr "" -#: ../../addon/cart/submodules/paypalbutton.php:143 -msgid "Cart - Paypal Addon" -msgstr "" - -#: ../../addon/cart/submodules/paypalbutton.php:277 +#: ../../addon/cart/submodules/paypalbutton.php:251 msgid "Paypal button payments are not enabled." msgstr "" -#: ../../addon/cart/submodules/paypalbutton.php:295 +#: ../../addon/cart/submodules/paypalbutton.php:269 msgid "" "Paypal button payments are not properly configured. Please choose another " "payment option." msgstr "" -#: ../../addon/cart/submodules/hzservices.php:71 -msgid "Enable Hubzilla Services Module" -msgstr "" - -#: ../../addon/cart/submodules/hzservices.php:77 -msgid "Cart - Hubzilla Services Addon" +#: ../../addon/cart/submodules/manualcat.php:60 +msgid "Enable Manual Cart Module" msgstr "" -#: ../../addon/cart/submodules/hzservices.php:169 +#: ../../addon/cart/submodules/manualcat.php:174 +#: ../../addon/cart/submodules/hzservices.php:159 msgid "New Sku" msgstr "" -#: ../../addon/cart/submodules/hzservices.php:204 +#: ../../addon/cart/submodules/manualcat.php:210 +#: ../../addon/cart/submodules/hzservices.php:194 msgid "Cannot save edits to locked item." msgstr "" -#: ../../addon/cart/submodules/hzservices.php:252 -#: ../../addon/cart/submodules/hzservices.php:339 +#: ../../addon/cart/submodules/manualcat.php:253 +#: ../../addon/cart/submodules/hzservices.php:643 +msgid "Changes Locked" +msgstr "" + +#: ../../addon/cart/submodules/manualcat.php:257 +#: ../../addon/cart/submodules/hzservices.php:647 +msgid "Item available for purchase." +msgstr "" + +#: ../../addon/cart/submodules/manualcat.php:264 +#: ../../addon/cart/submodules/hzservices.php:654 +msgid "Price" +msgstr "" + +#: ../../addon/cart/submodules/hzservices.php:61 +msgid "Enable Hubzilla Services Module" +msgstr "" + +#: ../../addon/cart/submodules/hzservices.php:242 +#: ../../addon/cart/submodules/hzservices.php:329 msgid "SKU not found." msgstr "" -#: ../../addon/cart/submodules/hzservices.php:305 -#: ../../addon/cart/submodules/hzservices.php:309 +#: ../../addon/cart/submodules/hzservices.php:295 +#: ../../addon/cart/submodules/hzservices.php:299 msgid "Invalid Activation Directive." msgstr "" -#: ../../addon/cart/submodules/hzservices.php:380 -#: ../../addon/cart/submodules/hzservices.php:384 +#: ../../addon/cart/submodules/hzservices.php:370 +#: ../../addon/cart/submodules/hzservices.php:374 msgid "Invalid Deactivation Directive." msgstr "" -#: ../../addon/cart/submodules/hzservices.php:570 +#: ../../addon/cart/submodules/hzservices.php:560 msgid "Add to this privacy group" msgstr "" -#: ../../addon/cart/submodules/hzservices.php:586 +#: ../../addon/cart/submodules/hzservices.php:576 msgid "Set user service class" msgstr "" -#: ../../addon/cart/submodules/hzservices.php:613 +#: ../../addon/cart/submodules/hzservices.php:603 msgid "You must be using a local account to purchase this service." msgstr "" -#: ../../addon/cart/submodules/hzservices.php:651 -msgid "Changes Locked" +#: ../../addon/cart/submodules/hzservices.php:658 +msgid "Add buyer to privacy group" msgstr "" -#: ../../addon/cart/submodules/hzservices.php:655 -msgid "Item available for purchase." +#: ../../addon/cart/submodules/hzservices.php:663 +msgid "Add buyer as connection" msgstr "" -#: ../../addon/cart/submodules/hzservices.php:662 -msgid "Price" +#: ../../addon/cart/submodules/hzservices.php:671 +#: ../../addon/cart/submodules/hzservices.php:713 +msgid "Set Service Class" msgstr "" -#: ../../addon/cart/submodules/hzservices.php:665 -msgid "Add buyer to privacy group" +#: ../../addon/cart/submodules/subscriptions.php:150 +msgid "Enable Subscription Management Module" msgstr "" -#: ../../addon/cart/submodules/hzservices.php:670 -msgid "Add buyer as connection" +#: ../../addon/cart/submodules/subscriptions.php:221 +msgid "" +"Cannot include subscription items with different terms in the same order." msgstr "" -#: ../../addon/cart/submodules/hzservices.php:677 -#: ../../addon/cart/submodules/hzservices.php:718 -msgid "Set Service Class" +#: ../../addon/cart/submodules/subscriptions.php:363 +msgid "Select Subscription to Edit" +msgstr "" + +#: ../../addon/cart/submodules/subscriptions.php:369 +msgid "Edit Subscriptions" +msgstr "" + +#: ../../addon/cart/submodules/subscriptions.php:403 +msgid "Subscription SKU" +msgstr "" + +#: ../../addon/cart/submodules/subscriptions.php:408 +msgid "Catalog Description" +msgstr "" + +#: ../../addon/cart/submodules/subscriptions.php:412 +msgid "Subscription available for purchase." +msgstr "" + +#: ../../addon/cart/submodules/subscriptions.php:417 +msgid "Maximum active subscriptions to this item per account." +msgstr "" + +#: ../../addon/cart/submodules/subscriptions.php:420 +msgid "Subscription price." +msgstr "" + +#: ../../addon/cart/submodules/subscriptions.php:424 +msgid "Quantity" +msgstr "" + +#: ../../addon/cart/submodules/subscriptions.php:428 +msgid "Term" msgstr "" #: ../../addon/cart/manual_payments.php:7 msgid "Error: order mismatch. Please try again." msgstr "" -#: ../../addon/cart/manual_payments.php:30 +#: ../../addon/cart/manual_payments.php:31 msgid "Manual payments are not enabled." msgstr "" -#: ../../addon/cart/manual_payments.php:46 +#: ../../addon/cart/manual_payments.php:47 msgid "Finished" msgstr "" @@ -11805,14 +12246,12 @@ msgid "" "return key" msgstr "" -#: ../../addon/sendzid/sendzid.php:25 -msgid "Extended Identity Sharing" +#: ../../addon/sendzid/Mod_Sendzid.php:14 +msgid "Send your identity to all websites" msgstr "" -#: ../../addon/sendzid/sendzid.php:26 -msgid "" -"Share your identity with all websites on the internet. When disabled, " -"identity is only shared with $Projectname sites." +#: ../../addon/sendzid/Mod_Sendzid.php:32 +msgid "Send ZID" msgstr "" #: ../../addon/tictac/tictac.php:21 @@ -11881,20 +12320,13 @@ msgstr "" msgid "pageheader Settings saved." msgstr "" -#: ../../addon/authchoose/authchoose.php:67 -msgid "Only authenticate automatically to sites of your friends" -msgstr "" - -#: ../../addon/authchoose/authchoose.php:67 -msgid "By default you are automatically authenticated anywhere in the network" -msgstr "" - -#: ../../addon/authchoose/authchoose.php:71 -msgid "Authchoose Settings" +#: ../../addon/authchoose/Mod_Authchoose.php:22 +msgid "" +"Allow magic authentication only to websites of your immediate connections" msgstr "" -#: ../../addon/authchoose/authchoose.php:85 -msgid "Atuhchoose Settings updated." +#: ../../addon/authchoose/Mod_Authchoose.php:39 +msgid "Authchoose" msgstr "" #: ../../addon/moremoods/moremoods.php:19 @@ -12196,11 +12628,11 @@ msgstr "" msgid "Hermaphrodite" msgstr "" -#: ../../include/selectors.php:49 ../../include/channel.php:1484 +#: ../../include/selectors.php:49 ../../include/channel.php:1491 msgid "Neuter" msgstr "" -#: ../../include/selectors.php:49 ../../include/channel.php:1486 +#: ../../include/selectors.php:49 ../../include/channel.php:1493 msgid "Non-specific" msgstr "" @@ -12400,8 +12832,8 @@ msgstr "" msgid "%1$s poked %2$s" msgstr "" -#: ../../include/conversation.php:251 ../../include/text.php:1140 -#: ../../include/text.php:1144 +#: ../../include/conversation.php:251 ../../include/text.php:1146 +#: ../../include/text.php:1150 msgid "poked" msgstr "" @@ -12430,278 +12862,117 @@ msgstr "" msgid "Loading..." msgstr "" -#: ../../include/conversation.php:891 +#: ../../include/conversation.php:892 msgid "Delete Selected Items" msgstr "" -#: ../../include/conversation.php:934 +#: ../../include/conversation.php:935 msgid "View Source" msgstr "" -#: ../../include/conversation.php:944 +#: ../../include/conversation.php:945 msgid "Follow Thread" msgstr "" -#: ../../include/conversation.php:953 +#: ../../include/conversation.php:954 msgid "Unfollow Thread" msgstr "" -#: ../../include/conversation.php:1067 +#: ../../include/conversation.php:1068 msgid "Edit Connection" msgstr "" -#: ../../include/conversation.php:1077 +#: ../../include/conversation.php:1078 msgid "Message" msgstr "" -#: ../../include/conversation.php:1211 +#: ../../include/conversation.php:1212 #, php-format msgid "%s likes this." msgstr "" -#: ../../include/conversation.php:1211 +#: ../../include/conversation.php:1212 #, php-format msgid "%s doesn't like this." msgstr "" -#: ../../include/conversation.php:1215 +#: ../../include/conversation.php:1216 #, php-format msgid "<span %1$s>%2$d people</span> like this." msgid_plural "<span %1$s>%2$d people</span> like this." msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1217 +#: ../../include/conversation.php:1218 #, php-format msgid "<span %1$s>%2$d people</span> don't like this." msgid_plural "<span %1$s>%2$d people</span> don't like this." msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1223 +#: ../../include/conversation.php:1224 msgid "and" msgstr "" -#: ../../include/conversation.php:1226 +#: ../../include/conversation.php:1227 #, php-format msgid ", and %d other people" msgid_plural ", and %d other people" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1227 +#: ../../include/conversation.php:1228 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:1227 +#: ../../include/conversation.php:1228 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:1270 -msgid "Set your location" -msgstr "" - -#: ../../include/conversation.php:1271 -msgid "Clear browser location" -msgstr "" - -#: ../../include/conversation.php:1287 -msgid "Embed (existing) photo from your photo albums" -msgstr "" - -#: ../../include/conversation.php:1323 -msgid "Tag term:" -msgstr "" - -#: ../../include/conversation.php:1324 -msgid "Where are you right now?" -msgstr "" - -#: ../../include/conversation.php:1329 -msgid "Choose a different album..." -msgstr "" - -#: ../../include/conversation.php:1333 -msgid "Comments enabled" -msgstr "" - -#: ../../include/conversation.php:1334 -msgid "Comments disabled" -msgstr "" - -#: ../../include/conversation.php:1383 -msgid "Page link name" -msgstr "" - -#: ../../include/conversation.php:1386 -msgid "Post as" -msgstr "" - -#: ../../include/conversation.php:1400 -msgid "Toggle voting" -msgstr "" - -#: ../../include/conversation.php:1403 -msgid "Disable comments" -msgstr "" - -#: ../../include/conversation.php:1404 -msgid "Toggle comments" -msgstr "" - -#: ../../include/conversation.php:1412 -msgid "Categories (optional, comma-separated list)" -msgstr "" - -#: ../../include/conversation.php:1435 -msgid "Other networks and post services" -msgstr "" - -#: ../../include/conversation.php:1441 -msgid "Set publish date" -msgstr "" - -#: ../../include/conversation.php:1702 -msgid "Commented Order" -msgstr "" - -#: ../../include/conversation.php:1705 -msgid "Sort by Comment Date" -msgstr "" - -#: ../../include/conversation.php:1709 -msgid "Posted Order" -msgstr "" - -#: ../../include/conversation.php:1712 -msgid "Sort by Post Date" -msgstr "" - -#: ../../include/conversation.php:1720 -msgid "Posts that mention or involve you" -msgstr "" - -#: ../../include/conversation.php:1729 -msgid "Activity Stream - by date" -msgstr "" - -#: ../../include/conversation.php:1735 -msgid "Starred" -msgstr "" - -#: ../../include/conversation.php:1738 -msgid "Favourite Posts" -msgstr "" - -#: ../../include/conversation.php:1745 -msgid "Spam" -msgstr "" - -#: ../../include/conversation.php:1748 -msgid "Posts flagged as SPAM" -msgstr "" - -#: ../../include/conversation.php:1823 ../../include/nav.php:373 -msgid "Status Messages and Posts" -msgstr "" - -#: ../../include/conversation.php:1836 ../../include/nav.php:386 -msgid "Profile Details" -msgstr "" - -#: ../../include/conversation.php:1846 ../../include/nav.php:396 -#: ../../include/photos.php:667 -msgid "Photo Albums" -msgstr "" - -#: ../../include/conversation.php:1854 ../../include/nav.php:404 -msgid "Files and Storage" -msgstr "" - -#: ../../include/conversation.php:1891 ../../include/nav.php:439 -msgid "Bookmarks" -msgstr "" - -#: ../../include/conversation.php:1894 ../../include/nav.php:442 -msgid "Saved Bookmarks" -msgstr "" - -#: ../../include/conversation.php:1905 ../../include/nav.php:453 -msgid "View Cards" -msgstr "" - -#: ../../include/conversation.php:1913 -msgid "articles" -msgstr "" - -#: ../../include/conversation.php:1916 ../../include/nav.php:464 -msgid "View Articles" -msgstr "" - -#: ../../include/conversation.php:1927 ../../include/nav.php:476 -msgid "View Webpages" -msgstr "" - -#: ../../include/conversation.php:1996 +#: ../../include/conversation.php:1699 msgctxt "noun" msgid "Attending" msgid_plural "Attending" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1999 +#: ../../include/conversation.php:1702 msgctxt "noun" msgid "Not Attending" msgid_plural "Not Attending" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:2002 +#: ../../include/conversation.php:1705 msgctxt "noun" msgid "Undecided" msgid_plural "Undecided" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:2005 +#: ../../include/conversation.php:1708 msgctxt "noun" msgid "Agree" msgid_plural "Agrees" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:2008 +#: ../../include/conversation.php:1711 msgctxt "noun" msgid "Disagree" msgid_plural "Disagrees" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:2011 +#: ../../include/conversation.php:1714 msgctxt "noun" msgid "Abstain" msgid_plural "Abstains" msgstr[0] "" msgstr[1] "" -#: ../../include/dir_fns.php:141 -msgid "Directory Options" -msgstr "" - -#: ../../include/dir_fns.php:143 -msgid "Safe Mode" -msgstr "" - -#: ../../include/dir_fns.php:144 -msgid "Public Forums Only" -msgstr "" - -#: ../../include/dir_fns.php:145 -msgid "This Website Only" -msgstr "" - #: ../../include/bookmarks.php:34 #, php-format msgid "%1$s's bookmarks" @@ -12716,373 +12987,373 @@ msgid "" "Cannot create a duplicate channel identifier on this system. Import failed." msgstr "" -#: ../../include/import.php:116 +#: ../../include/import.php:117 msgid "Cloned channel not found. Import failed." msgstr "" -#: ../../include/text.php:492 +#: ../../include/text.php:498 msgid "prev" msgstr "" -#: ../../include/text.php:494 +#: ../../include/text.php:500 msgid "first" msgstr "" -#: ../../include/text.php:523 +#: ../../include/text.php:529 msgid "last" msgstr "" -#: ../../include/text.php:526 +#: ../../include/text.php:532 msgid "next" msgstr "" -#: ../../include/text.php:537 +#: ../../include/text.php:543 msgid "older" msgstr "" -#: ../../include/text.php:539 +#: ../../include/text.php:545 msgid "newer" msgstr "" -#: ../../include/text.php:963 +#: ../../include/text.php:969 msgid "No connections" msgstr "" -#: ../../include/text.php:995 +#: ../../include/text.php:1001 #, php-format msgid "View all %s connections" msgstr "" -#: ../../include/text.php:1051 +#: ../../include/text.php:1057 #, php-format msgid "Network: %s" msgstr "" -#: ../../include/text.php:1140 ../../include/text.php:1144 +#: ../../include/text.php:1146 ../../include/text.php:1150 msgid "poke" msgstr "" -#: ../../include/text.php:1145 +#: ../../include/text.php:1151 msgid "ping" msgstr "" -#: ../../include/text.php:1145 +#: ../../include/text.php:1151 msgid "pinged" msgstr "" -#: ../../include/text.php:1146 +#: ../../include/text.php:1152 msgid "prod" msgstr "" -#: ../../include/text.php:1146 +#: ../../include/text.php:1152 msgid "prodded" msgstr "" -#: ../../include/text.php:1147 +#: ../../include/text.php:1153 msgid "slap" msgstr "" -#: ../../include/text.php:1147 +#: ../../include/text.php:1153 msgid "slapped" msgstr "" -#: ../../include/text.php:1148 +#: ../../include/text.php:1154 msgid "finger" msgstr "" -#: ../../include/text.php:1148 +#: ../../include/text.php:1154 msgid "fingered" msgstr "" -#: ../../include/text.php:1149 +#: ../../include/text.php:1155 msgid "rebuff" msgstr "" -#: ../../include/text.php:1149 +#: ../../include/text.php:1155 msgid "rebuffed" msgstr "" -#: ../../include/text.php:1172 +#: ../../include/text.php:1178 msgid "happy" msgstr "" -#: ../../include/text.php:1173 +#: ../../include/text.php:1179 msgid "sad" msgstr "" -#: ../../include/text.php:1174 +#: ../../include/text.php:1180 msgid "mellow" msgstr "" -#: ../../include/text.php:1175 +#: ../../include/text.php:1181 msgid "tired" msgstr "" -#: ../../include/text.php:1176 +#: ../../include/text.php:1182 msgid "perky" msgstr "" -#: ../../include/text.php:1177 +#: ../../include/text.php:1183 msgid "angry" msgstr "" -#: ../../include/text.php:1178 +#: ../../include/text.php:1184 msgid "stupefied" msgstr "" -#: ../../include/text.php:1179 +#: ../../include/text.php:1185 msgid "puzzled" msgstr "" -#: ../../include/text.php:1180 +#: ../../include/text.php:1186 msgid "interested" msgstr "" -#: ../../include/text.php:1181 +#: ../../include/text.php:1187 msgid "bitter" msgstr "" -#: ../../include/text.php:1182 +#: ../../include/text.php:1188 msgid "cheerful" msgstr "" -#: ../../include/text.php:1183 +#: ../../include/text.php:1189 msgid "alive" msgstr "" -#: ../../include/text.php:1184 +#: ../../include/text.php:1190 msgid "annoyed" msgstr "" -#: ../../include/text.php:1185 +#: ../../include/text.php:1191 msgid "anxious" msgstr "" -#: ../../include/text.php:1186 +#: ../../include/text.php:1192 msgid "cranky" msgstr "" -#: ../../include/text.php:1187 +#: ../../include/text.php:1193 msgid "disturbed" msgstr "" -#: ../../include/text.php:1188 +#: ../../include/text.php:1194 msgid "frustrated" msgstr "" -#: ../../include/text.php:1189 +#: ../../include/text.php:1195 msgid "depressed" msgstr "" -#: ../../include/text.php:1190 +#: ../../include/text.php:1196 msgid "motivated" msgstr "" -#: ../../include/text.php:1191 +#: ../../include/text.php:1197 msgid "relaxed" msgstr "" -#: ../../include/text.php:1192 +#: ../../include/text.php:1198 msgid "surprised" msgstr "" -#: ../../include/text.php:1371 ../../include/js_strings.php:86 +#: ../../include/text.php:1377 ../../include/js_strings.php:86 msgid "Monday" msgstr "" -#: ../../include/text.php:1371 ../../include/js_strings.php:87 +#: ../../include/text.php:1377 ../../include/js_strings.php:87 msgid "Tuesday" msgstr "" -#: ../../include/text.php:1371 ../../include/js_strings.php:88 +#: ../../include/text.php:1377 ../../include/js_strings.php:88 msgid "Wednesday" msgstr "" -#: ../../include/text.php:1371 ../../include/js_strings.php:89 +#: ../../include/text.php:1377 ../../include/js_strings.php:89 msgid "Thursday" msgstr "" -#: ../../include/text.php:1371 ../../include/js_strings.php:90 +#: ../../include/text.php:1377 ../../include/js_strings.php:90 msgid "Friday" msgstr "" -#: ../../include/text.php:1371 ../../include/js_strings.php:91 +#: ../../include/text.php:1377 ../../include/js_strings.php:91 msgid "Saturday" msgstr "" -#: ../../include/text.php:1371 ../../include/js_strings.php:85 +#: ../../include/text.php:1377 ../../include/js_strings.php:85 msgid "Sunday" msgstr "" -#: ../../include/text.php:1375 ../../include/js_strings.php:61 +#: ../../include/text.php:1381 ../../include/js_strings.php:61 msgid "January" msgstr "" -#: ../../include/text.php:1375 ../../include/js_strings.php:62 +#: ../../include/text.php:1381 ../../include/js_strings.php:62 msgid "February" msgstr "" -#: ../../include/text.php:1375 ../../include/js_strings.php:63 +#: ../../include/text.php:1381 ../../include/js_strings.php:63 msgid "March" msgstr "" -#: ../../include/text.php:1375 ../../include/js_strings.php:64 +#: ../../include/text.php:1381 ../../include/js_strings.php:64 msgid "April" msgstr "" -#: ../../include/text.php:1375 +#: ../../include/text.php:1381 msgid "May" msgstr "" -#: ../../include/text.php:1375 ../../include/js_strings.php:66 +#: ../../include/text.php:1381 ../../include/js_strings.php:66 msgid "June" msgstr "" -#: ../../include/text.php:1375 ../../include/js_strings.php:67 +#: ../../include/text.php:1381 ../../include/js_strings.php:67 msgid "July" msgstr "" -#: ../../include/text.php:1375 ../../include/js_strings.php:68 +#: ../../include/text.php:1381 ../../include/js_strings.php:68 msgid "August" msgstr "" -#: ../../include/text.php:1375 ../../include/js_strings.php:69 +#: ../../include/text.php:1381 ../../include/js_strings.php:69 msgid "September" msgstr "" -#: ../../include/text.php:1375 ../../include/js_strings.php:70 +#: ../../include/text.php:1381 ../../include/js_strings.php:70 msgid "October" msgstr "" -#: ../../include/text.php:1375 ../../include/js_strings.php:71 +#: ../../include/text.php:1381 ../../include/js_strings.php:71 msgid "November" msgstr "" -#: ../../include/text.php:1375 ../../include/js_strings.php:72 +#: ../../include/text.php:1381 ../../include/js_strings.php:72 msgid "December" msgstr "" -#: ../../include/text.php:1449 +#: ../../include/text.php:1455 msgid "Unknown Attachment" msgstr "" -#: ../../include/text.php:1451 ../../include/feedutils.php:860 +#: ../../include/text.php:1457 ../../include/feedutils.php:860 msgid "unknown" msgstr "" -#: ../../include/text.php:1487 +#: ../../include/text.php:1493 msgid "remove category" msgstr "" -#: ../../include/text.php:1561 +#: ../../include/text.php:1567 msgid "remove from file" msgstr "" -#: ../../include/text.php:1703 ../../include/message.php:12 +#: ../../include/text.php:1709 ../../include/message.php:13 msgid "Download binary/encrypted content" msgstr "" -#: ../../include/text.php:1866 ../../include/language.php:397 +#: ../../include/text.php:1872 ../../include/language.php:397 msgid "default" msgstr "" -#: ../../include/text.php:1874 +#: ../../include/text.php:1880 msgid "Page layout" msgstr "" -#: ../../include/text.php:1874 +#: ../../include/text.php:1880 msgid "You can create your own with the layouts tool" msgstr "" -#: ../../include/text.php:1885 +#: ../../include/text.php:1891 msgid "HTML" msgstr "" -#: ../../include/text.php:1888 +#: ../../include/text.php:1894 msgid "Comanche Layout" msgstr "" -#: ../../include/text.php:1893 +#: ../../include/text.php:1899 msgid "PHP" msgstr "" -#: ../../include/text.php:1902 +#: ../../include/text.php:1908 msgid "Page content type" msgstr "" -#: ../../include/text.php:2035 +#: ../../include/text.php:2041 msgid "activity" msgstr "" -#: ../../include/text.php:2135 +#: ../../include/text.php:2142 msgid "a-z, 0-9, -, and _ only" msgstr "" -#: ../../include/text.php:2455 +#: ../../include/text.php:2462 msgid "Design Tools" msgstr "" -#: ../../include/text.php:2461 +#: ../../include/text.php:2468 msgid "Pages" msgstr "" -#: ../../include/text.php:2483 +#: ../../include/text.php:2490 msgid "Import website..." msgstr "" -#: ../../include/text.php:2484 +#: ../../include/text.php:2491 msgid "Select folder to import" msgstr "" -#: ../../include/text.php:2485 +#: ../../include/text.php:2492 msgid "Import from a zipped folder:" msgstr "" -#: ../../include/text.php:2486 +#: ../../include/text.php:2493 msgid "Import from cloud files:" msgstr "" -#: ../../include/text.php:2487 +#: ../../include/text.php:2494 msgid "/cloud/channel/path/to/folder" msgstr "" -#: ../../include/text.php:2488 +#: ../../include/text.php:2495 msgid "Enter path to website files" msgstr "" -#: ../../include/text.php:2489 +#: ../../include/text.php:2496 msgid "Select folder" msgstr "" -#: ../../include/text.php:2490 +#: ../../include/text.php:2497 msgid "Export website..." msgstr "" -#: ../../include/text.php:2491 +#: ../../include/text.php:2498 msgid "Export to a zip file" msgstr "" -#: ../../include/text.php:2492 +#: ../../include/text.php:2499 msgid "website.zip" msgstr "" -#: ../../include/text.php:2493 +#: ../../include/text.php:2500 msgid "Enter a name for the zip file." msgstr "" -#: ../../include/text.php:2494 +#: ../../include/text.php:2501 msgid "Export to cloud files" msgstr "" -#: ../../include/text.php:2495 +#: ../../include/text.php:2502 msgid "/path/to/export/folder" msgstr "" -#: ../../include/text.php:2496 +#: ../../include/text.php:2503 msgid "Enter a path to a cloud files destination." msgstr "" -#: ../../include/text.php:2497 +#: ../../include/text.php:2504 msgid "Specify folder" msgstr "" @@ -13130,7 +13401,7 @@ msgstr "" msgid "View all %d common connections" msgstr "" -#: ../../include/markdown.php:158 ../../include/bbcode.php:358 +#: ../../include/markdown.php:200 ../../include/bbcode.php:358 #, php-format msgid "%1$s wrote the following %2$s %3$s" msgstr "" @@ -13460,19 +13731,19 @@ msgctxt "calendar" msgid "All day" msgstr "" -#: ../../include/message.php:40 +#: ../../include/message.php:41 msgid "Unable to determine sender." msgstr "" -#: ../../include/message.php:79 +#: ../../include/message.php:80 msgid "No recipient provided." msgstr "" -#: ../../include/message.php:84 +#: ../../include/message.php:85 msgid "[no subject]" msgstr "" -#: ../../include/message.php:214 +#: ../../include/message.php:215 msgid "Stored post could not be verified." msgstr "" @@ -13571,221 +13842,221 @@ msgid "" "form has been opened for too long (>3 hours) before submitting it." msgstr "" -#: ../../include/items.php:891 ../../include/items.php:951 +#: ../../include/items.php:911 ../../include/items.php:971 msgid "(Unknown)" msgstr "" -#: ../../include/items.php:1137 +#: ../../include/items.php:1157 msgid "Visible to anybody on the internet." msgstr "" -#: ../../include/items.php:1139 +#: ../../include/items.php:1159 msgid "Visible to you only." msgstr "" -#: ../../include/items.php:1141 +#: ../../include/items.php:1161 msgid "Visible to anybody in this network." msgstr "" -#: ../../include/items.php:1143 +#: ../../include/items.php:1163 msgid "Visible to anybody authenticated." msgstr "" -#: ../../include/items.php:1145 +#: ../../include/items.php:1165 #, php-format msgid "Visible to anybody on %s." msgstr "" -#: ../../include/items.php:1147 +#: ../../include/items.php:1167 msgid "Visible to all connections." msgstr "" -#: ../../include/items.php:1149 +#: ../../include/items.php:1169 msgid "Visible to approved connections." msgstr "" -#: ../../include/items.php:1151 +#: ../../include/items.php:1171 msgid "Visible to specific connections." msgstr "" -#: ../../include/items.php:4141 +#: ../../include/items.php:4183 msgid "Privacy group is empty." msgstr "" -#: ../../include/items.php:4148 +#: ../../include/items.php:4190 #, php-format msgid "Privacy group: %s" msgstr "" -#: ../../include/items.php:4160 +#: ../../include/items.php:4202 msgid "Connection not found." msgstr "" -#: ../../include/items.php:4509 +#: ../../include/items.php:4551 msgid "profile photo" msgstr "" -#: ../../include/items.php:4700 +#: ../../include/items.php:4742 #, php-format msgid "[Edited %s]" msgstr "" -#: ../../include/items.php:4700 +#: ../../include/items.php:4742 msgctxt "edit_activity" msgid "Post" msgstr "" -#: ../../include/items.php:4700 +#: ../../include/items.php:4742 msgctxt "edit_activity" msgid "Comment" msgstr "" -#: ../../include/channel.php:35 +#: ../../include/channel.php:42 msgid "Unable to obtain identity information from database" msgstr "" -#: ../../include/channel.php:68 +#: ../../include/channel.php:75 msgid "Empty name" msgstr "" -#: ../../include/channel.php:71 +#: ../../include/channel.php:78 msgid "Name too long" msgstr "" -#: ../../include/channel.php:188 +#: ../../include/channel.php:195 msgid "No account identifier" msgstr "" -#: ../../include/channel.php:200 +#: ../../include/channel.php:207 msgid "Nickname is required." msgstr "" -#: ../../include/channel.php:277 +#: ../../include/channel.php:284 msgid "Unable to retrieve created identity" msgstr "" -#: ../../include/channel.php:373 +#: ../../include/channel.php:380 msgid "Default Profile" msgstr "" -#: ../../include/channel.php:532 ../../include/channel.php:621 +#: ../../include/channel.php:539 ../../include/channel.php:628 msgid "Unable to retrieve modified identity" msgstr "" -#: ../../include/channel.php:1297 +#: ../../include/channel.php:1304 msgid "Create New Profile" msgstr "" -#: ../../include/channel.php:1318 +#: ../../include/channel.php:1325 msgid "Visible to everybody" msgstr "" -#: ../../include/channel.php:1395 ../../include/channel.php:1523 +#: ../../include/channel.php:1402 ../../include/channel.php:1530 msgid "Gender:" msgstr "" -#: ../../include/channel.php:1397 ../../include/channel.php:1591 +#: ../../include/channel.php:1404 ../../include/channel.php:1598 msgid "Homepage:" msgstr "" -#: ../../include/channel.php:1398 +#: ../../include/channel.php:1405 msgid "Online Now" msgstr "" -#: ../../include/channel.php:1451 +#: ../../include/channel.php:1458 msgid "Change your profile photo" msgstr "" -#: ../../include/channel.php:1482 +#: ../../include/channel.php:1489 msgid "Trans" msgstr "" -#: ../../include/channel.php:1528 +#: ../../include/channel.php:1535 msgid "Like this channel" msgstr "" -#: ../../include/channel.php:1552 +#: ../../include/channel.php:1559 msgid "j F, Y" msgstr "" -#: ../../include/channel.php:1553 +#: ../../include/channel.php:1560 msgid "j F" msgstr "" -#: ../../include/channel.php:1560 +#: ../../include/channel.php:1567 msgid "Birthday:" msgstr "" -#: ../../include/channel.php:1573 +#: ../../include/channel.php:1580 #, php-format msgid "for %1$d %2$s" msgstr "" -#: ../../include/channel.php:1585 +#: ../../include/channel.php:1592 msgid "Tags:" msgstr "" -#: ../../include/channel.php:1589 +#: ../../include/channel.php:1596 msgid "Sexual Preference:" msgstr "" -#: ../../include/channel.php:1595 +#: ../../include/channel.php:1602 msgid "Political Views:" msgstr "" -#: ../../include/channel.php:1597 +#: ../../include/channel.php:1604 msgid "Religion:" msgstr "" -#: ../../include/channel.php:1601 +#: ../../include/channel.php:1608 msgid "Hobbies/Interests:" msgstr "" -#: ../../include/channel.php:1603 +#: ../../include/channel.php:1610 msgid "Likes:" msgstr "" -#: ../../include/channel.php:1605 +#: ../../include/channel.php:1612 msgid "Dislikes:" msgstr "" -#: ../../include/channel.php:1607 +#: ../../include/channel.php:1614 msgid "Contact information and Social Networks:" msgstr "" -#: ../../include/channel.php:1609 +#: ../../include/channel.php:1616 msgid "My other channels:" msgstr "" -#: ../../include/channel.php:1611 +#: ../../include/channel.php:1618 msgid "Musical interests:" msgstr "" -#: ../../include/channel.php:1613 +#: ../../include/channel.php:1620 msgid "Books, literature:" msgstr "" -#: ../../include/channel.php:1615 +#: ../../include/channel.php:1622 msgid "Television:" msgstr "" -#: ../../include/channel.php:1617 +#: ../../include/channel.php:1624 msgid "Film/dance/culture/entertainment:" msgstr "" -#: ../../include/channel.php:1619 +#: ../../include/channel.php:1626 msgid "Love/Romance:" msgstr "" -#: ../../include/channel.php:1621 +#: ../../include/channel.php:1628 msgid "Work/employment:" msgstr "" -#: ../../include/channel.php:1623 +#: ../../include/channel.php:1630 msgid "School/education:" msgstr "" -#: ../../include/channel.php:1646 +#: ../../include/channel.php:1653 msgid "Like this thing" msgstr "" @@ -13907,17 +14178,17 @@ msgstr "" msgid "Cannot locate DNS info for database server '%s'" msgstr "" -#: ../../include/bbcode.php:200 ../../include/bbcode.php:1202 -#: ../../include/bbcode.php:1205 ../../include/bbcode.php:1210 -#: ../../include/bbcode.php:1213 ../../include/bbcode.php:1216 -#: ../../include/bbcode.php:1219 ../../include/bbcode.php:1224 -#: ../../include/bbcode.php:1227 ../../include/bbcode.php:1232 -#: ../../include/bbcode.php:1235 ../../include/bbcode.php:1238 -#: ../../include/bbcode.php:1241 +#: ../../include/bbcode.php:200 ../../include/bbcode.php:1201 +#: ../../include/bbcode.php:1204 ../../include/bbcode.php:1209 +#: ../../include/bbcode.php:1212 ../../include/bbcode.php:1215 +#: ../../include/bbcode.php:1218 ../../include/bbcode.php:1223 +#: ../../include/bbcode.php:1226 ../../include/bbcode.php:1231 +#: ../../include/bbcode.php:1234 ../../include/bbcode.php:1237 +#: ../../include/bbcode.php:1240 msgid "Image/photo" msgstr "" -#: ../../include/bbcode.php:239 ../../include/bbcode.php:1252 +#: ../../include/bbcode.php:239 ../../include/bbcode.php:1251 msgid "Encrypted content" msgstr "" @@ -13957,7 +14228,7 @@ msgstr "" msgid "View summary" msgstr "" -#: ../../include/bbcode.php:1190 +#: ../../include/bbcode.php:1189 msgid "$1 wrote:" msgstr "" @@ -13986,373 +14257,287 @@ msgstr "" msgid "OpenWebAuth: %1$s welcomes %2$s" msgstr "" -#: ../../include/features.php:56 -msgid "General Features" -msgstr "" - -#: ../../include/features.php:61 -msgid "Display new member quick links menu" -msgstr "" - -#: ../../include/features.php:69 -msgid "Advanced Profiles" +#: ../../include/features.php:86 ../../include/features.php:273 +msgid "Start calendar week on Monday" msgstr "" -#: ../../include/features.php:70 -msgid "Additional profile sections and selections" +#: ../../include/features.php:87 ../../include/features.php:274 +msgid "Default is Sunday" msgstr "" -#: ../../include/features.php:78 -msgid "Profile Import/Export" +#: ../../include/features.php:100 +msgid "Search by Date" msgstr "" -#: ../../include/features.php:79 -msgid "Save and load profile details across sites/channels" +#: ../../include/features.php:101 +msgid "Ability to select posts by date ranges" msgstr "" -#: ../../include/features.php:87 -msgid "Web Pages" +#: ../../include/features.php:108 +msgid "Tag Cloud" msgstr "" -#: ../../include/features.php:88 -msgid "Provide managed web pages on your channel" +#: ../../include/features.php:109 +msgid "Provide a personal tag cloud on your channel page" msgstr "" -#: ../../include/features.php:97 -msgid "Provide a wiki for your channel" +#: ../../include/features.php:116 ../../include/features.php:381 +msgid "Use blog/list mode" msgstr "" -#: ../../include/features.php:114 -msgid "Private Notes" +#: ../../include/features.php:117 ../../include/features.php:382 +msgid "Comments will be displayed separately" msgstr "" -#: ../../include/features.php:115 -msgid "Enables a tool to store notes and reminders (note: not encrypted)" +#: ../../include/features.php:129 +msgid "Connection Filtering" msgstr "" -#: ../../include/features.php:124 -msgid "Create personal planning cards" +#: ../../include/features.php:130 +msgid "Filter incoming posts from connections based on keywords/content" msgstr "" -#: ../../include/features.php:134 -msgid "Create interactive articles" +#: ../../include/features.php:138 +msgid "Conversation" msgstr "" #: ../../include/features.php:142 -msgid "Navigation Channel Select" +msgid "Community Tagging" msgstr "" #: ../../include/features.php:143 -msgid "Change channels directly from within the navigation dropdown menu" -msgstr "" - -#: ../../include/features.php:151 -msgid "Photo Location" +msgid "Ability to tag existing posts" msgstr "" -#: ../../include/features.php:152 -msgid "If location data is available on uploaded photos, link this to a map." +#: ../../include/features.php:150 +msgid "Emoji Reactions" msgstr "" -#: ../../include/features.php:160 -msgid "Access Controlled Chatrooms" +#: ../../include/features.php:151 +msgid "Add emoji reaction ability to posts" msgstr "" -#: ../../include/features.php:161 -msgid "Provide chatrooms and chat services with access control." +#: ../../include/features.php:158 +msgid "Dislike Posts" msgstr "" -#: ../../include/features.php:170 -msgid "Smart Birthdays" +#: ../../include/features.php:159 +msgid "Ability to dislike posts/comments" msgstr "" -#: ../../include/features.php:171 -msgid "" -"Make birthday events timezone aware in case your friends are scattered " -"across the planet." +#: ../../include/features.php:166 +msgid "Star Posts" msgstr "" -#: ../../include/features.php:179 -msgid "Event Timezone Selection" +#: ../../include/features.php:167 +msgid "Ability to mark special posts with a star indicator" msgstr "" #: ../../include/features.php:180 -msgid "Allow event creation in timezones other than your own." -msgstr "" - -#: ../../include/features.php:189 -msgid "Premium Channel" -msgstr "" - -#: ../../include/features.php:190 -msgid "" -"Allows you to set restrictions and terms on those that connect with your " -"channel" -msgstr "" - -#: ../../include/features.php:198 msgid "Advanced Directory Search" msgstr "" -#: ../../include/features.php:199 +#: ../../include/features.php:181 msgid "Allows creation of complex directory search queries" msgstr "" -#: ../../include/features.php:207 -msgid "Advanced Theme and Layout Settings" -msgstr "" - -#: ../../include/features.php:208 -msgid "Allows fine tuning of themes and page layouts" -msgstr "" - -#: ../../include/features.php:217 -msgid "Access Control and Permissions" -msgstr "" - -#: ../../include/features.php:222 -msgid "Enable management and selection of privacy groups" -msgstr "" - -#: ../../include/features.php:230 -msgid "Multiple Profiles" -msgstr "" - -#: ../../include/features.php:231 -msgid "Ability to create multiple profiles" -msgstr "" - -#: ../../include/features.php:241 -msgid "Create custom connection permission limits" -msgstr "" - -#: ../../include/features.php:249 -msgid "OAuth1 Clients" -msgstr "" - -#: ../../include/features.php:250 -msgid "Manage OAuth1 authenticatication tokens for mobile and remote apps." -msgstr "" - -#: ../../include/features.php:258 -msgid "OAuth2 Clients" -msgstr "" - -#: ../../include/features.php:259 -msgid "Manage OAuth2 authenticatication tokens for mobile and remote apps." -msgstr "" - -#: ../../include/features.php:267 -msgid "Access Tokens" +#: ../../include/features.php:190 +msgid "Editor" msgstr "" -#: ../../include/features.php:268 -msgid "Create access tokens so that non-members can access private content." +#: ../../include/features.php:194 +msgid "Post Categories" msgstr "" -#: ../../include/features.php:279 -msgid "Post Composition Features" +#: ../../include/features.php:195 +msgid "Add categories to your posts" msgstr "" -#: ../../include/features.php:283 +#: ../../include/features.php:203 msgid "Large Photos" msgstr "" -#: ../../include/features.php:284 +#: ../../include/features.php:204 msgid "" "Include large (1024px) photo thumbnails in posts. If not enabled, use small " "(640px) photo thumbnails" msgstr "" -#: ../../include/features.php:293 -msgid "Automatically import channel content from other channels or feeds" -msgstr "" - -#: ../../include/features.php:301 +#: ../../include/features.php:211 msgid "Even More Encryption" msgstr "" -#: ../../include/features.php:302 +#: ../../include/features.php:212 msgid "" "Allow optional encryption of content end-to-end with a shared secret key" msgstr "" -#: ../../include/features.php:310 +#: ../../include/features.php:219 msgid "Enable Voting Tools" msgstr "" -#: ../../include/features.php:311 +#: ../../include/features.php:220 msgid "Provide a class of post which others can vote on" msgstr "" -#: ../../include/features.php:319 +#: ../../include/features.php:227 msgid "Disable Comments" msgstr "" -#: ../../include/features.php:320 +#: ../../include/features.php:228 msgid "Provide the option to disable comments for a post" msgstr "" -#: ../../include/features.php:328 +#: ../../include/features.php:235 msgid "Delayed Posting" msgstr "" -#: ../../include/features.php:329 +#: ../../include/features.php:236 msgid "Allow posts to be published at a later date" msgstr "" -#: ../../include/features.php:337 +#: ../../include/features.php:243 msgid "Content Expiration" msgstr "" -#: ../../include/features.php:338 +#: ../../include/features.php:244 msgid "Remove posts/comments and/or private messages at a future time" msgstr "" -#: ../../include/features.php:346 +#: ../../include/features.php:251 msgid "Suppress Duplicate Posts/Comments" msgstr "" -#: ../../include/features.php:347 +#: ../../include/features.php:252 msgid "" "Prevent posts with identical content to be published with less than two " "minutes in between submissions." msgstr "" -#: ../../include/features.php:355 +#: ../../include/features.php:259 msgid "Auto-save drafts of posts and comments" msgstr "" -#: ../../include/features.php:356 +#: ../../include/features.php:260 msgid "" "Automatically saves post and comment drafts in local browser storage to help " "prevent accidental loss of compositions" msgstr "" -#: ../../include/features.php:367 -msgid "Network and Stream Filtering" +#: ../../include/features.php:281 +msgid "Smart Birthdays" msgstr "" -#: ../../include/features.php:371 -msgid "Search by Date" +#: ../../include/features.php:282 +msgid "" +"Make birthday events timezone aware in case your friends are scattered " +"across the planet." msgstr "" -#: ../../include/features.php:372 -msgid "Ability to select posts by date ranges" +#: ../../include/features.php:289 +msgid "Event Timezone Selection" +msgstr "" + +#: ../../include/features.php:290 +msgid "Allow event creation in timezones other than your own." +msgstr "" + +#: ../../include/features.php:299 +msgid "Manage" +msgstr "" + +#: ../../include/features.php:303 +msgid "Navigation Channel Select" msgstr "" -#: ../../include/features.php:382 +#: ../../include/features.php:304 +msgid "Change channels directly from within the navigation dropdown menu" +msgstr "" + +#: ../../include/features.php:318 msgid "Save search terms for re-use" msgstr "" -#: ../../include/features.php:390 +#: ../../include/features.php:326 +msgid "Ability to file posts under folders" +msgstr "" + +#: ../../include/features.php:333 msgid "Alternate Stream Order" msgstr "" -#: ../../include/features.php:391 +#: ../../include/features.php:334 msgid "" "Ability to order the stream by last post date, last comment date or " "unthreaded activities" msgstr "" -#: ../../include/features.php:399 +#: ../../include/features.php:341 msgid "Contact Filter" msgstr "" -#: ../../include/features.php:400 +#: ../../include/features.php:342 msgid "Ability to display only posts of a selected contact" msgstr "" -#: ../../include/features.php:408 +#: ../../include/features.php:349 msgid "Forum Filter" msgstr "" -#: ../../include/features.php:409 +#: ../../include/features.php:350 msgid "Ability to display only posts of a specific forum" msgstr "" -#: ../../include/features.php:417 +#: ../../include/features.php:357 msgid "Personal Posts Filter" msgstr "" -#: ../../include/features.php:418 +#: ../../include/features.php:358 msgid "Ability to display only posts that you've interacted on" msgstr "" -#: ../../include/features.php:426 +#: ../../include/features.php:365 msgid "Affinity Tool" msgstr "" -#: ../../include/features.php:427 +#: ../../include/features.php:366 msgid "Filter stream activity by depth of relationships" msgstr "" -#: ../../include/features.php:436 +#: ../../include/features.php:374 msgid "Show friend and connection suggestions" msgstr "" -#: ../../include/features.php:444 -msgid "Connection Filtering" -msgstr "" - -#: ../../include/features.php:445 -msgid "Filter incoming posts from connections based on keywords/content" -msgstr "" - -#: ../../include/features.php:457 -msgid "Post/Comment Tools" -msgstr "" - -#: ../../include/features.php:461 -msgid "Community Tagging" -msgstr "" - -#: ../../include/features.php:462 -msgid "Ability to tag existing posts" -msgstr "" - -#: ../../include/features.php:470 -msgid "Post Categories" -msgstr "" - -#: ../../include/features.php:471 -msgid "Add categories to your posts" -msgstr "" - -#: ../../include/features.php:479 -msgid "Emoji Reactions" -msgstr "" - -#: ../../include/features.php:480 -msgid "Add emoji reaction ability to posts" +#: ../../include/features.php:395 +msgid "Photo Location" msgstr "" -#: ../../include/features.php:489 -msgid "Ability to file posts under folders" +#: ../../include/features.php:396 +msgid "If location data is available on uploaded photos, link this to a map." msgstr "" -#: ../../include/features.php:497 -msgid "Dislike Posts" +#: ../../include/features.php:409 +msgid "Advanced Profiles" msgstr "" -#: ../../include/features.php:498 -msgid "Ability to dislike posts/comments" +#: ../../include/features.php:410 +msgid "Additional profile sections and selections" msgstr "" -#: ../../include/features.php:506 -msgid "Star Posts" +#: ../../include/features.php:417 +msgid "Profile Import/Export" msgstr "" -#: ../../include/features.php:507 -msgid "Ability to mark special posts with a star indicator" +#: ../../include/features.php:418 +msgid "Save and load profile details across sites/channels" msgstr "" -#: ../../include/features.php:515 -msgid "Tag Cloud" +#: ../../include/features.php:425 +msgid "Multiple Profiles" msgstr "" -#: ../../include/features.php:516 -msgid "Provide a personal tag cloud on your channel page" +#: ../../include/features.php:426 +msgid "Ability to create multiple profiles" msgstr "" #: ../../include/taxonomy.php:320 @@ -14536,155 +14721,155 @@ msgstr "" msgid "Happy Birthday %1$s" msgstr "" -#: ../../include/nav.php:88 +#: ../../include/nav.php:86 msgid "Remote authentication" msgstr "" -#: ../../include/nav.php:88 +#: ../../include/nav.php:86 msgid "Click to authenticate to your home hub" msgstr "" -#: ../../include/nav.php:94 +#: ../../include/nav.php:92 msgid "Manage your channels" msgstr "" -#: ../../include/nav.php:97 +#: ../../include/nav.php:95 msgid "Manage your privacy groups" msgstr "" -#: ../../include/nav.php:99 +#: ../../include/nav.php:97 msgid "Account/Channel Settings" msgstr "" -#: ../../include/nav.php:105 ../../include/nav.php:134 +#: ../../include/nav.php:103 ../../include/nav.php:132 msgid "End this session" msgstr "" -#: ../../include/nav.php:108 +#: ../../include/nav.php:106 msgid "Your profile page" msgstr "" -#: ../../include/nav.php:111 +#: ../../include/nav.php:109 msgid "Manage/Edit profiles" msgstr "" -#: ../../include/nav.php:120 ../../include/nav.php:124 +#: ../../include/nav.php:118 ../../include/nav.php:122 msgid "Sign in" msgstr "" -#: ../../include/nav.php:151 +#: ../../include/nav.php:149 msgid "Take me home" msgstr "" -#: ../../include/nav.php:153 +#: ../../include/nav.php:151 msgid "Log me out of this site" msgstr "" -#: ../../include/nav.php:158 +#: ../../include/nav.php:156 msgid "Create an account" msgstr "" -#: ../../include/nav.php:170 +#: ../../include/nav.php:168 msgid "Help and documentation" msgstr "" -#: ../../include/nav.php:185 +#: ../../include/nav.php:183 msgid "Search site @name, !forum, #tag, ?docs, content" msgstr "" -#: ../../include/nav.php:191 +#: ../../include/nav.php:189 msgid "Site Setup and Configuration" msgstr "" -#: ../../include/nav.php:282 +#: ../../include/nav.php:294 msgid "@name, !forum, #tag, ?doc, content" msgstr "" -#: ../../include/nav.php:283 +#: ../../include/nav.php:295 msgid "Please wait..." msgstr "" -#: ../../include/nav.php:289 +#: ../../include/nav.php:301 msgid "Add Apps" msgstr "" -#: ../../include/nav.php:290 +#: ../../include/nav.php:302 msgid "Arrange Apps" msgstr "" -#: ../../include/nav.php:291 +#: ../../include/nav.php:303 msgid "Toggle System Apps" msgstr "" -#: ../../include/photos.php:151 -#, php-format -msgid "Image exceeds website size limit of %lu bytes" +#: ../../include/nav.php:389 +msgid "Status Messages and Posts" msgstr "" -#: ../../include/photos.php:162 -msgid "Image file is empty." +#: ../../include/nav.php:402 +msgid "Profile Details" msgstr "" -#: ../../include/photos.php:327 -msgid "Photo storage failed." +#: ../../include/nav.php:412 ../../include/photos.php:667 +msgid "Photo Albums" msgstr "" -#: ../../include/photos.php:376 -msgid "a new photo" +#: ../../include/nav.php:420 +msgid "Files and Storage" msgstr "" -#: ../../include/photos.php:380 -#, php-format -msgctxt "photo_upload" -msgid "%1$s posted %2$s to %3$s" +#: ../../include/nav.php:455 +msgid "Bookmarks" msgstr "" -#: ../../include/photos.php:672 -msgid "Upload New Photos" +#: ../../include/nav.php:458 +msgid "Saved Bookmarks" msgstr "" -#: ../../include/zot.php:772 -msgid "Invalid data packet" +#: ../../include/nav.php:469 +msgid "View Cards" msgstr "" -#: ../../include/zot.php:799 -msgid "Unable to verify channel signature" +#: ../../include/nav.php:480 +msgid "View Articles" +msgstr "" + +#: ../../include/nav.php:492 +msgid "View Webpages" msgstr "" -#: ../../include/zot.php:2557 +#: ../../include/photos.php:151 #, php-format -msgid "Unable to verify site signature for %s" +msgid "Image exceeds website size limit of %lu bytes" msgstr "" -#: ../../include/zot.php:4221 -msgid "invalid target signature" +#: ../../include/photos.php:162 +msgid "Image file is empty." msgstr "" -#: ../../include/group.php:22 -msgid "" -"A deleted group with this name was revived. Existing item permissions " -"<strong>may</strong> apply to this group and any future members. If this is " -"not what you intended, please create another group with a different name." +#: ../../include/photos.php:327 +msgid "Photo storage failed." msgstr "" -#: ../../include/group.php:264 -msgid "Add new connections to this privacy group" +#: ../../include/photos.php:376 +msgid "a new photo" msgstr "" -#: ../../include/group.php:298 -msgid "edit" +#: ../../include/photos.php:380 +#, php-format +msgctxt "photo_upload" +msgid "%1$s posted %2$s to %3$s" msgstr "" -#: ../../include/group.php:321 -msgid "Edit group" +#: ../../include/photos.php:672 +msgid "Upload New Photos" msgstr "" -#: ../../include/group.php:322 -msgid "Add privacy group" +#: ../../include/zot.php:773 +msgid "Invalid data packet" msgstr "" -#: ../../include/group.php:323 -msgid "Channels not in any privacy group" +#: ../../include/zot.php:4235 +msgid "invalid target signature" msgstr "" #: ../../include/connections.php:133 @@ -14711,10 +14896,10 @@ msgstr "" msgid "Failed authentication" msgstr "" -#: ../../include/help.php:34 +#: ../../include/help.php:80 msgid "Help:" msgstr "" -#: ../../include/help.php:78 +#: ../../include/help.php:129 msgid "Not Found" msgstr "" diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 84f231a59..505682cda 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -984,6 +984,8 @@ return array( 'Zotlabs\\Module\\Notifications' => $baseDir . '/Zotlabs/Module/Notifications.php', 'Zotlabs\\Module\\Notify' => $baseDir . '/Zotlabs/Module/Notify.php', 'Zotlabs\\Module\\OAuth2TestVehicle' => $baseDir . '/Zotlabs/Module/Oauth2testvehicle.php', + 'Zotlabs\\Module\\Oauth' => $baseDir . '/Zotlabs/Module/Oauth.php', + 'Zotlabs\\Module\\Oauth2' => $baseDir . '/Zotlabs/Module/Oauth2.php', 'Zotlabs\\Module\\Oauthinfo' => $baseDir . '/Zotlabs/Module/Oauthinfo.php', 'Zotlabs\\Module\\Ochannel' => $baseDir . '/Zotlabs/Module/Ochannel.php', 'Zotlabs\\Module\\Oembed' => $baseDir . '/Zotlabs/Module/Oembed.php', @@ -996,6 +998,7 @@ return array( 'Zotlabs\\Module\\Pconfig' => $baseDir . '/Zotlabs/Module/Pconfig.php', 'Zotlabs\\Module\\Pdledit' => $baseDir . '/Zotlabs/Module/Pdledit.php', 'Zotlabs\\Module\\Permcat' => $baseDir . '/Zotlabs/Module/Permcat.php', + 'Zotlabs\\Module\\Permcats' => $baseDir . '/Zotlabs/Module/Permcats.php', 'Zotlabs\\Module\\Photo' => $baseDir . '/Zotlabs/Module/Photo.php', 'Zotlabs\\Module\\Photos' => $baseDir . '/Zotlabs/Module/Photos.php', 'Zotlabs\\Module\\Ping' => $baseDir . '/Zotlabs/Module/Ping.php', @@ -1030,14 +1033,21 @@ return array( 'Zotlabs\\Module\\Service_limits' => $baseDir . '/Zotlabs/Module/Service_limits.php', 'Zotlabs\\Module\\Settings' => $baseDir . '/Zotlabs/Module/Settings.php', 'Zotlabs\\Module\\Settings\\Account' => $baseDir . '/Zotlabs/Module/Settings/Account.php', + 'Zotlabs\\Module\\Settings\\Calendar' => $baseDir . '/Zotlabs/Module/Settings/Calendar.php', 'Zotlabs\\Module\\Settings\\Channel' => $baseDir . '/Zotlabs/Module/Settings/Channel.php', + 'Zotlabs\\Module\\Settings\\Channel_home' => $baseDir . '/Zotlabs/Module/Settings/Channel_home.php', + 'Zotlabs\\Module\\Settings\\Connections' => $baseDir . '/Zotlabs/Module/Settings/Connections.php', + 'Zotlabs\\Module\\Settings\\Conversation' => $baseDir . '/Zotlabs/Module/Settings/Conversation.php', + 'Zotlabs\\Module\\Settings\\Directory' => $baseDir . '/Zotlabs/Module/Settings/Directory.php', 'Zotlabs\\Module\\Settings\\Display' => $baseDir . '/Zotlabs/Module/Settings/Display.php', + 'Zotlabs\\Module\\Settings\\Editor' => $baseDir . '/Zotlabs/Module/Settings/Editor.php', + 'Zotlabs\\Module\\Settings\\Events' => $baseDir . '/Zotlabs/Module/Settings/Events.php', 'Zotlabs\\Module\\Settings\\Featured' => $baseDir . '/Zotlabs/Module/Settings/Featured.php', 'Zotlabs\\Module\\Settings\\Features' => $baseDir . '/Zotlabs/Module/Settings/Features.php', - 'Zotlabs\\Module\\Settings\\Oauth' => $baseDir . '/Zotlabs/Module/Settings/Oauth.php', - 'Zotlabs\\Module\\Settings\\Oauth2' => $baseDir . '/Zotlabs/Module/Settings/Oauth2.php', - 'Zotlabs\\Module\\Settings\\Permcats' => $baseDir . '/Zotlabs/Module/Settings/Permcats.php', - 'Zotlabs\\Module\\Settings\\Tokens' => $baseDir . '/Zotlabs/Module/Settings/Tokens.php', + 'Zotlabs\\Module\\Settings\\Manage' => $baseDir . '/Zotlabs/Module/Settings/Manage.php', + 'Zotlabs\\Module\\Settings\\Network' => $baseDir . '/Zotlabs/Module/Settings/Network.php', + 'Zotlabs\\Module\\Settings\\Photos' => $baseDir . '/Zotlabs/Module/Settings/Photos.php', + 'Zotlabs\\Module\\Settings\\Profiles' => $baseDir . '/Zotlabs/Module/Settings/Profiles.php', 'Zotlabs\\Module\\Setup' => $baseDir . '/Zotlabs/Module/Setup.php', 'Zotlabs\\Module\\Share' => $baseDir . '/Zotlabs/Module/Share.php', 'Zotlabs\\Module\\Sharedwithme' => $baseDir . '/Zotlabs/Module/Sharedwithme.php', @@ -1058,6 +1068,7 @@ return array( 'Zotlabs\\Module\\Toggle_mobile' => $baseDir . '/Zotlabs/Module/Toggle_mobile.php', 'Zotlabs\\Module\\Toggle_safesearch' => $baseDir . '/Zotlabs/Module/Toggle_safesearch.php', 'Zotlabs\\Module\\Token' => $baseDir . '/Zotlabs/Module/Token.php', + 'Zotlabs\\Module\\Tokens' => $baseDir . '/Zotlabs/Module/Tokens.php', 'Zotlabs\\Module\\Uexport' => $baseDir . '/Zotlabs/Module/Uexport.php', 'Zotlabs\\Module\\Update' => $baseDir . '/Zotlabs/Module/Update.php', 'Zotlabs\\Module\\Userinfo' => $baseDir . '/Zotlabs/Module/Userinfo.php', @@ -1319,6 +1330,8 @@ return array( 'Zotlabs\\Update\\_1217' => $baseDir . '/Zotlabs/Update/_1217.php', 'Zotlabs\\Update\\_1218' => $baseDir . '/Zotlabs/Update/_1218.php', 'Zotlabs\\Update\\_1219' => $baseDir . '/Zotlabs/Update/_1219.php', + 'Zotlabs\\Update\\_1220' => $baseDir . '/Zotlabs/Update/_1220.php', + 'Zotlabs\\Update\\_1221' => $baseDir . '/Zotlabs/Update/_1221.php', 'Zotlabs\\Web\\CheckJS' => $baseDir . '/Zotlabs/Web/CheckJS.php', 'Zotlabs\\Web\\Controller' => $baseDir . '/Zotlabs/Web/Controller.php', 'Zotlabs\\Web\\HTTPHeaders' => $baseDir . '/Zotlabs/Web/HTTPHeaders.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 5b0a19f51..ed924db15 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -1152,6 +1152,8 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Module\\Notifications' => __DIR__ . '/../..' . '/Zotlabs/Module/Notifications.php', 'Zotlabs\\Module\\Notify' => __DIR__ . '/../..' . '/Zotlabs/Module/Notify.php', 'Zotlabs\\Module\\OAuth2TestVehicle' => __DIR__ . '/../..' . '/Zotlabs/Module/Oauth2testvehicle.php', + 'Zotlabs\\Module\\Oauth' => __DIR__ . '/../..' . '/Zotlabs/Module/Oauth.php', + 'Zotlabs\\Module\\Oauth2' => __DIR__ . '/../..' . '/Zotlabs/Module/Oauth2.php', 'Zotlabs\\Module\\Oauthinfo' => __DIR__ . '/../..' . '/Zotlabs/Module/Oauthinfo.php', 'Zotlabs\\Module\\Ochannel' => __DIR__ . '/../..' . '/Zotlabs/Module/Ochannel.php', 'Zotlabs\\Module\\Oembed' => __DIR__ . '/../..' . '/Zotlabs/Module/Oembed.php', @@ -1164,6 +1166,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Module\\Pconfig' => __DIR__ . '/../..' . '/Zotlabs/Module/Pconfig.php', 'Zotlabs\\Module\\Pdledit' => __DIR__ . '/../..' . '/Zotlabs/Module/Pdledit.php', 'Zotlabs\\Module\\Permcat' => __DIR__ . '/../..' . '/Zotlabs/Module/Permcat.php', + 'Zotlabs\\Module\\Permcats' => __DIR__ . '/../..' . '/Zotlabs/Module/Permcats.php', 'Zotlabs\\Module\\Photo' => __DIR__ . '/../..' . '/Zotlabs/Module/Photo.php', 'Zotlabs\\Module\\Photos' => __DIR__ . '/../..' . '/Zotlabs/Module/Photos.php', 'Zotlabs\\Module\\Ping' => __DIR__ . '/../..' . '/Zotlabs/Module/Ping.php', @@ -1198,14 +1201,21 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Module\\Service_limits' => __DIR__ . '/../..' . '/Zotlabs/Module/Service_limits.php', 'Zotlabs\\Module\\Settings' => __DIR__ . '/../..' . '/Zotlabs/Module/Settings.php', 'Zotlabs\\Module\\Settings\\Account' => __DIR__ . '/../..' . '/Zotlabs/Module/Settings/Account.php', + 'Zotlabs\\Module\\Settings\\Calendar' => __DIR__ . '/../..' . '/Zotlabs/Module/Settings/Calendar.php', 'Zotlabs\\Module\\Settings\\Channel' => __DIR__ . '/../..' . '/Zotlabs/Module/Settings/Channel.php', + 'Zotlabs\\Module\\Settings\\Channel_home' => __DIR__ . '/../..' . '/Zotlabs/Module/Settings/Channel_home.php', + 'Zotlabs\\Module\\Settings\\Connections' => __DIR__ . '/../..' . '/Zotlabs/Module/Settings/Connections.php', + 'Zotlabs\\Module\\Settings\\Conversation' => __DIR__ . '/../..' . '/Zotlabs/Module/Settings/Conversation.php', + 'Zotlabs\\Module\\Settings\\Directory' => __DIR__ . '/../..' . '/Zotlabs/Module/Settings/Directory.php', 'Zotlabs\\Module\\Settings\\Display' => __DIR__ . '/../..' . '/Zotlabs/Module/Settings/Display.php', + 'Zotlabs\\Module\\Settings\\Editor' => __DIR__ . '/../..' . '/Zotlabs/Module/Settings/Editor.php', + 'Zotlabs\\Module\\Settings\\Events' => __DIR__ . '/../..' . '/Zotlabs/Module/Settings/Events.php', 'Zotlabs\\Module\\Settings\\Featured' => __DIR__ . '/../..' . '/Zotlabs/Module/Settings/Featured.php', 'Zotlabs\\Module\\Settings\\Features' => __DIR__ . '/../..' . '/Zotlabs/Module/Settings/Features.php', - 'Zotlabs\\Module\\Settings\\Oauth' => __DIR__ . '/../..' . '/Zotlabs/Module/Settings/Oauth.php', - 'Zotlabs\\Module\\Settings\\Oauth2' => __DIR__ . '/../..' . '/Zotlabs/Module/Settings/Oauth2.php', - 'Zotlabs\\Module\\Settings\\Permcats' => __DIR__ . '/../..' . '/Zotlabs/Module/Settings/Permcats.php', - 'Zotlabs\\Module\\Settings\\Tokens' => __DIR__ . '/../..' . '/Zotlabs/Module/Settings/Tokens.php', + 'Zotlabs\\Module\\Settings\\Manage' => __DIR__ . '/../..' . '/Zotlabs/Module/Settings/Manage.php', + 'Zotlabs\\Module\\Settings\\Network' => __DIR__ . '/../..' . '/Zotlabs/Module/Settings/Network.php', + 'Zotlabs\\Module\\Settings\\Photos' => __DIR__ . '/../..' . '/Zotlabs/Module/Settings/Photos.php', + 'Zotlabs\\Module\\Settings\\Profiles' => __DIR__ . '/../..' . '/Zotlabs/Module/Settings/Profiles.php', 'Zotlabs\\Module\\Setup' => __DIR__ . '/../..' . '/Zotlabs/Module/Setup.php', 'Zotlabs\\Module\\Share' => __DIR__ . '/../..' . '/Zotlabs/Module/Share.php', 'Zotlabs\\Module\\Sharedwithme' => __DIR__ . '/../..' . '/Zotlabs/Module/Sharedwithme.php', @@ -1226,6 +1236,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Module\\Toggle_mobile' => __DIR__ . '/../..' . '/Zotlabs/Module/Toggle_mobile.php', 'Zotlabs\\Module\\Toggle_safesearch' => __DIR__ . '/../..' . '/Zotlabs/Module/Toggle_safesearch.php', 'Zotlabs\\Module\\Token' => __DIR__ . '/../..' . '/Zotlabs/Module/Token.php', + 'Zotlabs\\Module\\Tokens' => __DIR__ . '/../..' . '/Zotlabs/Module/Tokens.php', 'Zotlabs\\Module\\Uexport' => __DIR__ . '/../..' . '/Zotlabs/Module/Uexport.php', 'Zotlabs\\Module\\Update' => __DIR__ . '/../..' . '/Zotlabs/Module/Update.php', 'Zotlabs\\Module\\Userinfo' => __DIR__ . '/../..' . '/Zotlabs/Module/Userinfo.php', @@ -1487,6 +1498,8 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Update\\_1217' => __DIR__ . '/../..' . '/Zotlabs/Update/_1217.php', 'Zotlabs\\Update\\_1218' => __DIR__ . '/../..' . '/Zotlabs/Update/_1218.php', 'Zotlabs\\Update\\_1219' => __DIR__ . '/../..' . '/Zotlabs/Update/_1219.php', + 'Zotlabs\\Update\\_1220' => __DIR__ . '/../..' . '/Zotlabs/Update/_1220.php', + 'Zotlabs\\Update\\_1221' => __DIR__ . '/../..' . '/Zotlabs/Update/_1221.php', 'Zotlabs\\Web\\CheckJS' => __DIR__ . '/../..' . '/Zotlabs/Web/CheckJS.php', 'Zotlabs\\Web\\Controller' => __DIR__ . '/../..' . '/Zotlabs/Web/Controller.php', 'Zotlabs\\Web\\HTTPHeaders' => __DIR__ . '/../..' . '/Zotlabs/Web/HTTPHeaders.php', diff --git a/view/css/mod_settings.css b/view/css/mod_settings.css index 4236b3dff..d8786eed2 100644 --- a/view/css/mod_settings.css +++ b/view/css/mod_settings.css @@ -9,20 +9,3 @@ .channel-menu { margin-top: 24px; } - -.zat-example { - color: red; -} - -#atoken-index { - width: 100%; -} - -#atoken-index td:nth-child(1){ - padding: 7px 3px 7px 10px; - white-space: nowrap; -} - -.atoken-index-tool { - padding: 7px 10px; -} diff --git a/view/css/mod_tokens.css b/view/css/mod_tokens.css new file mode 100644 index 000000000..ac3bd90d7 --- /dev/null +++ b/view/css/mod_tokens.css @@ -0,0 +1,16 @@ +.zat-example { + color: red; +} + +#atoken-index { + width: 100%; +} + +#atoken-index td:nth-child(1){ + padding: 7px 3px 7px 10px; + white-space: nowrap; +} + +.atoken-index-tool { + padding: 7px 10px; +} diff --git a/view/js/main.js b/view/js/main.js index 17f94dd16..48277f5cc 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -41,6 +41,8 @@ $.ajaxSetup({cache: false}); $(document).ready(function() { $(document).on('click focus', '.comment-edit-form', handle_comment_form); + $(document).on('click', '.conversation-settings-link', getConversationSettings); + $(document).on('click', '#settings_module_ajax_submit', postConversationSettings); jQuery.timeago.settings.strings = { prefixAgo : aStr['t01'], @@ -122,6 +124,33 @@ $(document).ready(function() { }); +function getConversationSettings() { + $.get('settings/conversation/?f=&aj=1',function(data) { + $('#conversation_settings_body').html(data); + }); + + + +} + +function postConversationSettings() { + $.post( + 'settings/conversation', + $('#settings_module_ajax_form').serialize() + "&auto_update=" + next_page + ); + + if(next_page === 1) { + page_load = true; + } + + $('#conversation_settings').modal('hide'); + + if(timer) clearTimeout(timer); + timer = setTimeout(updateInit,100); + + return false; +} + function datasrc2src(selector) { $(selector).each(function(i, el) { $(el).attr("src", $(el).data("src")); diff --git a/view/pdl/mod_uexport.pdl b/view/pdl/mod_uexport.pdl index 37c85c765..ed1f77c5a 100644 --- a/view/pdl/mod_uexport.pdl +++ b/view/pdl/mod_uexport.pdl @@ -1,5 +1,4 @@ [region=aside] -[widget=settings_menu][/widget] [/region] [region=right_aside] [widget=notifications][/widget] diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index a9ea29ba1..4f0658477 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1677,11 +1677,9 @@ dl.bb-dl > dd > li { .form-group.checkbox > div > input:disabled + label .onoffswitch-switch { - background-color: red; - border-radius: 3px; + background-color: red; opacity: 0.3; filter:alpha(opacity=30); - } diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index f98182739..0a779529d 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -54,6 +54,7 @@ class RedbasicConfig { $arr['converse_width']=get_pconfig(local_channel(),"redbasic","converse_width"); $arr['top_photo']=get_pconfig(local_channel(),"redbasic","top_photo"); $arr['reply_photo']=get_pconfig(local_channel(),"redbasic","reply_photo"); + $arr['advanced_theming'] = get_pconfig(local_channel(), 'redbasic', 'advanced_theming'); return $this->form($arr); } @@ -80,15 +81,15 @@ class RedbasicConfig { set_pconfig(local_channel(), 'redbasic', 'converse_width', $_POST['redbasic_converse_width']); set_pconfig(local_channel(), 'redbasic', 'top_photo', $_POST['redbasic_top_photo']); set_pconfig(local_channel(), 'redbasic', 'reply_photo', $_POST['redbasic_reply_photo']); + set_pconfig(local_channel(), 'redbasic', 'advanced_theming', $_POST['redbasic_advanced_theming']); } } function form($arr) { - if(feature_enabled(local_channel(),'advanced_theming')) + if(get_pconfig(local_channel(), 'redbasic', 'advanced_theming')) $expert = 1; - $o .= replace_macros(get_markup_template('theme_settings.tpl'), array( '$submit' => t('Submit'), '$baseurl' => z_root(), @@ -112,6 +113,7 @@ class RedbasicConfig { '$converse_width' => array('redbasic_converse_width',t('Set maximum width of content region in pixel'),$arr['converse_width'], t('Leave empty for default width')), '$top_photo' => array('redbasic_top_photo', t('Set size of conversation author photo'), $arr['top_photo']), '$reply_photo' => array('redbasic_reply_photo', t('Set size of followup author photos'), $arr['reply_photo']), + '$advanced_theming' => ['redbasic_advanced_theming', t('Show advanced settings'), $arr['advanced_theming'], '', [t('No'), t('Yes')]] )); return $o; diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index 7c552b49e..cc403f0a7 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -1,6 +1,7 @@ {{include file="field_checkbox.tpl" field=$narrow_navbar}} {{include file="field_input.tpl" field=$converse_width}} {{include file="field_input.tpl" field=$font_size}} +{{include file="field_checkbox.tpl" field=$advanced_theming}} {{if $expert}} {{include file="field_colorinput.tpl" field=$nav_bg}} {{include file="field_colorinput.tpl" field=$nav_icon_colour}} diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index d72258fa0..6ff7bffcd 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -485,7 +485,7 @@ </div> {{if $permcat_enable}} - <a href="settings/permcats" class="pull-right"><i class="fa fa-plus"></i> {{$permcat_new}}</a> + <a href="permcats" class="pull-right"><i class="fa fa-plus"></i> {{$permcat_new}}</a> {{include file="field_select.tpl" field=$permcat}} {{/if}} diff --git a/view/tpl/admin_account_edit.tpl b/view/tpl/admin_account_edit.tpl index 3329c0025..1cbb9af0b 100644 --- a/view/tpl/admin_account_edit.tpl +++ b/view/tpl/admin_account_edit.tpl @@ -8,7 +8,6 @@ {{include file="field_password.tpl" field=$pass1}} {{include file="field_password.tpl" field=$pass2}} -{{include file="field_select.tpl" field=$account_level}} {{include file="field_select.tpl" field=$account_language}} {{include file="field_input.tpl" field=$service_class}} diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index c3f8177c2..c644bc973 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -42,9 +42,6 @@ {{include file="field_input.tpl" field=$sitename}} - {{include file="field_select.tpl" field=$techlevel}} - {{include file="field_checkbox.tpl" field=$techlock}} - {{include file="field_textarea.tpl" field=$banner}} {{include file="field_textarea.tpl" field=$siteinfo}} {{include file="field_textarea.tpl" field=$admininfo}} diff --git a/view/tpl/channels.tpl b/view/tpl/channels.tpl index f484b49e5..695b3b30f 100755 --- a/view/tpl/channels.tpl +++ b/view/tpl/channels.tpl @@ -9,9 +9,11 @@ {{$channel_usage_message}} </div> {{/if}} + {{if $desc}} <div id="channels-desc" class="section-content-info-wrapper"> {{$desc}} </div> + {{/if}} {{foreach $all_channels as $chn}} {{include file="channel.tpl" channel=$chn}} {{/foreach}} diff --git a/view/tpl/conv_frame.tpl b/view/tpl/conv_frame.tpl index 8aa865076..c6b3b0d9b 100755 --- a/view/tpl/conv_frame.tpl +++ b/view/tpl/conv_frame.tpl @@ -4,5 +4,16 @@ <div id="page-spinner" class="spinner-wrapper"> <div class="spinner m"></div> </div> - - +<div class="modal" id="conversation_settings" tabindex="-1" role="dialog" aria-labelledby="conversation_settings_label" aria-hidden="true"> + <div class="modal-dialog"> + <div class="modal-content"> + <div class="modal-header"> + <h3 class="modal-title" id="conversation_settings_label">{{$conversation_tools}}</h3> + <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> + </div> + <div class="modal-body" id="conversation_settings_body"> + {{$wait}} + </div> + </div><!-- /.modal-content --> + </div><!-- /.modal-dialog --> +</div><!-- /.modal --> diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 05c3d7ae0..5720a2a5f 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -183,6 +183,10 @@ <div class="dropdown-divider"></div> <a class="dropdown-item" href="dreport/{{$item.mid}}">{{$item.dreport}}</a> {{/if}} + {{if $item.settings}} + <div class="dropdown-divider"></div> + <a class="dropdown-item conversation-settings-link" href="" data-toggle="modal" data-target="#conversation_settings">{{$item.settings}}</a> + {{/if}} </div> </div> </div> @@ -210,7 +214,7 @@ <div class="modal-dialog"> <div class="modal-content"> <div class="modal-header"> - <h4 class="modal-title">{{$response.count}} {{$response.button}}</h4> + <h3 class="modal-title">{{$response.count}} {{$response.button}}</h3> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> </div> <div class="modal-body response-list"> diff --git a/view/tpl/defperms.tpl b/view/tpl/defperms.tpl index 5273ee91b..29f642cff 100755 --- a/view/tpl/defperms.tpl +++ b/view/tpl/defperms.tpl @@ -17,7 +17,7 @@ <p>{{$permnote_self}}</p> </div> {{if $permcat_enable}} - <a href="settings/permcats" class="pull-right"><i class="fa fa-plus"></i> {{$permcat_new}}</a> + <a href="permcats" class="pull-right"><i class="fa fa-plus"></i> {{$permcat_new}}</a> {{include file="field_select.tpl" field=$permcat}} {{/if}} diff --git a/view/tpl/generic_addon_settings.tpl b/view/tpl/generic_addon_settings.tpl index 875c97feb..ae603056b 100644 --- a/view/tpl/generic_addon_settings.tpl +++ b/view/tpl/generic_addon_settings.tpl @@ -1,4 +1,4 @@ -<div class="panel"> +<div class="panel" id="settings"> <div class="section-subtitle-wrapper" role="tab" id="{{$addon.0}}-settings"> <h3> <a title="{{$addon.2}}" data-toggle="collapse" data-target="#{{$addon.0}}-settings-content" href="#" aria-controls="{{$addon.0}}-settings-content"> diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 2137baf9b..4eae33d13 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -43,7 +43,9 @@ {{/if}} <div id="jot-text-wrap"> <div id="profile-jot-tools" class="btn-group d-none"> + {{if $is_owner}} <a id="profile-jot-settings" class="btn btn-outline-secondary btn-sm border-0" href="/settings/editor/?f=&rpath=/{{$return_path}}"><i class="fa fa-cog"></i></a> + {{/if}} {{if $reset}} <button id="profile-jot-reset" class="btn btn-outline-secondary btn-sm border-0" title="{{$reset}}" onclick="itemCancel(); return false;"> <i class="fa fa-close"></i> @@ -212,7 +214,7 @@ <div class="modal-dialog"> <div class="modal-content"> <div class="modal-header"> - <h4 class="modal-title" id="expiryModalLabel">{{$jotnets_label}}</h4> + <h3 class="modal-title" id="expiryModalLabel">{{$jotnets_label}}</h3> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> </div> <div class="modal-body"> @@ -239,7 +241,7 @@ <div class="modal-dialog"> <div class="modal-content"> <div class="modal-header"> - <h4 class="modal-title" id="expiryModalLabel">{{$expires}}</h4> + <h3 class="modal-title" id="expiryModalLabel">{{$expires}}</h3> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> </div> <div class="modal-body form-group" style="width:90%"> @@ -266,7 +268,7 @@ <div class="modal-dialog"> <div class="modal-content"> <div class="modal-header"> - <h4 class="modal-title" id="createdModalLabel">{{$future_txt}}</h4> + <h3 class="modal-title" id="createdModalLabel">{{$future_txt}}</h3> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> </div> <div class="modal-body form-group" style="width:90%"> @@ -293,7 +295,7 @@ <div class="modal-dialog"> <div class="modal-content"> <div class="modal-header"> - <h4 class="modal-title" id="embedPhotoModalLabel">{{$embedPhotosModalTitle}}</h4> + <h3 class="modal-title" id="embedPhotoModalLabel">{{$embedPhotosModalTitle}}</h3> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> </div> <div class="modal-body" id="embedPhotoModalBody" > diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl index 51880e1f6..8d72df55b 100755 --- a/view/tpl/new_channel.tpl +++ b/view/tpl/new_channel.tpl @@ -13,23 +13,25 @@ </div> {{/if}} {{/if}} - <form action="new_channel" method="post" id="newchannel-form"> - {{if $default_role}} - <input type="hidden" name="permissions_role" value="{{$default_role}}" /> - {{else}} - {{include file="field_select_grouped.tpl" field=$role}} - {{/if}} - - {{include file="field_input.tpl" field=$name}} - - {{include file="field_input.tpl" field=$nickname}} - <button class="btn btn-primary" type="submit" id="newchannel-submit-button">{{$submit}}</button> - - - <div id="newchannel-submit-end" class="clear"></div> - - <div id="newchannel-import-link" class="descriptive-paragraph" >{{$label_import}}</div> - <div id="newchannel-import-end" class="clear"></div> - </form> + {{if $canadd}} + <form action="new_channel" method="post" id="newchannel-form"> + {{if $default_role}} + <input type="hidden" name="permissions_role" value="{{$default_role}}" /> + {{else}} + {{include file="field_select_grouped.tpl" field=$role}} + {{/if}} + + {{include file="field_input.tpl" field=$name}} + + {{include file="field_input.tpl" field=$nickname}} + <button class="btn btn-primary" type="submit" id="newchannel-submit-button">{{$submit}}</button> + + + <div id="newchannel-submit-end" class="clear"></div> + + <div id="newchannel-import-link" class="descriptive-paragraph" >{{$label_import}}</div> + <div id="newchannel-import-end" class="clear"></div> + </form> + {{/if}} </div> </div> diff --git a/view/tpl/notes.tpl b/view/tpl/notes.tpl index c6d5d8a73..67da5ff37 100644 --- a/view/tpl/notes.tpl +++ b/view/tpl/notes.tpl @@ -1,5 +1,13 @@ +{{if $app}} +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <h2>{{$banner}}</h2> + </div> + <div class="section-content-wrapper"> +{{else}} <div class="widget"> <h3>{{$banner}}</h3> +{{/if}} <textarea name="note_text" id="note-text">{{$text}}</textarea> <script> var noteSaveTimer = null; @@ -32,4 +40,7 @@ noteSaveTimer = setTimeout(noteSaveChanges,10000); } </script> +{{if $app}} +</div> +{{/if}} </div> diff --git a/view/tpl/settings_oauth.tpl b/view/tpl/oauth.tpl index 811cfcec5..881e22e99 100755 --- a/view/tpl/settings_oauth.tpl +++ b/view/tpl/oauth.tpl @@ -4,13 +4,13 @@ </div> <div class="section-content-tools-wrapper"> -<form action="settings/oauth" method="post" autocomplete="off"> +<form action="oauth" method="post" autocomplete="off"> <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> <div id="profile-edit-links"> <ul> <li> - <a id="profile-edit-view-link" href="{{$baseurl}}/settings/oauth/add">{{$add}}</a> + <a id="profile-edit-view-link" href="{{$baseurl}}/oauth/add">{{$add}}</a> </li> </ul> </div> @@ -25,8 +25,8 @@ {{/if}} {{/if}} {{if $app.my}} - <a href="{{$baseurl}}/settings/oauth/edit/{{$app.client_id}}" title="{{$edit}}"><i class="fa fa-pencil btn btn-outline-secondary"></i></a> - <a href="{{$baseurl}}/settings/oauth/delete/{{$app.client_id}}?t={{$form_security_token}}" title="{{$delete}}"><i class="fa fa-trash-o btn btn-outline-secondary"></i></a> + <a href="{{$baseurl}}/oauth/edit/{{$app.client_id}}" title="{{$edit}}"><i class="fa fa-pencil btn btn-outline-secondary"></i></a> + <a href="{{$baseurl}}/oauth/delete/{{$app.client_id}}?t={{$form_security_token}}" title="{{$delete}}"><i class="fa fa-trash-o btn btn-outline-secondary"></i></a> {{/if}} </div> {{/foreach}} diff --git a/view/tpl/settings_oauth2.tpl b/view/tpl/oauth2.tpl index f3bf59a12..a5b48ffce 100755 --- a/view/tpl/settings_oauth2.tpl +++ b/view/tpl/oauth2.tpl @@ -8,13 +8,13 @@ <div id="profile-edit-links"> <ul> <li> - <a id="profile-edit-view-link" href="{{$baseurl}}/settings/oauth2/add">{{$add}}</a> + <a id="profile-edit-view-link" href="{{$baseurl}}/oauth2/add">{{$add}}</a> </li> </ul> </div> {{foreach $apps as $app}} -<form action="settings/oauth2" method="post" autocomplete="off"> +<form action="oauth2" method="post" autocomplete="off"> <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> <input type='hidden' name='name' value='{{$app.client_id}}'> <div class='oauthapp'> @@ -25,8 +25,8 @@ {{/if}} {{/if}} {{if $app.my}} - <a href="{{$baseurl}}/settings/oauth2/edit/{{$app.client_id}}" title="{{$edit}}"><i class="fa fa-pencil btn btn-outline-secondary"></i></a> - <a href="{{$baseurl}}/settings/oauth2/delete/{{$app.client_id}}?t={{$form_security_token}}" title="{{$delete}}"><i class="fa fa-trash-o btn btn-outline-secondary"></i></a> + <a href="{{$baseurl}}/oauth2/edit/{{$app.client_id}}" title="{{$edit}}"><i class="fa fa-pencil btn btn-outline-secondary"></i></a> + <a href="{{$baseurl}}/oauth2/delete/{{$app.client_id}}?t={{$form_security_token}}" title="{{$delete}}"><i class="fa fa-trash-o btn btn-outline-secondary"></i></a> {{/if}} </div> </form> diff --git a/view/tpl/settings_oauth2_edit.tpl b/view/tpl/oauth2_edit.tpl index 399c64977..399c64977 100755 --- a/view/tpl/settings_oauth2_edit.tpl +++ b/view/tpl/oauth2_edit.tpl diff --git a/view/tpl/settings_oauth_edit.tpl b/view/tpl/oauth_edit.tpl index e44b44723..e44b44723 100755 --- a/view/tpl/settings_oauth_edit.tpl +++ b/view/tpl/oauth_edit.tpl diff --git a/view/tpl/settings_permcats.tpl b/view/tpl/permcats.tpl index bbbd41669..442b3e11a 100644 --- a/view/tpl/settings_permcats.tpl +++ b/view/tpl/permcats.tpl @@ -8,7 +8,7 @@ {{$desc}} </div> - <form action="settings/permcats" id="settings-permcats-form" method="post" autocomplete="off" > + <form action="permcats" id="settings-permcats-form" method="post" autocomplete="off" > <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> {{include file="field_input.tpl" field=$name}} @@ -17,10 +17,10 @@ </div> </div> - <div class="panel"> + <div class="panel" id="permission-settings"> <div class="section-subtitle-wrapper" role="tab" id="perms-tool"> <h3> - <a data-toggle="collapse" data-parent="#contact-edit-tools" href="#perms-tool-collapse" aria-expanded="true" aria-controls="perms-tool-collapse"> + <a data-toggle="collapse" data-parent="#permission-settings" href="#perms-tool-collapse" aria-expanded="true" aria-controls="perms-tool-collapse"> {{$permlbl}} </a> </h3> @@ -50,8 +50,8 @@ <table id="permcat-index"> {{foreach $permcats as $k => $v}} <tr class="permcat-row-{{$k}}"> - <td width="99%"><a href="settings/permcats/{{$k}}">{{$v}}</a></td> - <td width="1%"><i class="fa fa-trash-o drop-icons" onClick="dropItem('/settings/permcats/{{$k}}/drop', '.permcat-row-{{$k}}')"></i></td> + <td width="99%"><a href="permcats/{{$k}}">{{$v}}</a></td> + <td width="1%"><i class="fa fa-trash-o drop-icons" onClick="dropItem('permcats/{{$k}}/drop', '.permcat-row-{{$k}}')"></i></td> </tr> {{/foreach}} </table> diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 74863a5db..7980bc696 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -172,27 +172,28 @@ </div> <div id="miscellaneous-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="miscellaneous-settings" data-parent="#settings" > <div class="section-content-tools-wrapper"> - {{if $profselect}} - <label for="contact-profile-selector">{{$profseltxt}}</label> - {{$profselect}} - {{/if}} - {{if $menus}} - <div class="form-group channel-menu"> - <label for="channel_menu">{{$menu_desc}}</label> - <select name="channel_menu" class="form-control"> - {{foreach $menus as $menu }} - <option value="{{$menu.name}}" {{$menu.selected}} >{{$menu.name}} </option> - {{/foreach}} - </select> - </div> - {{/if}} - {{if $misc_addon}} - {{$misc_addon}} - {{/if}} - - <div class="settings-submit-wrapper" > - <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> - </div> + <div class="form-group"> + {{if $profselect}} + <label for="contact-profile-selector">{{$profseltxt}}</label> + {{$profselect}} + {{/if}} + {{if $menus}} + <div class="form-group channel-menu"> + <label for="channel_menu">{{$menu_desc}}</label> + <select name="channel_menu" class="form-control"> + {{foreach $menus as $menu }} + <option value="{{$menu.name}}" {{$menu.selected}}>{{$menu.name}}</option> + {{/foreach}} + </select> + </div> + {{/if}} + {{if $misc_addon}} + {{$misc_addon}} + {{/if}} + </div> + <div class="settings-submit-wrapper" > + <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> + </div> </div> </div> </div> diff --git a/view/tpl/settings_account.tpl b/view/tpl/settings_account.tpl index dd1d0d0c9..3eacf3f7a 100755 --- a/view/tpl/settings_account.tpl +++ b/view/tpl/settings_account.tpl @@ -12,12 +12,6 @@ {{include file="field_password.tpl" field=$password1}} {{include file="field_password.tpl" field=$password2}} - {{if ! $techlock}} - {{include file="field_select.tpl" field=$techlevel}} - {{else}} - <input type="hidden" name="techlevel" value="{{$techlevel.2}}" /> - {{/if}} - <div class="settings-submit-wrapper" > <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> </div> diff --git a/view/tpl/settings_addon.tpl b/view/tpl/settings_addon.tpl index b5665f579..93bf3d083 100644 --- a/view/tpl/settings_addon.tpl +++ b/view/tpl/settings_addon.tpl @@ -3,11 +3,20 @@ <h2>{{$title}}</h2> </div> <div class="section-content-wrapper"> + {{if $action_url}} <form action="{{$action_url}}" method="post" autocomplete="off"> - <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> - {{$content}} - <div class="settings-submit-wrapper" > - <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> - </div> + {{/if}} + {{if $form_security_token}} + <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> + {{/if}} + {{$content}} + {{if $submit}} + <div class="settings-submit-wrapper" > + <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> + </div> + {{/if}} + {{if $action_url}} + </form> + {{/if}} </div> </div> diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl index 7600038ea..c93efb4aa 100755 --- a/view/tpl/settings_display.tpl +++ b/view/tpl/settings_display.tpl @@ -58,21 +58,13 @@ <div class="section-content-wrapper"> {{include file="field_input.tpl" field=$ajaxint}} {{include file="field_input.tpl" field=$itemspage}} - {{include file="field_input.tpl" field=$channel_divmore_height}} - {{include file="field_input.tpl" field=$network_divmore_height}} {{include file="field_checkbox.tpl" field=$nosmile}} {{include file="field_checkbox.tpl" field=$channel_menu}} {{include file="field_checkbox.tpl" field=$title_tosource}} - {{include file="field_checkbox.tpl" field=$channel_list_mode}} - {{include file="field_checkbox.tpl" field=$network_list_mode}} {{include file="field_checkbox.tpl" field=$user_scalable}} {{include file="field_checkbox.tpl" field=$preload_images}} {{include file="field_checkbox.tpl" field=$manual_update}} - {{if $expert}} - <div class="form-group"> - <a class="btn btn-outline-secondary "href="pdledit">{{$layout_editor}}</a> - </div> - {{/if}} + {{include file="field_checkbox.tpl" field=$start_menu}} <div class="settings-submit-wrapper" > <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> </div> diff --git a/view/tpl/settings_features.tpl b/view/tpl/settings_features.tpl index 998199c8e..12c4f44f3 100755 --- a/view/tpl/settings_features.tpl +++ b/view/tpl/settings_features.tpl @@ -1,31 +1,10 @@ -<script> - $(document).ready(function() { - $('#id_techlevel').change(function() { - var techlvl = $('#id_techlevel').val(); - window.location.href='{{$baseurl}}/settings/features?f=&techlevel=' + techlvl; - }); - }); -</script> - <div class="generic-content-wrapper"> <div class="section-title-wrapper"> <h2>{{$title}}</h2> </div> <form action="settings/features" method="post" autocomplete="off"> <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> - {{if ! $techlock}} - <div class="section-content-tools-wrapper"> - {{include file="field_select.tpl" field=$techlevel}} - </div> - {{else}} - <input type="hidden" name="techlevel" value="{{$techlevel.2}}" /> - {{/if}} - {{if $hiddens}} - {{foreach $hiddens as $k => $v}} - <input type="hidden" name="feature_{{$k}}" value="{{$v}}" /> - {{/foreach}} - {{/if}} <div class="panel-group" id="settings" role="tablist" aria-multiselectable="true"> {{foreach $features as $g => $f}} <div class="panel"> diff --git a/view/tpl/settings_module.tpl b/view/tpl/settings_module.tpl index cabefc3e5..03d16d1d7 100755 --- a/view/tpl/settings_module.tpl +++ b/view/tpl/settings_module.tpl @@ -4,15 +4,19 @@ </div> <div class="section-content-wrapper"> <form action="{{$action_url}}" method="post" autocomplete="off"> - <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> - {{if $rpath}} - <input type='hidden' name='rpath' value='{{$rpath}}'> - {{/if}} - {{foreach $features as $feature}} - {{include file="field_checkbox.tpl" field=$feature}} - {{/foreach}} - <div class="settings-submit-wrapper" > - <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> - </div> + <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> + {{if $rpath}} + <input type='hidden' name='rpath' value='{{$rpath}}'> + {{/if}} + {{foreach $features as $feature}} + {{include file="field_checkbox.tpl" field=$feature}} + {{/foreach}} + {{if $extra_settings_html}} + {{$extra_settings_html}} + {{/if}} + <div class="settings-submit-wrapper" > + <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> + </div> + </form> </div> </div> diff --git a/view/tpl/settings_module_ajax.tpl b/view/tpl/settings_module_ajax.tpl new file mode 100644 index 000000000..bd7b6f3df --- /dev/null +++ b/view/tpl/settings_module_ajax.tpl @@ -0,0 +1,11 @@ +<form id="settings_module_ajax_form" action="{{$action_url}}" method="post" autocomplete="off"> + <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> + <input type='hidden' name='aj' value='1'> + {{foreach $features as $feature}} + {{include file="field_checkbox.tpl" field=$feature}} + {{/foreach}} + <div class="settings-submit-wrapper" > + <button id="settings_module_ajax_submit" type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> + </div> +</form> + diff --git a/view/tpl/settings_tokens.tpl b/view/tpl/tokens.tpl index 48190c00c..587965832 100644 --- a/view/tpl/settings_tokens.tpl +++ b/view/tpl/tokens.tpl @@ -8,7 +8,7 @@ {{$desc}} </div> - <form action="settings/tokens" id="settings-account-form" method="post" autocomplete="off" > + <form action="tokens" id="settings-account-form" method="post" autocomplete="off" > <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> {{if $atoken}}<input type="hidden" name="atoken_id" value="{{$atoken.atoken_id}}" />{{/if}} {{include file="field_input.tpl" field=$name}} @@ -19,10 +19,10 @@ </div> </div> - <div class="panel"> + <div class="panel" id="permission-settings"> <div class="section-subtitle-wrapper" role="tab" id="perms-tool"> <h3> - <a data-toggle="collapse" data-parent="#contact-edit-tools" href="#perms-tool-collapse" aria-expanded="true" aria-controls="perms-tool-collapse"> + <a data-toggle="collapse" data-parent="#permission-settings" href="#perms-tool-collapse" aria-expanded="true" aria-controls="perms-tool-collapse"> {{$permlbl}} </a> </h3> @@ -61,8 +61,8 @@ <table id="atoken-index"> {{foreach $tokens as $t}} <tr id="atoken-index-{{$t.atoken_id}}" class="atoken-index-row"> - <td width="99%"><a href="settings/tokens/{{$t.atoken_id}}">{{$t.atoken_name}}</a></td> - <td width="1%" class="atoken-index-tool"><i class="fa fa-trash-o drop-icons" onClick="dropItem('/settings/tokens/{{$t.atoken_id}}/drop', '#atoken-index-{{$t.atoken_id}}')"></i></td> + <td width="99%"><a href="tokens/{{$t.atoken_id}}">{{$t.atoken_name}}</a></td> + <td width="1%" class="atoken-index-tool"><i class="fa fa-trash-o drop-icons" onClick="dropItem('tokens/{{$t.atoken_id}}/drop', '#atoken-index-{{$t.atoken_id}}')"></i></td> </tr> {{/foreach}} </table> |