diff options
80 files changed, 5218 insertions, 4678 deletions
diff --git a/Zotlabs/Lib/AConfig.php b/Zotlabs/Lib/AConfig.php index 24ec97dfa..ab8648a18 100644 --- a/Zotlabs/Lib/AConfig.php +++ b/Zotlabs/Lib/AConfig.php @@ -15,7 +15,7 @@ class AConfig { } static public function Set($account_id,$family,$key,$value) { - return XConfig::Get('a_' . $account_id,$family,$key,$value); + return XConfig::Set('a_' . $account_id,$family,$key,$value); } static public function Delete($account_id,$family,$key) { diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php index 19ed1b612..a646d8a30 100644 --- a/Zotlabs/Lib/Apps.php +++ b/Zotlabs/Lib/Apps.php @@ -112,7 +112,7 @@ class Apps { static public function app_name_compare($a,$b) { - return strcmp($a['name'],$b['name']); + return strcasecmp($a['name'],$b['name']); } diff --git a/Zotlabs/Lib/System.php b/Zotlabs/Lib/System.php index 4479bf597..6ccfd664c 100644 --- a/Zotlabs/Lib/System.php +++ b/Zotlabs/Lib/System.php @@ -45,7 +45,7 @@ class System { static public function get_server_role() { if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['server_role']) return \App::$config['system']['server_role']; - return 'pro'; + return 'standard'; } static public function get_std_version() { diff --git a/Zotlabs/Module/Acl.php b/Zotlabs/Module/Acl.php index 03dc6c5d3..8c62f4de9 100644 --- a/Zotlabs/Module/Acl.php +++ b/Zotlabs/Module/Acl.php @@ -72,6 +72,7 @@ class Acl extends \Zotlabs\Web\Controller { ); $permitted = ids_to_array($x,'xchan'); + } @@ -249,7 +250,7 @@ class Acl extends \Zotlabs\Web\Controller { ); if($z) { foreach($z as $zz) { - if(in_array($zz['id'],$permitted)) { + if(in_array($zz['hash'],$permitted)) { $r[] = $zz; } } diff --git a/Zotlabs/Module/Admin.php b/Zotlabs/Module/Admin.php index 085d13fd7..fa4f32c8c 100644 --- a/Zotlabs/Module/Admin.php +++ b/Zotlabs/Module/Admin.php @@ -268,6 +268,8 @@ class Admin extends \Zotlabs\Web\Controller { check_form_security_token_redirectOnErr('/admin/site', 'admin_site'); $sitename = ((x($_POST,'sitename')) ? notags(trim($_POST['sitename'])) : ''); + $server_role = ((x($_POST,'server_role')) ? notags(trim($_POST['server_role'])) : 'standard'); + $banner = ((x($_POST,'banner')) ? trim($_POST['banner']) : false); $admininfo = ((x($_POST,'admininfo')) ? trim($_POST['admininfo']) : false); $language = ((x($_POST,'language')) ? notags(trim($_POST['language'])) : ''); @@ -287,8 +289,6 @@ class Admin extends \Zotlabs\Web\Controller { $mirror_frontpage = ((x($_POST,'mirror_frontpage')) ? intval(trim($_POST['mirror_frontpage'])) : 0); $directory_server = ((x($_POST,'directory_server')) ? trim($_POST['directory_server']) : ''); $allowed_sites = ((x($_POST,'allowed_sites')) ? notags(trim($_POST['allowed_sites'])) : ''); - $allowed_email = ((x($_POST,'allowed_email')) ? notags(trim($_POST['allowed_email'])) : ''); - $not_allowed_email = ((x($_POST,'not_allowed_email')) ? notags(trim($_POST['not_allowed_email'])) : ''); $force_publish = ((x($_POST,'publish_all')) ? True : False); $disable_discover_tab = ((x($_POST,'disable_discover_tab')) ? False : True); $login_on_homepage = ((x($_POST,'login_on_homepage')) ? True : False); @@ -308,6 +308,8 @@ class Admin extends \Zotlabs\Web\Controller { $feed_contacts = ((x($_POST,'feed_contacts')) ? intval($_POST['feed_contacts']) : 0); $verify_email = ((x($_POST,'verify_email')) ? 1 : 0); + + set_config('system', 'server_role', $server_role); set_config('system', 'feed_contacts', $feed_contacts); set_config('system', 'delivery_interval', $delivery_interval); set_config('system', 'delivery_batch_count', $delivery_batch_count); @@ -353,8 +355,6 @@ class Admin extends \Zotlabs\Web\Controller { set_config('system','account_abandon_days', $abandon_days); set_config('system','register_text', $register_text); set_config('system','allowed_sites', $allowed_sites); - set_config('system','allowed_email', $allowed_email); - set_config('system','not_allowed_email', $not_allowed_email); set_config('system','publish_all', $force_publish); set_config('system','disable_discover_tab', $disable_discover_tab); if ($global_directory == '') { @@ -481,6 +481,12 @@ class Admin extends \Zotlabs\Web\Controller { // now invert the logic for the setting. $discover_tab = (1 - $discover_tab); + $server_roles = [ + 'basic' => t('Basic/Minimal Social Networking'), + 'standard' => t('Standard Configuration (default)'), + 'pro' => t('Professional') + ]; + $homelogin = get_config('system','login_on_homepage'); $enable_context_help = get_config('system','enable_context_help'); @@ -498,6 +504,9 @@ class Admin extends \Zotlabs\Web\Controller { '$baseurl' => z_root(), // name, label, value, help string, extra data... '$sitename' => array('sitename', t("Site name"), htmlspecialchars(get_config('system','sitename'), ENT_QUOTES, 'UTF-8'),''), + + '$server_role' => array('server_role', t("Server Configuration/Role"), get_config('system','server_role'),'',$server_roles), + '$banner' => array('banner', t("Banner/Logo"), $banner, ""), '$admininfo' => array('admininfo', t("Administrator Information"), $admininfo, t("Contact information for site administrators. Displayed on siteinfo page. BBCode can be used here")), '$language' => array('language', t("System language"), get_config('system','language'), "", $lang_choices), @@ -514,8 +523,6 @@ class Admin extends \Zotlabs\Web\Controller { '$mirror_frontpage' => array('mirror_frontpage', t("Preserve site homepage URL"), get_config('system','mirror_frontpage'), t('Present the site homepage in a frame at the original location instead of redirecting')), '$abandon_days' => array('abandon_days', t('Accounts abandoned after x days'), get_config('system','account_abandon_days'), t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')), '$allowed_sites' => array('allowed_sites', t("Allowed friend domains"), get_config('system','allowed_sites'), t("Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains")), - '$allowed_email' => array('allowed_email', t("Allowed email domains"), get_config('system','allowed_email'), t("Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains")), - '$not_allowed_email' => array('not_allowed_email', t("Not allowed email domains"), get_config('system','not_allowed_email'), t("Comma separated list of domains which are not allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains, unless allowed domains have been defined.")), '$verify_email' => array('verify_email', t("Verify Email Addresses"), get_config('system','verify_email'), t("Check to verify email addresses used in account registration (recommended).")), '$force_publish' => array('publish_all', t("Force publish"), get_config('system','publish_all'), t("Check to force all profiles on this site to be listed in the site directory.")), '$disable_discover_tab' => array('disable_discover_tab', t('Import Public Streams'), $discover_tab, t('Import and allow access to public content pulled from other sites. Warning: this content is unmoderated.')), @@ -591,8 +598,12 @@ class Admin extends \Zotlabs\Web\Controller { function admin_page_security_post(&$a){ check_form_security_token_redirectOnErr('/admin/security', 'admin_security'); - logger('post: ' . print_r($_POST,true)); - + $allowed_email = ((x($_POST,'allowed_email')) ? notags(trim($_POST['allowed_email'])) : ''); + $not_allowed_email = ((x($_POST,'not_allowed_email')) ? notags(trim($_POST['not_allowed_email'])) : ''); + + set_config('system','allowed_email', $allowed_email); + set_config('system','not_allowed_email', $not_allowed_email); + $block_public = ((x($_POST,'block_public')) ? True : False); set_config('system','block_public',$block_public); @@ -758,6 +769,8 @@ class Admin extends \Zotlabs\Web\Controller { '$block_public' => array('block_public', t("Block public"), get_config('system','block_public'), t("Check to block public access to all otherwise public personal pages on this site unless you are currently authenticated.")), '$transport_security' => array('transport_security', t('Set "Transport Security" HTTP header'),intval(get_config('system','transport_security_header')),''), '$content_security' => array('content_security', t('Set "Content Security Policy" HTTP header'),intval(get_config('system','content_security_policy')),''), + '$allowed_email' => array('allowed_email', t("Allowed email domains"), get_config('system','allowed_email'), t("Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains")), + '$not_allowed_email' => array('not_allowed_email', t("Not allowed email domains"), get_config('system','not_allowed_email'), t("Comma separated list of domains which are not allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains, unless allowed domains have been defined.")), '$whitelisted_sites' => array('whitelisted_sites', t('Allow communications only from these sites'), $whitesites_str, t('One site per line. Leave empty to allow communication from anywhere by default')), '$blacklisted_sites' => array('blacklisted_sites', t('Block communications from these sites'), $blacksites_str, ''), '$whitelisted_channels' => array('whitelisted_channels', t('Allow communications only from these channels'), $whitechannels_str, t('One channel (hash) per line. Leave empty to allow from any channel by default')), @@ -1275,19 +1288,27 @@ class Admin extends \Zotlabs\Web\Controller { if (x($_GET,"a") && $_GET['a']=="t"){ check_form_security_token_redirectOnErr('/admin/plugins', 'admin_plugins', 't'); - + $pinstalled = false; // Toggle plugin status $idx = array_search($plugin, \App::$plugins); if ($idx !== false){ unset(\App::$plugins[$idx]); uninstall_plugin($plugin); + $pinstalled = false; info( sprintf( t("Plugin %s disabled."), $plugin ) ); } else { \App::$plugins[] = $plugin; install_plugin($plugin); + $pinstalled = true; info( sprintf( t("Plugin %s enabled."), $plugin ) ); } set_config("system","addon", implode(", ",\App::$plugins)); + + if($pinstalled) { + @require_once("addon/$plugin/$plugin.php"); + if(function_exists($plugin.'_plugin_admin')) + goaway(z_root() . '/admin/plugins/' . $plugin); + } goaway(z_root() . '/admin/plugins' ); } // display plugin details @@ -1341,6 +1362,7 @@ class Admin extends \Zotlabs\Web\Controller { '$str_minversion' => t('Minimum project version: '), '$str_maxversion' => t('Maximum project version: '), '$str_minphpversion' => t('Minimum PHP version: '), + '$str_serverroles' => t('Compatible Server Roles: '), '$str_requires' => t('Requires: '), '$disabled' => t('Disabled - version incompatibility'), diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php index 59cb9f06c..be65354a9 100644 --- a/Zotlabs/Module/Channel.php +++ b/Zotlabs/Module/Channel.php @@ -140,7 +140,8 @@ class Channel extends \Zotlabs\Web\Controller { 'profile_uid' => \App::$profile['profile_uid'], 'editor_autocomplete' => true, 'bbco_autocomplete' => 'bbcode', - 'bbcode' => true + 'bbcode' => true, + 'jotnets' => true ); $o .= status_editor($a,$x); diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php index 217249469..43feac189 100644 --- a/Zotlabs/Module/Connedit.php +++ b/Zotlabs/Module/Connedit.php @@ -663,13 +663,9 @@ class Connedit extends \Zotlabs\Web\Controller { $rating_text = $xl[0]['xlink_rating_text']; } - $poco_rating = get_config('system','poco_rating_enable'); + $rating_enabled = get_config('system','rating_enabled'); - // if unset default to enabled - if($poco_rating === false) - $poco_rating = true; - - if($poco_rating) { + if($rating_enabled) { $rating = replace_macros(get_markup_template('rating_slider.tpl'),array( '$min' => -10, '$val' => $rating_val diff --git a/Zotlabs/Module/Directory.php b/Zotlabs/Module/Directory.php index 560038ffc..84d40a166 100644 --- a/Zotlabs/Module/Directory.php +++ b/Zotlabs/Module/Directory.php @@ -239,7 +239,7 @@ class Directory extends \Zotlabs\Web\Controller { $page_type = ''; - if($rr['total_ratings']) + if($rr['total_ratings'] && get_config('system','rating_enabled')) $total_ratings = sprintf( tt("%d rating", "%d ratings", $rr['total_ratings']), $rr['total_ratings']); else $total_ratings = ''; diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php index 35ed0c894..e9441bbdf 100644 --- a/Zotlabs/Module/Display.php +++ b/Zotlabs/Module/Display.php @@ -73,7 +73,8 @@ class Display extends \Zotlabs\Web\Controller { 'expanded' => true, 'editor_autocomplete' => true, 'bbco_autocomplete' => 'bbcode', - 'bbcode' => true + 'bbcode' => true, + 'jotnets' => true ); $o = '<div id="jot-popup">'; diff --git a/Zotlabs/Module/Help.php b/Zotlabs/Module/Help.php index cc46c550b..241354d07 100644 --- a/Zotlabs/Module/Help.php +++ b/Zotlabs/Module/Help.php @@ -31,13 +31,14 @@ class Help extends \Zotlabs\Web\Controller { if($r) { $o .= '<ul class="help-searchlist">'; foreach($r as $rr) { - $dirname = dirname($rr['sid']); - $fname = basename($rr['sid']); + $dirname = dirname($rr['v']); + $fname = basename($rr['v']); $fname = substr($fname,0,strrpos($fname,'.')); $path = trim(substr($dirname,4),'/'); - $o .= '<li><a href="help/' . (($path) ? $path . '/' : '') . $fname . '" >' . ucwords(str_replace('_',' ',notags($fname))) . '</a><br />' . - str_replace('$Projectname',\Zotlabs\Lib\System::get_platform_name(),substr($rr['text'],0,200)) . '...<br /><br /></li>'; + $o .= '<li><a href="help/' . (($path) ? $path . '/' : '') . $fname . '" >' . ucwords(str_replace('_',' ',notags($fname))) . '</a><br />' + . '<b><i>' . 'help/' . (($path) ? $path . '/' : '') . $fname . '</i></b><br />' . + '...' . str_replace('$Projectname',\Zotlabs\Lib\System::get_platform_name(),$rr['text']) . '...<br /><br /></li>'; } $o .= '</ul>'; diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index 0128adc2c..50bb05075 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -159,7 +159,7 @@ class Network extends \Zotlabs\Web\Controller { 'allow_gid' => $channel['channel_allow_gid'], 'deny_cid' => $channel['channel_deny_cid'], 'deny_gid' => $channel['channel_deny_gid'] - ); + ); $private_editing = ((($group || $cid) && (! intval($_GET['pf']))) ? true : false); @@ -176,7 +176,8 @@ class Network extends \Zotlabs\Web\Controller { 'profile_uid' => local_channel(), 'editor_autocomplete' => true, 'bbco_autocomplete' => 'bbcode', - 'bbcode' => true + 'bbcode' => true, + 'jotnets' => true ); if($deftag) $x['pretext'] = $deftag; diff --git a/Zotlabs/Module/Pubsites.php b/Zotlabs/Module/Pubsites.php index 0dda08e6d..35a305130 100644 --- a/Zotlabs/Module/Pubsites.php +++ b/Zotlabs/Module/Pubsites.php @@ -16,7 +16,9 @@ class Pubsites extends \Zotlabs\Web\Controller { $url = $directory['url'] . '/dirsearch'; } $url .= '/sites'; - + + $rating_enabled = get_config('system','rating_enabled'); + $o .= '<div class="generic-content-wrapper">'; $o .= '<div class="section-title-wrapper"><h2>' . t('Public Hubs') . '</h2></div>'; @@ -28,7 +30,10 @@ class Pubsites extends \Zotlabs\Web\Controller { if($ret['success']) { $j = json_decode($ret['body'],true); if($j) { - $o .= '<table class="table table-striped table-hover"><tr><td>' . t('Hub URL') . '</td><td>' . t('Access Type') . '</td><td>' . t('Registration Policy') . '</td><td>' . t('Stats') . '</td><td>' . t('Software') . '</td><td colspan="2">' . t('Ratings') . '</td></tr>'; + $o .= '<table class="table table-striped table-hover"><tr><td>' . t('Hub URL') . '</td><td>' . t('Access Type') . '</td><td>' . t('Registration Policy') . '</td><td>' . t('Stats') . '</td><td>' . t('Software') . '</td>'; + if($rating_enabled) + $o .= '<td colspan="2">' . t('Ratings') . '</td>'; + $o .= '</tr>'; if($j['sites']) { foreach($j['sites'] as $jj) { $m = parse_url($jj['url']); @@ -44,7 +49,10 @@ class Pubsites extends \Zotlabs\Web\Controller { $location = '<br /> '; } $urltext = str_replace(array('https://'), '', $jj['url']); - $o .= '<tr><td><a href="'. (($jj['sellpage']) ? $jj['sellpage'] : $jj['url'] . '/register' ) . '" ><i class="fa fa-link"></i> ' . $urltext . '</a>' . $location . '</td><td>' . $jj['access'] . '</td><td>' . $jj['register'] . '</td><td>' . '<a target="stats" href="https://hubchart-tarine.rhcloud.com/hub.jsp?hubFqdn=' . $m['host'] . '"><i class="fa fa-area-chart"></i></a></td><td>' . ucwords($jj['project']) . '</td><td><a href="ratings/' . $host . '" class="btn-btn-default"><i class="fa fa-eye"></i> ' . t('View') . '</a></td>' . $rate_links . '</tr>'; + $o .= '<tr><td><a href="'. (($jj['sellpage']) ? $jj['sellpage'] : $jj['url'] . '/register' ) . '" ><i class="fa fa-link"></i> ' . $urltext . '</a>' . $location . '</td><td>' . $jj['access'] . '</td><td>' . $jj['register'] . '</td><td>' . '<a target="stats" href="https://hubchart-tarine.rhcloud.com/hub.jsp?hubFqdn=' . $m['host'] . '"><i class="fa fa-area-chart"></i></a></td><td>' . ucwords($jj['project']) . '</td>'; + if($rating_enabled) + $o .= '<td><a href="ratings/' . $host . '" class="btn-btn-default"><i class="fa fa-eye"></i> ' . t('View') . '</a></td>' . $rate_links ; + $o .= '</tr>'; } } diff --git a/Zotlabs/Module/Rate.php b/Zotlabs/Module/Rate.php index 2f769b36b..c03aaa54f 100644 --- a/Zotlabs/Module/Rate.php +++ b/Zotlabs/Module/Rate.php @@ -119,8 +119,8 @@ class Rate extends \Zotlabs\Web\Controller { // return; // } - $poco_rating = get_config('system','poco_rating_enable'); - if((! $poco_rating) && ($poco_rating !== false)) { + $rating_enabled = get_config('system','rating_enabled'); + if(! $rating_enabled) { notice('Ratings are disabled on this site.'); return; } @@ -141,11 +141,7 @@ class Rate extends \Zotlabs\Web\Controller { $rating_text = ''; } - // if unset default to enabled - if($poco_rating === false) - $poco_rating = true; - - if($poco_rating) { + if($rating_enabled) { $rating = replace_macros(get_markup_template('rating_slider.tpl'),array( '$min' => -10, '$val' => $rating_val diff --git a/Zotlabs/Module/Ratings.php b/Zotlabs/Module/Ratings.php index 969fb5015..055b16ca3 100644 --- a/Zotlabs/Module/Ratings.php +++ b/Zotlabs/Module/Ratings.php @@ -21,12 +21,9 @@ class Ratings extends \Zotlabs\Web\Controller { if($x) $url = $x['url']; - $poco_rating = get_config('system','poco_rating_enable'); - // if unset default to enabled - if($poco_rating === false) - $poco_rating = true; + $rating_enabled = get_config('system','rating_enabled'); - if(! $poco_rating) + if(! $rating_enabled) return; if(argc() > 1) @@ -87,12 +84,9 @@ class Ratings extends \Zotlabs\Web\Controller { return; } - $poco_rating = get_config('system','poco_rating_enable'); - // if unset default to enabled - if($poco_rating === false) - $poco_rating = true; + $rating_enabled = get_config('system','rating_enabled'); - if(! $poco_rating) + if(! $rating_enabled) return; $site_target = ((array_key_exists('target',\App::$data) && array_key_exists('site_url',\App::$data['target'])) ? diff --git a/Zotlabs/Module/Register.php b/Zotlabs/Module/Register.php index 4cdd27001..0b16d4a66 100644 --- a/Zotlabs/Module/Register.php +++ b/Zotlabs/Module/Register.php @@ -38,7 +38,7 @@ class Register extends \Zotlabs\Web\Controller { } - function post() { + function post() { $max_dailies = intval(get_config('system','max_daily_registrations')); if($max_dailies) { diff --git a/Zotlabs/Module/Rpost.php b/Zotlabs/Module/Rpost.php index 525f053de..1349cd1c5 100644 --- a/Zotlabs/Module/Rpost.php +++ b/Zotlabs/Module/Rpost.php @@ -126,7 +126,10 @@ class Rpost extends \Zotlabs\Web\Controller { 'source' => ((x($_REQUEST,'source')) ? strip_tags($_REQUEST['source']) : ''), 'return_path' => 'rpost/return', 'bbco_autocomplete' => 'bbcode', - 'bbcode' => true + 'editor_autocomplete'=> true, + 'bbcode' => true, + 'jotnets' => true + ); $editor = status_editor($a,$x); diff --git a/Zotlabs/Module/Settings.php b/Zotlabs/Module/Settings.php index 2679b364b..bd16b930e 100644 --- a/Zotlabs/Module/Settings.php +++ b/Zotlabs/Module/Settings.php @@ -1028,7 +1028,7 @@ class Settings extends \Zotlabs\Web\Controller { $theme_config = theme_content($a); } -logger('schemas: ' . print_r($schemas,true)); + // logger('schemas: ' . print_r($schemas,true)); $tpl = get_markup_template("settings_display.tpl"); $o = replace_macros($tpl, array( diff --git a/Zotlabs/Module/Setup.php b/Zotlabs/Module/Setup.php index 4553b6866..610f3c4f4 100644 --- a/Zotlabs/Module/Setup.php +++ b/Zotlabs/Module/Setup.php @@ -43,11 +43,12 @@ class Setup extends \Zotlabs\Web\Controller { killme(); } - if (x($_POST, 'pass')) + if (x($_POST, 'pass')) { $this->install_wizard_pass = intval($_POST['pass']); - else + } + else { $this->install_wizard_pass = 1; - + } } /** @@ -73,7 +74,9 @@ class Setup extends \Zotlabs\Web\Controller { $phpath = trim($_POST['phpath']); $adminmail = trim($_POST['adminmail']); $siteurl = trim($_POST['siteurl']); - $advanced = ((intval($_POST['advanced'])) ? 1 : 0); + $server_role = trim($_POST['server_role']); + if(! $server_role) + $server_role = 'standard'; // $siteurl should not have a trailing slash @@ -101,7 +104,9 @@ class Setup extends \Zotlabs\Web\Controller { $timezone = notags(trim($_POST['timezone'])); $adminmail = notags(trim($_POST['adminmail'])); $siteurl = notags(trim($_POST['siteurl'])); - $advanced = ((intval($_POST['advanced'])) ? 'pro' : 'basic'); + $server_role = notags(trim($_POST['server_role'])); + if(! $server_role) + $server_role = 'standard'; if($siteurl != z_root()) { $test = z_fetch_url($siteurl."/setup/testrewrite"); @@ -130,7 +135,7 @@ class Setup extends \Zotlabs\Web\Controller { '$dbpass' => $dbpass, '$dbdata' => $dbdata, '$dbtype' => $dbtype, - '$server_role' => $advanced, + '$server_role' => $server_role, '$timezone' => $timezone, '$siteurl' => $siteurl, '$site_id' => random_string(), @@ -327,6 +332,12 @@ class Setup extends \Zotlabs\Web\Controller { $siteurl = notags(trim($_POST['siteurl'])); $timezone = ((x($_POST,'timezone')) ? ($_POST['timezone']) : 'America/Los_Angeles'); + $server_roles = [ + 'basic' => t('Basic/Minimal Social Networking'), + 'standard' => t('Standard Configuration (default)'), + 'pro' => t('Professional') + ]; + $tpl = get_markup_template('install_settings.tpl'); $o .= replace_macros($tpl, array( '$title' => $install_title, @@ -344,7 +355,8 @@ class Setup extends \Zotlabs\Web\Controller { '$adminmail' => array('adminmail', t('Site administrator email address'), $adminmail, t('Your account email address must match this in order to use the web admin panel.')), '$siteurl' => array('siteurl', t('Website URL'), z_root(), t('Please use SSL (https) URL if available.')), - '$advanced' => array('advanced', t('Enable $Projectname <strong>advanced</strong> features?'), 1, t('Some advanced features, while useful - may be best suited for technically proficient audiences')), + + '$server_role' => array('server_role', t("Server Configuration/Role"), 'standard','',$server_roles), '$timezone' => array('timezone', t('Please select a default timezone for your website'), $timezone, '', get_timezones()), diff --git a/Zotlabs/Render/Comanche.php b/Zotlabs/Render/Comanche.php index 820897ee9..91f0ce33a 100644 --- a/Zotlabs/Render/Comanche.php +++ b/Zotlabs/Render/Comanche.php @@ -99,18 +99,73 @@ class Comanche { } } - + function get_condition_var($v) { + if($v) { + $x = explode('.',$v); + if($x[0] == 'config') + return get_config($x[1],$x[2]); + elseif($x[0] === 'observer') { + if(count($x) > 1) { + $y = \App::get_observer(); + if(! $y) + return false; + if($x[1] == 'address') + return $y['xchan_addr']; + elseif($x[1] == 'name') + return $y['xchan_name']; + return false; + } + return get_observer_hash(); + } + else + return false; + } + return false; + } function test_condition($s) { - // This is extensible. The first version of variable testing supports tests of the form + // This is extensible. The first version of variable testing supports tests of the forms: + // [if $config.system.foo == baz] which will check if get_config('system','foo') is the string 'baz'; + // [if $config.system.foo != baz] which will check if get_config('system','foo') is not the string 'baz'; + // You may check numeric entries, but these checks are evaluated as strings. + // [if $config.system.foo {} baz] which will check if 'baz' is an array element in get_config('system','foo') + // [if $config.system.foo {*} baz] which will check if 'baz' is an array key in get_config('system','foo') // [if $config.system.foo] which will check for a return of a true condition for get_config('system','foo'); // The values 0, '', an empty array, and an unset value will all evaluate to false. - if(preg_match("/[\$]config[\.](.*?)/",$s,$matches)) { - $x = explode('.',$s); - if(get_config($x[1],$x[2])) + if(preg_match('/[\$](.*?)\s\=\=\s(.*?)$/',$s,$matches)) { + $x = $this->get_condition_var($matches[1]); + if($x == trim($matches[2])) + return true; + return false; + } + if(preg_match('/[\$](.*?)\s\!\=\s(.*?)$/',$s,$matches)) { + $x = $this->get_condition_var($matches[1]); + if($x != trim($matches[2])) + return true; + return false; + } + + if(preg_match('/[\$](.*?)\s\{\}\s(.*?)$/',$s,$matches)) { + $x = $this->get_condition_var($matches[1]); + if(is_array($x) && in_array(trim($matches[2]),$x)) + return true; + return false; + } + + if(preg_match('/[\$](.*?)\s\{\*\}\s(.*?)$/',$s,$matches)) { + $x = $this->get_condition_var($matches[1]); + if(is_array($x) && array_key_exists(trim($matches[2]),$x)) + return true; + return false; + } + + if(preg_match('/[\$](.*?)/',$s,$matches)) { + $x = $this->get_condition_var($matches[1]); + if($x) return true; + return false; } return false; diff --git a/Zotlabs/Render/SmartyTemplate.php b/Zotlabs/Render/SmartyTemplate.php index 532d6e42f..7abe0731c 100755 --- a/Zotlabs/Render/SmartyTemplate.php +++ b/Zotlabs/Render/SmartyTemplate.php @@ -15,7 +15,10 @@ class SmartyTemplate implements TemplateEngine { ? \App::$config['system']['smarty3_folder'] : ''); if (!$basecompiledir) $basecompiledir = str_replace('Zotlabs','',dirname(__dir__)) . "/" . TEMPLATE_BUILD_PATH; if (!is_dir($basecompiledir)) { - echo "<b>ERROR:</b> folder <tt>$basecompiledir</tt> does not exist."; killme(); + @os_mkdir(TEMPLATE_BUILD_PATH, STORAGE_DEFAULT_PERMISSIONS, true); + if (!is_dir($basecompiledir)) { + echo "<b>ERROR:</b> folder <tt>$basecompiledir</tt> does not exist."; killme(); + } } if(!is_writable($basecompiledir)){ echo "<b>ERROR:</b> folder <tt>$basecompiledir</tt> must be writable by webserver."; killme(); @@ -27,6 +30,12 @@ class SmartyTemplate implements TemplateEngine { public function replace_macros($s, $r) { $template = ''; + + // these are available for use in all templates + + $r['$z_baseurl'] = z_root(); + $r['$z_server_role'] = \Zotlabs\Lib\System::get_server_role(); + if(gettype($s) === 'string') { $template = $s; $s = new SmartyInterface(); @@ -150,15 +150,6 @@ define ( 'MAX_IMAGE_LENGTH', -1 ); define ( 'DEFAULT_DB_ENGINE', 'MyISAM' ); /** - * SSL redirection policies - */ - -define ( 'SSL_POLICY_NONE', 0 ); -define ( 'SSL_POLICY_FULL', 1 ); -define ( 'SSL_POLICY_SELFSIGN', 2 ); // NOT supported in Red - - -/** * log levels */ @@ -168,6 +159,15 @@ define ( 'LOGGER_DEBUG', 2 ); define ( 'LOGGER_DATA', 3 ); define ( 'LOGGER_ALL', 4 ); + +/** + * Server roles + */ + +define ( 'SERVER_ROLE_BASIC', 0x0001 ); +define ( 'SERVER_ROLE_STANDARD', 0x0002 ); +define ( 'SERVER_ROLE_PRO', 0x0004 ); + /** * registration policies */ @@ -612,11 +612,11 @@ function sys_boot() { if(UNO) App::$config['system']['server_role'] = 'basic'; else - App::$config['system']['server_role'] = 'pro'; + App::$config['system']['server_role'] = 'standard'; } if(! (array_key_exists('server_role',App::$config['system']) && App::$config['system']['server_role'])) - App::$config['system']['server_role'] = 'pro'; + App::$config['system']['server_role'] = 'standard'; App::$timezone = ((App::$config['system']['timezone']) ? App::$config['system']['timezone'] : 'UTC'); date_default_timezone_set(App::$timezone); @@ -760,7 +760,7 @@ class miniApp { class App { public static $install = false; // true if we are installing the software - + public static $role = 0; // server role (constant, not the string) public static $account = null; // account record of the logged-in account public static $channel = null; // channel record of the current channel of the logged-in account public static $observer = null; // xchan record of the page observer @@ -1044,6 +1044,31 @@ class App { } } + public static function get_role() { + if(! self::$role) + return self::set_role(); + return self::$role; + } + + public static function set_role() { + $role_str = \Zotlabs\Lib\System::get_server_role(); + switch($role_str) { + case 'basic': + $role = SERVER_ROLE_BASIC; + break; + case 'pro': + $role = SERVER_ROLE_PRO; + break; + case 'standard': + default: + $role = SERVER_ROLE_STANDARD; + break; + } + self::$role = $role; + return $role; + } + + public static function get_scheme() { return self::$scheme; } diff --git a/doc/Developers.md b/doc/Developers.md index b19b4fc2f..ef02c8327 100644 --- a/doc/Developers.md +++ b/doc/Developers.md @@ -18,7 +18,7 @@ to notify us to merge your work. **Translations** -Our translations are managed through Transifex. If you wish to help out translating the $Projectname to another language, sign up on transifex.com, visit [https://www.transifex.com/projects/p/red-matrix/](https://www.transifex.com/projects/p/red-matrix/) and request to join one of the existing language teams or create a new one. Notify one of the core developers when you have a translation update which requires merging, or ask about merging it yourself if you're comfortable with git and PHP. We have a string file called 'messages.po' which is gettext compliant and a handful of email templates, and from there we automatically generate the application's language files. +Our translations are managed through Transifex. If you wish to help out translating $Projectname to another language, sign up on transifex.com, visit [https://www.transifex.com/projects/p/red-matrix/](https://www.transifex.com/projects/p/red-matrix/) and request to join one of the existing language teams or create a new one. Notify one of the core developers when you have a translation update which requires merging, or ask about merging it yourself if you're comfortable with git and PHP. We have a string file called 'messages.po' which is gettext compliant and a handful of email templates, and from there we automatically generate the application's language files. [Translations - More Info](help/Translations) diff --git a/doc/Features.md b/doc/Features.md index 3c5105582..a43fd73fa 100644 --- a/doc/Features.md +++ b/doc/Features.md @@ -1,7 +1,7 @@ Extra Features ============== -The default interface of the $Projectname was designed to be uncluttered. There are a huge number of extra features (some of which are extremely useful) which you can turn on and get the most of the application. These are found under the [Extra Features](settings/features) link of your [Settings](settings) page. +The default interface of $Projectname was designed to be uncluttered. There are a huge number of extra features (some of which are extremely useful) which you can turn on and get the most of the application. These are found under the [Extra Features](settings/features) link of your [Settings](settings) page. **Content Expiration** diff --git a/doc/Plugins.md b/doc/Plugins.md index 90ff0fb7d..88b42185b 100644 --- a/doc/Plugins.md +++ b/doc/Plugins.md @@ -1,9 +1,9 @@ -Creating Plugins/Addons for the $Projectname +Creating Plugins/Addons for $Projectname ========================================== -So you want to make the $Projectname do something it doesn't already do. There are lots of ways. But let's learn how to write a plugin or addon. +So you want to make $Projectname do something it doesn't already do. There are lots of ways. But let's learn how to write a plugin or addon. In your $Projectname folder/directory, you will probably see a sub-directory called 'addon'. If you don't have one already, go ahead and create it. @@ -49,7 +49,7 @@ In our case, we'll call them randplace_load() and randplace_unload(), as that is * pluginname_uninstall() -Next we'll talk about **hooks**. Hooks are places in the $Projectname code where we allow plugins to do stuff. There are a [lot of these](help/Hooks), and they each have a name. What we normally do is use the pluginname_load() function to register a "handler function" for any hooks you are interested in. Then when any of these hooks are triggered, your code will be called. +Next we'll talk about **hooks**. Hooks are places in $Projectname code where we allow plugins to do stuff. There are a [lot of these](help/Hooks), and they each have a name. What we normally do is use the pluginname_load() function to register a "handler function" for any hooks you are interested in. Then when any of these hooks are triggered, your code will be called. We register hook handlers with the 'register_hook()' function. It takes 3 arguments. The first is the hook we wish to catch, the second is the filename of the file to find our handler function (relative to the base of your $Projectname installation), and the third is the function name of your handler function. So let's create our randplace_load() function right now. @@ -246,18 +246,18 @@ we will create an argc/argv list for use by your module functions ***Porting Friendica Plugins*** -The $Projectname uses a similar plugin architecture to the Friendica project. The authentication, identity, and permissions systems are completely different. Many Friendica can be ported reasonably easily by renaming a few functions - and then ensuring that the permissions model is adhered to. The functions which need to be renamed are: +$Projectname uses a similar plugin architecture to the Friendica project. The authentication, identity, and permissions systems are completely different. Many Friendica plugins can be ported reasonably easily by renaming a few functions - and then ensuring that the permissions model is adhered to. The functions which need to be renamed are: * Friendica's pluginname_install() is pluginname_load() * Friendica's pluginname_uninstall() is pluginname_unload() -The $Projectname has _install and _uninstall functions but these are used differently. +$Projectname has _install and _uninstall functions but these are used differently. * Friendica's "plugin_settings" hook is called "feature_settings" * Friendica's "plugin_settings_post" hook is called "feature_settings_post" -Changing these will often allow your plugin to function, but please double check all your permission and identity code because the concepts behind it are completely different in the $Projectname. Many structured data names (especially DB schema columns) are also quite different. +Changing these will often allow your plugin to function, but please double check all your permission and identity code because the concepts behind it are completely different in $Projectname. Many structured data names (especially DB schema columns) are also quite different. #include doc/macros/main_footer.bb; diff --git a/doc/Privacy.md b/doc/Privacy.md index 089977d7e..1ac019f5a 100644 --- a/doc/Privacy.md +++ b/doc/Privacy.md @@ -36,11 +36,11 @@ Any information or anything posted by you within $Projectname MAY be public or v Your profile photo, your channel name, and the location (URL or network address) of your channel are visible to anybody on the internet and privacy controls will not affect the display of these items. -You MAY additionally provide other profile information. Any information which you provide in your "default" or **public profile** MAY be transmitted to other hubs in the $Projectname and additionally MAY be displayed in the channel directory. You can restrict the viewing of this profile information. It may be restricted only to members of your hub, or only connections (friends), or other limited sets of viewers as you desire. If you wish for your profile to be restricted, you must set the appropriate privacy setting, or simply DO NOT provide additional information. +You MAY additionally provide other profile information. Any information which you provide in your "default" or **public profile** MAY be transmitted to other hubs in $Projectname and additionally MAY be displayed in the channel directory. You can restrict the viewing of this profile information. It may be restricted only to members of your hub, or only connections (friends), or other limited sets of viewers as you desire. If you wish for your profile to be restricted, you must set the appropriate privacy setting, or simply DO NOT provide additional information. **Content** -Content you provide (status posts, photos, files, etc.) belongs to you. The $Projectname default is to publish content openly and visible to anybody on the internet (PUBLIC). You MAY control this in your channel settings and restrict the default permissions or you MAY restrict the visibility of any single published item separately (PRIVATE). $Projectname developers will ensure that restricted content is ONLY visible to those in the restriction list - to the best of their ability. +Content you provide (status posts, photos, files, etc.) belongs to you. $Projectname default is to publish content openly and visible to anybody on the internet (PUBLIC). You MAY control this in your channel settings and restrict the default permissions or you MAY restrict the visibility of any single published item separately (PRIVATE). $Projectname developers will ensure that restricted content is ONLY visible to those in the restriction list - to the best of their ability. Content (especially status posts) that you share with other networks or that you have made visible to anybody on the internet (PUBLIC) cannot easily be taken back once it has been published. It MAY be shared with other networks and made available through RSS/Atom feeds. It may also be syndicated on other $Projectname sites. It MAY appear on other networks and websites and be visible in internet searches. If you do not wish this default behaviour please adjust your channel settings and restrict who can see your content. @@ -56,7 +56,7 @@ $Projectname developers will ensure that any content you provide which is design Privacy for your identity is another aspect. Because you have a decentralized identity in $Projectname, your privacy extends beyond your home hub. If you want to have complete control of your privacy and security you should run your own hub on a dedicated server. For many people, this is complicated and may stretch their technical abilities. So let's list a few precautions you can make to assure your privacy as much as possible. -A decentralized identity has a lot of advantages and gives you al lot of interesting features, but you should be aware of the fact that your identity is known by other hubs in the $Projectname network. One of those advantages is that other channels can serve you customized content and allow you to see private things (such as private photos which others wish to share with you). Because of this those channels need to know who you are. But we understand that sometimes those other channels know more from you than you might desire. For instance the plug-in Visage that can tell a channel owner the last time you visit their profile. You can easily OPT-OUT of this low level and we think, harmless tracking. +A decentralized identity has a lot of advantages and gives you al lot of interesting features, but you should be aware of the fact that your identity is known by other hubs in $Projectname network. One of those advantages is that other channels can serve you customized content and allow you to see private things (such as private photos which others wish to share with you). Because of this those channels need to know who you are. But we understand that sometimes those other channels know more from you than you might desire. For instance the plug-in Visage that can tell a channel owner the last time you visit their profile. You can easily OPT-OUT of this low level and we think, harmless tracking. * You can enable [Do Not Track (DNT)](http://donottrack.us/) in your web browser. We respect this new privacy policy proposal. All modern browsers support DNT. You will find it in the privacy settings of your browsers or else you can consult the web browser's manual. This will not affect the functionality of $Projectname. This setting is probably enough for most people. diff --git a/doc/Translations.md b/doc/Translations.md index 226fa2e1a..654ba1b83 100644 --- a/doc/Translations.md +++ b/doc/Translations.md @@ -1,4 +1,4 @@ -Translating the $Projectname +Translating $Projectname ========================== Translation Process diff --git a/doc/account_basics.bb b/doc/account_basics.bb index ba2380df7..664949d6e 100644 --- a/doc/account_basics.bb +++ b/doc/account_basics.bb @@ -10,7 +10,7 @@ Please provide a valid email address. Your email address is never published. Thi [b]Password[/b]
-Enter a password of your choice, and repeat it in the second box to ensure it was typed correctly. As the $Projectname offers a decentralised identity, your account can log you in to many other websites.
+Enter a password of your choice, and repeat it in the second box to ensure it was typed correctly. As $Projectname offers a decentralised identity, your account can log you in to many other websites.
[b]Terms Of Service[/b]
diff --git a/doc/addons_gnusocial.bb b/doc/addons_gnusocial.bb index dfdce5f6a..d9aed9ac5 100644 --- a/doc/addons_gnusocial.bb +++ b/doc/addons_gnusocial.bb @@ -8,7 +8,7 @@ https://yourgnusocialinstance.org/settings/oauthapps Next, click the link to Register a new application. That brings up the new application form. Here's what to do on each field. -Icon. I uploaded the $Projectname icon located at this link, after saving it to my computer: +Icon. I uploaded $Projectname icon located at this link, after saving it to my computer: https://github.com/redmatrix/hubzilla/blob/master/images/rm-32.png @@ -39,7 +39,7 @@ Then click on the icon or the name of the application for the information you'll Now open up a new tab or window and go to your $Projectname account, to Settings > Feature settings. Find the StatusNet Posting Settings. -Insert the strings of numbers given on the GNUsocial site into the $Projectname fields for Consumer Key and Consumer Secret. +Insert the strings of numbers given on the GNUsocial site into $Projectname fields for Consumer Key and Consumer Secret. The Base API Path (remember the trailing /) will be your instance domain, plus the /api/ following. It will probably look like this: @@ -51,9 +51,9 @@ StatusNet application name: Insert the name you gave to the application over on Click Submit. -A button will appear for you to "Sign in to StatusNet." Click it and that will open a tab or window on the GNUsocial site for you to click "Allow." Once clicked and successfully authorized, a security code number will appear. Copy it and go back to the $Projectname app you just left and insert it in the field: "Copy the security code from StatusNet here." Click Submit. +A button will appear for you to "Sign in to StatusNet." Click it and that will open a tab or window on the GNUsocial site for you to click "Allow." Once clicked and successfully authorized, a security code number will appear. Copy it and go back to $Projectname app you just left and insert it in the field: "Copy the security code from StatusNet here." Click Submit. -If successful, your information from the GNUsocial instance should appear in the $Projectname app. +If successful, your information from the GNUsocial instance should appear in $Projectname app. You now have several options to choose, if you desire, and those will need to be confirmed by clicking "Submit" also. The most interesting is "Send public postings to StatusNet by default." This option automatically sends any post of yours made in your $Projectname account to your GNUsocial instance. diff --git a/doc/campaign.bb b/doc/campaign.bb index 48f28f0c0..750412ba3 100644 --- a/doc/campaign.bb +++ b/doc/campaign.bb @@ -4,7 +4,7 @@ [b][color= grey][size=18]Single-click sign on, nomadic identity, censorship-resistance, privacy, self-hosting[/size][/color][/b]
-We started the $Projectname project by asking ourselves a few questions:
+We started $Projectname project by asking ourselves a few questions:
- Imagine if it was possible to just access the content of different web sites, without the need to enter usernames and passwords for every site. Such a feature would permit Single-Click user identification: the ability to access sites simply by clicking on links to remote sites.
Authentication just happens automagically behind the scenes. Forget about remembering multiple user names with multiple passwords when accessing different sites online.
@@ -52,7 +52,7 @@ Think of it this way: the internet is nothing, but a bunch of permissions and a [b][color= grey][size=20]The Matrix is Born![/size][/color][/b]
-After asking and striving to answer a number of such questions, we realized that we were imagining a general purpose communication network with a number of unique, and potentially game-changing, features. We called it the $Projectname and started thinking of it as an over-lay on top of the internet as it exists today; an operating system re-invented as a communication network, with its own permissions, access control lists, protocol, connectors to others services, and open-ended possibilities via its API. The sum of the matrix is greater than it's parts. We're not building website, but a way for websites to link together and grow into something that is unique and ever-changing, with autonomy and privacy.
+After asking and striving to answer a number of such questions, we realized that we were imagining a general purpose communication network with a number of unique, and potentially game-changing, features. We called it $Projectname and started thinking of it as an over-lay on top of the internet as it exists today; an operating system re-invented as a communication network, with its own permissions, access control lists, protocol, connectors to others services, and open-ended possibilities via its API. The sum of the matrix is greater than it's parts. We're not building website, but a way for websites to link together and grow into something that is unique and ever-changing, with autonomy and privacy.
It's a lot of work, for anyone. So far, we've got a team of a handful of volunteers, code geeks, brave early adopters, system administrators and other good people, willing to give the project a shot. We're motivated by our commitment to a free web, where privacy is built-in, and corporations don't have a stranglehold on our daily communication.
@@ -60,7 +60,7 @@ We need your help to finish it and release it to the world! [b][color= grey][size=20]What have we written so far[/size][/color][/b]
-As of the today, the $Projectname is in developer preview (alpha) state. It is not ready for everyday use, but some of the initial set of core features are implemented (again, in alpha state). These include:
+As of the today, $Projectname is in developer preview (alpha) state. It is not ready for everyday use, but some of the initial set of core features are implemented (again, in alpha state). These include:
- Zot, the protocol powering the matrix
- Single-signon logins.
@@ -71,7 +71,7 @@ As of the today, the $Projectname is in developer preview (alpha) state. It is [b][color= grey][size=20]Our TO-DO List[/size][/color][/b]
-However, in addition to finishing and polishing the above, there are a number of features that have to implemented to make the $Projectname ready for daily use. If we meet our fundraising goal, we hope to dive into the following road map, by order of priority:
+However, in addition to finishing and polishing the above, there are a number of features that have to implemented to make $Projectname ready for daily use. If we meet our fundraising goal, we hope to dive into the following road map, by order of priority:
- A professionally designed user interface (UI), interface that is adaptive to any user level, from end users who want to use the Matrix as a social network, to tinkerers who will put together a customized blog using Comanche, to hackers who will develop and extend the matrix using a built-in code editor, that hooks to the API and the git.
@@ -145,7 +145,7 @@ You get one of your $Projectname t-shirts, as well as our undying gratitude. Each contributor at this level gets their own $Projectname virtual private server, installed, hosted and supported by us for a period of 1 year.
-[b][color= grey][size=20]Why are we so excited about the $Projectname?[/size][/color][/b]
+[b][color= grey][size=20]Why are we so excited about $Projectname?[/size][/color][/b]
{SOMETHING ABOUT THE POTENTIAL IMPACT OF RED, ITS INNOVATIONS, ETC>
@@ -167,7 +167,7 @@ Perhaps you're good at writing and documenting stuff. Grab an account at one of [b]1. Is Red a social network?[/b]
-The $Projectname is not a social network. We're thinking of it as a general purpose communication network, with sharing, and public/private communications built into the matrix.
+$Projectname is not a social network. We're thinking of it as a general purpose communication network, with sharing, and public/private communications built into the matrix.
[b]2. What is the difference between Red and Friendica?[/b]
@@ -177,7 +177,7 @@ Friendica is really, really good at sending postcards. It can do all sorts of th What Friendica can't do, is wave a postcard at somebody and expect them to believe that holding this postcard prove you are who you say you are. Sure, if you've been sending somebody postcards, they might accept that it is you in the picture, but somebody who has never heard of you will not accept ownership of a postcard as proof of identity.
-The $Projectname offers a passport.
+$Projectname offers a passport.
You can still use it to send postcards. At the same time, when you wave your passport at somebody, they do accept it as proof of identity. No longer do you need to register at every single site you use. You already have an account - it's just not necessarily at our site - so we'll ask to see your passport instead.
@@ -194,7 +194,7 @@ We use MySQL as our database (this include any forks such as, MariaDB or Percona [b]5. How is the Affinity Slider different from Mozilla's Persona?[/b]
{COMPLETE}
-[b]6. Does the $Projectname use encryption? Details please![/b]
+[b]6. Does $Projectname use encryption? Details please![/b]
Yes, we do our best to use free and open source encryption libraries to help achieve privacy from general, mass surveillance.
@@ -207,7 +207,7 @@ For more info on our initial implementation of encrypted communication, check ou [b]7. What do you mean by decentralization? [/b]
-[b]8. Can I build my own website with in the $Projectname?[/b]
+[b]8. Can I build my own website with in $Projectname?[/b]
Yes. The short explanation: We've got this spiffy idea we're calling "Comanche", which will allow non-programmers to build complete custom websites, and any such website will be able to connect to any other website or channel in the matrix. The goal of Comanche is to hide the technical complexities of communicating in the matrix, while encouraging people to use their creativity and put together their own unique presence on the matrix.
diff --git a/doc/channels.bb b/doc/channels.bb index 14d588266..eca8dd0e6 100644 --- a/doc/channels.bb +++ b/doc/channels.bb @@ -28,7 +28,7 @@ Once you have done this, your channel is ready to use. At [observer=1][observer. [h3]The grid, permissions and delegation[/h3]
-The "Grid" page contains all recent posts from across the $Projectname network, again in reverse chronologial order. The exact posts that appear here depend largely on your permissions. At their most permissive, you will receive posts from complete strangers. At the other end of the scale, you may see posts from only your friends - or if you're feeling really anti-social, only your own posts.
+The "Grid" page contains all recent posts from across $Projectname network, again in reverse chronologial order. The exact posts that appear here depend largely on your permissions. At their most permissive, you will receive posts from complete strangers. At the other end of the scale, you may see posts from only your friends - or if you're feeling really anti-social, only your own posts.
As mentioned at the start, many other kinds of channel are possible, however, the creation procedure is the same. The difference between channels lies primarily in the permissions assigned. For example, a channel for sharing documents with colleagues at work would probably want more permissive settings for "Can write to my "public" file storage" than a personal account. For more information, see the [zrl=[baseurl]/help/roles]permissions section[/zrl].
diff --git a/doc/cloud.bb b/doc/cloud.bb index 3e0ac1fd3..2ad22806b 100644 --- a/doc/cloud.bb +++ b/doc/cloud.bb @@ -1,6 +1,6 @@ [b]Personal Cloud Storage[/b]
-The $Projectname provides an ability to store privately and/or share arbitrary files with friends.
+$Projectname provides an ability to store privately and/or share arbitrary files with friends.
You may either upload files from your computer into your storage area, or copy them directly from the operating system using the WebDAV protocol.
diff --git a/doc/comanche.bb b/doc/comanche.bb index 6a96d5251..4b198d657 100644 --- a/doc/comanche.bb +++ b/doc/comanche.bb @@ -65,17 +65,23 @@ By default, $nav is placed in the "nav" page region and $content is pl To select a theme for your page, use the 'theme' tag.
[code]
- [theme]apw[/theme]
+ [theme]suckerberg[/theme]
[/code]
-This will select the theme named "apw". By default your channel's preferred theme will be used.
+This will select the theme named "suckerberg". By default your channel's preferred theme will be used.
[code]
- [theme=passion]apw[/theme]
+ [theme=passion]suckerberg[/theme]
[/code]
-This will select the theme named "apw" and select the "passion" schema (theme variant).
+This will select the theme named "suckerberg" and select the "passion" schema (theme variant). Alternatively it may be possible to use a condensed theme notation for this.
+[code]
+ [theme]suckerberg:passion[/theme]
+
+[/code]
+
+The condensed notation isn't part of Comanche itself but is recognised by $Projectname platform as a theme specifier.
[b]Regions[/b]
Each region has a name, as noted above. You will specify the region of interest using a 'region' tag, which includes the name. Any content you wish placed in this region should be placed between the opening region tag and the closing tag.
@@ -164,7 +170,42 @@ The 'comment' tag is used to delimit comments. These comments will not appear on [comment]This is a comment[/comment]
[/code]
-
+
+[b]Conditional Execution[/b]
+You can use an 'if' construct to make decisions. These are currently based on system configuration variable or the current observer.
+
+[code]
+ [if $config.system.foo]
+ ... the configuration variable system.foo evaluates to 'true'.
+ [else]
+ ... the configuration variable system.foo evaluates to 'false'.
+ [/if]
+
+ [if $observer]
+ ... this content will only be show to authenticated viewers
+ [/if]
+
+[/code]
+
+ The 'else' clause is optional.
+
+ Several tests are supported besides boolean evaluation.
+
+[code]
+ [if $config.system.foo == bar]
+ ... the configuration variable system.foo is equal to the string 'bar'
+ [/if]
+ [if $config.system.foo != bar]
+ ... the configuration variable system.foo is not equal to the string 'bar'
+ [/if]
+ [if $config.system.foo {} bar ]
+ ... the configuration variable system.foo is a simple array containing a value 'bar'
+ [/if]
+ [if $config.system.foo {*} bar]
+ ... the configuration variable system.foo is a simple array containing a key named 'bar'
+ [/if]
+[/code]
+
[b]Complex Example[/b]
[code]
[comment]use an existing page template which provides a banner region plus 3 columns beneath it[/comment]
diff --git a/doc/connecting_to_channels.bb b/doc/connecting_to_channels.bb index be37eb25c..291323f75 100644 --- a/doc/connecting_to_channels.bb +++ b/doc/connecting_to_channels.bb @@ -1,6 +1,6 @@ [b]Connecting To Channels[/b]
-Connections in the $Projectname can take on a great many different meanings. But let's keep it simple, you want to be friends with somebody like you are familiar with from social networking. How do you do it?
+Connections in $Projectname can take on a great many different meanings. But let's keep it simple, you want to be friends with somebody like you are familiar with from social networking. How do you do it?
First, you need to find some channels to connect to. There are two primary ways of doing this. Firstly, setting the "Can send me their channel stream and posts" permission to "Anybody in this network" will bring posts from complete strangers to your matrix. This will give you a lot of public content and should hopefully help you find interesting, entertaing people, forums, and channels.
diff --git a/doc/connecting_to_channels.md b/doc/connecting_to_channels.md index 60834c244..349f58b67 100644 --- a/doc/connecting_to_channels.md +++ b/doc/connecting_to_channels.md @@ -1,6 +1,6 @@ # Connecting To Channels # -Connections in the $Projectname can take on a great many different meanings. But let's keep it simple, you want to be friends with somebody like you are familiar with from social networking. How do you do it? +Connections in $Projectname can take on a great many different meanings. But let's keep it simple, you want to be friends with somebody like you are familiar with from social networking. How do you do it? First, you need to find some channels to connect to. There are two primary ways of doing this. Firstly, setting the "Can send me their channel stream and posts" permission to "Anybody in this network" will bring posts from complete strangers to your matrix. This will give you a lot of public content and should hopefully help you find interesting, entertaing people, forums, and channels. diff --git a/doc/context/en/connedit/help.html b/doc/context/en/connedit/help.html new file mode 100644 index 000000000..9eb62ecc7 --- /dev/null +++ b/doc/context/en/connedit/help.html @@ -0,0 +1,12 @@ +<dl class="dl-horizontal"> + <dt>General</dt> + <dd>This page allows you to change or edit any individual settings for a particular connection or delete a connection completely. You may have arrived at this page after creating or approving a new connection. If so, you are not required to do anything. Your connection has already been established. You <strong>may</strong> wish to add them to a group or adjust special permissions, and this page is presented so that you may do this while the opportunity is fresh.</dd> + <dt><a href='#' onclick='contextualHelpFocus(".section-title-wrapper", 0); return false;' title="Click to highlight element...">Connection Tools</a></dt> + <dd>The <a href='#' onclick='contextualHelpFocus(".section-title-wrapper", 0); return false;' title="Click to highlight element...">Connection Tools</a> menu access several settings. View Profile, View Recent Activity, Refresh Permissions, set or reset flags (Block, Ignore, Archive, Hide) and Delete the connection.</dd> + <dt><a href='#' onclick='contextualHelpFocus("#group-sidebar", 0); return false;' title="Click to highlight element...">Privacy Groups</a></dt> + <dd>Each connection may be assigned to one or more Privacy Groups for grouping collections of friends with access to specific posts, media and other content. You may add them to an existing privacy group here, or create a new privacy group. When you add them to an existing group the action is immediate and you are not required to submit a form. </dd> + <dt><a href='#' onclick='contextualHelpFocus("#perms-tool", 0); return false;' title="Click to highlight element...">Individual Permissions</a></dt> + <dd>Granting of permissions is usually automatic and require no action on your part. However you may wish to adjust specific permsisions for this connection which are different than for others.</dd> + <dt>Feature Specific Settings</dt> + <dd>A number of individual settings are controlled through additional features which may or may not be activated on your hub or for your channel. Several optional features have settings for each connection, and those may be set on this page through additional form tabs which may be present.</dd> +</dl> diff --git a/doc/context/es-es/connedit/help.html b/doc/context/es-es/connedit/help.html new file mode 100644 index 000000000..000f28950 --- /dev/null +++ b/doc/context/es-es/connedit/help.html @@ -0,0 +1,12 @@ +<dl class="dl-horizontal"> + <dt>General</dt> + <dd>Esta página le permite cambiar o modificar cualquier ajuste individual para una conexión en concreto o eliminar una conexión completamente. Ha podido llegar a esta página tras crear o aprobar una conexión nueva. Si es asÃ, no tiene por qué hacer nada. Su conexión ya se ha establecido. <strong>Es posible</strong> que desee añadirla a un grupo o ajustar para ella permisos especiales; si es asÃ, esta página se presenta de modo que usted pueda hacerlo mientras todo el proceso es aún reciente.</dd> + <dt><a href='#' onclick='contextualHelpFocus(".section-title-wrapper", 0); return false;' title="Pulsar para resaltar el elemento...">Conexiones</a></dt> + <dd>El menú <a href='#' onclick='contextualHelpFocus(".section-title-wrapper", 0); return false;' title="Pulsar para resaltar el elemento...">Conexiones</a> le da acceso a varios ajustes: "Ver el perfil", "Ver la actividad reciente", "Recargar los permisos", añadir o quitar estados ("flags") ("Bloquear", "Ignorar", "Archivar", "Ocultar") y eliminar la conexión.</dd> + <dt><a href='#' onclick='contextualHelpFocus("#group-sidebar", 0); return false;' title="Pulsar para resaltar el elemento...">Grupos de canales</a></dt> + <dd>Todas las conexiones se puede incluir en uno o varios grupos de canales para formar conjuntos de amigos con acceso a publicaciones concretas, ficheros multimedia y otros tipos de contenido. Puede añadirla aquà a un grupo de canales ya existente o crear un grupo nuevo. Cuando añade la conexión a un grupo que ya existe, el efecto es inmediato y no será requerido para confirmarlo.</dd> + <dt><a href='#' onclick='contextualHelpFocus("#perms-tool", 0); return false;' title="Pulsar para resaltar el elemento...">Permisos individuales</a></dt> + <dd>La concesión de permisos es, generalmente, automática y no requiere ninguna acción por su parte. Sin embargo, puede, si lo desea, ajustar permisos especiales, diferentes de los permisos concedidos a otros, para una conexión concreta.</dd> + <dt>Ajustes de funcionalidades concretas</dt> + <dd>Una serie de ajustes individuales se controlan mediante funcionalidades adicionales que pueden, o no, estar activadas en un hub o para su canal en concreto. Varias funcionalidades adicionales tienen ajustes para cada conexión, Estas funcionalidades se pueden configurar en esta página, de forma adicional, mediante pestañas que pueden estar presentes.</dd> +</dl> diff --git a/doc/contributor/covenant.html b/doc/contributor/covenant.html new file mode 100644 index 000000000..4facac24e --- /dev/null +++ b/doc/contributor/covenant.html @@ -0,0 +1,106 @@ +<!DOCTYPE html> + +<html lang="en"> +<head> + <meta charset="utf-8"/> + <title>Contributor Covenant 1.4.0</title> + <style> + body { + font-family: monospace; + padding: 4em; + } + a { + color: #990000; + } + </style> + <link rel="alternate" hreflang="de" href="version/1/3/0/de/" /> + <link rel="alternate" hreflang="es" href="version/1/4/es/" /> + <link rel="alternate" hreflang="fr" href="version/1/3/0/fr/" /> + <link rel="alternate" hreflang="hu" href="version/1/3/0/hu/" /> + <link rel="alternate" hreflang="it" href="version/1/3/0/it/" /> + <link rel="alternate" hreflang="ja" href="version/1/3/0/ja/" /> + <link rel="alternate" hreflang="pl" href="version/1/4/pl/" /> + <link rel="alternate" hreflang="pt" href="version/1/3/0/pt/" /> + <link rel="alternate" hreflang="pt" href="version/1/3/0/pt_br/" /> + <link rel="alternate" hreflang="ru" href="version/1/3/0/ru/" /> + <link rel="alternate" hreflang="sl" href="version/1/4/sl/" /> + <link rel="alternate" hreflang="uk" href="version/1/4/uk/" /> +</head> + +<body> + +<h1>Contributor Covenant Code of Conduct</h1> + +<h2>Our Pledge</h2> + +<p>In the interest of fostering an open and welcoming environment, we as +contributors and maintainers pledge to making participation in our project and +our community a harassment-free experience for everyone, regardless of age, body +size, disability, ethnicity, gender identity and expression, level of experience, +nationality, personal appearance, race, religion, or sexual identity and +orientation.</p> + +<h2>Our Standards</h2> + +<p>Examples of behavior that contributes to creating a positive environment +include:</p> + +<ul> + <li>Using welcoming and inclusive language</li> + <li>Being respectful of differing viewpoints and experiences</li> + <li>Gracefully accepting constructive criticism</li> + <li>Focusing on what is best for the community</li> + <li>Showing empathy towards other community members</li> +</ul> + +<p>Examples of unacceptable behavior by participants include:</p> + +<ul> + <li>The use of sexualized language or imagery and unwelcome sexual attention or advances</li> + <li>Trolling, insulting/derogatory comments, and personal or political attacks</li> + <li>Public or private harassment</li> + <li>Publishing others' private information, such as a physical or electronic address, without explicit permission</li> + <li>Other conduct which could reasonably be considered inappropriate in a professional setting</li> +</ul> + +<h2>Our Responsibilities</h2> + +<p>Project maintainers are responsible for clarifying the standards of acceptable +behavior and are expected to take appropriate and fair corrective action in +response to any instances of unacceptable behavior.</p> + +<p>Project maintainers have the right and responsibility to remove, edit, or +reject comments, commits, code, wiki edits, issues, and other contributions +that are not aligned to this Code of Conduct, or to ban temporarily or +permanently any contributor for other behaviors that they deem inappropriate, +threatening, offensive, or harmful.</p> + +<h2>Scope</h2> + +<p>This Code of Conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. Examples of +representing a project or community include using an official project e-mail +address, posting via an official social media account, or acting as an appointed +representative at an online or offline event. Representation of a project may be +further defined and clarified by project maintainers.</p> + +<h2>Enforcement</h2> + +<p>Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported by contacting the project team at project@hubzilla.org. All +complaints will be reviewed and investigated and will result in a response that +is deemed necessary and appropriate to the circumstances. The project team is +obligated to maintain confidentiality with regard to the reporter of an incident. +Further details of specific enforcement policies may be posted separately.</p> + +<p>Project maintainers who do not follow or enforce the Code of Conduct in good +faith may face temporary or permanent repercussions as determined by other +members of the project's leadership.</p> + +<h2>Attribution</h2> + +<p>This Code of Conduct is adapted from the <a href="http://contributor-covenant.org">Contributor Covenant</a>, version 1.4, +available at <a href="http://contributor-covenant.org/version/1/4/">http://contributor-covenant.org/version/1/4</a>.</p> + +</body> +</html> diff --git a/doc/develop.bb b/doc/develop.bb index ef3ea5bd0..20e987a5a 100644 --- a/doc/develop.bb +++ b/doc/develop.bb @@ -20,12 +20,12 @@ [zrl=[baseurl]/help/api_posting]Posting to $Projectname using the API[/zrl] [zrl=[baseurl]/help/developer_function_primer]Red Functions 101[/zrl] [zrl=[baseurl]/doc/html/]Code Reference (Doxygen generated - sets cookies)[/zrl] -[zrl=[baseurl]/help/to_do_doco]To-Do list for the $Projectname Documentation Project[/zrl] +[zrl=[baseurl]/help/to_do_doco]To-Do list for $Projectname Documentation Project[/zrl] [zrl=[baseurl]/help/to_do_code]To-Do list for Developers[/zrl] [zrl=[baseurl]/help/roadmap]Roadmap[/zrl] [zrl=[baseurl]/help/git_for_non_developers]Git for Non-Developers[/zrl] [zrl=[baseurl]/help/dev_beginner]Step-for-step manual for beginning developers[/zrl] [h3]External Resources[/h3] -[url=https://zothub.com/channel/one]Development Channel[/url] +[url=https://grid.reticu.li/channel/hubzilla]Development Channel[/url] [url=https://federated.social/channel/postgres]Postgres-specific $Projectname Admin Support Channel[/url] diff --git a/doc/developers.bb b/doc/developers.bb index 6f7752577..f8489640b 100644 --- a/doc/developers.bb +++ b/doc/developers.bb @@ -1,6 +1,6 @@ [b]$Projectname Developer Guide[/b]
-We're pretty relaxed when it comes to developers. We don't have a lot of rules. Some of us are over-worked and if you want to help we're happy to let you help. That said, attention to a few guidelines will make the process smoother and make it easier to work together. We have developers from across the globe with different abilities and different cultural backgrounds and different levels of patience. Our primary rule is to respect others. Sometimes this is hard and sometimes we have very different opinions of how things should work, but if everybody makes an effort, we'll get along just fine.
+We're pretty relaxed when it comes to developers. We don't have a lot of rules. Some of us are over-worked and if you want to help we're happy to let you help. That said, attention to a few guidelines will make the process smoother and make it easier to work together. All developers are expected to abide by our [zrl=[baseurl]/help/contributor/covenant]code of conduct[/zrl]. We have developers from across the globe with different abilities and different cultural backgrounds and different levels of patience. Our primary rule is to respect others. Sometimes this is hard and sometimes we have very different opinions of how things should work, but if everybody makes an effort, we'll get along just fine.
[b]Here is how you can join us.[/b]
@@ -19,7 +19,7 @@ to notify us to merge your work. [b]Translations[/b]
-Our translations are managed through Transifex. If you wish to help out translating the $Projectname to another language, sign up on transifex.com, visit [url=https://www.transifex.com/projects/p/red-matrix/]https://www.transifex.com/projects/p/red-matrix/[/url] and request to join one of the existing language teams or create a new one. Notify one of the core developers when you have a translation update which requires merging, or ask about merging it yourself if you're comfortable with git and PHP. We have a string file called 'messages.po' which is gettext compliant and a handful of email templates, and from there we automatically generate the application's language files.
+Our translations are managed through Transifex. If you wish to help out translating $Projectname to another language, sign up on transifex.com, visit [url=https://www.transifex.com/projects/p/red-matrix/]https://www.transifex.com/projects/p/red-matrix/[/url] and request to join one of the existing language teams or create a new one. Notify one of the core developers when you have a translation update which requires merging, or ask about merging it yourself if you're comfortable with git and PHP. We have a string file called 'messages.po' which is gettext compliant and a handful of email templates, and from there we automatically generate the application's language files.
[zrl=[baseurl]/help/Translations]Translations - More Info[/zrl]
diff --git a/doc/extra_features.bb b/doc/extra_features.bb index 9fb43d9a1..0044a06a7 100644 --- a/doc/extra_features.bb +++ b/doc/extra_features.bb @@ -1,7 +1,7 @@ // multiple of these have been enabled by default. should we note this here somewhere, move it or remove them from this file?
[b]Features[/b]
-The default interface of the $Projectname was designed to be uncluttered. There are a huge number of extra features (some of which are extremely useful) which you can turn on and get the most of the application. These are found under the Extra Features link of your Settings page.
+The default interface of $Projectname was designed to be uncluttered. There are a huge number of extra features (some of which are extremely useful) which you can turn on and get the most of the application. These are found under the Extra Features link of your Settings page.
[b]Content Expiration[/b]
diff --git a/doc/faq_admins.bb b/doc/faq_admins.bb index 63418c1dc..0b54a41de 100644 --- a/doc/faq_admins.bb +++ b/doc/faq_admins.bb @@ -1,4 +1,4 @@ -[size=large][b]The $Projectname FAQ[/b][/size] +[size=large][b]$Projectname FAQ[/b][/size] [toc] diff --git a/doc/faq_members.bb b/doc/faq_members.bb index 7af61df9b..c7f50314d 100644 --- a/doc/faq_members.bb +++ b/doc/faq_members.bb @@ -1,11 +1,11 @@ -[size=large][b]The $Projectname FAQ[/b][/size] +[size=large][b]$Projectname FAQ[/b][/size] [toc] [h3]I am able to edit a post's text after I saved it, but is there a way to change the permissions?[/h3] Short anser: No, there isn't. There are reasons. You are able to change permissons to your files, photos and the likes, but not to posts after you have saved them. The main reason is: Once you have saved a post it is being distributed either to the public channel and from there to other $Projectname servers or to those you intended it to go. Just like you cannot reclaim something you gave to another person, you cannot change permissions to $Projectname posts. We would need to track everywhere your posting goes, keep track of everyone you allowed to see it and then keep track of from whom to delete it. -If a posting is public this is even harder, as the $Projectname is a global network and there is no way to follow a post, let alone reclaim it reliably. Other networks that may receive your post have no reliable way to delete or reclaim the post. +If a posting is public this is even harder, as $Projectname is a global network and there is no way to follow a post, let alone reclaim it reliably. Other networks that may receive your post have no reliable way to delete or reclaim the post. [h3]I downloaded my channel and imported it (cloned my identity) to another site but there is no content, no posts, no photos. What is wrong???[/h3] Posts and photos/files are provided separately from the channel basic information. This is due to memory limitations dealing with years of conversations and photo archives. Posts and conversations can be synced separately from the basic channel information. Photos and file archives can be transferred using a plugin tool such as 'redfiles', which is currently listed as "experimental". When creating this feature we thought that keeping all your contacts was the most important task. Your friends have already seen your old content. Posts/conversations were next in priority and these may now be synced. Files and photos are the last bit to get completely working. Once we find someone willing to finish implementing this, it will be done. :) diff --git a/doc/feature/access_tokens.bb b/doc/feature/access_tokens.bb new file mode 100644 index 000000000..eb5c03717 --- /dev/null +++ b/doc/feature/access_tokens.bb @@ -0,0 +1,47 @@ +Feature: Zot Access Tokens +Status: Draft +Date: 15 July 2016 + + +Purpose: + +In order to facilitate sharing of private resources with non-members or members of federation nodes with limited identification discovery, Hubzilla should provide members with a mechanism to create and manage temporary ("throwaway") logins, aka "Zot Access Tokens". These tokens/credentials may be used to authenticate to a hubzilla site for the sole purpose of accessing privileged or access controlled resources (files, photos, posts, webpages, chatrooms, etc.). + + +Scope: + +Zot Access Tokens do not convey membership in the site or network. In particular, they do not provide an account or channel; which may be necessary to interact with the hub owner or with others in the network or federation of networks. In most cases they can only be used to consume restricted resources and do not have an ability to create those resources, however this ability may be provided by custom configurations or in future releases or addons. + +For instance the ability for a temporary login to access a chatroom may provide suitable permission to create chat messages inside that chatroom. + + +Implementation: + +Zot Access Tokens are managed through a "tab" of the settings page. Access to this tab may be controlled by site configuration. On this page, channels may create, edit, list, and remove any access tokens under their control. + +The form to create/edit accepts three parameters, a human readable name, a password or access token, and an optional expiration. Once expired, the access token is no longer valid, may no longer be used, and will be automatically purged from the list of temporary accounts. The password field in the create/edit forms displays the text of the access token and not an obscured password. By default we will create a token using the autoname() function, which generally produces a random character sequence which is "pronounceable", hence easy to convey or remember. This can be changed to any other character sequence which is acceptable to the site password complexity policy. (In most Hubzilla installations this imposes a minimum of three characters, but may be extended by plugin or site policy). + + +Usage: + +We do not specify mechanisms for sharing these tokens with others. Any communication method may be used. Any tokens you have created are added to the Access Control List selector and may be used anywhere that Access Control Lists are provided. + + Example: A visitor arrives at your site. She has an access token you have provided, and attempts to visit one of your photo albums (which is restricted to be viewed only by yourself and one temporary identity). Permission is denied. + +The visitor now selects "Login" from the menu navigation bar. This presents a login page. She enters the name and password you have provided her, and she can now view the restricted photo album. + + +Alternatively, you may share a link to a protected file by adding a parameter "&zat=abc123" to the URL, where the string "abc123" is the access token or password for the temporary login. No further negotiation is required, and the file is presented. + +Zot Acess Tokens are represented internally as an authenticated "observer". Querying the observer in code should return a pseudo or system generated xchan with an unknown protocol and a default profile photo. It will match (successfully) any access control rule which allows authenticated observers. + +Security Considerations: + +The URL form of authentication is inherently less secure than using a login, but may be preferable for some uses of this feature. It probably should not be transmitted over non-SSL links. + + +Future development: + +It might be desirable for future implementations to provide an options for single-use, where the access token is removed promptly following first use. + +
\ No newline at end of file diff --git a/doc/hidden_configs.bb b/doc/hidden_configs.bb index 6e093dbfc..35408c037 100644 --- a/doc/hidden_configs.bb +++ b/doc/hidden_configs.bb @@ -67,7 +67,7 @@ Options are: [*= system.paranoia ] As the pconfig, but on a site-wide basis. Can be overwritten by member settings. [*= system.photo_cache_time ] How long to cache photos, in seconds. Default is 86400 (1 day). Longer time increases performance, but it also means it takes longer for changed permissions to apply. [*= system.platform_name ] What to report as the platform name in webpages and statistics. (*) Must be set in .htconfig.php - [*= system.poco_rating_enable ] Distributed reputation reporting and data collection may be disabled. If your site does not participate in distributed reputation you will also not be able to make use of the data from your connections on other sites. By default and in the absence of any setting it is enabled. Individual members can opt out by restricting who can see their connections or by not providing any reputation information for their connections. + [*= system.rating_enabled ] Distributed reputation reporting and data collection. This feature is currently being re-worked. [*= system.poke_basic ] Reduce the number of poke verbs to exactly 1 ("poke"). Disable other verbs. [*= system.proc_run_use_exec ] If 1, use the exec system call in proc_run to run background tasks. By default we use proc_open and proc_close. On some (currently rare) systems this does not work well. [*= system.projecthome ] Display the project page on your home page for logged out viewers. diff --git a/doc/permissions.bb b/doc/permissions.bb index cc831dd61..0721c763d 100644 --- a/doc/permissions.bb +++ b/doc/permissions.bb @@ -28,7 +28,7 @@ We highly recommend that you use the "typical social network" settings when you [*= Anybody On This Hub ] Anybody with a channel on the same hub/website as you will have permission approved. Anybody who is registered at a different hub will have this permission denied.
- [*= Anybody in this network ] Anybody in the $Projectname will have this permission approved. Even complete strangers. However, anybody not logged in/authenticated will have this permission denied.
+ [*= Anybody in this network ] Anybody in $Projectname will have this permission approved. Even complete strangers. However, anybody not logged in/authenticated will have this permission denied.
[*= Anybody authenticated ] This is similar to "anybody in this network" except that it can include anybody who can authenticate by any means - and therefore [i]may[/i] include visitors from other networks.
diff --git a/doc/plugins.bb b/doc/plugins.bb index f2f0b04e8..a320de790 100644 --- a/doc/plugins.bb +++ b/doc/plugins.bb @@ -45,7 +45,7 @@ In our case, we'll call them randplace_load() and randplace_unload(), as that is pluginname_uninstall()
[/code]
-Next we'll talk about [b]hooks[/b]. Hooks are places in the $Projectname code where we allow plugins to do stuff. There are a [url=[baseurl]/help/hooklist]lot of these[/url], and they each have a name. What we normally do is use the pluginname_load() function to register a "handler function" for any hooks you are interested in. Then when any of these hooks are triggered, your code will be called.
+Next we'll talk about [b]hooks[/b]. Hooks are places in $Projectname code where we allow plugins to do stuff. There are a [url=[baseurl]/help/hooklist]lot of these[/url], and they each have a name. What we normally do is use the pluginname_load() function to register a "handler function" for any hooks you are interested in. Then when any of these hooks are triggered, your code will be called.
We register hook handlers with the 'Zotlabs\Extend\Hook::register()' function. It typically takes 3 arguments. The first is the hook we wish to catch, the second is the filename of the file to find our handler function (relative to the base of your $Projectname installation), and the third is the function name of your handler function. So let's create our randplace_load() function right now.
@@ -295,13 +295,13 @@ If you want to keep your plugin hidden from the siteinfo page, simply create a f ***Porting Friendica Plugins***
-The $Projectname uses a similar plugin architecture to the Friendica project. The authentication, identity, and permissions systems are completely different. Many Friendica can be ported reasonably easily by renaming a few functions - and then ensuring that the permissions model is adhered to. The functions which need to be renamed are:
+$Projectname uses a similar plugin architecture to the Friendica project. The authentication, identity, and permissions systems are completely different. Many Friendica can be ported reasonably easily by renaming a few functions - and then ensuring that the permissions model is adhered to. The functions which need to be renamed are:
[li] Friendica's pluginname_install() is pluginname_load()[/li]
[li] Friendica's pluginname_uninstall() is pluginname_unload()[/li]
-The $Projectname has _install and _uninstall functions but these are used differently.
+$Projectname has _install and _uninstall functions but these are used differently.
[li] Friendica's "plugin_settings" hook is called "feature_settings"[/li]
diff --git a/doc/problems-following-an-update.bb b/doc/problems-following-an-update.bb index 3bc7e9a51..2d1fefc5b 100644 --- a/doc/problems-following-an-update.bb +++ b/doc/problems-following-an-update.bb @@ -28,7 +28,7 @@ We use the Smarty3 template engine to generate pages. These templates are compi [b]Theme Issues[/b]
-There are many themes for The $Projectname. Only Redbasic is officialy supported by the core developers. This applies [i]even if a core developer happens to support an additional theme[/i]. This means new features are only guaranteed to work in Redbasic.
+There are many themes for $Projectname. Only Redbasic is officialy supported by the core developers. This applies [i]even if a core developer happens to support an additional theme[/i]. This means new features are only guaranteed to work in Redbasic.
Redbasic uses a few javascript libraries that are done differently, or entirely absent in other themes. This means new features may only work properly in Redbasic. Before reporting an issue, therefore, you should switch to Redbasic to see if it exists there. If the issue goes away, this is not a bug - it's a theme that isn't up to date.
diff --git a/doc/red2pi.bb b/doc/red2pi.bb index 18e7d325a..28db7dc70 100644 --- a/doc/red2pi.bb +++ b/doc/red2pi.bb @@ -1,4 +1,4 @@ -[b]How to install the $Projectname on a Raspberry Pi[/b]
+[b]How to install $Projectname on a Raspberry Pi[/b]
You just bought a Raspberry Pi and want to run the RED Matrix with your own domain name?
diff --git a/doc/sv/main.bb b/doc/sv/main.bb index a5c1d4f7a..1ab77a499 100644 --- a/doc/sv/main.bb +++ b/doc/sv/main.bb @@ -13,7 +13,7 @@ Zot är en fantastisk ny kommunikationsprotokoll uppfunnit speciellt för $Proje [h3]Kom igång[/h3]
[zrl=[baseurl]/help/Privacy]Privacy Policy[/zrl]
[zrl=[baseurl]/help/registration]Account Registration[/zrl]
-[zrl=[baseurl]/help/accounts_profiles_channels_basics]You at the $Projectname: accounts, profiles and channels in short[/zrl]
+[zrl=[baseurl]/help/accounts_profiles_channels_basics]You at $Projectname: accounts, profiles and channels in short[/zrl]
[zrl=[baseurl]/help/profiles]Profiles[/zrl]
[zrl=[baseurl]/help/channels]Channels[/zrl]
[zrl=[baseurl]/help/sv/roles]Behörighetsförval för kanaler[/zrl]
diff --git a/doc/zot.md b/doc/zot.md index 1e454e495..06c4d6083 100644 --- a/doc/zot.md +++ b/doc/zot.md @@ -57,7 +57,7 @@ In order to implement high performance communications, the data transfer format Bi-directional encryption is based on RSA 4096-bit keys expressed in DER/ASN.1 format using the PKCS#8 encoding variant, with AES-256-CBC used for block encryption of variable length or large items. -Some aspects of well known "federation protocols" (webfinger, salmon, activitystreams, portablecontacts, etc.) may be used in zot, but we are not tied to them and will not be bound by them. The $Projectname project is attempting some rather novel developments in decentralised communications and if there is any need to diverge from such "standard protocols" we will do so without question or hesitation. +Some aspects of well known "federation protocols" (webfinger, salmon, activitystreams, portablecontacts, etc.) may be used in zot, but we are not tied to them and will not be bound by them. $Projectname project is attempting some rather novel developments in decentralised communications and if there is any need to diverge from such "standard protocols" we will do so without question or hesitation. In order to create a globally unique ID, we will base it on a whirlpool hash of the identity URL of the origination node and a psuedo-random number, which should provide us with a 256 bit ID with an extremely low probability of collision (256 bits represents approximately 115 quattuorviginitillion or 1.16 X 10^77 unique numbers). This will be represented in communications as a base64url-encoded string. We will not depend on probabilities however and the ID must also be attached to a public key with public key cryptography used to provide an assurance of identity which has not been copied or somehow collided in whirlpool hash space. diff --git a/include/acl_selectors.php b/include/acl_selectors.php index 9bee942e2..362776b44 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -148,11 +148,6 @@ function populate_acl($defaults = null,$show_jotnets = true, $emptyACL_descripti array_walk($deny_cid,'fixacl'); array_walk($deny_gid,'fixacl'); } - - $jotnets = ''; - if($show_jotnets) { - call_hooks('jot_networks', $jotnets); - } $r = q("SELECT id, hash, gname FROM groups WHERE deleted = 0 AND uid = %d ORDER BY gname ASC", intval(local_channel()) @@ -181,8 +176,6 @@ function populate_acl($defaults = null,$show_jotnets = true, $emptyACL_descripti '$allowgid' => json_encode($allow_gid), '$denycid' => json_encode($deny_cid), '$denygid' => json_encode($deny_gid), - '$jnetModalTitle' => t('Other networks and post services'), - '$jotnets' => $jotnets, '$aclModalTitle' => t('Permissions'), '$aclModalDesc' => $dialog_description, '$aclModalDismiss' => t('Close'), diff --git a/include/attach.php b/include/attach.php index 172840b96..ae7d71dc7 100644 --- a/include/attach.php +++ b/include/attach.php @@ -1994,3 +1994,128 @@ function get_filename_by_cloudname($cloudname, $channel, $storepath) { } return null; } + +/** + * attach_move() + * This function performs an in place directory-to-directory move of a stored attachment or photo. + * The data is physically moved in the store/nickname storage location and the paths adjusted + * in the attach structure (and if applicable the photo table). The new 'album name' is recorded + * for photos and will show up immediately there. + * This takes a channel_id, attach.hash of the file to move (this is the same as a photo resource_id), and + * the attach.hash of the new parent folder, which must already exist. If $new_folder_hash is blank or empty, + * the file is relocated to the root of the channel's storage area. + * + * @fixme: this operation is currently not synced to clones !! + */ + +function attach_move($channel_id,$resource_id,$new_folder_hash) { + + $c = channelx_by_n($channel_id); + if(! $c) + return false; + + $r = q("select * from attach where hash = '%s' and uid = %d limit 1", + dbesc($resource_id), + intval($channel_id) + ); + if(! $r) + return false; + + $oldstorepath = $r[0]['content']; + + if($new_folder_hash) { + $n = q("select * from attach where hash = '%s' and uid = %d limit 1", + dbesc($new_folder_hash), + intval($channel_id) + ); + if(! $n) + return; + $newdirname = $n[0]['filename']; + $newstorepath = $n[0]['content'] . '/' . $resource_id; + } + else { + $newstorepath = 'store/' . $c['channel_address'] . '/' . $resource_id; + } + + rename($oldstorepath,$newstorepath); + + // duplicate detection. If 'overwrite' is specified, return false because we can't yet do that. + + $filename = $r[0]['filename']; + + $s = q("select filename, id, hash, filesize from attach where filename = '%s' and folder = '%s' ", + dbesc($filename), + dbesc($new_folder_hash) + ); + + if($s) { + $overwrite = get_pconfig($channel_id,'system','overwrite_dup_files'); + if($overwrite) { + // @fixme + return; + } + else { + if(strpos($filename,'.') !== false) { + $basename = substr($filename,0,strrpos($filename,'.')); + $ext = substr($filename,strrpos($filename,'.')); + } + else { + $basename = $filename; + $ext = ''; + } + + $v = q("select filename from attach where ( filename = '%s' OR filename like '%s' ) and folder = '%s' ", + dbesc($basename . $ext), + dbesc($basename . '(%)' . $ext), + dbesc($new_folder_hash) + ); + + if($v) { + $x = 1; + + do { + $found = false; + foreach($v as $vv) { + if($vv['filename'] === $basename . '(' . $x . ')' . $ext) { + $found = true; + break; + } + } + if($found) + $x++; + } + while($found); + $filename = $basename . '(' . $x . ')' . $ext; + } + else + $filename = $basename . $ext; + } + } + + $t = q("update attach set content = '%s', folder = '%s', filename = '%s' where id = %d", + dbesc($newstorepath), + dbesc($new_folder_hash), + dbesc($filename), + intval($r[0]['id']) + ); + + if($r[0]['is_photo']) { + $t = q("update photo set album = '%s', filename = '%s' where resource_id = '%s' and uid = %d", + dbesc($newdirname), + dbesc($filename), + dbesc($resource_id), + intval($channel_id) + ); + + $t = q("update photo set content = '%s' where resource_id = '%s' and uid = %d and imgscale = 0", + dbesc($newstorepath), + dbesc($resource_id), + intval($channel_id) + ); + } + + return true; + +} + + diff --git a/include/channel.php b/include/channel.php index 1179697a4..2c892dbb9 100644 --- a/include/channel.php +++ b/include/channel.php @@ -1103,8 +1103,8 @@ function profile_sidebar($profile, $block = 0, $show_connect = true, $zcard = fa require_once('include/widgets.php'); - if(! feature_enabled($profile['uid'],'hide_rating')) - $z = widget_rating(array('target' => $profile['channel_hash'])); +// if(! feature_enabled($profile['uid'],'hide_rating')) + $z = widget_rating(array('target' => $profile['channel_hash'])); $o .= replace_macros($tpl, array( '$zcard' => $zcard, @@ -1381,6 +1381,11 @@ function zid($s,$address = '') { if (! strlen($s) || strpos($s,'zid=')) return $s; + $m = parse_url($s); + $fragment = ((array_key_exists('fragment',$m) && $m['fragment']) ? $m['fragment'] : false); + if($fragment !== false) + $s = str_replace('#' . $fragment,'',$s); + $has_params = ((strpos($s,'?')) ? true : false); $num_slashes = substr_count($s, '/'); if (! $has_params) @@ -1401,6 +1406,11 @@ function zid($s,$address = '') { else $zurl = $s; + // put fragment at the end + + if($fragment) + $zurl .= '#' . $fragment; + $arr = array('url' => $s, 'zid' => urlencode($myaddr), 'result' => $zurl); call_hooks('zid', $arr); diff --git a/include/conversation.php b/include/conversation.php index 7d1473fe2..2e056b620 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -941,12 +941,9 @@ function item_photo_menu($item){ $clean_url = normalise_link($item['author-link']); } - $poco_rating = get_config('system','poco_rating_enable'); - // if unset default to enabled - if($poco_rating === false) - $poco_rating = true; + $rating_enabled = get_config('system','rating_enabled'); - $ratings_url = (($poco_rating) ? z_root() . '/ratings/' . urlencode($item['author_xchan']) : ''); + $ratings_url = (($rating_enabled) ? z_root() . '/ratings/' . urlencode($item['author_xchan']) : ''); $post_menu = Array( t("View Source") => $vsrc_link, @@ -1200,8 +1197,6 @@ function status_editor($a, $x, $popup = false) { $tpl = get_markup_template('jot.tpl'); - $jotplugins = ''; - $preview = t('Preview'); if(x($x, 'hide_preview')) $preview = ''; @@ -1218,8 +1213,14 @@ function status_editor($a, $x, $popup = false) { if(! $cipher) $cipher = 'aes256'; + $jotplugins = ''; call_hooks('jot_tool', $jotplugins); + $jotnets = ''; + if(x($x,'jotnets')) { + call_hooks('jot_networks', $jotnets); + } + $o .= replace_macros($tpl, array( '$return_path' => ((x($x, 'return_path')) ? $x['return_path'] : App::$query_string), '$action' => z_root() . '/item', @@ -1276,6 +1277,8 @@ function status_editor($a, $x, $popup = false) { '$preview' => $preview, '$source' => ((x($x, 'source')) ? $x['source'] : ''), '$jotplugins' => $jotplugins, + '$jotnets' => $jotnets, + '$jotnets_label' => t('Other networks and post services'), '$defexpire' => $defexpire, '$feature_expire' => $feature_expire, '$expires' => t('Set expiration date'), diff --git a/include/dba/dba_driver.php b/include/dba/dba_driver.php index f6091f6e1..7225a9be2 100755 --- a/include/dba/dba_driver.php +++ b/include/dba/dba_driver.php @@ -62,6 +62,8 @@ class DBA { if(is_object(self::$dba) && self::$dba->connected) { + if($server === 'localhost') + $port = $set_port; $dns = ((self::$dbtype == DBTYPE_POSTGRES) ? 'postgres' : 'mysql') . ':host=' . $server . (is_null($port) ? '' : ';port=' . $port) . ';dbname=' . $db; diff --git a/include/features.php b/include/features.php index 356de35a2..4e86b7881 100644 --- a/include/features.php +++ b/include/features.php @@ -55,21 +55,18 @@ function get_features($filtered = true) { array('profile_export', t('Profile Import/Export'), t('Save and load profile details across sites/channels'),false,get_config('feature_lock','profile_export')), array('webpages', t('Web Pages'), t('Provide managed web pages on your channel'),false,get_config('feature_lock','webpages')), array('wiki', t('Wiki'), t('Provide a wiki for your channel'),(($server_role === 'basic') ? false : true),get_config('feature_lock','wiki')), - array('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')), +// array('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')), array('private_notes', t('Private Notes'), t('Enables a tool to store notes and reminders (note: not encrypted)'),false,get_config('feature_lock','private_notes')), array('nav_channel_select', t('Navigation Channel Select'), t('Change channels directly from within the navigation dropdown menu'),false,get_config('feature_lock','nav_channel_select')), array('photo_location', t('Photo Location'), t('If location data is available on uploaded photos, link this to a map.'),false,get_config('feature_lock','photo_location')), array('ajaxchat', t('Access Controlled Chatrooms'), t('Provide chatrooms and chat services with access control.'),true,get_config('feature_lock','ajaxchat')), array('smart_birthdays', t('Smart Birthdays'), t('Make birthday events timezone aware in case your friends are scattered across the planet.'),true,get_config('feature_lock','smart_birthdays')), array('expert', t('Expert Mode'), t('Enable Expert Mode to provide advanced configuration options'),false,get_config('feature_lock','expert')), - array('premium_channel', t('Premium Channel'), t('Allows you to set restrictions and terms on those that connect with your channel'),false,get_config('feature_lock','premium_channel')), ), // Post composition 'composition' => array( t('Post Composition Features'), -// array('richtext', t('Richtext Editor'), t('Enable richtext editor'),falseget_config('feature_lock','richtext')), -// array('markdown', t('Use Markdown'), t('Allow use of "Markdown" to format posts'),false,get_config('feature_lock','markdown')), array('large_photos', t('Large Photos'), t('Include large (1024px) photo thumbnails in posts. If not enabled, use small (640px) photo thumbnails'),false,get_config('feature_lock','large_photos')), array('channel_sources', t('Channel Sources'), t('Automatically import channel content from other channels or feeds'),false,get_config('feature_lock','channel_sources')), array('content_encrypt', t('Even More Encryption'), t('Allow optional encryption of content end-to-end with a shared secret key'),false,get_config('feature_lock','content_encrypt')), @@ -106,6 +103,18 @@ function get_features($filtered = true) { ), ); + + + if(\Zotlabs\Lib\System::get_server_role() === 'pro') { + $arr['general'][] = [ + 'premium_channel', + t('Premium Channel'), + t('Allows you to set restrictions and terms on those that connect with your channel'), + false, + get_config('feature_lock','premium_channel') + ]; + } + // removed any locked features and remove the entire category if this makes it empty if($filtered) { diff --git a/include/help.php b/include/help.php index 7f57f3334..4bcc09670 100644 --- a/include/help.php +++ b/include/help.php @@ -40,8 +40,13 @@ function search_doc_files($s) { $r = fetch_post_tags($r,true); for($x = 0; $x < count($r); $x ++) { - - $r[$x]['text'] = $r[$x]['body']; + $position = stripos($r[$x]['body'], $s); + $dislen = 300; + $start = $position-floor($dislen/2); + if ( $start < 0) { + $start = 0; + } + $r[$x]['text'] = substr($r[$x]['body'], $start, $dislen); $r[$x]['rank'] = 0; if($r[$x]['term']) { diff --git a/include/items.php b/include/items.php index 0373dcb0d..53a7b7927 100755 --- a/include/items.php +++ b/include/items.php @@ -113,6 +113,26 @@ function collect_recipients($item, &$private_envelope) { // if($policy === 'pub') // $recipients[] = $sys['xchan_hash']; } + + // Add the authors of any posts in this thread, if they are known to us. + // This is specifically designed to forward wall-to-wall posts to the original author, + // in case they aren't a connection but have permission to write on our wall. + // This is important for issue tracker channels. It should be a no-op for most channels. + // Whether or not they will accept the delivery is not determined here, but should + // be taken into account by zot:process_delivery() + + $r = q("select author_xchan from item where parent = %d", + intval($item['parent']) + ); + if($r) { + foreach($r as $rv) { + if(! in_array($rv['author_xchan'],$recipients)) { + $recipients[] = $rv['author_xchan']; + } + } + } + + } // This is a somewhat expensive operation but important. @@ -695,8 +715,9 @@ function get_item_elements($x,$allow_code = false) { // hub and verify that they are legit - or else we're going to toss the post. We only need to do this // once, and after that your hub knows them. Sure some info is in the post, but it's only a transit identifier // and not enough info to be able to look you up from your hash - which is the only thing stored with the post. - - if(($xchan_hash = import_author_xchan($x['author'])) !== false) + + $xchan_hash = import_author_xchan($x['author']); + if($xchan_hash) $arr['author_xchan'] = $xchan_hash; else return array(); @@ -705,7 +726,8 @@ function get_item_elements($x,$allow_code = false) { if($arr['author_xchan'] === make_xchan_hash($x['owner']['guid'],$x['owner']['guid_sig'])) $arr['owner_xchan'] = $arr['author_xchan']; else { - if(($xchan_hash = import_author_xchan($x['owner'])) !== false) + $xchan_hash = import_author_xchan($x['owner']); + if($xchan_hash) $arr['owner_xchan'] = $xchan_hash; else return array(); @@ -1166,7 +1188,7 @@ function encode_item_xchan($xchan) { $ret['name'] = $xchan['xchan_name']; $ret['address'] = $xchan['xchan_addr']; - $ret['url'] = (($xchan['hubloc_url']) ? $xchan['hubloc_url'] : $xchan['xchan_url']); + $ret['url'] = $xchan['xchan_url']; $ret['network'] = $xchan['xchan_network']; $ret['photo'] = array('mimetype' => $xchan['xchan_photo_mimetype'], 'src' => $xchan['xchan_photo_m']); $ret['guid'] = $xchan['xchan_guid']; @@ -1625,8 +1647,21 @@ function item_store($arr, $allow_exec = false, $deliver = true) { $arr['commented'] = ((x($arr,'commented') !== false) ? datetime_convert('UTC','UTC',$arr['commented']) : datetime_convert()); $arr['comments_closed'] = ((x($arr,'comments_closed') !== false) ? datetime_convert('UTC','UTC',$arr['comments_closed']) : NULL_DATE); - $arr['received'] = datetime_convert(); - $arr['changed'] = datetime_convert(); + if($deliver) { + $arr['received'] = datetime_convert(); + $arr['changed'] = datetime_convert(); + } + else { + + // When deliver flag is false, we are *probably* performing an import or bulk migration. + // If one updates the changed timestamp it will be made available to zotfeed and delivery + // will still take place through backdoor methods. Since these fields are rarely used + // otherwise, just preserve the original timestamp. + + $arr['received'] = ((x($arr,'received') !== false) ? datetime_convert('UTC','UTC',$arr['received']) : datetime_convert()); + $arr['changed'] = ((x($arr,'changed') !== false) ? datetime_convert('UTC','UTC',$arr['changed']) : datetime_convert()); + } + $arr['location'] = ((x($arr,'location')) ? notags(trim($arr['location'])) : ''); $arr['coord'] = ((x($arr,'coord')) ? notags(trim($arr['coord'])) : ''); $arr['parent_mid'] = ((x($arr,'parent_mid')) ? notags(trim($arr['parent_mid'])) : ''); @@ -2033,8 +2068,22 @@ function item_store_update($arr,$allow_exec = false, $deliver = true) { $arr['comments_closed'] = $orig[0]['comments_closed']; $arr['commented'] = $orig[0]['commented']; - $arr['received'] = datetime_convert(); - $arr['changed'] = datetime_convert(); + + if($deliver) { + $arr['received'] = datetime_convert(); + $arr['changed'] = datetime_convert(); + } + else { + + // When deliver flag is false, we are *probably* performing an import or bulk migration. + // If one updates the changed timestamp it will be made available to zotfeed and delivery + // will still take place through backdoor methods. Since these fields are rarely used + // otherwise, just preserve the original timestamp. + + $arr['received'] = $orig[0]['received']; + $arr['changed'] = $orig[0]['changed']; + } + $arr['route'] = ((array_key_exists('route',$arr)) ? trim($arr['route']) : $orig[0]['route']); $arr['diaspora_meta'] = ((x($arr,'diaspora_meta')) ? $arr['diaspora_meta'] : $orig[0]['diaspora_meta']); $arr['location'] = ((x($arr,'location')) ? notags(trim($arr['location'])) : $orig[0]['location']); diff --git a/include/photos.php b/include/photos.php index d14c12d84..a3018816c 100644 --- a/include/photos.php +++ b/include/photos.php @@ -588,6 +588,8 @@ function photos_album_rename($channel_id, $oldname, $newname) { ); } + + /** * @brief * @@ -713,6 +715,7 @@ function profile_photo_set_profile_perms($uid, $profileid = 0) { if($profileid) { $r = q("SELECT photo, profile_guid, id, is_default, uid FROM profile WHERE uid = %d and ( profile.id = %d OR profile.profile_guid = '%s') LIMIT 1", + intval($uid), intval($profileid), dbesc($profileid) ); diff --git a/include/plugin.php b/include/plugin.php index cb206d944..663d17959 100755 --- a/include/plugin.php +++ b/include/plugin.php @@ -404,6 +404,18 @@ function check_plugin_versions($info) { return false; } } + if(array_key_exists('serverroles',$info)) { + $role = \Zotlabs\Lib\System::get_server_role(); + if(! ( + stristr($info['serverroles'],'*') + || stristr($info['serverroles'],'any') + || stristr($info['serverroles'],$role))) { + logger('serverrole limit: ' . $info['name'],LOGGER_NORMAL,LOG_WARNING); + return false; + + } + } + if(array_key_exists('requires',$info)) { $arr = explode(',',$info['requires']); diff --git a/include/widgets.php b/include/widgets.php index 68db74703..765cb4d42 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -1286,8 +1286,8 @@ function widget_random_block($arr) { function widget_rating($arr) { - $poco_rating = get_config('system','poco_rating_enable'); - if((! $poco_rating) && ($poco_rating !== false)) { + $rating_enabled = get_config('system','rating_enabled'); + if(! $rating_enabled) { return; } diff --git a/include/zot.php b/include/zot.php index 01b29f74b..6187e8a61 100644 --- a/include/zot.php +++ b/include/zot.php @@ -3708,6 +3708,8 @@ function zotinfo($arr) { } } + $ztarget_hash = (($ztarget && $zsig) ? make_xchan_hash($ztarget,$zsig) : '' ); + $r = null; if(strlen($zhash)) { @@ -3785,18 +3787,12 @@ function zotinfo($arr) { } else { // check if it has characteristics of a public forum based on custom permissions. - $t = q("select * from abconfig where abconfig.cat = 'my_perms' and abconfig.chan = %d and abconfig.xchan = '%s' and abconfig.k in ('tag_deliver', 'send_stream') ", - intval($e['channel_id']), - dbesc($e['channel_hash']) - ); - - $ch = 0; - - if($t) { - foreach($t as $tt) { - if($tt['k'] == 'tag_deliver' && $tt['v'] == 1) + $m = \Zotlabs\Access\Permissions::FilledAutoperms($e['channel_id']); + if($m) { + foreach($m as $k => $v) { + if($k == 'tag_deliver' && intval($v) == 1) $ch ++; - if($tt['k'] == 'send_stream' && $tt['v'] == 0) + if($k == 'send_stream' && intval($v) == 0) $ch ++; } if($ch == 2) @@ -3889,9 +3885,6 @@ function zotinfo($arr) { $ret['follow_url'] = z_root() . '/follow?f=&url=%s'; - $ztarget_hash = (($ztarget && $zsig) - ? make_xchan_hash($ztarget,$zsig) - : '' ); $permissions = get_all_perms($e['channel_id'],$ztarget_hash,false); diff --git a/install/htconfig.sample.php b/install/htconfig.sample.php index e5c743ac1..f37b3dc79 100755 --- a/install/htconfig.sample.php +++ b/install/htconfig.sample.php @@ -47,9 +47,9 @@ App::$config['system']['location_hash'] = 'if the auto install failed, put a uni // Choices are 'basic', 'standard', and 'pro'. // basic sets up the sevrer for basic social networking and removes "complicated" features // standard provides most desired features except e-commerce -// pro gives you access to everything +// pro gives you access to everything, but removes cross-platform federation/emulation -App::$config['system']['server_role'] = 'pro'; +App::$config['system']['server_role'] = 'standard'; // These lines set additional security headers to be sent with all responses diff --git a/util/add_addon_repo b/util/add_addon_repo index a8dd9f49a..de19bebfe 100755 --- a/util/add_addon_repo +++ b/util/add_addon_repo @@ -5,16 +5,16 @@ if [ $# -lt 2 ]; then exit 1 fi -if [[ $1 != *"//github.com/redmatrix"* && $3 != 'insecure' ]]; then - echo ""; - echo "This is NOT an official project repository."; - echo "In order to protect you from unverified and"; - echo "possibly malicious content, this repository"; - echo "will not be linked to your site unless you"; - echo "append the word 'insecure' to the command."; - echo ""; - exit 1 -fi +#if [[ $1 != *"//github.com/redmatrix"* && $3 != 'insecure' ]]; then +# echo ""; +# echo "This is NOT an official project repository."; +# echo "In order to protect you from unverified and"; +# echo "possibly malicious content, this repository"; +# echo "will not be linked to your site unless you"; +# echo "append the word 'insecure' to the command."; +# echo ""; +# exit 1 +#fi mkdir -p extend/addon/$2 mkdir addon > /dev/null 2>&1 diff --git a/util/add_theme_repo b/util/add_theme_repo index 8280c447b..1f8e7c1dd 100755 --- a/util/add_theme_repo +++ b/util/add_theme_repo @@ -5,16 +5,16 @@ if [ $# -lt 2 ]; then exit 1 fi -if [[ $1 != *"//github.com/redmatrix"* && $3 != 'insecure' ]]; then - echo ""; - echo "This is NOT an official project repository."; - echo "In order to protect you from unverified and"; - echo "possibly malicious content, this repository"; - echo "will not be linked to your site unless you"; - echo "append the word 'insecure' to the command."; - echo ""; - exit 1 -fi +#if [[ $1 != *"//github.com/redmatrix"* && $3 != 'insecure' ]]; then +# echo ""; +# echo "This is NOT an official project repository."; +# echo "In order to protect you from unverified and"; +# echo "possibly malicious content, this repository"; +# echo "will not be linked to your site unless you"; +# echo "append the word 'insecure' to the command."; +# echo ""; +# exit 1 +#fi mkdir -p extend/theme/$2 git clone $1 extend/theme/$2 diff --git a/util/add_widget_repo b/util/add_widget_repo index e7e316ba4..cb3112626 100755 --- a/util/add_widget_repo +++ b/util/add_widget_repo @@ -5,16 +5,16 @@ if [ $# -lt 2 ]; then exit 1 fi -if [[ $1 != *"//github.com/redmatrix"* && $3 != 'insecure' ]]; then - echo ""; - echo "This is NOT an official project repository."; - echo "In order to protect you from unverified and"; - echo "possibly malicious content, this repository"; - echo "will not be linked to your site unless you"; - echo "append the word 'insecure' to the command."; - echo ""; - exit 1 -fi +#if [[ $1 != *"//github.com/redmatrix"* && $3 != 'insecure' ]]; then +# echo ""; +# echo "This is NOT an official project repository."; +# echo "In order to protect you from unverified and"; +# echo "possibly malicious content, this repository"; +# echo "will not be linked to your site unless you"; +# echo "append the word 'insecure' to the command."; +# echo ""; +# exit 1 +#fi mkdir -p extend/widget/$2 mkdir widget > /dev/null 2>&1 diff --git a/util/hmessages.po b/util/hmessages.po index 99a478c2e..f985f6903 100644 --- a/util/hmessages.po +++ b/util/hmessages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-12 00:02-0700\n" +"POT-Creation-Date: 2016-08-26 00:02-0700\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" @@ -87,9 +87,10 @@ msgstr "" msgid "Special - Group Repository" msgstr "" -#: ../../Zotlabs/Access/PermissionRoles.php:204 ../../include/selectors.php:49 +#: ../../Zotlabs/Access/PermissionRoles.php:204 +#: ../../include/permissions.php:943 ../../include/selectors.php:49 #: ../../include/selectors.php:66 ../../include/selectors.php:104 -#: ../../include/selectors.php:140 ../../include/permissions.php:943 +#: ../../include/selectors.php:140 msgid "Other" msgstr "" @@ -193,14 +194,14 @@ msgstr "" #: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Module/Photos.php:800 #: ../../Zotlabs/Module/Photos.php:1249 #: ../../Zotlabs/Module/Embedphotos.php:147 ../../Zotlabs/Lib/Apps.php:490 -#: ../../Zotlabs/Lib/Apps.php:565 ../../include/conversation.php:1036 -#: ../../include/widgets.php:1613 +#: ../../Zotlabs/Lib/Apps.php:565 ../../include/widgets.php:1613 +#: ../../include/conversation.php:1033 msgid "Unknown" msgstr "" #: ../../Zotlabs/Storage/Browser.php:226 ../../Zotlabs/Module/Fbrowser.php:85 -#: ../../Zotlabs/Lib/Apps.php:217 ../../include/nav.php:95 -#: ../../include/conversation.php:1659 +#: ../../Zotlabs/Lib/Apps.php:217 ../../include/conversation.php:1672 +#: ../../include/nav.php:95 msgid "Files" msgstr "" @@ -213,7 +214,7 @@ msgid "Shared" msgstr "" #: ../../Zotlabs/Storage/Browser.php:230 ../../Zotlabs/Storage/Browser.php:323 -#: ../../Zotlabs/Module/Webpages.php:216 ../../Zotlabs/Module/Menu.php:118 +#: ../../Zotlabs/Module/Menu.php:118 ../../Zotlabs/Module/Webpages.php:216 #: ../../Zotlabs/Module/New_channel.php:142 #: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Layouts.php:184 msgid "Create" @@ -227,10 +228,9 @@ msgstr "" msgid "Upload" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:235 ../../Zotlabs/Module/Chat.php:250 -#: ../../Zotlabs/Module/Settings.php:662 ../../Zotlabs/Module/Settings.php:688 -#: ../../Zotlabs/Module/Admin.php:1223 -#: ../../Zotlabs/Module/Sharedwithme.php:99 +#: ../../Zotlabs/Storage/Browser.php:235 ../../Zotlabs/Module/Settings.php:684 +#: ../../Zotlabs/Module/Settings.php:710 ../../Zotlabs/Module/Admin.php:1236 +#: ../../Zotlabs/Module/Sharedwithme.php:99 ../../Zotlabs/Module/Chat.php:250 msgid "Name" msgstr "" @@ -248,33 +248,34 @@ msgstr "" msgid "Last Modified" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:240 ../../Zotlabs/Module/Webpages.php:217 +#: ../../Zotlabs/Storage/Browser.php:240 #: ../../Zotlabs/Module/Connections.php:290 #: ../../Zotlabs/Module/Connections.php:310 #: ../../Zotlabs/Module/Editblock.php:109 #: ../../Zotlabs/Module/Editlayout.php:114 #: ../../Zotlabs/Module/Editwebpage.php:145 ../../Zotlabs/Module/Menu.php:112 -#: ../../Zotlabs/Module/Editpost.php:84 ../../Zotlabs/Module/Settings.php:722 -#: ../../Zotlabs/Module/Admin.php:2113 ../../Zotlabs/Module/Blocks.php:160 -#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Thing.php:260 -#: ../../Zotlabs/Lib/Apps.php:341 ../../Zotlabs/Lib/ThreadItem.php:106 -#: ../../include/menu.php:113 ../../include/page_widgets.php:9 -#: ../../include/page_widgets.php:39 ../../include/channel.php:959 -#: ../../include/channel.php:963 +#: ../../Zotlabs/Module/Settings.php:744 ../../Zotlabs/Module/Admin.php:2127 +#: ../../Zotlabs/Module/Webpages.php:217 ../../Zotlabs/Module/Blocks.php:160 +#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Editpost.php:84 +#: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Lib/Apps.php:341 +#: ../../Zotlabs/Lib/ThreadItem.php:106 ../../include/channel.php:959 +#: ../../include/channel.php:963 ../../include/page_widgets.php:9 +#: ../../include/page_widgets.php:39 ../../include/menu.php:113 msgid "Edit" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:241 ../../Zotlabs/Module/Webpages.php:219 +#: ../../Zotlabs/Storage/Browser.php:241 #: ../../Zotlabs/Module/Connections.php:263 #: ../../Zotlabs/Module/Editblock.php:134 #: ../../Zotlabs/Module/Editlayout.php:137 #: ../../Zotlabs/Module/Editwebpage.php:170 -#: ../../Zotlabs/Module/Connedit.php:610 ../../Zotlabs/Module/Group.php:177 -#: ../../Zotlabs/Module/Photos.php:1179 ../../Zotlabs/Module/Settings.php:723 -#: ../../Zotlabs/Module/Admin.php:1039 ../../Zotlabs/Module/Admin.php:1213 -#: ../../Zotlabs/Module/Admin.php:2114 ../../Zotlabs/Module/Blocks.php:162 -#: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Lib/Apps.php:342 -#: ../../Zotlabs/Lib/ThreadItem.php:126 ../../include/conversation.php:660 +#: ../../Zotlabs/Module/Settings.php:745 ../../Zotlabs/Module/Group.php:177 +#: ../../Zotlabs/Module/Photos.php:1179 ../../Zotlabs/Module/Admin.php:1052 +#: ../../Zotlabs/Module/Admin.php:1226 ../../Zotlabs/Module/Admin.php:2128 +#: ../../Zotlabs/Module/Webpages.php:219 ../../Zotlabs/Module/Blocks.php:162 +#: ../../Zotlabs/Module/Connedit.php:607 ../../Zotlabs/Module/Thing.php:261 +#: ../../Zotlabs/Lib/Apps.php:342 ../../Zotlabs/Lib/ThreadItem.php:126 +#: ../../include/conversation.php:660 msgid "Delete" msgstr "" @@ -305,57 +306,57 @@ msgid "Drop files here to immediately upload" msgstr "" #: ../../Zotlabs/Web/Router.php:65 ../../Zotlabs/Web/WebServer.php:128 -#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Setup.php:215 -#: ../../Zotlabs/Module/Webpages.php:95 ../../Zotlabs/Module/Authtest.php:16 -#: ../../Zotlabs/Module/Profiles.php:203 ../../Zotlabs/Module/Profiles.php:601 -#: ../../Zotlabs/Module/Bookmarks.php:61 ../../Zotlabs/Module/Item.php:213 -#: ../../Zotlabs/Module/Item.php:221 ../../Zotlabs/Module/Item.php:1071 +#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Api.php:12 +#: ../../Zotlabs/Module/Rate.php:113 ../../Zotlabs/Module/Authtest.php:16 +#: ../../Zotlabs/Module/Register.php:77 ../../Zotlabs/Module/Bookmarks.php:61 #: ../../Zotlabs/Module/Page.php:35 ../../Zotlabs/Module/Page.php:91 -#: ../../Zotlabs/Module/Channel.php:104 ../../Zotlabs/Module/Channel.php:226 -#: ../../Zotlabs/Module/Channel.php:267 -#: ../../Zotlabs/Module/Connections.php:33 +#: ../../Zotlabs/Module/Network.php:15 ../../Zotlabs/Module/Connections.php:33 #: ../../Zotlabs/Module/Cover_photo.php:277 -#: ../../Zotlabs/Module/Cover_photo.php:290 ../../Zotlabs/Module/Like.php:181 +#: ../../Zotlabs/Module/Cover_photo.php:290 ../../Zotlabs/Module/Setup.php:219 #: ../../Zotlabs/Module/Editblock.php:67 #: ../../Zotlabs/Module/Editlayout.php:67 #: ../../Zotlabs/Module/Editlayout.php:90 #: ../../Zotlabs/Module/Editwebpage.php:68 #: ../../Zotlabs/Module/Editwebpage.php:89 #: ../../Zotlabs/Module/Editwebpage.php:104 -#: ../../Zotlabs/Module/Editwebpage.php:126 ../../Zotlabs/Module/Appman.php:75 -#: ../../Zotlabs/Module/Pdledit.php:26 ../../Zotlabs/Module/Filestorage.php:23 +#: ../../Zotlabs/Module/Editwebpage.php:126 ../../Zotlabs/Module/Menu.php:78 +#: ../../Zotlabs/Module/Appman.php:75 ../../Zotlabs/Module/Pdledit.php:26 +#: ../../Zotlabs/Module/Filestorage.php:23 #: ../../Zotlabs/Module/Filestorage.php:78 #: ../../Zotlabs/Module/Filestorage.php:93 #: ../../Zotlabs/Module/Filestorage.php:120 -#: ../../Zotlabs/Module/Connedit.php:398 ../../Zotlabs/Module/Group.php:13 -#: ../../Zotlabs/Module/Menu.php:78 ../../Zotlabs/Module/Block.php:26 -#: ../../Zotlabs/Module/Block.php:76 ../../Zotlabs/Module/Editpost.php:17 -#: ../../Zotlabs/Module/Invite.php:17 ../../Zotlabs/Module/Invite.php:91 -#: ../../Zotlabs/Module/Locs.php:87 ../../Zotlabs/Module/Chat.php:100 -#: ../../Zotlabs/Module/Chat.php:105 ../../Zotlabs/Module/Events.php:264 -#: ../../Zotlabs/Module/Message.php:18 ../../Zotlabs/Module/Mail.php:121 -#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Manage.php:10 -#: ../../Zotlabs/Module/Photos.php:73 ../../Zotlabs/Module/Settings.php:642 -#: ../../Zotlabs/Module/New_channel.php:77 +#: ../../Zotlabs/Module/Settings.php:664 ../../Zotlabs/Module/Group.php:13 +#: ../../Zotlabs/Module/Photos.php:73 ../../Zotlabs/Module/Block.php:26 +#: ../../Zotlabs/Module/Block.php:76 ../../Zotlabs/Module/Invite.php:17 +#: ../../Zotlabs/Module/Invite.php:91 ../../Zotlabs/Module/Locs.php:87 +#: ../../Zotlabs/Module/Like.php:181 ../../Zotlabs/Module/Manage.php:10 +#: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/Message.php:18 +#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Profiles.php:203 +#: ../../Zotlabs/Module/Profiles.php:601 ../../Zotlabs/Module/Webpages.php:95 +#: ../../Zotlabs/Module/Events.php:264 ../../Zotlabs/Module/New_channel.php:77 #: ../../Zotlabs/Module/New_channel.php:104 #: ../../Zotlabs/Module/Notifications.php:70 ../../Zotlabs/Module/Poke.php:137 #: ../../Zotlabs/Module/Profile.php:68 ../../Zotlabs/Module/Profile.php:76 -#: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80 -#: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78 -#: ../../Zotlabs/Module/Layouts.php:89 +#: ../../Zotlabs/Module/Channel.php:104 ../../Zotlabs/Module/Channel.php:227 +#: ../../Zotlabs/Module/Channel.php:268 ../../Zotlabs/Module/Blocks.php:73 +#: ../../Zotlabs/Module/Blocks.php:80 ../../Zotlabs/Module/Layouts.php:71 +#: ../../Zotlabs/Module/Layouts.php:78 ../../Zotlabs/Module/Layouts.php:89 #: ../../Zotlabs/Module/Profile_photo.php:265 #: ../../Zotlabs/Module/Profile_photo.php:278 -#: ../../Zotlabs/Module/Common.php:39 ../../Zotlabs/Module/Register.php:77 -#: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/Network.php:15 -#: ../../Zotlabs/Module/Regmod.php:21 ../../Zotlabs/Module/Thing.php:274 -#: ../../Zotlabs/Module/Thing.php:294 ../../Zotlabs/Module/Thing.php:335 +#: ../../Zotlabs/Module/Common.php:39 ../../Zotlabs/Module/Mail.php:121 +#: ../../Zotlabs/Module/Connedit.php:395 ../../Zotlabs/Module/Regmod.php:21 +#: ../../Zotlabs/Module/Editpost.php:17 #: ../../Zotlabs/Module/Service_limits.php:11 -#: ../../Zotlabs/Module/Rate.php:113 ../../Zotlabs/Module/Sharedwithme.php:11 +#: ../../Zotlabs/Module/Thing.php:274 ../../Zotlabs/Module/Thing.php:294 +#: ../../Zotlabs/Module/Thing.php:335 ../../Zotlabs/Module/Item.php:214 +#: ../../Zotlabs/Module/Item.php:222 ../../Zotlabs/Module/Item.php:1073 +#: ../../Zotlabs/Module/Sharedwithme.php:11 #: ../../Zotlabs/Module/Sources.php:74 ../../Zotlabs/Module/Suggest.php:30 -#: ../../Zotlabs/Module/Api.php:12 ../../Zotlabs/Module/Viewconnections.php:28 +#: ../../Zotlabs/Module/Viewconnections.php:28 #: ../../Zotlabs/Module/Viewconnections.php:33 -#: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Lib/Chatroom.php:137 -#: ../../include/items.php:3448 ../../include/photos.php:27 +#: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Chat.php:100 +#: ../../Zotlabs/Module/Chat.php:105 ../../Zotlabs/Lib/Chatroom.php:137 +#: ../../include/items.php:3477 ../../include/photos.php:27 #: ../../include/attach.php:142 ../../include/attach.php:190 #: ../../include/attach.php:253 ../../include/attach.php:267 #: ../../include/attach.php:274 ../../include/attach.php:339 @@ -369,15 +370,15 @@ msgstr "" msgid "Not Found" msgstr "" -#: ../../Zotlabs/Web/Router.php:149 ../../Zotlabs/Module/Page.php:94 -#: ../../Zotlabs/Module/Help.php:97 ../../Zotlabs/Module/Block.php:79 -#: ../../Zotlabs/Module/Display.php:119 +#: ../../Zotlabs/Web/Router.php:149 ../../Zotlabs/Module/Display.php:120 +#: ../../Zotlabs/Module/Page.php:94 ../../Zotlabs/Module/Help.php:97 +#: ../../Zotlabs/Module/Block.php:79 msgid "Page not found." msgstr "" #: ../../Zotlabs/Web/WebServer.php:127 ../../Zotlabs/Module/Dreport.php:10 -#: ../../Zotlabs/Module/Dreport.php:66 ../../Zotlabs/Module/Like.php:283 -#: ../../Zotlabs/Module/Group.php:72 ../../Zotlabs/Module/Import_items.php:114 +#: ../../Zotlabs/Module/Dreport.php:66 ../../Zotlabs/Module/Group.php:72 +#: ../../Zotlabs/Module/Import_items.php:114 ../../Zotlabs/Module/Like.php:283 #: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:62 #: ../../include/items.php:384 msgid "Permission denied" @@ -395,10 +396,11 @@ msgid "Welcome %s. Remote authentication successful." msgstr "" #: ../../Zotlabs/Module/Achievements.php:15 -#: ../../Zotlabs/Module/Webpages.php:33 ../../Zotlabs/Module/Editblock.php:31 +#: ../../Zotlabs/Module/Editblock.php:31 #: ../../Zotlabs/Module/Editlayout.php:31 #: ../../Zotlabs/Module/Editwebpage.php:32 -#: ../../Zotlabs/Module/Filestorage.php:59 ../../Zotlabs/Module/Hcard.php:12 +#: ../../Zotlabs/Module/Filestorage.php:59 +#: ../../Zotlabs/Module/Webpages.php:33 ../../Zotlabs/Module/Hcard.php:12 #: ../../Zotlabs/Module/Profile.php:20 ../../Zotlabs/Module/Blocks.php:33 #: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Connect.php:17 #: ../../include/channel.php:859 @@ -417,1627 +419,1456 @@ msgstr "" msgid "Online" msgstr "" -#: ../../Zotlabs/Module/Setup.php:179 -msgid "$Projectname Server - Setup" +#: ../../Zotlabs/Module/Dreport.php:44 +msgid "Invalid message" msgstr "" -#: ../../Zotlabs/Module/Setup.php:183 -msgid "Could not connect to database." +#: ../../Zotlabs/Module/Dreport.php:76 +msgid "no results" msgstr "" -#: ../../Zotlabs/Module/Setup.php:187 -msgid "" -"Could not connect to specified site URL. Possible SSL certificate or DNS " -"issue." +#: ../../Zotlabs/Module/Dreport.php:91 +msgid "channel sync processed" msgstr "" -#: ../../Zotlabs/Module/Setup.php:194 -msgid "Could not create table." +#: ../../Zotlabs/Module/Dreport.php:95 +msgid "queued" msgstr "" -#: ../../Zotlabs/Module/Setup.php:199 -msgid "Your site database has been installed." +#: ../../Zotlabs/Module/Dreport.php:99 +msgid "posted" msgstr "" -#: ../../Zotlabs/Module/Setup.php:203 -msgid "" -"You may need to import the file \"install/schema_xxx.sql\" manually using a " -"database client." +#: ../../Zotlabs/Module/Dreport.php:103 +msgid "accepted for delivery" msgstr "" -#: ../../Zotlabs/Module/Setup.php:204 ../../Zotlabs/Module/Setup.php:266 -#: ../../Zotlabs/Module/Setup.php:722 -msgid "Please see the file \"install/INSTALL.txt\"." +#: ../../Zotlabs/Module/Dreport.php:107 +msgid "updated" msgstr "" -#: ../../Zotlabs/Module/Setup.php:263 -msgid "System check" +#: ../../Zotlabs/Module/Dreport.php:110 +msgid "update ignored" msgstr "" -#: ../../Zotlabs/Module/Setup.php:267 ../../Zotlabs/Module/Events.php:676 -#: ../../Zotlabs/Module/Events.php:685 ../../Zotlabs/Module/Photos.php:960 -#: ../../Zotlabs/Module/Cal.php:333 ../../Zotlabs/Module/Cal.php:340 -msgid "Next" +#: ../../Zotlabs/Module/Dreport.php:113 +msgid "permission denied" msgstr "" -#: ../../Zotlabs/Module/Setup.php:268 -msgid "Check again" +#: ../../Zotlabs/Module/Dreport.php:117 +msgid "recipient not found" msgstr "" -#: ../../Zotlabs/Module/Setup.php:290 -msgid "Database connection" +#: ../../Zotlabs/Module/Dreport.php:120 +msgid "mail recalled" msgstr "" -#: ../../Zotlabs/Module/Setup.php:291 -msgid "" -"In order to install $Projectname we need to know how to connect to your " -"database." +#: ../../Zotlabs/Module/Dreport.php:123 +msgid "duplicate mail received" msgstr "" -#: ../../Zotlabs/Module/Setup.php:292 -msgid "" -"Please contact your hosting provider or site administrator if you have " -"questions about these settings." +#: ../../Zotlabs/Module/Dreport.php:126 +msgid "mail delivered" msgstr "" -#: ../../Zotlabs/Module/Setup.php:293 -msgid "" -"The database you specify below should already exist. If it does not, please " -"create it before continuing." +#: ../../Zotlabs/Module/Dreport.php:146 +#, php-format +msgid "Delivery report for %1$s" msgstr "" -#: ../../Zotlabs/Module/Setup.php:297 -msgid "Database Server Name" +#: ../../Zotlabs/Module/Dreport.php:149 +msgid "Options" msgstr "" -#: ../../Zotlabs/Module/Setup.php:297 -msgid "Default is 127.0.0.1" +#: ../../Zotlabs/Module/Dreport.php:150 +msgid "Redeliver" msgstr "" -#: ../../Zotlabs/Module/Setup.php:298 -msgid "Database Port" +#: ../../Zotlabs/Module/Probe.php:28 ../../Zotlabs/Module/Probe.php:32 +#, php-format +msgid "Fetching URL returns error: %1$s" msgstr "" -#: ../../Zotlabs/Module/Setup.php:298 -msgid "Communication port number - use 0 for default" +#: ../../Zotlabs/Module/Api.php:60 ../../Zotlabs/Module/Api.php:81 +msgid "Authorize application connection" msgstr "" -#: ../../Zotlabs/Module/Setup.php:299 -msgid "Database Login Name" +#: ../../Zotlabs/Module/Api.php:61 +msgid "Return to your app and insert this Security Code:" msgstr "" -#: ../../Zotlabs/Module/Setup.php:300 -msgid "Database Login Password" +#: ../../Zotlabs/Module/Api.php:71 +msgid "Please login to continue." msgstr "" -#: ../../Zotlabs/Module/Setup.php:301 -msgid "Database Name" +#: ../../Zotlabs/Module/Api.php:83 +msgid "" +"Do you want to authorize this application to access your posts and contacts, " +"and/or create new posts for you?" msgstr "" -#: ../../Zotlabs/Module/Setup.php:302 -msgid "Database Type" +#: ../../Zotlabs/Module/Api.php:84 ../../Zotlabs/Module/Menu.php:100 +#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Filestorage.php:160 +#: ../../Zotlabs/Module/Filestorage.php:168 +#: ../../Zotlabs/Module/Settings.php:673 ../../Zotlabs/Module/Photos.php:664 +#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:163 +#: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241 +#: ../../Zotlabs/Module/Admin.php:465 ../../Zotlabs/Module/Profiles.php:647 +#: ../../Zotlabs/Module/Events.php:462 ../../Zotlabs/Module/Events.php:463 +#: ../../Zotlabs/Module/Events.php:472 ../../Zotlabs/Module/Connedit.php:408 +#: ../../Zotlabs/Module/Removeme.php:63 ../../include/dir_fns.php:143 +#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145 +#: ../../view/theme/redbasic/php/config.php:111 +#: ../../view/theme/redbasic/php/config.php:136 ../../boot.php:1742 +msgid "Yes" msgstr "" -#: ../../Zotlabs/Module/Setup.php:304 ../../Zotlabs/Module/Setup.php:344 -msgid "Site administrator email address" +#: ../../Zotlabs/Module/Api.php:85 ../../Zotlabs/Module/Menu.php:100 +#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Filestorage.php:160 +#: ../../Zotlabs/Module/Filestorage.php:168 +#: ../../Zotlabs/Module/Settings.php:673 ../../Zotlabs/Module/Photos.php:664 +#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:163 +#: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241 +#: ../../Zotlabs/Module/Admin.php:463 ../../Zotlabs/Module/Profiles.php:647 +#: ../../Zotlabs/Module/Events.php:462 ../../Zotlabs/Module/Events.php:463 +#: ../../Zotlabs/Module/Events.php:472 ../../Zotlabs/Module/Connedit.php:408 +#: ../../Zotlabs/Module/Connedit.php:686 ../../Zotlabs/Module/Removeme.php:63 +#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144 +#: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:111 +#: ../../view/theme/redbasic/php/config.php:136 ../../boot.php:1742 +msgid "No" msgstr "" -#: ../../Zotlabs/Module/Setup.php:304 ../../Zotlabs/Module/Setup.php:344 -msgid "" -"Your account email address must match this in order to use the web admin " -"panel." +#: ../../Zotlabs/Module/Rate.php:155 ../../Zotlabs/Module/Connedit.php:762 +#: ../../include/js_strings.php:20 +msgid "Rating" msgstr "" -#: ../../Zotlabs/Module/Setup.php:305 ../../Zotlabs/Module/Setup.php:346 -msgid "Website URL" +#: ../../Zotlabs/Module/Rate.php:156 +msgid "Website:" msgstr "" -#: ../../Zotlabs/Module/Setup.php:305 ../../Zotlabs/Module/Setup.php:346 -msgid "Please use SSL (https) URL if available." +#: ../../Zotlabs/Module/Rate.php:159 +#, php-format +msgid "Remote Channel [%s] (not yet known on this site)" msgstr "" -#: ../../Zotlabs/Module/Setup.php:306 ../../Zotlabs/Module/Setup.php:349 -msgid "Please select a default timezone for your website" +#: ../../Zotlabs/Module/Rate.php:160 +msgid "Rating (this information is public)" +msgstr "" + +#: ../../Zotlabs/Module/Rate.php:161 +msgid "Optionally explain your rating (this information is public)" msgstr "" -#: ../../Zotlabs/Module/Setup.php:312 ../../Zotlabs/Module/Setup.php:353 -#: ../../Zotlabs/Module/Profiles.php:687 ../../Zotlabs/Module/Appman.php:126 +#: ../../Zotlabs/Module/Rate.php:166 ../../Zotlabs/Module/Setup.php:316 +#: ../../Zotlabs/Module/Setup.php:364 ../../Zotlabs/Module/Appman.php:126 #: ../../Zotlabs/Module/Pdledit.php:66 #: ../../Zotlabs/Module/Filestorage.php:165 -#: ../../Zotlabs/Module/Connedit.php:786 ../../Zotlabs/Module/Group.php:85 +#: ../../Zotlabs/Module/Settings.php:682 ../../Zotlabs/Module/Settings.php:795 +#: ../../Zotlabs/Module/Settings.php:886 ../../Zotlabs/Module/Settings.php:912 +#: ../../Zotlabs/Module/Settings.php:935 +#: ../../Zotlabs/Module/Settings.php:1040 +#: ../../Zotlabs/Module/Settings.php:1229 ../../Zotlabs/Module/Group.php:85 +#: ../../Zotlabs/Module/Photos.php:679 ../../Zotlabs/Module/Photos.php:1058 +#: ../../Zotlabs/Module/Photos.php:1098 ../../Zotlabs/Module/Photos.php:1216 #: ../../Zotlabs/Module/Import_items.php:122 #: ../../Zotlabs/Module/Invite.php:146 ../../Zotlabs/Module/Locs.php:121 -#: ../../Zotlabs/Module/Chat.php:196 ../../Zotlabs/Module/Chat.php:241 -#: ../../Zotlabs/Module/Events.php:484 ../../Zotlabs/Module/Mail.php:370 -#: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Photos.php:679 -#: ../../Zotlabs/Module/Photos.php:1058 ../../Zotlabs/Module/Photos.php:1098 -#: ../../Zotlabs/Module/Photos.php:1216 ../../Zotlabs/Module/Settings.php:660 -#: ../../Zotlabs/Module/Settings.php:773 ../../Zotlabs/Module/Settings.php:864 -#: ../../Zotlabs/Module/Settings.php:890 ../../Zotlabs/Module/Settings.php:913 -#: ../../Zotlabs/Module/Settings.php:1001 -#: ../../Zotlabs/Module/Settings.php:1187 ../../Zotlabs/Module/Admin.php:492 -#: ../../Zotlabs/Module/Admin.php:688 ../../Zotlabs/Module/Admin.php:771 -#: ../../Zotlabs/Module/Admin.php:1032 ../../Zotlabs/Module/Admin.php:1211 -#: ../../Zotlabs/Module/Admin.php:1421 ../../Zotlabs/Module/Admin.php:1648 -#: ../../Zotlabs/Module/Admin.php:1733 ../../Zotlabs/Module/Admin.php:2116 +#: ../../Zotlabs/Module/Mitem.php:243 ../../Zotlabs/Module/Admin.php:502 +#: ../../Zotlabs/Module/Admin.php:701 ../../Zotlabs/Module/Admin.php:784 +#: ../../Zotlabs/Module/Admin.php:1045 ../../Zotlabs/Module/Admin.php:1224 +#: ../../Zotlabs/Module/Admin.php:1435 ../../Zotlabs/Module/Admin.php:1662 +#: ../../Zotlabs/Module/Admin.php:1747 ../../Zotlabs/Module/Admin.php:2130 +#: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Profiles.php:687 +#: ../../Zotlabs/Module/Events.php:484 ../../Zotlabs/Module/Import.php:560 #: ../../Zotlabs/Module/Poke.php:186 ../../Zotlabs/Module/Pconfig.php:107 -#: ../../Zotlabs/Module/Cal.php:338 ../../Zotlabs/Module/Mitem.php:243 -#: ../../Zotlabs/Module/Connect.php:98 ../../Zotlabs/Module/Thing.php:320 -#: ../../Zotlabs/Module/Thing.php:370 ../../Zotlabs/Module/Rate.php:170 +#: ../../Zotlabs/Module/Cal.php:338 ../../Zotlabs/Module/Mail.php:370 +#: ../../Zotlabs/Module/Connedit.php:779 ../../Zotlabs/Module/Connect.php:98 +#: ../../Zotlabs/Module/Thing.php:320 ../../Zotlabs/Module/Thing.php:370 #: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:149 -#: ../../Zotlabs/Module/Import.php:560 ../../Zotlabs/Module/Xchan.php:15 -#: ../../Zotlabs/Lib/ThreadItem.php:711 ../../include/js_strings.php:22 -#: ../../include/widgets.php:763 ../../view/theme/redbasic/php/config.php:99 +#: ../../Zotlabs/Module/Chat.php:196 ../../Zotlabs/Module/Chat.php:241 +#: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Lib/ThreadItem.php:711 +#: ../../include/widgets.php:763 ../../include/js_strings.php:22 +#: ../../view/theme/redbasic/php/config.php:106 msgid "Submit" msgstr "" -#: ../../Zotlabs/Module/Setup.php:333 -msgid "Site settings" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:347 -msgid "Enable $Projectname <strong>advanced</strong> features?" +#: ../../Zotlabs/Module/Pubsites.php:24 ../../include/widgets.php:1351 +msgid "Public Hubs" msgstr "" -#: ../../Zotlabs/Module/Setup.php:347 +#: ../../Zotlabs/Module/Pubsites.php:27 msgid "" -"Some advanced features, while useful - may be best suited for technically " -"proficient audiences" +"The listed hubs allow public registration for the $Projectname network. All " +"hubs in the network are interlinked so membership on any of them conveys " +"membership in the network as a whole. Some hubs may require subscription or " +"provide tiered service plans. The hub itself <strong>may</strong> provide " +"additional details." msgstr "" -#: ../../Zotlabs/Module/Setup.php:388 -msgid "PHP version 5.5 or greater is required." +#: ../../Zotlabs/Module/Pubsites.php:33 +msgid "Hub URL" msgstr "" -#: ../../Zotlabs/Module/Setup.php:389 -msgid "PHP version" +#: ../../Zotlabs/Module/Pubsites.php:33 +msgid "Access Type" msgstr "" -#: ../../Zotlabs/Module/Setup.php:404 -msgid "Could not find a command line version of PHP in the web server PATH." +#: ../../Zotlabs/Module/Pubsites.php:33 +msgid "Registration Policy" msgstr "" -#: ../../Zotlabs/Module/Setup.php:405 -msgid "" -"If you don't have a command line version of PHP installed on server, you " -"will not be able to run background polling via cron." +#: ../../Zotlabs/Module/Pubsites.php:33 +msgid "Stats" msgstr "" -#: ../../Zotlabs/Module/Setup.php:409 -msgid "PHP executable path" +#: ../../Zotlabs/Module/Pubsites.php:33 +msgid "Software" msgstr "" -#: ../../Zotlabs/Module/Setup.php:409 -msgid "" -"Enter full path to php executable. You can leave this blank to continue the " -"installation." +#: ../../Zotlabs/Module/Pubsites.php:35 ../../Zotlabs/Module/Ratings.php:97 +#: ../../include/conversation.php:960 +msgid "Ratings" msgstr "" -#: ../../Zotlabs/Module/Setup.php:414 -msgid "Command line PHP" +#: ../../Zotlabs/Module/Pubsites.php:43 +msgid "Rate" msgstr "" -#: ../../Zotlabs/Module/Setup.php:423 -msgid "" -"The command line version of PHP on your system does not have " -"\"register_argc_argv\" enabled." +#: ../../Zotlabs/Module/Pubsites.php:46 ../../Zotlabs/Module/Locs.php:117 +#: ../../Zotlabs/Module/Profiles.php:477 ../../Zotlabs/Module/Profiles.php:698 +#: ../../Zotlabs/Module/Events.php:467 ../../include/js_strings.php:25 +msgid "Location" msgstr "" -#: ../../Zotlabs/Module/Setup.php:424 -msgid "This is required for message delivery to work." +#: ../../Zotlabs/Module/Pubsites.php:54 ../../Zotlabs/Module/Webpages.php:223 +#: ../../Zotlabs/Module/Events.php:680 ../../Zotlabs/Module/Blocks.php:166 +#: ../../Zotlabs/Module/Layouts.php:197 ../../include/page_widgets.php:42 +msgid "View" msgstr "" -#: ../../Zotlabs/Module/Setup.php:427 -msgid "PHP register_argc_argv" +#: ../../Zotlabs/Module/Register.php:49 +msgid "Maximum daily site registrations exceeded. Please try again tomorrow." msgstr "" -#: ../../Zotlabs/Module/Setup.php:445 -#, php-format +#: ../../Zotlabs/Module/Register.php:55 msgid "" -"Your max allowed total upload size is set to %s. Maximum size of one file to " -"upload is set to %s. You are allowed to upload up to %d files at once." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:450 -msgid "You can adjust these settings in the servers php.ini." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:452 -msgid "PHP upload limits" +"Please indicate acceptance of the Terms of Service. Registration failed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:475 -msgid "" -"Error: the \"openssl_pkey_new\" function on this system is not able to " -"generate encryption keys" +#: ../../Zotlabs/Module/Register.php:89 +msgid "Passwords do not match." msgstr "" -#: ../../Zotlabs/Module/Setup.php:476 +#: ../../Zotlabs/Module/Register.php:131 msgid "" -"If running under Windows, please see \"http://www.php.net/manual/en/openssl." -"installation.php\"." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:479 -msgid "Generate encryption keys" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:491 -msgid "libCurl PHP module" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:492 -msgid "GD graphics PHP module" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:493 -msgid "OpenSSL PHP module" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:494 -msgid "mysqli or postgres PHP module" +"Registration successful. Please check your email for validation instructions." msgstr "" -#: ../../Zotlabs/Module/Setup.php:495 -msgid "mb_string PHP module" +#: ../../Zotlabs/Module/Register.php:137 +msgid "Your registration is pending approval by the site owner." msgstr "" -#: ../../Zotlabs/Module/Setup.php:496 -msgid "xml PHP module" +#: ../../Zotlabs/Module/Register.php:140 +msgid "Your registration can not be processed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:500 ../../Zotlabs/Module/Setup.php:502 -msgid "Apache mod_rewrite module" +#: ../../Zotlabs/Module/Register.php:184 +msgid "Registration on this hub is disabled." msgstr "" -#: ../../Zotlabs/Module/Setup.php:500 -msgid "" -"Error: Apache webserver mod-rewrite module is required but not installed." +#: ../../Zotlabs/Module/Register.php:193 +msgid "Registration on this hub is by approval only." msgstr "" -#: ../../Zotlabs/Module/Setup.php:506 ../../Zotlabs/Module/Setup.php:509 -msgid "proc_open" +#: ../../Zotlabs/Module/Register.php:194 +msgid "<a href=\"pubsites\">Register at another affiliated hub.</a>" msgstr "" -#: ../../Zotlabs/Module/Setup.php:506 +#: ../../Zotlabs/Module/Register.php:204 msgid "" -"Error: proc_open is required but is either not installed or has been " -"disabled in php.ini" -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:514 -msgid "Error: libCURL PHP module required but not installed." +"This site has exceeded the number of allowed daily account registrations. " +"Please try again tomorrow." msgstr "" -#: ../../Zotlabs/Module/Setup.php:518 -msgid "" -"Error: GD graphics PHP module with JPEG support required but not installed." +#: ../../Zotlabs/Module/Register.php:215 +msgid "Terms of Service" msgstr "" -#: ../../Zotlabs/Module/Setup.php:522 -msgid "Error: openssl PHP module required but not installed." +#: ../../Zotlabs/Module/Register.php:221 +#, php-format +msgid "I accept the %s for this website" msgstr "" -#: ../../Zotlabs/Module/Setup.php:526 -msgid "" -"Error: mysqli or postgres PHP module required but neither are installed." +#: ../../Zotlabs/Module/Register.php:223 +#, php-format +msgid "I am over 13 years of age and accept the %s for this website" msgstr "" -#: ../../Zotlabs/Module/Setup.php:530 -msgid "Error: mb_string PHP module required but not installed." +#: ../../Zotlabs/Module/Register.php:227 +msgid "Your email address" msgstr "" -#: ../../Zotlabs/Module/Setup.php:534 -msgid "Error: xml PHP module required for DAV but not installed." +#: ../../Zotlabs/Module/Register.php:228 +msgid "Choose a password" msgstr "" -#: ../../Zotlabs/Module/Setup.php:552 -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." +#: ../../Zotlabs/Module/Register.php:229 +msgid "Please re-enter your password" msgstr "" -#: ../../Zotlabs/Module/Setup.php:553 -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." +#: ../../Zotlabs/Module/Register.php:230 +msgid "Please enter your invitation code" msgstr "" -#: ../../Zotlabs/Module/Setup.php:554 -msgid "" -"At the end of this procedure, we will give you a text to save in a file " -"named .htconfig.php in your Red top folder." +#: ../../Zotlabs/Module/Register.php:231 +#: ../../Zotlabs/Module/New_channel.php:128 +msgid "Name or caption" msgstr "" -#: ../../Zotlabs/Module/Setup.php:555 +#: ../../Zotlabs/Module/Register.php:231 +#: ../../Zotlabs/Module/New_channel.php:128 msgid "" -"You can alternatively skip this procedure and perform a manual installation. " -"Please see the file \"install/INSTALL.txt\" for instructions." -msgstr "" - -#: ../../Zotlabs/Module/Setup.php:558 -msgid ".htconfig.php is writable" +"Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation " +"Group\"" msgstr "" -#: ../../Zotlabs/Module/Setup.php:572 -msgid "" -"Red uses the Smarty3 template engine to render its web views. Smarty3 " -"compiles templates to PHP to speed up rendering." +#: ../../Zotlabs/Module/Register.php:233 +#: ../../Zotlabs/Module/New_channel.php:130 +msgid "Choose a short nickname" msgstr "" -#: ../../Zotlabs/Module/Setup.php:573 +#: ../../Zotlabs/Module/Register.php:233 +#: ../../Zotlabs/Module/New_channel.php:130 #, 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." +"Your nickname will be used to create an easy to remember channel address e." +"g. nickname%s" msgstr "" -#: ../../Zotlabs/Module/Setup.php:574 ../../Zotlabs/Module/Setup.php:595 -msgid "" -"Please ensure that the user that your web server runs as (e.g. www-data) has " -"write access to this folder." +#: ../../Zotlabs/Module/Register.php:235 +#: ../../Zotlabs/Module/New_channel.php:132 +msgid "Channel role and privacy" msgstr "" -#: ../../Zotlabs/Module/Setup.php:575 -#, 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." +#: ../../Zotlabs/Module/Register.php:235 +#: ../../Zotlabs/Module/New_channel.php:132 +msgid "Select a channel role with your privacy requirements." msgstr "" -#: ../../Zotlabs/Module/Setup.php:578 -#, php-format -msgid "%s is writable" +#: ../../Zotlabs/Module/Register.php:235 +#: ../../Zotlabs/Module/New_channel.php:132 +msgid "Read more about roles" msgstr "" -#: ../../Zotlabs/Module/Setup.php:594 -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 Red top " -"level folder" +#: ../../Zotlabs/Module/Register.php:236 +msgid "no" msgstr "" -#: ../../Zotlabs/Module/Setup.php:598 -msgid "store is writable" +#: ../../Zotlabs/Module/Register.php:236 +msgid "yes" msgstr "" -#: ../../Zotlabs/Module/Setup.php:631 -msgid "" -"SSL certificate cannot be validated. Fix certificate or disable https access " -"to this site." +#: ../../Zotlabs/Module/Register.php:248 ../../Zotlabs/Module/Admin.php:503 +msgid "Registration" msgstr "" -#: ../../Zotlabs/Module/Setup.php:632 -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!" +#: ../../Zotlabs/Module/Register.php:253 +msgid "Membership on this site is by invitation only." msgstr "" -#: ../../Zotlabs/Module/Setup.php:633 -msgid "" -"This restriction is incorporated because public posts from you may for " -"example contain references to images on your own hub." +#: ../../Zotlabs/Module/Register.php:265 ../../include/nav.php:151 +#: ../../boot.php:1720 +msgid "Register" msgstr "" -#: ../../Zotlabs/Module/Setup.php:634 +#: ../../Zotlabs/Module/Register.php:266 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." +"This site may require email verification after submitting this form. If you " +"are returned to a login page, please check your email for instructions." msgstr "" -#: ../../Zotlabs/Module/Setup.php:635 -msgid "" -"This can cause usability issues elsewhere (not just on your own site) so we " -"must insist on this requirement." +#: ../../Zotlabs/Module/Bookmarks.php:53 +msgid "Bookmark added" msgstr "" -#: ../../Zotlabs/Module/Setup.php:636 -msgid "" -"Providers are available that issue free certificates which are browser-valid." +#: ../../Zotlabs/Module/Bookmarks.php:75 +msgid "My Bookmarks" msgstr "" -#: ../../Zotlabs/Module/Setup.php:638 -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. " -"These are not normally required by browsers, but are required for server-to-" -"server communications." +#: ../../Zotlabs/Module/Bookmarks.php:86 +msgid "My Connections Bookmarks" msgstr "" -#: ../../Zotlabs/Module/Setup.php:641 -msgid "SSL certificate validation" +#: ../../Zotlabs/Module/Display.php:17 ../../Zotlabs/Module/Directory.php:63 +#: ../../Zotlabs/Module/Photos.php:520 ../../Zotlabs/Module/Ratings.php:83 +#: ../../Zotlabs/Module/Search.php:17 +#: ../../Zotlabs/Module/Viewconnections.php:23 +msgid "Public access denied." msgstr "" -#: ../../Zotlabs/Module/Setup.php:647 -msgid "" -"Url rewrite in .htaccess is not working. Check your server configuration." -"Test: " +#: ../../Zotlabs/Module/Display.php:40 ../../Zotlabs/Module/Filestorage.php:32 +#: ../../Zotlabs/Module/Admin.php:164 ../../Zotlabs/Module/Admin.php:1268 +#: ../../Zotlabs/Module/Admin.php:1575 ../../Zotlabs/Module/Thing.php:89 +#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:3398 +msgid "Item not found." msgstr "" -#: ../../Zotlabs/Module/Setup.php:650 -msgid "Url rewrite is working" +#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:222 +#: ../../include/conversation.php:1665 ../../include/nav.php:94 +msgid "Photos" msgstr "" -#: ../../Zotlabs/Module/Setup.php:659 -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." +#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88 +#: ../../Zotlabs/Module/Settings.php:683 ../../Zotlabs/Module/Settings.php:709 +#: ../../Zotlabs/Module/Admin.php:1420 ../../Zotlabs/Module/Wiki.php:171 +#: ../../Zotlabs/Module/Wiki.php:211 ../../Zotlabs/Module/Tagrm.php:15 +#: ../../Zotlabs/Module/Tagrm.php:138 ../../include/conversation.php:1243 +#: ../../include/conversation.php:1292 +msgid "Cancel" msgstr "" -#: ../../Zotlabs/Module/Setup.php:683 -msgid "Errors encountered creating database tables." +#: ../../Zotlabs/Module/Page.php:40 ../../Zotlabs/Module/Block.php:31 +msgid "Invalid item." msgstr "" -#: ../../Zotlabs/Module/Setup.php:720 -msgid "<h1>What next</h1>" +#: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Block.php:43 +#: ../../Zotlabs/Module/Cal.php:62 ../../Zotlabs/Module/Wall_upload.php:33 +msgid "Channel not found." msgstr "" -#: ../../Zotlabs/Module/Setup.php:721 +#: ../../Zotlabs/Module/Page.php:131 msgid "" -"IMPORTANT: You will need to [manually] setup a scheduled task for the poller." -msgstr "" - -#: ../../Zotlabs/Module/Dreport.php:44 -msgid "Invalid message" -msgstr "" - -#: ../../Zotlabs/Module/Dreport.php:76 -msgid "no results" -msgstr "" - -#: ../../Zotlabs/Module/Dreport.php:91 -msgid "channel sync processed" -msgstr "" - -#: ../../Zotlabs/Module/Dreport.php:95 -msgid "queued" -msgstr "" - -#: ../../Zotlabs/Module/Dreport.php:99 -msgid "posted" -msgstr "" - -#: ../../Zotlabs/Module/Dreport.php:103 -msgid "accepted for delivery" -msgstr "" - -#: ../../Zotlabs/Module/Dreport.php:107 -msgid "updated" -msgstr "" - -#: ../../Zotlabs/Module/Dreport.php:110 -msgid "update ignored" +"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod " +"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, " +"quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo " +"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse " +"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat " +"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." msgstr "" -#: ../../Zotlabs/Module/Dreport.php:113 -msgid "permission denied" +#: ../../Zotlabs/Module/Filer.php:52 +msgid "Save to Folder:" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:117 -msgid "recipient not found" +#: ../../Zotlabs/Module/Filer.php:52 +msgid "- select -" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:120 -msgid "mail recalled" +#: ../../Zotlabs/Module/Filer.php:53 ../../Zotlabs/Module/Admin.php:2047 +#: ../../Zotlabs/Module/Admin.php:2067 ../../Zotlabs/Module/Rbmark.php:32 +#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/text.php:926 +#: ../../include/text.php:938 ../../include/widgets.php:201 +msgid "Save" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:123 -msgid "duplicate mail received" +#: ../../Zotlabs/Module/Network.php:94 +msgid "No such group" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:126 -msgid "mail delivered" +#: ../../Zotlabs/Module/Network.php:134 +msgid "No such channel" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:146 -#, php-format -msgid "Delivery report for %1$s" +#: ../../Zotlabs/Module/Network.php:139 +msgid "forum" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:149 -msgid "Options" +#: ../../Zotlabs/Module/Network.php:151 +msgid "Search Results For:" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:150 -msgid "Redeliver" +#: ../../Zotlabs/Module/Network.php:217 +msgid "Privacy group is empty" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:53 -msgid "Import Webpage Elements" +#: ../../Zotlabs/Module/Network.php:226 +msgid "Privacy group: " msgstr "" -#: ../../Zotlabs/Module/Webpages.php:54 -msgid "Import selected" +#: ../../Zotlabs/Module/Network.php:252 +msgid "Invalid connection." msgstr "" -#: ../../Zotlabs/Module/Webpages.php:214 ../../Zotlabs/Lib/Apps.php:218 -#: ../../include/nav.php:108 ../../include/conversation.php:1705 -msgid "Webpages" +#: ../../Zotlabs/Module/Connections.php:56 +#: ../../Zotlabs/Module/Connections.php:161 +#: ../../Zotlabs/Module/Connections.php:242 +msgid "Blocked" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:218 ../../Zotlabs/Module/Photos.php:1078 -#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Layouts.php:193 -#: ../../include/conversation.php:1220 -msgid "Share" +#: ../../Zotlabs/Module/Connections.php:61 +#: ../../Zotlabs/Module/Connections.php:168 +#: ../../Zotlabs/Module/Connections.php:241 +msgid "Ignored" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:223 ../../Zotlabs/Module/Events.php:680 -#: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Layouts.php:197 -#: ../../Zotlabs/Module/Pubsites.php:47 ../../include/page_widgets.php:42 -msgid "View" +#: ../../Zotlabs/Module/Connections.php:66 +#: ../../Zotlabs/Module/Connections.php:182 +#: ../../Zotlabs/Module/Connections.php:240 +msgid "Hidden" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:224 ../../Zotlabs/Module/Events.php:473 -#: ../../Zotlabs/Module/Photos.php:1099 ../../Zotlabs/Lib/ThreadItem.php:720 -#: ../../include/page_widgets.php:43 ../../include/conversation.php:1199 -msgid "Preview" +#: ../../Zotlabs/Module/Connections.php:71 +#: ../../Zotlabs/Module/Connections.php:175 +#: ../../Zotlabs/Module/Connections.php:239 +msgid "Archived" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:225 ../../include/page_widgets.php:44 -msgid "Actions" +#: ../../Zotlabs/Module/Connections.php:76 +#: ../../Zotlabs/Module/Connections.php:86 ../../Zotlabs/Module/Menu.php:116 +#: ../../include/conversation.php:1568 +msgid "New" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:226 ../../include/page_widgets.php:45 -msgid "Page Link" +#: ../../Zotlabs/Module/Connections.php:92 +#: ../../Zotlabs/Module/Connections.php:107 +#: ../../Zotlabs/Module/Connedit.php:629 ../../include/widgets.php:497 +msgid "All" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:227 -msgid "Page Title" +#: ../../Zotlabs/Module/Connections.php:138 +msgid "New Connections" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:228 ../../Zotlabs/Module/Menu.php:114 -#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Layouts.php:190 -#: ../../include/page_widgets.php:47 -msgid "Created" +#: ../../Zotlabs/Module/Connections.php:141 +msgid "Show pending (new) connections" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:229 ../../Zotlabs/Module/Menu.php:115 -#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Layouts.php:191 -#: ../../include/page_widgets.php:48 -msgid "Edited" +#: ../../Zotlabs/Module/Connections.php:145 +#: ../../Zotlabs/Module/Profperm.php:144 +msgid "All Connections" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:258 -msgid "Invalid file type." +#: ../../Zotlabs/Module/Connections.php:148 +msgid "Show all connections" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:270 -msgid "Error opening zip file" +#: ../../Zotlabs/Module/Connections.php:164 +msgid "Only show blocked connections" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:281 -msgid "Invalid folder path." +#: ../../Zotlabs/Module/Connections.php:171 +msgid "Only show ignored connections" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:308 -msgid "No webpage elements detected." +#: ../../Zotlabs/Module/Connections.php:178 +msgid "Only show archived connections" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:382 -msgid "Import complete." +#: ../../Zotlabs/Module/Connections.php:185 +msgid "Only show hidden connections" msgstr "" -#: ../../Zotlabs/Module/Directory.php:63 ../../Zotlabs/Module/Display.php:17 -#: ../../Zotlabs/Module/Photos.php:520 ../../Zotlabs/Module/Ratings.php:86 -#: ../../Zotlabs/Module/Search.php:17 -#: ../../Zotlabs/Module/Viewconnections.php:23 -msgid "Public access denied." +#: ../../Zotlabs/Module/Connections.php:238 +msgid "Pending approval" msgstr "" -#: ../../Zotlabs/Module/Directory.php:243 +#: ../../Zotlabs/Module/Connections.php:254 #, php-format -msgid "%d rating" -msgid_plural "%d ratings" -msgstr[0] "" -msgstr[1] "" +msgid "%1$s [%2$s]" +msgstr "" -#: ../../Zotlabs/Module/Directory.php:254 -msgid "Gender: " +#: ../../Zotlabs/Module/Connections.php:255 +msgid "Edit connection" msgstr "" -#: ../../Zotlabs/Module/Directory.php:256 -msgid "Status: " +#: ../../Zotlabs/Module/Connections.php:256 +msgid "Delete connection" msgstr "" -#: ../../Zotlabs/Module/Directory.php:258 -msgid "Homepage: " +#: ../../Zotlabs/Module/Connections.php:265 +msgid "Channel address" msgstr "" -#: ../../Zotlabs/Module/Directory.php:306 ../../include/channel.php:1207 -msgid "Age:" +#: ../../Zotlabs/Module/Connections.php:267 +msgid "Network" msgstr "" -#: ../../Zotlabs/Module/Directory.php:311 ../../include/event.php:52 -#: ../../include/event.php:84 ../../include/channel.php:1049 -#: ../../include/bb2diaspora.php:507 -msgid "Location:" +#: ../../Zotlabs/Module/Connections.php:270 ../../Zotlabs/Module/Admin.php:723 +msgid "Status" msgstr "" -#: ../../Zotlabs/Module/Directory.php:317 -msgid "Description:" +#: ../../Zotlabs/Module/Connections.php:272 +msgid "Connected" msgstr "" -#: ../../Zotlabs/Module/Directory.php:322 ../../include/channel.php:1223 -msgid "Hometown:" +#: ../../Zotlabs/Module/Connections.php:274 +msgid "Approve connection" msgstr "" -#: ../../Zotlabs/Module/Directory.php:324 ../../include/channel.php:1231 -msgid "About:" +#: ../../Zotlabs/Module/Connections.php:275 +#: ../../Zotlabs/Module/Admin.php:1050 +msgid "Approve" msgstr "" -#: ../../Zotlabs/Module/Directory.php:325 ../../Zotlabs/Module/Match.php:68 -#: ../../Zotlabs/Module/Suggest.php:56 ../../include/channel.php:1034 -#: ../../include/conversation.php:960 ../../include/widgets.php:147 -#: ../../include/widgets.php:184 ../../include/connections.php:78 -msgid "Connect" +#: ../../Zotlabs/Module/Connections.php:276 +msgid "Ignore connection" msgstr "" -#: ../../Zotlabs/Module/Directory.php:326 -msgid "Public Forum:" +#: ../../Zotlabs/Module/Connections.php:277 +#: ../../Zotlabs/Module/Notifications.php:55 +#: ../../Zotlabs/Module/Connedit.php:583 +msgid "Ignore" msgstr "" -#: ../../Zotlabs/Module/Directory.php:329 -msgid "Keywords: " +#: ../../Zotlabs/Module/Connections.php:278 +msgid "Recent activity" msgstr "" -#: ../../Zotlabs/Module/Directory.php:332 -msgid "Don't suggest" +#: ../../Zotlabs/Module/Connections.php:302 ../../Zotlabs/Lib/Apps.php:209 +#: ../../include/text.php:855 ../../include/nav.php:190 +msgid "Connections" msgstr "" -#: ../../Zotlabs/Module/Directory.php:334 -msgid "Common connections:" +#: ../../Zotlabs/Module/Connections.php:306 ../../Zotlabs/Module/Search.php:44 +#: ../../Zotlabs/Lib/Apps.php:230 ../../include/text.php:925 +#: ../../include/text.php:937 ../../include/acl_selectors.php:174 +#: ../../include/nav.php:169 +msgid "Search" msgstr "" -#: ../../Zotlabs/Module/Directory.php:383 -msgid "Global Directory" +#: ../../Zotlabs/Module/Connections.php:307 +msgid "Search your connections" msgstr "" -#: ../../Zotlabs/Module/Directory.php:383 -msgid "Local Directory" +#: ../../Zotlabs/Module/Connections.php:308 +msgid "Connections search" msgstr "" -#: ../../Zotlabs/Module/Directory.php:388 -#: ../../Zotlabs/Module/Directory.php:393 #: ../../Zotlabs/Module/Connections.php:309 -#: ../../include/contact_widgets.php:23 +#: ../../Zotlabs/Module/Directory.php:388 +#: ../../Zotlabs/Module/Directory.php:393 ../../include/contact_widgets.php:23 msgid "Find" msgstr "" -#: ../../Zotlabs/Module/Directory.php:389 -msgid "Finding:" +#: ../../Zotlabs/Module/Cover_photo.php:58 +#: ../../Zotlabs/Module/Profile_photo.php:61 +msgid "Image uploaded but image cropping failed." msgstr "" -#: ../../Zotlabs/Module/Directory.php:392 ../../Zotlabs/Module/Suggest.php:64 -#: ../../include/contact_widgets.php:24 -msgid "Channel Suggestions" +#: ../../Zotlabs/Module/Cover_photo.php:134 +#: ../../Zotlabs/Module/Cover_photo.php:181 +msgid "Cover Photos" msgstr "" -#: ../../Zotlabs/Module/Directory.php:394 -msgid "next page" +#: ../../Zotlabs/Module/Cover_photo.php:154 +#: ../../Zotlabs/Module/Profile_photo.php:135 +msgid "Image resize failed." msgstr "" -#: ../../Zotlabs/Module/Directory.php:394 -msgid "previous page" +#: ../../Zotlabs/Module/Cover_photo.php:168 +#: ../../Zotlabs/Module/Profile_photo.php:196 ../../include/photos.php:148 +msgid "Unable to process image" msgstr "" -#: ../../Zotlabs/Module/Directory.php:395 -msgid "Sort options" +#: ../../Zotlabs/Module/Cover_photo.php:192 +#: ../../Zotlabs/Module/Profile_photo.php:223 +msgid "Image upload failed." msgstr "" -#: ../../Zotlabs/Module/Directory.php:396 -msgid "Alphabetic" +#: ../../Zotlabs/Module/Cover_photo.php:210 +#: ../../Zotlabs/Module/Profile_photo.php:242 +msgid "Unable to process image." msgstr "" -#: ../../Zotlabs/Module/Directory.php:397 -msgid "Reverse Alphabetic" +#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4312 +msgid "female" msgstr "" -#: ../../Zotlabs/Module/Directory.php:398 -msgid "Newest to Oldest" +#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4313 +#, php-format +msgid "%1$s updated her %2$s" msgstr "" -#: ../../Zotlabs/Module/Directory.php:399 -msgid "Oldest to Newest" +#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:4314 +msgid "male" msgstr "" -#: ../../Zotlabs/Module/Directory.php:416 -msgid "No entries (some entries may be hidden)." +#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4315 +#, php-format +msgid "%1$s updated his %2$s" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:189 -#: ../../Zotlabs/Module/Profiles.php:246 ../../Zotlabs/Module/Profiles.php:625 -msgid "Profile not found." +#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4317 +#, php-format +msgid "%1$s updated their %2$s" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:44 -msgid "Profile deleted." +#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/channel.php:1720 +msgid "cover photo" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:104 -msgid "Profile-" +#: ../../Zotlabs/Module/Cover_photo.php:303 +#: ../../Zotlabs/Module/Cover_photo.php:318 +#: ../../Zotlabs/Module/Profile_photo.php:300 +#: ../../Zotlabs/Module/Profile_photo.php:341 +msgid "Photo not available." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:89 ../../Zotlabs/Module/Profiles.php:132 -msgid "New profile created." +#: ../../Zotlabs/Module/Cover_photo.php:354 +#: ../../Zotlabs/Module/Profile_photo.php:387 +msgid "Upload File:" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:110 -msgid "Profile unavailable to clone." +#: ../../Zotlabs/Module/Cover_photo.php:355 +#: ../../Zotlabs/Module/Profile_photo.php:388 +msgid "Select a profile:" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:151 -msgid "Profile unavailable to export." +#: ../../Zotlabs/Module/Cover_photo.php:356 +msgid "Upload Cover Photo" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:256 -msgid "Profile Name is required." +#: ../../Zotlabs/Module/Cover_photo.php:361 +#: ../../Zotlabs/Module/Settings.php:1180 +#: ../../Zotlabs/Module/Profile_photo.php:396 +msgid "or" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:427 -msgid "Marital Status" +#: ../../Zotlabs/Module/Cover_photo.php:361 +#: ../../Zotlabs/Module/Profile_photo.php:396 +msgid "skip this step" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:431 -msgid "Romantic Partner" +#: ../../Zotlabs/Module/Cover_photo.php:361 +#: ../../Zotlabs/Module/Profile_photo.php:396 +msgid "select a photo from your photo albums" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:435 ../../Zotlabs/Module/Profiles.php:736 -msgid "Likes" +#: ../../Zotlabs/Module/Cover_photo.php:377 +#: ../../Zotlabs/Module/Profile_photo.php:415 +msgid "Crop Image" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:439 ../../Zotlabs/Module/Profiles.php:737 -msgid "Dislikes" +#: ../../Zotlabs/Module/Cover_photo.php:378 +#: ../../Zotlabs/Module/Profile_photo.php:416 +msgid "Please adjust the image cropping for optimum viewing." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:443 ../../Zotlabs/Module/Profiles.php:744 -msgid "Work/Employment" +#: ../../Zotlabs/Module/Cover_photo.php:380 +#: ../../Zotlabs/Module/Profile_photo.php:418 +msgid "Done Editing" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:446 -msgid "Religion" +#: ../../Zotlabs/Module/Setup.php:183 +msgid "$Projectname Server - Setup" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:450 -msgid "Political Views" +#: ../../Zotlabs/Module/Setup.php:187 +msgid "Could not connect to database." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:454 -msgid "Gender" +#: ../../Zotlabs/Module/Setup.php:191 +msgid "" +"Could not connect to specified site URL. Possible SSL certificate or DNS " +"issue." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:458 -msgid "Sexual Preference" +#: ../../Zotlabs/Module/Setup.php:198 +msgid "Could not create table." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:462 -msgid "Homepage" +#: ../../Zotlabs/Module/Setup.php:203 +msgid "Your site database has been installed." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:466 -msgid "Interests" +#: ../../Zotlabs/Module/Setup.php:207 +msgid "" +"You may need to import the file \"install/schema_xxx.sql\" manually using a " +"database client." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:470 ../../Zotlabs/Module/Locs.php:118 -#: ../../Zotlabs/Module/Admin.php:1224 -msgid "Address" +#: ../../Zotlabs/Module/Setup.php:208 ../../Zotlabs/Module/Setup.php:270 +#: ../../Zotlabs/Module/Setup.php:733 +msgid "Please see the file \"install/INSTALL.txt\"." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:477 ../../Zotlabs/Module/Profiles.php:698 -#: ../../Zotlabs/Module/Locs.php:117 ../../Zotlabs/Module/Events.php:467 -#: ../../Zotlabs/Module/Pubsites.php:41 ../../include/js_strings.php:25 -msgid "Location" +#: ../../Zotlabs/Module/Setup.php:267 +msgid "System check" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:560 -msgid "Profile updated." +#: ../../Zotlabs/Module/Setup.php:271 ../../Zotlabs/Module/Photos.php:960 +#: ../../Zotlabs/Module/Events.php:676 ../../Zotlabs/Module/Events.php:685 +#: ../../Zotlabs/Module/Cal.php:333 ../../Zotlabs/Module/Cal.php:340 +msgid "Next" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:644 -msgid "Hide your connections list from viewers of this profile" +#: ../../Zotlabs/Module/Setup.php:272 +msgid "Check again" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:647 -#: ../../Zotlabs/Module/Filestorage.php:160 -#: ../../Zotlabs/Module/Filestorage.php:168 -#: ../../Zotlabs/Module/Connedit.php:411 ../../Zotlabs/Module/Connedit.php:693 -#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157 -#: ../../Zotlabs/Module/Events.php:462 ../../Zotlabs/Module/Events.php:463 -#: ../../Zotlabs/Module/Events.php:472 ../../Zotlabs/Module/Photos.php:664 -#: ../../Zotlabs/Module/Settings.php:651 ../../Zotlabs/Module/Admin.php:459 -#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:163 -#: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241 -#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Api.php:85 -#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144 -#: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:105 -#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1717 -msgid "No" +#: ../../Zotlabs/Module/Setup.php:294 +msgid "Database connection" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:647 -#: ../../Zotlabs/Module/Filestorage.php:160 -#: ../../Zotlabs/Module/Filestorage.php:168 -#: ../../Zotlabs/Module/Connedit.php:411 ../../Zotlabs/Module/Menu.php:100 -#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Events.php:462 -#: ../../Zotlabs/Module/Events.php:463 ../../Zotlabs/Module/Events.php:472 -#: ../../Zotlabs/Module/Photos.php:664 ../../Zotlabs/Module/Settings.php:651 -#: ../../Zotlabs/Module/Admin.php:461 ../../Zotlabs/Module/Mitem.php:162 -#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:240 -#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Removeme.php:63 -#: ../../Zotlabs/Module/Api.php:84 ../../include/dir_fns.php:143 -#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145 -#: ../../view/theme/redbasic/php/config.php:105 -#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1717 -msgid "Yes" +#: ../../Zotlabs/Module/Setup.php:295 +msgid "" +"In order to install $Projectname we need to know how to connect to your " +"database." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:686 -msgid "Edit Profile Details" +#: ../../Zotlabs/Module/Setup.php:296 +msgid "" +"Please contact your hosting provider or site administrator if you have " +"questions about these settings." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:688 -msgid "View this profile" +#: ../../Zotlabs/Module/Setup.php:297 +msgid "" +"The database you specify below should already exist. If it does not, please " +"create it before continuing." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:689 ../../Zotlabs/Module/Profiles.php:771 -#: ../../include/channel.php:981 -msgid "Edit visibility" +#: ../../Zotlabs/Module/Setup.php:301 +msgid "Database Server Name" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:690 -msgid "Profile Tools" +#: ../../Zotlabs/Module/Setup.php:301 +msgid "Default is 127.0.0.1" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:691 -msgid "Change cover photo" +#: ../../Zotlabs/Module/Setup.php:302 +msgid "Database Port" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:692 ../../include/channel.php:952 -msgid "Change profile photo" +#: ../../Zotlabs/Module/Setup.php:302 +msgid "Communication port number - use 0 for default" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:693 -msgid "Create a new profile using these settings" +#: ../../Zotlabs/Module/Setup.php:303 +msgid "Database Login Name" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:694 -msgid "Clone this profile" +#: ../../Zotlabs/Module/Setup.php:304 +msgid "Database Login Password" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:695 -msgid "Delete this profile" +#: ../../Zotlabs/Module/Setup.php:305 +msgid "Database Name" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:696 -msgid "Add profile things" +#: ../../Zotlabs/Module/Setup.php:306 +msgid "Database Type" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:697 ../../include/conversation.php:1546 -#: ../../include/widgets.php:105 -msgid "Personal" +#: ../../Zotlabs/Module/Setup.php:308 ../../Zotlabs/Module/Setup.php:354 +msgid "Site administrator email address" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:699 -msgid "Relation" +#: ../../Zotlabs/Module/Setup.php:308 ../../Zotlabs/Module/Setup.php:354 +msgid "" +"Your account email address must match this in order to use the web admin " +"panel." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:700 ../../include/datetime.php:48 -msgid "Miscellaneous" +#: ../../Zotlabs/Module/Setup.php:309 ../../Zotlabs/Module/Setup.php:356 +msgid "Website URL" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:702 -msgid "Import profile from file" +#: ../../Zotlabs/Module/Setup.php:309 ../../Zotlabs/Module/Setup.php:356 +msgid "Please use SSL (https) URL if available." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:703 -msgid "Export profile to file" +#: ../../Zotlabs/Module/Setup.php:310 ../../Zotlabs/Module/Setup.php:360 +msgid "Please select a default timezone for your website" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:704 -msgid "Your gender" +#: ../../Zotlabs/Module/Setup.php:335 ../../Zotlabs/Module/Admin.php:489 +msgid "Basic/Minimal Social Networking" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:705 -msgid "Marital status" +#: ../../Zotlabs/Module/Setup.php:336 ../../Zotlabs/Module/Admin.php:490 +msgid "Standard Configuration (default)" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:706 -msgid "Sexual preference" +#: ../../Zotlabs/Module/Setup.php:337 ../../Zotlabs/Module/Admin.php:491 +msgid "Professional" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:709 -msgid "Profile name" +#: ../../Zotlabs/Module/Setup.php:343 +msgid "Site settings" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:709 ../../Zotlabs/Module/Profiles.php:713 -#: ../../Zotlabs/Module/Appman.php:115 ../../Zotlabs/Module/Appman.php:116 -#: ../../Zotlabs/Module/Events.php:452 ../../Zotlabs/Module/Events.php:457 -#: ../../include/datetime.php:245 -msgid "Required" +#: ../../Zotlabs/Module/Setup.php:358 ../../Zotlabs/Module/Admin.php:512 +msgid "Server Configuration/Role" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:711 -msgid "This is your default profile." +#: ../../Zotlabs/Module/Setup.php:399 +msgid "PHP version 5.5 or greater is required." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:713 -msgid "Your full name" +#: ../../Zotlabs/Module/Setup.php:400 +msgid "PHP version" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:714 -msgid "Title/Description" +#: ../../Zotlabs/Module/Setup.php:415 +msgid "Could not find a command line version of PHP in the web server PATH." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:717 -msgid "Street address" +#: ../../Zotlabs/Module/Setup.php:416 +msgid "" +"If you don't have a command line version of PHP installed on server, you " +"will not be able to run background polling via cron." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:718 -msgid "Locality/City" +#: ../../Zotlabs/Module/Setup.php:420 +msgid "PHP executable path" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:719 -msgid "Region/State" +#: ../../Zotlabs/Module/Setup.php:420 +msgid "" +"Enter full path to php executable. You can leave this blank to continue the " +"installation." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:720 -msgid "Postal/Zip code" +#: ../../Zotlabs/Module/Setup.php:425 +msgid "Command line PHP" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:721 -msgid "Country" +#: ../../Zotlabs/Module/Setup.php:434 +msgid "" +"The command line version of PHP on your system does not have " +"\"register_argc_argv\" enabled." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:726 -msgid "Who (if applicable)" +#: ../../Zotlabs/Module/Setup.php:435 +msgid "This is required for message delivery to work." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:726 -msgid "Examples: cathy123, Cathy Williams, cathy@example.com" +#: ../../Zotlabs/Module/Setup.php:438 +msgid "PHP register_argc_argv" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:727 -msgid "Since (date)" +#: ../../Zotlabs/Module/Setup.php:456 +#, php-format +msgid "" +"Your max allowed total upload size is set to %s. Maximum size of one file to " +"upload is set to %s. You are allowed to upload up to %d files at once." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:730 -msgid "Tell us about yourself" +#: ../../Zotlabs/Module/Setup.php:461 +msgid "You can adjust these settings in the servers php.ini." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:731 -msgid "Homepage URL" +#: ../../Zotlabs/Module/Setup.php:463 +msgid "PHP upload limits" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:732 -msgid "Hometown" +#: ../../Zotlabs/Module/Setup.php:486 +msgid "" +"Error: the \"openssl_pkey_new\" function on this system is not able to " +"generate encryption keys" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:733 -msgid "Political views" +#: ../../Zotlabs/Module/Setup.php:487 +msgid "" +"If running under Windows, please see \"http://www.php.net/manual/en/openssl." +"installation.php\"." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:734 -msgid "Religious views" +#: ../../Zotlabs/Module/Setup.php:490 +msgid "Generate encryption keys" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:735 -msgid "Keywords used in directory listings" +#: ../../Zotlabs/Module/Setup.php:502 +msgid "libCurl PHP module" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:735 -msgid "Example: fishing photography software" +#: ../../Zotlabs/Module/Setup.php:503 +msgid "GD graphics PHP module" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:738 -msgid "Musical interests" +#: ../../Zotlabs/Module/Setup.php:504 +msgid "OpenSSL PHP module" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:739 -msgid "Books, literature" +#: ../../Zotlabs/Module/Setup.php:505 +msgid "mysqli or postgres PHP module" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:740 -msgid "Television" +#: ../../Zotlabs/Module/Setup.php:506 +msgid "mb_string PHP module" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:741 -msgid "Film/Dance/Culture/Entertainment" +#: ../../Zotlabs/Module/Setup.php:507 +msgid "xml PHP module" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:742 -msgid "Hobbies/Interests" +#: ../../Zotlabs/Module/Setup.php:511 ../../Zotlabs/Module/Setup.php:513 +msgid "Apache mod_rewrite module" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:743 -msgid "Love/Romance" +#: ../../Zotlabs/Module/Setup.php:511 +msgid "" +"Error: Apache webserver mod-rewrite module is required but not installed." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:745 -msgid "School/Education" +#: ../../Zotlabs/Module/Setup.php:517 ../../Zotlabs/Module/Setup.php:520 +msgid "proc_open" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:746 -msgid "Contact information and social networks" +#: ../../Zotlabs/Module/Setup.php:517 +msgid "" +"Error: proc_open is required but is either not installed or has been " +"disabled in php.ini" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:747 -msgid "My other channels" +#: ../../Zotlabs/Module/Setup.php:525 +msgid "Error: libCURL PHP module required but not installed." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:767 ../../include/channel.php:977 -msgid "Profile Image" +#: ../../Zotlabs/Module/Setup.php:529 +msgid "" +"Error: GD graphics PHP module with JPEG support required but not installed." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:777 ../../include/nav.php:90 -#: ../../include/channel.php:959 -msgid "Edit Profiles" +#: ../../Zotlabs/Module/Setup.php:533 +msgid "Error: openssl PHP module required but not installed." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:778 ../../Zotlabs/Module/Chat.php:255 -#: ../../Zotlabs/Module/Manage.php:143 -msgid "Create New" +#: ../../Zotlabs/Module/Setup.php:537 +msgid "" +"Error: mysqli or postgres PHP module required but neither are installed." msgstr "" -#: ../../Zotlabs/Module/Rpost.php:135 ../../Zotlabs/Module/Editpost.php:106 -msgid "Edit post" +#: ../../Zotlabs/Module/Setup.php:541 +msgid "Error: mb_string PHP module required but not installed." msgstr "" -#: ../../Zotlabs/Module/Bookmarks.php:53 -msgid "Bookmark added" +#: ../../Zotlabs/Module/Setup.php:545 +msgid "Error: xml PHP module required for DAV but not installed." msgstr "" -#: ../../Zotlabs/Module/Bookmarks.php:75 -msgid "My Bookmarks" +#: ../../Zotlabs/Module/Setup.php:563 +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/Bookmarks.php:86 -msgid "My Connections Bookmarks" +#: ../../Zotlabs/Module/Setup.php:564 +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/Item.php:179 -msgid "Unable to locate original post." +#: ../../Zotlabs/Module/Setup.php:565 +msgid "" +"At the end of this procedure, we will give you a text to save in a file " +"named .htconfig.php in your Red top folder." msgstr "" -#: ../../Zotlabs/Module/Item.php:432 -msgid "Empty post discarded." +#: ../../Zotlabs/Module/Setup.php:566 +msgid "" +"You can alternatively skip this procedure and perform a manual installation. " +"Please see the file \"install/INSTALL.txt\" for instructions." msgstr "" -#: ../../Zotlabs/Module/Item.php:472 -msgid "Executable content type not permitted to this channel." +#: ../../Zotlabs/Module/Setup.php:569 +msgid ".htconfig.php is writable" msgstr "" -#: ../../Zotlabs/Module/Item.php:856 -msgid "Duplicate post suppressed." +#: ../../Zotlabs/Module/Setup.php:583 +msgid "" +"Red uses the Smarty3 template engine to render its web views. Smarty3 " +"compiles templates to PHP to speed up rendering." msgstr "" -#: ../../Zotlabs/Module/Item.php:989 -msgid "System error. Post not saved." +#: ../../Zotlabs/Module/Setup.php:584 +#, 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/Item.php:1242 -msgid "Unable to obtain post information from database." +#: ../../Zotlabs/Module/Setup.php:585 ../../Zotlabs/Module/Setup.php:606 +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/Item.php:1249 +#: ../../Zotlabs/Module/Setup.php:586 #, php-format -msgid "You have reached your limit of %1$.0f top level posts." +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/Item.php:1256 +#: ../../Zotlabs/Module/Setup.php:589 #, php-format -msgid "You have reached your limit of %1$.0f webpages." -msgstr "" - -#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:222 -#: ../../include/nav.php:94 ../../include/conversation.php:1652 -msgid "Photos" -msgstr "" - -#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88 -#: ../../Zotlabs/Module/Settings.php:661 ../../Zotlabs/Module/Settings.php:687 -#: ../../Zotlabs/Module/Admin.php:1406 ../../Zotlabs/Module/Wiki.php:171 -#: ../../Zotlabs/Module/Wiki.php:211 ../../Zotlabs/Module/Tagrm.php:15 -#: ../../Zotlabs/Module/Tagrm.php:138 ../../include/conversation.php:1236 -#: ../../include/conversation.php:1279 -msgid "Cancel" -msgstr "" - -#: ../../Zotlabs/Module/Page.php:40 ../../Zotlabs/Module/Block.php:31 -msgid "Invalid item." -msgstr "" - -#: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Block.php:43 -#: ../../Zotlabs/Module/Cal.php:62 ../../Zotlabs/Module/Wall_upload.php:33 -msgid "Channel not found." +msgid "%s is writable" msgstr "" -#: ../../Zotlabs/Module/Page.php:131 +#: ../../Zotlabs/Module/Setup.php:605 msgid "" -"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod " -"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, " -"quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo " -"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse " -"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat " -"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." -msgstr "" - -#: ../../Zotlabs/Module/Filer.php:52 -msgid "Save to Folder:" -msgstr "" - -#: ../../Zotlabs/Module/Filer.php:52 -msgid "- select -" -msgstr "" - -#: ../../Zotlabs/Module/Filer.php:53 ../../Zotlabs/Module/Admin.php:2033 -#: ../../Zotlabs/Module/Admin.php:2053 ../../Zotlabs/Module/Rbmark.php:32 -#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/text.php:926 -#: ../../include/text.php:938 ../../include/widgets.php:201 -msgid "Save" -msgstr "" - -#: ../../Zotlabs/Module/Channel.php:28 ../../Zotlabs/Module/Chat.php:25 -#: ../../Zotlabs/Module/Wiki.php:20 -msgid "You must be logged in to see this page." -msgstr "" - -#: ../../Zotlabs/Module/Channel.php:40 -msgid "Posts and comments" -msgstr "" - -#: ../../Zotlabs/Module/Channel.php:41 -msgid "Only posts" -msgstr "" - -#: ../../Zotlabs/Module/Channel.php:101 -msgid "Insufficient permissions. Request redirected to profile page." +"This software uses the store directory to save uploaded files. The web " +"server needs to have write access to the store directory under the Red top " +"level folder" msgstr "" -#: ../../Zotlabs/Module/Connections.php:56 -#: ../../Zotlabs/Module/Connections.php:161 -#: ../../Zotlabs/Module/Connections.php:242 -msgid "Blocked" +#: ../../Zotlabs/Module/Setup.php:609 +msgid "store is writable" msgstr "" -#: ../../Zotlabs/Module/Connections.php:61 -#: ../../Zotlabs/Module/Connections.php:168 -#: ../../Zotlabs/Module/Connections.php:241 -msgid "Ignored" +#: ../../Zotlabs/Module/Setup.php:642 +msgid "" +"SSL certificate cannot be validated. Fix certificate or disable https access " +"to this site." msgstr "" -#: ../../Zotlabs/Module/Connections.php:66 -#: ../../Zotlabs/Module/Connections.php:182 -#: ../../Zotlabs/Module/Connections.php:240 -msgid "Hidden" +#: ../../Zotlabs/Module/Setup.php:643 +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/Connections.php:71 -#: ../../Zotlabs/Module/Connections.php:175 -#: ../../Zotlabs/Module/Connections.php:239 -msgid "Archived" +#: ../../Zotlabs/Module/Setup.php:644 +msgid "" +"This restriction is incorporated because public posts from you may for " +"example contain references to images on your own hub." msgstr "" -#: ../../Zotlabs/Module/Connections.php:76 -#: ../../Zotlabs/Module/Connections.php:86 ../../Zotlabs/Module/Menu.php:116 -#: ../../include/conversation.php:1555 -msgid "New" +#: ../../Zotlabs/Module/Setup.php:645 +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/Connections.php:92 -#: ../../Zotlabs/Module/Connections.php:107 -#: ../../Zotlabs/Module/Connedit.php:632 ../../include/widgets.php:497 -msgid "All" +#: ../../Zotlabs/Module/Setup.php:646 +msgid "" +"This can cause usability issues elsewhere (not just on your own site) so we " +"must insist on this requirement." msgstr "" -#: ../../Zotlabs/Module/Connections.php:138 -msgid "New Connections" +#: ../../Zotlabs/Module/Setup.php:647 +msgid "" +"Providers are available that issue free certificates which are browser-valid." msgstr "" -#: ../../Zotlabs/Module/Connections.php:141 -msgid "Show pending (new) connections" +#: ../../Zotlabs/Module/Setup.php:649 +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. " +"These are not normally required by browsers, but are required for server-to-" +"server communications." msgstr "" -#: ../../Zotlabs/Module/Connections.php:145 -#: ../../Zotlabs/Module/Profperm.php:144 -msgid "All Connections" +#: ../../Zotlabs/Module/Setup.php:652 +msgid "SSL certificate validation" msgstr "" -#: ../../Zotlabs/Module/Connections.php:148 -msgid "Show all connections" +#: ../../Zotlabs/Module/Setup.php:658 +msgid "" +"Url rewrite in .htaccess is not working. Check your server configuration." +"Test: " msgstr "" -#: ../../Zotlabs/Module/Connections.php:164 -msgid "Only show blocked connections" +#: ../../Zotlabs/Module/Setup.php:661 +msgid "Url rewrite is working" msgstr "" -#: ../../Zotlabs/Module/Connections.php:171 -msgid "Only show ignored connections" +#: ../../Zotlabs/Module/Setup.php:670 +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/Connections.php:178 -msgid "Only show archived connections" +#: ../../Zotlabs/Module/Setup.php:694 +msgid "Errors encountered creating database tables." msgstr "" -#: ../../Zotlabs/Module/Connections.php:185 -msgid "Only show hidden connections" +#: ../../Zotlabs/Module/Setup.php:731 +msgid "<h1>What next</h1>" msgstr "" -#: ../../Zotlabs/Module/Connections.php:238 -msgid "Pending approval" +#: ../../Zotlabs/Module/Setup.php:732 +msgid "" +"IMPORTANT: You will need to [manually] setup a scheduled task for the poller." msgstr "" -#: ../../Zotlabs/Module/Connections.php:254 +#: ../../Zotlabs/Module/Directory.php:243 #, php-format -msgid "%1$s [%2$s]" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:255 -msgid "Edit connection" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:256 -msgid "Delete connection" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:265 -msgid "Channel address" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:267 -msgid "Network" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:270 ../../Zotlabs/Module/Admin.php:710 -msgid "Status" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:272 -msgid "Connected" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:274 -msgid "Approve connection" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:275 -#: ../../Zotlabs/Module/Admin.php:1037 -msgid "Approve" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:276 -msgid "Ignore connection" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:277 -#: ../../Zotlabs/Module/Connedit.php:586 -#: ../../Zotlabs/Module/Notifications.php:55 -msgid "Ignore" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:278 -msgid "Recent activity" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:302 ../../Zotlabs/Lib/Apps.php:209 -#: ../../include/text.php:855 ../../include/nav.php:190 -msgid "Connections" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:306 ../../Zotlabs/Module/Search.php:44 -#: ../../Zotlabs/Lib/Apps.php:230 ../../include/acl_selectors.php:274 -#: ../../include/text.php:925 ../../include/text.php:937 -#: ../../include/nav.php:169 -msgid "Search" -msgstr "" - -#: ../../Zotlabs/Module/Connections.php:307 -msgid "Search your connections" -msgstr "" +msgid "%d rating" +msgid_plural "%d ratings" +msgstr[0] "" +msgstr[1] "" -#: ../../Zotlabs/Module/Connections.php:308 -msgid "Connections search" +#: ../../Zotlabs/Module/Directory.php:254 +msgid "Gender: " msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:58 -#: ../../Zotlabs/Module/Profile_photo.php:61 -msgid "Image uploaded but image cropping failed." +#: ../../Zotlabs/Module/Directory.php:256 +msgid "Status: " msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:134 -#: ../../Zotlabs/Module/Cover_photo.php:181 -msgid "Cover Photos" +#: ../../Zotlabs/Module/Directory.php:258 +msgid "Homepage: " msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:154 -#: ../../Zotlabs/Module/Profile_photo.php:135 -msgid "Image resize failed." +#: ../../Zotlabs/Module/Directory.php:306 ../../include/channel.php:1207 +msgid "Age:" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:168 -#: ../../Zotlabs/Module/Profile_photo.php:196 ../../include/photos.php:148 -msgid "Unable to process image" +#: ../../Zotlabs/Module/Directory.php:311 ../../include/channel.php:1049 +#: ../../include/event.php:52 ../../include/event.php:84 +#: ../../include/bb2diaspora.php:507 +msgid "Location:" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:192 -#: ../../Zotlabs/Module/Profile_photo.php:223 -msgid "Image upload failed." +#: ../../Zotlabs/Module/Directory.php:317 +msgid "Description:" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:210 -#: ../../Zotlabs/Module/Profile_photo.php:242 -msgid "Unable to process image." +#: ../../Zotlabs/Module/Directory.php:322 ../../include/channel.php:1223 +msgid "Hometown:" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4283 -msgid "female" +#: ../../Zotlabs/Module/Directory.php:324 ../../include/channel.php:1231 +msgid "About:" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4284 -#, php-format -msgid "%1$s updated her %2$s" +#: ../../Zotlabs/Module/Directory.php:325 ../../Zotlabs/Module/Match.php:68 +#: ../../Zotlabs/Module/Suggest.php:56 ../../include/widgets.php:147 +#: ../../include/widgets.php:184 ../../include/connections.php:78 +#: ../../include/channel.php:1034 ../../include/conversation.php:957 +msgid "Connect" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:4285 -msgid "male" +#: ../../Zotlabs/Module/Directory.php:326 +msgid "Public Forum:" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4286 -#, php-format -msgid "%1$s updated his %2$s" +#: ../../Zotlabs/Module/Directory.php:329 +msgid "Keywords: " msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4288 -#, php-format -msgid "%1$s updated their %2$s" +#: ../../Zotlabs/Module/Directory.php:332 +msgid "Don't suggest" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/channel.php:1710 -msgid "cover photo" +#: ../../Zotlabs/Module/Directory.php:334 +msgid "Common connections:" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:303 -#: ../../Zotlabs/Module/Cover_photo.php:318 -#: ../../Zotlabs/Module/Profile_photo.php:300 -#: ../../Zotlabs/Module/Profile_photo.php:341 -msgid "Photo not available." +#: ../../Zotlabs/Module/Directory.php:383 +msgid "Global Directory" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:354 -#: ../../Zotlabs/Module/Profile_photo.php:387 -msgid "Upload File:" +#: ../../Zotlabs/Module/Directory.php:383 +msgid "Local Directory" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:355 -#: ../../Zotlabs/Module/Profile_photo.php:388 -msgid "Select a profile:" +#: ../../Zotlabs/Module/Directory.php:389 +msgid "Finding:" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:356 -msgid "Upload Cover Photo" +#: ../../Zotlabs/Module/Directory.php:392 ../../Zotlabs/Module/Suggest.php:64 +#: ../../include/contact_widgets.php:24 +msgid "Channel Suggestions" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:361 -#: ../../Zotlabs/Module/Settings.php:1138 -#: ../../Zotlabs/Module/Profile_photo.php:396 -msgid "or" +#: ../../Zotlabs/Module/Directory.php:394 +msgid "next page" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:361 -#: ../../Zotlabs/Module/Profile_photo.php:396 -msgid "skip this step" +#: ../../Zotlabs/Module/Directory.php:394 +msgid "previous page" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:361 -#: ../../Zotlabs/Module/Profile_photo.php:396 -msgid "select a photo from your photo albums" +#: ../../Zotlabs/Module/Directory.php:395 +msgid "Sort options" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:377 -#: ../../Zotlabs/Module/Profile_photo.php:415 -msgid "Crop Image" +#: ../../Zotlabs/Module/Directory.php:396 +msgid "Alphabetic" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:378 -#: ../../Zotlabs/Module/Profile_photo.php:416 -msgid "Please adjust the image cropping for optimum viewing." +#: ../../Zotlabs/Module/Directory.php:397 +msgid "Reverse Alphabetic" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:380 -#: ../../Zotlabs/Module/Profile_photo.php:418 -msgid "Done Editing" +#: ../../Zotlabs/Module/Directory.php:398 +msgid "Newest to Oldest" msgstr "" -#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:192 -msgid "webpage" +#: ../../Zotlabs/Module/Directory.php:399 +msgid "Oldest to Newest" msgstr "" -#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:198 -msgid "block" +#: ../../Zotlabs/Module/Directory.php:416 +msgid "No entries (some entries may be hidden)." msgstr "" -#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:195 -msgid "layout" +#: ../../Zotlabs/Module/Dirsearch.php:25 ../../Zotlabs/Module/Regdir.php:49 +msgid "This site is not a directory server" msgstr "" -#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:201 -msgid "menu" +#: ../../Zotlabs/Module/Dirsearch.php:33 +msgid "This directory server requires an access token" msgstr "" -#: ../../Zotlabs/Module/Impel.php:191 -#, php-format -msgid "%s element installed" +#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95 +#: ../../Zotlabs/Module/Editlayout.php:79 +#: ../../Zotlabs/Module/Editwebpage.php:80 +#: ../../Zotlabs/Module/Editpost.php:24 +msgid "Item not found" msgstr "" -#: ../../Zotlabs/Module/Impel.php:194 -#, php-format -msgid "%s element installation failed" +#: ../../Zotlabs/Module/Editblock.php:108 ../../Zotlabs/Module/Blocks.php:97 +#: ../../Zotlabs/Module/Blocks.php:155 +msgid "Block Name" msgstr "" -#: ../../Zotlabs/Module/Like.php:19 -msgid "Like/Dislike" +#: ../../Zotlabs/Module/Editblock.php:111 +#: ../../Zotlabs/Module/Editwebpage.php:146 ../../Zotlabs/Module/Mail.php:244 +#: ../../Zotlabs/Module/Mail.php:369 ../../Zotlabs/Module/Chat.php:207 +#: ../../include/conversation.php:1148 +msgid "Insert web link" msgstr "" -#: ../../Zotlabs/Module/Like.php:24 -msgid "This action is restricted to members." +#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1255 +msgid "Title (optional)" msgstr "" -#: ../../Zotlabs/Module/Like.php:25 -msgid "" -"Please <a href=\"rmagic\">login with your $Projectname ID</a> or <a href=" -"\"register\">register as a new $Projectname member</a> to continue." +#: ../../Zotlabs/Module/Editblock.php:133 +msgid "Edit Block" msgstr "" -#: ../../Zotlabs/Module/Like.php:105 ../../Zotlabs/Module/Like.php:131 -#: ../../Zotlabs/Module/Like.php:169 -msgid "Invalid request." +#: ../../Zotlabs/Module/Editlayout.php:127 +#: ../../Zotlabs/Module/Layouts.php:128 ../../Zotlabs/Module/Layouts.php:188 +msgid "Layout Name" msgstr "" -#: ../../Zotlabs/Module/Like.php:117 ../../include/conversation.php:126 -msgid "channel" +#: ../../Zotlabs/Module/Editlayout.php:128 +#: ../../Zotlabs/Module/Layouts.php:131 +msgid "Layout Description (Optional)" msgstr "" -#: ../../Zotlabs/Module/Like.php:146 -msgid "thing" +#: ../../Zotlabs/Module/Editlayout.php:136 +msgid "Edit Layout" msgstr "" -#: ../../Zotlabs/Module/Like.php:192 -msgid "Channel unavailable." +#: ../../Zotlabs/Module/Editwebpage.php:142 +msgid "Page link" msgstr "" -#: ../../Zotlabs/Module/Like.php:240 -msgid "Previous action reversed." +#: ../../Zotlabs/Module/Editwebpage.php:169 +msgid "Edit Webpage" msgstr "" -#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87 -#: ../../Zotlabs/Module/Tagger.php:47 ../../include/text.php:1945 -#: ../../include/conversation.php:120 -msgid "photo" +#: ../../Zotlabs/Module/Menu.php:49 +msgid "Unable to update menu." msgstr "" -#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87 -#: ../../include/text.php:1951 ../../include/conversation.php:148 -msgid "status" +#: ../../Zotlabs/Module/Menu.php:60 +msgid "Unable to create menu." msgstr "" -#: ../../Zotlabs/Module/Like.php:372 ../../Zotlabs/Module/Events.php:253 -#: ../../Zotlabs/Module/Tagger.php:51 ../../include/text.php:1948 -#: ../../include/event.php:951 ../../include/conversation.php:123 -msgid "event" +#: ../../Zotlabs/Module/Menu.php:98 ../../Zotlabs/Module/Menu.php:110 +msgid "Menu Name" msgstr "" -#: ../../Zotlabs/Module/Like.php:419 ../../include/conversation.php:164 -#, php-format -msgid "%1$s likes %2$s's %3$s" +#: ../../Zotlabs/Module/Menu.php:98 +msgid "Unique name (not visible on webpage) - required" msgstr "" -#: ../../Zotlabs/Module/Like.php:421 ../../include/conversation.php:167 -#, php-format -msgid "%1$s doesn't like %2$s's %3$s" +#: ../../Zotlabs/Module/Menu.php:99 ../../Zotlabs/Module/Menu.php:111 +msgid "Menu Title" msgstr "" -#: ../../Zotlabs/Module/Like.php:423 -#, php-format -msgid "%1$s agrees with %2$s's %3$s" +#: ../../Zotlabs/Module/Menu.php:99 +msgid "Visible on webpage - leave empty for no title" msgstr "" -#: ../../Zotlabs/Module/Like.php:425 -#, php-format -msgid "%1$s doesn't agree with %2$s's %3$s" +#: ../../Zotlabs/Module/Menu.php:100 +msgid "Allow Bookmarks" msgstr "" -#: ../../Zotlabs/Module/Like.php:427 -#, php-format -msgid "%1$s abstains from a decision on %2$s's %3$s" +#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157 +msgid "Menu may be used to store saved bookmarks" msgstr "" -#: ../../Zotlabs/Module/Like.php:429 -#, php-format -msgid "%1$s is attending %2$s's %3$s" +#: ../../Zotlabs/Module/Menu.php:101 ../../Zotlabs/Module/Menu.php:159 +msgid "Submit and proceed" msgstr "" -#: ../../Zotlabs/Module/Like.php:431 -#, php-format -msgid "%1$s is not attending %2$s's %3$s" +#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2263 +msgid "Menus" msgstr "" -#: ../../Zotlabs/Module/Like.php:433 -#, php-format -msgid "%1$s may attend %2$s's %3$s" +#: ../../Zotlabs/Module/Menu.php:113 ../../Zotlabs/Module/Locs.php:120 +msgid "Drop" msgstr "" -#: ../../Zotlabs/Module/Like.php:538 -msgid "Action completed." +#: ../../Zotlabs/Module/Menu.php:114 ../../Zotlabs/Module/Webpages.php:228 +#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Layouts.php:190 +#: ../../include/page_widgets.php:47 +msgid "Created" msgstr "" -#: ../../Zotlabs/Module/Like.php:539 -msgid "Thank you." +#: ../../Zotlabs/Module/Menu.php:115 ../../Zotlabs/Module/Webpages.php:229 +#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Layouts.php:191 +#: ../../include/page_widgets.php:48 +msgid "Edited" msgstr "" -#: ../../Zotlabs/Module/Dirsearch.php:25 ../../Zotlabs/Module/Regdir.php:49 -msgid "This site is not a directory server" +#: ../../Zotlabs/Module/Menu.php:117 +msgid "Bookmarks allowed" msgstr "" -#: ../../Zotlabs/Module/Dirsearch.php:33 -msgid "This directory server requires an access token" +#: ../../Zotlabs/Module/Menu.php:119 +msgid "Delete this menu" msgstr "" -#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95 -#: ../../Zotlabs/Module/Editlayout.php:79 -#: ../../Zotlabs/Module/Editwebpage.php:80 -#: ../../Zotlabs/Module/Editpost.php:24 -msgid "Item not found" +#: ../../Zotlabs/Module/Menu.php:120 ../../Zotlabs/Module/Menu.php:154 +msgid "Edit menu contents" msgstr "" -#: ../../Zotlabs/Module/Editblock.php:108 ../../Zotlabs/Module/Blocks.php:97 -#: ../../Zotlabs/Module/Blocks.php:155 -msgid "Block Name" +#: ../../Zotlabs/Module/Menu.php:121 +msgid "Edit this menu" msgstr "" -#: ../../Zotlabs/Module/Editblock.php:111 -#: ../../Zotlabs/Module/Editwebpage.php:146 ../../Zotlabs/Module/Chat.php:207 -#: ../../Zotlabs/Module/Mail.php:244 ../../Zotlabs/Module/Mail.php:369 -#: ../../include/conversation.php:1147 -msgid "Insert web link" +#: ../../Zotlabs/Module/Menu.php:136 +msgid "Menu could not be deleted." msgstr "" -#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1244 -msgid "Title (optional)" +#: ../../Zotlabs/Module/Menu.php:144 ../../Zotlabs/Module/Mitem.php:28 +msgid "Menu not found." msgstr "" -#: ../../Zotlabs/Module/Editblock.php:133 -msgid "Edit Block" +#: ../../Zotlabs/Module/Menu.php:149 +msgid "Edit Menu" msgstr "" -#: ../../Zotlabs/Module/Editlayout.php:127 -#: ../../Zotlabs/Module/Layouts.php:128 ../../Zotlabs/Module/Layouts.php:188 -msgid "Layout Name" +#: ../../Zotlabs/Module/Menu.php:153 +msgid "Add or remove entries to this menu" msgstr "" -#: ../../Zotlabs/Module/Editlayout.php:128 -#: ../../Zotlabs/Module/Layouts.php:131 -msgid "Layout Description (Optional)" +#: ../../Zotlabs/Module/Menu.php:155 +msgid "Menu name" msgstr "" -#: ../../Zotlabs/Module/Editlayout.php:136 -msgid "Edit Layout" +#: ../../Zotlabs/Module/Menu.php:155 +msgid "Must be unique, only seen by you" msgstr "" -#: ../../Zotlabs/Module/Editwebpage.php:142 -msgid "Page link" +#: ../../Zotlabs/Module/Menu.php:156 +msgid "Menu title" msgstr "" -#: ../../Zotlabs/Module/Editwebpage.php:169 -msgid "Edit Webpage" +#: ../../Zotlabs/Module/Menu.php:156 +msgid "Menu title as seen by others" msgstr "" -#: ../../Zotlabs/Module/Acl.php:312 -msgid "network" +#: ../../Zotlabs/Module/Menu.php:157 +msgid "Allow bookmarks" msgstr "" -#: ../../Zotlabs/Module/Acl.php:322 -msgid "RSS" +#: ../../Zotlabs/Module/Menu.php:166 ../../Zotlabs/Module/Mitem.php:120 +#: ../../Zotlabs/Module/Xchan.php:41 +msgid "Not found." msgstr "" #: ../../Zotlabs/Module/Appman.php:37 ../../Zotlabs/Module/Appman.php:53 @@ -2064,6 +1895,13 @@ msgstr "" msgid "Name of app" msgstr "" +#: ../../Zotlabs/Module/Appman.php:115 ../../Zotlabs/Module/Appman.php:116 +#: ../../Zotlabs/Module/Profiles.php:709 ../../Zotlabs/Module/Profiles.php:713 +#: ../../Zotlabs/Module/Events.php:452 ../../Zotlabs/Module/Events.php:457 +#: ../../include/datetime.php:245 +msgid "Required" +msgstr "" + #: ../../Zotlabs/Module/Appman.php:116 msgid "Location (URL) of app" msgstr "" @@ -2166,13 +2004,6 @@ msgstr "" msgid "Visible to:" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:32 ../../Zotlabs/Module/Display.php:40 -#: ../../Zotlabs/Module/Admin.php:164 ../../Zotlabs/Module/Admin.php:1255 -#: ../../Zotlabs/Module/Admin.php:1561 ../../Zotlabs/Module/Thing.php:89 -#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:3369 -msgid "Item not found." -msgstr "" - #: ../../Zotlabs/Module/Filestorage.php:87 msgid "Permission Denied." msgstr "" @@ -2185,10 +2016,10 @@ msgstr "" msgid "Edit file permissions" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:152 ../../Zotlabs/Module/Chat.php:234 +#: ../../Zotlabs/Module/Filestorage.php:152 #: ../../Zotlabs/Module/Photos.php:669 ../../Zotlabs/Module/Photos.php:1047 #: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:363 -#: ../../include/acl_selectors.php:281 +#: ../../Zotlabs/Module/Chat.php:234 ../../include/acl_selectors.php:179 msgid "Permissions" msgstr "" @@ -2224,1099 +2055,784 @@ msgstr "" msgid "Notify your contacts about this file" msgstr "" -#: ../../Zotlabs/Module/Probe.php:28 ../../Zotlabs/Module/Probe.php:32 -#, php-format -msgid "Fetching URL returns error: %1$s" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:80 -msgid "Could not access contact record." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:104 -msgid "Could not locate selected profile." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:256 -msgid "Connection updated." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:258 -msgid "Failed to update connection record." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:308 -msgid "is now connected to" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:443 -msgid "Could not access address book record." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:463 -msgid "Refresh failed - channel is currently unavailable." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:478 ../../Zotlabs/Module/Connedit.php:487 -#: ../../Zotlabs/Module/Connedit.php:496 ../../Zotlabs/Module/Connedit.php:505 -#: ../../Zotlabs/Module/Connedit.php:518 -msgid "Unable to set address book parameters." +#: ../../Zotlabs/Module/Settings.php:64 +msgid "Name is required" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:541 -msgid "Connection has been removed." +#: ../../Zotlabs/Module/Settings.php:68 +msgid "Key and Secret are required" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:557 ../../Zotlabs/Lib/Apps.php:221 -#: ../../include/nav.php:88 ../../include/conversation.php:958 -msgid "View Profile" +#: ../../Zotlabs/Module/Settings.php:72 ../../Zotlabs/Module/Settings.php:708 +#: ../../Zotlabs/Module/Admin.php:1449 ../../Zotlabs/Lib/Apps.php:334 +msgid "Update" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:560 +#: ../../Zotlabs/Module/Settings.php:138 #, php-format -msgid "View %s's profile" +msgid "This channel is limited to %d tokens" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:564 -msgid "Refresh Permissions" +#: ../../Zotlabs/Module/Settings.php:144 +msgid "Name and Password are required." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:567 -msgid "Fetch updated permissions" +#: ../../Zotlabs/Module/Settings.php:184 +msgid "Token saved." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:571 -msgid "Recent Activity" +#: ../../Zotlabs/Module/Settings.php:312 +msgid "Not valid email." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:574 -msgid "View recent posts and comments" +#: ../../Zotlabs/Module/Settings.php:315 +msgid "Protected email address. Cannot change to that email." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:578 ../../Zotlabs/Module/Admin.php:1041 -msgid "Unblock" +#: ../../Zotlabs/Module/Settings.php:324 +msgid "System failure storing new email. Please try again." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:578 ../../Zotlabs/Module/Admin.php:1040 -msgid "Block" +#: ../../Zotlabs/Module/Settings.php:341 +msgid "Password verification failed." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:581 -msgid "Block (or Unblock) all communications with this connection" +#: ../../Zotlabs/Module/Settings.php:348 +msgid "Passwords do not match. Password unchanged." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:582 -msgid "This connection is blocked!" +#: ../../Zotlabs/Module/Settings.php:352 +msgid "Empty passwords are not allowed. Password unchanged." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:586 -msgid "Unignore" +#: ../../Zotlabs/Module/Settings.php:366 +msgid "Password changed." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:589 -msgid "Ignore (or Unignore) all inbound communications from this connection" +#: ../../Zotlabs/Module/Settings.php:368 +msgid "Password update failed. Please try again." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:590 -msgid "This connection is ignored!" +#: ../../Zotlabs/Module/Settings.php:429 ../../Zotlabs/Module/Settings.php:433 +#: ../../Zotlabs/Module/Settings.php:434 ../../Zotlabs/Module/Settings.php:437 +#: ../../Zotlabs/Module/Settings.php:448 ../../Zotlabs/Module/Connedit.php:627 +#: ../../include/widgets.php:495 ../../include/channel.php:402 +#: ../../include/channel.php:403 ../../include/channel.php:410 +#: ../../include/selectors.php:123 +msgid "Friends" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:594 -msgid "Unarchive" +#: ../../Zotlabs/Module/Settings.php:617 +msgid "Settings updated." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:594 -msgid "Archive" +#: ../../Zotlabs/Module/Settings.php:681 ../../Zotlabs/Module/Settings.php:707 +#: ../../Zotlabs/Module/Settings.php:743 +msgid "Add application" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:597 -msgid "" -"Archive (or Unarchive) this connection - mark channel dead but keep content" +#: ../../Zotlabs/Module/Settings.php:684 +msgid "Name of application" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:598 -msgid "This connection is archived!" +#: ../../Zotlabs/Module/Settings.php:685 ../../Zotlabs/Module/Settings.php:711 +msgid "Consumer Key" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:602 -msgid "Unhide" +#: ../../Zotlabs/Module/Settings.php:685 ../../Zotlabs/Module/Settings.php:686 +msgid "Automatically generated - change if desired. Max length 20" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:602 -msgid "Hide" +#: ../../Zotlabs/Module/Settings.php:686 ../../Zotlabs/Module/Settings.php:712 +msgid "Consumer Secret" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:605 -msgid "Hide or Unhide this connection from your other connections" +#: ../../Zotlabs/Module/Settings.php:687 ../../Zotlabs/Module/Settings.php:713 +msgid "Redirect" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:606 -msgid "This connection is hidden!" +#: ../../Zotlabs/Module/Settings.php:687 +msgid "" +"Redirect URI - leave blank unless your application specifically requires this" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:613 -msgid "Delete this connection" +#: ../../Zotlabs/Module/Settings.php:688 ../../Zotlabs/Module/Settings.php:714 +msgid "Icon url" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:628 ../../include/widgets.php:493 -msgid "Me" +#: ../../Zotlabs/Module/Settings.php:688 ../../Zotlabs/Module/Sources.php:112 +#: ../../Zotlabs/Module/Sources.php:147 +msgid "Optional" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:629 ../../include/widgets.php:494 -msgid "Family" +#: ../../Zotlabs/Module/Settings.php:699 +msgid "Application not found." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:630 ../../Zotlabs/Module/Settings.php:407 -#: ../../Zotlabs/Module/Settings.php:411 ../../Zotlabs/Module/Settings.php:412 -#: ../../Zotlabs/Module/Settings.php:415 ../../Zotlabs/Module/Settings.php:426 -#: ../../include/selectors.php:123 ../../include/channel.php:402 -#: ../../include/channel.php:403 ../../include/channel.php:410 -#: ../../include/widgets.php:495 -msgid "Friends" +#: ../../Zotlabs/Module/Settings.php:742 +msgid "Connected Apps" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:631 ../../include/widgets.php:496 -msgid "Acquaintances" +#: ../../Zotlabs/Module/Settings.php:746 +msgid "Client key starts with" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:693 -msgid "Approve this connection" +#: ../../Zotlabs/Module/Settings.php:747 +msgid "No name" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:693 -msgid "Accept connection to allow communication" +#: ../../Zotlabs/Module/Settings.php:748 +msgid "Remove authorization" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:698 -msgid "Set Affinity" +#: ../../Zotlabs/Module/Settings.php:761 +msgid "No feature settings configured" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:701 -msgid "Set Profile" +#: ../../Zotlabs/Module/Settings.php:768 +msgid "Feature/Addon Settings" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:704 -msgid "Set Affinity & Profile" +#: ../../Zotlabs/Module/Settings.php:791 +msgid "Account Settings" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:753 -msgid "none" +#: ../../Zotlabs/Module/Settings.php:792 +msgid "Current Password" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:757 ../../include/widgets.php:623 -msgid "Connection Default Permissions" +#: ../../Zotlabs/Module/Settings.php:793 +msgid "Enter New Password" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:757 ../../include/items.php:3935 -#, php-format -msgid "Connection: %s" +#: ../../Zotlabs/Module/Settings.php:794 +msgid "Confirm New Password" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:758 -msgid "Apply these permissions automatically" +#: ../../Zotlabs/Module/Settings.php:794 +msgid "Leave password fields blank unless changing" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:758 -msgid "Connection requests will be approved without your interaction" +#: ../../Zotlabs/Module/Settings.php:796 +#: ../../Zotlabs/Module/Settings.php:1236 +msgid "Email Address:" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:760 -msgid "This connection's primary address is" +#: ../../Zotlabs/Module/Settings.php:797 +#: ../../Zotlabs/Module/Removeaccount.php:61 +msgid "Remove Account" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:761 -msgid "Available locations:" +#: ../../Zotlabs/Module/Settings.php:798 +msgid "Remove this account including all its channels" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:765 +#: ../../Zotlabs/Module/Settings.php:832 msgid "" -"The permissions indicated on this page will be applied to all new " -"connections." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:766 -msgid "Connection Tools" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:768 -msgid "Slide to adjust your degree of friendship" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:769 ../../Zotlabs/Module/Rate.php:159 -#: ../../include/js_strings.php:20 -msgid "Rating" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:770 -msgid "Slide to adjust your rating" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:771 ../../Zotlabs/Module/Connedit.php:776 -msgid "Optionally explain your rating" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:773 -msgid "Custom Filter" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:774 -msgid "Only import posts with this text" +"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/Connedit.php:774 ../../Zotlabs/Module/Connedit.php:775 +#: ../../Zotlabs/Module/Settings.php:834 msgid "" -"words one per line or #tags or /patterns/ or lang=xx, leave blank to import " -"all posts" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:775 -msgid "Do not import posts with this text" +"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/Connedit.php:777 -msgid "This information is public!" +#: ../../Zotlabs/Module/Settings.php:869 ../../include/widgets.php:614 +msgid "Guest Access Tokens" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:782 -msgid "Connection Pending Approval" +#: ../../Zotlabs/Module/Settings.php:876 +msgid "Login Name" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:785 ../../Zotlabs/Module/Settings.php:860 -msgid "inherited" +#: ../../Zotlabs/Module/Settings.php:877 +msgid "Login Password" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:787 -#, php-format -msgid "" -"Please choose the profile you would like to display to %s when viewing your " -"profile securely." +#: ../../Zotlabs/Module/Settings.php:878 +msgid "Expires (yyyy-mm-dd)" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:789 ../../Zotlabs/Module/Settings.php:857 +#: ../../Zotlabs/Module/Settings.php:879 ../../Zotlabs/Module/Connedit.php:782 msgid "Their Settings" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:790 ../../Zotlabs/Module/Settings.php:858 +#: ../../Zotlabs/Module/Settings.php:880 ../../Zotlabs/Module/Connedit.php:783 msgid "My Settings" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:792 ../../Zotlabs/Module/Settings.php:862 -msgid "Individual Permissions" +#: ../../Zotlabs/Module/Settings.php:882 ../../Zotlabs/Module/Connedit.php:778 +msgid "inherited" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:793 ../../Zotlabs/Module/Settings.php:863 -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." +#: ../../Zotlabs/Module/Settings.php:884 ../../Zotlabs/Module/Connedit.php:785 +msgid "Individual Permissions" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:794 +#: ../../Zotlabs/Module/Settings.php:885 ../../Zotlabs/Module/Connedit.php:786 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 change those settings here but they wont have " -"any impact unless the inherited setting changes." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:795 -msgid "Last update:" -msgstr "" - -#: ../../Zotlabs/Module/Group.php:24 -msgid "Privacy group created." -msgstr "" - -#: ../../Zotlabs/Module/Group.php:30 -msgid "Could not create privacy group." -msgstr "" - -#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141 -#: ../../include/items.php:3902 -msgid "Privacy group not found." -msgstr "" - -#: ../../Zotlabs/Module/Group.php:58 -msgid "Privacy group updated." -msgstr "" - -#: ../../Zotlabs/Module/Group.php:90 -msgid "Create a group of channels." -msgstr "" - -#: ../../Zotlabs/Module/Group.php:91 ../../Zotlabs/Module/Group.php:184 -msgid "Privacy group name: " -msgstr "" - -#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:187 -msgid "Members are visible to other channels" -msgstr "" - -#: ../../Zotlabs/Module/Group.php:111 -msgid "Privacy group removed." -msgstr "" - -#: ../../Zotlabs/Module/Group.php:113 -msgid "Unable to remove privacy group." -msgstr "" - -#: ../../Zotlabs/Module/Group.php:183 -msgid "Privacy group editor" -msgstr "" - -#: ../../Zotlabs/Module/Group.php:197 -msgid "Members" -msgstr "" - -#: ../../Zotlabs/Module/Group.php:199 -msgid "All Connected Channels" -msgstr "" - -#: ../../Zotlabs/Module/Group.php:231 -msgid "Click on a channel to add or remove." -msgstr "" - -#: ../../Zotlabs/Module/Menu.php:49 -msgid "Unable to update menu." -msgstr "" - -#: ../../Zotlabs/Module/Menu.php:60 -msgid "Unable to create menu." -msgstr "" - -#: ../../Zotlabs/Module/Menu.php:98 ../../Zotlabs/Module/Menu.php:110 -msgid "Menu Name" -msgstr "" - -#: ../../Zotlabs/Module/Menu.php:98 -msgid "Unique name (not visible on webpage) - required" -msgstr "" - -#: ../../Zotlabs/Module/Menu.php:99 ../../Zotlabs/Module/Menu.php:111 -msgid "Menu Title" -msgstr "" - -#: ../../Zotlabs/Module/Menu.php:99 -msgid "Visible on webpage - leave empty for no title" -msgstr "" - -#: ../../Zotlabs/Module/Menu.php:100 -msgid "Allow Bookmarks" -msgstr "" - -#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157 -msgid "Menu may be used to store saved bookmarks" -msgstr "" - -#: ../../Zotlabs/Module/Menu.php:101 ../../Zotlabs/Module/Menu.php:159 -msgid "Submit and proceed" -msgstr "" - -#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2263 -msgid "Menus" -msgstr "" - -#: ../../Zotlabs/Module/Menu.php:113 ../../Zotlabs/Module/Locs.php:120 -msgid "Drop" -msgstr "" - -#: ../../Zotlabs/Module/Menu.php:117 -msgid "Bookmarks allowed" -msgstr "" - -#: ../../Zotlabs/Module/Menu.php:119 -msgid "Delete this menu" -msgstr "" - -#: ../../Zotlabs/Module/Menu.php:120 ../../Zotlabs/Module/Menu.php:154 -msgid "Edit menu contents" -msgstr "" - -#: ../../Zotlabs/Module/Menu.php:121 -msgid "Edit this menu" -msgstr "" - -#: ../../Zotlabs/Module/Menu.php:136 -msgid "Menu could not be deleted." -msgstr "" - -#: ../../Zotlabs/Module/Menu.php:144 ../../Zotlabs/Module/Mitem.php:28 -msgid "Menu not found." -msgstr "" - -#: ../../Zotlabs/Module/Menu.php:149 -msgid "Edit Menu" -msgstr "" - -#: ../../Zotlabs/Module/Menu.php:153 -msgid "Add or remove entries to this menu" -msgstr "" - -#: ../../Zotlabs/Module/Menu.php:155 -msgid "Menu name" -msgstr "" - -#: ../../Zotlabs/Module/Menu.php:155 -msgid "Must be unique, only seen by you" -msgstr "" - -#: ../../Zotlabs/Module/Menu.php:156 -msgid "Menu title" -msgstr "" - -#: ../../Zotlabs/Module/Menu.php:156 -msgid "Menu title as seen by others" -msgstr "" - -#: ../../Zotlabs/Module/Menu.php:157 -msgid "Allow bookmarks" -msgstr "" - -#: ../../Zotlabs/Module/Menu.php:166 ../../Zotlabs/Module/Mitem.php:120 -#: ../../Zotlabs/Module/Xchan.php:41 -msgid "Not found." -msgstr "" - -#: ../../Zotlabs/Module/Editpost.php:35 -msgid "Item is not editable" -msgstr "" - -#: ../../Zotlabs/Module/Import_items.php:42 ../../Zotlabs/Module/Import.php:71 -msgid "Nothing to import." -msgstr "" - -#: ../../Zotlabs/Module/Import_items.php:66 ../../Zotlabs/Module/Import.php:95 -msgid "Unable to download data from old server" -msgstr "" - -#: ../../Zotlabs/Module/Import_items.php:72 -#: ../../Zotlabs/Module/Import.php:101 -msgid "Imported file is empty." -msgstr "" - -#: ../../Zotlabs/Module/Import_items.php:88 -#: ../../Zotlabs/Module/Import.php:123 -#, php-format -msgid "Warning: Database versions differ by %1$d updates." -msgstr "" - -#: ../../Zotlabs/Module/Import_items.php:104 -msgid "Import completed" -msgstr "" - -#: ../../Zotlabs/Module/Import_items.php:119 -msgid "Import Items" -msgstr "" - -#: ../../Zotlabs/Module/Import_items.php:120 -msgid "Use this form to import existing posts and content from an export file." -msgstr "" - -#: ../../Zotlabs/Module/Import_items.php:121 -#: ../../Zotlabs/Module/Import.php:549 -msgid "File to Upload" +"individual settings. You can <strong>not</strong> change those settings here." msgstr "" -#: ../../Zotlabs/Module/Invite.php:29 -msgid "Total invitation limit exceeded." +#: ../../Zotlabs/Module/Settings.php:903 ../../Zotlabs/Module/Admin.php:690 +#: ../../Zotlabs/Module/Admin.php:691 +msgid "Off" msgstr "" -#: ../../Zotlabs/Module/Invite.php:53 -#, php-format -msgid "%s : Not a valid email address." +#: ../../Zotlabs/Module/Settings.php:903 ../../Zotlabs/Module/Admin.php:690 +#: ../../Zotlabs/Module/Admin.php:691 +msgid "On" msgstr "" -#: ../../Zotlabs/Module/Invite.php:63 -msgid "Please join us on $Projectname" +#: ../../Zotlabs/Module/Settings.php:910 +msgid "Additional Features" msgstr "" -#: ../../Zotlabs/Module/Invite.php:74 -msgid "Invitation limit exceeded. Please contact your site administrator." +#: ../../Zotlabs/Module/Settings.php:934 +msgid "Connector Settings" msgstr "" -#: ../../Zotlabs/Module/Invite.php:79 -#, php-format -msgid "%s : Message delivery failed." +#: ../../Zotlabs/Module/Settings.php:981 +msgid "No special theme for mobile devices" msgstr "" -#: ../../Zotlabs/Module/Invite.php:83 +#: ../../Zotlabs/Module/Settings.php:984 #, php-format -msgid "%d message sent." -msgid_plural "%d messages sent." -msgstr[0] "" -msgstr[1] "" - -#: ../../Zotlabs/Module/Invite.php:102 -msgid "You have no more invitations available" -msgstr "" - -#: ../../Zotlabs/Module/Invite.php:133 -msgid "Send invitations" -msgstr "" - -#: ../../Zotlabs/Module/Invite.php:134 -msgid "Enter email addresses, one per line:" +msgid "%s - (Experimental)" msgstr "" -#: ../../Zotlabs/Module/Invite.php:135 ../../Zotlabs/Module/Mail.php:241 -msgid "Your message:" +#: ../../Zotlabs/Module/Settings.php:987 ../../Zotlabs/Module/Admin.php:414 +msgid "mobile" msgstr "" -#: ../../Zotlabs/Module/Invite.php:136 -msgid "Please join my community on $Projectname." +#: ../../Zotlabs/Module/Settings.php:1035 +msgid "Display Settings" msgstr "" -#: ../../Zotlabs/Module/Invite.php:138 -msgid "You will need to supply this invitation code:" +#: ../../Zotlabs/Module/Settings.php:1036 +msgid "Theme Settings" msgstr "" -#: ../../Zotlabs/Module/Invite.php:139 -msgid "1. Register at any $Projectname location (they are all inter-connected)" +#: ../../Zotlabs/Module/Settings.php:1037 +msgid "Custom Theme Settings" msgstr "" -#: ../../Zotlabs/Module/Invite.php:141 -msgid "2. Enter my $Projectname network address into the site searchbar." +#: ../../Zotlabs/Module/Settings.php:1038 +msgid "Content Settings" msgstr "" -#: ../../Zotlabs/Module/Invite.php:142 -msgid "or visit" +#: ../../Zotlabs/Module/Settings.php:1044 +msgid "Display Theme:" msgstr "" -#: ../../Zotlabs/Module/Invite.php:144 -msgid "3. Click [Connect]" +#: ../../Zotlabs/Module/Settings.php:1045 +msgid "Select scheme" msgstr "" -#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54 -msgid "Location not found." +#: ../../Zotlabs/Module/Settings.php:1047 +msgid "Mobile Theme:" msgstr "" -#: ../../Zotlabs/Module/Locs.php:62 -msgid "Location lookup failed." +#: ../../Zotlabs/Module/Settings.php:1048 +msgid "Preload images before rendering the page" msgstr "" -#: ../../Zotlabs/Module/Locs.php:66 +#: ../../Zotlabs/Module/Settings.php:1048 msgid "" -"Please select another location to become primary before removing the primary " -"location." -msgstr "" - -#: ../../Zotlabs/Module/Locs.php:95 -msgid "Syncing locations" -msgstr "" - -#: ../../Zotlabs/Module/Locs.php:105 -msgid "No locations found." -msgstr "" - -#: ../../Zotlabs/Module/Locs.php:116 -msgid "Manage Channel Locations" +"The subjective page load time will be longer but the page will be ready when " +"displayed" msgstr "" -#: ../../Zotlabs/Module/Locs.php:119 -msgid "Primary" +#: ../../Zotlabs/Module/Settings.php:1049 +msgid "Enable user zoom on mobile devices" msgstr "" -#: ../../Zotlabs/Module/Locs.php:122 -msgid "Sync Now" +#: ../../Zotlabs/Module/Settings.php:1050 +msgid "Update browser every xx seconds" msgstr "" -#: ../../Zotlabs/Module/Locs.php:123 -msgid "Please wait several minutes between consecutive operations." +#: ../../Zotlabs/Module/Settings.php:1050 +msgid "Minimum of 10 seconds, no maximum" msgstr "" -#: ../../Zotlabs/Module/Locs.php:124 -msgid "" -"When possible, drop a location by logging into that website/hub and removing " -"your channel." +#: ../../Zotlabs/Module/Settings.php:1051 +msgid "Maximum number of conversations to load at any time:" msgstr "" -#: ../../Zotlabs/Module/Locs.php:125 -msgid "Use this form to drop the location if the hub is no longer operating." +#: ../../Zotlabs/Module/Settings.php:1051 +msgid "Maximum of 100 items" msgstr "" -#: ../../Zotlabs/Module/Magic.php:71 -msgid "Hub not found." +#: ../../Zotlabs/Module/Settings.php:1052 +msgid "Show emoticons (smilies) as images" msgstr "" -#: ../../Zotlabs/Module/Chat.php:181 -msgid "Room not found" +#: ../../Zotlabs/Module/Settings.php:1053 +msgid "Link post titles to source" msgstr "" -#: ../../Zotlabs/Module/Chat.php:197 -msgid "Leave Room" +#: ../../Zotlabs/Module/Settings.php:1054 +msgid "System Page Layout Editor - (advanced)" msgstr "" -#: ../../Zotlabs/Module/Chat.php:198 -msgid "Delete Room" +#: ../../Zotlabs/Module/Settings.php:1057 +msgid "Use blog/list mode on channel page" msgstr "" -#: ../../Zotlabs/Module/Chat.php:199 -msgid "I am away right now" +#: ../../Zotlabs/Module/Settings.php:1057 +#: ../../Zotlabs/Module/Settings.php:1058 +msgid "(comments displayed separately)" msgstr "" -#: ../../Zotlabs/Module/Chat.php:200 -msgid "I am online" +#: ../../Zotlabs/Module/Settings.php:1058 +msgid "Use blog/list mode on grid page" msgstr "" -#: ../../Zotlabs/Module/Chat.php:202 -msgid "Bookmark this room" +#: ../../Zotlabs/Module/Settings.php:1059 +msgid "Channel page max height of content (in pixels)" msgstr "" -#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:197 -#: ../../Zotlabs/Module/Mail.php:306 ../../include/conversation.php:1182 -msgid "Please enter a link URL:" +#: ../../Zotlabs/Module/Settings.php:1059 +#: ../../Zotlabs/Module/Settings.php:1060 +msgid "click to expand content exceeding this height" msgstr "" -#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:250 -#: ../../Zotlabs/Module/Mail.php:375 ../../Zotlabs/Lib/ThreadItem.php:723 -#: ../../include/conversation.php:1276 -msgid "Encrypt text" +#: ../../Zotlabs/Module/Settings.php:1060 +msgid "Grid page max height of content (in pixels)" msgstr "" -#: ../../Zotlabs/Module/Chat.php:218 -msgid "Feature disabled." +#: ../../Zotlabs/Module/Settings.php:1090 +msgid "Nobody except yourself" msgstr "" -#: ../../Zotlabs/Module/Chat.php:231 -msgid "New Chatroom" +#: ../../Zotlabs/Module/Settings.php:1091 +msgid "Only those you specifically allow" msgstr "" -#: ../../Zotlabs/Module/Chat.php:232 -msgid "Chatroom name" +#: ../../Zotlabs/Module/Settings.php:1092 +msgid "Approved connections" msgstr "" -#: ../../Zotlabs/Module/Chat.php:233 -msgid "Expiration of chats (minutes)" +#: ../../Zotlabs/Module/Settings.php:1093 +msgid "Any connections" msgstr "" -#: ../../Zotlabs/Module/Chat.php:249 -#, php-format -msgid "%1$s's Chatrooms" +#: ../../Zotlabs/Module/Settings.php:1094 +msgid "Anybody on this website" msgstr "" -#: ../../Zotlabs/Module/Chat.php:254 -msgid "No chatrooms available" +#: ../../Zotlabs/Module/Settings.php:1095 +msgid "Anybody in this network" msgstr "" -#: ../../Zotlabs/Module/Chat.php:258 -msgid "Expiration" +#: ../../Zotlabs/Module/Settings.php:1096 +msgid "Anybody authenticated" msgstr "" -#: ../../Zotlabs/Module/Chat.php:259 -msgid "min" +#: ../../Zotlabs/Module/Settings.php:1097 +msgid "Anybody on the internet" msgstr "" -#: ../../Zotlabs/Module/Events.php:25 -msgid "Calendar entries imported." +#: ../../Zotlabs/Module/Settings.php:1171 +msgid "Publish your default profile in the network directory" msgstr "" -#: ../../Zotlabs/Module/Events.php:27 -msgid "No calendar entries found." +#: ../../Zotlabs/Module/Settings.php:1176 +msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: ../../Zotlabs/Module/Events.php:104 -msgid "Event can not end before it has started." +#: ../../Zotlabs/Module/Settings.php:1185 +msgid "Your channel address is" msgstr "" -#: ../../Zotlabs/Module/Events.php:106 ../../Zotlabs/Module/Events.php:115 -#: ../../Zotlabs/Module/Events.php:135 -msgid "Unable to generate preview." +#: ../../Zotlabs/Module/Settings.php:1227 +msgid "Channel Settings" msgstr "" -#: ../../Zotlabs/Module/Events.php:113 -msgid "Event title and start time are required." +#: ../../Zotlabs/Module/Settings.php:1234 +msgid "Basic Settings" msgstr "" -#: ../../Zotlabs/Module/Events.php:133 ../../Zotlabs/Module/Events.php:258 -msgid "Event not found." +#: ../../Zotlabs/Module/Settings.php:1235 ../../include/channel.php:1164 +msgid "Full Name:" msgstr "" -#: ../../Zotlabs/Module/Events.php:452 -msgid "Edit event title" +#: ../../Zotlabs/Module/Settings.php:1237 +msgid "Your Timezone:" msgstr "" -#: ../../Zotlabs/Module/Events.php:452 -msgid "Event title" +#: ../../Zotlabs/Module/Settings.php:1238 +msgid "Default Post Location:" msgstr "" -#: ../../Zotlabs/Module/Events.php:454 -msgid "Categories (comma-separated list)" +#: ../../Zotlabs/Module/Settings.php:1238 +msgid "Geographical location to display on your posts" msgstr "" -#: ../../Zotlabs/Module/Events.php:455 -msgid "Edit Category" +#: ../../Zotlabs/Module/Settings.php:1239 +msgid "Use Browser Location:" msgstr "" -#: ../../Zotlabs/Module/Events.php:455 -msgid "Category" +#: ../../Zotlabs/Module/Settings.php:1241 +msgid "Adult Content" msgstr "" -#: ../../Zotlabs/Module/Events.php:458 -msgid "Edit start date and time" +#: ../../Zotlabs/Module/Settings.php:1241 +msgid "" +"This channel frequently or regularly publishes adult content. (Please tag " +"any adult material and/or nudity with #NSFW)" msgstr "" -#: ../../Zotlabs/Module/Events.php:458 -msgid "Start date and time" +#: ../../Zotlabs/Module/Settings.php:1243 +msgid "Security and Privacy Settings" msgstr "" -#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:462 -msgid "Finish date and time are not known or not relevant" +#: ../../Zotlabs/Module/Settings.php:1246 +msgid "Your permissions are already configured. Click to view/adjust" msgstr "" -#: ../../Zotlabs/Module/Events.php:461 -msgid "Edit finish date and time" +#: ../../Zotlabs/Module/Settings.php:1248 +msgid "Hide my online presence" msgstr "" -#: ../../Zotlabs/Module/Events.php:461 -msgid "Finish date and time" +#: ../../Zotlabs/Module/Settings.php:1248 +msgid "Prevents displaying in your profile that you are online" msgstr "" -#: ../../Zotlabs/Module/Events.php:463 ../../Zotlabs/Module/Events.php:464 -msgid "Adjust for viewer timezone" +#: ../../Zotlabs/Module/Settings.php:1250 +msgid "Simple Privacy Settings:" msgstr "" -#: ../../Zotlabs/Module/Events.php:463 +#: ../../Zotlabs/Module/Settings.php:1251 msgid "" -"Important for events that happen in a particular place. Not practical for " -"global holidays." +"Very Public - <em>extremely permissive (should be used with caution)</em>" msgstr "" -#: ../../Zotlabs/Module/Events.php:465 -msgid "Edit Description" +#: ../../Zotlabs/Module/Settings.php:1252 +msgid "" +"Typical - <em>default public, privacy when desired (similar to social " +"network permissions but with improved privacy)</em>" msgstr "" -#: ../../Zotlabs/Module/Events.php:467 -msgid "Edit Location" +#: ../../Zotlabs/Module/Settings.php:1253 +msgid "Private - <em>default private, never open or public</em>" msgstr "" -#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:472 -msgid "Share this event" +#: ../../Zotlabs/Module/Settings.php:1254 +msgid "Blocked - <em>default blocked to/from everybody</em>" msgstr "" -#: ../../Zotlabs/Module/Events.php:474 ../../include/conversation.php:1248 -msgid "Permission settings" +#: ../../Zotlabs/Module/Settings.php:1256 +msgid "Allow others to tag your posts" msgstr "" -#: ../../Zotlabs/Module/Events.php:485 -msgid "Advanced Options" +#: ../../Zotlabs/Module/Settings.php:1256 +msgid "" +"Often used by the community to retro-actively flag inappropriate content" msgstr "" -#: ../../Zotlabs/Module/Events.php:597 ../../Zotlabs/Module/Cal.php:259 -msgid "l, F j" +#: ../../Zotlabs/Module/Settings.php:1258 +msgid "Advanced Privacy Settings" msgstr "" -#: ../../Zotlabs/Module/Events.php:619 -msgid "Edit event" +#: ../../Zotlabs/Module/Settings.php:1260 +msgid "Expire other channel content after this many days" msgstr "" -#: ../../Zotlabs/Module/Events.php:621 -msgid "Delete event" +#: ../../Zotlabs/Module/Settings.php:1260 +msgid "0 or blank to use the website limit." msgstr "" -#: ../../Zotlabs/Module/Events.php:646 ../../Zotlabs/Module/Cal.php:308 -#: ../../include/text.php:1716 -msgid "Link to Source" +#: ../../Zotlabs/Module/Settings.php:1260 +#, php-format +msgid "This website expires after %d days." msgstr "" -#: ../../Zotlabs/Module/Events.php:655 -msgid "calendar" +#: ../../Zotlabs/Module/Settings.php:1260 +msgid "This website does not expire imported content." msgstr "" -#: ../../Zotlabs/Module/Events.php:674 ../../Zotlabs/Module/Cal.php:331 -msgid "Edit Event" +#: ../../Zotlabs/Module/Settings.php:1260 +msgid "The website limit takes precedence if lower than your limit." msgstr "" -#: ../../Zotlabs/Module/Events.php:674 ../../Zotlabs/Module/Cal.php:331 -msgid "Create Event" +#: ../../Zotlabs/Module/Settings.php:1261 +msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../Zotlabs/Module/Events.php:675 ../../Zotlabs/Module/Events.php:684 -#: ../../Zotlabs/Module/Photos.php:951 ../../Zotlabs/Module/Cal.php:332 -#: ../../Zotlabs/Module/Cal.php:339 -msgid "Previous" +#: ../../Zotlabs/Module/Settings.php:1261 +msgid "May reduce spam activity" msgstr "" -#: ../../Zotlabs/Module/Events.php:677 ../../Zotlabs/Module/Cal.php:334 -msgid "Export" +#: ../../Zotlabs/Module/Settings.php:1262 +msgid "Default Post and Publish Permissions" msgstr "" -#: ../../Zotlabs/Module/Events.php:681 -msgid "Month" +#: ../../Zotlabs/Module/Settings.php:1263 ../../Zotlabs/Module/Mitem.php:154 +#: ../../Zotlabs/Module/Mitem.php:231 +msgid "(click to open/close)" msgstr "" -#: ../../Zotlabs/Module/Events.php:682 -msgid "Week" +#: ../../Zotlabs/Module/Settings.php:1264 +msgid "Use my default audience setting for the type of object published" msgstr "" -#: ../../Zotlabs/Module/Events.php:683 -msgid "Day" +#: ../../Zotlabs/Module/Settings.php:1271 +msgid "Channel permissions category:" msgstr "" -#: ../../Zotlabs/Module/Events.php:686 ../../Zotlabs/Module/Cal.php:341 -msgid "Today" +#: ../../Zotlabs/Module/Settings.php:1277 +msgid "Maximum private messages per day from unknown people:" msgstr "" -#: ../../Zotlabs/Module/Events.php:717 -msgid "Event removed" +#: ../../Zotlabs/Module/Settings.php:1277 +msgid "Useful to reduce spamming" msgstr "" -#: ../../Zotlabs/Module/Events.php:720 -msgid "Failed to remove event" +#: ../../Zotlabs/Module/Settings.php:1280 +msgid "Notification Settings" msgstr "" -#: ../../Zotlabs/Module/Mail.php:38 -msgid "Unable to lookup recipient." +#: ../../Zotlabs/Module/Settings.php:1281 +msgid "By default post a status message when:" msgstr "" -#: ../../Zotlabs/Module/Mail.php:45 -msgid "Unable to communicate with requested channel." +#: ../../Zotlabs/Module/Settings.php:1282 +msgid "accepting a friend request" msgstr "" -#: ../../Zotlabs/Module/Mail.php:52 -msgid "Cannot verify requested channel." +#: ../../Zotlabs/Module/Settings.php:1283 +msgid "joining a forum/community" msgstr "" -#: ../../Zotlabs/Module/Mail.php:70 -msgid "Selected channel has private message restrictions. Send failed." +#: ../../Zotlabs/Module/Settings.php:1284 +msgid "making an <em>interesting</em> profile change" msgstr "" -#: ../../Zotlabs/Module/Mail.php:135 -msgid "Messages" +#: ../../Zotlabs/Module/Settings.php:1285 +msgid "Send a notification email when:" msgstr "" -#: ../../Zotlabs/Module/Mail.php:170 -msgid "Message recalled." +#: ../../Zotlabs/Module/Settings.php:1286 +msgid "You receive a connection request" msgstr "" -#: ../../Zotlabs/Module/Mail.php:183 -msgid "Conversation removed." +#: ../../Zotlabs/Module/Settings.php:1287 +msgid "Your connections are confirmed" msgstr "" -#: ../../Zotlabs/Module/Mail.php:198 ../../Zotlabs/Module/Mail.php:307 -msgid "Expires YYYY-MM-DD HH:MM" +#: ../../Zotlabs/Module/Settings.php:1288 +msgid "Someone writes on your profile wall" msgstr "" -#: ../../Zotlabs/Module/Mail.php:226 -msgid "Requested channel is not in this network" +#: ../../Zotlabs/Module/Settings.php:1289 +msgid "Someone writes a followup comment" msgstr "" -#: ../../Zotlabs/Module/Mail.php:234 -msgid "Send Private Message" +#: ../../Zotlabs/Module/Settings.php:1290 +msgid "You receive a private message" msgstr "" -#: ../../Zotlabs/Module/Mail.php:235 ../../Zotlabs/Module/Mail.php:360 -msgid "To:" +#: ../../Zotlabs/Module/Settings.php:1291 +msgid "You receive a friend suggestion" msgstr "" -#: ../../Zotlabs/Module/Mail.php:238 ../../Zotlabs/Module/Mail.php:362 -msgid "Subject:" +#: ../../Zotlabs/Module/Settings.php:1292 +msgid "You are tagged in a post" msgstr "" -#: ../../Zotlabs/Module/Mail.php:243 ../../Zotlabs/Module/Mail.php:368 -#: ../../include/conversation.php:1232 -msgid "Attach file" +#: ../../Zotlabs/Module/Settings.php:1293 +msgid "You are poked/prodded/etc. in a post" msgstr "" -#: ../../Zotlabs/Module/Mail.php:245 -msgid "Send" +#: ../../Zotlabs/Module/Settings.php:1296 +msgid "Show visual notifications including:" msgstr "" -#: ../../Zotlabs/Module/Mail.php:248 ../../Zotlabs/Module/Mail.php:373 -#: ../../include/conversation.php:1271 -msgid "Set expiration date" +#: ../../Zotlabs/Module/Settings.php:1298 +msgid "Unseen grid activity" msgstr "" -#: ../../Zotlabs/Module/Mail.php:332 -msgid "Delete message" +#: ../../Zotlabs/Module/Settings.php:1299 +msgid "Unseen channel activity" msgstr "" -#: ../../Zotlabs/Module/Mail.php:333 -msgid "Delivery report" +#: ../../Zotlabs/Module/Settings.php:1300 +msgid "Unseen private messages" msgstr "" -#: ../../Zotlabs/Module/Mail.php:334 -msgid "Recall message" +#: ../../Zotlabs/Module/Settings.php:1300 +#: ../../Zotlabs/Module/Settings.php:1305 +#: ../../Zotlabs/Module/Settings.php:1306 +#: ../../Zotlabs/Module/Settings.php:1307 +msgid "Recommended" msgstr "" -#: ../../Zotlabs/Module/Mail.php:336 -msgid "Message has been recalled." +#: ../../Zotlabs/Module/Settings.php:1301 +msgid "Upcoming events" msgstr "" -#: ../../Zotlabs/Module/Mail.php:353 -msgid "Delete Conversation" +#: ../../Zotlabs/Module/Settings.php:1302 +msgid "Events today" msgstr "" -#: ../../Zotlabs/Module/Mail.php:355 -msgid "" -"No secure communications available. You <strong>may</strong> be able to " -"respond from the sender's profile page." +#: ../../Zotlabs/Module/Settings.php:1303 +msgid "Upcoming birthdays" msgstr "" -#: ../../Zotlabs/Module/Mail.php:359 -msgid "Send Reply" +#: ../../Zotlabs/Module/Settings.php:1303 +msgid "Not available in all themes" msgstr "" -#: ../../Zotlabs/Module/Mail.php:364 -#, php-format -msgid "Your message for %s (%s):" +#: ../../Zotlabs/Module/Settings.php:1304 +msgid "System (personal) notifications" msgstr "" -#: ../../Zotlabs/Module/Lostpass.php:19 -msgid "No valid account found." +#: ../../Zotlabs/Module/Settings.php:1305 +msgid "System info messages" msgstr "" -#: ../../Zotlabs/Module/Lostpass.php:33 -msgid "Password reset request issued. Check your email." +#: ../../Zotlabs/Module/Settings.php:1306 +msgid "System critical alerts" msgstr "" -#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:107 -#, php-format -msgid "Site Member (%s)" +#: ../../Zotlabs/Module/Settings.php:1307 +msgid "New connections" msgstr "" -#: ../../Zotlabs/Module/Lostpass.php:44 -#, php-format -msgid "Password reset requested at %s" +#: ../../Zotlabs/Module/Settings.php:1308 +msgid "System Registrations" msgstr "" -#: ../../Zotlabs/Module/Lostpass.php:67 +#: ../../Zotlabs/Module/Settings.php:1309 msgid "" -"Request could not be verified. (You may have previously submitted it.) " -"Password reset failed." -msgstr "" - -#: ../../Zotlabs/Module/Lostpass.php:90 ../../boot.php:1721 -msgid "Password Reset" +"Also show new wall posts, private messages and connections under Notices" msgstr "" -#: ../../Zotlabs/Module/Lostpass.php:91 -msgid "Your password has been reset as requested." +#: ../../Zotlabs/Module/Settings.php:1311 +msgid "Notify me of events this many days in advance" msgstr "" -#: ../../Zotlabs/Module/Lostpass.php:92 -msgid "Your new password is" +#: ../../Zotlabs/Module/Settings.php:1311 +msgid "Must be greater than 0" msgstr "" -#: ../../Zotlabs/Module/Lostpass.php:93 -msgid "Save or copy your new password - and then" +#: ../../Zotlabs/Module/Settings.php:1313 +msgid "Advanced Account/Page Type Settings" msgstr "" -#: ../../Zotlabs/Module/Lostpass.php:94 -msgid "click here to login" +#: ../../Zotlabs/Module/Settings.php:1314 +msgid "Change the behaviour of this account for special situations" msgstr "" -#: ../../Zotlabs/Module/Lostpass.php:95 +#: ../../Zotlabs/Module/Settings.php:1317 msgid "" -"Your password may be changed from the <em>Settings</em> page after " -"successful login." +"Please enable expert mode (in <a href=\"settings/features\">Settings > " +"Additional features</a>) to adjust!" msgstr "" -#: ../../Zotlabs/Module/Lostpass.php:112 -#, php-format -msgid "Your password has changed at %s" +#: ../../Zotlabs/Module/Settings.php:1318 +msgid "Miscellaneous Settings" msgstr "" -#: ../../Zotlabs/Module/Lostpass.php:127 -msgid "Forgot your Password?" +#: ../../Zotlabs/Module/Settings.php:1319 +msgid "Default photo upload folder" msgstr "" -#: ../../Zotlabs/Module/Lostpass.php:128 -msgid "" -"Enter your email address and submit to have your password reset. Then check " -"your email for further instructions." +#: ../../Zotlabs/Module/Settings.php:1319 +#: ../../Zotlabs/Module/Settings.php:1320 +msgid "%Y - current year, %m - current month" msgstr "" -#: ../../Zotlabs/Module/Lostpass.php:129 -msgid "Email Address" +#: ../../Zotlabs/Module/Settings.php:1320 +msgid "Default file upload folder" msgstr "" -#: ../../Zotlabs/Module/Lostpass.php:130 -msgid "Reset" +#: ../../Zotlabs/Module/Settings.php:1322 +msgid "Personal menu to display in your channel pages" msgstr "" -#: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:260 -#, php-format -msgctxt "mood" -msgid "%1$s is %2$s" +#: ../../Zotlabs/Module/Settings.php:1323 ../../Zotlabs/Module/Removeme.php:64 +msgid "Remove Channel" msgstr "" -#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:227 -msgid "Mood" +#: ../../Zotlabs/Module/Settings.php:1324 +msgid "Remove this channel." msgstr "" -#: ../../Zotlabs/Module/Mood.php:136 -msgid "Set your current mood and tell your friends" +#: ../../Zotlabs/Module/Settings.php:1325 +msgid "Firefox Share $Projectname provider" msgstr "" -#: ../../Zotlabs/Module/Manage.php:136 -#: ../../Zotlabs/Module/New_channel.php:121 -#, php-format -msgid "You have created %1$.0f of %2$.0f allowed channels." +#: ../../Zotlabs/Module/Settings.php:1326 +msgid "Start calendar week on monday" msgstr "" -#: ../../Zotlabs/Module/Manage.php:143 -msgid "Create a new channel" +#: ../../Zotlabs/Module/Acl.php:313 +msgid "network" msgstr "" -#: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:214 -#: ../../include/nav.php:210 -msgid "Channel Manager" +#: ../../Zotlabs/Module/Acl.php:323 +msgid "RSS" msgstr "" -#: ../../Zotlabs/Module/Manage.php:165 -msgid "Current Channel" +#: ../../Zotlabs/Module/Group.php:24 +msgid "Privacy group created." msgstr "" -#: ../../Zotlabs/Module/Manage.php:167 -msgid "Switch to one of your channels by selecting it." +#: ../../Zotlabs/Module/Group.php:30 +msgid "Could not create privacy group." msgstr "" -#: ../../Zotlabs/Module/Manage.php:168 -msgid "Default Channel" +#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141 +#: ../../include/items.php:3931 +msgid "Privacy group not found." msgstr "" -#: ../../Zotlabs/Module/Manage.php:169 -msgid "Make Default" +#: ../../Zotlabs/Module/Group.php:58 +msgid "Privacy group updated." msgstr "" -#: ../../Zotlabs/Module/Manage.php:172 -#, php-format -msgid "%d new messages" +#: ../../Zotlabs/Module/Group.php:90 +msgid "Create a group of channels." msgstr "" -#: ../../Zotlabs/Module/Manage.php:173 -#, php-format -msgid "%d new introductions" +#: ../../Zotlabs/Module/Group.php:91 ../../Zotlabs/Module/Group.php:184 +msgid "Privacy group name: " msgstr "" -#: ../../Zotlabs/Module/Manage.php:175 -msgid "Delegated Channel" +#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:187 +msgid "Members are visible to other channels" msgstr "" -#: ../../Zotlabs/Module/Notify.php:57 -#: ../../Zotlabs/Module/Notifications.php:98 -msgid "No more system notifications." +#: ../../Zotlabs/Module/Group.php:111 +msgid "Privacy group removed." msgstr "" -#: ../../Zotlabs/Module/Notify.php:61 -#: ../../Zotlabs/Module/Notifications.php:102 -msgid "System Notifications" +#: ../../Zotlabs/Module/Group.php:113 +msgid "Unable to remove privacy group." msgstr "" -#: ../../Zotlabs/Module/Match.php:26 -msgid "Profile Match" +#: ../../Zotlabs/Module/Group.php:183 +msgid "Privacy group editor" msgstr "" -#: ../../Zotlabs/Module/Match.php:35 -msgid "No keywords to match. Please add keywords to your default profile." +#: ../../Zotlabs/Module/Group.php:197 +msgid "Members" msgstr "" -#: ../../Zotlabs/Module/Match.php:67 -msgid "is interested in:" +#: ../../Zotlabs/Module/Group.php:199 +msgid "All Connected Channels" msgstr "" -#: ../../Zotlabs/Module/Match.php:74 -msgid "No matches" +#: ../../Zotlabs/Module/Group.php:231 +msgid "Click on a channel to add or remove." msgstr "" #: ../../Zotlabs/Module/Photos.php:82 @@ -3438,11 +2954,17 @@ msgstr "" msgid "Private Photo" msgstr "" +#: ../../Zotlabs/Module/Photos.php:951 ../../Zotlabs/Module/Events.php:675 +#: ../../Zotlabs/Module/Events.php:684 ../../Zotlabs/Module/Cal.php:332 +#: ../../Zotlabs/Module/Cal.php:339 +msgid "Previous" +msgstr "" + #: ../../Zotlabs/Module/Photos.php:955 msgid "View Full Size" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1000 ../../Zotlabs/Module/Admin.php:1437 +#: ../../Zotlabs/Module/Photos.php:1000 ../../Zotlabs/Module/Admin.php:1451 #: ../../Zotlabs/Module/Tagrm.php:137 msgid "Remove" msgstr "" @@ -3491,6 +3013,12 @@ msgstr "" msgid "I don't like this (toggle)" msgstr "" +#: ../../Zotlabs/Module/Photos.php:1078 ../../Zotlabs/Module/Webpages.php:218 +#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Layouts.php:193 +#: ../../include/conversation.php:1227 +msgid "Share" +msgstr "" + #: ../../Zotlabs/Module/Photos.php:1079 ../../Zotlabs/Lib/ThreadItem.php:398 #: ../../include/conversation.php:743 msgid "Please wait" @@ -3506,6 +3034,12 @@ msgstr "" msgid "Comment" msgstr "" +#: ../../Zotlabs/Module/Photos.php:1099 ../../Zotlabs/Module/Webpages.php:224 +#: ../../Zotlabs/Module/Events.php:473 ../../Zotlabs/Lib/ThreadItem.php:720 +#: ../../include/conversation.php:1200 ../../include/page_widgets.php:43 +msgid "Preview" +msgstr "" + #: ../../Zotlabs/Module/Photos.php:1113 ../../include/conversation.php:577 msgctxt "title" msgid "Likes" @@ -3548,12 +3082,12 @@ msgstr "" #: ../../Zotlabs/Module/Photos.php:1132 ../../Zotlabs/Module/Photos.php:1144 #: ../../Zotlabs/Lib/ThreadItem.php:181 ../../Zotlabs/Lib/ThreadItem.php:193 -#: ../../include/conversation.php:1743 +#: ../../include/conversation.php:1756 msgid "View all" msgstr "" #: ../../Zotlabs/Module/Photos.php:1136 ../../Zotlabs/Lib/ThreadItem.php:185 -#: ../../include/channel.php:1182 ../../include/conversation.php:1767 +#: ../../include/channel.php:1182 ../../include/conversation.php:1780 #: ../../include/taxonomy.php:403 msgctxt "noun" msgid "Like" @@ -3562,7 +3096,7 @@ msgstr[0] "" msgstr[1] "" #: ../../Zotlabs/Module/Photos.php:1141 ../../Zotlabs/Lib/ThreadItem.php:190 -#: ../../include/conversation.php:1770 +#: ../../include/conversation.php:1783 msgctxt "noun" msgid "Dislike" msgid_plural "Dislikes" @@ -3592,7 +3126,7 @@ msgid "Dislikes" msgstr "" #: ../../Zotlabs/Module/Photos.php:1269 ../../Zotlabs/Lib/ThreadItem.php:393 -#: ../../include/acl_selectors.php:283 +#: ../../include/acl_selectors.php:181 msgid "Close" msgstr "" @@ -3605,687 +3139,454 @@ msgstr "" msgid "Recent Photos" msgstr "" -#: ../../Zotlabs/Module/Settings.php:64 -msgid "Name is required" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:68 -msgid "Key and Secret are required" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:72 ../../Zotlabs/Module/Settings.php:686 -#: ../../Zotlabs/Module/Admin.php:1435 ../../Zotlabs/Lib/Apps.php:334 -msgid "Update" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:138 -#, php-format -msgid "This channel is limited to %d tokens" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:144 -msgid "Name and Password are required." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:184 -msgid "Token saved." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:290 -msgid "Not valid email." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:293 -msgid "Protected email address. Cannot change to that email." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:302 -msgid "System failure storing new email. Please try again." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:319 -msgid "Password verification failed." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:326 -msgid "Passwords do not match. Password unchanged." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:330 -msgid "Empty passwords are not allowed. Password unchanged." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:344 -msgid "Password changed." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:346 -msgid "Password update failed. Please try again." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:595 -msgid "Settings updated." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:659 ../../Zotlabs/Module/Settings.php:685 -#: ../../Zotlabs/Module/Settings.php:721 -msgid "Add application" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:662 -msgid "Name of application" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:663 ../../Zotlabs/Module/Settings.php:689 -msgid "Consumer Key" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:663 ../../Zotlabs/Module/Settings.php:664 -msgid "Automatically generated - change if desired. Max length 20" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:664 ../../Zotlabs/Module/Settings.php:690 -msgid "Consumer Secret" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:665 ../../Zotlabs/Module/Settings.php:691 -msgid "Redirect" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:665 -msgid "" -"Redirect URI - leave blank unless your application specifically requires this" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:666 ../../Zotlabs/Module/Settings.php:692 -msgid "Icon url" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:666 ../../Zotlabs/Module/Sources.php:112 -#: ../../Zotlabs/Module/Sources.php:147 -msgid "Optional" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:677 -msgid "Application not found." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:720 -msgid "Connected Apps" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:724 -msgid "Client key starts with" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:725 -msgid "No name" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:726 -msgid "Remove authorization" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:739 -msgid "No feature settings configured" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:746 -msgid "Feature/Addon Settings" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:769 -msgid "Account Settings" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:770 -msgid "Current Password" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:771 -msgid "Enter New Password" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:772 -msgid "Confirm New Password" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:772 -msgid "Leave password fields blank unless changing" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:774 -#: ../../Zotlabs/Module/Settings.php:1194 -msgid "Email Address:" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:775 -#: ../../Zotlabs/Module/Removeaccount.php:61 -msgid "Remove Account" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:776 -msgid "Remove this account including all its channels" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:810 -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.php:812 -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.php:847 ../../include/widgets.php:614 -msgid "Guest Access Tokens" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:854 -msgid "Login Name" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:855 -msgid "Login Password" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:856 -msgid "Expires (yyyy-mm-dd)" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:881 ../../Zotlabs/Module/Admin.php:677 -#: ../../Zotlabs/Module/Admin.php:678 -msgid "Off" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:881 ../../Zotlabs/Module/Admin.php:677 -#: ../../Zotlabs/Module/Admin.php:678 -msgid "On" +#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:192 +msgid "webpage" msgstr "" -#: ../../Zotlabs/Module/Settings.php:888 -msgid "Additional Features" +#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:198 +msgid "block" msgstr "" -#: ../../Zotlabs/Module/Settings.php:912 -msgid "Connector Settings" +#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:195 +msgid "layout" msgstr "" -#: ../../Zotlabs/Module/Settings.php:951 -msgid "No special theme for mobile devices" +#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:201 +msgid "menu" msgstr "" -#: ../../Zotlabs/Module/Settings.php:954 +#: ../../Zotlabs/Module/Impel.php:191 #, php-format -msgid "%s - (Experimental)" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:957 ../../Zotlabs/Module/Admin.php:410 -msgid "mobile" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:996 -msgid "Display Settings" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:997 -msgid "Theme Settings" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:998 -msgid "Custom Theme Settings" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:999 -msgid "Content Settings" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1005 -msgid "Display Theme:" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1006 -msgid "Mobile Theme:" +msgid "%s element installed" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1007 -msgid "Preload images before rendering the page" +#: ../../Zotlabs/Module/Impel.php:194 +#, php-format +msgid "%s element installation failed" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1007 -msgid "" -"The subjective page load time will be longer but the page will be ready when " -"displayed" +#: ../../Zotlabs/Module/Import_items.php:42 ../../Zotlabs/Module/Import.php:71 +msgid "Nothing to import." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1008 -msgid "Enable user zoom on mobile devices" +#: ../../Zotlabs/Module/Import_items.php:66 ../../Zotlabs/Module/Import.php:95 +msgid "Unable to download data from old server" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1009 -msgid "Update browser every xx seconds" +#: ../../Zotlabs/Module/Import_items.php:72 +#: ../../Zotlabs/Module/Import.php:101 +msgid "Imported file is empty." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1009 -msgid "Minimum of 10 seconds, no maximum" +#: ../../Zotlabs/Module/Import_items.php:88 +#: ../../Zotlabs/Module/Import.php:123 +#, php-format +msgid "Warning: Database versions differ by %1$d updates." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1010 -msgid "Maximum number of conversations to load at any time:" +#: ../../Zotlabs/Module/Import_items.php:104 +msgid "Import completed" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1010 -msgid "Maximum of 100 items" +#: ../../Zotlabs/Module/Import_items.php:119 +msgid "Import Items" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1011 -msgid "Show emoticons (smilies) as images" +#: ../../Zotlabs/Module/Import_items.php:120 +msgid "Use this form to import existing posts and content from an export file." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1012 -msgid "Link post titles to source" +#: ../../Zotlabs/Module/Import_items.php:121 +#: ../../Zotlabs/Module/Import.php:549 +msgid "File to Upload" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1013 -msgid "System Page Layout Editor - (advanced)" +#: ../../Zotlabs/Module/Invite.php:29 +msgid "Total invitation limit exceeded." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1016 -msgid "Use blog/list mode on channel page" +#: ../../Zotlabs/Module/Invite.php:53 +#, php-format +msgid "%s : Not a valid email address." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1016 -#: ../../Zotlabs/Module/Settings.php:1017 -msgid "(comments displayed separately)" +#: ../../Zotlabs/Module/Invite.php:63 +msgid "Please join us on $Projectname" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1017 -msgid "Use blog/list mode on grid page" +#: ../../Zotlabs/Module/Invite.php:74 +msgid "Invitation limit exceeded. Please contact your site administrator." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1018 -msgid "Channel page max height of content (in pixels)" +#: ../../Zotlabs/Module/Invite.php:79 +#, php-format +msgid "%s : Message delivery failed." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1018 -#: ../../Zotlabs/Module/Settings.php:1019 -msgid "click to expand content exceeding this height" -msgstr "" +#: ../../Zotlabs/Module/Invite.php:83 +#, php-format +msgid "%d message sent." +msgid_plural "%d messages sent." +msgstr[0] "" +msgstr[1] "" -#: ../../Zotlabs/Module/Settings.php:1019 -msgid "Grid page max height of content (in pixels)" +#: ../../Zotlabs/Module/Invite.php:102 +msgid "You have no more invitations available" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1048 -msgid "Nobody except yourself" +#: ../../Zotlabs/Module/Invite.php:133 +msgid "Send invitations" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1049 -msgid "Only those you specifically allow" +#: ../../Zotlabs/Module/Invite.php:134 +msgid "Enter email addresses, one per line:" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1050 -msgid "Approved connections" +#: ../../Zotlabs/Module/Invite.php:135 ../../Zotlabs/Module/Mail.php:241 +msgid "Your message:" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1051 -msgid "Any connections" +#: ../../Zotlabs/Module/Invite.php:136 +msgid "Please join my community on $Projectname." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1052 -msgid "Anybody on this website" +#: ../../Zotlabs/Module/Invite.php:138 +msgid "You will need to supply this invitation code:" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1053 -msgid "Anybody in this network" +#: ../../Zotlabs/Module/Invite.php:139 +msgid "1. Register at any $Projectname location (they are all inter-connected)" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1054 -msgid "Anybody authenticated" +#: ../../Zotlabs/Module/Invite.php:141 +msgid "2. Enter my $Projectname network address into the site searchbar." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1055 -msgid "Anybody on the internet" +#: ../../Zotlabs/Module/Invite.php:142 +msgid "or visit" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1129 -msgid "Publish your default profile in the network directory" +#: ../../Zotlabs/Module/Invite.php:144 +msgid "3. Click [Connect]" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1134 -msgid "Allow us to suggest you as a potential friend to new members?" +#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54 +msgid "Location not found." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1143 -msgid "Your channel address is" +#: ../../Zotlabs/Module/Locs.php:62 +msgid "Location lookup failed." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1185 -msgid "Channel Settings" +#: ../../Zotlabs/Module/Locs.php:66 +msgid "" +"Please select another location to become primary before removing the primary " +"location." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1192 -msgid "Basic Settings" +#: ../../Zotlabs/Module/Locs.php:95 +msgid "Syncing locations" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1193 ../../include/channel.php:1164 -msgid "Full Name:" +#: ../../Zotlabs/Module/Locs.php:105 +msgid "No locations found." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1195 -msgid "Your Timezone:" +#: ../../Zotlabs/Module/Locs.php:116 +msgid "Manage Channel Locations" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1196 -msgid "Default Post Location:" +#: ../../Zotlabs/Module/Locs.php:118 ../../Zotlabs/Module/Admin.php:1237 +#: ../../Zotlabs/Module/Profiles.php:470 +msgid "Address" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1196 -msgid "Geographical location to display on your posts" +#: ../../Zotlabs/Module/Locs.php:119 +msgid "Primary" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1197 -msgid "Use Browser Location:" +#: ../../Zotlabs/Module/Locs.php:122 +msgid "Sync Now" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1199 -msgid "Adult Content" +#: ../../Zotlabs/Module/Locs.php:123 +msgid "Please wait several minutes between consecutive operations." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1199 +#: ../../Zotlabs/Module/Locs.php:124 msgid "" -"This channel frequently or regularly publishes adult content. (Please tag " -"any adult material and/or nudity with #NSFW)" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1201 -msgid "Security and Privacy Settings" +"When possible, drop a location by logging into that website/hub and removing " +"your channel." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1204 -msgid "Your permissions are already configured. Click to view/adjust" +#: ../../Zotlabs/Module/Locs.php:125 +msgid "Use this form to drop the location if the hub is no longer operating." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1206 -msgid "Hide my online presence" +#: ../../Zotlabs/Module/Magic.php:71 +msgid "Hub not found." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1206 -msgid "Prevents displaying in your profile that you are online" +#: ../../Zotlabs/Module/Like.php:19 +msgid "Like/Dislike" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1208 -msgid "Simple Privacy Settings:" +#: ../../Zotlabs/Module/Like.php:24 +msgid "This action is restricted to members." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1209 +#: ../../Zotlabs/Module/Like.php:25 msgid "" -"Very Public - <em>extremely permissive (should be used with caution)</em>" +"Please <a href=\"rmagic\">login with your $Projectname ID</a> or <a href=" +"\"register\">register as a new $Projectname member</a> to continue." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1210 -msgid "" -"Typical - <em>default public, privacy when desired (similar to social " -"network permissions but with improved privacy)</em>" +#: ../../Zotlabs/Module/Like.php:105 ../../Zotlabs/Module/Like.php:131 +#: ../../Zotlabs/Module/Like.php:169 +msgid "Invalid request." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1211 -msgid "Private - <em>default private, never open or public</em>" +#: ../../Zotlabs/Module/Like.php:117 ../../include/conversation.php:126 +msgid "channel" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1212 -msgid "Blocked - <em>default blocked to/from everybody</em>" +#: ../../Zotlabs/Module/Like.php:146 +msgid "thing" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1214 -msgid "Allow others to tag your posts" +#: ../../Zotlabs/Module/Like.php:192 +msgid "Channel unavailable." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1214 -msgid "" -"Often used by the community to retro-actively flag inappropriate content" +#: ../../Zotlabs/Module/Like.php:240 +msgid "Previous action reversed." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1216 -msgid "Advanced Privacy Settings" +#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87 +#: ../../Zotlabs/Module/Tagger.php:47 ../../include/text.php:1945 +#: ../../include/conversation.php:120 +msgid "photo" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1218 -msgid "Expire other channel content after this many days" +#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87 +#: ../../include/text.php:1951 ../../include/conversation.php:148 +msgid "status" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1218 -msgid "0 or blank to use the website limit." +#: ../../Zotlabs/Module/Like.php:372 ../../Zotlabs/Module/Events.php:253 +#: ../../Zotlabs/Module/Tagger.php:51 ../../include/text.php:1948 +#: ../../include/conversation.php:123 ../../include/event.php:958 +msgid "event" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1218 +#: ../../Zotlabs/Module/Like.php:419 ../../include/conversation.php:164 #, php-format -msgid "This website expires after %d days." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1218 -msgid "This website does not expire imported content." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1218 -msgid "The website limit takes precedence if lower than your limit." -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1219 -msgid "Maximum Friend Requests/Day:" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1219 -msgid "May reduce spam activity" -msgstr "" - -#: ../../Zotlabs/Module/Settings.php:1220 -msgid "Default Post and Publish Permissions" +msgid "%1$s likes %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1221 ../../Zotlabs/Module/Mitem.php:154 -#: ../../Zotlabs/Module/Mitem.php:231 -msgid "(click to open/close)" +#: ../../Zotlabs/Module/Like.php:421 ../../include/conversation.php:167 +#, php-format +msgid "%1$s doesn't like %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1222 -msgid "Use my default audience setting for the type of object published" +#: ../../Zotlabs/Module/Like.php:423 +#, php-format +msgid "%1$s agrees with %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1229 -msgid "Channel permissions category:" +#: ../../Zotlabs/Module/Like.php:425 +#, php-format +msgid "%1$s doesn't agree with %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1235 -msgid "Maximum private messages per day from unknown people:" +#: ../../Zotlabs/Module/Like.php:427 +#, php-format +msgid "%1$s abstains from a decision on %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1235 -msgid "Useful to reduce spamming" +#: ../../Zotlabs/Module/Like.php:429 +#, php-format +msgid "%1$s is attending %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1238 -msgid "Notification Settings" +#: ../../Zotlabs/Module/Like.php:431 +#, php-format +msgid "%1$s is not attending %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1239 -msgid "By default post a status message when:" +#: ../../Zotlabs/Module/Like.php:433 +#, php-format +msgid "%1$s may attend %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1240 -msgid "accepting a friend request" +#: ../../Zotlabs/Module/Like.php:538 +msgid "Action completed." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1241 -msgid "joining a forum/community" +#: ../../Zotlabs/Module/Like.php:539 +msgid "Thank you." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1242 -msgid "making an <em>interesting</em> profile change" +#: ../../Zotlabs/Module/Manage.php:136 +#: ../../Zotlabs/Module/New_channel.php:121 +#, php-format +msgid "You have created %1$.0f of %2$.0f allowed channels." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1243 -msgid "Send a notification email when:" +#: ../../Zotlabs/Module/Manage.php:143 +msgid "Create a new channel" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1244 -msgid "You receive a connection request" +#: ../../Zotlabs/Module/Manage.php:143 ../../Zotlabs/Module/Profiles.php:778 +#: ../../Zotlabs/Module/Chat.php:255 +msgid "Create New" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1245 -msgid "Your connections are confirmed" +#: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:214 +#: ../../include/nav.php:210 +msgid "Channel Manager" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1246 -msgid "Someone writes on your profile wall" +#: ../../Zotlabs/Module/Manage.php:165 +msgid "Current Channel" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1247 -msgid "Someone writes a followup comment" +#: ../../Zotlabs/Module/Manage.php:167 +msgid "Switch to one of your channels by selecting it." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1248 -msgid "You receive a private message" +#: ../../Zotlabs/Module/Manage.php:168 +msgid "Default Channel" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1249 -msgid "You receive a friend suggestion" +#: ../../Zotlabs/Module/Manage.php:169 +msgid "Make Default" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1250 -msgid "You are tagged in a post" +#: ../../Zotlabs/Module/Manage.php:172 +#, php-format +msgid "%d new messages" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1251 -msgid "You are poked/prodded/etc. in a post" +#: ../../Zotlabs/Module/Manage.php:173 +#, php-format +msgid "%d new introductions" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1254 -msgid "Show visual notifications including:" +#: ../../Zotlabs/Module/Manage.php:175 +msgid "Delegated Channel" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1256 -msgid "Unseen grid activity" +#: ../../Zotlabs/Module/Mitem.php:52 +msgid "Unable to create element." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1257 -msgid "Unseen channel activity" +#: ../../Zotlabs/Module/Mitem.php:76 +msgid "Unable to update menu element." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1258 -msgid "Unseen private messages" +#: ../../Zotlabs/Module/Mitem.php:92 +msgid "Unable to add menu element." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1258 -#: ../../Zotlabs/Module/Settings.php:1263 -#: ../../Zotlabs/Module/Settings.php:1264 -#: ../../Zotlabs/Module/Settings.php:1265 -msgid "Recommended" +#: ../../Zotlabs/Module/Mitem.php:153 ../../Zotlabs/Module/Mitem.php:230 +msgid "Menu Item Permissions" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1259 -msgid "Upcoming events" +#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:176 +msgid "Link Name" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1260 -msgid "Events today" +#: ../../Zotlabs/Module/Mitem.php:161 ../../Zotlabs/Module/Mitem.php:239 +msgid "Link or Submenu Target" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1261 -msgid "Upcoming birthdays" +#: ../../Zotlabs/Module/Mitem.php:161 +msgid "Enter URL of the link or select a menu name to create a submenu" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1261 -msgid "Not available in all themes" +#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:240 +msgid "Use magic-auth if available" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1262 -msgid "System (personal) notifications" +#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:241 +msgid "Open link in new window" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1263 -msgid "System info messages" +#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242 +msgid "Order in list" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1264 -msgid "System critical alerts" +#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242 +msgid "Higher numbers will sink to bottom of listing" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1265 -msgid "New connections" +#: ../../Zotlabs/Module/Mitem.php:165 +msgid "Submit and finish" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1266 -msgid "System Registrations" +#: ../../Zotlabs/Module/Mitem.php:166 +msgid "Submit and continue" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1267 -msgid "" -"Also show new wall posts, private messages and connections under Notices" +#: ../../Zotlabs/Module/Mitem.php:174 +msgid "Menu:" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1269 -msgid "Notify me of events this many days in advance" +#: ../../Zotlabs/Module/Mitem.php:177 +msgid "Link Target" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1269 -msgid "Must be greater than 0" +#: ../../Zotlabs/Module/Mitem.php:180 +msgid "Edit menu" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1271 -msgid "Advanced Account/Page Type Settings" +#: ../../Zotlabs/Module/Mitem.php:183 +msgid "Edit element" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1272 -msgid "Change the behaviour of this account for special situations" +#: ../../Zotlabs/Module/Mitem.php:184 +msgid "Drop element" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1275 -msgid "" -"Please enable expert mode (in <a href=\"settings/features\">Settings > " -"Additional features</a>) to adjust!" +#: ../../Zotlabs/Module/Mitem.php:185 +msgid "New element" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1276 -msgid "Miscellaneous Settings" +#: ../../Zotlabs/Module/Mitem.php:186 +msgid "Edit this menu container" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1277 -msgid "Default photo upload folder" +#: ../../Zotlabs/Module/Mitem.php:187 +msgid "Add menu element" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1277 -#: ../../Zotlabs/Module/Settings.php:1278 -msgid "%Y - current year, %m - current month" +#: ../../Zotlabs/Module/Mitem.php:188 +msgid "Delete this menu item" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1278 -msgid "Default file upload folder" +#: ../../Zotlabs/Module/Mitem.php:189 +msgid "Edit this menu item" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1280 -msgid "Personal menu to display in your channel pages" +#: ../../Zotlabs/Module/Mitem.php:206 +msgid "Menu item not found." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1281 ../../Zotlabs/Module/Removeme.php:64 -msgid "Remove Channel" +#: ../../Zotlabs/Module/Mitem.php:219 +msgid "Menu item deleted." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1282 -msgid "Remove this channel." +#: ../../Zotlabs/Module/Mitem.php:221 +msgid "Menu item could not be deleted." msgstr "" -#: ../../Zotlabs/Module/Settings.php:1283 -msgid "Firefox Share $Projectname provider" +#: ../../Zotlabs/Module/Mitem.php:228 +msgid "Edit Menu Element" msgstr "" -#: ../../Zotlabs/Module/Settings.php:1284 -msgid "Start calendar week on monday" +#: ../../Zotlabs/Module/Mitem.php:238 +msgid "Link text" msgstr "" #: ../../Zotlabs/Module/Admin.php:77 @@ -4328,12 +3629,12 @@ msgstr "" msgid "Your software should be updated" msgstr "" -#: ../../Zotlabs/Module/Admin.php:241 ../../Zotlabs/Module/Admin.php:490 -#: ../../Zotlabs/Module/Admin.php:711 ../../Zotlabs/Module/Admin.php:755 -#: ../../Zotlabs/Module/Admin.php:1030 ../../Zotlabs/Module/Admin.php:1209 -#: ../../Zotlabs/Module/Admin.php:1329 ../../Zotlabs/Module/Admin.php:1419 -#: ../../Zotlabs/Module/Admin.php:1612 ../../Zotlabs/Module/Admin.php:1646 -#: ../../Zotlabs/Module/Admin.php:1731 +#: ../../Zotlabs/Module/Admin.php:241 ../../Zotlabs/Module/Admin.php:500 +#: ../../Zotlabs/Module/Admin.php:724 ../../Zotlabs/Module/Admin.php:768 +#: ../../Zotlabs/Module/Admin.php:1043 ../../Zotlabs/Module/Admin.php:1222 +#: ../../Zotlabs/Module/Admin.php:1342 ../../Zotlabs/Module/Admin.php:1433 +#: ../../Zotlabs/Module/Admin.php:1626 ../../Zotlabs/Module/Admin.php:1660 +#: ../../Zotlabs/Module/Admin.php:1745 msgid "Administration" msgstr "" @@ -4345,7 +3646,7 @@ msgstr "" msgid "Registered accounts" msgstr "" -#: ../../Zotlabs/Module/Admin.php:246 ../../Zotlabs/Module/Admin.php:715 +#: ../../Zotlabs/Module/Admin.php:246 ../../Zotlabs/Module/Admin.php:728 msgid "Pending registrations" msgstr "" @@ -4353,7 +3654,7 @@ msgstr "" msgid "Registered channels" msgstr "" -#: ../../Zotlabs/Module/Admin.php:248 ../../Zotlabs/Module/Admin.php:716 +#: ../../Zotlabs/Module/Admin.php:248 ../../Zotlabs/Module/Admin.php:729 msgid "Active plugins" msgstr "" @@ -4369,962 +3670,1588 @@ msgstr "" msgid "Repository version (dev)" msgstr "" -#: ../../Zotlabs/Module/Admin.php:373 +#: ../../Zotlabs/Module/Admin.php:377 msgid "Site settings updated." msgstr "" -#: ../../Zotlabs/Module/Admin.php:400 ../../include/text.php:2888 +#: ../../Zotlabs/Module/Admin.php:404 ../../include/text.php:2888 msgid "Default" msgstr "" -#: ../../Zotlabs/Module/Admin.php:412 +#: ../../Zotlabs/Module/Admin.php:416 msgid "experimental" msgstr "" -#: ../../Zotlabs/Module/Admin.php:414 +#: ../../Zotlabs/Module/Admin.php:418 msgid "unsupported" msgstr "" -#: ../../Zotlabs/Module/Admin.php:460 +#: ../../Zotlabs/Module/Admin.php:464 msgid "Yes - with approval" msgstr "" -#: ../../Zotlabs/Module/Admin.php:466 +#: ../../Zotlabs/Module/Admin.php:470 msgid "My site is not a public server" msgstr "" -#: ../../Zotlabs/Module/Admin.php:467 +#: ../../Zotlabs/Module/Admin.php:471 msgid "My site has paid access only" msgstr "" -#: ../../Zotlabs/Module/Admin.php:468 +#: ../../Zotlabs/Module/Admin.php:472 msgid "My site has free access only" msgstr "" -#: ../../Zotlabs/Module/Admin.php:469 +#: ../../Zotlabs/Module/Admin.php:473 msgid "My site offers free accounts with optional paid upgrades" msgstr "" -#: ../../Zotlabs/Module/Admin.php:491 ../../include/widgets.php:1490 +#: ../../Zotlabs/Module/Admin.php:501 ../../include/widgets.php:1490 msgid "Site" msgstr "" -#: ../../Zotlabs/Module/Admin.php:493 ../../Zotlabs/Module/Register.php:248 -msgid "Registration" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:494 +#: ../../Zotlabs/Module/Admin.php:504 msgid "File upload" msgstr "" -#: ../../Zotlabs/Module/Admin.php:495 +#: ../../Zotlabs/Module/Admin.php:505 msgid "Policies" msgstr "" -#: ../../Zotlabs/Module/Admin.php:496 ../../include/contact_widgets.php:16 +#: ../../Zotlabs/Module/Admin.php:506 ../../include/contact_widgets.php:16 msgid "Advanced" msgstr "" -#: ../../Zotlabs/Module/Admin.php:500 +#: ../../Zotlabs/Module/Admin.php:510 msgid "Site name" msgstr "" -#: ../../Zotlabs/Module/Admin.php:501 +#: ../../Zotlabs/Module/Admin.php:514 msgid "Banner/Logo" msgstr "" -#: ../../Zotlabs/Module/Admin.php:502 +#: ../../Zotlabs/Module/Admin.php:515 msgid "Administrator Information" msgstr "" -#: ../../Zotlabs/Module/Admin.php:502 +#: ../../Zotlabs/Module/Admin.php:515 msgid "" "Contact information for site administrators. Displayed on siteinfo page. " "BBCode can be used here" msgstr "" -#: ../../Zotlabs/Module/Admin.php:503 +#: ../../Zotlabs/Module/Admin.php:516 msgid "System language" msgstr "" -#: ../../Zotlabs/Module/Admin.php:504 +#: ../../Zotlabs/Module/Admin.php:517 msgid "System theme" msgstr "" -#: ../../Zotlabs/Module/Admin.php:504 +#: ../../Zotlabs/Module/Admin.php:517 msgid "" "Default system theme - may be over-ridden by user profiles - <a href='#' " "id='cnftheme'>change theme settings</a>" msgstr "" -#: ../../Zotlabs/Module/Admin.php:505 +#: ../../Zotlabs/Module/Admin.php:518 msgid "Mobile system theme" msgstr "" -#: ../../Zotlabs/Module/Admin.php:505 +#: ../../Zotlabs/Module/Admin.php:518 msgid "Theme for mobile devices" msgstr "" -#: ../../Zotlabs/Module/Admin.php:507 +#: ../../Zotlabs/Module/Admin.php:520 msgid "Allow Feeds as Connections" msgstr "" -#: ../../Zotlabs/Module/Admin.php:507 +#: ../../Zotlabs/Module/Admin.php:520 msgid "(Heavy system resource usage)" msgstr "" -#: ../../Zotlabs/Module/Admin.php:508 +#: ../../Zotlabs/Module/Admin.php:521 msgid "Maximum image size" msgstr "" -#: ../../Zotlabs/Module/Admin.php:508 +#: ../../Zotlabs/Module/Admin.php:521 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "" -#: ../../Zotlabs/Module/Admin.php:509 +#: ../../Zotlabs/Module/Admin.php:522 msgid "Does this site allow new member registration?" msgstr "" -#: ../../Zotlabs/Module/Admin.php:510 +#: ../../Zotlabs/Module/Admin.php:523 msgid "Invitation only" msgstr "" -#: ../../Zotlabs/Module/Admin.php:510 +#: ../../Zotlabs/Module/Admin.php:523 msgid "" "Only allow new member registrations with an invitation code. Above register " "policy must be set to Yes." msgstr "" -#: ../../Zotlabs/Module/Admin.php:511 +#: ../../Zotlabs/Module/Admin.php:524 msgid "Which best describes the types of account offered by this hub?" msgstr "" -#: ../../Zotlabs/Module/Admin.php:512 +#: ../../Zotlabs/Module/Admin.php:525 msgid "Register text" msgstr "" -#: ../../Zotlabs/Module/Admin.php:512 +#: ../../Zotlabs/Module/Admin.php:525 msgid "Will be displayed prominently on the registration page." msgstr "" -#: ../../Zotlabs/Module/Admin.php:513 +#: ../../Zotlabs/Module/Admin.php:526 msgid "Site homepage to show visitors (default: login box)" msgstr "" -#: ../../Zotlabs/Module/Admin.php:513 +#: ../../Zotlabs/Module/Admin.php:526 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.php:514 +#: ../../Zotlabs/Module/Admin.php:527 msgid "Preserve site homepage URL" msgstr "" -#: ../../Zotlabs/Module/Admin.php:514 +#: ../../Zotlabs/Module/Admin.php:527 msgid "" "Present the site homepage in a frame at the original location instead of " "redirecting" msgstr "" -#: ../../Zotlabs/Module/Admin.php:515 +#: ../../Zotlabs/Module/Admin.php:528 msgid "Accounts abandoned after x days" msgstr "" -#: ../../Zotlabs/Module/Admin.php:515 +#: ../../Zotlabs/Module/Admin.php:528 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: ../../Zotlabs/Module/Admin.php:516 +#: ../../Zotlabs/Module/Admin.php:529 msgid "Allowed friend domains" msgstr "" -#: ../../Zotlabs/Module/Admin.php:516 +#: ../../Zotlabs/Module/Admin.php:529 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.php:517 +#: ../../Zotlabs/Module/Admin.php:530 msgid "Allowed email domains" msgstr "" -#: ../../Zotlabs/Module/Admin.php:517 +#: ../../Zotlabs/Module/Admin.php:530 msgid "" "Comma separated list of domains which are allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains" msgstr "" -#: ../../Zotlabs/Module/Admin.php:518 +#: ../../Zotlabs/Module/Admin.php:531 msgid "Not allowed email domains" msgstr "" -#: ../../Zotlabs/Module/Admin.php:518 +#: ../../Zotlabs/Module/Admin.php:531 msgid "" "Comma separated list of domains which are not allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains, unless allowed domains have been defined." msgstr "" -#: ../../Zotlabs/Module/Admin.php:519 +#: ../../Zotlabs/Module/Admin.php:532 msgid "Verify Email Addresses" msgstr "" -#: ../../Zotlabs/Module/Admin.php:519 +#: ../../Zotlabs/Module/Admin.php:532 msgid "" "Check to verify email addresses used in account registration (recommended)." msgstr "" -#: ../../Zotlabs/Module/Admin.php:520 +#: ../../Zotlabs/Module/Admin.php:533 msgid "Force publish" msgstr "" -#: ../../Zotlabs/Module/Admin.php:520 +#: ../../Zotlabs/Module/Admin.php:533 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "" -#: ../../Zotlabs/Module/Admin.php:521 +#: ../../Zotlabs/Module/Admin.php:534 msgid "Import Public Streams" msgstr "" -#: ../../Zotlabs/Module/Admin.php:521 +#: ../../Zotlabs/Module/Admin.php:534 msgid "" "Import and allow access to public content pulled from other sites. Warning: " "this content is unmoderated." msgstr "" -#: ../../Zotlabs/Module/Admin.php:522 +#: ../../Zotlabs/Module/Admin.php:535 msgid "Login on Homepage" msgstr "" -#: ../../Zotlabs/Module/Admin.php:522 +#: ../../Zotlabs/Module/Admin.php:535 msgid "" "Present a login box to visitors on the home page if no other content has " "been configured." msgstr "" -#: ../../Zotlabs/Module/Admin.php:523 +#: ../../Zotlabs/Module/Admin.php:536 msgid "Enable context help" msgstr "" -#: ../../Zotlabs/Module/Admin.php:523 +#: ../../Zotlabs/Module/Admin.php:536 msgid "" "Display contextual help for the current page when the help button is pressed." msgstr "" -#: ../../Zotlabs/Module/Admin.php:525 +#: ../../Zotlabs/Module/Admin.php:538 msgid "Directory Server URL" msgstr "" -#: ../../Zotlabs/Module/Admin.php:525 +#: ../../Zotlabs/Module/Admin.php:538 msgid "Default directory server" msgstr "" -#: ../../Zotlabs/Module/Admin.php:527 +#: ../../Zotlabs/Module/Admin.php:540 msgid "Proxy user" msgstr "" -#: ../../Zotlabs/Module/Admin.php:528 +#: ../../Zotlabs/Module/Admin.php:541 msgid "Proxy URL" msgstr "" -#: ../../Zotlabs/Module/Admin.php:529 +#: ../../Zotlabs/Module/Admin.php:542 msgid "Network timeout" msgstr "" -#: ../../Zotlabs/Module/Admin.php:529 +#: ../../Zotlabs/Module/Admin.php:542 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "" -#: ../../Zotlabs/Module/Admin.php:530 +#: ../../Zotlabs/Module/Admin.php:543 msgid "Delivery interval" msgstr "" -#: ../../Zotlabs/Module/Admin.php:530 +#: ../../Zotlabs/Module/Admin.php:543 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.php:531 +#: ../../Zotlabs/Module/Admin.php:544 msgid "Deliveries per process" msgstr "" -#: ../../Zotlabs/Module/Admin.php:531 +#: ../../Zotlabs/Module/Admin.php:544 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.php:532 +#: ../../Zotlabs/Module/Admin.php:545 msgid "Poll interval" msgstr "" -#: ../../Zotlabs/Module/Admin.php:532 +#: ../../Zotlabs/Module/Admin.php:545 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "" -#: ../../Zotlabs/Module/Admin.php:533 +#: ../../Zotlabs/Module/Admin.php:546 msgid "Maximum Load Average" msgstr "" -#: ../../Zotlabs/Module/Admin.php:533 +#: ../../Zotlabs/Module/Admin.php:546 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "" -#: ../../Zotlabs/Module/Admin.php:534 +#: ../../Zotlabs/Module/Admin.php:547 msgid "Expiration period in days for imported (grid/network) content" msgstr "" -#: ../../Zotlabs/Module/Admin.php:534 +#: ../../Zotlabs/Module/Admin.php:547 msgid "0 for no expiration of imported content" msgstr "" -#: ../../Zotlabs/Module/Admin.php:678 +#: ../../Zotlabs/Module/Admin.php:691 #, php-format msgid "Lock feature %s" msgstr "" -#: ../../Zotlabs/Module/Admin.php:686 +#: ../../Zotlabs/Module/Admin.php:699 msgid "Manage Additional Features" msgstr "" -#: ../../Zotlabs/Module/Admin.php:703 +#: ../../Zotlabs/Module/Admin.php:716 msgid "No server found" msgstr "" -#: ../../Zotlabs/Module/Admin.php:710 ../../Zotlabs/Module/Admin.php:1046 +#: ../../Zotlabs/Module/Admin.php:723 ../../Zotlabs/Module/Admin.php:1059 msgid "ID" msgstr "" -#: ../../Zotlabs/Module/Admin.php:710 +#: ../../Zotlabs/Module/Admin.php:723 msgid "for channel" msgstr "" -#: ../../Zotlabs/Module/Admin.php:710 +#: ../../Zotlabs/Module/Admin.php:723 msgid "on server" msgstr "" -#: ../../Zotlabs/Module/Admin.php:712 +#: ../../Zotlabs/Module/Admin.php:725 msgid "Server" msgstr "" -#: ../../Zotlabs/Module/Admin.php:746 +#: ../../Zotlabs/Module/Admin.php:759 msgid "" "By default, unfiltered HTML is allowed in embedded media. This is inherently " "insecure." msgstr "" -#: ../../Zotlabs/Module/Admin.php:749 +#: ../../Zotlabs/Module/Admin.php:762 msgid "" "The recommended setting is to only allow unfiltered HTML from the following " "sites:" msgstr "" -#: ../../Zotlabs/Module/Admin.php:750 +#: ../../Zotlabs/Module/Admin.php:763 msgid "" "https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/" "<br />https://vimeo.com/<br />https://soundcloud.com/<br />" msgstr "" -#: ../../Zotlabs/Module/Admin.php:751 +#: ../../Zotlabs/Module/Admin.php:764 msgid "" "All other embedded content will be filtered, <strong>unless</strong> " "embedded content from that site is explicitly blocked." msgstr "" -#: ../../Zotlabs/Module/Admin.php:756 ../../include/widgets.php:1493 +#: ../../Zotlabs/Module/Admin.php:769 ../../include/widgets.php:1493 msgid "Security" msgstr "" -#: ../../Zotlabs/Module/Admin.php:758 +#: ../../Zotlabs/Module/Admin.php:771 msgid "Block public" msgstr "" -#: ../../Zotlabs/Module/Admin.php:758 +#: ../../Zotlabs/Module/Admin.php:771 msgid "" "Check to block public access to all otherwise public personal pages on this " "site unless you are currently authenticated." msgstr "" -#: ../../Zotlabs/Module/Admin.php:759 +#: ../../Zotlabs/Module/Admin.php:772 msgid "Set \"Transport Security\" HTTP header" msgstr "" -#: ../../Zotlabs/Module/Admin.php:760 +#: ../../Zotlabs/Module/Admin.php:773 msgid "Set \"Content Security Policy\" HTTP header" msgstr "" -#: ../../Zotlabs/Module/Admin.php:761 +#: ../../Zotlabs/Module/Admin.php:774 msgid "Allow communications only from these sites" msgstr "" -#: ../../Zotlabs/Module/Admin.php:761 +#: ../../Zotlabs/Module/Admin.php:774 msgid "" "One site per line. Leave empty to allow communication from anywhere by " "default" msgstr "" -#: ../../Zotlabs/Module/Admin.php:762 +#: ../../Zotlabs/Module/Admin.php:775 msgid "Block communications from these sites" msgstr "" -#: ../../Zotlabs/Module/Admin.php:763 +#: ../../Zotlabs/Module/Admin.php:776 msgid "Allow communications only from these channels" msgstr "" -#: ../../Zotlabs/Module/Admin.php:763 +#: ../../Zotlabs/Module/Admin.php:776 msgid "" "One channel (hash) per line. Leave empty to allow from any channel by default" msgstr "" -#: ../../Zotlabs/Module/Admin.php:764 +#: ../../Zotlabs/Module/Admin.php:777 msgid "Block communications from these channels" msgstr "" -#: ../../Zotlabs/Module/Admin.php:765 +#: ../../Zotlabs/Module/Admin.php:778 msgid "Only allow embeds from secure (SSL) websites and links." msgstr "" -#: ../../Zotlabs/Module/Admin.php:766 +#: ../../Zotlabs/Module/Admin.php:779 msgid "Allow unfiltered embedded HTML content only from these domains" msgstr "" -#: ../../Zotlabs/Module/Admin.php:766 +#: ../../Zotlabs/Module/Admin.php:779 msgid "One site per line. By default embedded content is filtered." msgstr "" -#: ../../Zotlabs/Module/Admin.php:767 +#: ../../Zotlabs/Module/Admin.php:780 msgid "Block embedded HTML from these domains" msgstr "" -#: ../../Zotlabs/Module/Admin.php:785 +#: ../../Zotlabs/Module/Admin.php:798 msgid "Update has been marked successful" msgstr "" -#: ../../Zotlabs/Module/Admin.php:795 +#: ../../Zotlabs/Module/Admin.php:808 #, php-format msgid "Executing %s failed. Check system logs." msgstr "" -#: ../../Zotlabs/Module/Admin.php:798 +#: ../../Zotlabs/Module/Admin.php:811 #, php-format msgid "Update %s was successfully applied." msgstr "" -#: ../../Zotlabs/Module/Admin.php:802 +#: ../../Zotlabs/Module/Admin.php:815 #, php-format msgid "Update %s did not return a status. Unknown if it succeeded." msgstr "" -#: ../../Zotlabs/Module/Admin.php:805 +#: ../../Zotlabs/Module/Admin.php:818 #, php-format msgid "Update function %s could not be found." msgstr "" -#: ../../Zotlabs/Module/Admin.php:821 +#: ../../Zotlabs/Module/Admin.php:834 msgid "No failed updates." msgstr "" -#: ../../Zotlabs/Module/Admin.php:825 +#: ../../Zotlabs/Module/Admin.php:838 msgid "Failed Updates" msgstr "" -#: ../../Zotlabs/Module/Admin.php:827 +#: ../../Zotlabs/Module/Admin.php:840 msgid "Mark success (if update was manually applied)" msgstr "" -#: ../../Zotlabs/Module/Admin.php:828 +#: ../../Zotlabs/Module/Admin.php:841 msgid "Attempt to execute this update step automatically" msgstr "" -#: ../../Zotlabs/Module/Admin.php:859 +#: ../../Zotlabs/Module/Admin.php:872 msgid "Queue Statistics" msgstr "" -#: ../../Zotlabs/Module/Admin.php:860 +#: ../../Zotlabs/Module/Admin.php:873 msgid "Total Entries" msgstr "" -#: ../../Zotlabs/Module/Admin.php:861 +#: ../../Zotlabs/Module/Admin.php:874 msgid "Priority" msgstr "" -#: ../../Zotlabs/Module/Admin.php:862 +#: ../../Zotlabs/Module/Admin.php:875 msgid "Destination URL" msgstr "" -#: ../../Zotlabs/Module/Admin.php:863 +#: ../../Zotlabs/Module/Admin.php:876 msgid "Mark hub permanently offline" msgstr "" -#: ../../Zotlabs/Module/Admin.php:864 +#: ../../Zotlabs/Module/Admin.php:877 msgid "Empty queue for this hub" msgstr "" -#: ../../Zotlabs/Module/Admin.php:865 +#: ../../Zotlabs/Module/Admin.php:878 msgid "Last known contact" msgstr "" -#: ../../Zotlabs/Module/Admin.php:901 +#: ../../Zotlabs/Module/Admin.php:914 #, php-format msgid "%s account blocked/unblocked" msgid_plural "%s account blocked/unblocked" msgstr[0] "" msgstr[1] "" -#: ../../Zotlabs/Module/Admin.php:908 +#: ../../Zotlabs/Module/Admin.php:921 #, php-format msgid "%s account deleted" msgid_plural "%s accounts deleted" msgstr[0] "" msgstr[1] "" -#: ../../Zotlabs/Module/Admin.php:944 +#: ../../Zotlabs/Module/Admin.php:957 msgid "Account not found" msgstr "" -#: ../../Zotlabs/Module/Admin.php:955 +#: ../../Zotlabs/Module/Admin.php:968 #, php-format msgid "Account '%s' deleted" msgstr "" -#: ../../Zotlabs/Module/Admin.php:963 +#: ../../Zotlabs/Module/Admin.php:976 #, php-format msgid "Account '%s' blocked" msgstr "" -#: ../../Zotlabs/Module/Admin.php:971 +#: ../../Zotlabs/Module/Admin.php:984 #, php-format msgid "Account '%s' unblocked" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1031 ../../Zotlabs/Module/Admin.php:1044 +#: ../../Zotlabs/Module/Admin.php:1044 ../../Zotlabs/Module/Admin.php:1057 #: ../../include/widgets.php:1491 msgid "Accounts" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1033 ../../Zotlabs/Module/Admin.php:1212 +#: ../../Zotlabs/Module/Admin.php:1046 ../../Zotlabs/Module/Admin.php:1225 msgid "select all" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1034 +#: ../../Zotlabs/Module/Admin.php:1047 msgid "Registrations waiting for confirm" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1035 +#: ../../Zotlabs/Module/Admin.php:1048 msgid "Request date" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1035 ../../Zotlabs/Module/Admin.php:1047 +#: ../../Zotlabs/Module/Admin.php:1048 ../../Zotlabs/Module/Admin.php:1060 #: ../../include/network.php:2208 msgid "Email" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1036 +#: ../../Zotlabs/Module/Admin.php:1049 msgid "No registrations." msgstr "" -#: ../../Zotlabs/Module/Admin.php:1038 +#: ../../Zotlabs/Module/Admin.php:1051 msgid "Deny" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1048 ../../include/group.php:267 +#: ../../Zotlabs/Module/Admin.php:1053 ../../Zotlabs/Module/Connedit.php:575 +msgid "Block" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1054 ../../Zotlabs/Module/Connedit.php:575 +msgid "Unblock" +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1061 ../../include/group.php:267 msgid "All Channels" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1049 +#: ../../Zotlabs/Module/Admin.php:1062 msgid "Register date" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1050 +#: ../../Zotlabs/Module/Admin.php:1063 msgid "Last login" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1051 +#: ../../Zotlabs/Module/Admin.php:1064 msgid "Expires" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1052 +#: ../../Zotlabs/Module/Admin.php:1065 msgid "Service Class" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1054 +#: ../../Zotlabs/Module/Admin.php:1067 msgid "" "Selected accounts will be deleted!\\n\\nEverything these accounts had posted " "on this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1055 +#: ../../Zotlabs/Module/Admin.php:1068 msgid "" "The account {0} will be deleted!\\n\\nEverything this account has posted on " "this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1091 +#: ../../Zotlabs/Module/Admin.php:1104 #, php-format msgid "%s channel censored/uncensored" msgid_plural "%s channels censored/uncensored" msgstr[0] "" msgstr[1] "" -#: ../../Zotlabs/Module/Admin.php:1100 +#: ../../Zotlabs/Module/Admin.php:1113 #, php-format msgid "%s channel code allowed/disallowed" msgid_plural "%s channels code allowed/disallowed" msgstr[0] "" msgstr[1] "" -#: ../../Zotlabs/Module/Admin.php:1106 +#: ../../Zotlabs/Module/Admin.php:1119 #, php-format msgid "%s channel deleted" msgid_plural "%s channels deleted" msgstr[0] "" msgstr[1] "" -#: ../../Zotlabs/Module/Admin.php:1126 +#: ../../Zotlabs/Module/Admin.php:1139 msgid "Channel not found" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1136 +#: ../../Zotlabs/Module/Admin.php:1149 #, php-format msgid "Channel '%s' deleted" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1148 +#: ../../Zotlabs/Module/Admin.php:1161 #, php-format msgid "Channel '%s' censored" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1148 +#: ../../Zotlabs/Module/Admin.php:1161 #, php-format msgid "Channel '%s' uncensored" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1159 +#: ../../Zotlabs/Module/Admin.php:1172 #, php-format msgid "Channel '%s' code allowed" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1159 +#: ../../Zotlabs/Module/Admin.php:1172 #, php-format msgid "Channel '%s' code disallowed" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1210 ../../include/widgets.php:1492 +#: ../../Zotlabs/Module/Admin.php:1223 ../../include/widgets.php:1492 msgid "Channels" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1214 +#: ../../Zotlabs/Module/Admin.php:1227 msgid "Censor" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1215 +#: ../../Zotlabs/Module/Admin.php:1228 msgid "Uncensor" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1216 +#: ../../Zotlabs/Module/Admin.php:1229 msgid "Allow Code" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1217 +#: ../../Zotlabs/Module/Admin.php:1230 msgid "Disallow Code" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1218 ../../include/conversation.php:1631 +#: ../../Zotlabs/Module/Admin.php:1231 ../../include/conversation.php:1644 msgid "Channel" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1222 +#: ../../Zotlabs/Module/Admin.php:1235 msgid "UID" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1226 +#: ../../Zotlabs/Module/Admin.php:1239 msgid "" "Selected channels will be deleted!\\n\\nEverything that was posted in these " "channels on this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1227 +#: ../../Zotlabs/Module/Admin.php:1240 msgid "" "The channel {0} will be deleted!\\n\\nEverything that was posted in this " "channel on this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1284 +#: ../../Zotlabs/Module/Admin.php:1297 #, php-format msgid "Plugin %s disabled." msgstr "" -#: ../../Zotlabs/Module/Admin.php:1288 +#: ../../Zotlabs/Module/Admin.php:1301 #, php-format msgid "Plugin %s enabled." msgstr "" -#: ../../Zotlabs/Module/Admin.php:1298 ../../Zotlabs/Module/Admin.php:1585 +#: ../../Zotlabs/Module/Admin.php:1311 ../../Zotlabs/Module/Admin.php:1599 msgid "Disable" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1301 ../../Zotlabs/Module/Admin.php:1587 +#: ../../Zotlabs/Module/Admin.php:1314 ../../Zotlabs/Module/Admin.php:1601 msgid "Enable" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1330 ../../Zotlabs/Module/Admin.php:1420 +#: ../../Zotlabs/Module/Admin.php:1343 ../../Zotlabs/Module/Admin.php:1434 #: ../../include/widgets.php:1495 msgid "Plugins" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1331 ../../Zotlabs/Module/Admin.php:1614 +#: ../../Zotlabs/Module/Admin.php:1344 ../../Zotlabs/Module/Admin.php:1628 msgid "Toggle" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1332 ../../Zotlabs/Module/Admin.php:1615 -#: ../../Zotlabs/Lib/Apps.php:216 ../../include/nav.php:212 -#: ../../include/widgets.php:647 +#: ../../Zotlabs/Module/Admin.php:1345 ../../Zotlabs/Module/Admin.php:1629 +#: ../../Zotlabs/Lib/Apps.php:216 ../../include/widgets.php:647 +#: ../../include/nav.php:212 msgid "Settings" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1339 ../../Zotlabs/Module/Admin.php:1624 +#: ../../Zotlabs/Module/Admin.php:1352 ../../Zotlabs/Module/Admin.php:1638 msgid "Author: " msgstr "" -#: ../../Zotlabs/Module/Admin.php:1340 ../../Zotlabs/Module/Admin.php:1625 +#: ../../Zotlabs/Module/Admin.php:1353 ../../Zotlabs/Module/Admin.php:1639 msgid "Maintainer: " msgstr "" -#: ../../Zotlabs/Module/Admin.php:1341 +#: ../../Zotlabs/Module/Admin.php:1354 msgid "Minimum project version: " msgstr "" -#: ../../Zotlabs/Module/Admin.php:1342 +#: ../../Zotlabs/Module/Admin.php:1355 msgid "Maximum project version: " msgstr "" -#: ../../Zotlabs/Module/Admin.php:1343 +#: ../../Zotlabs/Module/Admin.php:1356 msgid "Minimum PHP version: " msgstr "" -#: ../../Zotlabs/Module/Admin.php:1344 +#: ../../Zotlabs/Module/Admin.php:1357 +msgid "Compatible Server Roles: " +msgstr "" + +#: ../../Zotlabs/Module/Admin.php:1358 msgid "Requires: " msgstr "" -#: ../../Zotlabs/Module/Admin.php:1345 ../../Zotlabs/Module/Admin.php:1425 +#: ../../Zotlabs/Module/Admin.php:1359 ../../Zotlabs/Module/Admin.php:1439 msgid "Disabled - version incompatibility" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1394 +#: ../../Zotlabs/Module/Admin.php:1408 msgid "Enter the public git repository URL of the plugin repo." msgstr "" -#: ../../Zotlabs/Module/Admin.php:1395 +#: ../../Zotlabs/Module/Admin.php:1409 msgid "Plugin repo git URL" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1396 +#: ../../Zotlabs/Module/Admin.php:1410 msgid "Custom repo name" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1396 +#: ../../Zotlabs/Module/Admin.php:1410 msgid "(optional)" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1397 +#: ../../Zotlabs/Module/Admin.php:1411 msgid "Download Plugin Repo" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1404 +#: ../../Zotlabs/Module/Admin.php:1418 msgid "Install new repo" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1405 ../../Zotlabs/Lib/Apps.php:334 +#: ../../Zotlabs/Module/Admin.php:1419 ../../Zotlabs/Lib/Apps.php:334 msgid "Install" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1427 +#: ../../Zotlabs/Module/Admin.php:1441 msgid "Manage Repos" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1428 +#: ../../Zotlabs/Module/Admin.php:1442 msgid "Installed Plugin Repositories" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1429 +#: ../../Zotlabs/Module/Admin.php:1443 msgid "Install a New Plugin Repository" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1436 +#: ../../Zotlabs/Module/Admin.php:1450 msgid "Switch branch" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1550 +#: ../../Zotlabs/Module/Admin.php:1564 msgid "No themes found." msgstr "" -#: ../../Zotlabs/Module/Admin.php:1606 +#: ../../Zotlabs/Module/Admin.php:1620 msgid "Screenshot" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1613 ../../Zotlabs/Module/Admin.php:1647 +#: ../../Zotlabs/Module/Admin.php:1627 ../../Zotlabs/Module/Admin.php:1661 #: ../../include/widgets.php:1496 msgid "Themes" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1652 +#: ../../Zotlabs/Module/Admin.php:1666 msgid "[Experimental]" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1653 +#: ../../Zotlabs/Module/Admin.php:1667 msgid "[Unsupported]" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1677 +#: ../../Zotlabs/Module/Admin.php:1691 msgid "Log settings updated." msgstr "" -#: ../../Zotlabs/Module/Admin.php:1732 ../../include/widgets.php:1517 +#: ../../Zotlabs/Module/Admin.php:1746 ../../include/widgets.php:1517 #: ../../include/widgets.php:1527 msgid "Logs" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1734 +#: ../../Zotlabs/Module/Admin.php:1748 msgid "Clear" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1740 +#: ../../Zotlabs/Module/Admin.php:1754 msgid "Debugging" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1741 +#: ../../Zotlabs/Module/Admin.php:1755 msgid "Log file" msgstr "" -#: ../../Zotlabs/Module/Admin.php:1741 +#: ../../Zotlabs/Module/Admin.php:1755 msgid "" "Must be writable by web server. Relative to your top-level webserver " "directory." msgstr "" -#: ../../Zotlabs/Module/Admin.php:1742 +#: ../../Zotlabs/Module/Admin.php:1756 msgid "Log level" msgstr "" -#: ../../Zotlabs/Module/Admin.php:2028 +#: ../../Zotlabs/Module/Admin.php:2042 msgid "New Profile Field" msgstr "" -#: ../../Zotlabs/Module/Admin.php:2029 ../../Zotlabs/Module/Admin.php:2049 +#: ../../Zotlabs/Module/Admin.php:2043 ../../Zotlabs/Module/Admin.php:2063 msgid "Field nickname" msgstr "" -#: ../../Zotlabs/Module/Admin.php:2029 ../../Zotlabs/Module/Admin.php:2049 +#: ../../Zotlabs/Module/Admin.php:2043 ../../Zotlabs/Module/Admin.php:2063 msgid "System name of field" msgstr "" -#: ../../Zotlabs/Module/Admin.php:2030 ../../Zotlabs/Module/Admin.php:2050 +#: ../../Zotlabs/Module/Admin.php:2044 ../../Zotlabs/Module/Admin.php:2064 msgid "Input type" msgstr "" -#: ../../Zotlabs/Module/Admin.php:2031 ../../Zotlabs/Module/Admin.php:2051 +#: ../../Zotlabs/Module/Admin.php:2045 ../../Zotlabs/Module/Admin.php:2065 msgid "Field Name" msgstr "" -#: ../../Zotlabs/Module/Admin.php:2031 ../../Zotlabs/Module/Admin.php:2051 +#: ../../Zotlabs/Module/Admin.php:2045 ../../Zotlabs/Module/Admin.php:2065 msgid "Label on profile pages" msgstr "" -#: ../../Zotlabs/Module/Admin.php:2032 ../../Zotlabs/Module/Admin.php:2052 +#: ../../Zotlabs/Module/Admin.php:2046 ../../Zotlabs/Module/Admin.php:2066 msgid "Help text" msgstr "" -#: ../../Zotlabs/Module/Admin.php:2032 ../../Zotlabs/Module/Admin.php:2052 +#: ../../Zotlabs/Module/Admin.php:2046 ../../Zotlabs/Module/Admin.php:2066 msgid "Additional info (optional)" msgstr "" -#: ../../Zotlabs/Module/Admin.php:2042 +#: ../../Zotlabs/Module/Admin.php:2056 msgid "Field definition not found" msgstr "" -#: ../../Zotlabs/Module/Admin.php:2048 +#: ../../Zotlabs/Module/Admin.php:2062 msgid "Edit Profile Field" msgstr "" -#: ../../Zotlabs/Module/Admin.php:2106 ../../include/widgets.php:1498 +#: ../../Zotlabs/Module/Admin.php:2120 ../../include/widgets.php:1498 msgid "Profile Fields" msgstr "" -#: ../../Zotlabs/Module/Admin.php:2107 +#: ../../Zotlabs/Module/Admin.php:2121 msgid "Basic Profile Fields" msgstr "" -#: ../../Zotlabs/Module/Admin.php:2108 +#: ../../Zotlabs/Module/Admin.php:2122 msgid "Advanced Profile Fields" msgstr "" -#: ../../Zotlabs/Module/Admin.php:2108 +#: ../../Zotlabs/Module/Admin.php:2122 msgid "(In addition to basic fields)" msgstr "" -#: ../../Zotlabs/Module/Admin.php:2110 +#: ../../Zotlabs/Module/Admin.php:2124 msgid "All available fields" msgstr "" -#: ../../Zotlabs/Module/Admin.php:2111 +#: ../../Zotlabs/Module/Admin.php:2125 msgid "Custom Fields" msgstr "" -#: ../../Zotlabs/Module/Admin.php:2115 +#: ../../Zotlabs/Module/Admin.php:2129 msgid "Create Custom Field" msgstr "" -#: ../../Zotlabs/Module/New_channel.php:128 -#: ../../Zotlabs/Module/Register.php:231 -msgid "Name or caption" +#: ../../Zotlabs/Module/Lostpass.php:19 +msgid "No valid account found." msgstr "" -#: ../../Zotlabs/Module/New_channel.php:128 -#: ../../Zotlabs/Module/Register.php:231 +#: ../../Zotlabs/Module/Lostpass.php:33 +msgid "Password reset request issued. Check your email." +msgstr "" + +#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:107 +#, php-format +msgid "Site Member (%s)" +msgstr "" + +#: ../../Zotlabs/Module/Lostpass.php:44 +#, php-format +msgid "Password reset requested at %s" +msgstr "" + +#: ../../Zotlabs/Module/Lostpass.php:67 msgid "" -"Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation " -"Group\"" +"Request could not be verified. (You may have previously submitted it.) " +"Password reset failed." msgstr "" -#: ../../Zotlabs/Module/New_channel.php:130 -#: ../../Zotlabs/Module/Register.php:233 -msgid "Choose a short nickname" +#: ../../Zotlabs/Module/Lostpass.php:90 ../../boot.php:1746 +msgid "Password Reset" msgstr "" -#: ../../Zotlabs/Module/New_channel.php:130 -#: ../../Zotlabs/Module/Register.php:233 +#: ../../Zotlabs/Module/Lostpass.php:91 +msgid "Your password has been reset as requested." +msgstr "" + +#: ../../Zotlabs/Module/Lostpass.php:92 +msgid "Your new password is" +msgstr "" + +#: ../../Zotlabs/Module/Lostpass.php:93 +msgid "Save or copy your new password - and then" +msgstr "" + +#: ../../Zotlabs/Module/Lostpass.php:94 +msgid "click here to login" +msgstr "" + +#: ../../Zotlabs/Module/Lostpass.php:95 +msgid "" +"Your password may be changed from the <em>Settings</em> page after " +"successful login." +msgstr "" + +#: ../../Zotlabs/Module/Lostpass.php:112 #, php-format +msgid "Your password has changed at %s" +msgstr "" + +#: ../../Zotlabs/Module/Lostpass.php:127 +msgid "Forgot your Password?" +msgstr "" + +#: ../../Zotlabs/Module/Lostpass.php:128 msgid "" -"Your nickname will be used to create an easy to remember channel address e." -"g. nickname%s" +"Enter your email address and submit to have your password reset. Then check " +"your email for further instructions." msgstr "" -#: ../../Zotlabs/Module/New_channel.php:132 -#: ../../Zotlabs/Module/Register.php:235 -msgid "Channel role and privacy" +#: ../../Zotlabs/Module/Lostpass.php:129 +msgid "Email Address" msgstr "" -#: ../../Zotlabs/Module/New_channel.php:132 -#: ../../Zotlabs/Module/Register.php:235 -msgid "Select a channel role with your privacy requirements." +#: ../../Zotlabs/Module/Lostpass.php:130 +msgid "Reset" msgstr "" -#: ../../Zotlabs/Module/New_channel.php:132 -#: ../../Zotlabs/Module/Register.php:235 -msgid "Read more about roles" +#: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:260 +#, php-format +msgctxt "mood" +msgid "%1$s is %2$s" +msgstr "" + +#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:227 +msgid "Mood" +msgstr "" + +#: ../../Zotlabs/Module/Mood.php:136 +msgid "Set your current mood and tell your friends" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:189 +#: ../../Zotlabs/Module/Profiles.php:246 ../../Zotlabs/Module/Profiles.php:625 +msgid "Profile not found." +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:44 +msgid "Profile deleted." +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:104 +msgid "Profile-" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:89 ../../Zotlabs/Module/Profiles.php:132 +msgid "New profile created." +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:110 +msgid "Profile unavailable to clone." +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:151 +msgid "Profile unavailable to export." +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:256 +msgid "Profile Name is required." +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:427 +msgid "Marital Status" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:431 +msgid "Romantic Partner" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:435 ../../Zotlabs/Module/Profiles.php:736 +msgid "Likes" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:439 ../../Zotlabs/Module/Profiles.php:737 +msgid "Dislikes" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:443 ../../Zotlabs/Module/Profiles.php:744 +msgid "Work/Employment" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:446 +msgid "Religion" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:450 +msgid "Political Views" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:454 +msgid "Gender" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:458 +msgid "Sexual Preference" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:462 +msgid "Homepage" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:466 +msgid "Interests" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:560 +msgid "Profile updated." +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:644 +msgid "Hide your connections list from viewers of this profile" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:686 +msgid "Edit Profile Details" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:688 +msgid "View this profile" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:689 ../../Zotlabs/Module/Profiles.php:771 +#: ../../include/channel.php:981 +msgid "Edit visibility" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:690 +msgid "Profile Tools" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:691 +msgid "Change cover photo" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:692 ../../include/channel.php:952 +msgid "Change profile photo" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:693 +msgid "Create a new profile using these settings" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:694 +msgid "Clone this profile" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:695 +msgid "Delete this profile" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:696 +msgid "Add profile things" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:697 ../../include/widgets.php:105 +#: ../../include/conversation.php:1559 +msgid "Personal" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:699 +msgid "Relation" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:700 ../../include/datetime.php:48 +msgid "Miscellaneous" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:702 +msgid "Import profile from file" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:703 +msgid "Export profile to file" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:704 +msgid "Your gender" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:705 +msgid "Marital status" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:706 +msgid "Sexual preference" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:709 +msgid "Profile name" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:711 +msgid "This is your default profile." +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:713 +msgid "Your full name" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:714 +msgid "Title/Description" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:717 +msgid "Street address" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:718 +msgid "Locality/City" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:719 +msgid "Region/State" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:720 +msgid "Postal/Zip code" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:721 +msgid "Country" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:726 +msgid "Who (if applicable)" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:726 +msgid "Examples: cathy123, Cathy Williams, cathy@example.com" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:727 +msgid "Since (date)" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:730 +msgid "Tell us about yourself" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:731 +msgid "Homepage URL" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:732 +msgid "Hometown" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:733 +msgid "Political views" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:734 +msgid "Religious views" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:735 +msgid "Keywords used in directory listings" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:735 +msgid "Example: fishing photography software" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:738 +msgid "Musical interests" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:739 +msgid "Books, literature" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:740 +msgid "Television" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:741 +msgid "Film/Dance/Culture/Entertainment" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:742 +msgid "Hobbies/Interests" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:743 +msgid "Love/Romance" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:745 +msgid "School/Education" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:746 +msgid "Contact information and social networks" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:747 +msgid "My other channels" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:767 ../../include/channel.php:977 +msgid "Profile Image" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:777 ../../include/channel.php:959 +#: ../../include/nav.php:90 +msgid "Edit Profiles" +msgstr "" + +#: ../../Zotlabs/Module/Notify.php:57 +#: ../../Zotlabs/Module/Notifications.php:98 +msgid "No more system notifications." +msgstr "" + +#: ../../Zotlabs/Module/Notify.php:61 +#: ../../Zotlabs/Module/Notifications.php:102 +msgid "System Notifications" +msgstr "" + +#: ../../Zotlabs/Module/Match.php:26 +msgid "Profile Match" +msgstr "" + +#: ../../Zotlabs/Module/Match.php:35 +msgid "No keywords to match. Please add keywords to your default profile." +msgstr "" + +#: ../../Zotlabs/Module/Match.php:67 +msgid "is interested in:" +msgstr "" + +#: ../../Zotlabs/Module/Match.php:74 +msgid "No matches" +msgstr "" + +#: ../../Zotlabs/Module/Webpages.php:53 +msgid "Import Webpage Elements" +msgstr "" + +#: ../../Zotlabs/Module/Webpages.php:54 +msgid "Import selected" +msgstr "" + +#: ../../Zotlabs/Module/Webpages.php:214 ../../Zotlabs/Lib/Apps.php:218 +#: ../../include/conversation.php:1718 ../../include/nav.php:108 +msgid "Webpages" +msgstr "" + +#: ../../Zotlabs/Module/Webpages.php:225 ../../include/page_widgets.php:44 +msgid "Actions" +msgstr "" + +#: ../../Zotlabs/Module/Webpages.php:226 ../../include/page_widgets.php:45 +msgid "Page Link" +msgstr "" + +#: ../../Zotlabs/Module/Webpages.php:227 +msgid "Page Title" +msgstr "" + +#: ../../Zotlabs/Module/Webpages.php:258 +msgid "Invalid file type." +msgstr "" + +#: ../../Zotlabs/Module/Webpages.php:270 +msgid "Error opening zip file" +msgstr "" + +#: ../../Zotlabs/Module/Webpages.php:281 +msgid "Invalid folder path." +msgstr "" + +#: ../../Zotlabs/Module/Webpages.php:308 +msgid "No webpage elements detected." +msgstr "" + +#: ../../Zotlabs/Module/Webpages.php:382 +msgid "Import complete." +msgstr "" + +#: ../../Zotlabs/Module/Events.php:25 +msgid "Calendar entries imported." +msgstr "" + +#: ../../Zotlabs/Module/Events.php:27 +msgid "No calendar entries found." +msgstr "" + +#: ../../Zotlabs/Module/Events.php:104 +msgid "Event can not end before it has started." +msgstr "" + +#: ../../Zotlabs/Module/Events.php:106 ../../Zotlabs/Module/Events.php:115 +#: ../../Zotlabs/Module/Events.php:135 +msgid "Unable to generate preview." +msgstr "" + +#: ../../Zotlabs/Module/Events.php:113 +msgid "Event title and start time are required." +msgstr "" + +#: ../../Zotlabs/Module/Events.php:133 ../../Zotlabs/Module/Events.php:258 +msgid "Event not found." +msgstr "" + +#: ../../Zotlabs/Module/Events.php:452 +msgid "Edit event title" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:452 +msgid "Event title" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:454 +msgid "Categories (comma-separated list)" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:455 +msgid "Edit Category" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:455 +msgid "Category" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:458 +msgid "Edit start date and time" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:458 +msgid "Start date and time" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:462 +msgid "Finish date and time are not known or not relevant" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:461 +msgid "Edit finish date and time" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:461 +msgid "Finish date and time" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:463 ../../Zotlabs/Module/Events.php:464 +msgid "Adjust for viewer timezone" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:463 +msgid "" +"Important for events that happen in a particular place. Not practical for " +"global holidays." +msgstr "" + +#: ../../Zotlabs/Module/Events.php:465 +msgid "Edit Description" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:467 +msgid "Edit Location" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:472 +msgid "Share this event" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:474 ../../include/conversation.php:1259 +msgid "Permission settings" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:485 +msgid "Advanced Options" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:597 ../../Zotlabs/Module/Cal.php:259 +msgid "l, F j" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:619 +msgid "Edit event" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:621 +msgid "Delete event" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:646 ../../Zotlabs/Module/Cal.php:308 +#: ../../include/text.php:1716 +msgid "Link to Source" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:655 +msgid "calendar" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:674 ../../Zotlabs/Module/Cal.php:331 +msgid "Edit Event" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:674 ../../Zotlabs/Module/Cal.php:331 +msgid "Create Event" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:677 ../../Zotlabs/Module/Cal.php:334 +msgid "Export" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:681 +msgid "Month" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:682 +msgid "Week" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:683 +msgid "Day" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:686 ../../Zotlabs/Module/Cal.php:341 +msgid "Today" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:717 +msgid "Event removed" +msgstr "" + +#: ../../Zotlabs/Module/Events.php:720 +msgid "Failed to remove event" +msgstr "" + +#: ../../Zotlabs/Module/Import.php:33 +#, php-format +msgid "Your service plan only allows %d channels." +msgstr "" + +#: ../../Zotlabs/Module/Import.php:153 ../../include/import.php:107 +msgid "Cloned channel not found. Import failed." +msgstr "" + +#: ../../Zotlabs/Module/Import.php:163 +msgid "No channel. Import failed." +msgstr "" + +#: ../../Zotlabs/Module/Import.php:520 +#: ../../include/Import/import_diaspora.php:142 +msgid "Import completed." +msgstr "" + +#: ../../Zotlabs/Module/Import.php:542 +msgid "You must be logged in to use this feature." +msgstr "" + +#: ../../Zotlabs/Module/Import.php:547 +msgid "Import Channel" +msgstr "" + +#: ../../Zotlabs/Module/Import.php:548 +msgid "" +"Use this form to import an existing channel from a different server/hub. You " +"may retrieve the channel identity from the old server/hub via the network or " +"provide an export file." +msgstr "" + +#: ../../Zotlabs/Module/Import.php:550 +msgid "Or provide the old server/hub details" +msgstr "" + +#: ../../Zotlabs/Module/Import.php:551 +msgid "Your old identity address (xyz@example.com)" +msgstr "" + +#: ../../Zotlabs/Module/Import.php:552 +msgid "Your old login email address" +msgstr "" + +#: ../../Zotlabs/Module/Import.php:553 +msgid "Your old login password" +msgstr "" + +#: ../../Zotlabs/Module/Import.php:554 +msgid "" +"For either option, please choose whether to make this hub your new primary " +"address, or whether your old location should continue this role. You will be " +"able to post from either location, but only one can be marked as the primary " +"location for files, photos, and media." +msgstr "" + +#: ../../Zotlabs/Module/Import.php:555 +msgid "Make this hub my primary location" +msgstr "" + +#: ../../Zotlabs/Module/Import.php:556 +msgid "" +"Import existing posts if possible (experimental - limited by available memory" +msgstr "" + +#: ../../Zotlabs/Module/Import.php:557 +msgid "" +"This process may take several minutes to complete. Please submit the form " +"only once and leave this page open until finished." msgstr "" #: ../../Zotlabs/Module/New_channel.php:135 @@ -5376,7 +5303,7 @@ msgid "Mark all system notifications seen" msgstr "" #: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:228 -#: ../../include/conversation.php:964 +#: ../../include/conversation.php:961 msgid "Poke" msgstr "" @@ -5447,81 +5374,21 @@ msgid "" "to correctly use this feature." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:34 -msgid "Not found" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:97 ../../Zotlabs/Lib/Apps.php:219 -#: ../../include/features.php:57 ../../include/nav.php:110 -#: ../../include/conversation.php:1715 ../../include/conversation.php:1718 -msgid "Wiki" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:98 -msgid "Sandbox" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:100 -msgid "" -"\"# Wiki Sandbox\\n\\nContent you **edit** and **preview** here *will not be " -"saved*.\"" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:169 -msgid "Revision Comparison" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:170 -msgid "Revert" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:201 -msgid "Enter the name of your new wiki:" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:202 -msgid "Enter the name of the new page:" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:203 -msgid "Enter the new name:" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:209 ../../include/conversation.php:1151 -msgid "Embed image from photo albums" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:210 ../../include/conversation.php:1235 -msgid "Embed an image from your albums" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:212 ../../include/conversation.php:1237 -#: ../../include/conversation.php:1278 -msgid "OK" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:213 ../../include/conversation.php:1187 -msgid "Choose images to embed" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:214 ../../include/conversation.php:1188 -msgid "Choose an album" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:215 ../../include/conversation.php:1189 -msgid "Choose a different album..." +#: ../../Zotlabs/Module/Channel.php:28 ../../Zotlabs/Module/Wiki.php:20 +#: ../../Zotlabs/Module/Chat.php:25 +msgid "You must be logged in to see this page." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:216 ../../include/conversation.php:1190 -msgid "Error getting album list" +#: ../../Zotlabs/Module/Channel.php:40 +msgid "Posts and comments" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:217 ../../include/conversation.php:1191 -msgid "Error getting photo link" +#: ../../Zotlabs/Module/Channel.php:41 +msgid "Only posts" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:218 ../../include/conversation.php:1192 -msgid "Error getting album" +#: ../../Zotlabs/Module/Channel.php:101 +msgid "Insufficient permissions. Request redirected to profile page." msgstr "" #: ../../Zotlabs/Module/Siteinfo.php:19 @@ -5606,46 +5473,20 @@ msgstr "" msgid "Download PDL file" msgstr "" -#: ../../Zotlabs/Module/Pubsites.php:22 ../../include/widgets.php:1351 -msgid "Public Hubs" -msgstr "" - -#: ../../Zotlabs/Module/Pubsites.php:25 -msgid "" -"The listed hubs allow public registration for the $Projectname network. All " -"hubs in the network are interlinked so membership on any of them conveys " -"membership in the network as a whole. Some hubs may require subscription or " -"provide tiered service plans. The hub itself <strong>may</strong> provide " -"additional details." -msgstr "" - -#: ../../Zotlabs/Module/Pubsites.php:31 -msgid "Hub URL" -msgstr "" - -#: ../../Zotlabs/Module/Pubsites.php:31 -msgid "Access Type" -msgstr "" - -#: ../../Zotlabs/Module/Pubsites.php:31 -msgid "Registration Policy" -msgstr "" - -#: ../../Zotlabs/Module/Pubsites.php:31 -msgid "Stats" +#: ../../Zotlabs/Module/Ratings.php:70 +msgid "No ratings" msgstr "" -#: ../../Zotlabs/Module/Pubsites.php:31 -msgid "Software" +#: ../../Zotlabs/Module/Ratings.php:98 +msgid "Rating: " msgstr "" -#: ../../Zotlabs/Module/Pubsites.php:31 ../../Zotlabs/Module/Ratings.php:103 -#: ../../include/conversation.php:963 -msgid "Ratings" +#: ../../Zotlabs/Module/Ratings.php:99 +msgid "Website: " msgstr "" -#: ../../Zotlabs/Module/Pubsites.php:38 -msgid "Rate" +#: ../../Zotlabs/Module/Ratings.php:101 +msgid "Description: " msgstr "" #: ../../Zotlabs/Module/Profile_photo.php:186 @@ -5678,234 +5519,366 @@ msgstr "" msgid "No connections in common." msgstr "" -#: ../../Zotlabs/Module/Register.php:49 -msgid "Maximum daily site registrations exceeded. Please try again tomorrow." +#: ../../Zotlabs/Module/Mail.php:38 +msgid "Unable to lookup recipient." msgstr "" -#: ../../Zotlabs/Module/Register.php:55 -msgid "" -"Please indicate acceptance of the Terms of Service. Registration failed." +#: ../../Zotlabs/Module/Mail.php:45 +msgid "Unable to communicate with requested channel." msgstr "" -#: ../../Zotlabs/Module/Register.php:89 -msgid "Passwords do not match." +#: ../../Zotlabs/Module/Mail.php:52 +msgid "Cannot verify requested channel." msgstr "" -#: ../../Zotlabs/Module/Register.php:131 -msgid "" -"Registration successful. Please check your email for validation instructions." +#: ../../Zotlabs/Module/Mail.php:70 +msgid "Selected channel has private message restrictions. Send failed." msgstr "" -#: ../../Zotlabs/Module/Register.php:137 -msgid "Your registration is pending approval by the site owner." +#: ../../Zotlabs/Module/Mail.php:135 +msgid "Messages" msgstr "" -#: ../../Zotlabs/Module/Register.php:140 -msgid "Your registration can not be processed." +#: ../../Zotlabs/Module/Mail.php:170 +msgid "Message recalled." msgstr "" -#: ../../Zotlabs/Module/Register.php:184 -msgid "Registration on this hub is disabled." +#: ../../Zotlabs/Module/Mail.php:183 +msgid "Conversation removed." msgstr "" -#: ../../Zotlabs/Module/Register.php:193 -msgid "Registration on this hub is by approval only." +#: ../../Zotlabs/Module/Mail.php:197 ../../Zotlabs/Module/Mail.php:306 +#: ../../Zotlabs/Module/Chat.php:205 ../../include/conversation.php:1183 +msgid "Please enter a link URL:" msgstr "" -#: ../../Zotlabs/Module/Register.php:194 -msgid "<a href=\"pubsites\">Register at another affiliated hub.</a>" +#: ../../Zotlabs/Module/Mail.php:198 ../../Zotlabs/Module/Mail.php:307 +msgid "Expires YYYY-MM-DD HH:MM" msgstr "" -#: ../../Zotlabs/Module/Register.php:204 +#: ../../Zotlabs/Module/Mail.php:226 +msgid "Requested channel is not in this network" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:234 +msgid "Send Private Message" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:235 ../../Zotlabs/Module/Mail.php:360 +msgid "To:" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:238 ../../Zotlabs/Module/Mail.php:362 +msgid "Subject:" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:243 ../../Zotlabs/Module/Mail.php:368 +#: ../../include/conversation.php:1239 +msgid "Attach file" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:245 +msgid "Send" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:248 ../../Zotlabs/Module/Mail.php:373 +#: ../../include/conversation.php:1284 +msgid "Set expiration date" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:250 ../../Zotlabs/Module/Mail.php:375 +#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Lib/ThreadItem.php:723 +#: ../../include/conversation.php:1289 +msgid "Encrypt text" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:332 +msgid "Delete message" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:333 +msgid "Delivery report" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:334 +msgid "Recall message" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:336 +msgid "Message has been recalled." +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:353 +msgid "Delete Conversation" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:355 msgid "" -"This site has exceeded the number of allowed daily account registrations. " -"Please try again tomorrow." +"No secure communications available. You <strong>may</strong> be able to " +"respond from the sender's profile page." msgstr "" -#: ../../Zotlabs/Module/Register.php:215 -msgid "Terms of Service" +#: ../../Zotlabs/Module/Mail.php:359 +msgid "Send Reply" msgstr "" -#: ../../Zotlabs/Module/Register.php:221 +#: ../../Zotlabs/Module/Mail.php:364 #, php-format -msgid "I accept the %s for this website" +msgid "Your message for %s (%s):" msgstr "" -#: ../../Zotlabs/Module/Register.php:223 +#: ../../Zotlabs/Module/Connedit.php:80 +msgid "Could not access contact record." +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:104 +msgid "Could not locate selected profile." +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:256 +msgid "Connection updated." +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:258 +msgid "Failed to update connection record." +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:308 +msgid "is now connected to" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:440 +msgid "Could not access address book record." +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:460 +msgid "Refresh failed - channel is currently unavailable." +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:475 ../../Zotlabs/Module/Connedit.php:484 +#: ../../Zotlabs/Module/Connedit.php:493 ../../Zotlabs/Module/Connedit.php:502 +#: ../../Zotlabs/Module/Connedit.php:515 +msgid "Unable to set address book parameters." +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:538 +msgid "Connection has been removed." +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:554 ../../Zotlabs/Lib/Apps.php:221 +#: ../../include/conversation.php:955 ../../include/nav.php:88 +msgid "View Profile" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:557 #, php-format -msgid "I am over 13 years of age and accept the %s for this website" +msgid "View %s's profile" msgstr "" -#: ../../Zotlabs/Module/Register.php:227 -msgid "Your email address" +#: ../../Zotlabs/Module/Connedit.php:561 +msgid "Refresh Permissions" msgstr "" -#: ../../Zotlabs/Module/Register.php:228 -msgid "Choose a password" +#: ../../Zotlabs/Module/Connedit.php:564 +msgid "Fetch updated permissions" msgstr "" -#: ../../Zotlabs/Module/Register.php:229 -msgid "Please re-enter your password" +#: ../../Zotlabs/Module/Connedit.php:568 +msgid "Recent Activity" msgstr "" -#: ../../Zotlabs/Module/Register.php:230 -msgid "Please enter your invitation code" +#: ../../Zotlabs/Module/Connedit.php:571 +msgid "View recent posts and comments" msgstr "" -#: ../../Zotlabs/Module/Register.php:236 -msgid "no" +#: ../../Zotlabs/Module/Connedit.php:578 +msgid "Block (or Unblock) all communications with this connection" msgstr "" -#: ../../Zotlabs/Module/Register.php:236 -msgid "yes" +#: ../../Zotlabs/Module/Connedit.php:579 +msgid "This connection is blocked!" msgstr "" -#: ../../Zotlabs/Module/Register.php:253 -msgid "Membership on this site is by invitation only." +#: ../../Zotlabs/Module/Connedit.php:583 +msgid "Unignore" msgstr "" -#: ../../Zotlabs/Module/Register.php:265 ../../include/nav.php:151 -#: ../../boot.php:1695 -msgid "Register" +#: ../../Zotlabs/Module/Connedit.php:586 +msgid "Ignore (or Unignore) all inbound communications from this connection" msgstr "" -#: ../../Zotlabs/Module/Register.php:266 +#: ../../Zotlabs/Module/Connedit.php:587 +msgid "This connection is ignored!" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:591 +msgid "Unarchive" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:591 +msgid "Archive" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:594 msgid "" -"This site may require email verification after submitting this form. If you " -"are returned to a login page, please check your email for instructions." +"Archive (or Unarchive) this connection - mark channel dead but keep content" msgstr "" -#: ../../Zotlabs/Module/Ratings.php:73 -msgid "No ratings" +#: ../../Zotlabs/Module/Connedit.php:595 +msgid "This connection is archived!" msgstr "" -#: ../../Zotlabs/Module/Ratings.php:104 -msgid "Rating: " +#: ../../Zotlabs/Module/Connedit.php:599 +msgid "Unhide" msgstr "" -#: ../../Zotlabs/Module/Ratings.php:105 -msgid "Website: " +#: ../../Zotlabs/Module/Connedit.php:599 +msgid "Hide" msgstr "" -#: ../../Zotlabs/Module/Ratings.php:107 -msgid "Description: " +#: ../../Zotlabs/Module/Connedit.php:602 +msgid "Hide or Unhide this connection from your other connections" msgstr "" -#: ../../Zotlabs/Module/Apps.php:47 ../../include/nav.php:167 -#: ../../include/widgets.php:102 -msgid "Apps" +#: ../../Zotlabs/Module/Connedit.php:603 +msgid "This connection is hidden!" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:52 -msgid "Unable to create element." +#: ../../Zotlabs/Module/Connedit.php:610 +msgid "Delete this connection" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:76 -msgid "Unable to update menu element." +#: ../../Zotlabs/Module/Connedit.php:625 ../../include/widgets.php:493 +msgid "Me" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:92 -msgid "Unable to add menu element." +#: ../../Zotlabs/Module/Connedit.php:626 ../../include/widgets.php:494 +msgid "Family" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:153 ../../Zotlabs/Module/Mitem.php:230 -msgid "Menu Item Permissions" +#: ../../Zotlabs/Module/Connedit.php:628 ../../include/widgets.php:496 +msgid "Acquaintances" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:176 -msgid "Link Name" +#: ../../Zotlabs/Module/Connedit.php:686 +msgid "Approve this connection" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:161 ../../Zotlabs/Module/Mitem.php:239 -msgid "Link or Submenu Target" +#: ../../Zotlabs/Module/Connedit.php:686 +msgid "Accept connection to allow communication" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:161 -msgid "Enter URL of the link or select a menu name to create a submenu" +#: ../../Zotlabs/Module/Connedit.php:691 +msgid "Set Affinity" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:240 -msgid "Use magic-auth if available" +#: ../../Zotlabs/Module/Connedit.php:694 +msgid "Set Profile" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:241 -msgid "Open link in new window" +#: ../../Zotlabs/Module/Connedit.php:697 +msgid "Set Affinity & Profile" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242 -msgid "Order in list" +#: ../../Zotlabs/Module/Connedit.php:746 +msgid "none" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242 -msgid "Higher numbers will sink to bottom of listing" +#: ../../Zotlabs/Module/Connedit.php:750 ../../include/widgets.php:623 +msgid "Connection Default Permissions" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:165 -msgid "Submit and finish" +#: ../../Zotlabs/Module/Connedit.php:750 ../../include/items.php:3964 +#, php-format +msgid "Connection: %s" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:166 -msgid "Submit and continue" +#: ../../Zotlabs/Module/Connedit.php:751 +msgid "Apply these permissions automatically" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:174 -msgid "Menu:" +#: ../../Zotlabs/Module/Connedit.php:751 +msgid "Connection requests will be approved without your interaction" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:177 -msgid "Link Target" +#: ../../Zotlabs/Module/Connedit.php:753 +msgid "This connection's primary address is" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:180 -msgid "Edit menu" +#: ../../Zotlabs/Module/Connedit.php:754 +msgid "Available locations:" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:183 -msgid "Edit element" +#: ../../Zotlabs/Module/Connedit.php:758 +msgid "" +"The permissions indicated on this page will be applied to all new " +"connections." msgstr "" -#: ../../Zotlabs/Module/Mitem.php:184 -msgid "Drop element" +#: ../../Zotlabs/Module/Connedit.php:759 +msgid "Connection Tools" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:185 -msgid "New element" +#: ../../Zotlabs/Module/Connedit.php:761 +msgid "Slide to adjust your degree of friendship" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:186 -msgid "Edit this menu container" +#: ../../Zotlabs/Module/Connedit.php:763 +msgid "Slide to adjust your rating" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:187 -msgid "Add menu element" +#: ../../Zotlabs/Module/Connedit.php:764 ../../Zotlabs/Module/Connedit.php:769 +msgid "Optionally explain your rating" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:188 -msgid "Delete this menu item" +#: ../../Zotlabs/Module/Connedit.php:766 +msgid "Custom Filter" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:189 -msgid "Edit this menu item" +#: ../../Zotlabs/Module/Connedit.php:767 +msgid "Only import posts with this text" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:206 -msgid "Menu item not found." +#: ../../Zotlabs/Module/Connedit.php:767 ../../Zotlabs/Module/Connedit.php:768 +msgid "" +"words one per line or #tags or /patterns/ or lang=xx, leave blank to import " +"all posts" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:219 -msgid "Menu item deleted." +#: ../../Zotlabs/Module/Connedit.php:768 +msgid "Do not import posts with this text" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:221 -msgid "Menu item could not be deleted." +#: ../../Zotlabs/Module/Connedit.php:770 +msgid "This information is public!" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:228 -msgid "Edit Menu Element" +#: ../../Zotlabs/Module/Connedit.php:775 +msgid "Connection Pending Approval" msgstr "" -#: ../../Zotlabs/Module/Mitem.php:238 -msgid "Link text" +#: ../../Zotlabs/Module/Connedit.php:780 +#, php-format +msgid "" +"Please choose the profile you would like to display to %s when viewing your " +"profile securely." +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:787 +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 change those settings here but they wont have " +"any impact unless the inherited setting changes." +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:788 +msgid "Last update:" +msgstr "" + +#: ../../Zotlabs/Module/Apps.php:47 ../../include/widgets.php:102 +#: ../../include/nav.php:167 +msgid "Apps" msgstr "" #: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109 @@ -5967,32 +5940,20 @@ msgstr "" msgid "Or enter new bookmark folder name" msgstr "" -#: ../../Zotlabs/Module/Network.php:94 -msgid "No such group" -msgstr "" - -#: ../../Zotlabs/Module/Network.php:134 -msgid "No such channel" -msgstr "" - -#: ../../Zotlabs/Module/Network.php:139 -msgid "forum" -msgstr "" - -#: ../../Zotlabs/Module/Network.php:151 -msgid "Search Results For:" +#: ../../Zotlabs/Module/Rmagic.php:35 +msgid "Authentication failed." msgstr "" -#: ../../Zotlabs/Module/Network.php:216 -msgid "Privacy group is empty" +#: ../../Zotlabs/Module/Rmagic.php:75 +msgid "Remote Authentication" msgstr "" -#: ../../Zotlabs/Module/Network.php:225 -msgid "Privacy group: " +#: ../../Zotlabs/Module/Rmagic.php:76 +msgid "Enter your channel address (e.g. channel@example.com)" msgstr "" -#: ../../Zotlabs/Module/Network.php:251 -msgid "Invalid connection." +#: ../../Zotlabs/Module/Rmagic.php:77 +msgid "Authenticate" msgstr "" #: ../../Zotlabs/Module/Regmod.php:15 @@ -6124,6 +6085,28 @@ msgid "" "or restore these in date order (oldest first)." msgstr "" +#: ../../Zotlabs/Module/Editpost.php:35 +msgid "Item is not editable" +msgstr "" + +#: ../../Zotlabs/Module/Editpost.php:106 ../../Zotlabs/Module/Rpost.php:138 +msgid "Edit post" +msgstr "" + +#: ../../Zotlabs/Module/Search.php:216 +#, php-format +msgid "Items tagged with: %s" +msgstr "" + +#: ../../Zotlabs/Module/Search.php:218 +#, php-format +msgid "Search results for: %s" +msgstr "" + +#: ../../Zotlabs/Module/Service_limits.php:23 +msgid "No service class restrictions found." +msgstr "" + #: ../../Zotlabs/Module/Thing.php:114 msgid "Thing updated" msgstr "" @@ -6181,51 +6164,38 @@ msgstr "" msgid "Add Thing to your Profile" msgstr "" -#: ../../Zotlabs/Module/Search.php:216 -#, php-format -msgid "Items tagged with: %s" -msgstr "" - -#: ../../Zotlabs/Module/Search.php:218 -#, php-format -msgid "Search results for: %s" -msgstr "" - -#: ../../Zotlabs/Module/Service_limits.php:23 -msgid "No service class restrictions found." -msgstr "" - -#: ../../Zotlabs/Module/Rate.php:160 -msgid "Website:" +#: ../../Zotlabs/Module/Item.php:180 +msgid "Unable to locate original post." msgstr "" -#: ../../Zotlabs/Module/Rate.php:163 -#, php-format -msgid "Remote Channel [%s] (not yet known on this site)" +#: ../../Zotlabs/Module/Item.php:433 +msgid "Empty post discarded." msgstr "" -#: ../../Zotlabs/Module/Rate.php:164 -msgid "Rating (this information is public)" +#: ../../Zotlabs/Module/Item.php:473 +msgid "Executable content type not permitted to this channel." msgstr "" -#: ../../Zotlabs/Module/Rate.php:165 -msgid "Optionally explain your rating (this information is public)" +#: ../../Zotlabs/Module/Item.php:858 +msgid "Duplicate post suppressed." msgstr "" -#: ../../Zotlabs/Module/Rmagic.php:35 -msgid "Authentication failed." +#: ../../Zotlabs/Module/Item.php:991 +msgid "System error. Post not saved." msgstr "" -#: ../../Zotlabs/Module/Rmagic.php:75 -msgid "Remote Authentication" +#: ../../Zotlabs/Module/Item.php:1112 +msgid "Unable to obtain post information from database." msgstr "" -#: ../../Zotlabs/Module/Rmagic.php:76 -msgid "Enter your channel address (e.g. channel@example.com)" +#: ../../Zotlabs/Module/Item.php:1119 +#, php-format +msgid "You have reached your limit of %1$.0f top level posts." msgstr "" -#: ../../Zotlabs/Module/Rmagic.php:77 -msgid "Authenticate" +#: ../../Zotlabs/Module/Item.php:1126 +#, php-format +msgid "You have reached your limit of %1$.0f webpages." msgstr "" #: ../../Zotlabs/Module/Sharedwithme.php:98 @@ -6244,8 +6214,81 @@ msgstr "" msgid "Remove this file" msgstr "" -#: ../../Zotlabs/Module/Follow.php:34 -msgid "Channel added." +#: ../../Zotlabs/Module/Wiki.php:34 +msgid "Not found" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:97 ../../Zotlabs/Lib/Apps.php:219 +#: ../../include/conversation.php:1728 ../../include/conversation.php:1731 +#: ../../include/features.php:57 ../../include/nav.php:110 +msgid "Wiki" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:98 +msgid "Sandbox" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:100 +msgid "" +"\"# Wiki Sandbox\\n\\nContent you **edit** and **preview** here *will not be " +"saved*.\"" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:169 +msgid "Revision Comparison" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:170 +msgid "Revert" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:201 +msgid "Enter the name of your new wiki:" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:202 +msgid "Enter the name of the new page:" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:203 +msgid "Enter the new name:" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:209 ../../include/conversation.php:1152 +msgid "Embed image from photo albums" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:210 ../../include/conversation.php:1242 +msgid "Embed an image from your albums" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:212 ../../include/conversation.php:1244 +#: ../../include/conversation.php:1291 +msgid "OK" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:213 ../../include/conversation.php:1188 +msgid "Choose images to embed" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:214 ../../include/conversation.php:1189 +msgid "Choose an album" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:215 ../../include/conversation.php:1190 +msgid "Choose a different album..." +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:216 ../../include/conversation.php:1191 +msgid "Error getting album list" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:217 ../../include/conversation.php:1192 +msgid "Error getting photo link" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:218 ../../include/conversation.php:1193 +msgid "Error getting album" msgstr "" #: ../../Zotlabs/Module/Sources.php:37 @@ -6264,8 +6307,8 @@ msgstr "" msgid "*" msgstr "" -#: ../../Zotlabs/Module/Sources.php:96 ../../include/features.php:74 -#: ../../include/widgets.php:639 +#: ../../Zotlabs/Module/Sources.php:96 ../../include/widgets.php:639 +#: ../../include/features.php:71 msgid "Channel Sources" msgstr "" @@ -6367,111 +6410,82 @@ msgstr "" msgid "Select a tag to remove: " msgstr "" -#: ../../Zotlabs/Module/Api.php:60 ../../Zotlabs/Module/Api.php:81 -msgid "Authorize application connection" -msgstr "" - -#: ../../Zotlabs/Module/Api.php:61 -msgid "Return to your app and insert this Security Code:" -msgstr "" - -#: ../../Zotlabs/Module/Api.php:71 -msgid "Please login to continue." +#: ../../Zotlabs/Module/Follow.php:34 +msgid "Channel added." msgstr "" -#: ../../Zotlabs/Module/Api.php:83 -msgid "" -"Do you want to authorize this application to access your posts and contacts, " -"and/or create new posts for you?" +#: ../../Zotlabs/Module/Viewconnections.php:65 +msgid "No connections." msgstr "" -#: ../../Zotlabs/Module/Import.php:33 +#: ../../Zotlabs/Module/Viewconnections.php:78 #, php-format -msgid "Your service plan only allows %d channels." -msgstr "" - -#: ../../Zotlabs/Module/Import.php:153 ../../include/import.php:107 -msgid "Cloned channel not found. Import failed." -msgstr "" - -#: ../../Zotlabs/Module/Import.php:163 -msgid "No channel. Import failed." +msgid "Visit %s's profile [%s]" msgstr "" -#: ../../Zotlabs/Module/Import.php:520 -#: ../../include/Import/import_diaspora.php:142 -msgid "Import completed." +#: ../../Zotlabs/Module/Viewconnections.php:107 +msgid "View Connections" msgstr "" -#: ../../Zotlabs/Module/Import.php:542 -msgid "You must be logged in to use this feature." +#: ../../Zotlabs/Module/Viewsrc.php:44 +msgid "Source of Item" msgstr "" -#: ../../Zotlabs/Module/Import.php:547 -msgid "Import Channel" +#: ../../Zotlabs/Module/Chat.php:181 +msgid "Room not found" msgstr "" -#: ../../Zotlabs/Module/Import.php:548 -msgid "" -"Use this form to import an existing channel from a different server/hub. You " -"may retrieve the channel identity from the old server/hub via the network or " -"provide an export file." +#: ../../Zotlabs/Module/Chat.php:197 +msgid "Leave Room" msgstr "" -#: ../../Zotlabs/Module/Import.php:550 -msgid "Or provide the old server/hub details" +#: ../../Zotlabs/Module/Chat.php:198 +msgid "Delete Room" msgstr "" -#: ../../Zotlabs/Module/Import.php:551 -msgid "Your old identity address (xyz@example.com)" +#: ../../Zotlabs/Module/Chat.php:199 +msgid "I am away right now" msgstr "" -#: ../../Zotlabs/Module/Import.php:552 -msgid "Your old login email address" +#: ../../Zotlabs/Module/Chat.php:200 +msgid "I am online" msgstr "" -#: ../../Zotlabs/Module/Import.php:553 -msgid "Your old login password" +#: ../../Zotlabs/Module/Chat.php:202 +msgid "Bookmark this room" msgstr "" -#: ../../Zotlabs/Module/Import.php:554 -msgid "" -"For either option, please choose whether to make this hub your new primary " -"address, or whether your old location should continue this role. You will be " -"able to post from either location, but only one can be marked as the primary " -"location for files, photos, and media." +#: ../../Zotlabs/Module/Chat.php:218 +msgid "Feature disabled." msgstr "" -#: ../../Zotlabs/Module/Import.php:555 -msgid "Make this hub my primary location" +#: ../../Zotlabs/Module/Chat.php:231 +msgid "New Chatroom" msgstr "" -#: ../../Zotlabs/Module/Import.php:556 -msgid "" -"Import existing posts if possible (experimental - limited by available memory" +#: ../../Zotlabs/Module/Chat.php:232 +msgid "Chatroom name" msgstr "" -#: ../../Zotlabs/Module/Import.php:557 -msgid "" -"This process may take several minutes to complete. Please submit the form " -"only once and leave this page open until finished." +#: ../../Zotlabs/Module/Chat.php:233 +msgid "Expiration of chats (minutes)" msgstr "" -#: ../../Zotlabs/Module/Viewconnections.php:65 -msgid "No connections." +#: ../../Zotlabs/Module/Chat.php:249 +#, php-format +msgid "%1$s's Chatrooms" msgstr "" -#: ../../Zotlabs/Module/Viewconnections.php:78 -#, php-format -msgid "Visit %s's profile [%s]" +#: ../../Zotlabs/Module/Chat.php:254 +msgid "No chatrooms available" msgstr "" -#: ../../Zotlabs/Module/Viewconnections.php:107 -msgid "View Connections" +#: ../../Zotlabs/Module/Chat.php:258 +msgid "Expiration" msgstr "" -#: ../../Zotlabs/Module/Viewsrc.php:44 -msgid "Source of Item" +#: ../../Zotlabs/Module/Chat.php:259 +msgid "min" msgstr "" #: ../../Zotlabs/Module/Xchan.php:10 @@ -6730,12 +6744,12 @@ msgstr "" msgid "Remote Diagnostics" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:212 ../../include/features.php:92 +#: ../../Zotlabs/Lib/Apps.php:212 ../../include/features.php:90 msgid "Suggest Channels" msgstr "" #: ../../Zotlabs/Lib/Apps.php:213 ../../include/nav.php:114 -#: ../../boot.php:1713 +#: ../../boot.php:1738 msgid "Login" msgstr "" @@ -6747,8 +6761,8 @@ msgstr "" msgid "Channel Home" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:223 ../../include/nav.php:205 -#: ../../include/conversation.php:1669 ../../include/conversation.php:1672 +#: ../../Zotlabs/Lib/Apps.php:223 ../../include/conversation.php:1682 +#: ../../include/conversation.php:1685 ../../include/nav.php:205 msgid "Events" msgstr "" @@ -6801,12 +6815,12 @@ msgid "Purchase" msgstr "" #: ../../Zotlabs/Lib/PermissionDescription.php:31 -#: ../../include/acl_selectors.php:230 +#: ../../include/acl_selectors.php:124 msgid "Visible to your default audience" msgstr "" #: ../../Zotlabs/Lib/PermissionDescription.php:106 -#: ../../include/acl_selectors.php:266 +#: ../../include/acl_selectors.php:165 msgid "Only me" msgstr "" @@ -7007,23 +7021,23 @@ msgstr "" msgid "%s show all" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:712 ../../include/conversation.php:1227 +#: ../../Zotlabs/Lib/ThreadItem.php:712 ../../include/conversation.php:1234 msgid "Bold" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:713 ../../include/conversation.php:1228 +#: ../../Zotlabs/Lib/ThreadItem.php:713 ../../include/conversation.php:1235 msgid "Italic" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:714 ../../include/conversation.php:1229 +#: ../../Zotlabs/Lib/ThreadItem.php:714 ../../include/conversation.php:1236 msgid "Underline" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:715 ../../include/conversation.php:1230 +#: ../../Zotlabs/Lib/ThreadItem.php:715 ../../include/conversation.php:1237 msgid "Quote" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:716 ../../include/conversation.php:1231 +#: ../../Zotlabs/Lib/ThreadItem.php:716 ../../include/conversation.php:1238 msgid "Code" msgstr "" @@ -7047,1598 +7061,1699 @@ msgstr "" msgid "Unable to create a unique channel address. Import failed." msgstr "" -#: ../../include/dba/dba_driver.php:171 +#: ../../include/dba/dba_driver.php:173 #, php-format msgid "Cannot locate DNS info for database server '%s'" msgstr "" -#: ../../include/items.php:897 ../../include/items.php:942 -msgid "(Unknown)" +#: ../../include/network.php:704 +msgid "view full size" msgstr "" -#: ../../include/items.php:1141 -msgid "Visible to anybody on the internet." +#: ../../include/network.php:1935 ../../include/account.php:317 +#: ../../include/account.php:344 ../../include/account.php:404 +msgid "Administrator" msgstr "" -#: ../../include/items.php:1143 -msgid "Visible to you only." +#: ../../include/network.php:1949 +msgid "No Subject" msgstr "" -#: ../../include/items.php:1145 -msgid "Visible to anybody in this network." +#: ../../include/network.php:2203 ../../include/network.php:2204 +msgid "Friendica" msgstr "" -#: ../../include/items.php:1147 -msgid "Visible to anybody authenticated." +#: ../../include/network.php:2205 +msgid "OStatus" msgstr "" -#: ../../include/items.php:1149 -#, php-format -msgid "Visible to anybody on %s." +#: ../../include/network.php:2206 +msgid "GNU-Social" msgstr "" -#: ../../include/items.php:1151 -msgid "Visible to all connections." +#: ../../include/network.php:2207 +msgid "RSS/Atom" msgstr "" -#: ../../include/items.php:1153 -msgid "Visible to approved connections." +#: ../../include/network.php:2209 +msgid "Diaspora" msgstr "" -#: ../../include/items.php:1155 -msgid "Visible to specific connections." +#: ../../include/network.php:2210 +msgid "Facebook" msgstr "" -#: ../../include/items.php:3918 -msgid "Privacy group is empty." +#: ../../include/network.php:2211 +msgid "Zot" msgstr "" -#: ../../include/items.php:3925 -#, php-format -msgid "Privacy group: %s" +#: ../../include/network.php:2212 +msgid "LinkedIn" msgstr "" -#: ../../include/items.php:3937 -msgid "Connection not found." +#: ../../include/network.php:2213 +msgid "XMPP/IM" msgstr "" -#: ../../include/items.php:4290 -msgid "profile photo" +#: ../../include/network.php:2214 +msgid "MySpace" msgstr "" -#: ../../include/import.php:30 -msgid "" -"Cannot create a duplicate channel identifier on this system. Import failed." +#: ../../include/oembed.php:340 +msgid "Embedded content" msgstr "" -#: ../../include/import.php:97 -msgid "Channel clone failed. Import failed." +#: ../../include/oembed.php:349 +msgid "Embedding disabled" msgstr "" -#: ../../include/photos.php:114 -#, php-format -msgid "Image exceeds website size limit of %lu bytes" +#: ../../include/permissions.php:29 +msgid "Can view my normal stream and posts" msgstr "" -#: ../../include/photos.php:121 -msgid "Image file is empty." +#: ../../include/permissions.php:33 +msgid "Can view my webpages" msgstr "" -#: ../../include/photos.php:259 -msgid "Photo storage failed." +#: ../../include/permissions.php:37 +msgid "Can post on my channel page (\"wall\")" msgstr "" -#: ../../include/photos.php:299 -msgid "a new photo" +#: ../../include/permissions.php:40 +msgid "Can like/dislike stuff" msgstr "" -#: ../../include/photos.php:303 -#, php-format -msgctxt "photo_upload" -msgid "%1$s posted %2$s to %3$s" +#: ../../include/permissions.php:40 +msgid "Profiles and things other than posts/comments" msgstr "" -#: ../../include/photos.php:506 ../../include/conversation.php:1655 -msgid "Photo Albums" +#: ../../include/permissions.php:42 +msgid "Can forward to all my channel contacts via post @mentions" msgstr "" -#: ../../include/photos.php:510 -msgid "Upload New Photos" +#: ../../include/permissions.php:42 +msgid "Advanced - useful for creating group forum channels" msgstr "" -#: ../../include/features.php:50 -msgid "General Features" +#: ../../include/permissions.php:43 +msgid "Can chat with me (when available)" msgstr "" -#: ../../include/features.php:52 -msgid "Content Expiration" +#: ../../include/permissions.php:44 +msgid "Can write to my file storage and photos" msgstr "" -#: ../../include/features.php:52 -msgid "Remove posts/comments and/or private messages at a future time" +#: ../../include/permissions.php:45 +msgid "Can edit my webpages" msgstr "" -#: ../../include/features.php:53 -msgid "Multiple Profiles" +#: ../../include/permissions.php:47 +msgid "Somewhat advanced - very useful in open communities" msgstr "" -#: ../../include/features.php:53 -msgid "Ability to create multiple profiles" +#: ../../include/permissions.php:49 +msgid "Can administer my channel resources" msgstr "" -#: ../../include/features.php:54 -msgid "Advanced Profiles" +#: ../../include/permissions.php:49 +msgid "Extremely advanced. Leave this alone unless you know what you are doing" msgstr "" -#: ../../include/features.php:54 -msgid "Additional profile sections and selections" +#: ../../include/items.php:899 ../../include/items.php:944 +msgid "(Unknown)" msgstr "" -#: ../../include/features.php:55 -msgid "Profile Import/Export" +#: ../../include/items.php:1143 +msgid "Visible to anybody on the internet." msgstr "" -#: ../../include/features.php:55 -msgid "Save and load profile details across sites/channels" +#: ../../include/items.php:1145 +msgid "Visible to you only." msgstr "" -#: ../../include/features.php:56 -msgid "Web Pages" +#: ../../include/items.php:1147 +msgid "Visible to anybody in this network." msgstr "" -#: ../../include/features.php:56 -msgid "Provide managed web pages on your channel" +#: ../../include/items.php:1149 +msgid "Visible to anybody authenticated." msgstr "" -#: ../../include/features.php:57 -msgid "Provide a wiki for your channel" +#: ../../include/items.php:1151 +#, php-format +msgid "Visible to anybody on %s." msgstr "" -#: ../../include/features.php:58 -msgid "Hide Rating" +#: ../../include/items.php:1153 +msgid "Visible to all connections." msgstr "" -#: ../../include/features.php:58 -msgid "" -"Hide the rating buttons on your channel and profile pages. Note: People can " -"still rate you somewhere else." +#: ../../include/items.php:1155 +msgid "Visible to approved connections." msgstr "" -#: ../../include/features.php:59 -msgid "Private Notes" +#: ../../include/items.php:1157 +msgid "Visible to specific connections." msgstr "" -#: ../../include/features.php:59 -msgid "Enables a tool to store notes and reminders (note: not encrypted)" +#: ../../include/items.php:3947 +msgid "Privacy group is empty." msgstr "" -#: ../../include/features.php:60 -msgid "Navigation Channel Select" +#: ../../include/items.php:3954 +#, php-format +msgid "Privacy group: %s" msgstr "" -#: ../../include/features.php:60 -msgid "Change channels directly from within the navigation dropdown menu" +#: ../../include/items.php:3966 +msgid "Connection not found." msgstr "" -#: ../../include/features.php:61 -msgid "Photo Location" +#: ../../include/items.php:4319 +msgid "profile photo" msgstr "" -#: ../../include/features.php:61 -msgid "If location data is available on uploaded photos, link this to a map." +#: ../../include/text.php:404 +msgid "prev" msgstr "" -#: ../../include/features.php:62 -msgid "Access Controlled Chatrooms" +#: ../../include/text.php:406 +msgid "first" msgstr "" -#: ../../include/features.php:62 -msgid "Provide chatrooms and chat services with access control." +#: ../../include/text.php:435 +msgid "last" msgstr "" -#: ../../include/features.php:63 -msgid "Smart Birthdays" +#: ../../include/text.php:438 +msgid "next" msgstr "" -#: ../../include/features.php:63 -msgid "" -"Make birthday events timezone aware in case your friends are scattered " -"across the planet." +#: ../../include/text.php:448 +msgid "older" msgstr "" -#: ../../include/features.php:64 -msgid "Expert Mode" +#: ../../include/text.php:450 +msgid "newer" msgstr "" -#: ../../include/features.php:64 -msgid "Enable Expert Mode to provide advanced configuration options" +#: ../../include/text.php:843 +msgid "No connections" msgstr "" -#: ../../include/features.php:65 -msgid "Premium Channel" +#: ../../include/text.php:868 +#, php-format +msgid "View all %s connections" msgstr "" -#: ../../include/features.php:65 -msgid "" -"Allows you to set restrictions and terms on those that connect with your " -"channel" +#: ../../include/text.php:1013 ../../include/text.php:1018 +msgid "poke" msgstr "" -#: ../../include/features.php:70 -msgid "Post Composition Features" +#: ../../include/text.php:1013 ../../include/text.php:1018 +#: ../../include/conversation.php:243 +msgid "poked" msgstr "" -#: ../../include/features.php:73 -msgid "Large Photos" +#: ../../include/text.php:1019 +msgid "ping" msgstr "" -#: ../../include/features.php:73 -msgid "" -"Include large (1024px) photo thumbnails in posts. If not enabled, use small " -"(640px) photo thumbnails" +#: ../../include/text.php:1019 +msgid "pinged" msgstr "" -#: ../../include/features.php:74 -msgid "Automatically import channel content from other channels or feeds" +#: ../../include/text.php:1020 +msgid "prod" msgstr "" -#: ../../include/features.php:75 -msgid "Even More Encryption" +#: ../../include/text.php:1020 +msgid "prodded" msgstr "" -#: ../../include/features.php:75 -msgid "" -"Allow optional encryption of content end-to-end with a shared secret key" +#: ../../include/text.php:1021 +msgid "slap" msgstr "" -#: ../../include/features.php:76 -msgid "Enable Voting Tools" +#: ../../include/text.php:1021 +msgid "slapped" msgstr "" -#: ../../include/features.php:76 -msgid "Provide a class of post which others can vote on" +#: ../../include/text.php:1022 +msgid "finger" msgstr "" -#: ../../include/features.php:77 -msgid "Delayed Posting" +#: ../../include/text.php:1022 +msgid "fingered" msgstr "" -#: ../../include/features.php:77 -msgid "Allow posts to be published at a later date" +#: ../../include/text.php:1023 +msgid "rebuff" msgstr "" -#: ../../include/features.php:78 -msgid "Suppress Duplicate Posts/Comments" +#: ../../include/text.php:1023 +msgid "rebuffed" msgstr "" -#: ../../include/features.php:78 -msgid "" -"Prevent posts with identical content to be published with less than two " -"minutes in between submissions." +#: ../../include/text.php:1035 +msgid "happy" msgstr "" -#: ../../include/features.php:84 -msgid "Network and Stream Filtering" +#: ../../include/text.php:1036 +msgid "sad" msgstr "" -#: ../../include/features.php:85 -msgid "Search by Date" +#: ../../include/text.php:1037 +msgid "mellow" msgstr "" -#: ../../include/features.php:85 -msgid "Ability to select posts by date ranges" +#: ../../include/text.php:1038 +msgid "tired" msgstr "" -#: ../../include/features.php:86 ../../include/group.php:311 -msgid "Privacy Groups" +#: ../../include/text.php:1039 +msgid "perky" msgstr "" -#: ../../include/features.php:86 -msgid "Enable management and selection of privacy groups" +#: ../../include/text.php:1040 +msgid "angry" msgstr "" -#: ../../include/features.php:87 ../../include/widgets.php:281 -msgid "Saved Searches" +#: ../../include/text.php:1041 +msgid "stupefied" msgstr "" -#: ../../include/features.php:87 -msgid "Save search terms for re-use" +#: ../../include/text.php:1042 +msgid "puzzled" msgstr "" -#: ../../include/features.php:88 -msgid "Network Personal Tab" +#: ../../include/text.php:1043 +msgid "interested" msgstr "" -#: ../../include/features.php:88 -msgid "Enable tab to display only Network posts that you've interacted on" +#: ../../include/text.php:1044 +msgid "bitter" msgstr "" -#: ../../include/features.php:89 -msgid "Network New Tab" +#: ../../include/text.php:1045 +msgid "cheerful" msgstr "" -#: ../../include/features.php:89 -msgid "Enable tab to display all new Network activity" +#: ../../include/text.php:1046 +msgid "alive" msgstr "" -#: ../../include/features.php:90 -msgid "Affinity Tool" +#: ../../include/text.php:1047 +msgid "annoyed" msgstr "" -#: ../../include/features.php:90 -msgid "Filter stream activity by depth of relationships" +#: ../../include/text.php:1048 +msgid "anxious" msgstr "" -#: ../../include/features.php:91 -msgid "Connection Filtering" +#: ../../include/text.php:1049 +msgid "cranky" msgstr "" -#: ../../include/features.php:91 -msgid "Filter incoming posts from connections based on keywords/content" +#: ../../include/text.php:1050 +msgid "disturbed" msgstr "" -#: ../../include/features.php:92 -msgid "Show channel suggestions" +#: ../../include/text.php:1051 +msgid "frustrated" msgstr "" -#: ../../include/features.php:97 -msgid "Post/Comment Tools" +#: ../../include/text.php:1052 +msgid "depressed" msgstr "" -#: ../../include/features.php:98 -msgid "Community Tagging" +#: ../../include/text.php:1053 +msgid "motivated" msgstr "" -#: ../../include/features.php:98 -msgid "Ability to tag existing posts" +#: ../../include/text.php:1054 +msgid "relaxed" msgstr "" -#: ../../include/features.php:99 -msgid "Post Categories" +#: ../../include/text.php:1055 +msgid "surprised" msgstr "" -#: ../../include/features.php:99 -msgid "Add categories to your posts" +#: ../../include/text.php:1239 ../../include/js_strings.php:70 +msgid "Monday" msgstr "" -#: ../../include/features.php:100 -msgid "Emoji Reactions" +#: ../../include/text.php:1239 ../../include/js_strings.php:71 +msgid "Tuesday" msgstr "" -#: ../../include/features.php:100 -msgid "Add emoji reaction ability to posts" +#: ../../include/text.php:1239 ../../include/js_strings.php:72 +msgid "Wednesday" msgstr "" -#: ../../include/features.php:101 ../../include/widgets.php:310 -#: ../../include/contact_widgets.php:53 -msgid "Saved Folders" +#: ../../include/text.php:1239 ../../include/js_strings.php:73 +msgid "Thursday" msgstr "" -#: ../../include/features.php:101 -msgid "Ability to file posts under folders" +#: ../../include/text.php:1239 ../../include/js_strings.php:74 +msgid "Friday" msgstr "" -#: ../../include/features.php:102 -msgid "Dislike Posts" +#: ../../include/text.php:1239 ../../include/js_strings.php:75 +msgid "Saturday" msgstr "" -#: ../../include/features.php:102 -msgid "Ability to dislike posts/comments" +#: ../../include/text.php:1239 ../../include/js_strings.php:69 +msgid "Sunday" msgstr "" -#: ../../include/features.php:103 -msgid "Star Posts" +#: ../../include/text.php:1243 ../../include/js_strings.php:45 +msgid "January" msgstr "" -#: ../../include/features.php:103 -msgid "Ability to mark special posts with a star indicator" +#: ../../include/text.php:1243 ../../include/js_strings.php:46 +msgid "February" msgstr "" -#: ../../include/features.php:104 -msgid "Tag Cloud" +#: ../../include/text.php:1243 ../../include/js_strings.php:47 +msgid "March" msgstr "" -#: ../../include/features.php:104 -msgid "Provide a personal tag cloud on your channel page" +#: ../../include/text.php:1243 ../../include/js_strings.php:48 +msgid "April" msgstr "" -#: ../../include/api.php:1337 -msgid "Public Timeline" +#: ../../include/text.php:1243 +msgid "May" msgstr "" -#: ../../include/acl_selectors.php:269 -msgid "Who can see this?" +#: ../../include/text.php:1243 ../../include/js_strings.php:50 +msgid "June" msgstr "" -#: ../../include/acl_selectors.php:270 -msgid "Custom selection" +#: ../../include/text.php:1243 ../../include/js_strings.php:51 +msgid "July" msgstr "" -#: ../../include/acl_selectors.php:271 -msgid "" -"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit " -"the scope of \"Show\"." +#: ../../include/text.php:1243 ../../include/js_strings.php:52 +msgid "August" msgstr "" -#: ../../include/acl_selectors.php:272 -msgid "Show" +#: ../../include/text.php:1243 ../../include/js_strings.php:53 +msgid "September" msgstr "" -#: ../../include/acl_selectors.php:273 -msgid "Don't show" +#: ../../include/text.php:1243 ../../include/js_strings.php:54 +msgid "October" msgstr "" -#: ../../include/acl_selectors.php:279 -msgid "Other networks and post services" +#: ../../include/text.php:1243 ../../include/js_strings.php:55 +msgid "November" msgstr "" -#: ../../include/acl_selectors.php:309 -#, php-format -msgid "" -"Post permissions %s cannot be changed %s after a post is shared.</br />These " -"permissions set who is allowed to view the post." +#: ../../include/text.php:1243 ../../include/js_strings.php:56 +msgid "December" msgstr "" -#: ../../include/datetime.php:135 -msgid "Birthday" +#: ../../include/text.php:1320 ../../include/text.php:1324 +msgid "Unknown Attachment" msgstr "" -#: ../../include/datetime.php:137 -msgid "Age: " +#: ../../include/text.php:1326 +msgid "unknown" msgstr "" -#: ../../include/datetime.php:139 -msgid "YYYY-MM-DD or MM-DD" +#: ../../include/text.php:1362 +msgid "remove category" msgstr "" -#: ../../include/datetime.php:272 ../../boot.php:2549 -msgid "never" +#: ../../include/text.php:1439 +msgid "remove from file" msgstr "" -#: ../../include/datetime.php:278 -msgid "less than a second ago" +#: ../../include/text.php:1738 ../../include/text.php:1809 +msgid "default" msgstr "" -#: ../../include/datetime.php:296 -#, php-format -msgctxt "e.g. 22 hours ago, 1 minute ago" -msgid "%1$d %2$s ago" +#: ../../include/text.php:1746 +msgid "Page layout" msgstr "" -#: ../../include/datetime.php:307 -msgctxt "relative_date" -msgid "year" -msgid_plural "years" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/datetime.php:310 -msgctxt "relative_date" -msgid "month" -msgid_plural "months" -msgstr[0] "" -msgstr[1] "" +#: ../../include/text.php:1746 +msgid "You can create your own with the layouts tool" +msgstr "" -#: ../../include/datetime.php:313 -msgctxt "relative_date" -msgid "week" -msgid_plural "weeks" -msgstr[0] "" -msgstr[1] "" +#: ../../include/text.php:1788 +msgid "Page content type" +msgstr "" -#: ../../include/datetime.php:316 -msgctxt "relative_date" -msgid "day" -msgid_plural "days" -msgstr[0] "" -msgstr[1] "" +#: ../../include/text.php:1821 +msgid "Select an alternate language" +msgstr "" -#: ../../include/datetime.php:319 -msgctxt "relative_date" -msgid "hour" -msgid_plural "hours" -msgstr[0] "" -msgstr[1] "" +#: ../../include/text.php:1958 +msgid "activity" +msgstr "" -#: ../../include/datetime.php:322 -msgctxt "relative_date" -msgid "minute" -msgid_plural "minutes" -msgstr[0] "" -msgstr[1] "" +#: ../../include/text.php:2259 +msgid "Design Tools" +msgstr "" -#: ../../include/datetime.php:325 -msgctxt "relative_date" -msgid "second" -msgid_plural "seconds" -msgstr[0] "" -msgstr[1] "" +#: ../../include/text.php:2265 +msgid "Pages" +msgstr "" -#: ../../include/datetime.php:562 -#, php-format -msgid "%1$s's birthday" +#: ../../include/text.php:2287 +msgid "Import website..." msgstr "" -#: ../../include/datetime.php:563 -#, php-format -msgid "Happy Birthday %1$s" +#: ../../include/text.php:2288 +msgid "Select folder to import" msgstr "" -#: ../../include/selectors.php:30 -msgid "Frequently" +#: ../../include/text.php:2289 +msgid "Import from a zipped folder:" msgstr "" -#: ../../include/selectors.php:31 -msgid "Hourly" +#: ../../include/text.php:2290 +msgid "Import from cloud files:" msgstr "" -#: ../../include/selectors.php:32 -msgid "Twice daily" +#: ../../include/text.php:2291 +msgid "/cloud/channel/path/to/folder" msgstr "" -#: ../../include/selectors.php:33 -msgid "Daily" +#: ../../include/text.php:2292 +msgid "Enter path to website files" msgstr "" -#: ../../include/selectors.php:34 -msgid "Weekly" +#: ../../include/text.php:2293 +msgid "Select folder" msgstr "" -#: ../../include/selectors.php:35 -msgid "Monthly" +#: ../../include/widgets.php:46 ../../include/widgets.php:429 +#: ../../include/taxonomy.php:188 ../../include/taxonomy.php:270 +#: ../../include/contact_widgets.php:91 +msgid "Categories" msgstr "" -#: ../../include/selectors.php:49 ../../include/selectors.php:66 -msgid "Male" +#: ../../include/widgets.php:103 +msgid "System" msgstr "" -#: ../../include/selectors.php:49 ../../include/selectors.php:66 -msgid "Female" +#: ../../include/widgets.php:106 +msgid "New App" msgstr "" -#: ../../include/selectors.php:49 -msgid "Currently Male" +#: ../../include/widgets.php:154 +msgid "Suggestions" msgstr "" -#: ../../include/selectors.php:49 -msgid "Currently Female" +#: ../../include/widgets.php:155 +msgid "See more..." msgstr "" -#: ../../include/selectors.php:49 -msgid "Mostly Male" +#: ../../include/widgets.php:175 +#, php-format +msgid "You have %1$.0f of %2$.0f allowed connections." msgstr "" -#: ../../include/selectors.php:49 -msgid "Mostly Female" +#: ../../include/widgets.php:181 +msgid "Add New Connection" msgstr "" -#: ../../include/selectors.php:49 -msgid "Transgender" +#: ../../include/widgets.php:182 +msgid "Enter channel address" msgstr "" -#: ../../include/selectors.php:49 -msgid "Intersex" +#: ../../include/widgets.php:183 +msgid "Examples: bob@example.com, https://example.com/barbara" msgstr "" -#: ../../include/selectors.php:49 -msgid "Transsexual" +#: ../../include/widgets.php:199 +msgid "Notes" msgstr "" -#: ../../include/selectors.php:49 -msgid "Hermaphrodite" +#: ../../include/widgets.php:273 +msgid "Remove term" msgstr "" -#: ../../include/selectors.php:49 -msgid "Neuter" +#: ../../include/widgets.php:281 ../../include/features.php:85 +msgid "Saved Searches" msgstr "" -#: ../../include/selectors.php:49 -msgid "Non-specific" +#: ../../include/widgets.php:282 ../../include/group.php:316 +msgid "add" msgstr "" -#: ../../include/selectors.php:49 -msgid "Undecided" +#: ../../include/widgets.php:310 ../../include/features.php:99 +#: ../../include/contact_widgets.php:53 +msgid "Saved Folders" msgstr "" -#: ../../include/selectors.php:85 ../../include/selectors.php:104 -msgid "Males" +#: ../../include/widgets.php:313 ../../include/widgets.php:432 +#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94 +msgid "Everything" msgstr "" -#: ../../include/selectors.php:85 ../../include/selectors.php:104 -msgid "Females" +#: ../../include/widgets.php:354 +msgid "Archives" msgstr "" -#: ../../include/selectors.php:85 -msgid "Gay" +#: ../../include/widgets.php:516 +msgid "Refresh" msgstr "" -#: ../../include/selectors.php:85 -msgid "Lesbian" +#: ../../include/widgets.php:556 +msgid "Account settings" msgstr "" -#: ../../include/selectors.php:85 -msgid "No Preference" +#: ../../include/widgets.php:562 +msgid "Channel settings" msgstr "" -#: ../../include/selectors.php:85 -msgid "Bisexual" +#: ../../include/widgets.php:571 +msgid "Additional features" msgstr "" -#: ../../include/selectors.php:85 -msgid "Autosexual" +#: ../../include/widgets.php:578 +msgid "Feature/Addon settings" msgstr "" -#: ../../include/selectors.php:85 -msgid "Abstinent" +#: ../../include/widgets.php:584 +msgid "Display settings" msgstr "" -#: ../../include/selectors.php:85 -msgid "Virgin" +#: ../../include/widgets.php:591 +msgid "Manage locations" msgstr "" -#: ../../include/selectors.php:85 -msgid "Deviant" +#: ../../include/widgets.php:600 +msgid "Export channel" msgstr "" -#: ../../include/selectors.php:85 -msgid "Fetish" +#: ../../include/widgets.php:607 +msgid "Connected apps" msgstr "" -#: ../../include/selectors.php:85 -msgid "Oodles" +#: ../../include/widgets.php:631 +msgid "Premium Channel Settings" msgstr "" -#: ../../include/selectors.php:85 -msgid "Nonsexual" +#: ../../include/widgets.php:660 +msgid "Private Mail Menu" msgstr "" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 -msgid "Single" +#: ../../include/widgets.php:662 +msgid "Combined View" msgstr "" -#: ../../include/selectors.php:123 -msgid "Lonely" +#: ../../include/widgets.php:667 ../../include/nav.php:200 +msgid "Inbox" msgstr "" -#: ../../include/selectors.php:123 -msgid "Available" +#: ../../include/widgets.php:672 ../../include/nav.php:201 +msgid "Outbox" msgstr "" -#: ../../include/selectors.php:123 -msgid "Unavailable" +#: ../../include/widgets.php:677 ../../include/nav.php:202 +msgid "New Message" msgstr "" -#: ../../include/selectors.php:123 -msgid "Has crush" +#: ../../include/widgets.php:694 ../../include/widgets.php:706 +msgid "Conversations" msgstr "" -#: ../../include/selectors.php:123 -msgid "Infatuated" +#: ../../include/widgets.php:698 +msgid "Received Messages" msgstr "" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 -msgid "Dating" +#: ../../include/widgets.php:702 +msgid "Sent Messages" msgstr "" -#: ../../include/selectors.php:123 -msgid "Unfaithful" +#: ../../include/widgets.php:716 +msgid "No messages." msgstr "" -#: ../../include/selectors.php:123 -msgid "Sex Addict" +#: ../../include/widgets.php:734 +msgid "Delete conversation" msgstr "" -#: ../../include/selectors.php:123 -msgid "Friends/Benefits" +#: ../../include/widgets.php:760 +msgid "Events Tools" msgstr "" -#: ../../include/selectors.php:123 -msgid "Casual" +#: ../../include/widgets.php:761 +msgid "Export Calendar" msgstr "" -#: ../../include/selectors.php:123 -msgid "Engaged" +#: ../../include/widgets.php:762 +msgid "Import Calendar" msgstr "" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 -msgid "Married" +#: ../../include/widgets.php:850 ../../include/conversation.php:1695 +#: ../../include/conversation.php:1698 +msgid "Chatrooms" msgstr "" -#: ../../include/selectors.php:123 -msgid "Imaginarily married" +#: ../../include/widgets.php:854 +msgid "Overview" msgstr "" -#: ../../include/selectors.php:123 -msgid "Partners" +#: ../../include/widgets.php:861 +msgid "Chat Members" msgstr "" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 -msgid "Cohabiting" +#: ../../include/widgets.php:883 +msgid "Wiki List" msgstr "" -#: ../../include/selectors.php:123 -msgid "Common law" +#: ../../include/widgets.php:921 +msgid "Wiki Pages" msgstr "" -#: ../../include/selectors.php:123 -msgid "Happy" +#: ../../include/widgets.php:956 +msgid "Bookmarked Chatrooms" msgstr "" -#: ../../include/selectors.php:123 -msgid "Not looking" +#: ../../include/widgets.php:979 +msgid "Suggested Chatrooms" msgstr "" -#: ../../include/selectors.php:123 -msgid "Swinger" +#: ../../include/widgets.php:1125 ../../include/widgets.php:1237 +msgid "photo/image" msgstr "" -#: ../../include/selectors.php:123 -msgid "Betrayed" +#: ../../include/widgets.php:1180 +msgid "Click to show more" msgstr "" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 -msgid "Separated" +#: ../../include/widgets.php:1331 +msgid "Rating Tools" msgstr "" -#: ../../include/selectors.php:123 -msgid "Unstable" +#: ../../include/widgets.php:1335 ../../include/widgets.php:1337 +msgid "Rate Me" msgstr "" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 -msgid "Divorced" +#: ../../include/widgets.php:1340 +msgid "View Ratings" msgstr "" -#: ../../include/selectors.php:123 -msgid "Imaginarily divorced" +#: ../../include/widgets.php:1424 +msgid "Forums" msgstr "" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 -msgid "Widowed" +#: ../../include/widgets.php:1453 +msgid "Tasks" msgstr "" -#: ../../include/selectors.php:123 -msgid "Uncertain" +#: ../../include/widgets.php:1462 +msgid "Documentation" msgstr "" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 -msgid "It's complicated" +#: ../../include/widgets.php:1464 +msgid "Project/Site Information" msgstr "" -#: ../../include/selectors.php:123 -msgid "Don't care" +#: ../../include/widgets.php:1465 +msgid "For Members" msgstr "" -#: ../../include/selectors.php:123 -msgid "Ask me" +#: ../../include/widgets.php:1466 +msgid "For Administrators" msgstr "" -#: ../../include/follow.php:27 -msgid "Channel is blocked on this site." +#: ../../include/widgets.php:1467 +msgid "For Developers" msgstr "" -#: ../../include/follow.php:32 -msgid "Channel location missing." +#: ../../include/widgets.php:1491 ../../include/widgets.php:1529 +msgid "Member registrations waiting for confirmation" msgstr "" -#: ../../include/follow.php:80 -msgid "Response from remote channel was incomplete." +#: ../../include/widgets.php:1497 +msgid "Inspect queue" msgstr "" -#: ../../include/follow.php:97 -msgid "Channel was deleted and no longer exists." +#: ../../include/widgets.php:1499 +msgid "DB updates" msgstr "" -#: ../../include/follow.php:147 ../../include/follow.php:183 -msgid "Protocol disabled." +#: ../../include/widgets.php:1524 ../../include/nav.php:220 +msgid "Admin" msgstr "" -#: ../../include/follow.php:171 -msgid "Channel discovery failed." +#: ../../include/widgets.php:1525 +msgid "Plugin Features" msgstr "" -#: ../../include/follow.php:210 -msgid "Cannot connect to yourself." +#: ../../include/connections.php:95 +msgid "New window" msgstr "" -#: ../../include/text.php:404 -msgid "prev" +#: ../../include/connections.php:96 +msgid "Open the selected location in a different window or browser tab" msgstr "" -#: ../../include/text.php:406 -msgid "first" +#: ../../include/connections.php:214 +#, php-format +msgid "User '%s' deleted" msgstr "" -#: ../../include/text.php:435 -msgid "last" +#: ../../include/acl_selectors.php:169 +msgid "Who can see this?" msgstr "" -#: ../../include/text.php:438 -msgid "next" +#: ../../include/acl_selectors.php:170 +msgid "Custom selection" msgstr "" -#: ../../include/text.php:448 -msgid "older" +#: ../../include/acl_selectors.php:171 +msgid "" +"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit " +"the scope of \"Show\"." msgstr "" -#: ../../include/text.php:450 -msgid "newer" +#: ../../include/acl_selectors.php:172 +msgid "Show" msgstr "" -#: ../../include/text.php:843 -msgid "No connections" +#: ../../include/acl_selectors.php:173 +msgid "Don't show" msgstr "" -#: ../../include/text.php:868 +#: ../../include/acl_selectors.php:207 #, php-format -msgid "View all %s connections" +msgid "" +"Post permissions %s cannot be changed %s after a post is shared.</br />These " +"permissions set who is allowed to view the post." msgstr "" -#: ../../include/text.php:1013 ../../include/text.php:1018 -msgid "poke" +#: ../../include/api.php:1330 +msgid "Public Timeline" msgstr "" -#: ../../include/text.php:1013 ../../include/text.php:1018 -#: ../../include/conversation.php:243 -msgid "poked" +#: ../../include/channel.php:33 +msgid "Unable to obtain identity information from database" msgstr "" -#: ../../include/text.php:1019 -msgid "ping" +#: ../../include/channel.php:67 +msgid "Empty name" msgstr "" -#: ../../include/text.php:1019 -msgid "pinged" +#: ../../include/channel.php:70 +msgid "Name too long" msgstr "" -#: ../../include/text.php:1020 -msgid "prod" +#: ../../include/channel.php:181 +msgid "No account identifier" msgstr "" -#: ../../include/text.php:1020 -msgid "prodded" +#: ../../include/channel.php:193 +msgid "Nickname is required." msgstr "" -#: ../../include/text.php:1021 -msgid "slap" +#: ../../include/channel.php:207 +msgid "Reserved nickname. Please choose another." msgstr "" -#: ../../include/text.php:1021 -msgid "slapped" +#: ../../include/channel.php:212 +msgid "" +"Nickname has unsupported characters or is already being used on this site." msgstr "" -#: ../../include/text.php:1022 -msgid "finger" +#: ../../include/channel.php:272 +msgid "Unable to retrieve created identity" msgstr "" -#: ../../include/text.php:1022 -msgid "fingered" +#: ../../include/channel.php:341 +msgid "Default Profile" msgstr "" -#: ../../include/text.php:1023 -msgid "rebuff" +#: ../../include/channel.php:813 +msgid "Requested channel is not available." msgstr "" -#: ../../include/text.php:1023 -msgid "rebuffed" +#: ../../include/channel.php:960 +msgid "Create New Profile" msgstr "" -#: ../../include/text.php:1035 -msgid "happy" +#: ../../include/channel.php:963 ../../include/nav.php:92 +msgid "Edit Profile" msgstr "" -#: ../../include/text.php:1036 -msgid "sad" +#: ../../include/channel.php:980 +msgid "Visible to everybody" msgstr "" -#: ../../include/text.php:1037 -msgid "mellow" +#: ../../include/channel.php:1053 ../../include/channel.php:1166 +msgid "Gender:" msgstr "" -#: ../../include/text.php:1038 -msgid "tired" +#: ../../include/channel.php:1054 ../../include/channel.php:1210 +msgid "Status:" msgstr "" -#: ../../include/text.php:1039 -msgid "perky" +#: ../../include/channel.php:1055 ../../include/channel.php:1221 +msgid "Homepage:" msgstr "" -#: ../../include/text.php:1040 -msgid "angry" +#: ../../include/channel.php:1056 +msgid "Online Now" msgstr "" -#: ../../include/text.php:1041 -msgid "stupefied" +#: ../../include/channel.php:1171 +msgid "Like this channel" msgstr "" -#: ../../include/text.php:1042 -msgid "puzzled" +#: ../../include/channel.php:1195 +msgid "j F, Y" msgstr "" -#: ../../include/text.php:1043 -msgid "interested" +#: ../../include/channel.php:1196 +msgid "j F" msgstr "" -#: ../../include/text.php:1044 -msgid "bitter" +#: ../../include/channel.php:1203 +msgid "Birthday:" msgstr "" -#: ../../include/text.php:1045 -msgid "cheerful" +#: ../../include/channel.php:1216 +#, php-format +msgid "for %1$d %2$s" msgstr "" -#: ../../include/text.php:1046 -msgid "alive" +#: ../../include/channel.php:1219 +msgid "Sexual Preference:" msgstr "" -#: ../../include/text.php:1047 -msgid "annoyed" +#: ../../include/channel.php:1225 +msgid "Tags:" msgstr "" -#: ../../include/text.php:1048 -msgid "anxious" +#: ../../include/channel.php:1227 +msgid "Political Views:" msgstr "" -#: ../../include/text.php:1049 -msgid "cranky" +#: ../../include/channel.php:1229 +msgid "Religion:" msgstr "" -#: ../../include/text.php:1050 -msgid "disturbed" +#: ../../include/channel.php:1233 +msgid "Hobbies/Interests:" msgstr "" -#: ../../include/text.php:1051 -msgid "frustrated" +#: ../../include/channel.php:1235 +msgid "Likes:" msgstr "" -#: ../../include/text.php:1052 -msgid "depressed" +#: ../../include/channel.php:1237 +msgid "Dislikes:" msgstr "" -#: ../../include/text.php:1053 -msgid "motivated" +#: ../../include/channel.php:1239 +msgid "Contact information and Social Networks:" msgstr "" -#: ../../include/text.php:1054 -msgid "relaxed" +#: ../../include/channel.php:1241 +msgid "My other channels:" msgstr "" -#: ../../include/text.php:1055 -msgid "surprised" +#: ../../include/channel.php:1243 +msgid "Musical interests:" msgstr "" -#: ../../include/text.php:1239 ../../include/js_strings.php:70 -msgid "Monday" +#: ../../include/channel.php:1245 +msgid "Books, literature:" msgstr "" -#: ../../include/text.php:1239 ../../include/js_strings.php:71 -msgid "Tuesday" +#: ../../include/channel.php:1247 +msgid "Television:" msgstr "" -#: ../../include/text.php:1239 ../../include/js_strings.php:72 -msgid "Wednesday" +#: ../../include/channel.php:1249 +msgid "Film/dance/culture/entertainment:" msgstr "" -#: ../../include/text.php:1239 ../../include/js_strings.php:73 -msgid "Thursday" +#: ../../include/channel.php:1251 +msgid "Love/Romance:" msgstr "" -#: ../../include/text.php:1239 ../../include/js_strings.php:74 -msgid "Friday" +#: ../../include/channel.php:1253 +msgid "Work/employment:" msgstr "" -#: ../../include/text.php:1239 ../../include/js_strings.php:75 -msgid "Saturday" +#: ../../include/channel.php:1255 +msgid "School/education:" msgstr "" -#: ../../include/text.php:1239 ../../include/js_strings.php:69 -msgid "Sunday" +#: ../../include/channel.php:1276 +msgid "Like this thing" msgstr "" -#: ../../include/text.php:1243 ../../include/js_strings.php:45 -msgid "January" +#: ../../include/datetime.php:135 +msgid "Birthday" msgstr "" -#: ../../include/text.php:1243 ../../include/js_strings.php:46 -msgid "February" +#: ../../include/datetime.php:137 +msgid "Age: " msgstr "" -#: ../../include/text.php:1243 ../../include/js_strings.php:47 -msgid "March" +#: ../../include/datetime.php:139 +msgid "YYYY-MM-DD or MM-DD" msgstr "" -#: ../../include/text.php:1243 ../../include/js_strings.php:48 -msgid "April" +#: ../../include/datetime.php:272 ../../boot.php:2577 +msgid "never" msgstr "" -#: ../../include/text.php:1243 -msgid "May" +#: ../../include/datetime.php:278 +msgid "less than a second ago" msgstr "" -#: ../../include/text.php:1243 ../../include/js_strings.php:50 -msgid "June" +#: ../../include/datetime.php:296 +#, php-format +msgctxt "e.g. 22 hours ago, 1 minute ago" +msgid "%1$d %2$s ago" msgstr "" -#: ../../include/text.php:1243 ../../include/js_strings.php:51 -msgid "July" +#: ../../include/datetime.php:307 +msgctxt "relative_date" +msgid "year" +msgid_plural "years" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/datetime.php:310 +msgctxt "relative_date" +msgid "month" +msgid_plural "months" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/datetime.php:313 +msgctxt "relative_date" +msgid "week" +msgid_plural "weeks" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/datetime.php:316 +msgctxt "relative_date" +msgid "day" +msgid_plural "days" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/datetime.php:319 +msgctxt "relative_date" +msgid "hour" +msgid_plural "hours" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/datetime.php:322 +msgctxt "relative_date" +msgid "minute" +msgid_plural "minutes" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/datetime.php:325 +msgctxt "relative_date" +msgid "second" +msgid_plural "seconds" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/datetime.php:562 +#, php-format +msgid "%1$s's birthday" msgstr "" -#: ../../include/text.php:1243 ../../include/js_strings.php:52 -msgid "August" +#: ../../include/datetime.php:563 +#, php-format +msgid "Happy Birthday %1$s" msgstr "" -#: ../../include/text.php:1243 ../../include/js_strings.php:53 -msgid "September" +#: ../../include/selectors.php:30 +msgid "Frequently" msgstr "" -#: ../../include/text.php:1243 ../../include/js_strings.php:54 -msgid "October" +#: ../../include/selectors.php:31 +msgid "Hourly" msgstr "" -#: ../../include/text.php:1243 ../../include/js_strings.php:55 -msgid "November" +#: ../../include/selectors.php:32 +msgid "Twice daily" msgstr "" -#: ../../include/text.php:1243 ../../include/js_strings.php:56 -msgid "December" +#: ../../include/selectors.php:33 +msgid "Daily" msgstr "" -#: ../../include/text.php:1320 ../../include/text.php:1324 -msgid "Unknown Attachment" +#: ../../include/selectors.php:34 +msgid "Weekly" msgstr "" -#: ../../include/text.php:1326 -msgid "unknown" +#: ../../include/selectors.php:35 +msgid "Monthly" msgstr "" -#: ../../include/text.php:1362 -msgid "remove category" +#: ../../include/selectors.php:49 ../../include/selectors.php:66 +msgid "Male" msgstr "" -#: ../../include/text.php:1439 -msgid "remove from file" +#: ../../include/selectors.php:49 ../../include/selectors.php:66 +msgid "Female" msgstr "" -#: ../../include/text.php:1738 ../../include/text.php:1809 -msgid "default" +#: ../../include/selectors.php:49 +msgid "Currently Male" msgstr "" -#: ../../include/text.php:1746 -msgid "Page layout" +#: ../../include/selectors.php:49 +msgid "Currently Female" msgstr "" -#: ../../include/text.php:1746 -msgid "You can create your own with the layouts tool" +#: ../../include/selectors.php:49 +msgid "Mostly Male" msgstr "" -#: ../../include/text.php:1788 -msgid "Page content type" +#: ../../include/selectors.php:49 +msgid "Mostly Female" msgstr "" -#: ../../include/text.php:1821 -msgid "Select an alternate language" +#: ../../include/selectors.php:49 +msgid "Transgender" msgstr "" -#: ../../include/text.php:1958 -msgid "activity" +#: ../../include/selectors.php:49 +msgid "Intersex" msgstr "" -#: ../../include/text.php:2259 -msgid "Design Tools" +#: ../../include/selectors.php:49 +msgid "Transsexual" msgstr "" -#: ../../include/text.php:2265 -msgid "Pages" +#: ../../include/selectors.php:49 +msgid "Hermaphrodite" msgstr "" -#: ../../include/text.php:2287 -msgid "Import website..." +#: ../../include/selectors.php:49 +msgid "Neuter" msgstr "" -#: ../../include/text.php:2288 -msgid "Select folder to import" +#: ../../include/selectors.php:49 +msgid "Non-specific" msgstr "" -#: ../../include/text.php:2289 -msgid "Import from a zipped folder:" +#: ../../include/selectors.php:49 +msgid "Undecided" msgstr "" -#: ../../include/text.php:2290 -msgid "Import from cloud files:" +#: ../../include/selectors.php:85 ../../include/selectors.php:104 +msgid "Males" msgstr "" -#: ../../include/text.php:2291 -msgid "/cloud/channel/path/to/folder" +#: ../../include/selectors.php:85 ../../include/selectors.php:104 +msgid "Females" msgstr "" -#: ../../include/text.php:2292 -msgid "Enter path to website files" +#: ../../include/selectors.php:85 +msgid "Gay" msgstr "" -#: ../../include/text.php:2293 -msgid "Select folder" +#: ../../include/selectors.php:85 +msgid "Lesbian" msgstr "" -#: ../../include/nav.php:84 ../../include/nav.php:117 ../../boot.php:1712 -msgid "Logout" +#: ../../include/selectors.php:85 +msgid "No Preference" msgstr "" -#: ../../include/nav.php:84 ../../include/nav.php:117 -msgid "End this session" +#: ../../include/selectors.php:85 +msgid "Bisexual" msgstr "" -#: ../../include/nav.php:87 ../../include/nav.php:148 -msgid "Home" +#: ../../include/selectors.php:85 +msgid "Autosexual" msgstr "" -#: ../../include/nav.php:87 -msgid "Your posts and conversations" +#: ../../include/selectors.php:85 +msgid "Abstinent" msgstr "" -#: ../../include/nav.php:88 -msgid "Your profile page" +#: ../../include/selectors.php:85 +msgid "Virgin" msgstr "" -#: ../../include/nav.php:90 -msgid "Manage/Edit profiles" +#: ../../include/selectors.php:85 +msgid "Deviant" msgstr "" -#: ../../include/nav.php:92 ../../include/channel.php:963 -msgid "Edit Profile" +#: ../../include/selectors.php:85 +msgid "Fetish" msgstr "" -#: ../../include/nav.php:92 -msgid "Edit your profile" +#: ../../include/selectors.php:85 +msgid "Oodles" msgstr "" -#: ../../include/nav.php:94 -msgid "Your photos" +#: ../../include/selectors.php:85 +msgid "Nonsexual" msgstr "" -#: ../../include/nav.php:95 -msgid "Your files" +#: ../../include/selectors.php:123 ../../include/selectors.php:140 +msgid "Single" msgstr "" -#: ../../include/nav.php:98 -msgid "Your chatrooms" +#: ../../include/selectors.php:123 +msgid "Lonely" msgstr "" -#: ../../include/nav.php:104 ../../include/conversation.php:1695 -msgid "Bookmarks" +#: ../../include/selectors.php:123 +msgid "Available" msgstr "" -#: ../../include/nav.php:104 -msgid "Your bookmarks" +#: ../../include/selectors.php:123 +msgid "Unavailable" msgstr "" -#: ../../include/nav.php:108 -msgid "Your webpages" +#: ../../include/selectors.php:123 +msgid "Has crush" msgstr "" -#: ../../include/nav.php:110 -msgid "Your wiki" +#: ../../include/selectors.php:123 +msgid "Infatuated" msgstr "" -#: ../../include/nav.php:114 -msgid "Sign in" +#: ../../include/selectors.php:123 ../../include/selectors.php:140 +msgid "Dating" msgstr "" -#: ../../include/nav.php:131 -#, php-format -msgid "%s - click to logout" +#: ../../include/selectors.php:123 +msgid "Unfaithful" msgstr "" -#: ../../include/nav.php:134 -msgid "Remote authentication" +#: ../../include/selectors.php:123 +msgid "Sex Addict" msgstr "" -#: ../../include/nav.php:134 -msgid "Click to authenticate to your home hub" +#: ../../include/selectors.php:123 +msgid "Friends/Benefits" msgstr "" -#: ../../include/nav.php:148 -msgid "Home Page" +#: ../../include/selectors.php:123 +msgid "Casual" msgstr "" -#: ../../include/nav.php:151 -msgid "Create an account" +#: ../../include/selectors.php:123 +msgid "Engaged" msgstr "" -#: ../../include/nav.php:163 -msgid "Help and documentation" +#: ../../include/selectors.php:123 ../../include/selectors.php:140 +msgid "Married" msgstr "" -#: ../../include/nav.php:167 -msgid "Applications, utilities, links, games" +#: ../../include/selectors.php:123 +msgid "Imaginarily married" msgstr "" -#: ../../include/nav.php:169 -msgid "Search site @name, #tag, ?docs, content" +#: ../../include/selectors.php:123 +msgid "Partners" msgstr "" -#: ../../include/nav.php:171 -msgid "Channel Directory" +#: ../../include/selectors.php:123 ../../include/selectors.php:140 +msgid "Cohabiting" msgstr "" -#: ../../include/nav.php:183 -msgid "Your grid" +#: ../../include/selectors.php:123 +msgid "Common law" msgstr "" -#: ../../include/nav.php:184 -msgid "Mark all grid notifications seen" +#: ../../include/selectors.php:123 +msgid "Happy" msgstr "" -#: ../../include/nav.php:186 -msgid "Channel home" +#: ../../include/selectors.php:123 +msgid "Not looking" msgstr "" -#: ../../include/nav.php:187 -msgid "Mark all channel notifications seen" +#: ../../include/selectors.php:123 +msgid "Swinger" msgstr "" -#: ../../include/nav.php:193 -msgid "Notices" +#: ../../include/selectors.php:123 +msgid "Betrayed" msgstr "" -#: ../../include/nav.php:193 -msgid "Notifications" +#: ../../include/selectors.php:123 ../../include/selectors.php:140 +msgid "Separated" msgstr "" -#: ../../include/nav.php:194 -msgid "See all notifications" +#: ../../include/selectors.php:123 +msgid "Unstable" msgstr "" -#: ../../include/nav.php:197 -msgid "Private mail" +#: ../../include/selectors.php:123 ../../include/selectors.php:140 +msgid "Divorced" msgstr "" -#: ../../include/nav.php:198 -msgid "See all private messages" +#: ../../include/selectors.php:123 +msgid "Imaginarily divorced" msgstr "" -#: ../../include/nav.php:199 -msgid "Mark all private messages seen" +#: ../../include/selectors.php:123 ../../include/selectors.php:140 +msgid "Widowed" msgstr "" -#: ../../include/nav.php:200 ../../include/widgets.php:667 -msgid "Inbox" +#: ../../include/selectors.php:123 +msgid "Uncertain" msgstr "" -#: ../../include/nav.php:201 ../../include/widgets.php:672 -msgid "Outbox" +#: ../../include/selectors.php:123 ../../include/selectors.php:140 +msgid "It's complicated" msgstr "" -#: ../../include/nav.php:202 ../../include/widgets.php:677 -msgid "New Message" +#: ../../include/selectors.php:123 +msgid "Don't care" msgstr "" -#: ../../include/nav.php:205 -msgid "Event Calendar" +#: ../../include/selectors.php:123 +msgid "Ask me" msgstr "" -#: ../../include/nav.php:206 -msgid "See all events" +#: ../../include/photos.php:114 +#, php-format +msgid "Image exceeds website size limit of %lu bytes" msgstr "" -#: ../../include/nav.php:207 -msgid "Mark all events seen" +#: ../../include/photos.php:121 +msgid "Image file is empty." msgstr "" -#: ../../include/nav.php:210 -msgid "Manage Your Channels" +#: ../../include/photos.php:259 +msgid "Photo storage failed." msgstr "" -#: ../../include/nav.php:212 -msgid "Account/Channel Settings" +#: ../../include/photos.php:299 +msgid "a new photo" msgstr "" -#: ../../include/nav.php:220 ../../include/widgets.php:1524 -msgid "Admin" +#: ../../include/photos.php:303 +#, php-format +msgctxt "photo_upload" +msgid "%1$s posted %2$s to %3$s" msgstr "" -#: ../../include/nav.php:220 -msgid "Site Setup and Configuration" +#: ../../include/photos.php:506 ../../include/conversation.php:1668 +msgid "Photo Albums" msgstr "" -#: ../../include/nav.php:251 ../../include/conversation.php:855 -msgid "Loading..." +#: ../../include/photos.php:510 +msgid "Upload New Photos" msgstr "" -#: ../../include/nav.php:256 -msgid "@name, #tag, ?doc, content" +#: ../../include/security.php:109 +msgid "guest:" msgstr "" -#: ../../include/nav.php:257 -msgid "Please wait..." +#: ../../include/security.php:527 +msgid "" +"The form security token was not correct. This probably happened because the " +"form has been opened for too long (>3 hours) before submitting it." msgstr "" -#: ../../include/bookmarks.php:35 +#: ../../include/conversation.php:204 #, php-format -msgid "%1$s's bookmarks" +msgid "%1$s is now connected with %2$s" msgstr "" -#: ../../include/event.php:22 ../../include/event.php:69 -#: ../../include/bb2diaspora.php:485 -msgid "l F d, Y \\@ g:i A" +#: ../../include/conversation.php:239 +#, php-format +msgid "%1$s poked %2$s" msgstr "" -#: ../../include/event.php:30 ../../include/event.php:73 -#: ../../include/bb2diaspora.php:491 -msgid "Starts:" +#: ../../include/conversation.php:694 +#, php-format +msgid "View %s's profile @ %s" msgstr "" -#: ../../include/event.php:40 ../../include/event.php:77 -#: ../../include/bb2diaspora.php:499 -msgid "Finishes:" +#: ../../include/conversation.php:713 +msgid "Categories:" msgstr "" -#: ../../include/event.php:814 -msgid "This event has been added to your calendar." +#: ../../include/conversation.php:714 +msgid "Filed under:" msgstr "" -#: ../../include/event.php:1014 -msgid "Not specified" +#: ../../include/conversation.php:741 +msgid "View in context" msgstr "" -#: ../../include/event.php:1015 -msgid "Needs Action" +#: ../../include/conversation.php:851 +msgid "remove" msgstr "" -#: ../../include/event.php:1016 -msgid "Completed" +#: ../../include/conversation.php:855 ../../include/nav.php:251 +msgid "Loading..." msgstr "" -#: ../../include/event.php:1017 -msgid "In Process" +#: ../../include/conversation.php:856 +msgid "Delete Selected Items" msgstr "" -#: ../../include/event.php:1018 -msgid "Cancelled" +#: ../../include/conversation.php:949 +msgid "View Source" msgstr "" -#: ../../include/group.php:26 -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/conversation.php:950 +msgid "Follow Thread" msgstr "" -#: ../../include/group.php:248 -msgid "Add new connections to this privacy group" +#: ../../include/conversation.php:951 +msgid "Unfollow Thread" msgstr "" -#: ../../include/group.php:289 -msgid "edit" +#: ../../include/conversation.php:956 +msgid "Activity/Posts" msgstr "" -#: ../../include/group.php:312 -msgid "Edit group" +#: ../../include/conversation.php:958 +msgid "Edit Connection" msgstr "" -#: ../../include/group.php:313 -msgid "Add privacy group" +#: ../../include/conversation.php:959 +msgid "Message" msgstr "" -#: ../../include/group.php:314 -msgid "Channels not in any privacy group" +#: ../../include/conversation.php:1076 +#, php-format +msgid "%s likes this." msgstr "" -#: ../../include/group.php:316 ../../include/widgets.php:282 -msgid "add" +#: ../../include/conversation.php:1076 +#, php-format +msgid "%s doesn't like this." msgstr "" -#: ../../include/page_widgets.php:7 -msgid "New Page" +#: ../../include/conversation.php:1080 +#, 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:1082 +#, 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:1088 +msgid "and" msgstr "" -#: ../../include/page_widgets.php:46 -msgid "Title" +#: ../../include/conversation.php:1091 +#, php-format +msgid ", and %d other people" +msgid_plural ", and %d other people" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1092 +#, php-format +msgid "%s like this." msgstr "" -#: ../../include/channel.php:33 -msgid "Unable to obtain identity information from database" +#: ../../include/conversation.php:1092 +#, php-format +msgid "%s don't like this." msgstr "" -#: ../../include/channel.php:67 -msgid "Empty name" +#: ../../include/conversation.php:1135 +msgid "Set your location" msgstr "" -#: ../../include/channel.php:70 -msgid "Name too long" +#: ../../include/conversation.php:1136 +msgid "Clear browser location" msgstr "" -#: ../../include/channel.php:181 -msgid "No account identifier" +#: ../../include/conversation.php:1184 +msgid "Tag term:" msgstr "" -#: ../../include/channel.php:193 -msgid "Nickname is required." +#: ../../include/conversation.php:1185 +msgid "Where are you right now?" msgstr "" -#: ../../include/channel.php:207 -msgid "Reserved nickname. Please choose another." +#: ../../include/conversation.php:1194 +msgid "Comments enabled" msgstr "" -#: ../../include/channel.php:212 -msgid "" -"Nickname has unsupported characters or is already being used on this site." +#: ../../include/conversation.php:1195 +msgid "Comments disabled" msgstr "" -#: ../../include/channel.php:272 -msgid "Unable to retrieve created identity" +#: ../../include/conversation.php:1229 +msgid "Page link name" msgstr "" -#: ../../include/channel.php:341 -msgid "Default Profile" +#: ../../include/conversation.php:1232 +msgid "Post as" msgstr "" -#: ../../include/channel.php:813 -msgid "Requested channel is not available." +#: ../../include/conversation.php:1246 +msgid "Toggle voting" msgstr "" -#: ../../include/channel.php:960 -msgid "Create New Profile" +#: ../../include/conversation.php:1249 +msgid "Disable comments" msgstr "" -#: ../../include/channel.php:980 -msgid "Visible to everybody" +#: ../../include/conversation.php:1250 +msgid "Toggle comments" msgstr "" -#: ../../include/channel.php:1053 ../../include/channel.php:1166 -msgid "Gender:" +#: ../../include/conversation.php:1258 +msgid "Categories (optional, comma-separated list)" msgstr "" -#: ../../include/channel.php:1054 ../../include/channel.php:1210 -msgid "Status:" +#: ../../include/conversation.php:1281 +msgid "Other networks and post services" msgstr "" -#: ../../include/channel.php:1055 ../../include/channel.php:1221 -msgid "Homepage:" +#: ../../include/conversation.php:1287 +msgid "Set publish date" msgstr "" -#: ../../include/channel.php:1056 -msgid "Online Now" +#: ../../include/conversation.php:1536 +msgid "Discover" msgstr "" -#: ../../include/channel.php:1171 -msgid "Like this channel" +#: ../../include/conversation.php:1539 +msgid "Imported public streams" msgstr "" -#: ../../include/channel.php:1195 -msgid "j F, Y" +#: ../../include/conversation.php:1544 +msgid "Commented Order" msgstr "" -#: ../../include/channel.php:1196 -msgid "j F" +#: ../../include/conversation.php:1547 +msgid "Sort by Comment Date" msgstr "" -#: ../../include/channel.php:1203 -msgid "Birthday:" +#: ../../include/conversation.php:1551 +msgid "Posted Order" msgstr "" -#: ../../include/channel.php:1216 -#, php-format -msgid "for %1$d %2$s" +#: ../../include/conversation.php:1554 +msgid "Sort by Post Date" msgstr "" -#: ../../include/channel.php:1219 -msgid "Sexual Preference:" +#: ../../include/conversation.php:1562 +msgid "Posts that mention or involve you" msgstr "" -#: ../../include/channel.php:1225 -msgid "Tags:" +#: ../../include/conversation.php:1571 +msgid "Activity Stream - by date" msgstr "" -#: ../../include/channel.php:1227 -msgid "Political Views:" +#: ../../include/conversation.php:1577 +msgid "Starred" msgstr "" -#: ../../include/channel.php:1229 -msgid "Religion:" +#: ../../include/conversation.php:1580 +msgid "Favourite Posts" msgstr "" -#: ../../include/channel.php:1233 -msgid "Hobbies/Interests:" +#: ../../include/conversation.php:1587 +msgid "Spam" msgstr "" -#: ../../include/channel.php:1235 -msgid "Likes:" +#: ../../include/conversation.php:1590 +msgid "Posts flagged as SPAM" msgstr "" -#: ../../include/channel.php:1237 -msgid "Dislikes:" +#: ../../include/conversation.php:1647 +msgid "Status Messages and Posts" msgstr "" -#: ../../include/channel.php:1239 -msgid "Contact information and Social Networks:" +#: ../../include/conversation.php:1656 +msgid "About" msgstr "" -#: ../../include/channel.php:1241 -msgid "My other channels:" +#: ../../include/conversation.php:1659 +msgid "Profile Details" msgstr "" -#: ../../include/channel.php:1243 -msgid "Musical interests:" +#: ../../include/conversation.php:1675 +msgid "Files and Storage" msgstr "" -#: ../../include/channel.php:1245 -msgid "Books, literature:" +#: ../../include/conversation.php:1708 ../../include/nav.php:104 +msgid "Bookmarks" msgstr "" -#: ../../include/channel.php:1247 -msgid "Television:" +#: ../../include/conversation.php:1711 +msgid "Saved Bookmarks" msgstr "" -#: ../../include/channel.php:1249 -msgid "Film/dance/culture/entertainment:" +#: ../../include/conversation.php:1721 +msgid "Manage Webpages" msgstr "" -#: ../../include/channel.php:1251 -msgid "Love/Romance:" +#: ../../include/conversation.php:1786 +msgctxt "noun" +msgid "Attending" +msgid_plural "Attending" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1789 +msgctxt "noun" +msgid "Not Attending" +msgid_plural "Not Attending" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1792 +msgctxt "noun" +msgid "Undecided" +msgid_plural "Undecided" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1795 +msgctxt "noun" +msgid "Agree" +msgid_plural "Agrees" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1798 +msgctxt "noun" +msgid "Disagree" +msgid_plural "Disagrees" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1801 +msgctxt "noun" +msgid "Abstain" +msgid_plural "Abstains" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/bookmarks.php:35 +#, php-format +msgid "%1$s's bookmarks" msgstr "" -#: ../../include/channel.php:1253 -msgid "Work/employment:" +#: ../../include/group.php:26 +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 "" -#: ../../include/channel.php:1255 -msgid "School/education:" +#: ../../include/group.php:248 +msgid "Add new connections to this privacy group" msgstr "" -#: ../../include/channel.php:1276 -msgid "Like this thing" +#: ../../include/group.php:289 +msgid "edit" msgstr "" -#: ../../include/network.php:704 -msgid "view full size" +#: ../../include/group.php:311 ../../include/features.php:84 +msgid "Privacy Groups" msgstr "" -#: ../../include/network.php:1935 ../../include/account.php:317 -#: ../../include/account.php:344 ../../include/account.php:404 -msgid "Administrator" +#: ../../include/group.php:312 +msgid "Edit group" msgstr "" -#: ../../include/network.php:1949 -msgid "No Subject" +#: ../../include/group.php:313 +msgid "Add privacy group" msgstr "" -#: ../../include/network.php:2203 ../../include/network.php:2204 -msgid "Friendica" +#: ../../include/group.php:314 +msgid "Channels not in any privacy group" msgstr "" -#: ../../include/network.php:2205 -msgid "OStatus" +#: ../../include/page_widgets.php:7 +msgid "New Page" msgstr "" -#: ../../include/network.php:2206 -msgid "GNU-Social" +#: ../../include/page_widgets.php:46 +msgid "Title" msgstr "" -#: ../../include/network.php:2207 -msgid "RSS/Atom" +#: ../../include/wiki.php:525 ../../include/bbcode.php:619 +msgid "Different viewers will see this text differently" msgstr "" -#: ../../include/network.php:2209 -msgid "Diaspora" +#: ../../include/event.php:22 ../../include/event.php:69 +#: ../../include/bb2diaspora.php:485 +msgid "l F d, Y \\@ g:i A" msgstr "" -#: ../../include/network.php:2210 -msgid "Facebook" +#: ../../include/event.php:30 ../../include/event.php:73 +#: ../../include/bb2diaspora.php:491 +msgid "Starts:" msgstr "" -#: ../../include/network.php:2211 -msgid "Zot" +#: ../../include/event.php:40 ../../include/event.php:77 +#: ../../include/bb2diaspora.php:499 +msgid "Finishes:" msgstr "" -#: ../../include/network.php:2212 -msgid "LinkedIn" +#: ../../include/event.php:821 +msgid "This event has been added to your calendar." msgstr "" -#: ../../include/network.php:2213 -msgid "XMPP/IM" +#: ../../include/event.php:1021 +msgid "Not specified" msgstr "" -#: ../../include/network.php:2214 -msgid "MySpace" +#: ../../include/event.php:1022 +msgid "Needs Action" +msgstr "" + +#: ../../include/event.php:1023 +msgid "Completed" +msgstr "" + +#: ../../include/event.php:1024 +msgid "In Process" +msgstr "" + +#: ../../include/event.php:1025 +msgid "Cancelled" msgstr "" #: ../../include/bb2diaspora.php:398 @@ -8896,1107 +9011,1016 @@ msgctxt "calendar" msgid "All day" msgstr "" -#: ../../include/security.php:109 -msgid "guest:" +#: ../../include/follow.php:27 +msgid "Channel is blocked on this site." msgstr "" -#: ../../include/security.php:527 -msgid "" -"The form security token was not correct. This probably happened because the " -"form has been opened for too long (>3 hours) before submitting it." +#: ../../include/follow.php:32 +msgid "Channel location missing." msgstr "" -#: ../../include/account.php:28 -msgid "Not a valid email address" +#: ../../include/follow.php:80 +msgid "Response from remote channel was incomplete." msgstr "" -#: ../../include/account.php:30 -msgid "Your email domain is not among those allowed on this site" +#: ../../include/follow.php:97 +msgid "Channel was deleted and no longer exists." msgstr "" -#: ../../include/account.php:36 -msgid "Your email address is already registered at this site." +#: ../../include/follow.php:147 ../../include/follow.php:183 +msgid "Protocol disabled." msgstr "" -#: ../../include/account.php:68 -msgid "An invitation is required." +#: ../../include/follow.php:171 +msgid "Channel discovery failed." msgstr "" -#: ../../include/account.php:72 -msgid "Invitation could not be verified." +#: ../../include/follow.php:210 +msgid "Cannot connect to yourself." msgstr "" -#: ../../include/account.php:122 -msgid "Please enter the required information." +#: ../../include/attach.php:248 ../../include/attach.php:334 +msgid "Item was not found." msgstr "" -#: ../../include/account.php:189 -msgid "Failed to store account information." +#: ../../include/attach.php:500 +msgid "No source file." msgstr "" -#: ../../include/account.php:249 -#, php-format -msgid "Registration confirmation for %s" +#: ../../include/attach.php:522 +msgid "Cannot locate file to replace" msgstr "" -#: ../../include/account.php:315 -#, php-format -msgid "Registration request at %s" +#: ../../include/attach.php:540 +msgid "Cannot locate file to revise/update" msgstr "" -#: ../../include/account.php:339 -msgid "your registration password" +#: ../../include/attach.php:675 +#, php-format +msgid "File exceeds size limit of %d" msgstr "" -#: ../../include/account.php:342 ../../include/account.php:402 +#: ../../include/attach.php:689 #, php-format -msgid "Registration details for %s" +msgid "You have reached your limit of %1$.0f Mbytes attachment storage." msgstr "" -#: ../../include/account.php:414 -msgid "Account approved." +#: ../../include/attach.php:847 +msgid "File upload failed. Possible system limit or action terminated." msgstr "" -#: ../../include/account.php:454 -#, php-format -msgid "Registration revoked for %s" +#: ../../include/attach.php:860 +msgid "Stored file could not be verified. Upload failed." msgstr "" -#: ../../include/account.php:739 ../../include/account.php:741 -msgid "Click here to upgrade." +#: ../../include/attach.php:916 ../../include/attach.php:932 +msgid "Path not available." msgstr "" -#: ../../include/account.php:747 -msgid "This action exceeds the limits set by your subscription plan." +#: ../../include/attach.php:978 ../../include/attach.php:1130 +msgid "Empty pathname" msgstr "" -#: ../../include/account.php:752 -msgid "This action is not available under your subscription plan." +#: ../../include/attach.php:1004 +msgid "duplicate filename or path" msgstr "" -#: ../../include/bbcode.php:123 ../../include/bbcode.php:878 -#: ../../include/bbcode.php:881 ../../include/bbcode.php:886 -#: ../../include/bbcode.php:889 ../../include/bbcode.php:892 -#: ../../include/bbcode.php:895 ../../include/bbcode.php:900 -#: ../../include/bbcode.php:903 ../../include/bbcode.php:908 -#: ../../include/bbcode.php:911 ../../include/bbcode.php:914 -#: ../../include/bbcode.php:917 -msgid "Image/photo" +#: ../../include/attach.php:1026 +msgid "Path not found." msgstr "" -#: ../../include/bbcode.php:162 ../../include/bbcode.php:928 -msgid "Encrypted content" +#: ../../include/attach.php:1084 +msgid "mkdir failed." msgstr "" -#: ../../include/bbcode.php:178 -#, php-format -msgid "Install %s element: " +#: ../../include/attach.php:1088 +msgid "database storage failed." msgstr "" -#: ../../include/bbcode.php:182 -#, php-format -msgid "" -"This post contains an installable %s element, however you lack permissions " -"to install it on this site." +#: ../../include/attach.php:1136 +msgid "Empty path" msgstr "" -#: ../../include/bbcode.php:261 -#, php-format -msgid "%1$s wrote the following %2$s %3$s" +#: ../../include/auth.php:148 +msgid "Logged out." msgstr "" -#: ../../include/bbcode.php:338 ../../include/bbcode.php:346 -msgid "Click to open/close" +#: ../../include/auth.php:275 +msgid "Failed authentication" msgstr "" -#: ../../include/bbcode.php:346 -msgid "spoiler" +#: ../../include/auth.php:286 +msgid "Login failed." msgstr "" -#: ../../include/bbcode.php:619 ../../include/wiki.php:525 -msgid "Different viewers will see this text differently" +#: ../../include/activities.php:41 +msgid " and " msgstr "" -#: ../../include/bbcode.php:866 -msgid "$1 wrote:" +#: ../../include/activities.php:49 +msgid "public profile" msgstr "" -#: ../../include/conversation.php:204 +#: ../../include/activities.php:58 #, php-format -msgid "%1$s is now connected with %2$s" +msgid "%1$s changed %2$s to “%3$s”" msgstr "" -#: ../../include/conversation.php:239 +#: ../../include/activities.php:59 #, php-format -msgid "%1$s poked %2$s" +msgid "Visit %1$s's %2$s" msgstr "" -#: ../../include/conversation.php:694 +#: ../../include/activities.php:62 #, php-format -msgid "View %s's profile @ %s" -msgstr "" - -#: ../../include/conversation.php:713 -msgid "Categories:" -msgstr "" - -#: ../../include/conversation.php:714 -msgid "Filed under:" -msgstr "" - -#: ../../include/conversation.php:741 -msgid "View in context" -msgstr "" - -#: ../../include/conversation.php:851 -msgid "remove" +msgid "%1$s has an updated %2$s, changing %3$s." msgstr "" -#: ../../include/conversation.php:856 -msgid "Delete Selected Items" +#: ../../include/zot.php:700 +msgid "Invalid data packet" msgstr "" -#: ../../include/conversation.php:952 -msgid "View Source" +#: ../../include/zot.php:716 +msgid "Unable to verify channel signature" msgstr "" -#: ../../include/conversation.php:953 -msgid "Follow Thread" +#: ../../include/zot.php:2329 +#, php-format +msgid "Unable to verify site signature for %s" msgstr "" -#: ../../include/conversation.php:954 -msgid "Unfollow Thread" +#: ../../include/zot.php:3706 +msgid "invalid target signature" msgstr "" -#: ../../include/conversation.php:959 -msgid "Activity/Posts" +#: ../../include/features.php:50 +msgid "General Features" msgstr "" -#: ../../include/conversation.php:961 -msgid "Edit Connection" +#: ../../include/features.php:52 +msgid "Content Expiration" msgstr "" -#: ../../include/conversation.php:962 -msgid "Message" +#: ../../include/features.php:52 +msgid "Remove posts/comments and/or private messages at a future time" msgstr "" -#: ../../include/conversation.php:1079 -#, php-format -msgid "%s likes this." +#: ../../include/features.php:53 +msgid "Multiple Profiles" msgstr "" -#: ../../include/conversation.php:1079 -#, php-format -msgid "%s doesn't like this." +#: ../../include/features.php:53 +msgid "Ability to create multiple profiles" msgstr "" -#: ../../include/conversation.php:1083 -#, 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:1085 -#, 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:1091 -msgid "and" +#: ../../include/features.php:54 +msgid "Advanced Profiles" msgstr "" -#: ../../include/conversation.php:1094 -#, php-format -msgid ", and %d other people" -msgid_plural ", and %d other people" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1095 -#, php-format -msgid "%s like this." +#: ../../include/features.php:54 +msgid "Additional profile sections and selections" msgstr "" -#: ../../include/conversation.php:1095 -#, php-format -msgid "%s don't like this." +#: ../../include/features.php:55 +msgid "Profile Import/Export" msgstr "" -#: ../../include/conversation.php:1134 -msgid "Set your location" +#: ../../include/features.php:55 +msgid "Save and load profile details across sites/channels" msgstr "" -#: ../../include/conversation.php:1135 -msgid "Clear browser location" +#: ../../include/features.php:56 +msgid "Web Pages" msgstr "" -#: ../../include/conversation.php:1183 -msgid "Tag term:" +#: ../../include/features.php:56 +msgid "Provide managed web pages on your channel" msgstr "" -#: ../../include/conversation.php:1184 -msgid "Where are you right now?" +#: ../../include/features.php:57 +msgid "Provide a wiki for your channel" msgstr "" -#: ../../include/conversation.php:1222 -msgid "Page link name" +#: ../../include/features.php:59 +msgid "Private Notes" msgstr "" -#: ../../include/conversation.php:1225 -msgid "Post as" +#: ../../include/features.php:59 +msgid "Enables a tool to store notes and reminders (note: not encrypted)" msgstr "" -#: ../../include/conversation.php:1239 -msgid "Toggle voting" +#: ../../include/features.php:60 +msgid "Navigation Channel Select" msgstr "" -#: ../../include/conversation.php:1247 -msgid "Categories (optional, comma-separated list)" +#: ../../include/features.php:60 +msgid "Change channels directly from within the navigation dropdown menu" msgstr "" -#: ../../include/conversation.php:1274 -msgid "Set publish date" +#: ../../include/features.php:61 +msgid "Photo Location" msgstr "" -#: ../../include/conversation.php:1523 -msgid "Discover" +#: ../../include/features.php:61 +msgid "If location data is available on uploaded photos, link this to a map." msgstr "" -#: ../../include/conversation.php:1526 -msgid "Imported public streams" +#: ../../include/features.php:62 +msgid "Access Controlled Chatrooms" msgstr "" -#: ../../include/conversation.php:1531 -msgid "Commented Order" +#: ../../include/features.php:62 +msgid "Provide chatrooms and chat services with access control." msgstr "" -#: ../../include/conversation.php:1534 -msgid "Sort by Comment Date" +#: ../../include/features.php:63 +msgid "Smart Birthdays" msgstr "" -#: ../../include/conversation.php:1538 -msgid "Posted Order" +#: ../../include/features.php:63 +msgid "" +"Make birthday events timezone aware in case your friends are scattered " +"across the planet." msgstr "" -#: ../../include/conversation.php:1541 -msgid "Sort by Post Date" +#: ../../include/features.php:64 +msgid "Expert Mode" msgstr "" -#: ../../include/conversation.php:1549 -msgid "Posts that mention or involve you" +#: ../../include/features.php:64 +msgid "Enable Expert Mode to provide advanced configuration options" msgstr "" -#: ../../include/conversation.php:1558 -msgid "Activity Stream - by date" +#: ../../include/features.php:69 +msgid "Post Composition Features" msgstr "" -#: ../../include/conversation.php:1564 -msgid "Starred" +#: ../../include/features.php:70 +msgid "Large Photos" msgstr "" -#: ../../include/conversation.php:1567 -msgid "Favourite Posts" +#: ../../include/features.php:70 +msgid "" +"Include large (1024px) photo thumbnails in posts. If not enabled, use small " +"(640px) photo thumbnails" msgstr "" -#: ../../include/conversation.php:1574 -msgid "Spam" +#: ../../include/features.php:71 +msgid "Automatically import channel content from other channels or feeds" msgstr "" -#: ../../include/conversation.php:1577 -msgid "Posts flagged as SPAM" +#: ../../include/features.php:72 +msgid "Even More Encryption" msgstr "" -#: ../../include/conversation.php:1634 -msgid "Status Messages and Posts" +#: ../../include/features.php:72 +msgid "" +"Allow optional encryption of content end-to-end with a shared secret key" msgstr "" -#: ../../include/conversation.php:1643 -msgid "About" +#: ../../include/features.php:73 +msgid "Enable Voting Tools" msgstr "" -#: ../../include/conversation.php:1646 -msgid "Profile Details" +#: ../../include/features.php:73 +msgid "Provide a class of post which others can vote on" msgstr "" -#: ../../include/conversation.php:1662 -msgid "Files and Storage" +#: ../../include/features.php:74 +msgid "Disable Comments" msgstr "" -#: ../../include/conversation.php:1682 ../../include/conversation.php:1685 -#: ../../include/widgets.php:850 -msgid "Chatrooms" +#: ../../include/features.php:74 +msgid "Provide the option to disable comments for a post" msgstr "" -#: ../../include/conversation.php:1698 -msgid "Saved Bookmarks" +#: ../../include/features.php:75 +msgid "Delayed Posting" msgstr "" -#: ../../include/conversation.php:1708 -msgid "Manage Webpages" +#: ../../include/features.php:75 +msgid "Allow posts to be published at a later date" msgstr "" -#: ../../include/conversation.php:1773 -msgctxt "noun" -msgid "Attending" -msgid_plural "Attending" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1776 -msgctxt "noun" -msgid "Not Attending" -msgid_plural "Not Attending" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1779 -msgctxt "noun" -msgid "Undecided" -msgid_plural "Undecided" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1782 -msgctxt "noun" -msgid "Agree" -msgid_plural "Agrees" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1785 -msgctxt "noun" -msgid "Disagree" -msgid_plural "Disagrees" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1788 -msgctxt "noun" -msgid "Abstain" -msgid_plural "Abstains" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/oembed.php:340 -msgid "Embedded content" +#: ../../include/features.php:76 +msgid "Suppress Duplicate Posts/Comments" msgstr "" -#: ../../include/oembed.php:349 -msgid "Embedding disabled" +#: ../../include/features.php:76 +msgid "" +"Prevent posts with identical content to be published with less than two " +"minutes in between submissions." msgstr "" -#: ../../include/activities.php:41 -msgid " and " +#: ../../include/features.php:82 +msgid "Network and Stream Filtering" msgstr "" -#: ../../include/activities.php:49 -msgid "public profile" +#: ../../include/features.php:83 +msgid "Search by Date" msgstr "" -#: ../../include/activities.php:58 -#, php-format -msgid "%1$s changed %2$s to “%3$s”" +#: ../../include/features.php:83 +msgid "Ability to select posts by date ranges" msgstr "" -#: ../../include/activities.php:59 -#, php-format -msgid "Visit %1$s's %2$s" +#: ../../include/features.php:84 +msgid "Enable management and selection of privacy groups" msgstr "" -#: ../../include/activities.php:62 -#, php-format -msgid "%1$s has an updated %2$s, changing %3$s." +#: ../../include/features.php:85 +msgid "Save search terms for re-use" msgstr "" -#: ../../include/taxonomy.php:188 ../../include/taxonomy.php:270 -#: ../../include/widgets.php:46 ../../include/widgets.php:429 -#: ../../include/contact_widgets.php:91 -msgid "Categories" +#: ../../include/features.php:86 +msgid "Network Personal Tab" msgstr "" -#: ../../include/taxonomy.php:228 ../../include/taxonomy.php:249 -msgid "Tags" +#: ../../include/features.php:86 +msgid "Enable tab to display only Network posts that you've interacted on" msgstr "" -#: ../../include/taxonomy.php:293 -msgid "Keywords" +#: ../../include/features.php:87 +msgid "Network New Tab" msgstr "" -#: ../../include/taxonomy.php:314 -msgid "have" +#: ../../include/features.php:87 +msgid "Enable tab to display all new Network activity" msgstr "" -#: ../../include/taxonomy.php:314 -msgid "has" +#: ../../include/features.php:88 +msgid "Affinity Tool" msgstr "" -#: ../../include/taxonomy.php:315 -msgid "want" +#: ../../include/features.php:88 +msgid "Filter stream activity by depth of relationships" msgstr "" -#: ../../include/taxonomy.php:315 -msgid "wants" +#: ../../include/features.php:89 +msgid "Connection Filtering" msgstr "" -#: ../../include/taxonomy.php:316 -msgid "likes" +#: ../../include/features.php:89 +msgid "Filter incoming posts from connections based on keywords/content" msgstr "" -#: ../../include/taxonomy.php:317 -msgid "dislikes" +#: ../../include/features.php:90 +msgid "Show channel suggestions" msgstr "" -#: ../../include/permissions.php:29 -msgid "Can view my normal stream and posts" +#: ../../include/features.php:95 +msgid "Post/Comment Tools" msgstr "" -#: ../../include/permissions.php:33 -msgid "Can view my webpages" +#: ../../include/features.php:96 +msgid "Community Tagging" msgstr "" -#: ../../include/permissions.php:37 -msgid "Can post on my channel page (\"wall\")" +#: ../../include/features.php:96 +msgid "Ability to tag existing posts" msgstr "" -#: ../../include/permissions.php:40 -msgid "Can like/dislike stuff" +#: ../../include/features.php:97 +msgid "Post Categories" msgstr "" -#: ../../include/permissions.php:40 -msgid "Profiles and things other than posts/comments" +#: ../../include/features.php:97 +msgid "Add categories to your posts" msgstr "" -#: ../../include/permissions.php:42 -msgid "Can forward to all my channel contacts via post @mentions" +#: ../../include/features.php:98 +msgid "Emoji Reactions" msgstr "" -#: ../../include/permissions.php:42 -msgid "Advanced - useful for creating group forum channels" +#: ../../include/features.php:98 +msgid "Add emoji reaction ability to posts" msgstr "" -#: ../../include/permissions.php:43 -msgid "Can chat with me (when available)" +#: ../../include/features.php:99 +msgid "Ability to file posts under folders" msgstr "" -#: ../../include/permissions.php:44 -msgid "Can write to my file storage and photos" +#: ../../include/features.php:100 +msgid "Dislike Posts" msgstr "" -#: ../../include/permissions.php:45 -msgid "Can edit my webpages" +#: ../../include/features.php:100 +msgid "Ability to dislike posts/comments" msgstr "" -#: ../../include/permissions.php:47 -msgid "Somewhat advanced - very useful in open communities" +#: ../../include/features.php:101 +msgid "Star Posts" msgstr "" -#: ../../include/permissions.php:49 -msgid "Can administer my channel resources" +#: ../../include/features.php:101 +msgid "Ability to mark special posts with a star indicator" msgstr "" -#: ../../include/permissions.php:49 -msgid "Extremely advanced. Leave this alone unless you know what you are doing" +#: ../../include/features.php:102 +msgid "Tag Cloud" msgstr "" -#: ../../include/widgets.php:103 -msgid "System" +#: ../../include/features.php:102 +msgid "Provide a personal tag cloud on your channel page" msgstr "" -#: ../../include/widgets.php:106 -msgid "New App" +#: ../../include/features.php:111 +msgid "Premium Channel" msgstr "" -#: ../../include/widgets.php:154 -msgid "Suggestions" +#: ../../include/features.php:112 +msgid "" +"Allows you to set restrictions and terms on those that connect with your " +"channel" msgstr "" -#: ../../include/widgets.php:155 -msgid "See more..." +#: ../../include/taxonomy.php:228 ../../include/taxonomy.php:249 +msgid "Tags" msgstr "" -#: ../../include/widgets.php:175 -#, php-format -msgid "You have %1$.0f of %2$.0f allowed connections." +#: ../../include/taxonomy.php:293 +msgid "Keywords" msgstr "" -#: ../../include/widgets.php:181 -msgid "Add New Connection" +#: ../../include/taxonomy.php:314 +msgid "have" msgstr "" -#: ../../include/widgets.php:182 -msgid "Enter channel address" +#: ../../include/taxonomy.php:314 +msgid "has" msgstr "" -#: ../../include/widgets.php:183 -msgid "Examples: bob@example.com, https://example.com/barbara" +#: ../../include/taxonomy.php:315 +msgid "want" msgstr "" -#: ../../include/widgets.php:199 -msgid "Notes" +#: ../../include/taxonomy.php:315 +msgid "wants" msgstr "" -#: ../../include/widgets.php:273 -msgid "Remove term" +#: ../../include/taxonomy.php:316 +msgid "likes" msgstr "" -#: ../../include/widgets.php:313 ../../include/widgets.php:432 -#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94 -msgid "Everything" +#: ../../include/taxonomy.php:317 +msgid "dislikes" msgstr "" -#: ../../include/widgets.php:354 -msgid "Archives" +#: ../../include/account.php:28 +msgid "Not a valid email address" msgstr "" -#: ../../include/widgets.php:516 -msgid "Refresh" +#: ../../include/account.php:30 +msgid "Your email domain is not among those allowed on this site" msgstr "" -#: ../../include/widgets.php:556 -msgid "Account settings" +#: ../../include/account.php:36 +msgid "Your email address is already registered at this site." msgstr "" -#: ../../include/widgets.php:562 -msgid "Channel settings" +#: ../../include/account.php:68 +msgid "An invitation is required." msgstr "" -#: ../../include/widgets.php:571 -msgid "Additional features" +#: ../../include/account.php:72 +msgid "Invitation could not be verified." msgstr "" -#: ../../include/widgets.php:578 -msgid "Feature/Addon settings" +#: ../../include/account.php:122 +msgid "Please enter the required information." msgstr "" -#: ../../include/widgets.php:584 -msgid "Display settings" +#: ../../include/account.php:189 +msgid "Failed to store account information." msgstr "" -#: ../../include/widgets.php:591 -msgid "Manage locations" +#: ../../include/account.php:249 +#, php-format +msgid "Registration confirmation for %s" msgstr "" -#: ../../include/widgets.php:600 -msgid "Export channel" +#: ../../include/account.php:315 +#, php-format +msgid "Registration request at %s" msgstr "" -#: ../../include/widgets.php:607 -msgid "Connected apps" +#: ../../include/account.php:339 +msgid "your registration password" msgstr "" -#: ../../include/widgets.php:631 -msgid "Premium Channel Settings" +#: ../../include/account.php:342 ../../include/account.php:402 +#, php-format +msgid "Registration details for %s" msgstr "" -#: ../../include/widgets.php:660 -msgid "Private Mail Menu" +#: ../../include/account.php:414 +msgid "Account approved." msgstr "" -#: ../../include/widgets.php:662 -msgid "Combined View" +#: ../../include/account.php:454 +#, php-format +msgid "Registration revoked for %s" msgstr "" -#: ../../include/widgets.php:694 ../../include/widgets.php:706 -msgid "Conversations" +#: ../../include/account.php:739 ../../include/account.php:741 +msgid "Click here to upgrade." msgstr "" -#: ../../include/widgets.php:698 -msgid "Received Messages" +#: ../../include/account.php:747 +msgid "This action exceeds the limits set by your subscription plan." msgstr "" -#: ../../include/widgets.php:702 -msgid "Sent Messages" +#: ../../include/account.php:752 +msgid "This action is not available under your subscription plan." msgstr "" -#: ../../include/widgets.php:716 -msgid "No messages." +#: ../../include/bbcode.php:123 ../../include/bbcode.php:878 +#: ../../include/bbcode.php:881 ../../include/bbcode.php:886 +#: ../../include/bbcode.php:889 ../../include/bbcode.php:892 +#: ../../include/bbcode.php:895 ../../include/bbcode.php:900 +#: ../../include/bbcode.php:903 ../../include/bbcode.php:908 +#: ../../include/bbcode.php:911 ../../include/bbcode.php:914 +#: ../../include/bbcode.php:917 +msgid "Image/photo" msgstr "" -#: ../../include/widgets.php:734 -msgid "Delete conversation" +#: ../../include/bbcode.php:162 ../../include/bbcode.php:928 +msgid "Encrypted content" msgstr "" -#: ../../include/widgets.php:760 -msgid "Events Tools" +#: ../../include/bbcode.php:178 +#, php-format +msgid "Install %s element: " msgstr "" -#: ../../include/widgets.php:761 -msgid "Export Calendar" +#: ../../include/bbcode.php:182 +#, php-format +msgid "" +"This post contains an installable %s element, however you lack permissions " +"to install it on this site." msgstr "" -#: ../../include/widgets.php:762 -msgid "Import Calendar" +#: ../../include/bbcode.php:261 +#, php-format +msgid "%1$s wrote the following %2$s %3$s" msgstr "" -#: ../../include/widgets.php:854 -msgid "Overview" +#: ../../include/bbcode.php:338 ../../include/bbcode.php:346 +msgid "Click to open/close" msgstr "" -#: ../../include/widgets.php:861 -msgid "Chat Members" +#: ../../include/bbcode.php:346 +msgid "spoiler" msgstr "" -#: ../../include/widgets.php:883 -msgid "Wiki List" +#: ../../include/bbcode.php:866 +msgid "$1 wrote:" msgstr "" -#: ../../include/widgets.php:921 -msgid "Wiki Pages" -msgstr "" +#: ../../include/contact_widgets.php:11 +#, php-format +msgid "%d invitation available" +msgid_plural "%d invitations available" +msgstr[0] "" +msgstr[1] "" -#: ../../include/widgets.php:956 -msgid "Bookmarked Chatrooms" +#: ../../include/contact_widgets.php:19 +msgid "Find Channels" msgstr "" -#: ../../include/widgets.php:979 -msgid "Suggested Chatrooms" +#: ../../include/contact_widgets.php:20 +msgid "Enter name or interest" msgstr "" -#: ../../include/widgets.php:1125 ../../include/widgets.php:1237 -msgid "photo/image" +#: ../../include/contact_widgets.php:21 +msgid "Connect/Follow" msgstr "" -#: ../../include/widgets.php:1180 -msgid "Click to show more" +#: ../../include/contact_widgets.php:22 +msgid "Examples: Robert Morgenstein, Fishing" msgstr "" -#: ../../include/widgets.php:1331 -msgid "Rating Tools" +#: ../../include/contact_widgets.php:26 +msgid "Random Profile" msgstr "" -#: ../../include/widgets.php:1335 ../../include/widgets.php:1337 -msgid "Rate Me" +#: ../../include/contact_widgets.php:27 +msgid "Invite Friends" msgstr "" -#: ../../include/widgets.php:1340 -msgid "View Ratings" +#: ../../include/contact_widgets.php:29 +msgid "Advanced example: name=fred and country=iceland" msgstr "" -#: ../../include/widgets.php:1424 -msgid "Forums" -msgstr "" +#: ../../include/contact_widgets.php:122 +#, php-format +msgid "%d connection in common" +msgid_plural "%d connections in common" +msgstr[0] "" +msgstr[1] "" -#: ../../include/widgets.php:1453 -msgid "Tasks" +#: ../../include/contact_widgets.php:127 +msgid "show more" msgstr "" -#: ../../include/widgets.php:1462 -msgid "Documentation" +#: ../../include/dir_fns.php:141 +msgid "Directory Options" msgstr "" -#: ../../include/widgets.php:1464 -msgid "Project/Site Information" +#: ../../include/dir_fns.php:143 +msgid "Safe Mode" msgstr "" -#: ../../include/widgets.php:1465 -msgid "For Members" +#: ../../include/dir_fns.php:144 +msgid "Public Forums Only" msgstr "" -#: ../../include/widgets.php:1466 -msgid "For Administrators" +#: ../../include/dir_fns.php:145 +msgid "This Website Only" msgstr "" -#: ../../include/widgets.php:1467 -msgid "For Developers" +#: ../../include/message.php:20 +msgid "No recipient provided." msgstr "" -#: ../../include/widgets.php:1491 ../../include/widgets.php:1529 -msgid "Member registrations waiting for confirmation" +#: ../../include/message.php:25 +msgid "[no subject]" msgstr "" -#: ../../include/widgets.php:1497 -msgid "Inspect queue" +#: ../../include/message.php:45 +msgid "Unable to determine sender." msgstr "" -#: ../../include/widgets.php:1499 -msgid "DB updates" +#: ../../include/message.php:222 +msgid "Stored post could not be verified." msgstr "" -#: ../../include/widgets.php:1525 -msgid "Plugin Features" +#: ../../include/import.php:30 +msgid "" +"Cannot create a duplicate channel identifier on this system. Import failed." msgstr "" -#: ../../include/attach.php:248 ../../include/attach.php:334 -msgid "Item was not found." +#: ../../include/import.php:97 +msgid "Channel clone failed. Import failed." msgstr "" -#: ../../include/attach.php:500 -msgid "No source file." +#: ../../include/nav.php:84 ../../include/nav.php:117 ../../boot.php:1737 +msgid "Logout" msgstr "" -#: ../../include/attach.php:522 -msgid "Cannot locate file to replace" +#: ../../include/nav.php:84 ../../include/nav.php:117 +msgid "End this session" msgstr "" -#: ../../include/attach.php:540 -msgid "Cannot locate file to revise/update" +#: ../../include/nav.php:87 ../../include/nav.php:148 +msgid "Home" msgstr "" -#: ../../include/attach.php:675 -#, php-format -msgid "File exceeds size limit of %d" +#: ../../include/nav.php:87 +msgid "Your posts and conversations" msgstr "" -#: ../../include/attach.php:689 -#, php-format -msgid "You have reached your limit of %1$.0f Mbytes attachment storage." +#: ../../include/nav.php:88 +msgid "Your profile page" msgstr "" -#: ../../include/attach.php:847 -msgid "File upload failed. Possible system limit or action terminated." +#: ../../include/nav.php:90 +msgid "Manage/Edit profiles" msgstr "" -#: ../../include/attach.php:860 -msgid "Stored file could not be verified. Upload failed." +#: ../../include/nav.php:92 +msgid "Edit your profile" msgstr "" -#: ../../include/attach.php:916 ../../include/attach.php:932 -msgid "Path not available." +#: ../../include/nav.php:94 +msgid "Your photos" msgstr "" -#: ../../include/attach.php:978 ../../include/attach.php:1130 -msgid "Empty pathname" +#: ../../include/nav.php:95 +msgid "Your files" msgstr "" -#: ../../include/attach.php:1004 -msgid "duplicate filename or path" +#: ../../include/nav.php:98 +msgid "Your chatrooms" msgstr "" -#: ../../include/attach.php:1026 -msgid "Path not found." +#: ../../include/nav.php:104 +msgid "Your bookmarks" msgstr "" -#: ../../include/attach.php:1084 -msgid "mkdir failed." +#: ../../include/nav.php:108 +msgid "Your webpages" msgstr "" -#: ../../include/attach.php:1088 -msgid "database storage failed." +#: ../../include/nav.php:110 +msgid "Your wiki" msgstr "" -#: ../../include/attach.php:1136 -msgid "Empty path" +#: ../../include/nav.php:114 +msgid "Sign in" msgstr "" -#: ../../include/contact_widgets.php:11 +#: ../../include/nav.php:131 #, php-format -msgid "%d invitation available" -msgid_plural "%d invitations available" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/contact_widgets.php:19 -msgid "Find Channels" +msgid "%s - click to logout" msgstr "" -#: ../../include/contact_widgets.php:20 -msgid "Enter name or interest" +#: ../../include/nav.php:134 +msgid "Remote authentication" msgstr "" -#: ../../include/contact_widgets.php:21 -msgid "Connect/Follow" +#: ../../include/nav.php:134 +msgid "Click to authenticate to your home hub" msgstr "" -#: ../../include/contact_widgets.php:22 -msgid "Examples: Robert Morgenstein, Fishing" +#: ../../include/nav.php:148 +msgid "Home Page" msgstr "" -#: ../../include/contact_widgets.php:26 -msgid "Random Profile" +#: ../../include/nav.php:151 +msgid "Create an account" msgstr "" -#: ../../include/contact_widgets.php:27 -msgid "Invite Friends" +#: ../../include/nav.php:163 +msgid "Help and documentation" msgstr "" -#: ../../include/contact_widgets.php:29 -msgid "Advanced example: name=fred and country=iceland" +#: ../../include/nav.php:167 +msgid "Applications, utilities, links, games" msgstr "" -#: ../../include/contact_widgets.php:122 -#, php-format -msgid "%d connection in common" -msgid_plural "%d connections in common" -msgstr[0] "" -msgstr[1] "" +#: ../../include/nav.php:169 +msgid "Search site @name, #tag, ?docs, content" +msgstr "" -#: ../../include/contact_widgets.php:127 -msgid "show more" +#: ../../include/nav.php:171 +msgid "Channel Directory" msgstr "" -#: ../../include/dir_fns.php:141 -msgid "Directory Options" +#: ../../include/nav.php:183 +msgid "Your grid" msgstr "" -#: ../../include/dir_fns.php:143 -msgid "Safe Mode" +#: ../../include/nav.php:184 +msgid "Mark all grid notifications seen" msgstr "" -#: ../../include/dir_fns.php:144 -msgid "Public Forums Only" +#: ../../include/nav.php:186 +msgid "Channel home" msgstr "" -#: ../../include/dir_fns.php:145 -msgid "This Website Only" +#: ../../include/nav.php:187 +msgid "Mark all channel notifications seen" msgstr "" -#: ../../include/message.php:20 -msgid "No recipient provided." +#: ../../include/nav.php:193 +msgid "Notices" msgstr "" -#: ../../include/message.php:25 -msgid "[no subject]" +#: ../../include/nav.php:193 +msgid "Notifications" msgstr "" -#: ../../include/message.php:45 -msgid "Unable to determine sender." +#: ../../include/nav.php:194 +msgid "See all notifications" msgstr "" -#: ../../include/message.php:222 -msgid "Stored post could not be verified." +#: ../../include/nav.php:197 +msgid "Private mail" msgstr "" -#: ../../include/auth.php:148 -msgid "Logged out." +#: ../../include/nav.php:198 +msgid "See all private messages" msgstr "" -#: ../../include/auth.php:275 -msgid "Failed authentication" +#: ../../include/nav.php:199 +msgid "Mark all private messages seen" msgstr "" -#: ../../include/auth.php:286 -msgid "Login failed." +#: ../../include/nav.php:205 +msgid "Event Calendar" msgstr "" -#: ../../include/connections.php:95 -msgid "New window" +#: ../../include/nav.php:206 +msgid "See all events" msgstr "" -#: ../../include/connections.php:96 -msgid "Open the selected location in a different window or browser tab" +#: ../../include/nav.php:207 +msgid "Mark all events seen" msgstr "" -#: ../../include/connections.php:214 -#, php-format -msgid "User '%s' deleted" +#: ../../include/nav.php:210 +msgid "Manage Your Channels" msgstr "" -#: ../../include/zot.php:697 -msgid "Invalid data packet" +#: ../../include/nav.php:212 +msgid "Account/Channel Settings" msgstr "" -#: ../../include/zot.php:713 -msgid "Unable to verify channel signature" +#: ../../include/nav.php:220 +msgid "Site Setup and Configuration" msgstr "" -#: ../../include/zot.php:2326 -#, php-format -msgid "Unable to verify site signature for %s" +#: ../../include/nav.php:256 +msgid "@name, #tag, ?doc, content" msgstr "" -#: ../../include/zot.php:3703 -msgid "invalid target signature" +#: ../../include/nav.php:257 +msgid "Please wait..." msgstr "" -#: ../../view/theme/redbasic/php/config.php:82 +#: ../../view/theme/redbasic/php/config.php:6 msgid "Focus (Hubzilla default)" msgstr "" -#: ../../view/theme/redbasic/php/config.php:103 +#: ../../view/theme/redbasic/php/config.php:110 msgid "Theme settings" msgstr "" -#: ../../view/theme/redbasic/php/config.php:104 -msgid "Select scheme" -msgstr "" - -#: ../../view/theme/redbasic/php/config.php:105 +#: ../../view/theme/redbasic/php/config.php:111 msgid "Narrow navbar" msgstr "" -#: ../../view/theme/redbasic/php/config.php:106 +#: ../../view/theme/redbasic/php/config.php:112 msgid "Navigation bar background color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:107 +#: ../../view/theme/redbasic/php/config.php:113 msgid "Navigation bar gradient top color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:108 +#: ../../view/theme/redbasic/php/config.php:114 msgid "Navigation bar gradient bottom color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:109 +#: ../../view/theme/redbasic/php/config.php:115 msgid "Navigation active button gradient top color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:110 +#: ../../view/theme/redbasic/php/config.php:116 msgid "Navigation active button gradient bottom color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:111 +#: ../../view/theme/redbasic/php/config.php:117 msgid "Navigation bar border color " msgstr "" -#: ../../view/theme/redbasic/php/config.php:112 +#: ../../view/theme/redbasic/php/config.php:118 msgid "Navigation bar icon color " msgstr "" -#: ../../view/theme/redbasic/php/config.php:113 +#: ../../view/theme/redbasic/php/config.php:119 msgid "Navigation bar active icon color " msgstr "" -#: ../../view/theme/redbasic/php/config.php:114 +#: ../../view/theme/redbasic/php/config.php:120 msgid "link color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:115 +#: ../../view/theme/redbasic/php/config.php:121 msgid "Set font-color for banner" msgstr "" -#: ../../view/theme/redbasic/php/config.php:116 +#: ../../view/theme/redbasic/php/config.php:122 msgid "Set the background color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:117 +#: ../../view/theme/redbasic/php/config.php:123 msgid "Set the background image" msgstr "" -#: ../../view/theme/redbasic/php/config.php:118 +#: ../../view/theme/redbasic/php/config.php:124 msgid "Set the background color of items" msgstr "" -#: ../../view/theme/redbasic/php/config.php:119 +#: ../../view/theme/redbasic/php/config.php:125 msgid "Set the background color of comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:120 +#: ../../view/theme/redbasic/php/config.php:126 msgid "Set the border color of comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:121 +#: ../../view/theme/redbasic/php/config.php:127 msgid "Set the indent for comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:122 +#: ../../view/theme/redbasic/php/config.php:128 msgid "Set the basic color for item icons" msgstr "" -#: ../../view/theme/redbasic/php/config.php:123 +#: ../../view/theme/redbasic/php/config.php:129 msgid "Set the hover color for item icons" msgstr "" -#: ../../view/theme/redbasic/php/config.php:124 +#: ../../view/theme/redbasic/php/config.php:130 msgid "Set font-size for the entire application" msgstr "" -#: ../../view/theme/redbasic/php/config.php:124 +#: ../../view/theme/redbasic/php/config.php:130 msgid "Example: 14px" msgstr "" -#: ../../view/theme/redbasic/php/config.php:125 +#: ../../view/theme/redbasic/php/config.php:131 msgid "Set font-size for posts and comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:126 +#: ../../view/theme/redbasic/php/config.php:132 msgid "Set font-color for posts and comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:127 +#: ../../view/theme/redbasic/php/config.php:133 msgid "Set radius of corners" msgstr "" -#: ../../view/theme/redbasic/php/config.php:128 +#: ../../view/theme/redbasic/php/config.php:134 msgid "Set shadow depth of photos" msgstr "" -#: ../../view/theme/redbasic/php/config.php:129 +#: ../../view/theme/redbasic/php/config.php:135 msgid "Set maximum width of content region in pixel" msgstr "" -#: ../../view/theme/redbasic/php/config.php:129 +#: ../../view/theme/redbasic/php/config.php:135 msgid "Leave empty for default width" msgstr "" -#: ../../view/theme/redbasic/php/config.php:130 +#: ../../view/theme/redbasic/php/config.php:136 msgid "Left align page content" msgstr "" -#: ../../view/theme/redbasic/php/config.php:131 +#: ../../view/theme/redbasic/php/config.php:137 msgid "Set minimum opacity of nav bar - to hide it" msgstr "" -#: ../../view/theme/redbasic/php/config.php:132 +#: ../../view/theme/redbasic/php/config.php:138 msgid "Set size of conversation author photo" msgstr "" -#: ../../view/theme/redbasic/php/config.php:133 +#: ../../view/theme/redbasic/php/config.php:139 msgid "Set size of followup author photos" msgstr "" -#: ../../boot.php:1169 +#: ../../boot.php:1194 #, php-format msgctxt "opensearch" msgid "Search %1$s (%2$s)" msgstr "" -#: ../../boot.php:1169 +#: ../../boot.php:1194 msgctxt "opensearch" msgid "$Projectname" msgstr "" -#: ../../boot.php:1487 +#: ../../boot.php:1512 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../boot.php:1490 +#: ../../boot.php:1515 #, php-format msgid "Update Error at %s" msgstr "" -#: ../../boot.php:1694 +#: ../../boot.php:1719 msgid "" "Create an account to access services and applications within the Hubzilla" msgstr "" -#: ../../boot.php:1715 +#: ../../boot.php:1740 msgid "Login/Email" msgstr "" -#: ../../boot.php:1716 +#: ../../boot.php:1741 msgid "Password" msgstr "" -#: ../../boot.php:1717 +#: ../../boot.php:1742 msgid "Remember me" msgstr "" -#: ../../boot.php:1720 +#: ../../boot.php:1745 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:2286 +#: ../../boot.php:2314 msgid "toggle mobile" msgstr "" -#: ../../boot.php:2441 +#: ../../boot.php:2469 msgid "Website SSL certificate is not valid. Please correct." msgstr "" -#: ../../boot.php:2444 +#: ../../boot.php:2472 #, php-format msgid "[hubzilla] Website SSL error for %s" msgstr "" -#: ../../boot.php:2548 +#: ../../boot.php:2576 msgid "Cron/Scheduled tasks not running." msgstr "" -#: ../../boot.php:2552 +#: ../../boot.php:2580 #, php-format msgid "[hubzilla] Cron tasks not running on %s" msgstr "" diff --git a/view/css/conversation.css b/view/css/conversation.css index 5af0c55e7..6c5171545 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -1,6 +1,6 @@ /* jot */ -.jothidden input { +.jothidden input[type="text"] { border: 0px; margin: 0px; height: 39px; @@ -70,6 +70,10 @@ margin-bottom: 30px; } +#profile-jot-plugin-wrapper { + margin-top: 10px; +} + #profile-rotator-wrapper { float: left; } @@ -78,14 +82,6 @@ padding: 15px 0px 0px 15px; } -.profile-jot-net { - float: left; - margin-right: 10px; - margin-top: 5px; - margin-bottom: 5px; - padding: 5px; -} - /* conversation */ .thread-wrapper.toplevel_item { diff --git a/view/js/acl.js b/view/js/acl.js index eb7b7f523..c11997c43 100644 --- a/view/js/acl.js +++ b/view/js/acl.js @@ -68,7 +68,7 @@ function ACL(backend_url) { } -ACL.prototype.get_form_data = function(event) { +ACL.prototype.get_form_data = function(event) { form_id = $(this).data('form_id'); that.form_id = $('#' + form_id); @@ -100,13 +100,6 @@ ACL.prototype.on_submit = function() { $(that.deny_cid).each(function(i,v) { that.form_id.append("<input class='acl-field' type='hidden' name='contact_deny[]' value='"+v+"'>"); }); - - var formfields = $('.profile-jot-net input').serializeArray(); - - $.each(formfields, function(i, field) { - that.form_id.append("<input class='acl-field' type='hidden' name='"+field.name+"' value='"+field.value+"'>"); - }); - }; ACL.prototype.search = function() { @@ -282,7 +275,8 @@ ACL.prototype.update_view = function(value) { that.update_select('public'); /* jot acl */ - $('#jot-perms-icon, #dialog-perms-icon').removeClass('fa-lock').addClass('fa-unlock'); + $('#jot-perms-icon, #dialog-perms-icon, #' + that.form_id[0].id + ' .jot-perms-icon').removeClass('fa-lock').addClass('fa-unlock'); + $('#dbtn-jotnets').show(); $('.profile-jot-net input').attr('disabled', false); } @@ -294,7 +288,8 @@ ACL.prototype.update_view = function(value) { that.update_select(that.selected_id); /* jot acl */ - $('#jot-perms-icon, #dialog-perms-icon').removeClass('fa-unlock').addClass('fa-lock'); + $('#jot-perms-icon, #dialog-perms-icon, #' + that.form_id[0].id + ' .jot-perms-icon').removeClass('fa-unlock').addClass('fa-lock'); + $('#dbtn-jotnets').hide(); $('.profile-jot-net input').attr('disabled', 'disabled'); } @@ -305,7 +300,8 @@ ACL.prototype.update_view = function(value) { that.update_select('onlyme'); /* jot acl */ - $('#jot-perms-icon, #dialog-perms-icon').removeClass('fa-unlock').addClass('fa-lock'); + $('#jot-perms-icon, #dialog-perms-icon, #' + that.form_id[0].id + ' .jot-perms-icon').removeClass('fa-unlock').addClass('fa-lock'); + $('#dbtn-jotnets').hide(); $('.profile-jot-net input').attr('disabled', 'disabled'); } @@ -316,11 +312,13 @@ ACL.prototype.update_view = function(value) { /* jot acl */ if(that.allow_gid.length === 0 && that.allow_cid.length === 0 && that.deny_gid.length === 0 && that.deny_cid.length === 0 && value === 'custom') { - $('#jot-perms-icon, #dialog-perms-icon').removeClass('fa-lock').addClass('fa-unlock'); + $('#jot-perms-icon, #dialog-perms-icon, #' + that.form_id[0].id + ' .jot-perms-icon').removeClass('fa-lock').addClass('fa-unlock'); + $('#dbtn-jotnets').show(); $('.profile-jot-net input').attr('disabled', false); } else { - $('#jot-perms-icon, #dialog-perms-icon').removeClass('fa-unlock').addClass('fa-lock'); + $('#jot-perms-icon, #dialog-perms-icon, #' + that.form_id[0].id + ' .jot-perms-icon').removeClass('fa-unlock').addClass('fa-lock'); + $('#dbtn-jotnets').hide(); $('.profile-jot-net input').attr('disabled', 'disabled'); } } diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl index 70ef4469a..dbdbd6a56 100755 --- a/view/tpl/acl_selector.tpl +++ b/view/tpl/acl_selector.tpl @@ -27,16 +27,6 @@ </div> {{/if}} - {{if $jotnets}} - <div class="jotnets-wrapper" role="tab" id="jotnets-wrapper"> - <a data-toggle="collapse" class="btn btn-block btn-default" href="#jotnets-collapse" aria-expanded="false" aria-controls="jotnets-collapse">{{$jnetModalTitle}} <span class="caret"></span></a> - </div> - <div id="jotnets-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="acl-select"> - {{$jotnets}} - <div class="clear"></div> - </div> - {{/if}} - <div id="acl-wrapper"> <div id="acl-list"> <div id="acl-search-wrapper"> @@ -47,13 +37,14 @@ <div id="acl-list-content"></div> </div> </div> - <span id="acl-fields"></span> </div> + <div class="acl-list-item" rel="acl-template" style="display:none"> <img data-src="{0}"><p>{1}</p> <button class="acl-button-hide btn btn-xs btn-default"><i class="fa fa-times"></i> {{$hide}}</button> <button class="acl-button-show btn btn-xs btn-default"><i class="fa fa-check"></i> {{$show}}</button> </div> + </div> <div class="modal-footer clear"> <button type="button" class="btn btn-default" data-dismiss="modal">{{$aclModalDismiss}}</button> diff --git a/view/tpl/admin_plugins_details.tpl b/view/tpl/admin_plugins_details.tpl index b8cc72a04..309fc9569 100755 --- a/view/tpl/admin_plugins_details.tpl +++ b/view/tpl/admin_plugins_details.tpl @@ -24,6 +24,9 @@ {{if $info.minphpversion}} <p class="versionlimit">{{$str_minphpversion}}{{$info.minphpversion}}</p> {{/if}} + {{if $info.serverroles}} + <p class="versionlimit">{{$str_serverroles}}{{$info.serverroles}}</p> + {{/if}} {{if $info.requires}} <p class="versionlimit">{{$str_requires}}{{$info.requires}}</p> {{/if}} diff --git a/view/tpl/admin_security.tpl b/view/tpl/admin_security.tpl index 721b5f38f..409e9fc7d 100755 --- a/view/tpl/admin_security.tpl +++ b/view/tpl/admin_security.tpl @@ -11,6 +11,9 @@ {{include file="field_checkbox.tpl" field=$content_security}} {{include file="field_checkbox.tpl" field=$embed_sslonly}} + {{include file="field_textarea.tpl" field=$allowed_email}} + {{include file="field_textarea.tpl" field=$not_allowed_email}} + {{include file="field_textarea.tpl" field=$whitelisted_sites}} {{include file="field_textarea.tpl" field=$blacklisted_sites}} diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 6b8729ee6..56e6087d6 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -41,6 +41,7 @@ <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> {{include file="field_input.tpl" field=$sitename}} + {{include file="field_select.tpl" field=$server_role}} {{include file="field_textarea.tpl" field=$banner}} {{include file="field_textarea.tpl" field=$admininfo}} {{include file="field_select.tpl" field=$language}} @@ -61,8 +62,6 @@ {{include file="field_select.tpl" field=$register_policy}} {{include file="field_checkbox.tpl" field=$invite_only}} {{include file="field_select.tpl" field=$access_policy}} - {{include file="field_textarea.tpl" field=$allowed_email}} - {{include file="field_textarea.tpl" field=$not_allowed_email}} <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div> <h3>{{$upload}}</h3> diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl index b851e391e..36edc3b44 100644 --- a/view/tpl/cloud_actionspanel.tpl +++ b/view/tpl/cloud_actionspanel.tpl @@ -1,7 +1,6 @@ <div id="files-mkdir-tools" class="section-content-tools-wrapper"> <label for="files-mkdir">{{$folder_header}}</label> <form id="mkdir-form" method="post" action="file_upload" class="acl-form" data-form_id="mkdir-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'> - <!--input type="hidden" name="sabreAction" value="mkcol"--> <input type="hidden" name="folder" value="{{$folder}}" /> <input type="hidden" name="channick" value="{{$channick}}" /> <input type="hidden" name="return_url" value="{{$return_url}}" /> diff --git a/view/tpl/contact_block.tpl b/view/tpl/contact_block.tpl index 6a29abaef..580a8a41c 100755 --- a/view/tpl/contact_block.tpl +++ b/view/tpl/contact_block.tpl @@ -1,13 +1,14 @@ <div id="contact-block" class="widget"> -<h3>{{$contacts}}</h3> -{{if $micropro}} - {{if $viewconnections}} - <a class="allcontact-link" href="viewconnections/{{$nickname}}">{{$viewconnections}}</a> - {{/if}} - <div class='contact-block-content'> - {{foreach $micropro as $m}} - {{$m}} - {{/foreach}} - </div> -{{/if}} + <h3>{{$contacts}}</h3> + {{if $micropro}} + {{if $viewconnections}} + <a class="allcontact-link" href="viewconnections/{{$nickname}}">{{$viewconnections}}</a> + {{/if}} + <div class='contact-block-content'> + {{foreach $micropro as $m}} + {{$m}} + {{/foreach}} + </div> + {{/if}} </div> +<div class="clear"></div> diff --git a/view/tpl/cover_photo_widget.tpl b/view/tpl/cover_photo_widget.tpl index 4e210a300..2b47270c9 100755 --- a/view/tpl/cover_photo_widget.tpl +++ b/view/tpl/cover_photo_widget.tpl @@ -1,22 +1,28 @@ <script> var aside_padding_top; var section_padding_top; + var coverSlid = false; $(document).ready(function() { aside_padding_top = parseInt($('aside').css('padding-top')); section_padding_top = parseInt($('section').css('padding-top')); + $(document).on('click', slideUpCover); + if($('#cover-photo').length && $(window).width() > 755) { - $('.navbar-fixed-top').css('position', 'relative'); - $('main').css('margin-top', - $('nav').outerHeight(true) + 'px'); - $('aside').css('padding-top', aside_padding_top - $('nav').outerHeight() + 'px'); - $('section').css('padding-top', section_padding_top - $('nav').outerHeight() + 'px'); - $('main').css('opacity', 0); - $('header').hide(); + if($(window).scrollTop() < $('#cover-photo').height()) { + $('main').css('margin-top', - $('nav').outerHeight(true) + 'px'); + $('aside').css('padding-top', aside_padding_top - $('nav').outerHeight() + 'px'); + $('section').css('padding-top', section_padding_top - $('nav').outerHeight() + 'px'); + $('.navbar-fixed-top').css('position', 'relative'); + $('main').css('opacity', 0); + $('header').hide(); + } } else { $('#cover-photo').remove(); + coverSlid = true; } }); @@ -26,10 +32,26 @@ $('main').css('opacity', 1); $('aside').css('padding-top', aside_padding_top + 'px'); $('section').css('padding-top', section_padding_top + 'px'); - $(window).scrollTop($(window).scrollTop() - $('#cover-photo').height()) - $('.navbar-fixed-top').css('position', 'fixed'); + $('.navbar-fixed-top').css('position', ''); $('main').css('margin-top', ''); - $('#cover-photo').remove(); + coverSlid = true; + } + else if ($('#cover-photo').length && $(window).width() > 755 && $(window).scrollTop() < $('#cover-photo').height()){ + if(coverSlid) { + $(window).scrollTop(Math.ceil($('#cover-photo').height())); + setTimeout(function(){ coverSlid = false; }, 1000); + } + else { + if($(window).scrollTop() < $('#cover-photo').height()) { + $('main').css('margin-top', - $('nav').outerHeight(true) + 'px'); + $('aside').css('padding-top', aside_padding_top - $('nav').outerHeight() + 'px'); + $('section').css('padding-top', section_padding_top - $('nav').outerHeight() + 'px'); + + $('.navbar-fixed-top').css('position', 'relative'); + $('main').css('opacity', 0); + $('header').hide(); + } + } } if($('#cover-photo').length) { $('main').css('opacity', ($(window).scrollTop()/$('#cover-photo').height()).toFixed(1)); @@ -38,21 +60,26 @@ $(window).resize(function () { if($('#cover-photo').length && $(window).width() < 755) { + $('#cover-photo').remove(); $('main').css('opacity', 1); $('aside').css('padding-top', aside_padding_top + 'px'); $('section').css('padding-top', section_padding_top + 'px'); - $('.navbar-fixed-top').css('position', 'fixed'); - $('#cover-photo').remove(); + $('.navbar-fixed-top').css('position', ''); + coverSlid = true; } }); function slideUpCover() { + if(coverSlid) { + return; + } $('html, body').animate({scrollTop: Math.ceil($('#cover-photo').height()) + 'px' }); + return; } </script> -<div id="cover-photo" onclick="slideUpCover();" title="{{$hovertitle}}"> +<div id="cover-photo" title="{{$hovertitle}}"> {{$photo_html}} <div id="cover-photo-caption"> <div class="cover-photo-title"> diff --git a/view/tpl/install_settings.tpl b/view/tpl/install_settings.tpl index 5ecd3243b..f7a0108a8 100755 --- a/view/tpl/install_settings.tpl +++ b/view/tpl/install_settings.tpl @@ -19,7 +19,7 @@ {{include file="field_input.tpl" field=$adminmail}} {{include file="field_input.tpl" field=$siteurl}} -{{include file="field_checkbox.tpl" field=$advanced}} +{{include file="field_select.tpl" field=$server_role}} {{include file="field_select_grouped.tpl" field=$timezone}} diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 20357b66f..a3bfad842 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -80,10 +80,10 @@ </button> {{/if}} {{if $embedPhotos}} - <button id="embed-photo-wrapper" class="btn btn-default btn-sm" title="{{$embedPhotos}}" onclick="initializeEmbedPhotoDialog();return false;"> - <i id="embed-photo" class="fa fa-file-image-o jot-icons"></i> - </button> - {{/if}} + <button id="embed-photo-wrapper" class="btn btn-default btn-sm" title="{{$embedPhotos}}" onclick="initializeEmbedPhotoDialog();return false;"> + <i id="embed-photo" class="fa fa-file-image-o jot-icons"></i> + </button> + {{/if}} </div> <div class="btn-group hidden-xs hidden-sm"> {{if $setloc}} @@ -130,7 +130,7 @@ <button type="button" id="more-tools" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> <i id="more-tools-icon" class="fa fa-caret-down jot-icons"></i> </button> - <ul class="dropdown-menu dropdown-menu" role="menu"> + <ul class="dropdown-menu" role="menu"> {{if $visitor}} {{if $writefiles}} <li><a id="wall-file-upload-sub" href="#" ><i class="fa fa-paperclip"></i> {{$attach}}</a></li> @@ -173,17 +173,42 @@ <i class="fa fa-eye jot-icons" ></i> </button> {{/if}} + {{if $jotnets}} + <button id="dbtn-jotnets" class="btn btn-default btn-sm" data-toggle="modal" data-target="#jotnetsModal" type="button" title="{{$jotnets_label}}" style="{{if $lockstate == 'lock'}}display: none;{{/if}}"> + <i class="fa fa-share-alt jot-icons"></i> + </button> + {{/if}} {{if $showacl}} - <button id="dbtn-acl" class="acl-select btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" type="button" data-form_id="profile-jot-form"> + <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" type="button" data-form_id="profile-jot-form"> <i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons"></i>{{if $bang}} <i class="fa fa-exclamation jot-icons"></i>{{/if}} </button> {{/if}} - <button id="dbtn-submit" class="acl-submit btn btn-primary btn-sm" type="submit" tabindex=3 name="button-submit">{{$share}}</button> + <button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" tabindex="3" name="button-submit">{{$share}}</button> </div> - <div id="profile-jot-perms-end"></div> + <div class="clear"></div> + {{if $jotplugins}} <div id="profile-jot-plugin-wrapper"> {{$jotplugins}} </div> + {{/if}} + {{if $jotnets}} + <div class="modal" id="jotnetsModal" tabindex="-1" role="dialog" aria-labelledby="jotnetsModalLabel" aria-hidden="true"> + <div class="modal-dialog"> + <div class="modal-content"> + <div class="modal-header"> + <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> + <h4 class="modal-title" id="expiryModalLabel">{{$jotnets_label}}</h4> + </div> + <div class="modal-body"> + {{$jotnets}} + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-default" data-dismiss="modal">Close</button> + </div> + </div><!-- /.modal-content --> + </div><!-- /.modal-dialog --> + </div><!-- /.modal --> + {{/if}} </div> <div id="profile-jot-text-loading"></div> <div id="profile-jot-end" class="clear"></div> @@ -197,70 +222,78 @@ {{if $feature_expire}} <!-- Modal for item expiry--> <div class="modal" id="expiryModal" tabindex="-1" role="dialog" aria-labelledby="expiryModalLabel" aria-hidden="true"> - <div class="modal-dialog"> - <div class="modal-content"> - <div class="modal-header"> - <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> - <h4 class="modal-title" id="expiryModalLabel">{{$expires}}</h4> - </div> - <!-- <div class="modal-body"> --> - <div class="modal-body form-group" style="width:90%"> - <div class='date'><input type='text' placeholder='yyyy-mm-dd HH:MM' name='start_text' id='expiration-date' class="form-control" /></div><script type='text/javascript'>$(function () {var picker = $('#expiration-date').datetimepicker({format:'Y-m-d H:i', minDate: 0 }); })</script> - </div> - <!-- </div> --> - <div class="modal-footer"> - <button type="button" class="btn btn-default" data-dismiss="modal">{{$expiryModalCANCEL}}</button> - <button id="expiry-modal-OKButton" type="button" class="btn btn-primary">{{$expiryModalOK}}</button> - </div> - </div><!-- /.modal-content --> - </div><!-- /.modal-dialog --> + <div class="modal-dialog"> + <div class="modal-content"> + <div class="modal-header"> + <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> + <h4 class="modal-title" id="expiryModalLabel">{{$expires}}</h4> + </div> + <div class="modal-body form-group" style="width:90%"> + <div class="date"> + <input type="text" placeholder="yyyy-mm-dd HH:MM" name="start_text" id="expiration-date" class="form-control" /> + </div> + <script> + $(function () { + var picker = $('#expiration-date').datetimepicker({format:'Y-m-d H:i', minDate: 0 }); + }); + </script> + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-default" data-dismiss="modal">{{$expiryModalCANCEL}}</button> + <button id="expiry-modal-OKButton" type="button" class="btn btn-primary">{{$expiryModalOK}}</button> + </div> + </div><!-- /.modal-content --> + </div><!-- /.modal-dialog --> </div><!-- /.modal --> {{/if}} {{if $feature_future}} -<!-- Modal for item created--> <div class="modal" id="createdModal" tabindex="-1" role="dialog" aria-labelledby="createdModalLabel" aria-hidden="true"> - <div class="modal-dialog"> - <div class="modal-content"> - <div class="modal-header"> - <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> - <h4 class="modal-title" id="createdModalLabel">{{$future_txt}}</h4> - </div> - <!-- <div class="modal-body"> --> - <div class="modal-body form-group" style="width:90%"> - <div class='date'><input type='text' placeholder='yyyy-mm-dd HH:MM' name='created_text' id='created-date' class="form-control" /></div><script type='text/javascript'>$(function () {var picker = $('#created-date').datetimepicker({format:'Y-m-d H:i', minDate: 0 }); })</script> - </div> - <!-- </div> --> - <div class="modal-footer"> - <button type="button" class="btn btn-default" data-dismiss="modal">{{$expiryModalCANCEL}}</button> - <button id="created-modal-OKButton" type="button" class="btn btn-primary">{{$expiryModalOK}}</button> - </div> - </div><!-- /.modal-content --> - </div><!-- /.modal-dialog --> + <div class="modal-dialog"> + <div class="modal-content"> + <div class="modal-header"> + <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> + <h4 class="modal-title" id="createdModalLabel">{{$future_txt}}</h4> + </div> + <div class="modal-body form-group" style="width:90%"> + <div class="date"> + <input type="text" placeholder="yyyy-mm-dd HH:MM" name="created_text" id="created-date" class="form-control" /> + </div> + <script> + $(function () { + var picker = $('#created-date').datetimepicker({format:'Y-m-d H:i', minDate: 0 }); + }); + </script> + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-default" data-dismiss="modal">{{$expiryModalCANCEL}}</button> + <button id="created-modal-OKButton" type="button" class="btn btn-primary">{{$expiryModalOK}}</button> + </div> + </div><!-- /.modal-content --> + </div><!-- /.modal-dialog --> </div><!-- /.modal --> {{/if}} {{if $embedPhotos}} <div class="modal" id="embedPhotoModal" tabindex="-1" role="dialog" aria-labelledby="embedPhotoLabel" aria-hidden="true"> - <div class="modal-dialog"> - <div class="modal-content"> - <div class="modal-header"> - <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> - <h4 class="modal-title" id="embedPhotoModalLabel">{{$embedPhotosModalTitle}}</h4> - </div> - <div class="modal-body" id="embedPhotoModalBody" > - <div id="embedPhotoModalBodyAlbumListDialog" class="hide"> - <div id="embedPhotoModalBodyAlbumList"></div> - </div> - <div id="embedPhotoModalBodyAlbumDialog" class="hide"> - </div> - </div> - <div class="modal-footer"> - <button type="button" class="btn btn-default" data-dismiss="modal">{{$embedPhotosModalCancel}}</button> - <button id="embed-photo-OKButton" type="button" class="btn btn-primary">{{$embedPhotosModalOK}}</button> - </div> - </div><!-- /.modal-content --> - </div><!-- /.modal-dialog --> + <div class="modal-dialog"> + <div class="modal-content"> + <div class="modal-header"> + <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> + <h4 class="modal-title" id="embedPhotoModalLabel">{{$embedPhotosModalTitle}}</h4> + </div> + <div class="modal-body" id="embedPhotoModalBody" > + <div id="embedPhotoModalBodyAlbumListDialog" class="hide"> + <div id="embedPhotoModalBodyAlbumList"></div> + </div> + <div id="embedPhotoModalBodyAlbumDialog" class="hide"></div> + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-default" data-dismiss="modal">{{$embedPhotosModalCancel}}</button> + <button id="embed-photo-OKButton" type="button" class="btn btn-primary">{{$embedPhotosModalOK}}</button> + </div> + </div><!-- /.modal-content --> + </div><!-- /.modal-dialog --> </div><!-- /.modal --> {{/if}} diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl index 3407e152c..013e1cfdc 100755 --- a/view/tpl/msg-header.tpl +++ b/view/tpl/msg-header.tpl @@ -1,52 +1,9 @@ -<script language="javascript" type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script> +<script type="text/javascript" src="view/js/ajaxupload.js" ></script> <script language="javascript" type="text/javascript"> -var plaintext = '{{$editselect}}'; - -if(plaintext != 'none') { - tinyMCE.init({ - theme : "advanced", - mode : "specific_textareas", - editor_selector: /(profile-jot-text|prvmail-text)/, - plugins : "bbcode,paste", - theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor", - theme_advanced_buttons2 : "", - theme_advanced_buttons3 : "", - theme_advanced_toolbar_location : "top", - theme_advanced_toolbar_align : "center", - theme_advanced_blockformats : "blockquote,code", - gecko_spellcheck : true, - paste_text_sticky : true, - entity_encoding : "raw", - add_unload_trigger : false, - remove_linebreaks : false, - force_p_newlines : false, - force_br_newlines : true, - forced_root_block : '', - convert_urls: false, - content_css: "{{$baseurl}}/view/custom_tinymce.css", - //Character count - theme_advanced_path : false, - setup : function(ed) { - ed.onInit.add(function(ed) { - ed.pasteAsPlainText = true; - var editorId = ed.editorId; - var textarea = $('#'+editorId); - if (typeof(textarea.attr('tabindex')) != "undefined") { - $('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex')); - textarea.attr('tabindex', null); - } - }); - } - }); -} -else $("#prvmail-text").editor_autocomplete(baseurl+"/acl"); -</script> -<script type="text/javascript" src="view/js/ajaxupload.js" ></script> -<script> $(document).ready(function() { var file_uploader = new window.AjaxUpload( @@ -114,12 +71,8 @@ else } function addmailtext(data) { - if(plaintext == 'none') { - var currentText = $("#prvmail-text").val(); - $("#prvmail-text").val(currentText + data); - } - else - tinyMCE.execCommand('mceInsertRawHTML',false,data); + var currentText = $("#prvmail-text").val(); + $("#prvmail-text").val(currentText + data); } diff --git a/view/tpl/profed_head.tpl b/view/tpl/profed_head.tpl index 103960a76..ce774052a 100755 --- a/view/tpl/profed_head.tpl +++ b/view/tpl/profed_head.tpl @@ -1,36 +1,2 @@ -<script language="javascript" type="text/javascript" - src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script> - <script language="javascript" type="text/javascript"> - - -tinyMCE.init({ - theme : "advanced", - mode : "{{$editselect}}", - plugins : "bbcode,paste", - theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code", - theme_advanced_buttons2 : "", - theme_advanced_buttons3 : "", - theme_advanced_toolbar_location : "top", - theme_advanced_toolbar_align : "center", - theme_advanced_blockformats : "blockquote,code", - gecko_spellcheck : true, - paste_text_sticky : true, - entity_encoding : "raw", - add_unload_trigger : false, - remove_linebreaks : false, - force_p_newlines : false, - force_br_newlines : true, - forced_root_block : '', - content_css: "{{$baseurl}}/view/custom_tinymce.css", - theme_advanced_path : false, - setup : function(ed) { - ed.onInit.add(function(ed) { - ed.pasteAsPlainText = true; - }); - } - -}); - - -</script> +<script language="javascript" type="text/javascript"></script> |