diff options
| author | Max Kostikov <max@kostikov.co> | 2021-04-29 09:32:02 +0000 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2021-04-29 09:32:02 +0000 |
| commit | 0cbdeb7bf16f1fb0d03038dd5af324b7cdd7e850 (patch) | |
| tree | 2229673706f8c83d4f4789b68c339b78a8c3b299 | |
| parent | 61cf92ebddcad92d79d831178d3c7c9ed58d62e9 (diff) | |
| parent | 6be464ef8484063690840e6b06e7540f7416788a (diff) | |
| download | volse-hubzilla-0cbdeb7bf16f1fb0d03038dd5af324b7cdd7e850.tar.gz volse-hubzilla-0cbdeb7bf16f1fb0d03038dd5af324b7cdd7e850.tar.bz2 volse-hubzilla-0cbdeb7bf16f1fb0d03038dd5af324b7cdd7e850.zip | |
Merge branch 'dev' into 'dev'
Dev Sync
See merge request kostikov/core!1
| -rw-r--r-- | Zotlabs/Lib/Activity.php | 8 | ||||
| -rw-r--r-- | Zotlabs/Module/Admin/Site.php | 162 | ||||
| -rw-r--r-- | Zotlabs/Module/Display.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/New_channel.php | 76 | ||||
| -rw-r--r-- | Zotlabs/Module/Regate.php | 85 | ||||
| -rw-r--r-- | Zotlabs/Module/Register.php | 111 | ||||
| -rw-r--r-- | Zotlabs/Module/Search.php | 2 | ||||
| -rw-r--r-- | boot.php | 2 | ||||
| -rw-r--r-- | include/account.php | 22 | ||||
| -rw-r--r-- | util/hmessages.po | 2630 | ||||
| -rw-r--r-- | vendor/composer/ClassLoader.php | 6 | ||||
| -rw-r--r-- | vendor/composer/autoload_classmap.php | 3 | ||||
| -rw-r--r-- | vendor/composer/autoload_static.php | 3 |
13 files changed, 1755 insertions, 1357 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index 82e74fc83..e036c7b1e 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -1360,16 +1360,14 @@ class Activity { case 'Join': // A second Follow request, but we haven't approved the first one - if ($contact['abook_pending']) { return; } // We've already approved them or followed them first // Send an Accept back to them - set_abconfig($channel['channel_id'], $person_obj['id'], 'pubcrawl', 'their_follow_id', $their_follow_id); - Master::Summon(['Notifier', 'permissions_accept', $contact['abook_id']]); + Master::Summon(['Notifier', 'permission_accept', $contact['abook_id']]); return; case 'Accept': @@ -1471,9 +1469,9 @@ class Activity { if ($my_perms && $automatic) { // send an Accept for this Follow activity - Master::Summon(['Notifier', 'permissions_accept', $new_connection[0]['abook_id']]); + Master::Summon(['Notifier', 'permission_accept', $new_connection[0]['abook_id']]); // Send back a Follow notification to them - Master::Summon(['Notifier', 'permissions_create', $new_connection[0]['abook_id']]); + Master::Summon(['Notifier', 'permission_create', $new_connection[0]['abook_id']]); } $clone = []; diff --git a/Zotlabs/Module/Admin/Site.php b/Zotlabs/Module/Admin/Site.php index 8a7bb1180..3b2632411 100644 --- a/Zotlabs/Module/Admin/Site.php +++ b/Zotlabs/Module/Admin/Site.php @@ -5,9 +5,6 @@ namespace Zotlabs\Module\Admin; class Site { - // system cfgs - const ivo = 'invitation_only'; - const iva = 'invitation_also'; /** * @brief POST handler for Admin Site Page. @@ -129,7 +126,7 @@ class Site { //logger( print_r( $this->msgbg, true) ); //logger( print_r( $this->joo, true) ); if ($this->error === 0) { - set_config('system', 'register_duty', $this->register_duty); + set_config('system', 'register_duty', $this->register_duty); set_config('system', 'register_duty_jso', $this->joo); } else { notice('ZAR0130E,'.t('Errors') . ': ' . $this->error) . EOL . $this->msgfg; @@ -198,8 +195,8 @@ class Site { set_config('system','register_wo_email', $register_wo_email); set_config('system','minimum_age', $minimum_age); set_config('system','auto_channel_create', $reg_autochannel); - set_config('system',self::ivo, $invitation_only); - set_config('system',self::iva, $invitation_also); + set_config('system', 'invitation_only', $invitation_only); + set_config('system', 'invitation_also', $invitation_also); set_config('system','access_policy', $access_policy); set_config('system','account_abandon_days', $abandon_days); set_config('system','register_text', $register_text); @@ -323,9 +320,8 @@ class Site { REGISTER_APPROVE => t("Yes - with approval"), REGISTER_OPEN => t("Yes") ); - $this->register_duty ? get_config('system', 'register_duty') : ''; - $register_perday = get_config('system','max_daily_registrations'); - $register_perday ? '' : $register_perday = 50; + $this->register_duty = get_config('system', 'register_duty', '-:-'); + $register_perday = get_config('system','max_daily_registrations', 50); /* Acess policy */ $access_choices = Array( @@ -367,11 +363,10 @@ class Site { list($regdelay_n, $regdelay_u) = array(substr($regdelay,0,-1),substr($regdelay,-1)); $reg_delay = replace_macros(get_markup_template('field_duration.qmc.tpl'), array( - 'label' => t('Account registration delay'), + 'label' => t('Register verification delay'), 'qmc' => 'zar', - 'qmcid' => 'ZAR0860C', - 'help' => t('How long a registration request has to wait before validation can perform.' - . ' No delay if zero or no value.'), + 'qmcid' => '', + 'help' => t('Time to wait before a registration can be verified'), 'field' => array( 'name' => 'delay', 'title' => t('duration up from now'), @@ -390,25 +385,22 @@ class Site { list($regexpire_n, $regexpire_u) = array(substr($regexpire,0,-1),substr($regexpire,-1)); $reg_expire = replace_macros(get_markup_template('field_duration.qmc.tpl'), array( - 'label' => t('Account registration expiration'), + 'label' => t('Register verification expiration time'), 'qmc' => 'zar', - 'qmcid' => 'ZAR0862C', - 'help' => t('How long a registration to confirm remains valid.' - . ' Not expire if zero or no value.'), + 'qmcid' => '', + 'help' => t('Time before an unverified registration will expire'), 'field' => array( 'name' => 'expire', 'title' => t('duration up from now'), - 'value' => ($regexpire_n === false ? 99 : $regexpire_n), + 'value' => ($regexpire_n === false ? 3 : $regexpire_n), 'min' => '0', 'max' => '99', 'size' => '2', - 'default' => ($regexpire_u === false ? 'y' : $regexpire_u) + 'default' => ($regexpire_u === false ? 'd' : $regexpire_u) ), 'rabot' => $reg_rabots ) ); - $invitation_only = get_config('system',self::ivo); - $invitation_also = get_config('system',self::iva); $tao = ''; $t = get_markup_template("admin_site.tpl"); @@ -441,81 +433,72 @@ class Site { // Register // [hilmar-> - '$register_text' => array('register_text', + '$register_text' => [ + 'register_text', t("Register text"), htmlspecialchars(get_config('system','register_text'), ENT_QUOTES, 'UTF-8'), - t("Will be displayed prominently on the registration page.") . ' ' - . t('If you operate with register duties (see ZAR0830C), best practise is to tell cleartext about here'), - 'ZAR0810C'), - '$register_policy' => array('register_policy', + t("This text will be displayed prominently at the registration page") + ], + '$register_policy' => [ + 'register_policy', t("Does this site allow new member registration?"), get_config('system','register_policy'), "", $register_choices, - 'ZAR0820C'), - '$register_wo_email' => array('register_wo_email', - t("Registration is also possible without having to enter an email address."), - get_config('system','register_wo_email'), - t("Registration is also supported without requiring an email address from the applicant. Instead of the email address an artificial identification is generated, which has to be confirmed in a separate dialog. The default value is (Off) and corresponds to the registration procedure up to version 5.4.x."), - "", "", 'ZAR0824C'), - - '$register_duty' => array('register_duty', - t('Registration office on duty'), - $this->register_duty = get_config('system', 'register_duty'), - t('The weekdays and hours the register office is open for registrations') . '. ' - . t('Split weekdays and hours per `:`') . '. ' - . t('Separate weekday(s):hour(s) pairs with blank(s)') . '. ' - . t('Several values or ranges are to split by comma') . '. ' - . t('From-To ranges are joined with `-`') . '. ' - . t('ie') . ' `1-5:0900-1200,1300-1700 6:900-1230` ' . t('or') .' `1-2,4-5:800-1800` ' - . EOL . ' <a id="zar083a" class="zuia btn">' . t('Parse and test your input') . '</a>'. EOL - . t('If left empty, defaults to 24h open everyday the week (-:-).') . ' ' - . t('Note, ranges are specified as open-close pairs and in case of') - . ' 0900-1200 ' - . t('results to: opens 9h and closes 12h. If meant open 9h to 12h exactly, say `0900-1201`'), - 'ZAR0830C'), - '$register_perday' => array('register_perday', - t('Account registrations max per day'), - (x(get_config('system', 'max_daily_registrations'))) - ? get_config('system', 'max_daily_registrations') : 50, - t('How many registration requests the site accepts during one day. Unlimited if zero or no value. Default 50'), - 'ZAR0840C'), - '$register_sameip' => array('register_sameip', - t('Account registrations from same ip'), - (x(get_config('system', 'register_sameip'))) - ? get_config('system', 'register_sameip') : 3, - t('How many pending registration requests the site accepts from a same ip address.'), - 'ZAR0850C'), - '$reg_delay'=>$reg_delay, - '$reg_expire'=>$reg_expire, - '$reg_autochannel' => array('auto_channel_create', + ], + '$register_duty' => [ + 'register_duty', + t('Configure the registration open days/hours'), + get_config('system', 'register_duty', '-:-'), + t('Empty or \'-:-\' value will keep registration open 24/7 (default)') . EOL . + t('Weekdays and hours must be separated by colon \':\', From-To ranges with a dash `-` example: 1:800-1200') . EOL . + t('Weekday:Hour pairs must be separated by space \' \' example: 1:900-1700 2:900-1700') . EOL . + t('From-To ranges must be separated by comma \',\' example: 1:800-1200,1300-1700 or 1-2,4-5:900-1700') . EOL . + t('Advanced examples:') . ' 1-5:0900-1200,1300-1700 6:900-1230 ' . t('or') . ' 1-2,4-5:800-1800<br>' . EOL . + '<a id="zar083a" class="btn btn-sm btn-outline-secondary zuia">' . t('Check your configuration') . '</a>'. EOL + ], + '$register_perday' => [ + 'register_perday', + t('Max account registrations per day'), + get_config('system', 'max_daily_registrations', 50), + t('Unlimited if zero or no value - default 50') + ], + '$register_sameip' => [ + 'register_sameip', + t('Max account registrations from same IP'), + get_config('system', 'register_sameip', 3), + t('Unlimited if zero or no value - default 3') + ], + '$reg_delay' => $reg_delay, + '$reg_expire' => $reg_expire, + '$reg_autochannel' => [ + 'auto_channel_create', t("Auto channel create"), get_config('system','auto_channel_create', 1), - t("Auto create a channel when register a new account. When On, the register form will show additional fields for the channel-name and the nickname."), - "", "", 'ZAR0870C'), - - '$invitation_only' => array(self::ivo, - ($invitation_only === false ? '✗' : '✓') . ' ' . t("Invitation only"), - $invitation_only, - t("Only allow new member registrations with an invitation code. Above register policy must be set to Yes."), - "", "", 'ZAR0880C'), - - '$invitation_also' => array(self::iva, - ($invitation_also === false ? '✗' : '✓') . ' ' . t("Invitation also"), - $invitation_also, - t("Also allow new member registrations with an invitation code. Above register policy must be set to Yes."), - "", "", 'ZAR0881C'), - - '$verify_email' => array('verify_email', - t("Verify Email Addresses"), + t("If disabled the channel will be created in a separate step during the registration process") + ], + '$invitation_only' => [ + 'invitation_only', + t("Require invite code"), + $invitation_only + ], + '$invitation_also' => [ + 'invitation_also', + t("Allow invite code"), + $invitation_also + ], + '$verify_email' => [ + 'verify_email', + t("Require email address"), get_config('system','verify_email'), - t("Check to verify email addresses used in account registration (recommended)."), - "", "", 'ZAR0890C'), - '$abandon_days' => array('abandon_days', - t('Accounts abandoned after x days'), + t("The provided email address will be verified (recommended)") + ], + '$abandon_days' => [ + 'abandon_days', + t('Abandon account 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.') - ), + ], // <-hilmar] '$role' => $role, @@ -598,16 +581,13 @@ class Site { if ($this->isajax) { $op = (preg_match('/[a-z]{2,4}/', $_REQUEST['zarop'])) ? $_REQUEST['zarop'] : ''; if ($op == 'zar083') { - $this->msgbg = 'ZAR0130I Testmode:' . $this->eol . $this->msgbg; + $this->msgbg = 'Testmode:' . $this->eol . $this->msgbg; } else { killme(); exit; } } - if (! $this->register_duty) - $this->register_duty = '-:-'; - $ranges = preg_split('/\s+/', $this->register_duty); $this->msgbg .= '..ranges: ' . print_r(count($ranges),true) . $this->eol; @@ -696,11 +676,11 @@ class Site { $cdow = $this->wdconst[$adow]; // below is the essential algo to verify a date (of format Hi) meets an open or closed condition $t = date('Hi', ( rand(time(), 60*60*24+time()) ) ); - $how='closed'; + $how='close'; foreach ($aro[$adow] as $o => $v) { // $this->msgbg .= 'debug: ' . $o . ' gt ' . $t . ' / ' . $v . $this->eol; // 4devels if ($o > $t) { - $how = ($v ? 'open' : 'closed'); + $how = ($v ? 'open' : 'close'); break; } } diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php index eb97e77a0..21d3e2e08 100644 --- a/Zotlabs/Module/Display.php +++ b/Zotlabs/Module/Display.php @@ -325,7 +325,7 @@ class Display extends \Zotlabs\Web\Controller { if($parents_str) { $items = q("SELECT item.*, item.id AS item_id FROM item - WHERE parent in ( %s ) $item_normal ", + WHERE parent in ( %s ) $sql_extra $item_normal ", dbesc($parents_str) ); xchan_query($items); diff --git a/Zotlabs/Module/New_channel.php b/Zotlabs/Module/New_channel.php index 98aa480fe..84d492f8f 100644 --- a/Zotlabs/Module/New_channel.php +++ b/Zotlabs/Module/New_channel.php @@ -11,7 +11,7 @@ class New_channel extends \Zotlabs\Web\Controller { function init() { $cmd = ((argc() > 1) ? argv(1) : ''); - + if($cmd === 'autofill.json') { require_once('library/urlify/URLify.php'); $result = array('error' => false, 'message' => ''); @@ -20,14 +20,14 @@ class New_channel extends \Zotlabs\Web\Controller { $x = false; if(get_config('system','unicode_usernames')) { - $x = punify(mb_strtolower($n)); + $x = punify(mb_strtolower($n)); } if((! $x) || strlen($x) > 64) $x = strtolower(\URLify::transliterate($n)); - + $test = array(); - + // first name if(strpos($x,' ')) $test[] = legal_webbie(substr($x,0,strpos($x,' '))); @@ -44,19 +44,19 @@ class New_channel extends \Zotlabs\Web\Controller { json_return_and_die(check_webbie($test)); } - + if($cmd === 'checkaddr.json') { require_once('library/urlify/URLify.php'); $result = array('error' => false, 'message' => ''); $n = trim($_REQUEST['nick']); if(! $n) { - $n = trim($_REQUEST['name']); + $n = trim($_REQUEST['name']); } $x = false; if(get_config('system','unicode_usernames')) { - $x = punify(mb_strtolower($n)); + $x = punify(mb_strtolower($n)); } if((! $x) || strlen($x) > 64) @@ -64,7 +64,7 @@ class New_channel extends \Zotlabs\Web\Controller { $test = array(); - + // first name if(strpos($x,' ')) $test[] = legal_webbie(substr($x,0,strpos($x,' '))); @@ -80,57 +80,57 @@ class New_channel extends \Zotlabs\Web\Controller { $test[] = $n; $test[] = $n . mt_rand(1000,9999); } - + for($y = 0; $y < 100; $y ++) $test[] = 'id' . mt_rand(1000,9999); - + json_return_and_die(check_webbie($test)); } - - + + } - + function post() { - + $arr = $_POST; - + $acc = \App::get_account(); $arr['account_id'] = get_account_id(); - - // prevent execution by delegated channels as well as those not logged in. + + // prevent execution by delegated channels as well as those not logged in. // get_account_id() returns the account_id from the session. But \App::$account - // may point to the original authenticated account. - + // may point to the original authenticated account. + if((! $acc) || ($acc['account_id'] != $arr['account_id'])) { notice( t('Permission denied.') . EOL ); return; } - + $result = create_identity($arr); - + if(! $result['success']) { notice($result['message']); return; } - + $newuid = $result['channel']['channel_id']; - + change_channel($result['channel']['channel_id']); - - $next_page = get_config('system', 'workflow_channel_next', 'profiles'); + + $next_page = get_config('system', 'workflow_channel_next', 'profiles'); goaway(z_root() . '/' . $next_page); - + } - + function get() { - + $acc = \App::get_account(); - + if((! $acc) || $acc['account_id'] != get_account_id()) { notice( t('Permission denied.') . EOL); return; } - + $default_role = ''; $aid = get_account_id(); if($aid) { @@ -140,7 +140,7 @@ class New_channel extends \Zotlabs\Web\Controller { if($r && (! intval($r[0]['total']))) { $default_role = get_config('system','default_permissions_role','social'); } - + $limit = account_service_class_fetch(get_account_id(),'total_identities'); $canadd = true; if($r && ($limit !== false)) { @@ -155,7 +155,7 @@ class New_channel extends \Zotlabs\Web\Controller { } $name_help = '<span id="name_help_loading" style="display:none">' . t('Loading') . '</span><span id="name_help_text">'; - $name_help .= (($default_role) + $name_help .= (($default_role) ? t('Your real name is recommended.') : t('Examples: "Bob Jameson", "Lisa and her Horses", "Soccer", "Aviation Group"') ); @@ -176,10 +176,10 @@ class New_channel extends \Zotlabs\Web\Controller { $nickhub = '@' . \App::get_hostname(); $nickname = array('nickname', t('Choose a short nickname'), ((x($_REQUEST,'nickname')) ? $_REQUEST['nickname'] : ''), $nick_help, "*"); $role = array('permissions_role' , t('Channel role and privacy'), ($privacy_role) ? $privacy_role : 'social', t('Select a channel permission role compatible with your usage needs and privacy requirements.') . '<br>' . '<a href="help/member/member_guide#Channel_Permission_Roles" target="_blank">' . t('Read more about channel permission roles') . '</a>',$perm_roles); - + $o = replace_macros(get_markup_template('new_channel.tpl'), array( '$title' => t('Create a Channel'), - '$desc' => t('A channel is a unique network identity. It can represent a person (social network profile), a forum (group), a business or celebrity page, a newsfeed, and many other things.') , + '$desc' => t('A channel is a unique network identity. It can represent a person (social network profile), a forum (group), a business or celebrity page, a newsfeed, and many other things.') , '$label_import' => t('or <a href="import">import an existing channel</a> from another location.'), '$name' => $name, '$role' => $role, @@ -190,10 +190,10 @@ class New_channel extends \Zotlabs\Web\Controller { '$channel_usage_message' => $channel_usage_message, '$canadd' => $canadd )); - + return $o; - + } - - + + } diff --git a/Zotlabs/Module/Regate.php b/Zotlabs/Module/Regate.php index 372b65433..155f818ef 100644 --- a/Zotlabs/Module/Regate.php +++ b/Zotlabs/Module/Regate.php @@ -151,46 +151,62 @@ class Regate extends \Zotlabs\Web\Controller { zar_log('ZAR1238I ' . $msg . ' ' . $cra['account']['account_email'] . ' ' . $cra['account']['account_language']); + authenticate_success($cra['account'],null,true,false,true); + $nextpage = 'new_channel'; - $auto_create = get_config('system','auto_channel_create',1); + $auto_create = get_config('system', 'auto_channel_create', 1); if($auto_create) { - // prepare channel creation - if($reonar['chan.name']) - set_aconfig($cra['account']['account_id'], 'register', 'channel_name', $reonar['chan.name']); - if($reonar['chan.did1']) - set_aconfig($cra['account']['account_id'], 'register', 'channel_address', $reonar['chan.did1']); + $new_channel = ['success' => false]; - $permissions_role = get_config('system','default_permissions_role'); - if($permissions_role) - set_aconfig($cra['account']['account_id'], 'register', 'permissions_role', $permissions_role); - } + // We do not reserve a channel_address before the registration is verified + // and possibly approved by the admin. + // If the provided channel_address has been claimed meanwhile, + // we will proceed to /new_channel. - authenticate_success($cra['account'],null,true,false,true); + if(isset($reonar['chan.did1']) && check_webbie([$reonar['chan.did1']])) { - if($auto_create) { - // create channel - $new_channel = auto_channel_create($cra['account']['account_id']); - - if($new_channel['success']) { - $channel_id = $new_channel['channel']['channel_id']; - change_channel($channel_id); - $nextpage = 'profiles/' . $channel_id; - $msg = 'ZAR1239I ' . t('Channel successfull created') . ' ' . $did2; + // prepare channel creation + if($reonar['chan.name']) + set_aconfig($cra['account']['account_id'], 'register', 'channel_name', $reonar['chan.name']); + + if($reonar['chan.did1']) + set_aconfig($cra['account']['account_id'], 'register', 'channel_address', $reonar['chan.did1']); + + $permissions_role = get_config('system','default_permissions_role'); + if($permissions_role) + set_aconfig($cra['account']['account_id'], 'register', 'permissions_role', $permissions_role); + + // create channel + $new_channel = auto_channel_create($cra['account']['account_id']); + + if($new_channel['success']) { + $channel_id = $new_channel['channel']['channel_id']; + change_channel($channel_id); + $nextpage = 'profiles/' . $channel_id; + $msg_code = 'ZAR1239I'; + $msg = t('Channel successfull created') . ' ' . $did2; + } } - else { - $msg = 'ZAR1239E ' . t('Channel still not created') . ' ' . $did2; + + if(!$new_channel['success']) { + $msg_code = 'ZAR1239E'; + $msg = t('Automatic channel creation failed. Please create a channel.') . ' ' . $did2; + $nextpage = 'new_channel?name=' . $reonar['chan.name']; } - zar_log($msg . ' ' . $reonar['chan.did1'] . ' (' . $reonar['chan.name'] . ')'); + + zar_log($msg_code . ' ' . $msg . ' ' . $reonar['chan.did1'] . ' (' . $reonar['chan.name'] . ')'); + } unset($_SESSION['login_return_url']); } else { q("ROLLBACK"); - $msg = 'ZAR1238E ' . t('Account creation error'); - zar_log($msg . ':' . print_r($cra, true)); + $msg_code = 'ZAR1238E'; + $msg = t('Account creation error'); + zar_log($msg_code . ' ' . $msg . ': ' . print_r($cra, true)); } } else { @@ -200,25 +216,32 @@ class Regate extends \Zotlabs\Web\Controller { } else { // nothing to confirm - $msg = 'ZAR1236E' . ' ' . t('Verify failed'); + $msg_code = 'ZAR1236E'; + $msg = t('Verify failed'); } } else { - $msg = 'ZAR1235E' . ' ' . t('Token verification failed'); + $msg_code = 'ZAR1235E'; + $msg = t('Token verification failed'); } } else { - $msg = 'ZAR1234W' . ' ' . t('Request not inside time frame'); + $msg_code = 'ZAR1234W'; + $msg = t('Request not inside time frame'); //info($r[0]['reg_startup'] . EOL . $r[0]['reg_expire'] ); } } else { - $msg = 'ZAR1232E' . ' ' . t('Identity unknown'); - zar_log($msg . ':' . $did2 . $didx); + $msg_code = 'ZAR1232E'; + $msg = t('Identity unknown'); + zar_log($msg_code . ' ' . $msg . ':' . $did2 . $didx); } } else { - $msg = 'ZAR1231E' . t('dId2 mistaken'); + $msg_code = 'ZAR1231E'; + $msg = t('dId2 mistaken'); + zar_log($msg_code . ' ' . $msg); + } } diff --git a/Zotlabs/Module/Register.php b/Zotlabs/Module/Register.php index 601828d5c..56d3f2d22 100644 --- a/Zotlabs/Module/Register.php +++ b/Zotlabs/Module/Register.php @@ -47,7 +47,6 @@ class Register extends Controller { } } - function post() { check_form_security_token_redirectOnErr('/register', 'register'); @@ -61,24 +60,26 @@ class Register extends Controller { */ - $act = q("SELECT COUNT(*) AS act FROM account")[0]['act']; - $duty = zar_register_dutystate(); - $is247 = false; - $ip = $_SERVER['REMOTE_ADDR']; - $sameip = intval(get_config('system','register_sameip')); - $arr = $_POST; - $invite_code = ((x($arr,'invite_code')) ? notags(trim($arr['invite_code'])) : ''); - $invite_code = ((x($arr,'invite_code')) ? notags(trim($arr['invite_code'])) : ''); - $invite_code = ((x($arr,'invite_code')) ? notags(trim($arr['invite_code'])) : ''); - $name = ''; - $nick = ''; - $email = ((x($arr,'email')) ? notags(punify(trim($arr['email']))) : ''); - $password = ((x($arr,'password')) ? trim($arr['password']) : ''); - $password2 = ((x($arr,'password2')) ? trim($arr['password2']) : ''); + $act = q("SELECT COUNT(*) AS act FROM account")[0]['act']; + $is247 = false; + $ip = $_SERVER['REMOTE_ADDR']; + $sameip = intval(get_config('system','register_sameip', 3)); + $arr = $_POST; + $invite_code = ((x($arr,'invite_code')) ? notags(trim($arr['invite_code'])) : ''); + $name = ''; + $nick = ''; + $email = ((x($arr,'email')) ? notags(punify(trim($arr['email']))) : ''); + $password = ((x($arr,'password')) ? trim($arr['password']) : ''); + $password2 = ((x($arr,'password2')) ? trim($arr['password2']) : ''); $register_msg = ((x($arr,'register_msg')) ? notags(trim($arr['register_msg'])) : ''); + $reonar = []; + $auto_create = get_config('system','auto_channel_create', 1); + $duty = zar_register_dutystate(); - $reonar = []; - $auto_create = get_config('system','auto_channel_create', 1); + if (!get_config('system', 'register_duty_jso')) { + // if not yet configured default to true + $duty = array( 'isduty' => true, 'atfrm' => '', 'nowfmt' => ''); + } if($auto_create) { $name = escape_tags(trim($arr['name'])); @@ -113,27 +114,26 @@ class Register extends Controller { } if ($email) { - if (! preg_match('/^.{2,64}\@[a-z0-9.-]{4,32}\.[a-z]{2,12}$/', $email)) { - // msg! - notice(t('Not a valid email address') . EOL); + $email_result = check_account_email($email); + if ($email_result['error']) { + notice($email_result['message'] . EOL); return; } } // case when an invited prepares the own account by supply own pw, accept tos, prepage channel (if auto) if ($email && $invite_code) { - if ( preg_match('/^.{2,64}\@[a-z0-9.-]{4,32}\.[a-z]{2,12}$/', $email ) ) { - if ( preg_match('/^[a-z0-9]{12,12}$/', $invite_code ) ) { - $is247 = true; - } + if ( preg_match('/^[a-z0-9]{12,12}$/', $invite_code ) ) { + $is247 = true; } } if ($act > 0 && !$is247 && !$duty['isduty']) { // normally (except very 1st timr after install), that should never arrive here (ie js hack or sth like) // log suitable for f2b also - $logmsg = 'ZAR0230S Unexpected registration request off duty'; - zar_log($logmsg); + $logmsg = 'Unexpected registration request off duty'; + notice($logmsg); + zar_log('ZAR0230S ' . $logmsg); return; } @@ -149,19 +149,12 @@ class Register extends Controller { } } - // s2 max daily - // msg? - if ( !$is247 && self::check_reg_limits()['is'] ) return; - - if(!$password) { - // msg! + if (!$password) { notice(t('No password provided') . EOL); return; } - // pw1 == pw2 - if($password !== $password2) { - // msg! + if ($password !== $password2) { notice(t('Passwords do not match') . EOL); return; } @@ -208,7 +201,7 @@ class Register extends Controller { break; } - if($email_verify && ($policy == REGISTER_OPEN || $policy == REGISTER_APPROVE) ) + if($email_verify && ($policy == REGISTER_OPEN || $policy == REGISTER_APPROVE)) $flags = ($flags | ACCOUNT_UNVERIFIED); // $arr has $_POST; @@ -287,28 +280,27 @@ class Register extends Controller { return; } - } else { - $icdone = false; // no ivc entered - if ( ! $invonly) { + if (!$invonly) { // possibly the email is just in use ? $reg = q("SELECT * from register WHERE reg_vital = 1 AND reg_email = '%s'", - dbesc('e' . $email)); + dbesc($email) + ); - if ( ! $reg) - $act = q("SELECT * from account WHERE account_email = '%s'", dbesc($email)); + if (!$reg) { + $act = q("SELECT * from account WHERE account_email = '%s'", + dbesc($email) + ); + } // in case an invitation was made but the invitecode was not entered, better ignore. // goaway(z_root() . '/regate/' . bin2hex($reg['email'])); - if ( ! $reg && ! $act) { + if (! $reg && !$act) { // email useable - $well = true; - - } else { $msg = t('Email address already in use') . EOL; notice($msg); @@ -328,15 +320,21 @@ class Register extends Controller { } + // check max daily registrations after we have dealt with the invitecode + if (self::check_reg_limits()['is']) { + notice('Max registrations per day exceeded.'); + return; + } + if ($well) { if($policy == REGISTER_OPEN || $policy == REGISTER_APPROVE ) { - $cfgdelay = get_config( 'system', 'register_delay' ); + $cfgdelay = get_config('system', 'register_delay', '0i'); $reg_delayed = calculate_adue( $cfgdelay ); $regdelay = (($reg_delayed) ? datetime_convert(date_default_timezone_get(), 'UTC', $reg_delayed['due']) : $now); - $cfgexpire = get_config('system','register_expire' ); + $cfgexpire = get_config('system', 'register_expire', '3d'); $reg_expires = calculate_adue( $cfgexpire ); $regexpire = (($reg_expires) ? datetime_convert(date_default_timezone_get(), 'UTC', $reg_expires['due']) : datetime_convert('UTC', 'UTC', 'now + 99 years')); @@ -451,7 +449,6 @@ class Register extends Controller { } - function get() { $registration_is = ''; @@ -472,11 +469,11 @@ class Register extends Controller { $other_sites = '<a href="pubsites">' . t('Register at another affiliated hub in case when prefered') . '</a>'; } - if ( !get_config('system', 'register_duty_jso') ) { - // duty yet not configured - $duty = array( 'isduty' => false, 'atfrm' => '', 'nowfmt' => ''); - } else { - $duty = zar_register_dutystate(); + $duty = zar_register_dutystate(); + + if (!get_config('system', 'register_duty_jso')) { + // if not yet configured default to true + $duty = array( 'isduty' => true, 'atfrm' => '', 'nowfmt' => ''); } $invitations = false; @@ -578,9 +575,9 @@ class Register extends Controller { // check against register, account $rear = array( 'is' => false, 'rn' => 0, 'an' => 0, 'msg' => '' ); - $max_dailies = intval(get_config('system','max_daily_registrations')); + $max_dailies = intval(get_config('system', 'max_daily_registrations', 50)); - if ( $max_dailies ) { + if ($max_dailies) { $r = q("SELECT COUNT(reg_id) AS nr FROM register WHERE reg_vital = 1 AND reg_created > %s - INTERVAL %s", db_utcnow(), db_quoteinterval('1 day') @@ -589,7 +586,7 @@ class Register extends Controller { $rear['is'] = ( $r && $r[0]['nr'] >= $max_dailies ) ? true : false; $rear['rn'] = $r[0]['nr']; - if ( !$rear['is']) { + if (!$rear['is']) { $r = q("SELECT COUNT(account_id) AS nr FROM account WHERE account_created > %s - INTERVAL %s", db_utcnow(), db_quoteinterval('1 day') ); diff --git a/Zotlabs/Module/Search.php b/Zotlabs/Module/Search.php index 73dfa0816..2ad79e3f6 100644 --- a/Zotlabs/Module/Search.php +++ b/Zotlabs/Module/Search.php @@ -58,7 +58,7 @@ class Search extends Controller { $o .= search($search, 'search-box', '/search', ((local_channel()) ? true : false)); if (local_channel() && strpos($search, 'https://') === 0 && !$update && !$load) { - $j = Activity::fetch($search, App::get_channel()); + $j = Activity::fetch(punify($search), App::get_channel()); if ($j) { $AS = new ActivityStreams($j); if ($AS->is_valid()) { @@ -52,7 +52,7 @@ require_once('include/attach.php'); require_once('include/bbcode.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '5.5.5' ); +define ( 'STD_VERSION', '5.7' ); define ( 'ZOT_REVISION', '6.0' ); define ( 'DB_UPDATE_VERSION', 1244 ); diff --git a/include/account.php b/include/account.php index 349c6cfee..4c5437594 100644 --- a/include/account.php +++ b/include/account.php @@ -35,15 +35,20 @@ function check_account_email($email) { return $result; if(! validate_email($email)) - $result['message'] .= t('Email address not valid') . EOL; + $result['message'] = t('The provided email address is not valid') . EOL; elseif(! allowed_email($email)) - $result['message'] = t('Your email domain is not among those allowed on this site'); + $result['message'] = t('The provided email domain is not among those allowed on this site'); else { $r = q("select account_email from account where account_email = '%s' limit 1", dbesc($email) ); + if (!$r) { + $r = q("select reg_did2 from register where reg_did2 = '%s' limit 1", + dbesc($email) + ); + } if($r) { - $result['message'] .= t('Your email address is already registered at this site.'); + $result['message'] = t('The provided email address is already registered at this site'); } } if($result['message']) @@ -1195,8 +1200,15 @@ function get_account_techlevel($account_id = 0) { } function zar_log($msg='') { - file_put_contents('./zar.log', - date('Y-m-d_H:i:s') . ' ' . $msg . ', ip: § ' . $_SERVER['REMOTE_ADDR'] . ' §' . "\n", FILE_APPEND); + + if(get_config('system', 'register_logfile', 0)) { + file_put_contents('./zar.log', + date('Y-m-d_H:i:s') . ' ' . $msg . ', ip: § ' . $_SERVER['REMOTE_ADDR'] . ' §' . "\n", FILE_APPEND); + } + else { + logger('zar_log: ' . $msg . ', ip: § ' . $_SERVER['REMOTE_ADDR'] . ' §'); + } + return; } diff --git a/util/hmessages.po b/util/hmessages.po index b06690b8d..1b0738e02 100644 --- a/util/hmessages.po +++ b/util/hmessages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 5.4RC\n" +"Project-Id-Version: 5.6RC1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-23 10:52+0000\n" +"POT-Creation-Date: 2021-04-29 08:26+0000\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" @@ -21,8 +21,8 @@ msgstr "" #: ../../addon/cart/submodules/orderoptions.php:335 #: ../../addon/cart/submodules/orderoptions.php:359 #: ../../addon/cart/submodules/orderoptions.php:435 -#: ../../addon/cart/submodules/orderoptions.php:459 ../../include/text.php:3382 -#: ../../Zotlabs/Module/Admin/Site.php:191 +#: ../../addon/cart/submodules/orderoptions.php:459 ../../include/text.php:3395 +#: ../../Zotlabs/Module/Admin/Site.php:251 msgid "Default" msgstr "" @@ -79,8 +79,8 @@ msgstr "" #: ../../Zotlabs/Widget/Wiki_pages.php:99 #: ../../Zotlabs/Widget/Eventstools.php:16 ../../Zotlabs/Module/Tokens.php:188 #: ../../Zotlabs/Module/Import_items.php:129 -#: ../../Zotlabs/Module/Import.php:646 ../../Zotlabs/Module/Setup.php:304 -#: ../../Zotlabs/Module/Setup.php:344 ../../Zotlabs/Module/Group.php:151 +#: ../../Zotlabs/Module/Import.php:647 ../../Zotlabs/Module/Setup.php:306 +#: ../../Zotlabs/Module/Setup.php:346 ../../Zotlabs/Module/Group.php:151 #: ../../Zotlabs/Module/Group.php:167 ../../Zotlabs/Module/Oauth.php:111 #: ../../Zotlabs/Module/Chat.php:209 ../../Zotlabs/Module/Chat.php:248 #: ../../Zotlabs/Module/Poke.php:217 ../../Zotlabs/Module/Mitem.php:259 @@ -89,24 +89,25 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Themes.php:158 #: ../../Zotlabs/Module/Admin/Features.php:66 #: ../../Zotlabs/Module/Admin/Security.php:120 -#: ../../Zotlabs/Module/Admin/Accounts.php:168 -#: ../../Zotlabs/Module/Admin/Site.php:293 +#: ../../Zotlabs/Module/Admin/Accounts.php:309 +#: ../../Zotlabs/Module/Admin/Site.php:412 #: ../../Zotlabs/Module/Admin/Logs.php:84 #: ../../Zotlabs/Module/Admin/Channels.php:147 #: ../../Zotlabs/Module/Admin/Account_edit.php:73 #: ../../Zotlabs/Module/Admin/Profs.php:178 #: ../../Zotlabs/Module/Admin/Addons.php:442 -#: ../../Zotlabs/Module/Events.php:501 ../../Zotlabs/Module/Permcats.php:129 -#: ../../Zotlabs/Module/Mood.php:158 ../../Zotlabs/Module/Appman.php:155 +#: ../../Zotlabs/Module/Regate.php:384 ../../Zotlabs/Module/Events.php:501 +#: ../../Zotlabs/Module/Permcats.php:129 ../../Zotlabs/Module/Mood.php:158 +#: ../../Zotlabs/Module/Appman.php:155 #: ../../Zotlabs/Module/Email_validation.php:40 #: ../../Zotlabs/Module/Photos.php:1058 ../../Zotlabs/Module/Photos.php:1098 #: ../../Zotlabs/Module/Photos.php:1216 ../../Zotlabs/Module/Profiles.php:725 -#: ../../Zotlabs/Module/Invite.php:168 ../../Zotlabs/Module/Xchan.php:15 +#: ../../Zotlabs/Module/Invite.php:550 ../../Zotlabs/Module/Xchan.php:15 #: ../../Zotlabs/Module/Affinity.php:87 ../../Zotlabs/Module/Rate.php:168 #: ../../Zotlabs/Module/Settings/Network.php:62 #: ../../Zotlabs/Module/Settings/Features.php:48 #: ../../Zotlabs/Module/Settings/Channel.php:495 -#: ../../Zotlabs/Module/Settings/Account.php:103 +#: ../../Zotlabs/Module/Settings/Account.php:107 #: ../../Zotlabs/Module/Settings/Events.php:42 #: ../../Zotlabs/Module/Settings/Manage.php:43 #: ../../Zotlabs/Module/Settings/Channel_home.php:91 @@ -121,7 +122,7 @@ msgstr "" #: ../../Zotlabs/Module/Defperms.php:266 ../../Zotlabs/Module/Pconfig.php:116 #: ../../Zotlabs/Module/Oauth2.php:116 ../../Zotlabs/Module/Thing.php:328 #: ../../Zotlabs/Module/Thing.php:381 ../../Zotlabs/Module/Pdledit.php:108 -#: ../../Zotlabs/Module/Wiki.php:215 ../../Zotlabs/Module/Connedit.php:897 +#: ../../Zotlabs/Module/Wiki.php:214 ../../Zotlabs/Module/Connedit.php:897 #: ../../Zotlabs/Module/Locs.php:132 ../../Zotlabs/Module/Sources.php:125 #: ../../Zotlabs/Module/Sources.php:162 ../../Zotlabs/Lib/ThreadItem.php:827 #: ../../Zotlabs/Storage/Browser.php:382 @@ -177,29 +178,29 @@ msgstr "" #: ../../addon/libertree/Mod_Libertree.php:59 #: ../../addon/socialauth/Mod_SocialAuth.php:214 #: ../../addon/ljpost/Mod_Ljpost.php:63 ../../addon/ljpost/Mod_Ljpost.php:67 -#: ../../addon/ljpost/Mod_Ljpost.php:71 ../../include/conversation.php:1469 +#: ../../addon/ljpost/Mod_Ljpost.php:71 ../../include/conversation.php:1468 #: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145 -#: ../../include/dir_fns.php:146 ../../Zotlabs/Module/Import.php:635 -#: ../../Zotlabs/Module/Import.php:639 ../../Zotlabs/Module/Import.php:640 -#: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:177 -#: ../../Zotlabs/Module/Mitem.php:256 ../../Zotlabs/Module/Mitem.php:257 -#: ../../Zotlabs/Module/Filestorage.php:203 +#: ../../include/dir_fns.php:146 ../../Zotlabs/Module/Import.php:636 +#: ../../Zotlabs/Module/Import.php:640 ../../Zotlabs/Module/Import.php:641 +#: ../../Zotlabs/Module/Register.php:536 ../../Zotlabs/Module/Mitem.php:176 +#: ../../Zotlabs/Module/Mitem.php:177 ../../Zotlabs/Module/Mitem.php:256 +#: ../../Zotlabs/Module/Mitem.php:257 ../../Zotlabs/Module/Filestorage.php:203 #: ../../Zotlabs/Module/Filestorage.php:211 -#: ../../Zotlabs/Module/Admin/Site.php:259 ../../Zotlabs/Module/Events.php:478 +#: ../../Zotlabs/Module/Admin/Site.php:319 ../../Zotlabs/Module/Events.php:478 #: ../../Zotlabs/Module/Events.php:479 ../../Zotlabs/Module/Api.php:99 #: ../../Zotlabs/Module/Photos.php:673 ../../Zotlabs/Module/Profiles.php:683 #: ../../Zotlabs/Module/Settings/Channel.php:311 #: ../../Zotlabs/Module/Settings/Display.php:88 #: ../../Zotlabs/Module/Menu.php:163 ../../Zotlabs/Module/Menu.php:222 -#: ../../Zotlabs/Module/Defperms.php:198 ../../Zotlabs/Module/Wiki.php:227 -#: ../../Zotlabs/Module/Wiki.php:228 ../../Zotlabs/Module/Connedit.php:404 +#: ../../Zotlabs/Module/Defperms.php:198 ../../Zotlabs/Module/Wiki.php:226 +#: ../../Zotlabs/Module/Wiki.php:227 ../../Zotlabs/Module/Connedit.php:404 #: ../../Zotlabs/Module/Connedit.php:789 ../../Zotlabs/Module/Sources.php:124 #: ../../Zotlabs/Module/Sources.php:159 ../../Zotlabs/Lib/Libzotdir.php:165 #: ../../Zotlabs/Lib/Libzotdir.php:166 ../../Zotlabs/Lib/Libzotdir.php:168 #: ../../Zotlabs/Storage/Browser.php:310 ../../Zotlabs/Storage/Browser.php:311 #: ../../Zotlabs/Storage/Browser.php:312 ../../Zotlabs/Storage/Browser.php:389 #: ../../Zotlabs/Storage/Browser.php:391 ../../Zotlabs/Storage/Browser.php:552 -#: ../../boot.php:1716 +#: ../../boot.php:1721 msgid "No" msgstr "" @@ -244,28 +245,28 @@ msgstr "" #: ../../addon/libertree/Mod_Libertree.php:59 #: ../../addon/socialauth/Mod_SocialAuth.php:214 #: ../../addon/ljpost/Mod_Ljpost.php:63 ../../addon/ljpost/Mod_Ljpost.php:67 -#: ../../addon/ljpost/Mod_Ljpost.php:71 ../../include/conversation.php:1469 +#: ../../addon/ljpost/Mod_Ljpost.php:71 ../../include/conversation.php:1468 #: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145 -#: ../../include/dir_fns.php:146 ../../Zotlabs/Module/Import.php:635 -#: ../../Zotlabs/Module/Import.php:639 ../../Zotlabs/Module/Import.php:640 -#: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:177 -#: ../../Zotlabs/Module/Mitem.php:256 ../../Zotlabs/Module/Mitem.php:257 -#: ../../Zotlabs/Module/Filestorage.php:203 +#: ../../include/dir_fns.php:146 ../../Zotlabs/Module/Import.php:636 +#: ../../Zotlabs/Module/Import.php:640 ../../Zotlabs/Module/Import.php:641 +#: ../../Zotlabs/Module/Register.php:536 ../../Zotlabs/Module/Mitem.php:176 +#: ../../Zotlabs/Module/Mitem.php:177 ../../Zotlabs/Module/Mitem.php:256 +#: ../../Zotlabs/Module/Mitem.php:257 ../../Zotlabs/Module/Filestorage.php:203 #: ../../Zotlabs/Module/Filestorage.php:211 -#: ../../Zotlabs/Module/Admin/Site.php:261 ../../Zotlabs/Module/Events.php:478 +#: ../../Zotlabs/Module/Admin/Site.php:321 ../../Zotlabs/Module/Events.php:478 #: ../../Zotlabs/Module/Events.php:479 ../../Zotlabs/Module/Api.php:98 #: ../../Zotlabs/Module/Photos.php:673 ../../Zotlabs/Module/Profiles.php:683 #: ../../Zotlabs/Module/Settings/Channel.php:311 #: ../../Zotlabs/Module/Settings/Display.php:88 #: ../../Zotlabs/Module/Menu.php:163 ../../Zotlabs/Module/Menu.php:222 -#: ../../Zotlabs/Module/Defperms.php:198 ../../Zotlabs/Module/Wiki.php:227 -#: ../../Zotlabs/Module/Wiki.php:228 ../../Zotlabs/Module/Connedit.php:404 +#: ../../Zotlabs/Module/Defperms.php:198 ../../Zotlabs/Module/Wiki.php:226 +#: ../../Zotlabs/Module/Wiki.php:227 ../../Zotlabs/Module/Connedit.php:404 #: ../../Zotlabs/Module/Sources.php:124 ../../Zotlabs/Module/Sources.php:159 #: ../../Zotlabs/Lib/Libzotdir.php:165 ../../Zotlabs/Lib/Libzotdir.php:166 #: ../../Zotlabs/Lib/Libzotdir.php:168 ../../Zotlabs/Storage/Browser.php:310 #: ../../Zotlabs/Storage/Browser.php:311 ../../Zotlabs/Storage/Browser.php:312 #: ../../Zotlabs/Storage/Browser.php:389 ../../Zotlabs/Storage/Browser.php:391 -#: ../../Zotlabs/Storage/Browser.php:552 ../../boot.php:1716 +#: ../../Zotlabs/Storage/Browser.php:552 ../../boot.php:1721 msgid "Yes" msgstr "" @@ -420,7 +421,7 @@ msgid "Channel Reputation" msgstr "" #: ../../addon/channelreputation/channelreputation.php:233 -#: ../../include/acl_selectors.php:155 ../../Zotlabs/Widget/Pinned.php:160 +#: ../../include/acl_selectors.php:156 ../../Zotlabs/Widget/Pinned.php:158 #: ../../Zotlabs/Module/Photos.php:1275 ../../Zotlabs/Lib/ThreadItem.php:497 #: ../../Zotlabs/Storage/Browser.php:411 msgid "Close" @@ -476,17 +477,17 @@ msgstr "" #: ../../addon/xmpp/Mod_Xmpp.php:35 ../../Zotlabs/Module/Tokens.php:99 #: ../../Zotlabs/Module/Group.php:107 ../../Zotlabs/Module/Oauth.php:100 #: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Poke.php:165 -#: ../../Zotlabs/Module/Cdav.php:876 ../../Zotlabs/Module/Webpages.php:48 +#: ../../Zotlabs/Module/Cdav.php:877 ../../Zotlabs/Module/Webpages.php:48 #: ../../Zotlabs/Module/Pubstream.php:20 ../../Zotlabs/Module/Permcats.php:63 -#: ../../Zotlabs/Module/Lang.php:17 ../../Zotlabs/Module/Uexport.php:61 +#: ../../Zotlabs/Module/Lang.php:17 ../../Zotlabs/Module/Uexport.php:62 #: ../../Zotlabs/Module/Mood.php:134 ../../Zotlabs/Module/Cards.php:51 #: ../../Zotlabs/Module/Articles.php:52 ../../Zotlabs/Module/Bookmarks.php:78 -#: ../../Zotlabs/Module/Probe.php:19 ../../Zotlabs/Module/Invite.php:110 -#: ../../Zotlabs/Module/Notes.php:57 ../../Zotlabs/Module/Affinity.php:52 -#: ../../Zotlabs/Module/Defperms.php:190 ../../Zotlabs/Module/Oauth2.php:106 -#: ../../Zotlabs/Module/Randprof.php:29 ../../Zotlabs/Module/Pdledit.php:43 -#: ../../Zotlabs/Module/Wiki.php:52 ../../Zotlabs/Module/Suggest.php:40 -#: ../../Zotlabs/Module/Sources.php:88 +#: ../../Zotlabs/Module/Probe.php:19 ../../Zotlabs/Module/Invite.php:56 +#: ../../Zotlabs/Module/Invite.php:310 ../../Zotlabs/Module/Notes.php:57 +#: ../../Zotlabs/Module/Affinity.php:52 ../../Zotlabs/Module/Defperms.php:190 +#: ../../Zotlabs/Module/Oauth2.php:106 ../../Zotlabs/Module/Randprof.php:29 +#: ../../Zotlabs/Module/Pdledit.php:43 ../../Zotlabs/Module/Wiki.php:52 +#: ../../Zotlabs/Module/Suggest.php:40 ../../Zotlabs/Module/Sources.php:88 msgid "Not Installed" msgstr "" @@ -578,7 +579,7 @@ msgid "View Profile" msgstr "" #: ../../addon/openclipatar/openclipatar.php:58 ../../include/nav.php:120 -#: ../../include/channel.php:1543 +#: ../../include/channel.php:1567 msgid "Edit Profile" msgstr "" @@ -696,8 +697,8 @@ msgstr "" msgid "Queueworker Settings" msgstr "" -#: ../../addon/queueworker/Mod_Queueworker.php:116 ../../include/text.php:1152 -#: ../../include/text.php:1164 ../../Zotlabs/Widget/Notes.php:23 +#: ../../addon/queueworker/Mod_Queueworker.php:116 ../../include/text.php:1145 +#: ../../include/text.php:1157 ../../Zotlabs/Widget/Notes.php:23 #: ../../Zotlabs/Module/Admin/Profs.php:94 #: ../../Zotlabs/Module/Admin/Profs.php:114 ../../Zotlabs/Module/Cards.php:113 #: ../../Zotlabs/Module/Filer.php:54 ../../Zotlabs/Module/Articles.php:117 @@ -752,7 +753,7 @@ msgstr "" msgid "Photo Gallery" msgstr "" -#: ../../addon/gallery/Mod_Gallery.php:49 ../../include/channel.php:1440 +#: ../../addon/gallery/Mod_Gallery.php:49 ../../include/channel.php:1464 #: ../../Zotlabs/Module/Hcard.php:12 ../../Zotlabs/Module/Editwebpage.php:32 #: ../../Zotlabs/Module/Profile.php:27 ../../Zotlabs/Module/Webpages.php:39 #: ../../Zotlabs/Module/Filestorage.php:59 ../../Zotlabs/Module/Connect.php:17 @@ -783,7 +784,7 @@ msgstr "" #: ../../addon/openid/Mod_Id.php:53 ../../addon/mail/Mod_Mail.php:26 #: ../../addon/pumpio/pumpio.php:44 ../../addon/keepout/keepout.php:36 -#: ../../include/photos.php:27 ../../include/items.php:4001 +#: ../../include/photos.php:27 ../../include/items.php:4087 #: ../../include/attach.php:156 ../../include/attach.php:205 #: ../../include/attach.php:278 ../../include/attach.php:329 #: ../../include/attach.php:424 ../../include/attach.php:438 @@ -793,11 +794,11 @@ msgstr "" #: ../../Zotlabs/Module/Attach_edit.php:90 #: ../../Zotlabs/Module/Attach_edit.php:99 #: ../../Zotlabs/Module/Attach_edit.php:106 ../../Zotlabs/Module/Network.php:19 -#: ../../Zotlabs/Module/Register.php:80 ../../Zotlabs/Module/Setup.php:206 +#: ../../Zotlabs/Module/Register.php:197 ../../Zotlabs/Module/Setup.php:208 #: ../../Zotlabs/Module/Viewconnections.php:28 #: ../../Zotlabs/Module/Viewconnections.php:33 -#: ../../Zotlabs/Module/Channel.php:209 ../../Zotlabs/Module/Channel.php:364 -#: ../../Zotlabs/Module/Channel.php:403 ../../Zotlabs/Module/Group.php:15 +#: ../../Zotlabs/Module/Channel.php:209 ../../Zotlabs/Module/Channel.php:365 +#: ../../Zotlabs/Module/Channel.php:404 ../../Zotlabs/Module/Group.php:15 #: ../../Zotlabs/Module/Group.php:31 ../../Zotlabs/Module/Card_edit.php:51 #: ../../Zotlabs/Module/Editwebpage.php:68 #: ../../Zotlabs/Module/Editwebpage.php:89 @@ -806,8 +807,8 @@ msgstr "" #: ../../Zotlabs/Module/Chat.php:118 #: ../../Zotlabs/Module/Channel_calendar.php:232 #: ../../Zotlabs/Module/Like.php:242 ../../Zotlabs/Module/Poke.php:157 -#: ../../Zotlabs/Module/Item.php:496 ../../Zotlabs/Module/Item.php:515 -#: ../../Zotlabs/Module/Item.php:525 ../../Zotlabs/Module/Item.php:1436 +#: ../../Zotlabs/Module/Item.php:506 ../../Zotlabs/Module/Item.php:525 +#: ../../Zotlabs/Module/Item.php:535 ../../Zotlabs/Module/Item.php:1444 #: ../../Zotlabs/Module/Mitem.php:129 ../../Zotlabs/Module/Profile.php:99 #: ../../Zotlabs/Module/Profile.php:114 #: ../../Zotlabs/Module/Sharedwithme.php:19 @@ -821,7 +822,7 @@ msgstr "" #: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Events.php:277 #: ../../Zotlabs/Module/Manage.php:10 ../../Zotlabs/Module/Authtest.php:16 #: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Moderate.php:15 -#: ../../Zotlabs/Module/Display.php:428 ../../Zotlabs/Module/Common.php:38 +#: ../../Zotlabs/Module/Display.php:420 ../../Zotlabs/Module/Common.php:38 #: ../../Zotlabs/Module/New_channel.php:105 #: ../../Zotlabs/Module/New_channel.php:130 #: ../../Zotlabs/Module/Service_limits.php:11 ../../Zotlabs/Module/Mood.php:126 @@ -840,14 +841,14 @@ msgstr "" #: ../../Zotlabs/Module/Page.php:34 ../../Zotlabs/Module/Page.php:133 #: ../../Zotlabs/Module/Profiles.php:200 ../../Zotlabs/Module/Profiles.php:637 #: ../../Zotlabs/Module/Articles.php:89 ../../Zotlabs/Module/Bookmarks.php:70 -#: ../../Zotlabs/Module/Invite.php:21 ../../Zotlabs/Module/Invite.php:102 +#: ../../Zotlabs/Module/Invite.php:51 ../../Zotlabs/Module/Invite.php:302 #: ../../Zotlabs/Module/Block.php:24 ../../Zotlabs/Module/Block.php:74 #: ../../Zotlabs/Module/Rate.php:115 ../../Zotlabs/Module/Menu.php:130 #: ../../Zotlabs/Module/Menu.php:141 ../../Zotlabs/Module/Defperms.php:182 #: ../../Zotlabs/Module/Thing.php:282 ../../Zotlabs/Module/Thing.php:302 #: ../../Zotlabs/Module/Thing.php:343 ../../Zotlabs/Module/Pdledit.php:35 -#: ../../Zotlabs/Module/Wiki.php:59 ../../Zotlabs/Module/Wiki.php:285 -#: ../../Zotlabs/Module/Wiki.php:428 ../../Zotlabs/Module/Suggest.php:32 +#: ../../Zotlabs/Module/Wiki.php:59 ../../Zotlabs/Module/Wiki.php:284 +#: ../../Zotlabs/Module/Wiki.php:427 ../../Zotlabs/Module/Suggest.php:32 #: ../../Zotlabs/Module/Connedit.php:397 #: ../../Zotlabs/Module/Notifications.php:11 #: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78 @@ -858,12 +859,12 @@ msgid "Permission denied." msgstr "" #: ../../addon/openid/Mod_Id.php:85 ../../include/selectors.php:60 -#: ../../include/selectors.php:77 ../../include/channel.php:1723 +#: ../../include/selectors.php:77 ../../include/channel.php:1747 msgid "Male" msgstr "" #: ../../addon/openid/Mod_Id.php:87 ../../include/selectors.php:60 -#: ../../include/selectors.php:77 ../../include/channel.php:1721 +#: ../../include/selectors.php:77 ../../include/channel.php:1745 msgid "Female" msgstr "" @@ -909,10 +910,10 @@ msgstr "" #: ../../addon/openid/MysqlProvider.php:56 #: ../../addon/openid/MysqlProvider.php:57 ../../addon/redred/Mod_Redred.php:71 -#: ../../addon/rtof/Mod_Rtof.php:57 ../../include/network.php:1764 -#: ../../Zotlabs/Module/Cdav.php:1376 -#: ../../Zotlabs/Module/Admin/Accounts.php:171 -#: ../../Zotlabs/Module/Admin/Accounts.php:183 +#: ../../addon/rtof/Mod_Rtof.php:57 ../../include/network.php:1768 +#: ../../Zotlabs/Module/Cdav.php:1377 +#: ../../Zotlabs/Module/Admin/Accounts.php:316 +#: ../../Zotlabs/Module/Admin/Accounts.php:330 #: ../../Zotlabs/Module/Profiles.php:789 ../../Zotlabs/Module/Connedit.php:920 msgid "Email" msgstr "" @@ -1132,7 +1133,7 @@ msgstr "" msgid "Channel is required." msgstr "" -#: ../../addon/redred/Mod_Redred.php:29 ../../Zotlabs/Module/Network.php:322 +#: ../../addon/redred/Mod_Redred.php:29 ../../Zotlabs/Module/Network.php:326 msgid "Invalid channel." msgstr "" @@ -1190,7 +1191,7 @@ msgstr "" #: ../../include/items.php:441 ../../Zotlabs/Module/Import_items.php:120 #: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Group.php:99 #: ../../Zotlabs/Module/Like.php:342 ../../Zotlabs/Module/Cloud.php:123 -#: ../../Zotlabs/Module/Share.php:72 ../../Zotlabs/Module/Subthread.php:86 +#: ../../Zotlabs/Module/Share.php:72 ../../Zotlabs/Module/Subthread.php:89 #: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:82 #: ../../Zotlabs/Web/WebServer.php:115 msgid "Permission denied" @@ -1235,11 +1236,11 @@ msgstr "" msgid "0 or blank to import all available" msgstr "" -#: ../../addon/redphotos/redphotohelper.php:71 ../../addon/pubcrawl/as.php:2049 -#: ../../addon/diaspora/Receiver.php:1641 ../../include/text.php:2253 +#: ../../addon/redphotos/redphotohelper.php:71 ../../addon/pubcrawl/as.php:2101 +#: ../../addon/diaspora/Receiver.php:1649 ../../include/text.php:2254 #: ../../include/conversation.php:128 ../../Zotlabs/Module/Like.php:439 -#: ../../Zotlabs/Module/Tagger.php:71 ../../Zotlabs/Module/Subthread.php:112 -#: ../../Zotlabs/Lib/Activity.php:3229 +#: ../../Zotlabs/Module/Tagger.php:71 ../../Zotlabs/Module/Subthread.php:115 +#: ../../Zotlabs/Lib/Activity.php:3264 msgid "photo" msgstr "" @@ -1371,7 +1372,7 @@ msgid "Post to GNU social" msgstr "" #: ../../addon/statusnet/statusnet.php:593 -#: ../../Zotlabs/Module/Admin/Site.php:301 +#: ../../Zotlabs/Module/Admin/Site.php:420 msgid "Site name" msgstr "" @@ -1436,7 +1437,7 @@ msgstr "" #: ../../addon/wppost/wppost.php:173 ../../addon/wppost/Mod_Wppost.php:98 #: ../../addon/dwpost/Mod_Dwpost.php:69 ../../addon/dwpost/dwpost.php:134 -#: ../../addon/ljpost/ljpost.php:134 ../../Zotlabs/Module/Wiki.php:384 +#: ../../addon/ljpost/ljpost.php:134 ../../Zotlabs/Module/Wiki.php:383 msgid "Source" msgstr "" @@ -1559,16 +1560,16 @@ msgstr "" msgid "Until modified date yyyy-mm-dd" msgstr "" -#: ../../addon/hsse/hsse.php:82 ../../include/conversation.php:1331 +#: ../../addon/hsse/hsse.php:82 ../../include/conversation.php:1332 msgid "Set your location" msgstr "" -#: ../../addon/hsse/hsse.php:83 ../../include/conversation.php:1332 +#: ../../addon/hsse/hsse.php:83 ../../include/conversation.php:1333 msgid "Clear browser location" msgstr "" #: ../../addon/hsse/hsse.php:95 ../../addon/mail/Mod_Mail.php:167 -#: ../../addon/mail/Mod_Mail.php:310 ../../include/conversation.php:1344 +#: ../../addon/mail/Mod_Mail.php:310 ../../include/conversation.php:1345 #: ../../Zotlabs/Module/Article_edit.php:100 #: ../../Zotlabs/Module/Card_edit.php:101 #: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Chat.php:220 @@ -1576,129 +1577,129 @@ msgstr "" msgid "Insert web link" msgstr "" -#: ../../addon/hsse/hsse.php:99 ../../include/conversation.php:1348 +#: ../../addon/hsse/hsse.php:99 ../../include/conversation.php:1349 msgid "Embed (existing) photo from your photo albums" msgstr "" #: ../../addon/hsse/hsse.php:134 ../../addon/mail/Mod_Mail.php:120 -#: ../../addon/mail/Mod_Mail.php:241 ../../include/conversation.php:1383 +#: ../../addon/mail/Mod_Mail.php:241 ../../include/conversation.php:1382 #: ../../Zotlabs/Module/Chat.php:218 msgid "Please enter a link URL:" msgstr "" -#: ../../addon/hsse/hsse.php:135 ../../include/conversation.php:1384 +#: ../../addon/hsse/hsse.php:135 ../../include/conversation.php:1383 msgid "Tag term:" msgstr "" -#: ../../addon/hsse/hsse.php:136 ../../include/conversation.php:1385 +#: ../../addon/hsse/hsse.php:136 ../../include/conversation.php:1384 msgid "Where are you right now?" msgstr "" -#: ../../addon/hsse/hsse.php:139 ../../include/conversation.php:1388 +#: ../../addon/hsse/hsse.php:139 ../../include/conversation.php:1387 #: ../../Zotlabs/Module/Profile_photo.php:509 -#: ../../Zotlabs/Module/Cover_photo.php:430 ../../Zotlabs/Module/Wiki.php:403 +#: ../../Zotlabs/Module/Cover_photo.php:430 ../../Zotlabs/Module/Wiki.php:402 msgid "Choose images to embed" msgstr "" -#: ../../addon/hsse/hsse.php:140 ../../include/conversation.php:1389 +#: ../../addon/hsse/hsse.php:140 ../../include/conversation.php:1388 #: ../../Zotlabs/Module/Profile_photo.php:510 -#: ../../Zotlabs/Module/Cover_photo.php:431 ../../Zotlabs/Module/Wiki.php:404 +#: ../../Zotlabs/Module/Cover_photo.php:431 ../../Zotlabs/Module/Wiki.php:403 msgid "Choose an album" msgstr "" -#: ../../addon/hsse/hsse.php:141 ../../include/conversation.php:1390 +#: ../../addon/hsse/hsse.php:141 ../../include/conversation.php:1389 msgid "Choose a different album..." msgstr "" -#: ../../addon/hsse/hsse.php:142 ../../include/conversation.php:1391 +#: ../../addon/hsse/hsse.php:142 ../../include/conversation.php:1390 #: ../../Zotlabs/Module/Profile_photo.php:512 -#: ../../Zotlabs/Module/Cover_photo.php:433 ../../Zotlabs/Module/Wiki.php:406 +#: ../../Zotlabs/Module/Cover_photo.php:433 ../../Zotlabs/Module/Wiki.php:405 msgid "Error getting album list" msgstr "" -#: ../../addon/hsse/hsse.php:143 ../../include/conversation.php:1392 +#: ../../addon/hsse/hsse.php:143 ../../include/conversation.php:1391 #: ../../Zotlabs/Module/Profile_photo.php:513 -#: ../../Zotlabs/Module/Cover_photo.php:434 ../../Zotlabs/Module/Wiki.php:407 +#: ../../Zotlabs/Module/Cover_photo.php:434 ../../Zotlabs/Module/Wiki.php:406 msgid "Error getting photo link" msgstr "" -#: ../../addon/hsse/hsse.php:144 ../../include/conversation.php:1393 +#: ../../addon/hsse/hsse.php:144 ../../include/conversation.php:1392 #: ../../Zotlabs/Module/Profile_photo.php:514 -#: ../../Zotlabs/Module/Cover_photo.php:435 ../../Zotlabs/Module/Wiki.php:408 +#: ../../Zotlabs/Module/Cover_photo.php:435 ../../Zotlabs/Module/Wiki.php:407 msgid "Error getting album" msgstr "" -#: ../../addon/hsse/hsse.php:145 ../../include/conversation.php:1394 +#: ../../addon/hsse/hsse.php:145 ../../include/conversation.php:1393 msgid "Comments enabled" msgstr "" -#: ../../addon/hsse/hsse.php:146 ../../include/conversation.php:1395 +#: ../../addon/hsse/hsse.php:146 ../../include/conversation.php:1394 msgid "Comments disabled" msgstr "" -#: ../../addon/hsse/hsse.php:153 ../../include/conversation.php:1405 +#: ../../addon/hsse/hsse.php:153 ../../include/conversation.php:1404 #: ../../Zotlabs/Module/Webpages.php:262 ../../Zotlabs/Module/Events.php:486 #: ../../Zotlabs/Module/Photos.php:1099 ../../Zotlabs/Lib/ThreadItem.php:837 msgid "Preview" msgstr "" -#: ../../addon/hsse/hsse.php:186 ../../include/conversation.php:1438 +#: ../../addon/hsse/hsse.php:186 ../../include/conversation.php:1437 #: ../../Zotlabs/Widget/Cdav.php:136 ../../Zotlabs/Module/Webpages.php:256 #: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1078 -#: ../../Zotlabs/Module/Wiki.php:301 ../../Zotlabs/Module/Layouts.php:194 +#: ../../Zotlabs/Module/Wiki.php:300 ../../Zotlabs/Module/Layouts.php:194 msgid "Share" msgstr "" -#: ../../addon/hsse/hsse.php:195 ../../include/conversation.php:1447 +#: ../../addon/hsse/hsse.php:195 ../../include/conversation.php:1446 msgid "Page link name" msgstr "" -#: ../../addon/hsse/hsse.php:198 ../../include/conversation.php:1450 +#: ../../addon/hsse/hsse.php:198 ../../include/conversation.php:1449 msgid "Post as" msgstr "" -#: ../../addon/hsse/hsse.php:200 ../../include/conversation.php:1452 +#: ../../addon/hsse/hsse.php:200 ../../include/conversation.php:1451 #: ../../Zotlabs/Lib/ThreadItem.php:828 msgid "Bold" msgstr "" -#: ../../addon/hsse/hsse.php:201 ../../include/conversation.php:1453 +#: ../../addon/hsse/hsse.php:201 ../../include/conversation.php:1452 #: ../../Zotlabs/Lib/ThreadItem.php:829 msgid "Italic" msgstr "" -#: ../../addon/hsse/hsse.php:202 ../../include/conversation.php:1454 +#: ../../addon/hsse/hsse.php:202 ../../include/conversation.php:1453 #: ../../Zotlabs/Lib/ThreadItem.php:830 msgid "Underline" msgstr "" -#: ../../addon/hsse/hsse.php:203 ../../include/conversation.php:1455 +#: ../../addon/hsse/hsse.php:203 ../../include/conversation.php:1454 #: ../../Zotlabs/Lib/ThreadItem.php:831 msgid "Quote" msgstr "" -#: ../../addon/hsse/hsse.php:204 ../../include/conversation.php:1456 +#: ../../addon/hsse/hsse.php:204 ../../include/conversation.php:1455 #: ../../Zotlabs/Lib/ThreadItem.php:832 msgid "Code" msgstr "" -#: ../../addon/hsse/hsse.php:205 ../../include/conversation.php:1457 +#: ../../addon/hsse/hsse.php:205 ../../include/conversation.php:1456 #: ../../Zotlabs/Lib/ThreadItem.php:834 msgid "Attach/Upload file" msgstr "" -#: ../../addon/hsse/hsse.php:208 ../../include/conversation.php:1460 -#: ../../Zotlabs/Module/Wiki.php:400 +#: ../../addon/hsse/hsse.php:208 ../../include/conversation.php:1459 +#: ../../Zotlabs/Module/Wiki.php:399 msgid "Embed an image from your albums" msgstr "" #: ../../addon/hsse/hsse.php:209 ../../addon/hsse/hsse.php:258 -#: ../../include/conversation.php:1461 ../../include/conversation.php:1516 +#: ../../include/conversation.php:1460 ../../include/conversation.php:1515 #: ../../Zotlabs/Module/Article_edit.php:131 #: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88 #: ../../Zotlabs/Module/Card_edit.php:132 ../../Zotlabs/Module/Oauth.php:112 #: ../../Zotlabs/Module/Oauth.php:138 ../../Zotlabs/Module/Editwebpage.php:169 -#: ../../Zotlabs/Module/Cdav.php:1058 ../../Zotlabs/Module/Cdav.php:1390 +#: ../../Zotlabs/Module/Cdav.php:1059 ../../Zotlabs/Module/Cdav.php:1391 #: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138 #: ../../Zotlabs/Module/Editpost.php:111 #: ../../Zotlabs/Module/Admin/Addons.php:427 @@ -1707,32 +1708,32 @@ msgstr "" #: ../../Zotlabs/Module/Editlayout.php:140 #: ../../Zotlabs/Module/Cover_photo.php:428 #: ../../Zotlabs/Module/Profiles.php:803 ../../Zotlabs/Module/Oauth2.php:117 -#: ../../Zotlabs/Module/Oauth2.php:145 ../../Zotlabs/Module/Wiki.php:368 -#: ../../Zotlabs/Module/Wiki.php:401 ../../Zotlabs/Module/Connedit.php:934 +#: ../../Zotlabs/Module/Oauth2.php:145 ../../Zotlabs/Module/Wiki.php:367 +#: ../../Zotlabs/Module/Wiki.php:400 ../../Zotlabs/Module/Connedit.php:934 #: ../../Zotlabs/Storage/Browser.php:383 msgid "Cancel" msgstr "" #: ../../addon/hsse/hsse.php:210 ../../addon/hsse/hsse.php:257 -#: ../../include/conversation.php:1462 ../../include/conversation.php:1515 +#: ../../include/conversation.php:1461 ../../include/conversation.php:1514 #: ../../Zotlabs/Module/Profile_photo.php:508 -#: ../../Zotlabs/Module/Cover_photo.php:429 ../../Zotlabs/Module/Wiki.php:402 +#: ../../Zotlabs/Module/Cover_photo.php:429 ../../Zotlabs/Module/Wiki.php:401 msgid "OK" msgstr "" -#: ../../addon/hsse/hsse.php:212 ../../include/conversation.php:1464 +#: ../../addon/hsse/hsse.php:212 ../../include/conversation.php:1463 msgid "Toggle voting" msgstr "" -#: ../../addon/hsse/hsse.php:215 ../../include/conversation.php:1471 +#: ../../addon/hsse/hsse.php:215 ../../include/conversation.php:1470 msgid "Disable comments" msgstr "" -#: ../../addon/hsse/hsse.php:216 ../../include/conversation.php:1472 +#: ../../addon/hsse/hsse.php:216 ../../include/conversation.php:1471 msgid "Toggle comments" msgstr "" -#: ../../addon/hsse/hsse.php:221 ../../include/conversation.php:1478 +#: ../../addon/hsse/hsse.php:221 ../../include/conversation.php:1477 #: ../../Zotlabs/Module/Article_edit.php:117 #: ../../Zotlabs/Module/Card_edit.php:118 #: ../../Zotlabs/Module/Editblock.php:129 ../../Zotlabs/Module/Photos.php:674 @@ -1740,30 +1741,30 @@ msgstr "" msgid "Title (optional)" msgstr "" -#: ../../addon/hsse/hsse.php:224 ../../include/conversation.php:1482 +#: ../../addon/hsse/hsse.php:224 ../../include/conversation.php:1481 msgid "Categories (optional, comma-separated list)" msgstr "" -#: ../../addon/hsse/hsse.php:225 ../../include/conversation.php:1483 +#: ../../addon/hsse/hsse.php:225 ../../include/conversation.php:1482 #: ../../Zotlabs/Module/Events.php:487 msgid "Permission settings" msgstr "" -#: ../../addon/hsse/hsse.php:247 ../../include/conversation.php:1505 +#: ../../addon/hsse/hsse.php:247 ../../include/conversation.php:1504 msgid "Other networks and post services" msgstr "" #: ../../addon/hsse/hsse.php:250 ../../addon/mail/Mod_Mail.php:171 -#: ../../addon/mail/Mod_Mail.php:314 ../../include/conversation.php:1508 +#: ../../addon/mail/Mod_Mail.php:314 ../../include/conversation.php:1507 msgid "Set expiration date" msgstr "" -#: ../../addon/hsse/hsse.php:253 ../../include/conversation.php:1511 +#: ../../addon/hsse/hsse.php:253 ../../include/conversation.php:1510 msgid "Set publish date" msgstr "" #: ../../addon/hsse/hsse.php:255 ../../addon/mail/Mod_Mail.php:173 -#: ../../addon/mail/Mod_Mail.php:316 ../../include/conversation.php:1513 +#: ../../addon/mail/Mod_Mail.php:316 ../../include/conversation.php:1512 #: ../../Zotlabs/Module/Chat.php:219 ../../Zotlabs/Lib/ThreadItem.php:841 msgid "Encrypt text" msgstr "" @@ -1878,36 +1879,36 @@ msgstr "" msgid "Enter some text" msgstr "" -#: ../../addon/pubcrawl/as.php:1183 ../../include/cdav.php:158 +#: ../../addon/pubcrawl/as.php:1189 ../../include/cdav.php:158 #: ../../include/cdav.php:159 ../../include/cdav.php:167 #: ../../include/conversation.php:1214 ../../Zotlabs/Widget/Album.php:84 -#: ../../Zotlabs/Widget/Pinned.php:270 ../../Zotlabs/Widget/Portfolio.php:95 +#: ../../Zotlabs/Widget/Pinned.php:268 ../../Zotlabs/Widget/Portfolio.php:95 #: ../../Zotlabs/Module/Embedphotos.php:177 ../../Zotlabs/Module/Photos.php:793 -#: ../../Zotlabs/Module/Photos.php:1255 ../../Zotlabs/Lib/Activity.php:1529 +#: ../../Zotlabs/Module/Photos.php:1255 ../../Zotlabs/Lib/Activity.php:1552 #: ../../Zotlabs/Lib/Apps.php:1112 ../../Zotlabs/Lib/Apps.php:1196 msgid "Unknown" msgstr "" -#: ../../addon/pubcrawl/as.php:1475 ../../addon/pubcrawl/as.php:1887 -#: ../../addon/pubcrawl/as.php:2095 ../../include/network.php:1763 -#: ../../Zotlabs/Lib/Activity.php:3079 ../../Zotlabs/Lib/Activity.php:3271 +#: ../../addon/pubcrawl/as.php:1490 ../../addon/pubcrawl/as.php:1939 +#: ../../addon/pubcrawl/as.php:2147 ../../include/network.php:1767 +#: ../../Zotlabs/Lib/Activity.php:3114 ../../Zotlabs/Lib/Activity.php:3306 msgid "ActivityPub" msgstr "" -#: ../../addon/pubcrawl/as.php:2049 ../../addon/diaspora/Receiver.php:1641 -#: ../../Zotlabs/Module/Like.php:439 ../../Zotlabs/Module/Subthread.php:112 +#: ../../addon/pubcrawl/as.php:2101 ../../addon/diaspora/Receiver.php:1649 +#: ../../Zotlabs/Module/Like.php:439 ../../Zotlabs/Module/Subthread.php:115 msgid "status" msgstr "" -#: ../../addon/pubcrawl/as.php:2086 ../../addon/diaspora/Receiver.php:1587 +#: ../../addon/pubcrawl/as.php:2138 ../../addon/diaspora/Receiver.php:1595 #: ../../include/conversation.php:174 ../../Zotlabs/Module/Like.php:471 -#: ../../Zotlabs/Lib/Activity.php:3262 +#: ../../Zotlabs/Lib/Activity.php:3297 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "" -#: ../../addon/pubcrawl/as.php:2088 ../../include/conversation.php:177 -#: ../../Zotlabs/Module/Like.php:473 ../../Zotlabs/Lib/Activity.php:3264 +#: ../../addon/pubcrawl/as.php:2140 ../../include/conversation.php:177 +#: ../../Zotlabs/Module/Like.php:473 ../../Zotlabs/Lib/Activity.php:3299 #, php-format msgid "%1$s doesn't like %2$s's %3$s" msgstr "" @@ -2199,11 +2200,11 @@ msgstr "" #: ../../Zotlabs/Widget/Wiki_page_history.php:22 #: ../../Zotlabs/Module/Group.php:155 ../../Zotlabs/Module/Oauth.php:113 #: ../../Zotlabs/Module/Oauth.php:139 ../../Zotlabs/Module/Chat.php:257 -#: ../../Zotlabs/Module/Cdav.php:1372 ../../Zotlabs/Module/Sharedwithme.php:106 +#: ../../Zotlabs/Module/Cdav.php:1373 ../../Zotlabs/Module/Sharedwithme.php:106 #: ../../Zotlabs/Module/Admin/Channels.php:159 #: ../../Zotlabs/Module/Oauth2.php:118 ../../Zotlabs/Module/Oauth2.php:146 -#: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Module/Connedit.php:916 -#: ../../Zotlabs/Lib/NativeWikiPage.php:563 +#: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Module/Connedit.php:916 +#: ../../Zotlabs/Lib/NativeWikiPage.php:576 #: ../../Zotlabs/Storage/Browser.php:377 msgid "Name" msgstr "" @@ -2211,7 +2212,7 @@ msgstr "" #: ../../addon/rendezvous/rendezvous.php:173 #: ../../addon/cart/submodules/hzservices.php:655 #: ../../addon/cart/submodules/manualcat.php:260 -#: ../../Zotlabs/Module/Cdav.php:1014 ../../Zotlabs/Module/Events.php:481 +#: ../../Zotlabs/Module/Cdav.php:1015 ../../Zotlabs/Module/Events.php:481 #: ../../Zotlabs/Module/Appman.php:145 ../../Zotlabs/Module/Rbmark.php:101 msgid "Description" msgstr "" @@ -2291,7 +2292,7 @@ msgstr "" msgid "You have no rendezvous. Press the button above to create a rendezvous!" msgstr "" -#: ../../addon/rendezvous/rendezvous.php:401 ../../Zotlabs/Module/Setup.php:718 +#: ../../addon/rendezvous/rendezvous.php:401 ../../Zotlabs/Module/Setup.php:720 msgid "Errors encountered creating database tables." msgstr "" @@ -2351,10 +2352,11 @@ msgid "To:" msgstr "" #: ../../addon/mail/Mod_Mail.php:161 ../../addon/mail/Mod_Mail.php:303 +#: ../../Zotlabs/Module/Invite.php:542 msgid "Subject:" msgstr "" -#: ../../addon/mail/Mod_Mail.php:164 ../../Zotlabs/Module/Invite.php:157 +#: ../../addon/mail/Mod_Mail.php:164 ../../Zotlabs/Module/Invite.php:539 msgid "Your message:" msgstr "" @@ -2826,7 +2828,8 @@ msgstr "" #: ../../addon/cart/submodules/orderoptions.php:358 #: ../../addon/cart/submodules/orderoptions.php:434 #: ../../addon/cart/submodules/orderoptions.php:458 -#: ../../include/datetime.php:211 ../../Zotlabs/Module/Events.php:468 +#: ../../include/js_strings.php:123 ../../include/datetime.php:211 +#: ../../Zotlabs/Module/Register.php:522 ../../Zotlabs/Module/Events.php:468 #: ../../Zotlabs/Module/Events.php:473 ../../Zotlabs/Module/Appman.php:143 #: ../../Zotlabs/Module/Appman.php:144 ../../Zotlabs/Module/Profiles.php:747 #: ../../Zotlabs/Module/Profiles.php:751 @@ -3064,7 +3067,7 @@ msgid "Unable to create a unique channel address. Import failed." msgstr "" #: ../../addon/diaspora/import_diaspora.php:142 -#: ../../Zotlabs/Module/Import.php:594 +#: ../../Zotlabs/Module/Import.php:595 msgid "Import completed." msgstr "" @@ -3087,6 +3090,12 @@ msgstr "" msgid "Allow any Diaspora member to comment or like your public posts" msgstr "" +#: ../../addon/diaspora/Mod_Diaspora.php:77 +msgid "" +"If this setting is disabled only your contacts will be able to comment or " +"like your public posts" +msgstr "" + #: ../../addon/diaspora/Mod_Diaspora.php:81 msgid "Prevent your hashtags from being redirected to other sites" msgstr "" @@ -3103,22 +3112,22 @@ msgstr "" msgid "Diaspora Protocol" msgstr "" -#: ../../addon/diaspora/Receiver.php:1591 +#: ../../addon/diaspora/Receiver.php:1599 #, php-format msgid "%1$s dislikes %2$s's %3$s" msgstr "" -#: ../../addon/diaspora/Receiver.php:2218 ../../Zotlabs/Module/Like.php:481 +#: ../../addon/diaspora/Receiver.php:2226 ../../Zotlabs/Module/Like.php:481 #, php-format msgid "%1$s is attending %2$s's %3$s" msgstr "" -#: ../../addon/diaspora/Receiver.php:2220 ../../Zotlabs/Module/Like.php:483 +#: ../../addon/diaspora/Receiver.php:2228 ../../Zotlabs/Module/Like.php:483 #, php-format msgid "%1$s is not attending %2$s's %3$s" msgstr "" -#: ../../addon/diaspora/Receiver.php:2222 ../../Zotlabs/Module/Like.php:485 +#: ../../addon/diaspora/Receiver.php:2230 ../../Zotlabs/Module/Like.php:485 #, php-format msgid "%1$s may attend %2$s's %3$s" msgstr "" @@ -3206,7 +3215,7 @@ msgid "Web link." msgstr "" #: ../../addon/workflow/workflow.php:2617 -#: ../../addon/workflow/workflow.php:2678 ../../Zotlabs/Module/Cdav.php:1374 +#: ../../addon/workflow/workflow.php:2678 ../../Zotlabs/Module/Cdav.php:1375 #: ../../Zotlabs/Module/Connedit.php:918 msgid "Title" msgstr "" @@ -3338,8 +3347,10 @@ msgctxt "opensearch" msgid "$Projectname" msgstr "" -#: ../../addon/opensearch/opensearch.php:42 ../../Zotlabs/Module/Home.php:87 -#: ../../Zotlabs/Module/Home.php:95 ../../Zotlabs/Lib/Enotify.php:66 +#: ../../addon/opensearch/opensearch.php:42 ../../Zotlabs/Module/Invite.php:225 +#: ../../Zotlabs/Module/Invite.php:494 ../../Zotlabs/Module/Invite.php:508 +#: ../../Zotlabs/Module/Home.php:87 ../../Zotlabs/Module/Home.php:95 +#: ../../Zotlabs/Lib/Enotify.php:66 msgid "$Projectname" msgstr "" @@ -3411,7 +3422,7 @@ msgid "New registration" msgstr "" #: ../../addon/notifyadmin/notifyadmin.php:40 -#: ../../Zotlabs/Module/Invite.php:90 +#: ../../Zotlabs/Module/Invite.php:252 #, php-format msgid "%s : Message delivery failed." msgstr "" @@ -3426,7 +3437,7 @@ msgid "Not allowed." msgstr "" #: ../../addon/flashcards/Mod_Flashcards.php:254 -#: ../../include/acl_selectors.php:153 ../../Zotlabs/Module/Chat.php:241 +#: ../../include/acl_selectors.php:154 ../../Zotlabs/Module/Chat.php:241 #: ../../Zotlabs/Module/Filestorage.php:195 ../../Zotlabs/Module/Photos.php:678 #: ../../Zotlabs/Module/Photos.php:1047 ../../Zotlabs/Module/Thing.php:321 #: ../../Zotlabs/Module/Thing.php:374 ../../Zotlabs/Module/Connedit.php:683 @@ -3439,12 +3450,12 @@ msgid "Set/edit permissions" msgstr "" #: ../../addon/flashcards/Mod_Flashcards.php:284 -#: ../../addon/flashcards/Mod_Flashcards.php:285 ../../include/items.php:3924 +#: ../../addon/flashcards/Mod_Flashcards.php:285 ../../include/items.php:4010 #: ../../Zotlabs/Module/Filestorage.php:29 #: ../../Zotlabs/Module/Admin/Themes.php:72 #: ../../Zotlabs/Module/Admin/Addons.php:260 #: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:42 -#: ../../Zotlabs/Module/Display.php:432 ../../Zotlabs/Module/Admin.php:62 +#: ../../Zotlabs/Module/Display.php:424 ../../Zotlabs/Module/Admin.php:62 #: ../../Zotlabs/Module/Thing.php:96 msgid "Item not found." msgstr "" @@ -3908,10 +3919,10 @@ msgstr "" msgid "Posted by" msgstr "" -#: ../../addon/mdpost/mdpost.php:41 ../../include/text.php:2117 +#: ../../addon/mdpost/mdpost.php:41 ../../include/text.php:2118 #: ../../Zotlabs/Widget/Wiki_pages.php:38 -#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../Zotlabs/Module/Wiki.php:217 -#: ../../Zotlabs/Module/Wiki.php:371 +#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../Zotlabs/Module/Wiki.php:216 +#: ../../Zotlabs/Module/Wiki.php:370 msgid "Markdown" msgstr "" @@ -4032,11 +4043,11 @@ msgstr "" msgid "Invalid data packet" msgstr "" -#: ../../include/zot.php:805 ../../Zotlabs/Lib/Libzot.php:656 +#: ../../include/zot.php:805 ../../Zotlabs/Lib/Libzot.php:655 msgid "Unable to verify channel signature" msgstr "" -#: ../../include/zot.php:2663 ../../Zotlabs/Lib/Libsync.php:737 +#: ../../include/zot.php:2663 ../../Zotlabs/Lib/Libsync.php:740 #, php-format msgid "Unable to verify site signature for %s" msgstr "" @@ -4069,278 +4080,278 @@ msgstr "" msgid "newer" msgstr "" -#: ../../include/text.php:1025 +#: ../../include/text.php:1018 msgid "No connections" msgstr "" -#: ../../include/text.php:1037 ../../include/features.php:133 +#: ../../include/text.php:1030 ../../include/features.php:133 #: ../../Zotlabs/Module/Connections.php:375 ../../Zotlabs/Lib/Apps.php:333 msgid "Connections" msgstr "" -#: ../../include/text.php:1045 ../../Zotlabs/Module/Viewconnections.php:80 +#: ../../include/text.php:1038 ../../Zotlabs/Module/Viewconnections.php:80 #: ../../Zotlabs/Module/Connections.php:289 msgid "Accepts" msgstr "" -#: ../../include/text.php:1048 ../../Zotlabs/Module/Viewconnections.php:83 +#: ../../include/text.php:1041 ../../Zotlabs/Module/Viewconnections.php:83 #: ../../Zotlabs/Module/Connections.php:292 msgid "Comments" msgstr "" -#: ../../include/text.php:1053 ../../Zotlabs/Module/Viewconnections.php:88 +#: ../../include/text.php:1046 ../../Zotlabs/Module/Viewconnections.php:88 #: ../../Zotlabs/Module/Connections.php:297 msgid "Stream items" msgstr "" -#: ../../include/text.php:1058 ../../Zotlabs/Module/Viewconnections.php:93 +#: ../../include/text.php:1051 ../../Zotlabs/Module/Viewconnections.php:93 #: ../../Zotlabs/Module/Connections.php:302 msgid "Wall posts" msgstr "" -#: ../../include/text.php:1062 ../../Zotlabs/Module/Viewconnections.php:97 +#: ../../include/text.php:1055 ../../Zotlabs/Module/Viewconnections.php:97 #: ../../Zotlabs/Module/Connections.php:306 msgid "Nothing" msgstr "" -#: ../../include/text.php:1077 +#: ../../include/text.php:1070 #, php-format msgid "View all %s connections" msgstr "" -#: ../../include/text.php:1140 +#: ../../include/text.php:1133 #, php-format msgid "Network: %s" msgstr "" -#: ../../include/text.php:1151 ../../include/text.php:1163 -#: ../../include/nav.php:194 ../../include/acl_selectors.php:148 +#: ../../include/text.php:1144 ../../include/text.php:1156 +#: ../../include/nav.php:194 ../../include/acl_selectors.php:149 #: ../../Zotlabs/Widget/Sitesearch.php:31 -#: ../../Zotlabs/Widget/Activity_filter.php:193 -#: ../../Zotlabs/Module/Search.php:46 ../../Zotlabs/Module/Connections.php:379 +#: ../../Zotlabs/Widget/Activity_filter.php:203 +#: ../../Zotlabs/Module/Search.php:45 ../../Zotlabs/Module/Connections.php:379 #: ../../Zotlabs/Lib/Apps.php:353 msgid "Search" msgstr "" -#: ../../include/text.php:1243 ../../include/text.php:1247 +#: ../../include/text.php:1236 ../../include/text.php:1240 msgid "poke" msgstr "" -#: ../../include/text.php:1243 ../../include/text.php:1247 +#: ../../include/text.php:1236 ../../include/text.php:1240 #: ../../include/conversation.php:267 msgid "poked" msgstr "" -#: ../../include/text.php:1248 +#: ../../include/text.php:1241 msgid "ping" msgstr "" -#: ../../include/text.php:1248 +#: ../../include/text.php:1241 msgid "pinged" msgstr "" -#: ../../include/text.php:1249 +#: ../../include/text.php:1242 msgid "prod" msgstr "" -#: ../../include/text.php:1249 +#: ../../include/text.php:1242 msgid "prodded" msgstr "" -#: ../../include/text.php:1250 +#: ../../include/text.php:1243 msgid "slap" msgstr "" -#: ../../include/text.php:1250 +#: ../../include/text.php:1243 msgid "slapped" msgstr "" -#: ../../include/text.php:1251 +#: ../../include/text.php:1244 msgid "finger" msgstr "" -#: ../../include/text.php:1251 +#: ../../include/text.php:1244 msgid "fingered" msgstr "" -#: ../../include/text.php:1252 +#: ../../include/text.php:1245 msgid "rebuff" msgstr "" -#: ../../include/text.php:1252 +#: ../../include/text.php:1245 msgid "rebuffed" msgstr "" -#: ../../include/text.php:1275 +#: ../../include/text.php:1268 msgid "happy" msgstr "" -#: ../../include/text.php:1276 +#: ../../include/text.php:1269 msgid "sad" msgstr "" -#: ../../include/text.php:1277 +#: ../../include/text.php:1270 msgid "mellow" msgstr "" -#: ../../include/text.php:1278 +#: ../../include/text.php:1271 msgid "tired" msgstr "" -#: ../../include/text.php:1279 +#: ../../include/text.php:1272 msgid "perky" msgstr "" -#: ../../include/text.php:1280 +#: ../../include/text.php:1273 msgid "angry" msgstr "" -#: ../../include/text.php:1281 +#: ../../include/text.php:1274 msgid "stupefied" msgstr "" -#: ../../include/text.php:1282 +#: ../../include/text.php:1275 msgid "puzzled" msgstr "" -#: ../../include/text.php:1283 +#: ../../include/text.php:1276 msgid "interested" msgstr "" -#: ../../include/text.php:1284 +#: ../../include/text.php:1277 msgid "bitter" msgstr "" -#: ../../include/text.php:1285 +#: ../../include/text.php:1278 msgid "cheerful" msgstr "" -#: ../../include/text.php:1286 +#: ../../include/text.php:1279 msgid "alive" msgstr "" -#: ../../include/text.php:1287 +#: ../../include/text.php:1280 msgid "annoyed" msgstr "" -#: ../../include/text.php:1288 +#: ../../include/text.php:1281 msgid "anxious" msgstr "" -#: ../../include/text.php:1289 +#: ../../include/text.php:1282 msgid "cranky" msgstr "" -#: ../../include/text.php:1290 +#: ../../include/text.php:1283 msgid "disturbed" msgstr "" -#: ../../include/text.php:1291 +#: ../../include/text.php:1284 msgid "frustrated" msgstr "" -#: ../../include/text.php:1292 +#: ../../include/text.php:1285 msgid "depressed" msgstr "" -#: ../../include/text.php:1293 +#: ../../include/text.php:1286 msgid "motivated" msgstr "" -#: ../../include/text.php:1294 +#: ../../include/text.php:1287 msgid "relaxed" msgstr "" -#: ../../include/text.php:1295 +#: ../../include/text.php:1288 msgid "surprised" msgstr "" -#: ../../include/text.php:1483 ../../include/js_strings.php:99 +#: ../../include/text.php:1476 ../../include/js_strings.php:99 msgid "Monday" msgstr "" -#: ../../include/text.php:1483 ../../include/js_strings.php:100 +#: ../../include/text.php:1476 ../../include/js_strings.php:100 msgid "Tuesday" msgstr "" -#: ../../include/text.php:1483 ../../include/js_strings.php:101 +#: ../../include/text.php:1476 ../../include/js_strings.php:101 msgid "Wednesday" msgstr "" -#: ../../include/text.php:1483 ../../include/js_strings.php:102 +#: ../../include/text.php:1476 ../../include/js_strings.php:102 msgid "Thursday" msgstr "" -#: ../../include/text.php:1483 ../../include/js_strings.php:103 +#: ../../include/text.php:1476 ../../include/js_strings.php:103 msgid "Friday" msgstr "" -#: ../../include/text.php:1483 ../../include/js_strings.php:104 +#: ../../include/text.php:1476 ../../include/js_strings.php:104 msgid "Saturday" msgstr "" -#: ../../include/text.php:1483 ../../include/js_strings.php:98 +#: ../../include/text.php:1476 ../../include/js_strings.php:98 msgid "Sunday" msgstr "" -#: ../../include/text.php:1487 ../../include/js_strings.php:74 +#: ../../include/text.php:1480 ../../include/js_strings.php:74 msgid "January" msgstr "" -#: ../../include/text.php:1487 ../../include/js_strings.php:75 +#: ../../include/text.php:1480 ../../include/js_strings.php:75 msgid "February" msgstr "" -#: ../../include/text.php:1487 ../../include/js_strings.php:76 +#: ../../include/text.php:1480 ../../include/js_strings.php:76 msgid "March" msgstr "" -#: ../../include/text.php:1487 ../../include/js_strings.php:77 +#: ../../include/text.php:1480 ../../include/js_strings.php:77 msgid "April" msgstr "" -#: ../../include/text.php:1487 +#: ../../include/text.php:1480 msgid "May" msgstr "" -#: ../../include/text.php:1487 ../../include/js_strings.php:79 +#: ../../include/text.php:1480 ../../include/js_strings.php:79 msgid "June" msgstr "" -#: ../../include/text.php:1487 ../../include/js_strings.php:80 +#: ../../include/text.php:1480 ../../include/js_strings.php:80 msgid "July" msgstr "" -#: ../../include/text.php:1487 ../../include/js_strings.php:81 +#: ../../include/text.php:1480 ../../include/js_strings.php:81 msgid "August" msgstr "" -#: ../../include/text.php:1487 ../../include/js_strings.php:82 +#: ../../include/text.php:1480 ../../include/js_strings.php:82 msgid "September" msgstr "" -#: ../../include/text.php:1487 ../../include/js_strings.php:83 +#: ../../include/text.php:1480 ../../include/js_strings.php:83 msgid "October" msgstr "" -#: ../../include/text.php:1487 ../../include/js_strings.php:84 +#: ../../include/text.php:1480 ../../include/js_strings.php:84 msgid "November" msgstr "" -#: ../../include/text.php:1487 ../../include/js_strings.php:85 +#: ../../include/text.php:1480 ../../include/js_strings.php:85 msgid "December" msgstr "" -#: ../../include/text.php:1561 +#: ../../include/text.php:1556 msgid "Unknown Attachment" msgstr "" -#: ../../include/text.php:1563 ../../Zotlabs/Module/Sharedwithme.php:108 +#: ../../include/text.php:1558 ../../Zotlabs/Module/Sharedwithme.php:108 #: ../../Zotlabs/Storage/Browser.php:379 msgid "Size" msgstr "" -#: ../../include/text.php:1563 ../../include/feedutils.php:873 +#: ../../include/text.php:1558 ../../include/feedutils.php:872 msgid "unknown" msgstr "" @@ -4348,71 +4359,71 @@ msgstr "" msgid "remove category" msgstr "" -#: ../../include/text.php:1675 +#: ../../include/text.php:1676 msgid "remove from file" msgstr "" -#: ../../include/text.php:1844 ../../include/message.php:13 +#: ../../include/text.php:1845 ../../include/message.php:13 msgid "Download binary/encrypted content" msgstr "" -#: ../../include/text.php:1915 +#: ../../include/text.php:1916 msgid "Poll has ended." msgstr "" -#: ../../include/text.php:1918 +#: ../../include/text.php:1919 #, php-format msgid "Poll ends: %s" msgstr "" -#: ../../include/text.php:1923 ../../Zotlabs/Lib/ThreadItem.php:446 +#: ../../include/text.php:1924 ../../Zotlabs/Lib/ThreadItem.php:446 msgid "Vote" msgstr "" -#: ../../include/text.php:2075 ../../Zotlabs/Module/Events.php:669 +#: ../../include/text.php:2076 ../../Zotlabs/Module/Events.php:669 msgid "Link to Source" msgstr "" -#: ../../include/text.php:2097 ../../include/language.php:424 +#: ../../include/text.php:2098 ../../include/language.php:428 msgid "default" msgstr "" -#: ../../include/text.php:2105 +#: ../../include/text.php:2106 msgid "Page layout" msgstr "" -#: ../../include/text.php:2105 +#: ../../include/text.php:2106 msgid "You can create your own with the layouts tool" msgstr "" -#: ../../include/text.php:2115 ../../Zotlabs/Widget/Wiki_pages.php:38 -#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../Zotlabs/Module/Wiki.php:217 -#: ../../Zotlabs/Module/Wiki.php:371 +#: ../../include/text.php:2116 ../../Zotlabs/Widget/Wiki_pages.php:38 +#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../Zotlabs/Module/Wiki.php:216 +#: ../../Zotlabs/Module/Wiki.php:370 msgid "BBcode" msgstr "" -#: ../../include/text.php:2116 +#: ../../include/text.php:2117 msgid "HTML" msgstr "" -#: ../../include/text.php:2118 ../../Zotlabs/Widget/Wiki_pages.php:38 -#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../Zotlabs/Module/Wiki.php:217 +#: ../../include/text.php:2119 ../../Zotlabs/Widget/Wiki_pages.php:38 +#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../Zotlabs/Module/Wiki.php:216 msgid "Text" msgstr "" -#: ../../include/text.php:2119 +#: ../../include/text.php:2120 msgid "Comanche Layout" msgstr "" -#: ../../include/text.php:2124 +#: ../../include/text.php:2125 msgid "PHP" msgstr "" -#: ../../include/text.php:2133 +#: ../../include/text.php:2134 msgid "Page content type" msgstr "" -#: ../../include/text.php:2256 ../../include/event.php:1259 +#: ../../include/text.php:2257 ../../include/event.php:1259 #: ../../include/conversation.php:132 #: ../../Zotlabs/Module/Channel_calendar.php:221 #: ../../Zotlabs/Module/Like.php:441 ../../Zotlabs/Module/Tagger.php:75 @@ -4420,110 +4431,110 @@ msgstr "" msgid "event" msgstr "" -#: ../../include/text.php:2259 ../../include/conversation.php:158 -#: ../../include/bbcode.php:543 ../../include/markdown.php:204 -#: ../../Zotlabs/Module/Tagger.php:79 ../../Zotlabs/Lib/Activity.php:3229 +#: ../../include/text.php:2260 ../../include/conversation.php:158 +#: ../../include/bbcode.php:555 ../../include/markdown.php:204 +#: ../../Zotlabs/Module/Tagger.php:79 ../../Zotlabs/Lib/Activity.php:3264 msgid "post" msgstr "" -#: ../../include/text.php:2261 ../../include/conversation.php:160 +#: ../../include/text.php:2262 ../../include/conversation.php:160 #: ../../Zotlabs/Module/Tagger.php:81 msgid "comment" msgstr "" -#: ../../include/text.php:2266 +#: ../../include/text.php:2267 msgid "activity" msgstr "" -#: ../../include/text.php:2269 +#: ../../include/text.php:2270 msgid "poll" msgstr "" -#: ../../include/text.php:2370 +#: ../../include/text.php:2383 msgid "a-z, 0-9, -, and _ only" msgstr "" -#: ../../include/text.php:2696 +#: ../../include/text.php:2709 msgid "Design Tools" msgstr "" -#: ../../include/text.php:2699 ../../Zotlabs/Module/Blocks.php:154 +#: ../../include/text.php:2712 ../../Zotlabs/Module/Blocks.php:154 msgid "Blocks" msgstr "" -#: ../../include/text.php:2700 ../../Zotlabs/Module/Menu.php:171 +#: ../../include/text.php:2713 ../../Zotlabs/Module/Menu.php:171 msgid "Menus" msgstr "" -#: ../../include/text.php:2701 ../../Zotlabs/Module/Layouts.php:184 +#: ../../include/text.php:2714 ../../Zotlabs/Module/Layouts.php:184 msgid "Layouts" msgstr "" -#: ../../include/text.php:2702 +#: ../../include/text.php:2715 msgid "Pages" msgstr "" -#: ../../include/text.php:2714 +#: ../../include/text.php:2727 msgid "Import" msgstr "" -#: ../../include/text.php:2715 +#: ../../include/text.php:2728 msgid "Import website..." msgstr "" -#: ../../include/text.php:2716 +#: ../../include/text.php:2729 msgid "Select folder to import" msgstr "" -#: ../../include/text.php:2717 +#: ../../include/text.php:2730 msgid "Import from a zipped folder:" msgstr "" -#: ../../include/text.php:2718 +#: ../../include/text.php:2731 msgid "Import from cloud files:" msgstr "" -#: ../../include/text.php:2719 +#: ../../include/text.php:2732 msgid "/cloud/channel/path/to/folder" msgstr "" -#: ../../include/text.php:2720 +#: ../../include/text.php:2733 msgid "Enter path to website files" msgstr "" -#: ../../include/text.php:2721 +#: ../../include/text.php:2734 msgid "Select folder" msgstr "" -#: ../../include/text.php:2722 +#: ../../include/text.php:2735 msgid "Export website..." msgstr "" -#: ../../include/text.php:2723 +#: ../../include/text.php:2736 msgid "Export to a zip file" msgstr "" -#: ../../include/text.php:2724 +#: ../../include/text.php:2737 msgid "website.zip" msgstr "" -#: ../../include/text.php:2725 +#: ../../include/text.php:2738 msgid "Enter a name for the zip file." msgstr "" -#: ../../include/text.php:2726 +#: ../../include/text.php:2739 msgid "Export to cloud files" msgstr "" -#: ../../include/text.php:2727 +#: ../../include/text.php:2740 msgid "/path/to/export/folder" msgstr "" -#: ../../include/text.php:2728 +#: ../../include/text.php:2741 msgid "Enter a path to a cloud files destination." msgstr "" -#: ../../include/text.php:2729 +#: ../../include/text.php:2742 msgid "Specify folder" msgstr "" @@ -4545,7 +4556,7 @@ msgid "Finishes:" msgstr "" #: ../../include/event.php:63 ../../include/event.php:134 -#: ../../include/channel.php:1634 ../../Zotlabs/Module/Directory.php:354 +#: ../../include/channel.php:1658 ../../Zotlabs/Module/Directory.php:354 msgid "Location:" msgstr "" @@ -4586,13 +4597,13 @@ msgid "Cancelled" msgstr "" #: ../../include/event.php:1422 ../../include/connections.php:734 -#: ../../Zotlabs/Module/Cdav.php:1381 ../../Zotlabs/Module/Profiles.php:794 +#: ../../Zotlabs/Module/Cdav.php:1382 ../../Zotlabs/Module/Profiles.php:794 #: ../../Zotlabs/Module/Connedit.php:925 msgid "Mobile" msgstr "" #: ../../include/event.php:1423 ../../include/connections.php:735 -#: ../../Zotlabs/Module/Cdav.php:1382 ../../Zotlabs/Module/Profiles.php:795 +#: ../../Zotlabs/Module/Cdav.php:1383 ../../Zotlabs/Module/Profiles.php:795 #: ../../Zotlabs/Module/Connedit.php:926 msgid "Home" msgstr "" @@ -4606,7 +4617,7 @@ msgid "Home, Fax" msgstr "" #: ../../include/event.php:1426 ../../include/connections.php:738 -#: ../../Zotlabs/Module/Cdav.php:1383 ../../Zotlabs/Module/Profiles.php:796 +#: ../../Zotlabs/Module/Cdav.php:1384 ../../Zotlabs/Module/Profiles.php:796 #: ../../Zotlabs/Module/Connedit.php:927 msgid "Work" msgstr "" @@ -4623,7 +4634,7 @@ msgstr "" #: ../../include/selectors.php:60 ../../include/selectors.php:77 #: ../../include/selectors.php:115 ../../include/selectors.php:151 #: ../../include/connections.php:741 ../../include/connections.php:748 -#: ../../Zotlabs/Module/Cdav.php:1384 ../../Zotlabs/Module/Profiles.php:797 +#: ../../Zotlabs/Module/Cdav.php:1385 ../../Zotlabs/Module/Profiles.php:797 #: ../../Zotlabs/Module/Connedit.php:928 #: ../../Zotlabs/Access/PermissionRoles.php:310 msgid "Other" @@ -4641,8 +4652,8 @@ msgstr "" msgid "On" msgstr "" -#: ../../include/features.php:82 ../../include/nav.php:464 -#: ../../include/nav.php:467 ../../Zotlabs/Lib/Apps.php:346 +#: ../../include/features.php:82 ../../include/nav.php:463 +#: ../../include/nav.php:466 ../../Zotlabs/Lib/Apps.php:346 msgid "Calendar" msgstr "" @@ -4682,11 +4693,11 @@ msgstr "" msgid "Provide a personal tag cloud on your channel page" msgstr "" -#: ../../include/features.php:124 ../../include/features.php:359 +#: ../../include/features.php:124 ../../include/features.php:358 msgid "Use blog/list mode" msgstr "" -#: ../../include/features.php:125 ../../include/features.php:360 +#: ../../include/features.php:125 ../../include/features.php:359 msgid "Comments will be displayed separately" msgstr "" @@ -4758,195 +4769,195 @@ msgstr "" msgid "Add categories to your posts" msgstr "" -#: ../../include/features.php:219 +#: ../../include/features.php:218 msgid "Large Photos" msgstr "" -#: ../../include/features.php:220 +#: ../../include/features.php:219 msgid "" "Include large (1024px) photo thumbnails in posts. If not enabled, use small " "(640px) photo thumbnails" msgstr "" -#: ../../include/features.php:227 +#: ../../include/features.php:226 msgid "Even More Encryption" msgstr "" -#: ../../include/features.php:228 +#: ../../include/features.php:227 msgid "" "Allow optional encryption of content end-to-end with a shared secret key" msgstr "" -#: ../../include/features.php:235 +#: ../../include/features.php:234 msgid "Disable Comments" msgstr "" -#: ../../include/features.php:236 +#: ../../include/features.php:235 msgid "Provide the option to disable comments for a post" msgstr "" -#: ../../include/features.php:243 +#: ../../include/features.php:242 msgid "Delayed Posting" msgstr "" -#: ../../include/features.php:244 +#: ../../include/features.php:243 msgid "Allow posts to be published at a later date" msgstr "" -#: ../../include/features.php:251 +#: ../../include/features.php:250 msgid "Content Expiration" msgstr "" -#: ../../include/features.php:252 +#: ../../include/features.php:251 msgid "Remove posts/comments and/or private messages at a future time" msgstr "" -#: ../../include/features.php:259 +#: ../../include/features.php:258 msgid "Suppress Duplicate Posts/Comments" msgstr "" -#: ../../include/features.php:260 +#: ../../include/features.php:259 msgid "" "Prevent posts with identical content to be published with less than two " "minutes in between submissions." msgstr "" -#: ../../include/features.php:267 +#: ../../include/features.php:266 msgid "Auto-save drafts of posts and comments" msgstr "" -#: ../../include/features.php:268 +#: ../../include/features.php:267 msgid "" "Automatically saves post and comment drafts in local browser storage to help " "prevent accidental loss of compositions" msgstr "" -#: ../../include/features.php:277 +#: ../../include/features.php:276 msgid "Manage" msgstr "" -#: ../../include/features.php:281 +#: ../../include/features.php:280 msgid "Navigation Channel Select" msgstr "" -#: ../../include/features.php:282 +#: ../../include/features.php:281 msgid "Change channels directly from within the navigation dropdown menu" msgstr "" -#: ../../include/features.php:291 ../../Zotlabs/Module/Connections.php:333 +#: ../../include/features.php:290 ../../Zotlabs/Module/Connections.php:333 msgid "Network" msgstr "" -#: ../../include/features.php:295 +#: ../../include/features.php:294 msgid "Events Filter" msgstr "" -#: ../../include/features.php:296 +#: ../../include/features.php:295 msgid "Ability to display only events" msgstr "" -#: ../../include/features.php:303 +#: ../../include/features.php:302 msgid "Polls Filter" msgstr "" -#: ../../include/features.php:304 +#: ../../include/features.php:303 msgid "Ability to display only polls" msgstr "" -#: ../../include/features.php:311 ../../Zotlabs/Widget/Savedsearch.php:83 +#: ../../include/features.php:310 ../../Zotlabs/Widget/Savedsearch.php:83 msgid "Saved Searches" msgstr "" -#: ../../include/features.php:312 +#: ../../include/features.php:311 msgid "Save search terms for re-use" msgstr "" -#: ../../include/features.php:319 ../../include/contact_widgets.php:53 -#: ../../Zotlabs/Widget/Activity_filter.php:179 +#: ../../include/features.php:318 ../../include/contact_widgets.php:53 +#: ../../Zotlabs/Widget/Activity_filter.php:189 #: ../../Zotlabs/Widget/Filer.php:28 msgid "Saved Folders" msgstr "" -#: ../../include/features.php:320 +#: ../../include/features.php:319 msgid "Ability to file posts under folders" msgstr "" -#: ../../include/features.php:327 +#: ../../include/features.php:326 msgid "Alternate Stream Order" msgstr "" -#: ../../include/features.php:328 +#: ../../include/features.php:327 msgid "" "Ability to order the stream by last post date, last comment date or " "unthreaded activities" msgstr "" -#: ../../include/features.php:335 +#: ../../include/features.php:334 msgid "Contact Filter" msgstr "" -#: ../../include/features.php:336 +#: ../../include/features.php:335 msgid "Ability to display only posts of a selected contact" msgstr "" -#: ../../include/features.php:343 +#: ../../include/features.php:342 msgid "Forum Filter" msgstr "" -#: ../../include/features.php:344 +#: ../../include/features.php:343 msgid "Ability to display only posts of a specific forum" msgstr "" -#: ../../include/features.php:351 +#: ../../include/features.php:350 msgid "Personal Posts Filter" msgstr "" -#: ../../include/features.php:352 +#: ../../include/features.php:351 msgid "Ability to display only posts that you've interacted on" msgstr "" -#: ../../include/features.php:369 ../../include/nav.php:445 +#: ../../include/features.php:368 ../../include/nav.php:444 #: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:345 msgid "Photos" msgstr "" -#: ../../include/features.php:373 +#: ../../include/features.php:372 msgid "Photo Location" msgstr "" -#: ../../include/features.php:374 +#: ../../include/features.php:373 msgid "If location data is available on uploaded photos, link this to a map." msgstr "" -#: ../../include/features.php:383 ../../Zotlabs/Lib/Apps.php:363 +#: ../../include/features.php:382 ../../Zotlabs/Lib/Apps.php:363 msgid "Profiles" msgstr "" -#: ../../include/features.php:387 +#: ../../include/features.php:386 msgid "Advanced Profiles" msgstr "" -#: ../../include/features.php:388 +#: ../../include/features.php:387 msgid "Additional profile sections and selections" msgstr "" -#: ../../include/features.php:395 +#: ../../include/features.php:394 msgid "Profile Import/Export" msgstr "" -#: ../../include/features.php:396 +#: ../../include/features.php:395 msgid "Save and load profile details across sites/channels" msgstr "" -#: ../../include/features.php:403 +#: ../../include/features.php:402 msgid "Multiple Profiles" msgstr "" -#: ../../include/features.php:404 +#: ../../include/features.php:403 msgid "Ability to create multiple profiles" msgstr "" -#: ../../include/security.php:608 +#: ../../include/security.php:607 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." @@ -4985,7 +4996,7 @@ msgstr "" msgid "Password too short" msgstr "" -#: ../../include/js_strings.php:12 +#: ../../include/js_strings.php:12 ../../Zotlabs/Module/Register.php:158 msgid "Passwords do not match" msgstr "" @@ -5035,7 +5046,7 @@ msgid "Unsaved changes. Are you sure you wish to leave this page?" msgstr "" #: ../../include/js_strings.php:25 ../../Zotlabs/Module/Pubsites.php:53 -#: ../../Zotlabs/Module/Cdav.php:1015 ../../Zotlabs/Module/Events.php:483 +#: ../../Zotlabs/Module/Cdav.php:1016 ../../Zotlabs/Module/Events.php:483 #: ../../Zotlabs/Module/Profiles.php:511 ../../Zotlabs/Module/Profiles.php:736 #: ../../Zotlabs/Module/Locs.php:128 msgid "Location" @@ -5095,7 +5106,7 @@ msgstr "" msgid "Pin to the top" msgstr "" -#: ../../include/js_strings.php:39 ../../Zotlabs/Widget/Pinned.php:157 +#: ../../include/js_strings.php:39 ../../Zotlabs/Widget/Pinned.php:155 #: ../../Zotlabs/Lib/ThreadItem.php:473 msgid "Unpin from the top" msgstr "" @@ -5294,12 +5305,16 @@ msgstr "" msgid "Please stand by while your download is being prepared." msgstr "" +#: ../../include/js_strings.php:122 +msgid "Email address not valid" +msgstr "" + #: ../../include/help.php:80 msgid "Help:" msgstr "" #: ../../include/help.php:117 ../../include/help.php:125 -#: ../../include/nav.php:180 ../../include/nav.php:321 +#: ../../include/nav.php:180 ../../include/nav.php:320 #: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:348 msgid "Help" msgstr "" @@ -5311,7 +5326,7 @@ msgstr "" #: ../../include/help.php:132 ../../Zotlabs/Module/Display.php:136 #: ../../Zotlabs/Module/Display.php:153 ../../Zotlabs/Module/Display.php:173 #: ../../Zotlabs/Module/Display.php:179 ../../Zotlabs/Module/Page.php:136 -#: ../../Zotlabs/Module/Block.php:77 ../../Zotlabs/Lib/NativeWikiPage.php:520 +#: ../../Zotlabs/Module/Block.php:77 ../../Zotlabs/Lib/NativeWikiPage.php:533 #: ../../Zotlabs/Web/Router.php:186 msgid "Page not found." msgstr "" @@ -5344,7 +5359,7 @@ msgctxt "photo_upload" msgid "%1$s posted %2$s to %3$s" msgstr "" -#: ../../include/photos.php:666 ../../include/nav.php:448 +#: ../../include/photos.php:666 ../../include/nav.php:447 msgid "Photo Albums" msgstr "" @@ -5357,43 +5372,43 @@ msgstr "" msgid "Upload New Photos" msgstr "" -#: ../../include/network.php:1758 ../../include/network.php:1759 +#: ../../include/network.php:1762 ../../include/network.php:1763 msgid "Friendica" msgstr "" -#: ../../include/network.php:1760 +#: ../../include/network.php:1764 msgid "OStatus" msgstr "" -#: ../../include/network.php:1761 +#: ../../include/network.php:1765 msgid "GNU-Social" msgstr "" -#: ../../include/network.php:1762 +#: ../../include/network.php:1766 msgid "RSS/Atom" msgstr "" -#: ../../include/network.php:1765 +#: ../../include/network.php:1769 msgid "Diaspora" msgstr "" -#: ../../include/network.php:1766 +#: ../../include/network.php:1770 msgid "Facebook" msgstr "" -#: ../../include/network.php:1767 +#: ../../include/network.php:1771 msgid "Zot" msgstr "" -#: ../../include/network.php:1768 +#: ../../include/network.php:1772 msgid "LinkedIn" msgstr "" -#: ../../include/network.php:1769 +#: ../../include/network.php:1773 msgid "XMPP/IM" msgstr "" -#: ../../include/network.php:1770 +#: ../../include/network.php:1774 msgid "MySpace" msgstr "" @@ -5427,8 +5442,8 @@ msgid_plural "%d invitations available" msgstr[0] "" msgstr[1] "" -#: ../../include/contact_widgets.php:16 ../../include/acl_selectors.php:144 -#: ../../Zotlabs/Module/Admin/Site.php:297 +#: ../../include/contact_widgets.php:16 ../../include/acl_selectors.php:145 +#: ../../Zotlabs/Module/Admin/Site.php:416 msgid "Advanced" msgstr "" @@ -5482,7 +5497,7 @@ msgstr "" #: ../../include/contact_widgets.php:201 ../../include/contact_widgets.php:236 #: ../../include/taxonomy.php:420 ../../include/taxonomy.php:502 #: ../../include/taxonomy.php:522 ../../include/taxonomy.php:543 -#: ../../Zotlabs/Widget/Appcategories.php:43 ../../Zotlabs/Module/Cdav.php:1070 +#: ../../Zotlabs/Widget/Appcategories.php:43 ../../Zotlabs/Module/Cdav.php:1071 #: ../../Zotlabs/Storage/Browser.php:293 ../../Zotlabs/Storage/Browser.php:388 #: ../../Zotlabs/Storage/Browser.php:403 msgid "Categories" @@ -5497,7 +5512,7 @@ msgstr "" msgid "View all %d common connections" msgstr "" -#: ../../include/language.php:437 +#: ../../include/language.php:441 msgid "Select an alternate language" msgstr "" @@ -5531,9 +5546,9 @@ msgstr "" msgid "Manage your channels" msgstr "" -#: ../../include/nav.php:104 ../../include/group.php:321 -#: ../../include/acl_selectors.php:86 -#: ../../Zotlabs/Widget/Activity_filter.php:82 +#: ../../include/nav.php:104 ../../include/group.php:327 +#: ../../include/acl_selectors.php:87 +#: ../../Zotlabs/Widget/Activity_filter.php:88 #: ../../Zotlabs/Module/Group.php:142 ../../Zotlabs/Module/Group.php:154 #: ../../Zotlabs/Lib/Group.php:324 ../../Zotlabs/Lib/Apps.php:364 msgid "Privacy Groups" @@ -5555,7 +5570,7 @@ msgid "Account/Channel Settings" msgstr "" #: ../../include/nav.php:112 ../../include/nav.php:142 -#: ../../include/nav.php:163 ../../boot.php:1710 +#: ../../include/nav.php:163 ../../boot.php:1715 msgid "Logout" msgstr "" @@ -5567,7 +5582,7 @@ msgstr "" msgid "Your profile page" msgstr "" -#: ../../include/nav.php:118 ../../include/channel.php:1539 +#: ../../include/nav.php:118 ../../include/channel.php:1563 #: ../../Zotlabs/Module/Profiles.php:832 msgid "Edit Profiles" msgstr "" @@ -5581,7 +5596,7 @@ msgid "Edit your profile" msgstr "" #: ../../include/nav.php:127 ../../include/nav.php:131 -#: ../../Zotlabs/Lib/Apps.php:336 ../../boot.php:1711 +#: ../../Zotlabs/Lib/Apps.php:336 ../../boot.php:1716 msgid "Login" msgstr "" @@ -5597,8 +5612,8 @@ msgstr "" msgid "Log me out of this site" msgstr "" -#: ../../include/nav.php:168 ../../Zotlabs/Module/Register.php:293 -#: ../../boot.php:1691 +#: ../../include/nav.php:168 ../../Zotlabs/Module/Register.php:566 +#: ../../boot.php:1696 msgid "Register" msgstr "" @@ -5622,104 +5637,104 @@ msgstr "" msgid "Site Setup and Configuration" msgstr "" -#: ../../include/nav.php:325 ../../Zotlabs/Widget/Notifications.php:182 +#: ../../include/nav.php:324 ../../Zotlabs/Widget/Notifications.php:182 #: ../../Zotlabs/Module/New_channel.php:157 #: ../../Zotlabs/Module/New_channel.php:164 #: ../../Zotlabs/Module/Defperms.php:257 ../../Zotlabs/Module/Connedit.php:862 msgid "Loading" msgstr "" -#: ../../include/nav.php:331 +#: ../../include/nav.php:330 msgid "@name, !forum, #tag, ?doc, content" msgstr "" -#: ../../include/nav.php:332 +#: ../../include/nav.php:331 msgid "Please wait..." msgstr "" -#: ../../include/nav.php:338 +#: ../../include/nav.php:337 msgid "Add Apps" msgstr "" -#: ../../include/nav.php:339 +#: ../../include/nav.php:338 msgid "Arrange Apps" msgstr "" -#: ../../include/nav.php:340 +#: ../../include/nav.php:339 msgid "Toggle System Apps" msgstr "" -#: ../../include/nav.php:422 ../../Zotlabs/Module/Admin/Channels.php:154 +#: ../../include/nav.php:421 ../../Zotlabs/Module/Admin/Channels.php:154 msgid "Channel" msgstr "" -#: ../../include/nav.php:425 +#: ../../include/nav.php:424 msgid "Status Messages and Posts" msgstr "" -#: ../../include/nav.php:435 ../../Zotlabs/Module/Help.php:83 +#: ../../include/nav.php:434 ../../Zotlabs/Module/Help.php:83 msgid "About" msgstr "" -#: ../../include/nav.php:438 +#: ../../include/nav.php:437 msgid "Profile Details" msgstr "" -#: ../../include/nav.php:453 ../../Zotlabs/Module/Fbrowser.php:85 +#: ../../include/nav.php:452 ../../Zotlabs/Module/Fbrowser.php:85 #: ../../Zotlabs/Lib/Apps.php:340 ../../Zotlabs/Storage/Browser.php:351 msgid "Files" msgstr "" -#: ../../include/nav.php:456 +#: ../../include/nav.php:455 msgid "Files and Storage" msgstr "" -#: ../../include/nav.php:478 ../../include/nav.php:481 +#: ../../include/nav.php:477 ../../include/nav.php:480 #: ../../Zotlabs/Widget/Chatroom_list.php:16 ../../Zotlabs/Lib/Apps.php:330 msgid "Chatrooms" msgstr "" -#: ../../include/nav.php:491 ../../Zotlabs/Lib/Apps.php:329 +#: ../../include/nav.php:490 ../../Zotlabs/Lib/Apps.php:329 msgid "Bookmarks" msgstr "" -#: ../../include/nav.php:494 +#: ../../include/nav.php:493 msgid "Saved Bookmarks" msgstr "" -#: ../../include/nav.php:502 ../../Zotlabs/Module/Cards.php:207 +#: ../../include/nav.php:501 ../../Zotlabs/Module/Cards.php:207 #: ../../Zotlabs/Lib/Apps.php:326 msgid "Cards" msgstr "" -#: ../../include/nav.php:505 +#: ../../include/nav.php:504 msgid "View Cards" msgstr "" -#: ../../include/nav.php:513 ../../Zotlabs/Module/Articles.php:225 +#: ../../include/nav.php:512 ../../Zotlabs/Module/Articles.php:225 #: ../../Zotlabs/Lib/Apps.php:325 msgid "Articles" msgstr "" -#: ../../include/nav.php:516 +#: ../../include/nav.php:515 msgid "View Articles" msgstr "" -#: ../../include/nav.php:525 ../../Zotlabs/Module/Webpages.php:252 +#: ../../include/nav.php:524 ../../Zotlabs/Module/Webpages.php:252 #: ../../Zotlabs/Lib/Apps.php:341 msgid "Webpages" msgstr "" -#: ../../include/nav.php:528 +#: ../../include/nav.php:527 msgid "View Webpages" msgstr "" -#: ../../include/nav.php:537 ../../Zotlabs/Widget/Wiki_list.php:15 -#: ../../Zotlabs/Module/Wiki.php:206 +#: ../../include/nav.php:536 ../../Zotlabs/Widget/Wiki_list.php:15 +#: ../../Zotlabs/Module/Wiki.php:205 msgid "Wikis" msgstr "" -#: ../../include/nav.php:540 ../../Zotlabs/Lib/Apps.php:342 +#: ../../include/nav.php:539 ../../Zotlabs/Lib/Apps.php:342 msgid "Wiki" msgstr "" @@ -5756,7 +5771,7 @@ msgstr "" msgid "YYYY-MM-DD or MM-DD" msgstr "" -#: ../../include/datetime.php:238 ../../boot.php:2715 +#: ../../include/datetime.php:238 ../../boot.php:2730 msgid "never" msgstr "" @@ -5977,9 +5992,9 @@ msgstr "" #: ../../include/conversation.php:730 ../../include/conversation.php:777 #: ../../Zotlabs/Module/Article_edit.php:129 #: ../../Zotlabs/Module/Card_edit.php:130 ../../Zotlabs/Module/Oauth.php:174 -#: ../../Zotlabs/Module/Editwebpage.php:167 ../../Zotlabs/Module/Cdav.php:1056 -#: ../../Zotlabs/Module/Cdav.php:1389 ../../Zotlabs/Module/Webpages.php:257 -#: ../../Zotlabs/Module/Admin/Accounts.php:175 +#: ../../Zotlabs/Module/Editwebpage.php:167 ../../Zotlabs/Module/Cdav.php:1057 +#: ../../Zotlabs/Module/Cdav.php:1390 ../../Zotlabs/Module/Webpages.php:257 +#: ../../Zotlabs/Module/Admin/Accounts.php:320 #: ../../Zotlabs/Module/Admin/Channels.php:149 #: ../../Zotlabs/Module/Admin/Profs.php:176 ../../Zotlabs/Module/Blocks.php:162 #: ../../Zotlabs/Module/Editblock.php:139 @@ -6012,7 +6027,7 @@ msgid "Message signature incorrect" msgstr "" #: ../../include/conversation.php:776 -#: ../../Zotlabs/Module/Admin/Accounts.php:173 +#: ../../Zotlabs/Module/Admin/Accounts.php:318 #: ../../Zotlabs/Module/Connections.php:343 msgid "Approve" msgstr "" @@ -6030,19 +6045,19 @@ msgstr "" msgid "Filed under:" msgstr "" -#: ../../include/conversation.php:809 ../../Zotlabs/Widget/Pinned.php:133 +#: ../../include/conversation.php:809 ../../Zotlabs/Widget/Pinned.php:132 #: ../../Zotlabs/Lib/ThreadItem.php:430 #, php-format msgid "from %s" msgstr "" -#: ../../include/conversation.php:812 ../../Zotlabs/Widget/Pinned.php:136 +#: ../../include/conversation.php:812 ../../Zotlabs/Widget/Pinned.php:135 #: ../../Zotlabs/Lib/ThreadItem.php:433 #, php-format msgid "last edited: %s" msgstr "" -#: ../../include/conversation.php:813 ../../Zotlabs/Widget/Pinned.php:137 +#: ../../include/conversation.php:813 ../../Zotlabs/Widget/Pinned.php:136 #: ../../Zotlabs/Lib/ThreadItem.php:434 #, php-format msgid "Expires: %s" @@ -6090,7 +6105,7 @@ msgid "Recent Activity" msgstr "" #: ../../include/conversation.php:1103 ../../include/connections.php:110 -#: ../../include/channel.php:1619 ../../Zotlabs/Widget/Suggestions.php:46 +#: ../../include/channel.php:1643 ../../Zotlabs/Widget/Suggestions.php:46 #: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Module/Directory.php:370 #: ../../Zotlabs/Module/Connections.php:350 ../../Zotlabs/Module/Suggest.php:71 msgid "Connect" @@ -6101,6 +6116,7 @@ msgid "Edit Connection" msgstr "" #: ../../include/conversation.php:1123 +#: ../../Zotlabs/Module/Admin/Accounts.php:347 msgid "Message" msgstr "" @@ -6159,40 +6175,40 @@ msgstr "" msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:1465 +#: ../../include/conversation.php:1464 msgid "Toggle poll" msgstr "" -#: ../../include/conversation.php:1466 +#: ../../include/conversation.php:1465 msgid "Option" msgstr "" -#: ../../include/conversation.php:1467 +#: ../../include/conversation.php:1466 msgid "Add option" msgstr "" -#: ../../include/conversation.php:1468 +#: ../../include/conversation.php:1467 msgid "Minutes" msgstr "" -#: ../../include/conversation.php:1468 +#: ../../include/conversation.php:1467 msgid "Hours" msgstr "" -#: ../../include/conversation.php:1468 +#: ../../include/conversation.php:1467 msgid "Days" msgstr "" -#: ../../include/conversation.php:1469 +#: ../../include/conversation.php:1468 msgid "Allow multiple answers" msgstr "" -#: ../../include/conversation.php:1479 +#: ../../include/conversation.php:1478 msgid "Summary (optional)" msgstr "" -#: ../../include/conversation.php:1753 ../../include/taxonomy.php:670 -#: ../../include/channel.php:1782 ../../Zotlabs/Module/Photos.php:1136 +#: ../../include/conversation.php:1752 ../../include/taxonomy.php:670 +#: ../../include/channel.php:1806 ../../Zotlabs/Module/Photos.php:1136 #: ../../Zotlabs/Lib/ThreadItem.php:243 msgctxt "noun" msgid "Like" @@ -6200,7 +6216,7 @@ msgid_plural "Likes" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1756 ../../Zotlabs/Module/Photos.php:1141 +#: ../../include/conversation.php:1755 ../../Zotlabs/Module/Photos.php:1141 #: ../../Zotlabs/Lib/ThreadItem.php:248 msgctxt "noun" msgid "Dislike" @@ -6208,42 +6224,42 @@ msgid_plural "Dislikes" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1759 +#: ../../include/conversation.php:1758 msgctxt "noun" msgid "Attending" msgid_plural "Attending" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1762 +#: ../../include/conversation.php:1761 msgctxt "noun" msgid "Not Attending" msgid_plural "Not Attending" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1765 +#: ../../include/conversation.php:1764 msgctxt "noun" msgid "Undecided" msgid_plural "Undecided" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1768 +#: ../../include/conversation.php:1767 msgctxt "noun" msgid "Agree" msgid_plural "Agrees" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1771 +#: ../../include/conversation.php:1770 msgctxt "noun" msgid "Disagree" msgid_plural "Disagrees" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1774 +#: ../../include/conversation.php:1773 msgctxt "noun" msgid "Abstain" msgid_plural "Abstains" @@ -6310,11 +6326,11 @@ msgstr "" msgid "Hermaphrodite" msgstr "" -#: ../../include/selectors.php:60 ../../include/channel.php:1727 +#: ../../include/selectors.php:60 ../../include/channel.php:1751 msgid "Neuter" msgstr "" -#: ../../include/selectors.php:60 ../../include/channel.php:1729 +#: ../../include/selectors.php:60 ../../include/channel.php:1753 msgid "Non-specific" msgstr "" @@ -6411,8 +6427,7 @@ msgid "Sex Addict" msgstr "" #: ../../include/selectors.php:134 ../../include/channel.php:506 -#: ../../include/channel.php:507 ../../include/channel.php:514 -#: ../../Zotlabs/Widget/Affinity.php:32 +#: ../../include/channel.php:509 ../../Zotlabs/Widget/Affinity.php:32 #: ../../Zotlabs/Module/Settings/Channel.php:71 #: ../../Zotlabs/Module/Settings/Channel.php:75 #: ../../Zotlabs/Module/Settings/Channel.php:76 @@ -6521,28 +6536,28 @@ msgid "" "not what you intended, please create another group with a different name." msgstr "" -#: ../../include/group.php:265 ../../Zotlabs/Lib/Group.php:270 +#: ../../include/group.php:271 ../../Zotlabs/Lib/Group.php:270 msgid "Add new connections to this privacy group" msgstr "" -#: ../../include/group.php:299 ../../Zotlabs/Lib/AccessList.php:311 +#: ../../include/group.php:305 ../../Zotlabs/Lib/AccessList.php:311 #: ../../Zotlabs/Lib/Group.php:302 msgid "edit" msgstr "" -#: ../../include/group.php:322 ../../Zotlabs/Lib/Group.php:325 +#: ../../include/group.php:328 ../../Zotlabs/Lib/Group.php:325 msgid "Edit group" msgstr "" -#: ../../include/group.php:323 ../../Zotlabs/Lib/Group.php:326 +#: ../../include/group.php:329 ../../Zotlabs/Lib/Group.php:326 msgid "Add privacy group" msgstr "" -#: ../../include/group.php:324 ../../Zotlabs/Lib/Group.php:327 +#: ../../include/group.php:330 ../../Zotlabs/Lib/Group.php:327 msgid "Channels not in any privacy group" msgstr "" -#: ../../include/group.php:326 ../../Zotlabs/Widget/Savedsearch.php:84 +#: ../../include/group.php:332 ../../Zotlabs/Widget/Savedsearch.php:84 #: ../../Zotlabs/Lib/AccessList.php:336 ../../Zotlabs/Lib/Group.php:329 msgid "add" msgstr "" @@ -6592,177 +6607,199 @@ msgstr "" msgid "dislikes" msgstr "" -#: ../../include/items.php:1001 ../../include/items.php:1061 +#: ../../include/items.php:1037 ../../include/items.php:1097 msgid "(Unknown)" msgstr "" -#: ../../include/items.php:1249 +#: ../../include/items.php:1301 msgid "Visible to anybody on the internet." msgstr "" -#: ../../include/items.php:1251 +#: ../../include/items.php:1303 msgid "Visible to you only." msgstr "" -#: ../../include/items.php:1253 +#: ../../include/items.php:1305 msgid "Visible to anybody in this network." msgstr "" -#: ../../include/items.php:1255 +#: ../../include/items.php:1307 msgid "Visible to anybody authenticated." msgstr "" -#: ../../include/items.php:1257 +#: ../../include/items.php:1309 #, php-format msgid "Visible to anybody on %s." msgstr "" -#: ../../include/items.php:1259 +#: ../../include/items.php:1311 msgid "Visible to all connections." msgstr "" -#: ../../include/items.php:1261 +#: ../../include/items.php:1313 msgid "Visible to approved connections." msgstr "" -#: ../../include/items.php:1263 +#: ../../include/items.php:1315 msgid "Visible to specific connections." msgstr "" -#: ../../include/items.php:4493 ../../Zotlabs/Module/Group.php:62 +#: ../../include/items.php:4584 ../../Zotlabs/Module/Group.php:62 #: ../../Zotlabs/Module/Group.php:214 msgid "Privacy group not found." msgstr "" -#: ../../include/items.php:4509 +#: ../../include/items.php:4600 msgid "Privacy group is empty." msgstr "" -#: ../../include/items.php:4516 +#: ../../include/items.php:4607 #, php-format msgid "Privacy group: %s" msgstr "" -#: ../../include/items.php:4526 ../../Zotlabs/Module/Connedit.php:860 +#: ../../include/items.php:4617 ../../Zotlabs/Module/Connedit.php:860 #, php-format msgid "Connection: %s" msgstr "" -#: ../../include/items.php:4528 +#: ../../include/items.php:4619 msgid "Connection not found." msgstr "" -#: ../../include/items.php:4875 ../../Zotlabs/Module/Cover_photo.php:297 +#: ../../include/items.php:4965 ../../Zotlabs/Module/Cover_photo.php:297 msgid "female" msgstr "" -#: ../../include/items.php:4876 ../../Zotlabs/Module/Cover_photo.php:298 +#: ../../include/items.php:4966 ../../Zotlabs/Module/Cover_photo.php:298 #, php-format msgid "%1$s updated her %2$s" msgstr "" -#: ../../include/items.php:4877 ../../Zotlabs/Module/Cover_photo.php:299 +#: ../../include/items.php:4967 ../../Zotlabs/Module/Cover_photo.php:299 msgid "male" msgstr "" -#: ../../include/items.php:4878 ../../Zotlabs/Module/Cover_photo.php:300 +#: ../../include/items.php:4968 ../../Zotlabs/Module/Cover_photo.php:300 #, php-format msgid "%1$s updated his %2$s" msgstr "" -#: ../../include/items.php:4880 ../../Zotlabs/Module/Cover_photo.php:302 +#: ../../include/items.php:4970 ../../Zotlabs/Module/Cover_photo.php:302 #, php-format msgid "%1$s updated their %2$s" msgstr "" -#: ../../include/items.php:4882 +#: ../../include/items.php:4972 msgid "profile photo" msgstr "" -#: ../../include/items.php:5074 +#: ../../include/items.php:5164 #, php-format msgid "[Edited %s]" msgstr "" -#: ../../include/items.php:5074 +#: ../../include/items.php:5164 msgctxt "edit_activity" msgid "Post" msgstr "" -#: ../../include/items.php:5074 +#: ../../include/items.php:5164 msgctxt "edit_activity" msgid "Comment" msgstr "" #: ../../include/account.php:38 -msgid "Not a valid email address" +msgid "The provided email address is not valid" msgstr "" #: ../../include/account.php:40 -msgid "Your email domain is not among those allowed on this site" +msgid "The provided email domain is not among those allowed on this site" msgstr "" -#: ../../include/account.php:46 -msgid "Your email address is already registered at this site." +#: ../../include/account.php:51 +msgid "The provided email address is already registered at this site" msgstr "" -#: ../../include/account.php:78 +#: ../../include/account.php:88 msgid "An invitation is required." msgstr "" -#: ../../include/account.php:82 +#: ../../include/account.php:97 msgid "Invitation could not be verified." msgstr "" -#: ../../include/account.php:158 +#: ../../include/account.php:185 msgid "Please enter the required information." msgstr "" -#: ../../include/account.php:225 +#: ../../include/account.php:252 ../../include/account.php:360 msgid "Failed to store account information." msgstr "" -#: ../../include/account.php:313 +#: ../../include/account.php:429 ../../include/account.php:497 +#: ../../Zotlabs/Module/Register.php:352 #, php-format msgid "Registration confirmation for %s" msgstr "" -#: ../../include/account.php:382 +#: ../../include/account.php:572 #, php-format msgid "Registration request at %s" msgstr "" -#: ../../include/account.php:404 +#: ../../include/account.php:594 msgid "your registration password" msgstr "" -#: ../../include/account.php:410 ../../include/account.php:473 +#: ../../include/account.php:600 ../../include/account.php:689 #, php-format msgid "Registration details for %s" msgstr "" -#: ../../include/account.php:484 +#: ../../include/account.php:700 msgid "Account approved." msgstr "" -#: ../../include/account.php:524 +#: ../../include/account.php:756 #, php-format msgid "Registration revoked for %s" msgstr "" -#: ../../include/account.php:807 ../../include/account.php:809 +#: ../../include/account.php:763 +#, php-format +msgid "Could not revoke registration for %s" +msgstr "" + +#: ../../include/account.php:1179 ../../include/account.php:1181 msgid "Click here to upgrade." msgstr "" -#: ../../include/account.php:815 +#: ../../include/account.php:1187 msgid "This action exceeds the limits set by your subscription plan." msgstr "" -#: ../../include/account.php:820 +#: ../../include/account.php:1192 msgid "This action is not available under your subscription plan." msgstr "" -#: ../../include/photo/photo_driver.php:434 +#: ../../include/account.php:1252 +msgid "open" +msgstr "" + +#: ../../include/account.php:1252 +msgid "closed" +msgstr "" + +#: ../../include/account.php:1259 +msgid "Registration is currently" +msgstr "" + +#: ../../include/account.php:1268 +msgid "please come back" +msgstr "" + +#: ../../include/photo/photo_driver.php:435 #: ../../Zotlabs/Module/Profile_photo.php:147 #: ../../Zotlabs/Module/Profile_photo.php:284 msgid "Profile Photos" @@ -6845,8 +6882,8 @@ msgstr "" msgid "%1$s's bookmarks" msgstr "" -#: ../../include/menu.php:120 ../../include/channel.php:1539 -#: ../../include/channel.php:1543 ../../Zotlabs/Widget/Cdav.php:138 +#: ../../include/menu.php:120 ../../include/channel.php:1563 +#: ../../include/channel.php:1567 ../../Zotlabs/Widget/Cdav.php:138 #: ../../Zotlabs/Widget/Cdav.php:175 ../../Zotlabs/Module/Article_edit.php:98 #: ../../Zotlabs/Module/Group.php:253 ../../Zotlabs/Module/Card_edit.php:99 #: ../../Zotlabs/Module/Oauth.php:173 ../../Zotlabs/Module/Editwebpage.php:142 @@ -6858,84 +6895,84 @@ msgstr "" #: ../../Zotlabs/Module/Connections.php:363 #: ../../Zotlabs/Module/Connections.php:383 ../../Zotlabs/Module/Menu.php:176 #: ../../Zotlabs/Module/Oauth2.php:194 ../../Zotlabs/Module/Thing.php:268 -#: ../../Zotlabs/Module/Wiki.php:211 ../../Zotlabs/Module/Wiki.php:384 +#: ../../Zotlabs/Module/Wiki.php:210 ../../Zotlabs/Module/Wiki.php:383 #: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Lib/Apps.php:557 #: ../../Zotlabs/Lib/ThreadItem.php:149 msgid "Edit" msgstr "" -#: ../../include/bbcode.php:221 ../../include/bbcode.php:916 -#: ../../include/bbcode.php:1494 ../../include/bbcode.php:1502 +#: ../../include/bbcode.php:233 ../../include/bbcode.php:928 +#: ../../include/bbcode.php:1525 ../../include/bbcode.php:1533 msgid "Image/photo" msgstr "" -#: ../../include/bbcode.php:268 ../../include/bbcode.php:1519 +#: ../../include/bbcode.php:280 ../../include/bbcode.php:1550 msgid "Encrypted content" msgstr "" -#: ../../include/bbcode.php:322 +#: ../../include/bbcode.php:334 #, php-format msgid "Install %1$s element %2$s" msgstr "" -#: ../../include/bbcode.php:326 +#: ../../include/bbcode.php:338 #, php-format msgid "" "This post contains an installable %s element, however you lack permissions " "to install it on this site." msgstr "" -#: ../../include/bbcode.php:336 ../../Zotlabs/Module/Impel.php:43 +#: ../../include/bbcode.php:348 ../../Zotlabs/Module/Impel.php:43 msgid "webpage" msgstr "" -#: ../../include/bbcode.php:339 ../../Zotlabs/Module/Impel.php:53 +#: ../../include/bbcode.php:351 ../../Zotlabs/Module/Impel.php:53 msgid "layout" msgstr "" -#: ../../include/bbcode.php:342 ../../Zotlabs/Module/Impel.php:48 +#: ../../include/bbcode.php:354 ../../Zotlabs/Module/Impel.php:48 msgid "block" msgstr "" -#: ../../include/bbcode.php:345 ../../Zotlabs/Module/Impel.php:60 +#: ../../include/bbcode.php:357 ../../Zotlabs/Module/Impel.php:60 msgid "menu" msgstr "" -#: ../../include/bbcode.php:539 +#: ../../include/bbcode.php:551 msgid "card" msgstr "" -#: ../../include/bbcode.php:541 +#: ../../include/bbcode.php:553 msgid "article" msgstr "" -#: ../../include/bbcode.php:547 ../../include/markdown.php:202 +#: ../../include/bbcode.php:559 ../../include/markdown.php:202 #, php-format msgid "%1$s wrote the following %2$s %3$s" msgstr "" -#: ../../include/bbcode.php:624 ../../include/bbcode.php:632 +#: ../../include/bbcode.php:636 ../../include/bbcode.php:644 msgid "Click to open/close" msgstr "" -#: ../../include/bbcode.php:632 ../../include/markdown.php:255 +#: ../../include/bbcode.php:644 ../../include/markdown.php:255 msgid "spoiler" msgstr "" -#: ../../include/bbcode.php:645 +#: ../../include/bbcode.php:657 msgid "View article" msgstr "" -#: ../../include/bbcode.php:645 +#: ../../include/bbcode.php:657 msgid "View summary" msgstr "" -#: ../../include/bbcode.php:1038 ../../include/bbcode.php:1195 -#: ../../Zotlabs/Lib/NativeWikiPage.php:605 +#: ../../include/bbcode.php:1050 ../../include/bbcode.php:1217 +#: ../../Zotlabs/Lib/NativeWikiPage.php:618 msgid "Different viewers will see this text differently" msgstr "" -#: ../../include/bbcode.php:1482 +#: ../../include/bbcode.php:1501 msgid "$1 wrote:" msgstr "" @@ -6955,17 +6992,17 @@ msgstr "" msgid "No account identifier" msgstr "" -#: ../../include/channel.php:212 +#: ../../include/channel.php:212 ../../Zotlabs/Module/Register.php:95 msgid "Nickname is required." msgstr "" -#: ../../include/channel.php:226 ../../include/channel.php:707 -#: ../../Zotlabs/Module/Changeaddr.php:46 +#: ../../include/channel.php:226 ../../include/channel.php:706 +#: ../../Zotlabs/Module/Register.php:100 ../../Zotlabs/Module/Changeaddr.php:46 msgid "Reserved nickname. Please choose another." msgstr "" -#: ../../include/channel.php:231 ../../include/channel.php:712 -#: ../../Zotlabs/Module/Changeaddr.php:51 +#: ../../include/channel.php:231 ../../include/channel.php:711 +#: ../../Zotlabs/Module/Register.php:105 ../../Zotlabs/Module/Changeaddr.php:51 msgid "" "Nickname has unsupported characters or is already being used on this site." msgstr "" @@ -6978,191 +7015,191 @@ msgstr "" msgid "Default Profile" msgstr "" -#: ../../include/channel.php:640 ../../include/channel.php:729 +#: ../../include/channel.php:639 ../../include/channel.php:728 msgid "Unable to retrieve modified identity" msgstr "" -#: ../../include/channel.php:1386 +#: ../../include/channel.php:1410 msgid "Requested channel is not available." msgstr "" -#: ../../include/channel.php:1532 ../../Zotlabs/Module/Profiles.php:730 +#: ../../include/channel.php:1556 ../../Zotlabs/Module/Profiles.php:730 msgid "Change profile photo" msgstr "" -#: ../../include/channel.php:1540 +#: ../../include/channel.php:1564 msgid "Create New Profile" msgstr "" -#: ../../include/channel.php:1558 ../../Zotlabs/Module/Profiles.php:822 +#: ../../include/channel.php:1582 ../../Zotlabs/Module/Profiles.php:822 msgid "Profile Image" msgstr "" -#: ../../include/channel.php:1561 +#: ../../include/channel.php:1585 msgid "Visible to everybody" msgstr "" -#: ../../include/channel.php:1562 ../../Zotlabs/Module/Profiles.php:727 +#: ../../include/channel.php:1586 ../../Zotlabs/Module/Profiles.php:727 #: ../../Zotlabs/Module/Profiles.php:826 msgid "Edit visibility" msgstr "" -#: ../../include/channel.php:1638 ../../include/channel.php:1766 +#: ../../include/channel.php:1662 ../../include/channel.php:1790 msgid "Gender:" msgstr "" -#: ../../include/channel.php:1639 ../../include/channel.php:1810 +#: ../../include/channel.php:1663 ../../include/channel.php:1834 msgid "Status:" msgstr "" -#: ../../include/channel.php:1640 ../../include/channel.php:1834 +#: ../../include/channel.php:1664 ../../include/channel.php:1858 msgid "Homepage:" msgstr "" -#: ../../include/channel.php:1641 +#: ../../include/channel.php:1665 msgid "Online Now" msgstr "" -#: ../../include/channel.php:1694 +#: ../../include/channel.php:1718 msgid "Change your profile photo" msgstr "" -#: ../../include/channel.php:1725 +#: ../../include/channel.php:1749 msgid "Trans" msgstr "" -#: ../../include/channel.php:1764 ../../Zotlabs/Module/Settings/Channel.php:501 +#: ../../include/channel.php:1788 ../../Zotlabs/Module/Settings/Channel.php:501 msgid "Full Name:" msgstr "" -#: ../../include/channel.php:1771 +#: ../../include/channel.php:1795 msgid "Like this channel" msgstr "" -#: ../../include/channel.php:1795 +#: ../../include/channel.php:1819 msgid "j F, Y" msgstr "" -#: ../../include/channel.php:1796 +#: ../../include/channel.php:1820 msgid "j F" msgstr "" -#: ../../include/channel.php:1803 +#: ../../include/channel.php:1827 msgid "Birthday:" msgstr "" -#: ../../include/channel.php:1807 ../../Zotlabs/Module/Directory.php:349 +#: ../../include/channel.php:1831 ../../Zotlabs/Module/Directory.php:349 msgid "Age:" msgstr "" -#: ../../include/channel.php:1816 +#: ../../include/channel.php:1840 #, php-format msgid "for %1$d %2$s" msgstr "" -#: ../../include/channel.php:1828 +#: ../../include/channel.php:1852 msgid "Tags:" msgstr "" -#: ../../include/channel.php:1832 +#: ../../include/channel.php:1856 msgid "Sexual Preference:" msgstr "" -#: ../../include/channel.php:1836 ../../Zotlabs/Module/Directory.php:367 +#: ../../include/channel.php:1860 ../../Zotlabs/Module/Directory.php:367 msgid "Hometown:" msgstr "" -#: ../../include/channel.php:1838 +#: ../../include/channel.php:1862 msgid "Political Views:" msgstr "" -#: ../../include/channel.php:1840 +#: ../../include/channel.php:1864 msgid "Religion:" msgstr "" -#: ../../include/channel.php:1842 ../../Zotlabs/Module/Directory.php:369 +#: ../../include/channel.php:1866 ../../Zotlabs/Module/Directory.php:369 msgid "About:" msgstr "" -#: ../../include/channel.php:1844 +#: ../../include/channel.php:1868 msgid "Hobbies/Interests:" msgstr "" -#: ../../include/channel.php:1846 +#: ../../include/channel.php:1870 msgid "Likes:" msgstr "" -#: ../../include/channel.php:1848 +#: ../../include/channel.php:1872 msgid "Dislikes:" msgstr "" -#: ../../include/channel.php:1850 +#: ../../include/channel.php:1874 msgid "Contact information and Social Networks:" msgstr "" -#: ../../include/channel.php:1852 +#: ../../include/channel.php:1876 msgid "My other channels:" msgstr "" -#: ../../include/channel.php:1854 +#: ../../include/channel.php:1878 msgid "Musical interests:" msgstr "" -#: ../../include/channel.php:1856 +#: ../../include/channel.php:1880 msgid "Books, literature:" msgstr "" -#: ../../include/channel.php:1858 +#: ../../include/channel.php:1882 msgid "Television:" msgstr "" -#: ../../include/channel.php:1860 +#: ../../include/channel.php:1884 msgid "Film/dance/culture/entertainment:" msgstr "" -#: ../../include/channel.php:1862 +#: ../../include/channel.php:1886 msgid "Love/Romance:" msgstr "" -#: ../../include/channel.php:1864 +#: ../../include/channel.php:1888 msgid "Work/employment:" msgstr "" -#: ../../include/channel.php:1866 +#: ../../include/channel.php:1890 msgid "School/education:" msgstr "" -#: ../../include/channel.php:1887 ../../Zotlabs/Module/Profperm.php:113 +#: ../../include/channel.php:1911 ../../Zotlabs/Module/Profperm.php:113 #: ../../Zotlabs/Lib/Apps.php:362 msgid "Profile" msgstr "" -#: ../../include/channel.php:1889 +#: ../../include/channel.php:1913 msgid "Like this thing" msgstr "" -#: ../../include/channel.php:1890 ../../Zotlabs/Module/Events.php:699 +#: ../../include/channel.php:1914 ../../Zotlabs/Module/Events.php:699 msgid "Export" msgstr "" -#: ../../include/channel.php:2329 ../../Zotlabs/Module/Cover_photo.php:304 +#: ../../include/channel.php:2353 ../../Zotlabs/Module/Cover_photo.php:304 msgid "cover photo" msgstr "" -#: ../../include/channel.php:2598 ../../Zotlabs/Module/Rmagic.php:96 -#: ../../boot.php:1712 +#: ../../include/channel.php:2622 ../../Zotlabs/Module/Rmagic.php:96 +#: ../../boot.php:1717 msgid "Remote Authentication" msgstr "" -#: ../../include/channel.php:2599 ../../Zotlabs/Module/Rmagic.php:97 +#: ../../include/channel.php:2623 ../../Zotlabs/Module/Rmagic.php:97 msgid "Enter your channel address (e.g. channel@example.com)" msgstr "" -#: ../../include/channel.php:2600 ../../Zotlabs/Module/Rmagic.php:98 +#: ../../include/channel.php:2624 ../../Zotlabs/Module/Rmagic.php:98 msgid "Authenticate" msgstr "" -#: ../../include/channel.php:2758 ../../Zotlabs/Module/Admin/Accounts.php:91 +#: ../../include/channel.php:2782 ../../Zotlabs/Module/Admin/Accounts.php:184 #, php-format msgid "Account '%s' deleted" msgstr "" @@ -7172,49 +7209,49 @@ msgstr "" msgid "Visible to your default audience" msgstr "" -#: ../../include/acl_selectors.php:99 +#: ../../include/acl_selectors.php:100 msgid "Profile-Based Privacy Groups" msgstr "" -#: ../../include/acl_selectors.php:118 +#: ../../include/acl_selectors.php:119 msgid "Private Forum" msgstr "" -#: ../../include/acl_selectors.php:124 ../../Zotlabs/Widget/Forums.php:100 -#: ../../Zotlabs/Widget/Activity_filter.php:115 +#: ../../include/acl_selectors.php:125 ../../Zotlabs/Widget/Forums.php:100 +#: ../../Zotlabs/Widget/Activity_filter.php:123 #: ../../Zotlabs/Widget/Notifications.php:139 #: ../../Zotlabs/Widget/Notifications.php:140 msgid "Forums" msgstr "" -#: ../../include/acl_selectors.php:135 +#: ../../include/acl_selectors.php:136 #: ../../Zotlabs/Lib/PermissionDescription.php:107 msgid "Only me" msgstr "" -#: ../../include/acl_selectors.php:142 +#: ../../include/acl_selectors.php:143 msgid "Share with" msgstr "" -#: ../../include/acl_selectors.php:143 +#: ../../include/acl_selectors.php:144 msgid "Custom selection" msgstr "" -#: ../../include/acl_selectors.php:145 +#: ../../include/acl_selectors.php:146 msgid "" "Select \"Allow\" to allow viewing. \"Don't allow\" lets you override and " "limit the scope of \"Allow\"." msgstr "" -#: ../../include/acl_selectors.php:146 ../../Zotlabs/Module/Authorize.php:32 +#: ../../include/acl_selectors.php:147 ../../Zotlabs/Module/Authorize.php:32 msgid "Allow" msgstr "" -#: ../../include/acl_selectors.php:147 +#: ../../include/acl_selectors.php:148 msgid "Don't allow" msgstr "" -#: ../../include/acl_selectors.php:180 +#: ../../include/acl_selectors.php:181 #, php-format msgid "" "Post permissions %s cannot be changed %s after a post is shared.</br />These " @@ -7412,28 +7449,28 @@ msgstr "" msgid "share" msgstr "" -#: ../../Zotlabs/Widget/Pinned.php:123 ../../Zotlabs/Widget/Pinned.php:124 +#: ../../Zotlabs/Widget/Pinned.php:122 ../../Zotlabs/Widget/Pinned.php:123 #, php-format msgid "View %s's profile - %s" msgstr "" -#: ../../Zotlabs/Widget/Pinned.php:128 ../../Zotlabs/Lib/ThreadItem.php:414 +#: ../../Zotlabs/Widget/Pinned.php:127 ../../Zotlabs/Lib/ThreadItem.php:414 msgid "via" msgstr "" -#: ../../Zotlabs/Widget/Pinned.php:143 ../../Zotlabs/Lib/ThreadItem.php:445 +#: ../../Zotlabs/Widget/Pinned.php:141 ../../Zotlabs/Lib/ThreadItem.php:445 msgid "Attendance Options" msgstr "" -#: ../../Zotlabs/Widget/Pinned.php:144 ../../Zotlabs/Lib/ThreadItem.php:447 +#: ../../Zotlabs/Widget/Pinned.php:142 ../../Zotlabs/Lib/ThreadItem.php:447 msgid "Voting Options" msgstr "" -#: ../../Zotlabs/Widget/Pinned.php:156 ../../Zotlabs/Lib/ThreadItem.php:471 +#: ../../Zotlabs/Widget/Pinned.php:154 ../../Zotlabs/Lib/ThreadItem.php:471 msgid "Pinned post" msgstr "" -#: ../../Zotlabs/Widget/Pinned.php:158 +#: ../../Zotlabs/Widget/Pinned.php:156 msgid "Don't show" msgstr "" @@ -7459,7 +7496,7 @@ msgid "Channel Calendar" msgstr "" #: ../../Zotlabs/Widget/Cdav.php:129 ../../Zotlabs/Widget/Cdav.php:143 -#: ../../Zotlabs/Module/Cdav.php:1055 +#: ../../Zotlabs/Module/Cdav.php:1056 msgid "CalDAV Calendars" msgstr "" @@ -7480,7 +7517,7 @@ msgid "Create new CalDAV calendar" msgstr "" #: ../../Zotlabs/Widget/Cdav.php:140 ../../Zotlabs/Widget/Cdav.php:178 -#: ../../Zotlabs/Module/Cdav.php:1059 ../../Zotlabs/Module/Cdav.php:1387 +#: ../../Zotlabs/Module/Cdav.php:1060 ../../Zotlabs/Module/Cdav.php:1388 #: ../../Zotlabs/Module/Webpages.php:254 #: ../../Zotlabs/Module/New_channel.php:189 ../../Zotlabs/Module/Blocks.php:159 #: ../../Zotlabs/Module/Profiles.php:800 ../../Zotlabs/Module/Menu.php:182 @@ -7497,7 +7534,7 @@ msgstr "" msgid "Calendar Tools" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:143 ../../Zotlabs/Module/Cdav.php:1055 +#: ../../Zotlabs/Widget/Cdav.php:143 ../../Zotlabs/Module/Cdav.php:1056 msgid "Channel Calendars" msgstr "" @@ -7582,23 +7619,23 @@ msgid "Bookmarked Chatrooms" msgstr "" #: ../../Zotlabs/Widget/Wiki_page_history.php:23 -#: ../../Zotlabs/Lib/NativeWikiPage.php:564 +#: ../../Zotlabs/Lib/NativeWikiPage.php:577 msgctxt "wiki_history" msgid "Message" msgstr "" #: ../../Zotlabs/Widget/Wiki_page_history.php:24 -#: ../../Zotlabs/Lib/NativeWikiPage.php:565 +#: ../../Zotlabs/Lib/NativeWikiPage.php:578 msgid "Date" msgstr "" #: ../../Zotlabs/Widget/Wiki_page_history.php:25 -#: ../../Zotlabs/Module/Wiki.php:367 ../../Zotlabs/Lib/NativeWikiPage.php:566 +#: ../../Zotlabs/Module/Wiki.php:366 ../../Zotlabs/Lib/NativeWikiPage.php:579 msgid "Revert" msgstr "" #: ../../Zotlabs/Widget/Wiki_page_history.php:26 -#: ../../Zotlabs/Lib/NativeWikiPage.php:567 +#: ../../Zotlabs/Lib/NativeWikiPage.php:580 msgid "Compare" msgstr "" @@ -7634,13 +7671,13 @@ msgstr "" msgid "photo/image" msgstr "" -#: ../../Zotlabs/Widget/Admin.php:22 ../../Zotlabs/Module/Admin/Site.php:292 +#: ../../Zotlabs/Widget/Admin.php:22 ../../Zotlabs/Module/Admin/Site.php:411 msgid "Site" msgstr "" #: ../../Zotlabs/Widget/Admin.php:23 -#: ../../Zotlabs/Module/Admin/Accounts.php:167 -#: ../../Zotlabs/Module/Admin/Accounts.php:180 +#: ../../Zotlabs/Module/Admin/Accounts.php:308 +#: ../../Zotlabs/Module/Admin/Accounts.php:327 #: ../../Zotlabs/Module/Admin.php:96 msgid "Accounts" msgstr "" @@ -7651,7 +7688,7 @@ msgstr "" #: ../../Zotlabs/Widget/Admin.php:24 #: ../../Zotlabs/Module/Admin/Channels.php:146 -#: ../../Zotlabs/Module/Admin.php:114 +#: ../../Zotlabs/Module/Admin.php:117 msgid "Channels" msgstr "" @@ -7694,85 +7731,85 @@ msgstr "" msgid "Addon Features" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:33 +#: ../../Zotlabs/Widget/Activity_filter.php:37 msgid "Direct Messages" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:37 +#: ../../Zotlabs/Widget/Activity_filter.php:41 msgid "Show direct (private) messages" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:42 +#: ../../Zotlabs/Widget/Activity_filter.php:46 msgid "Events" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:46 +#: ../../Zotlabs/Widget/Activity_filter.php:50 msgid "Show posts that include events" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:52 +#: ../../Zotlabs/Widget/Activity_filter.php:56 msgid "Polls" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:56 +#: ../../Zotlabs/Widget/Activity_filter.php:60 msgid "Show posts that include polls" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:77 +#: ../../Zotlabs/Widget/Activity_filter.php:83 #, php-format msgid "Show posts related to the %s privacy group" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:86 +#: ../../Zotlabs/Widget/Activity_filter.php:92 msgid "Show my privacy groups" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:108 +#: ../../Zotlabs/Widget/Activity_filter.php:116 msgid "Show posts to this forum" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:119 +#: ../../Zotlabs/Widget/Activity_filter.php:127 msgid "Show forums" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:133 +#: ../../Zotlabs/Widget/Activity_filter.php:141 msgid "Starred Posts" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:137 +#: ../../Zotlabs/Widget/Activity_filter.php:145 msgid "Show posts that I have starred" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:148 +#: ../../Zotlabs/Widget/Activity_filter.php:156 msgid "Personal Posts" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:152 +#: ../../Zotlabs/Widget/Activity_filter.php:160 msgid "Show posts that mention or involve me" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:173 +#: ../../Zotlabs/Widget/Activity_filter.php:183 #, php-format msgid "Show posts that I have filed to %s" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:183 +#: ../../Zotlabs/Widget/Activity_filter.php:193 msgid "Show filed post categories" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:197 +#: ../../Zotlabs/Widget/Activity_filter.php:207 msgid "Panel search" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:207 +#: ../../Zotlabs/Widget/Activity_filter.php:217 msgid "Filter by name" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:222 +#: ../../Zotlabs/Widget/Activity_filter.php:232 msgid "Remove active filter" msgstr "" -#: ../../Zotlabs/Widget/Activity_filter.php:238 +#: ../../Zotlabs/Widget/Activity_filter.php:248 msgid "Stream Filters" msgstr "" @@ -8186,29 +8223,29 @@ msgstr "" msgid "Can not move folder \"%s\" into itself." msgstr "" -#: ../../Zotlabs/Module/Network.php:105 +#: ../../Zotlabs/Module/Network.php:107 msgid "No such group" msgstr "" -#: ../../Zotlabs/Module/Network.php:152 +#: ../../Zotlabs/Module/Network.php:156 msgid "No such channel" msgstr "" -#: ../../Zotlabs/Module/Network.php:164 ../../Zotlabs/Module/Channel.php:221 +#: ../../Zotlabs/Module/Network.php:168 ../../Zotlabs/Module/Channel.php:221 msgid "Search Results For:" msgstr "" -#: ../../Zotlabs/Module/Network.php:205 ../../Zotlabs/Module/Channel.php:256 +#: ../../Zotlabs/Module/Network.php:209 ../../Zotlabs/Module/Channel.php:256 #: ../../Zotlabs/Module/Hq.php:125 ../../Zotlabs/Module/Pubstream.php:95 #: ../../Zotlabs/Module/Display.php:76 msgid "Reset form" msgstr "" -#: ../../Zotlabs/Module/Network.php:239 +#: ../../Zotlabs/Module/Network.php:243 msgid "Privacy group is empty" msgstr "" -#: ../../Zotlabs/Module/Network.php:249 +#: ../../Zotlabs/Module/Network.php:253 msgid "Privacy group: " msgstr "" @@ -8243,7 +8280,7 @@ msgid "Use this form to import existing posts and content from an export file." msgstr "" #: ../../Zotlabs/Module/Import_items.php:127 -#: ../../Zotlabs/Module/Import.php:629 +#: ../../Zotlabs/Module/Import.php:630 msgid "File to Upload" msgstr "" @@ -8256,42 +8293,42 @@ msgstr "" msgid "No channel. Import failed." msgstr "" -#: ../../Zotlabs/Module/Import.php:622 +#: ../../Zotlabs/Module/Import.php:623 msgid "You must be logged in to use this feature." msgstr "" -#: ../../Zotlabs/Module/Import.php:627 +#: ../../Zotlabs/Module/Import.php:628 msgid "Import Channel" msgstr "" -#: ../../Zotlabs/Module/Import.php:628 +#: ../../Zotlabs/Module/Import.php:629 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:630 +#: ../../Zotlabs/Module/Import.php:631 msgid "Or provide the old server/hub details" msgstr "" -#: ../../Zotlabs/Module/Import.php:632 +#: ../../Zotlabs/Module/Import.php:633 msgid "Your old identity address (xyz@example.com)" msgstr "" -#: ../../Zotlabs/Module/Import.php:633 +#: ../../Zotlabs/Module/Import.php:634 msgid "Your old login email address" msgstr "" -#: ../../Zotlabs/Module/Import.php:634 +#: ../../Zotlabs/Module/Import.php:635 msgid "Your old login password" msgstr "" -#: ../../Zotlabs/Module/Import.php:635 +#: ../../Zotlabs/Module/Import.php:636 msgid "Import a few months of posts if possible (limited by available memory" msgstr "" -#: ../../Zotlabs/Module/Import.php:637 +#: ../../Zotlabs/Module/Import.php:638 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 " @@ -8299,25 +8336,25 @@ msgid "" "location for files, photos, and media." msgstr "" -#: ../../Zotlabs/Module/Import.php:639 +#: ../../Zotlabs/Module/Import.php:640 msgid "Make this hub my primary location" msgstr "" -#: ../../Zotlabs/Module/Import.php:640 +#: ../../Zotlabs/Module/Import.php:641 msgid "Move this channel (disable all previous locations)" msgstr "" -#: ../../Zotlabs/Module/Import.php:641 +#: ../../Zotlabs/Module/Import.php:642 msgid "Use this channel nickname instead of the one provided" msgstr "" -#: ../../Zotlabs/Module/Import.php:641 +#: ../../Zotlabs/Module/Import.php:642 msgid "" "Leave blank to keep your existing channel nickname. You will be randomly " "assigned a similar nickname if either name is already allocated on this site." msgstr "" -#: ../../Zotlabs/Module/Import.php:643 +#: ../../Zotlabs/Module/Import.php:644 msgid "" "This process may take several minutes to complete. Please submit the form " "only once and leave this page open until finished." @@ -8344,145 +8381,150 @@ msgstr "" msgid "from the terminal." msgstr "" -#: ../../Zotlabs/Module/Register.php:52 -msgid "Maximum daily site registrations exceeded. Please try again tomorrow." +#: ../../Zotlabs/Module/Register.php:112 +msgid "Email address required" msgstr "" -#: ../../Zotlabs/Module/Register.php:58 -msgid "" -"Please indicate acceptance of the Terms of Service. Registration failed." +#: ../../Zotlabs/Module/Register.php:153 +msgid "No password provided" msgstr "" -#: ../../Zotlabs/Module/Register.php:92 -msgid "Passwords do not match." +#: ../../Zotlabs/Module/Register.php:176 +msgid "Terms of Service not accepted" msgstr "" -#: ../../Zotlabs/Module/Register.php:135 -msgid "Registration successful. Continue to create your first channel..." +#: ../../Zotlabs/Module/Register.php:238 +msgid "Invitation code succesfully applied" msgstr "" -#: ../../Zotlabs/Module/Register.php:138 -msgid "" -"Registration successful. Please check your email for validation instructions." +#: ../../Zotlabs/Module/Register.php:258 +msgid "Invitation not in time or too late" +msgstr "" + +#: ../../Zotlabs/Module/Register.php:264 +msgid "Invitation email failed" +msgstr "" + +#: ../../Zotlabs/Module/Register.php:272 +msgid "Invitation code failed" +msgstr "" + +#: ../../Zotlabs/Module/Register.php:279 +msgid "Invitations are not available" msgstr "" -#: ../../Zotlabs/Module/Register.php:145 -msgid "Your registration is pending approval by the site owner." +#: ../../Zotlabs/Module/Register.php:305 +msgid "Email address already in use" msgstr "" -#: ../../Zotlabs/Module/Register.php:148 -msgid "Your registration can not be processed." +#: ../../Zotlabs/Module/Register.php:315 +msgid "Registration on this hub is by invitation only" msgstr "" -#: ../../Zotlabs/Module/Register.php:195 +#: ../../Zotlabs/Module/Register.php:423 +msgid "New register request" +msgstr "" + +#: ../../Zotlabs/Module/Register.php:441 +msgid "Error creating dId A" +msgstr "" + +#: ../../Zotlabs/Module/Register.php:459 msgid "Registration on this hub is disabled." msgstr "" -#: ../../Zotlabs/Module/Register.php:204 +#: ../../Zotlabs/Module/Register.php:468 msgid "Registration on this hub is by approval only." msgstr "" -#: ../../Zotlabs/Module/Register.php:205 ../../Zotlabs/Module/Register.php:214 -msgid "<a href=\"pubsites\">Register at another affiliated hub.</a>" +#: ../../Zotlabs/Module/Register.php:469 +msgid "Register at another affiliated hub in case when prefered" msgstr "" -#: ../../Zotlabs/Module/Register.php:213 +#: ../../Zotlabs/Module/Register.php:482 msgid "Registration on this hub is by invitation only." msgstr "" -#: ../../Zotlabs/Module/Register.php:224 -msgid "" -"This site has exceeded the number of allowed daily account registrations. " -"Please try again tomorrow." +#: ../../Zotlabs/Module/Register.php:483 +msgid "Register at another affiliated hub" msgstr "" -#: ../../Zotlabs/Module/Register.php:239 ../../Zotlabs/Module/Siteinfo.php:28 +#: ../../Zotlabs/Module/Register.php:497 ../../Zotlabs/Module/Siteinfo.php:28 msgid "Terms of Service" msgstr "" -#: ../../Zotlabs/Module/Register.php:245 +#: ../../Zotlabs/Module/Register.php:503 #, php-format msgid "I accept the %s for this website" msgstr "" -#: ../../Zotlabs/Module/Register.php:252 +#: ../../Zotlabs/Module/Register.php:510 #, php-format msgid "I am over %s years of age and accept the %s for this website" msgstr "" -#: ../../Zotlabs/Module/Register.php:257 +#: ../../Zotlabs/Module/Register.php:520 msgid "Your email address" msgstr "" -#: ../../Zotlabs/Module/Register.php:258 +#: ../../Zotlabs/Module/Register.php:522 ../../Zotlabs/Module/Oauth.php:117 +#: ../../Zotlabs/Module/Sources.php:123 ../../Zotlabs/Module/Sources.php:158 +msgid "Optional" +msgstr "" + +#: ../../Zotlabs/Module/Register.php:527 msgid "Choose a password" msgstr "" -#: ../../Zotlabs/Module/Register.php:259 +#: ../../Zotlabs/Module/Register.php:528 msgid "Please re-enter your password" msgstr "" -#: ../../Zotlabs/Module/Register.php:260 +#: ../../Zotlabs/Module/Register.php:530 msgid "Please enter your invitation code" msgstr "" -#: ../../Zotlabs/Module/Register.php:261 -msgid "Your Name" +#: ../../Zotlabs/Module/Register.php:532 +msgid "Your name" msgstr "" -#: ../../Zotlabs/Module/Register.php:261 -msgid "Real names are preferred." +#: ../../Zotlabs/Module/Register.php:532 +msgid "Real name is preferred" msgstr "" -#: ../../Zotlabs/Module/Register.php:263 +#: ../../Zotlabs/Module/Register.php:534 #: ../../Zotlabs/Module/New_channel.php:177 msgid "Choose a short nickname" msgstr "" -#: ../../Zotlabs/Module/Register.php:263 -#, php-format +#: ../../Zotlabs/Module/Register.php:534 msgid "" -"Your nickname will be used to create an easy to remember channel address e." -"g. nickname%s" +"Your nickname will be used to create an easy to remember channel address" msgstr "" -#: ../../Zotlabs/Module/Register.php:264 -#: ../../Zotlabs/Module/New_channel.php:178 -#: ../../Zotlabs/Module/Settings/Channel.php:537 -msgid "Channel role and privacy" +#: ../../Zotlabs/Module/Register.php:538 +msgid "Why do you want to join this hub?" msgstr "" -#: ../../Zotlabs/Module/Register.php:264 -msgid "" -"Select a channel permission role for your usage needs and privacy " -"requirements." +#: ../../Zotlabs/Module/Register.php:538 +msgid "This will help to review your registrtation" msgstr "" -#: ../../Zotlabs/Module/Register.php:264 -#: ../../Zotlabs/Module/New_channel.php:178 -msgid "Read more about channel permission roles" -msgstr "" - -#: ../../Zotlabs/Module/Register.php:265 -msgid "no" -msgstr "" - -#: ../../Zotlabs/Module/Register.php:265 -msgid "yes" +#: ../../Zotlabs/Module/Register.php:544 +#: ../../Zotlabs/Module/Admin/Site.php:413 +msgid "Registration" msgstr "" -#: ../../Zotlabs/Module/Register.php:277 -#: ../../Zotlabs/Module/Admin/Site.php:294 -msgid "Registration" +#: ../../Zotlabs/Module/Register.php:552 +msgid "I have an invite code" msgstr "" -#: ../../Zotlabs/Module/Register.php:294 +#: ../../Zotlabs/Module/Register.php:599 msgid "" -"This site requires email verification. After completing this form, please " -"check your email for further instructions." +"This site has exceeded the number of allowed daily account registrations." msgstr "" -#: ../../Zotlabs/Module/Search.php:22 +#: ../../Zotlabs/Module/Search.php:21 #: ../../Zotlabs/Module/Viewconnections.php:23 #: ../../Zotlabs/Module/Ratings.php:83 ../../Zotlabs/Module/Display.php:26 #: ../../Zotlabs/Module/Directory.php:73 ../../Zotlabs/Module/Directory.php:78 @@ -8490,424 +8532,424 @@ msgstr "" msgid "Public access denied." msgstr "" -#: ../../Zotlabs/Module/Search.php:251 +#: ../../Zotlabs/Module/Search.php:250 #, php-format msgid "Items tagged with: %s" msgstr "" -#: ../../Zotlabs/Module/Search.php:253 +#: ../../Zotlabs/Module/Search.php:252 #, php-format msgid "Search results for: %s" msgstr "" -#: ../../Zotlabs/Module/Setup.php:167 +#: ../../Zotlabs/Module/Setup.php:169 msgid "$Projectname Server - Setup" msgstr "" -#: ../../Zotlabs/Module/Setup.php:171 +#: ../../Zotlabs/Module/Setup.php:173 msgid "Could not connect to database." msgstr "" -#: ../../Zotlabs/Module/Setup.php:175 +#: ../../Zotlabs/Module/Setup.php:177 msgid "" "Could not connect to specified site URL. Possible SSL certificate or DNS " "issue." msgstr "" -#: ../../Zotlabs/Module/Setup.php:182 +#: ../../Zotlabs/Module/Setup.php:184 msgid "Could not create table." msgstr "" -#: ../../Zotlabs/Module/Setup.php:188 +#: ../../Zotlabs/Module/Setup.php:190 msgid "Your site database has been installed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:194 +#: ../../Zotlabs/Module/Setup.php:196 msgid "" "You may need to import the file \"install/schema_xxx.sql\" manually using a " "database client." msgstr "" -#: ../../Zotlabs/Module/Setup.php:195 ../../Zotlabs/Module/Setup.php:259 -#: ../../Zotlabs/Module/Setup.php:766 +#: ../../Zotlabs/Module/Setup.php:197 ../../Zotlabs/Module/Setup.php:261 +#: ../../Zotlabs/Module/Setup.php:768 msgid "Please see the file \"install/INSTALL.txt\"." msgstr "" -#: ../../Zotlabs/Module/Setup.php:256 +#: ../../Zotlabs/Module/Setup.php:258 msgid "System check" msgstr "" -#: ../../Zotlabs/Module/Setup.php:260 ../../Zotlabs/Module/Cdav.php:1036 +#: ../../Zotlabs/Module/Setup.php:262 ../../Zotlabs/Module/Cdav.php:1037 #: ../../Zotlabs/Module/Events.php:698 ../../Zotlabs/Module/Events.php:707 #: ../../Zotlabs/Module/Cal.php:204 ../../Zotlabs/Module/Photos.php:956 msgid "Next" msgstr "" -#: ../../Zotlabs/Module/Setup.php:261 +#: ../../Zotlabs/Module/Setup.php:263 msgid "Check again" msgstr "" -#: ../../Zotlabs/Module/Setup.php:282 +#: ../../Zotlabs/Module/Setup.php:284 msgid "Database connection" msgstr "" -#: ../../Zotlabs/Module/Setup.php:283 +#: ../../Zotlabs/Module/Setup.php:285 msgid "" "In order to install $Projectname we need to know how to connect to your " "database." msgstr "" -#: ../../Zotlabs/Module/Setup.php:284 +#: ../../Zotlabs/Module/Setup.php:286 msgid "" "Please contact your hosting provider or site administrator if you have " "questions about these settings." msgstr "" -#: ../../Zotlabs/Module/Setup.php:285 +#: ../../Zotlabs/Module/Setup.php:287 msgid "" "The database you specify below should already exist. If it does not, please " "create it before continuing." msgstr "" -#: ../../Zotlabs/Module/Setup.php:289 +#: ../../Zotlabs/Module/Setup.php:291 msgid "Database Server Name" msgstr "" -#: ../../Zotlabs/Module/Setup.php:289 +#: ../../Zotlabs/Module/Setup.php:291 msgid "Default is 127.0.0.1" msgstr "" -#: ../../Zotlabs/Module/Setup.php:290 +#: ../../Zotlabs/Module/Setup.php:292 msgid "Database Port" msgstr "" -#: ../../Zotlabs/Module/Setup.php:290 +#: ../../Zotlabs/Module/Setup.php:292 msgid "Communication port number - use 0 for default" msgstr "" -#: ../../Zotlabs/Module/Setup.php:291 +#: ../../Zotlabs/Module/Setup.php:293 msgid "Database Login Name" msgstr "" -#: ../../Zotlabs/Module/Setup.php:292 +#: ../../Zotlabs/Module/Setup.php:294 msgid "Database Login Password" msgstr "" -#: ../../Zotlabs/Module/Setup.php:293 +#: ../../Zotlabs/Module/Setup.php:295 msgid "Database Name" msgstr "" -#: ../../Zotlabs/Module/Setup.php:294 +#: ../../Zotlabs/Module/Setup.php:296 msgid "Database Type" msgstr "" -#: ../../Zotlabs/Module/Setup.php:296 ../../Zotlabs/Module/Setup.php:336 +#: ../../Zotlabs/Module/Setup.php:298 ../../Zotlabs/Module/Setup.php:338 msgid "Site administrator email address" msgstr "" -#: ../../Zotlabs/Module/Setup.php:296 ../../Zotlabs/Module/Setup.php:336 +#: ../../Zotlabs/Module/Setup.php:298 ../../Zotlabs/Module/Setup.php:338 msgid "" "Your account email address must match this in order to use the web admin " "panel." msgstr "" -#: ../../Zotlabs/Module/Setup.php:297 ../../Zotlabs/Module/Setup.php:338 +#: ../../Zotlabs/Module/Setup.php:299 ../../Zotlabs/Module/Setup.php:340 msgid "Website URL" msgstr "" -#: ../../Zotlabs/Module/Setup.php:297 ../../Zotlabs/Module/Setup.php:338 +#: ../../Zotlabs/Module/Setup.php:299 ../../Zotlabs/Module/Setup.php:340 msgid "Please use SSL (https) URL if available." msgstr "" -#: ../../Zotlabs/Module/Setup.php:298 ../../Zotlabs/Module/Setup.php:340 +#: ../../Zotlabs/Module/Setup.php:300 ../../Zotlabs/Module/Setup.php:342 msgid "Please select a default timezone for your website" msgstr "" -#: ../../Zotlabs/Module/Setup.php:325 +#: ../../Zotlabs/Module/Setup.php:327 msgid "Site settings" msgstr "" -#: ../../Zotlabs/Module/Setup.php:379 +#: ../../Zotlabs/Module/Setup.php:381 msgid "PHP version 7.1 or greater is required." msgstr "" -#: ../../Zotlabs/Module/Setup.php:380 +#: ../../Zotlabs/Module/Setup.php:382 msgid "PHP version" msgstr "" -#: ../../Zotlabs/Module/Setup.php:396 +#: ../../Zotlabs/Module/Setup.php:398 msgid "Could not find a command line version of PHP in the web server PATH." msgstr "" -#: ../../Zotlabs/Module/Setup.php:397 +#: ../../Zotlabs/Module/Setup.php:399 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/Setup.php:401 +#: ../../Zotlabs/Module/Setup.php:403 msgid "PHP executable path" msgstr "" -#: ../../Zotlabs/Module/Setup.php:401 +#: ../../Zotlabs/Module/Setup.php:403 msgid "" "Enter full path to php executable. You can leave this blank to continue the " "installation." msgstr "" -#: ../../Zotlabs/Module/Setup.php:406 +#: ../../Zotlabs/Module/Setup.php:408 msgid "Command line PHP" msgstr "" -#: ../../Zotlabs/Module/Setup.php:416 +#: ../../Zotlabs/Module/Setup.php:418 msgid "" "Unable to check command line PHP, as shell_exec() is disabled. This is " "required." msgstr "" -#: ../../Zotlabs/Module/Setup.php:420 +#: ../../Zotlabs/Module/Setup.php:422 msgid "" "The command line version of PHP on your system does not have " "\"register_argc_argv\" enabled." msgstr "" -#: ../../Zotlabs/Module/Setup.php:421 +#: ../../Zotlabs/Module/Setup.php:423 msgid "This is required for message delivery to work." msgstr "" -#: ../../Zotlabs/Module/Setup.php:424 +#: ../../Zotlabs/Module/Setup.php:426 msgid "PHP register_argc_argv" msgstr "" -#: ../../Zotlabs/Module/Setup.php:444 +#: ../../Zotlabs/Module/Setup.php:446 msgid "" "This is not sufficient to upload larger images or files. You should be able " "to upload at least 4 MB at once." msgstr "" -#: ../../Zotlabs/Module/Setup.php:446 +#: ../../Zotlabs/Module/Setup.php:448 #, 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/Setup.php:452 +#: ../../Zotlabs/Module/Setup.php:454 msgid "You can adjust these settings in the server php.ini file." msgstr "" -#: ../../Zotlabs/Module/Setup.php:454 +#: ../../Zotlabs/Module/Setup.php:456 msgid "PHP upload limits" msgstr "" -#: ../../Zotlabs/Module/Setup.php:477 +#: ../../Zotlabs/Module/Setup.php:479 msgid "" "Error: the \"openssl_pkey_new\" function on this system is not able to " "generate encryption keys" msgstr "" -#: ../../Zotlabs/Module/Setup.php:478 +#: ../../Zotlabs/Module/Setup.php:480 msgid "" "If running under Windows, please see \"http://www.php.net/manual/en/openssl." "installation.php\"." msgstr "" -#: ../../Zotlabs/Module/Setup.php:481 +#: ../../Zotlabs/Module/Setup.php:483 msgid "Generate encryption keys" msgstr "" -#: ../../Zotlabs/Module/Setup.php:498 +#: ../../Zotlabs/Module/Setup.php:500 msgid "libCurl PHP module" msgstr "" -#: ../../Zotlabs/Module/Setup.php:499 +#: ../../Zotlabs/Module/Setup.php:501 msgid "GD graphics PHP module" msgstr "" -#: ../../Zotlabs/Module/Setup.php:500 +#: ../../Zotlabs/Module/Setup.php:502 msgid "OpenSSL PHP module" msgstr "" -#: ../../Zotlabs/Module/Setup.php:501 +#: ../../Zotlabs/Module/Setup.php:503 msgid "PDO database PHP module" msgstr "" -#: ../../Zotlabs/Module/Setup.php:502 +#: ../../Zotlabs/Module/Setup.php:504 msgid "mb_string PHP module" msgstr "" -#: ../../Zotlabs/Module/Setup.php:503 +#: ../../Zotlabs/Module/Setup.php:505 msgid "xml PHP module" msgstr "" -#: ../../Zotlabs/Module/Setup.php:504 +#: ../../Zotlabs/Module/Setup.php:506 msgid "zip PHP module" msgstr "" -#: ../../Zotlabs/Module/Setup.php:508 ../../Zotlabs/Module/Setup.php:510 +#: ../../Zotlabs/Module/Setup.php:510 ../../Zotlabs/Module/Setup.php:512 msgid "Apache mod_rewrite module" msgstr "" -#: ../../Zotlabs/Module/Setup.php:508 +#: ../../Zotlabs/Module/Setup.php:510 msgid "" "Error: Apache webserver mod-rewrite module is required but not installed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:514 ../../Zotlabs/Module/Setup.php:517 +#: ../../Zotlabs/Module/Setup.php:516 ../../Zotlabs/Module/Setup.php:519 msgid "exec" msgstr "" -#: ../../Zotlabs/Module/Setup.php:514 +#: ../../Zotlabs/Module/Setup.php:516 msgid "" "Error: exec is required but is either not installed or has been disabled in " "php.ini" msgstr "" -#: ../../Zotlabs/Module/Setup.php:520 ../../Zotlabs/Module/Setup.php:523 +#: ../../Zotlabs/Module/Setup.php:522 ../../Zotlabs/Module/Setup.php:525 msgid "shell_exec" msgstr "" -#: ../../Zotlabs/Module/Setup.php:520 +#: ../../Zotlabs/Module/Setup.php:522 msgid "" "Error: shell_exec is required but is either not installed or has been " "disabled in php.ini" msgstr "" -#: ../../Zotlabs/Module/Setup.php:528 +#: ../../Zotlabs/Module/Setup.php:530 msgid "Error: libCURL PHP module required but not installed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:532 +#: ../../Zotlabs/Module/Setup.php:534 msgid "" "Error: GD PHP module with JPEG support or ImageMagick graphics library " "required but not installed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:536 +#: ../../Zotlabs/Module/Setup.php:538 msgid "Error: openssl PHP module required but not installed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:542 +#: ../../Zotlabs/Module/Setup.php:544 msgid "" "Error: PDO database PHP module missing a driver for either mysql or pgsql." msgstr "" -#: ../../Zotlabs/Module/Setup.php:547 +#: ../../Zotlabs/Module/Setup.php:549 msgid "Error: PDO database PHP module required but not installed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:551 +#: ../../Zotlabs/Module/Setup.php:553 msgid "Error: mb_string PHP module required but not installed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:555 +#: ../../Zotlabs/Module/Setup.php:557 msgid "Error: xml PHP module required for DAV but not installed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:559 +#: ../../Zotlabs/Module/Setup.php:561 msgid "Error: zip PHP module required but not installed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:578 ../../Zotlabs/Module/Setup.php:587 +#: ../../Zotlabs/Module/Setup.php:580 ../../Zotlabs/Module/Setup.php:589 msgid ".htconfig.php is writable" msgstr "" -#: ../../Zotlabs/Module/Setup.php:583 +#: ../../Zotlabs/Module/Setup.php:585 msgid "" "The web installer needs to be able to create a file called \".htconfig.php\" " "in the top folder of your web server and it is unable to do so." msgstr "" -#: ../../Zotlabs/Module/Setup.php:584 +#: ../../Zotlabs/Module/Setup.php:586 msgid "" "This is most often a permission setting, as the web server may not be able " "to write files in your folder - even if you can." msgstr "" -#: ../../Zotlabs/Module/Setup.php:585 +#: ../../Zotlabs/Module/Setup.php:587 msgid "Please see install/INSTALL.txt for additional information." msgstr "" -#: ../../Zotlabs/Module/Setup.php:601 +#: ../../Zotlabs/Module/Setup.php:603 msgid "" "This software uses the Smarty3 template engine to render its web views. " "Smarty3 compiles templates to PHP to speed up rendering." msgstr "" -#: ../../Zotlabs/Module/Setup.php:602 +#: ../../Zotlabs/Module/Setup.php:604 #, php-format msgid "" "In order to store these compiled templates, the web server needs to have " "write access to the directory %s under the top level web folder." msgstr "" -#: ../../Zotlabs/Module/Setup.php:603 ../../Zotlabs/Module/Setup.php:624 +#: ../../Zotlabs/Module/Setup.php:605 ../../Zotlabs/Module/Setup.php:626 msgid "" "Please ensure that the user that your web server runs as (e.g. www-data) has " "write access to this folder." msgstr "" -#: ../../Zotlabs/Module/Setup.php:604 +#: ../../Zotlabs/Module/Setup.php:606 #, php-format msgid "" "Note: as a security measure, you should give the web server write access to " "%s only--not the template files (.tpl) that it contains." msgstr "" -#: ../../Zotlabs/Module/Setup.php:607 +#: ../../Zotlabs/Module/Setup.php:609 #, php-format msgid "%s is writable" msgstr "" -#: ../../Zotlabs/Module/Setup.php:623 +#: ../../Zotlabs/Module/Setup.php:625 msgid "" "This software uses the store directory to save uploaded files. The web " "server needs to have write access to the store directory under the top level " "web folder" msgstr "" -#: ../../Zotlabs/Module/Setup.php:627 +#: ../../Zotlabs/Module/Setup.php:629 msgid "store is writable" msgstr "" -#: ../../Zotlabs/Module/Setup.php:659 +#: ../../Zotlabs/Module/Setup.php:661 msgid "" "SSL certificate cannot be validated. Fix certificate or disable https access " "to this site." msgstr "" -#: ../../Zotlabs/Module/Setup.php:660 +#: ../../Zotlabs/Module/Setup.php:662 msgid "" "If you have https access to your website or allow connections to TCP port " "443 (the https: port), you MUST use a browser-valid certificate. You MUST " "NOT use self-signed certificates!" msgstr "" -#: ../../Zotlabs/Module/Setup.php:661 +#: ../../Zotlabs/Module/Setup.php:663 msgid "" "This restriction is incorporated because public posts from you may for " "example contain references to images on your own hub." msgstr "" -#: ../../Zotlabs/Module/Setup.php:662 +#: ../../Zotlabs/Module/Setup.php:664 msgid "" "If your certificate is not recognized, members of other sites (who may " "themselves have valid certificates) will get a warning message on their own " "site complaining about security issues." msgstr "" -#: ../../Zotlabs/Module/Setup.php:663 +#: ../../Zotlabs/Module/Setup.php:665 msgid "" "This can cause usability issues elsewhere (not just on your own site) so we " "must insist on this requirement." msgstr "" -#: ../../Zotlabs/Module/Setup.php:664 +#: ../../Zotlabs/Module/Setup.php:666 msgid "" "Providers are available that issue free certificates which are browser-valid." msgstr "" -#: ../../Zotlabs/Module/Setup.php:665 +#: ../../Zotlabs/Module/Setup.php:667 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. " @@ -8915,32 +8957,32 @@ msgid "" "server communications." msgstr "" -#: ../../Zotlabs/Module/Setup.php:667 +#: ../../Zotlabs/Module/Setup.php:669 msgid "SSL certificate validation" msgstr "" -#: ../../Zotlabs/Module/Setup.php:673 +#: ../../Zotlabs/Module/Setup.php:675 msgid "" "Url rewrite in .htaccess is not working. Check your server configuration." "Test: " msgstr "" -#: ../../Zotlabs/Module/Setup.php:676 +#: ../../Zotlabs/Module/Setup.php:678 msgid "Url rewrite is working" msgstr "" -#: ../../Zotlabs/Module/Setup.php:689 +#: ../../Zotlabs/Module/Setup.php:691 msgid "" "The database configuration file \".htconfig.php\" could not be written. " "Please use the enclosed text to create a configuration file in your web " "server root." msgstr "" -#: ../../Zotlabs/Module/Setup.php:764 +#: ../../Zotlabs/Module/Setup.php:766 msgid "<h1>What next?</h1>" msgstr "" -#: ../../Zotlabs/Module/Setup.php:765 +#: ../../Zotlabs/Module/Setup.php:767 msgid "" "IMPORTANT: You will need to [manually] setup a scheduled task for the poller." msgstr "" @@ -8993,18 +9035,18 @@ msgstr "" #: ../../Zotlabs/Module/Pubsites.php:61 ../../Zotlabs/Module/Webpages.php:261 #: ../../Zotlabs/Module/Events.php:702 ../../Zotlabs/Module/Blocks.php:166 -#: ../../Zotlabs/Module/Wiki.php:213 ../../Zotlabs/Module/Wiki.php:409 +#: ../../Zotlabs/Module/Wiki.php:212 ../../Zotlabs/Module/Wiki.php:408 #: ../../Zotlabs/Module/Layouts.php:198 msgid "View" msgstr "" #: ../../Zotlabs/Module/Channel.php:131 ../../Zotlabs/Module/Hcard.php:37 -#: ../../Zotlabs/Module/Profile.php:60 +#: ../../Zotlabs/Module/Profile.php:62 msgid "Posts and comments" msgstr "" #: ../../Zotlabs/Module/Channel.php:138 ../../Zotlabs/Module/Hcard.php:44 -#: ../../Zotlabs/Module/Profile.php:67 +#: ../../Zotlabs/Module/Profile.php:69 msgid "Only posts" msgstr "" @@ -9012,7 +9054,7 @@ msgstr "" msgid "Insufficient permissions. Request redirected to profile page." msgstr "" -#: ../../Zotlabs/Module/Channel.php:482 ../../Zotlabs/Module/Display.php:362 +#: ../../Zotlabs/Module/Channel.php:483 ../../Zotlabs/Module/Display.php:354 msgid "" "You must enable javascript for your browser to be able to view this content." msgstr "" @@ -9179,7 +9221,7 @@ msgid "Key and Secret are required" msgstr "" #: ../../Zotlabs/Module/Oauth.php:53 ../../Zotlabs/Module/Oauth.php:137 -#: ../../Zotlabs/Module/Cdav.php:1053 ../../Zotlabs/Module/Cdav.php:1388 +#: ../../Zotlabs/Module/Cdav.php:1054 ../../Zotlabs/Module/Cdav.php:1389 #: ../../Zotlabs/Module/Admin/Addons.php:457 #: ../../Zotlabs/Module/Profiles.php:801 ../../Zotlabs/Module/Oauth2.php:58 #: ../../Zotlabs/Module/Oauth2.php:144 ../../Zotlabs/Module/Connedit.php:932 @@ -9226,11 +9268,6 @@ msgstr "" msgid "Icon url" msgstr "" -#: ../../Zotlabs/Module/Oauth.php:117 ../../Zotlabs/Module/Sources.php:123 -#: ../../Zotlabs/Module/Sources.php:158 -msgid "Optional" -msgstr "" - #: ../../Zotlabs/Module/Oauth.php:128 msgid "Application not found." msgstr "" @@ -9275,7 +9312,7 @@ msgstr "" msgid "You have got no unseen posts..." msgstr "" -#: ../../Zotlabs/Module/Pin.php:36 ../../Zotlabs/Module/Item.php:461 +#: ../../Zotlabs/Module/Pin.php:36 ../../Zotlabs/Module/Item.php:471 msgid "Unable to locate original post." msgstr "" @@ -9333,7 +9370,7 @@ msgid "No chatrooms available" msgstr "" #: ../../Zotlabs/Module/Chat.php:262 ../../Zotlabs/Module/Manage.php:145 -#: ../../Zotlabs/Module/Profiles.php:833 ../../Zotlabs/Module/Wiki.php:214 +#: ../../Zotlabs/Module/Profiles.php:833 ../../Zotlabs/Module/Wiki.php:213 msgid "Create New" msgstr "" @@ -9380,7 +9417,7 @@ msgid "Delete event" msgstr "" #: ../../Zotlabs/Module/Channel_calendar.php:392 -#: ../../Zotlabs/Module/Cdav.php:943 ../../Zotlabs/Module/Cal.php:165 +#: ../../Zotlabs/Module/Cdav.php:944 ../../Zotlabs/Module/Cal.php:165 msgid "Link to source" msgstr "" @@ -9480,168 +9517,168 @@ msgstr "" msgid "Make this post private" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:818 ../../Zotlabs/Module/Events.php:28 +#: ../../Zotlabs/Module/Cdav.php:819 ../../Zotlabs/Module/Events.php:28 msgid "Calendar entries imported." msgstr "" -#: ../../Zotlabs/Module/Cdav.php:820 ../../Zotlabs/Module/Events.php:30 +#: ../../Zotlabs/Module/Cdav.php:821 ../../Zotlabs/Module/Events.php:30 msgid "No calendar entries found." msgstr "" -#: ../../Zotlabs/Module/Cdav.php:876 +#: ../../Zotlabs/Module/Cdav.php:877 msgid "CardDAV App" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:877 +#: ../../Zotlabs/Module/Cdav.php:878 msgid "CalDAV capable addressbook" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1009 ../../Zotlabs/Module/Events.php:468 +#: ../../Zotlabs/Module/Cdav.php:1010 ../../Zotlabs/Module/Events.php:468 msgid "Event title" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1010 ../../Zotlabs/Module/Events.php:474 +#: ../../Zotlabs/Module/Cdav.php:1011 ../../Zotlabs/Module/Events.php:474 msgid "Start date and time" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1011 +#: ../../Zotlabs/Module/Cdav.php:1012 msgid "End date and time" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1012 ../../Zotlabs/Module/Events.php:497 +#: ../../Zotlabs/Module/Cdav.php:1013 ../../Zotlabs/Module/Events.php:497 msgid "Timezone:" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1035 ../../Zotlabs/Module/Events.php:697 +#: ../../Zotlabs/Module/Cdav.php:1036 ../../Zotlabs/Module/Events.php:697 #: ../../Zotlabs/Module/Events.php:706 ../../Zotlabs/Module/Cal.php:203 #: ../../Zotlabs/Module/Photos.php:947 msgid "Previous" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1037 ../../Zotlabs/Module/Events.php:708 +#: ../../Zotlabs/Module/Cdav.php:1038 ../../Zotlabs/Module/Events.php:708 #: ../../Zotlabs/Module/Cal.php:205 msgid "Today" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1038 ../../Zotlabs/Module/Events.php:703 +#: ../../Zotlabs/Module/Cdav.php:1039 ../../Zotlabs/Module/Events.php:703 msgid "Month" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1039 ../../Zotlabs/Module/Events.php:704 +#: ../../Zotlabs/Module/Cdav.php:1040 ../../Zotlabs/Module/Events.php:704 msgid "Week" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1040 ../../Zotlabs/Module/Events.php:705 +#: ../../Zotlabs/Module/Cdav.php:1041 ../../Zotlabs/Module/Events.php:705 msgid "Day" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1041 +#: ../../Zotlabs/Module/Cdav.php:1042 msgid "List month" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1042 +#: ../../Zotlabs/Module/Cdav.php:1043 msgid "List week" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1043 +#: ../../Zotlabs/Module/Cdav.php:1044 msgid "List day" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1051 +#: ../../Zotlabs/Module/Cdav.php:1052 msgid "More" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1052 +#: ../../Zotlabs/Module/Cdav.php:1053 msgid "Less" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1054 +#: ../../Zotlabs/Module/Cdav.php:1055 msgid "Select calendar" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1057 +#: ../../Zotlabs/Module/Cdav.php:1058 msgid "Delete all" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1060 +#: ../../Zotlabs/Module/Cdav.php:1061 msgid "Sorry! Editing of recurrent events is not yet implemented." msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1373 ../../Zotlabs/Module/Connedit.php:917 +#: ../../Zotlabs/Module/Cdav.php:1374 ../../Zotlabs/Module/Connedit.php:917 msgid "Organisation" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1375 ../../Zotlabs/Module/Profiles.php:788 +#: ../../Zotlabs/Module/Cdav.php:1376 ../../Zotlabs/Module/Profiles.php:788 #: ../../Zotlabs/Module/Connedit.php:919 msgid "Phone" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1377 ../../Zotlabs/Module/Profiles.php:790 +#: ../../Zotlabs/Module/Cdav.php:1378 ../../Zotlabs/Module/Profiles.php:790 #: ../../Zotlabs/Module/Connedit.php:921 msgid "Instant messenger" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1378 ../../Zotlabs/Module/Profiles.php:791 +#: ../../Zotlabs/Module/Cdav.php:1379 ../../Zotlabs/Module/Profiles.php:791 #: ../../Zotlabs/Module/Connedit.php:922 msgid "Website" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1379 +#: ../../Zotlabs/Module/Cdav.php:1380 #: ../../Zotlabs/Module/Admin/Channels.php:160 #: ../../Zotlabs/Module/Profiles.php:504 ../../Zotlabs/Module/Profiles.php:792 #: ../../Zotlabs/Module/Connedit.php:923 ../../Zotlabs/Module/Locs.php:129 msgid "Address" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1380 ../../Zotlabs/Module/Profiles.php:793 +#: ../../Zotlabs/Module/Cdav.php:1381 ../../Zotlabs/Module/Profiles.php:793 #: ../../Zotlabs/Module/Connedit.php:924 msgid "Note" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1385 ../../Zotlabs/Module/Profiles.php:798 +#: ../../Zotlabs/Module/Cdav.php:1386 ../../Zotlabs/Module/Profiles.php:798 #: ../../Zotlabs/Module/Connedit.php:929 msgid "Add Contact" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1386 ../../Zotlabs/Module/Profiles.php:799 +#: ../../Zotlabs/Module/Cdav.php:1387 ../../Zotlabs/Module/Profiles.php:799 #: ../../Zotlabs/Module/Connedit.php:930 msgid "Add Field" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1391 ../../Zotlabs/Module/Connedit.php:935 +#: ../../Zotlabs/Module/Cdav.php:1392 ../../Zotlabs/Module/Connedit.php:935 msgid "P.O. Box" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1392 ../../Zotlabs/Module/Connedit.php:936 +#: ../../Zotlabs/Module/Cdav.php:1393 ../../Zotlabs/Module/Connedit.php:936 msgid "Additional" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1393 ../../Zotlabs/Module/Connedit.php:937 +#: ../../Zotlabs/Module/Cdav.php:1394 ../../Zotlabs/Module/Connedit.php:937 msgid "Street" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1394 ../../Zotlabs/Module/Connedit.php:938 +#: ../../Zotlabs/Module/Cdav.php:1395 ../../Zotlabs/Module/Connedit.php:938 msgid "Locality" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1395 ../../Zotlabs/Module/Connedit.php:939 +#: ../../Zotlabs/Module/Cdav.php:1396 ../../Zotlabs/Module/Connedit.php:939 msgid "Region" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1396 ../../Zotlabs/Module/Connedit.php:940 +#: ../../Zotlabs/Module/Cdav.php:1397 ../../Zotlabs/Module/Connedit.php:940 msgid "ZIP Code" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1397 ../../Zotlabs/Module/Profiles.php:759 +#: ../../Zotlabs/Module/Cdav.php:1398 ../../Zotlabs/Module/Profiles.php:759 #: ../../Zotlabs/Module/Connedit.php:941 msgid "Country" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1456 +#: ../../Zotlabs/Module/Cdav.php:1457 msgid "Default Calendar" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1467 +#: ../../Zotlabs/Module/Cdav.php:1468 msgid "Default Addressbook" msgstr "" @@ -9659,32 +9696,32 @@ msgctxt "acl" msgid "Profile" msgstr "" -#: ../../Zotlabs/Module/Item.php:747 +#: ../../Zotlabs/Module/Item.php:757 msgid "Empty post discarded." msgstr "" -#: ../../Zotlabs/Module/Item.php:1181 +#: ../../Zotlabs/Module/Item.php:1189 msgid "Duplicate post suppressed." msgstr "" -#: ../../Zotlabs/Module/Item.php:1326 +#: ../../Zotlabs/Module/Item.php:1334 msgid "System error. Post not saved." msgstr "" -#: ../../Zotlabs/Module/Item.php:1360 +#: ../../Zotlabs/Module/Item.php:1368 msgid "Your comment is awaiting approval." msgstr "" -#: ../../Zotlabs/Module/Item.php:1490 +#: ../../Zotlabs/Module/Item.php:1498 msgid "Unable to obtain post information from database." msgstr "" -#: ../../Zotlabs/Module/Item.php:1497 +#: ../../Zotlabs/Module/Item.php:1505 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "" -#: ../../Zotlabs/Module/Item.php:1504 +#: ../../Zotlabs/Module/Item.php:1512 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "" @@ -10033,15 +10070,11 @@ msgstr "" msgid "Not found" msgstr "" -#: ../../Zotlabs/Module/Cloud.php:126 -msgid "Please refresh page" -msgstr "" - -#: ../../Zotlabs/Module/Cloud.php:129 +#: ../../Zotlabs/Module/Cloud.php:130 msgid "Unknown error" msgstr "" -#: ../../Zotlabs/Module/Share.php:104 ../../Zotlabs/Lib/Activity.php:2154 +#: ../../Zotlabs/Module/Share.php:104 ../../Zotlabs/Lib/Activity.php:2186 #, php-format msgid "🔁 Repeated %1$s's %2$s" msgstr "" @@ -10085,7 +10118,7 @@ msgid "Do you authorize the app %s to access your channel data?" msgstr "" #: ../../Zotlabs/Module/Authorize.php:33 -#: ../../Zotlabs/Module/Admin/Accounts.php:174 +#: ../../Zotlabs/Module/Admin/Accounts.php:319 msgid "Deny" msgstr "" @@ -10142,12 +10175,12 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Themes.php:122 #: ../../Zotlabs/Module/Admin/Themes.php:156 #: ../../Zotlabs/Module/Admin/Security.php:98 -#: ../../Zotlabs/Module/Admin/Accounts.php:166 -#: ../../Zotlabs/Module/Admin/Site.php:291 +#: ../../Zotlabs/Module/Admin/Accounts.php:307 +#: ../../Zotlabs/Module/Admin/Site.php:408 #: ../../Zotlabs/Module/Admin/Logs.php:82 #: ../../Zotlabs/Module/Admin/Channels.php:145 #: ../../Zotlabs/Module/Admin/Addons.php:342 -#: ../../Zotlabs/Module/Admin/Addons.php:440 ../../Zotlabs/Module/Admin.php:138 +#: ../../Zotlabs/Module/Admin/Addons.php:440 ../../Zotlabs/Module/Admin.php:141 msgid "Administration" msgstr "" @@ -10315,524 +10348,688 @@ msgstr "" msgid "Allow embedded (inline) PDF files" msgstr "" -#: ../../Zotlabs/Module/Admin/Accounts.php:37 +#: ../../Zotlabs/Module/Admin/Accounts.php:128 #, php-format msgid "%s account blocked/unblocked" msgid_plural "%s account blocked/unblocked" msgstr[0] "" msgstr[1] "" -#: ../../Zotlabs/Module/Admin/Accounts.php:44 +#: ../../Zotlabs/Module/Admin/Accounts.php:135 #, php-format msgid "%s account deleted" msgid_plural "%s accounts deleted" msgstr[0] "" msgstr[1] "" -#: ../../Zotlabs/Module/Admin/Accounts.php:80 +#: ../../Zotlabs/Module/Admin/Accounts.php:171 msgid "Account not found" msgstr "" -#: ../../Zotlabs/Module/Admin/Accounts.php:99 +#: ../../Zotlabs/Module/Admin/Accounts.php:192 #, php-format msgid "Account '%s' blocked" msgstr "" -#: ../../Zotlabs/Module/Admin/Accounts.php:107 +#: ../../Zotlabs/Module/Admin/Accounts.php:200 #, php-format msgid "Account '%s' unblocked" msgstr "" -#: ../../Zotlabs/Module/Admin/Accounts.php:169 -#: ../../Zotlabs/Module/Admin/Channels.php:148 -msgid "select all" +#: ../../Zotlabs/Module/Admin/Accounts.php:240 +msgid "Unverified" msgstr "" -#: ../../Zotlabs/Module/Admin/Accounts.php:170 -msgid "Registrations waiting for confirm" +#: ../../Zotlabs/Module/Admin/Accounts.php:243 +msgid "Expired" msgstr "" -#: ../../Zotlabs/Module/Admin/Accounts.php:171 +#: ../../Zotlabs/Module/Admin/Accounts.php:310 +msgid "Show verified registrations" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Accounts.php:310 +msgid "Show all registrations" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Accounts.php:312 +msgid "Select toggle" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Accounts.php:313 +msgid "Deny selected" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Accounts.php:314 +msgid "Approve selected" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Accounts.php:315 +msgid "All registrations" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Accounts.php:315 +msgid "Verified registrations waiting for approval" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Accounts.php:316 msgid "Request date" msgstr "" -#: ../../Zotlabs/Module/Admin/Accounts.php:172 -msgid "No registrations." +#: ../../Zotlabs/Module/Admin/Accounts.php:316 +msgid "Requests" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Accounts.php:317 +msgid "No registrations available" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Accounts.php:317 +msgid "No verified registrations available" msgstr "" -#: ../../Zotlabs/Module/Admin/Accounts.php:176 +#: ../../Zotlabs/Module/Admin/Accounts.php:321 #: ../../Zotlabs/Module/Connedit.php:629 msgid "Block" msgstr "" -#: ../../Zotlabs/Module/Admin/Accounts.php:177 +#: ../../Zotlabs/Module/Admin/Accounts.php:322 #: ../../Zotlabs/Module/Connedit.php:629 msgid "Unblock" msgstr "" -#: ../../Zotlabs/Module/Admin/Accounts.php:182 +#: ../../Zotlabs/Module/Admin/Accounts.php:323 +msgid "Verified" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Accounts.php:324 +msgid "Not yet verified" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Accounts.php:329 msgid "ID" msgstr "" -#: ../../Zotlabs/Module/Admin/Accounts.php:184 -msgid "All Channels" +#: ../../Zotlabs/Module/Admin/Accounts.php:331 +msgid "All channels" msgstr "" -#: ../../Zotlabs/Module/Admin/Accounts.php:185 +#: ../../Zotlabs/Module/Admin/Accounts.php:332 msgid "Register date" msgstr "" -#: ../../Zotlabs/Module/Admin/Accounts.php:186 +#: ../../Zotlabs/Module/Admin/Accounts.php:333 msgid "Last login" msgstr "" -#: ../../Zotlabs/Module/Admin/Accounts.php:187 +#: ../../Zotlabs/Module/Admin/Accounts.php:334 msgid "Expires" msgstr "" -#: ../../Zotlabs/Module/Admin/Accounts.php:188 -msgid "Service Class" +#: ../../Zotlabs/Module/Admin/Accounts.php:335 +#: ../../Zotlabs/Module/Admin/Account_edit.php:72 +msgid "Service class" msgstr "" -#: ../../Zotlabs/Module/Admin/Accounts.php:190 +#: ../../Zotlabs/Module/Admin/Accounts.php:337 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/Accounts.php:191 +#: ../../Zotlabs/Module/Admin/Accounts.php:338 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/Site.php:165 +#: ../../Zotlabs/Module/Admin/Site.php:112 +msgid "Invalid input" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:132 +msgid "Errors" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:225 msgid "Site settings updated." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:202 +#: ../../Zotlabs/Module/Admin/Site.php:262 #: ../../Zotlabs/Module/Settings/Display.php:118 #, php-format msgid "%s - (Incompatible)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:209 +#: ../../Zotlabs/Module/Admin/Site.php:269 msgid "mobile" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:211 +#: ../../Zotlabs/Module/Admin/Site.php:271 msgid "experimental" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:213 +#: ../../Zotlabs/Module/Admin/Site.php:273 msgid "unsupported" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:260 +#: ../../Zotlabs/Module/Admin/Site.php:320 msgid "Yes - with approval" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:266 +#: ../../Zotlabs/Module/Admin/Site.php:328 msgid "My site is not a public server" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:267 +#: ../../Zotlabs/Module/Admin/Site.php:329 msgid "My site has paid access only" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:268 +#: ../../Zotlabs/Module/Admin/Site.php:330 msgid "My site has free access only" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:269 +#: ../../Zotlabs/Module/Admin/Site.php:331 msgid "My site offers free accounts with optional paid upgrades" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:283 +#: ../../Zotlabs/Module/Admin/Site.php:345 msgid "Default permission role for new accounts" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:283 +#: ../../Zotlabs/Module/Admin/Site.php:345 msgid "" "This role will be used for the first channel created after registration." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:295 +#: ../../Zotlabs/Module/Admin/Site.php:353 ../../Zotlabs/Module/Invite.php:398 +msgid "Minute(s)" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:354 ../../Zotlabs/Module/Invite.php:399 +msgid "Hour(s)" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:355 ../../Zotlabs/Module/Invite.php:400 +msgid "Day(s)" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:356 +msgid "Week(s)" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:357 +msgid "Month(s)" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:358 +msgid "Year(s)" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:366 +msgid "Register verification delay" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:369 +msgid "Time to wait before a registration can be verified" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:372 +#: ../../Zotlabs/Module/Admin/Site.php:394 ../../Zotlabs/Module/Invite.php:409 +msgid "duration up from now" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:388 +msgid "Register verification expiration time" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:391 +msgid "Time before an unverified registration will expire" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:414 msgid "File upload" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:296 +#: ../../Zotlabs/Module/Admin/Site.php:415 msgid "Policies" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:303 +#: ../../Zotlabs/Module/Admin/Site.php:422 msgid "Banner/Logo" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:303 +#: ../../Zotlabs/Module/Admin/Site.php:422 msgid "Unfiltered HTML/CSS/JS is allowed" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:304 +#: ../../Zotlabs/Module/Admin/Site.php:423 msgid "Administrator Information" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:304 +#: ../../Zotlabs/Module/Admin/Site.php:423 msgid "" "Contact information for site administrators. Displayed on siteinfo page. " "BBCode can be used here" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:305 ../../Zotlabs/Module/Siteinfo.php:24 +#: ../../Zotlabs/Module/Admin/Site.php:424 ../../Zotlabs/Module/Siteinfo.php:24 msgid "Site Information" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:305 +#: ../../Zotlabs/Module/Admin/Site.php:424 msgid "" "Publicly visible description of this site. Displayed on siteinfo page. " "BBCode can be used here" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:306 +#: ../../Zotlabs/Module/Admin/Site.php:425 msgid "System language" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:307 +#: ../../Zotlabs/Module/Admin/Site.php:426 msgid "System theme" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:307 +#: ../../Zotlabs/Module/Admin/Site.php:426 msgid "" "Default system theme - may be over-ridden by user profiles - <a href='#' " "id='cnftheme'>change theme settings</a>" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:310 +#: ../../Zotlabs/Module/Admin/Site.php:429 msgid "Allow Feeds as Connections" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:310 +#: ../../Zotlabs/Module/Admin/Site.php:429 msgid "(Heavy system resource usage)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:311 +#: ../../Zotlabs/Module/Admin/Site.php:430 msgid "Maximum image size" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:311 +#: ../../Zotlabs/Module/Admin/Site.php:430 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:312 +#: ../../Zotlabs/Module/Admin/Site.php:431 +msgid "Minimum age" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:431 +msgid "Minimum age (in years) for who may register on this site." +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:432 +msgid "Which best describes the types of account offered by this hub?" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:432 +msgid "This is displayed on the public server site list." +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:438 +msgid "Register text" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:440 +msgid "This text will be displayed prominently at the registration page" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:444 msgid "Does this site allow new member registration?" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:313 -msgid "Invitation only" +#: ../../Zotlabs/Module/Admin/Site.php:451 +msgid "Configure the registration open days/hours" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:453 +msgid "Empty or '-:-' value will keep registration open 24/7 (default)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:313 +#: ../../Zotlabs/Module/Admin/Site.php:454 msgid "" -"Only allow new member registrations with an invitation code. Above register " -"policy must be set to Yes." +"Weekdays and hours must be separated by colon ':', From-To ranges with a " +"dash `-` example: 1:800-1200" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:314 -msgid "Minimum age" +#: ../../Zotlabs/Module/Admin/Site.php:455 +msgid "" +"Weekday:Hour pairs must be separated by space ' ' example: 1:900-1700 " +"2:900-1700" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:314 -msgid "Minimum age (in years) for who may register on this site." +#: ../../Zotlabs/Module/Admin/Site.php:456 +msgid "" +"From-To ranges must be separated by comma ',' example: 1:800-1200,1300-1700 " +"or 1-2,4-5:900-1700" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:315 -msgid "Which best describes the types of account offered by this hub?" +#: ../../Zotlabs/Module/Admin/Site.php:457 +msgid "Advanced examples:" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:315 -msgid "This is displayed on the public server site list." +#: ../../Zotlabs/Module/Admin/Site.php:457 +#: ../../Zotlabs/Module/Settings/Channel.php:420 +msgid "or" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:316 -msgid "Register text" +#: ../../Zotlabs/Module/Admin/Site.php:458 +msgid "Check your configuration" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:316 -msgid "Will be displayed prominently on the registration page." +#: ../../Zotlabs/Module/Admin/Site.php:462 +msgid "Max account registrations per day" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:318 -msgid "Site homepage to show visitors (default: login box)" +#: ../../Zotlabs/Module/Admin/Site.php:464 +msgid "Unlimited if zero or no value - default 50" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:318 -msgid "" -"example: 'pubstream' to show public stream, 'page/sys/home' to show a system " -"webpage called 'home' or 'include:home.html' to include a file." +#: ../../Zotlabs/Module/Admin/Site.php:468 +msgid "Max account registrations from same IP" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:319 -msgid "Preserve site homepage URL" +#: ../../Zotlabs/Module/Admin/Site.php:470 +msgid "Unlimited if zero or no value - default 3" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:319 +#: ../../Zotlabs/Module/Admin/Site.php:476 +msgid "Auto channel create" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:478 msgid "" -"Present the site homepage in a frame at the original location instead of " -"redirecting" +"If disabled the channel will be created in a separate step during the " +"registration process" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:320 -msgid "Accounts abandoned after x days" +#: ../../Zotlabs/Module/Admin/Site.php:482 +msgid "Require invite code" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:320 +#: ../../Zotlabs/Module/Admin/Site.php:487 +msgid "Allow invite code" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:492 +msgid "Require email address" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:494 +msgid "The provided email address will be verified (recommended)" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:498 +msgid "Abandon account after x days" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:500 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:321 -msgid "Allowed friend domains" +#: ../../Zotlabs/Module/Admin/Site.php:505 +msgid "Site homepage to show visitors (default: login box)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:321 +#: ../../Zotlabs/Module/Admin/Site.php:505 msgid "" -"Comma separated list of domains which are allowed to establish friendships " -"with this site. Wildcards are accepted. Empty to allow any domains" +"example: 'pubstream' to show public stream, 'page/sys/home' to show a system " +"webpage called 'home' or 'include:home.html' to include a file." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:322 -msgid "Verify Email Addresses" +#: ../../Zotlabs/Module/Admin/Site.php:506 +msgid "Preserve site homepage URL" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:322 +#: ../../Zotlabs/Module/Admin/Site.php:506 msgid "" -"Check to verify email addresses used in account registration (recommended)." +"Present the site homepage in a frame at the original location instead of " +"redirecting" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:507 +msgid "Allowed friend domains" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:507 +msgid "" +"Comma separated list of domains which are allowed to establish friendships " +"with this site. Wildcards are accepted. Empty to allow any domains" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:323 +#: ../../Zotlabs/Module/Admin/Site.php:508 msgid "Force publish" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:323 +#: ../../Zotlabs/Module/Admin/Site.php:508 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:324 +#: ../../Zotlabs/Module/Admin/Site.php:509 msgid "Import Public Streams" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:324 +#: ../../Zotlabs/Module/Admin/Site.php:509 msgid "" "Import and allow access to public content pulled from other sites. Warning: " "this content is unmoderated." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:325 +#: ../../Zotlabs/Module/Admin/Site.php:510 msgid "Site only Public Streams" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:325 +#: ../../Zotlabs/Module/Admin/Site.php:510 msgid "" "Allow access to public content originating only from this site if Imported " "Public Streams are disabled." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:326 +#: ../../Zotlabs/Module/Admin/Site.php:511 msgid "Allow anybody on the internet to access the Public streams" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:326 +#: ../../Zotlabs/Module/Admin/Site.php:511 msgid "" "Disable to require authentication before viewing. Warning: this content is " "unmoderated." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:327 +#: ../../Zotlabs/Module/Admin/Site.php:512 msgid "Only import Public stream posts with this text" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:327 -#: ../../Zotlabs/Module/Admin/Site.php:328 +#: ../../Zotlabs/Module/Admin/Site.php:512 +#: ../../Zotlabs/Module/Admin/Site.php:513 #: ../../Zotlabs/Module/Connedit.php:885 ../../Zotlabs/Module/Connedit.php:886 msgid "" "words one per line or #tags or /patterns/ or lang=xx, leave blank to import " "all posts" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:328 +#: ../../Zotlabs/Module/Admin/Site.php:513 msgid "Do not import Public stream posts with this text" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:331 +#: ../../Zotlabs/Module/Admin/Site.php:516 msgid "Login on Homepage" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:331 +#: ../../Zotlabs/Module/Admin/Site.php:516 msgid "" "Present a login box to visitors on the home page if no other content has " "been configured." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:332 +#: ../../Zotlabs/Module/Admin/Site.php:517 msgid "Enable context help" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:332 +#: ../../Zotlabs/Module/Admin/Site.php:517 msgid "" "Display contextual help for the current page when the help button is pressed." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:334 +#: ../../Zotlabs/Module/Admin/Site.php:519 msgid "Reply-to email address for system generated email." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:335 +#: ../../Zotlabs/Module/Admin/Site.php:520 msgid "Sender (From) email address for system generated email." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:336 +#: ../../Zotlabs/Module/Admin/Site.php:521 msgid "Name of email sender for system generated email." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:338 +#: ../../Zotlabs/Module/Admin/Site.php:523 msgid "Directory Server URL" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:338 +#: ../../Zotlabs/Module/Admin/Site.php:523 msgid "Default directory server" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:340 +#: ../../Zotlabs/Module/Admin/Site.php:525 msgid "Enable SSE Notifications" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:340 +#: ../../Zotlabs/Module/Admin/Site.php:525 msgid "" "If disabled, traditional polling will be used. Warning: this setting might " "not be suited for shared hosting" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:342 +#: ../../Zotlabs/Module/Admin/Site.php:527 msgid "Proxy user" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:343 +#: ../../Zotlabs/Module/Admin/Site.php:528 msgid "Proxy URL" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:344 +#: ../../Zotlabs/Module/Admin/Site.php:529 msgid "Network timeout" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:344 +#: ../../Zotlabs/Module/Admin/Site.php:529 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:345 +#: ../../Zotlabs/Module/Admin/Site.php:530 msgid "Delivery interval" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:345 +#: ../../Zotlabs/Module/Admin/Site.php:530 msgid "" "Delay background delivery processes by this many seconds to reduce system " "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " "for large dedicated servers." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:346 +#: ../../Zotlabs/Module/Admin/Site.php:531 msgid "Deliveries per process" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:346 +#: ../../Zotlabs/Module/Admin/Site.php:531 msgid "" "Number of deliveries to attempt in a single operating system process. Adjust " "if necessary to tune system performance. Recommend: 1-5." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:347 +#: ../../Zotlabs/Module/Admin/Site.php:532 msgid "Queue Threshold" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:347 +#: ../../Zotlabs/Module/Admin/Site.php:532 msgid "" "Always defer immediate delivery if queue contains more than this number of " "entries." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:348 +#: ../../Zotlabs/Module/Admin/Site.php:533 msgid "Poll interval" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:348 +#: ../../Zotlabs/Module/Admin/Site.php:533 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:349 +#: ../../Zotlabs/Module/Admin/Site.php:534 msgid "Path to ImageMagick convert program" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:349 +#: ../../Zotlabs/Module/Admin/Site.php:534 msgid "" "If set, use this program to generate photo thumbnails for huge images ( > " "4000 pixels in either dimension), otherwise memory exhaustion may occur. " "Example: /usr/bin/convert" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:350 +#: ../../Zotlabs/Module/Admin/Site.php:535 msgid "Maximum Load Average" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:350 +#: ../../Zotlabs/Module/Admin/Site.php:535 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:351 +#: ../../Zotlabs/Module/Admin/Site.php:536 msgid "Expiration period in days for imported (grid/network) content" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:351 +#: ../../Zotlabs/Module/Admin/Site.php:536 msgid "0 for no expiration of imported content" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:352 +#: ../../Zotlabs/Module/Admin/Site.php:537 msgid "" "Do not expire any posts which have comments less than this many days ago" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:354 +#: ../../Zotlabs/Module/Admin/Site.php:538 msgid "" "Public servers: Optional landing (marketing) webpage for new registrants" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:354 +#: ../../Zotlabs/Module/Admin/Site.php:538 #, php-format msgid "Create this page first. Default is %s/register" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:355 +#: ../../Zotlabs/Module/Admin/Site.php:539 msgid "Page to display after creating a new channel" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:355 +#: ../../Zotlabs/Module/Admin/Site.php:539 msgid "Default: profiles" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:357 +#: ../../Zotlabs/Module/Admin/Site.php:540 msgid "Optional: site location" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:357 +#: ../../Zotlabs/Module/Admin/Site.php:540 msgid "Region or country" msgstr "" +#: ../../Zotlabs/Module/Admin/Site.php:625 +#: ../../Zotlabs/Module/Admin/Site.php:626 +msgid "Invalid 24h time value (hhmm/hmm)" +msgstr "" + #: ../../Zotlabs/Module/Admin/Logs.php:28 msgid "Log settings updated." msgstr "" @@ -10909,6 +11106,10 @@ msgstr "" msgid "Channel '%s' code disallowed" msgstr "" +#: ../../Zotlabs/Module/Admin/Channels.php:148 +msgid "select all" +msgstr "" + #: ../../Zotlabs/Module/Admin/Channels.php:150 #: ../../Zotlabs/Module/Directory.php:362 msgid "Censor" @@ -10972,10 +11173,6 @@ msgstr "" msgid "Account language (for emails)" msgstr "" -#: ../../Zotlabs/Module/Admin/Account_edit.php:72 -msgid "Service class" -msgstr "" - #: ../../Zotlabs/Module/Admin/Profs.php:89 msgid "New Profile Field" msgstr "" @@ -11242,6 +11439,129 @@ msgstr "" msgid "Remove Channel" msgstr "" +#: ../../Zotlabs/Module/Regate.php:81 +msgid "Email resent" +msgstr "" + +#: ../../Zotlabs/Module/Regate.php:81 +msgid "Email resend failed" +msgstr "" + +#: ../../Zotlabs/Module/Regate.php:105 +msgid "Verify successfull" +msgstr "" + +#: ../../Zotlabs/Module/Regate.php:149 +msgid "Account successfull created" +msgstr "" + +#: ../../Zotlabs/Module/Regate.php:190 +msgid "Channel successfull created" +msgstr "" + +#: ../../Zotlabs/Module/Regate.php:196 +msgid "Automatic channel creation failed. Please create a channel." +msgstr "" + +#: ../../Zotlabs/Module/Regate.php:208 +msgid "Account creation error" +msgstr "" + +#: ../../Zotlabs/Module/Regate.php:220 +msgid "Verify failed" +msgstr "" + +#: ../../Zotlabs/Module/Regate.php:225 +msgid "Token verification failed" +msgstr "" + +#: ../../Zotlabs/Module/Regate.php:230 +msgid "Request not inside time frame" +msgstr "" + +#: ../../Zotlabs/Module/Regate.php:236 ../../Zotlabs/Module/Regate.php:266 +msgid "Identity unknown" +msgstr "" + +#: ../../Zotlabs/Module/Regate.php:242 +msgid "dId2 mistaken" +msgstr "" + +#: ../../Zotlabs/Module/Regate.php:270 +msgid "Your Registration ID" +msgstr "" + +#: ../../Zotlabs/Module/Regate.php:283 ../../Zotlabs/Module/Regate.php:374 +#: ../../Zotlabs/Module/Regate.php:403 +msgid "Registration verification" +msgstr "" + +#: ../../Zotlabs/Module/Regate.php:290 ../../Zotlabs/Module/Regate.php:408 +msgid "Hold on, you can start verification in" +msgstr "" + +#: ../../Zotlabs/Module/Regate.php:291 +msgid "Please remember your verification token for ID" +msgstr "" + +#: ../../Zotlabs/Module/Regate.php:292 +msgid "Token validity" +msgstr "" + +#: ../../Zotlabs/Module/Regate.php:328 +msgid "Resend" +msgstr "" + +#: ../../Zotlabs/Module/Regate.php:333 +msgid "Registration status" +msgstr "" + +#: ../../Zotlabs/Module/Regate.php:336 +msgid "Verification successful!" +msgstr "" + +#: ../../Zotlabs/Module/Regate.php:337 +msgid "Your login ID is" +msgstr "" + +#: ../../Zotlabs/Module/Regate.php:338 +msgid "" +"After your account has been approved by our administrator you will be able " +"to login with your login ID and your provided password." +msgstr "" + +#: ../../Zotlabs/Module/Regate.php:350 +msgid "Registration request revoked" +msgstr "" + +#: ../../Zotlabs/Module/Regate.php:351 +msgid "Sorry for any inconvience. Thank you for your response." +msgstr "" + +#: ../../Zotlabs/Module/Regate.php:375 +msgid "Please enter your verification token for ID" +msgstr "" + +#: ../../Zotlabs/Module/Regate.php:385 +msgid "Verification token" +msgstr "" + +#: ../../Zotlabs/Module/Regate.php:396 +msgid "ID expired" +msgstr "" + +#: ../../Zotlabs/Module/Regate.php:409 +msgid "You will require the verification token for ID" +msgstr "" + +#: ../../Zotlabs/Module/Regate.php:417 +msgid "Unknown or expired ID" +msgstr "" + +#: ../../Zotlabs/Module/Regate.php:428 +msgid "dId2 malformed" +msgstr "" + #: ../../Zotlabs/Module/Events.php:468 msgid "Edit event title" msgstr "" @@ -11489,7 +11809,7 @@ msgid "" msgstr "" #: ../../Zotlabs/Module/Removeaccount.php:61 -#: ../../Zotlabs/Module/Settings/Account.php:105 +#: ../../Zotlabs/Module/Settings/Account.php:109 msgid "Remove Account" msgstr "" @@ -11501,30 +11821,30 @@ msgstr "" msgid "Change UI language" msgstr "" -#: ../../Zotlabs/Module/Uexport.php:61 +#: ../../Zotlabs/Module/Uexport.php:62 msgid "Channel Export App" msgstr "" -#: ../../Zotlabs/Module/Uexport.php:62 +#: ../../Zotlabs/Module/Uexport.php:63 msgid "Export your channel" msgstr "" -#: ../../Zotlabs/Module/Uexport.php:72 ../../Zotlabs/Module/Uexport.php:73 +#: ../../Zotlabs/Module/Uexport.php:73 ../../Zotlabs/Module/Uexport.php:74 msgid "Export Channel" msgstr "" -#: ../../Zotlabs/Module/Uexport.php:74 +#: ../../Zotlabs/Module/Uexport.php:75 msgid "" "Export your basic channel information to a file. This acts as a backup of " "your connections, permissions, profile and basic data, which can be used to " "import your data to a new server hub, but does not contain your content." msgstr "" -#: ../../Zotlabs/Module/Uexport.php:75 +#: ../../Zotlabs/Module/Uexport.php:76 msgid "Export Content" msgstr "" -#: ../../Zotlabs/Module/Uexport.php:76 +#: ../../Zotlabs/Module/Uexport.php:77 msgid "" "Export your channel information and recent content to a JSON backup that can " "be restored or imported to another server hub. This backs up all of your " @@ -11533,11 +11853,11 @@ msgid "" "this download to begin." msgstr "" -#: ../../Zotlabs/Module/Uexport.php:78 +#: ../../Zotlabs/Module/Uexport.php:79 msgid "Export your posts from a given year." msgstr "" -#: ../../Zotlabs/Module/Uexport.php:80 +#: ../../Zotlabs/Module/Uexport.php:81 msgid "" "You may also export your posts and conversations for a particular year or " "month. Adjust the date in your browser location bar to select other dates. " @@ -11545,21 +11865,21 @@ msgid "" "please try again selecting a more limited date range." msgstr "" -#: ../../Zotlabs/Module/Uexport.php:81 +#: ../../Zotlabs/Module/Uexport.php:82 #, php-format msgid "" "To select all posts for a given year, such as this year, visit <a href=\"%1$s" "\">%2$s</a>" msgstr "" -#: ../../Zotlabs/Module/Uexport.php:82 +#: ../../Zotlabs/Module/Uexport.php:83 #, php-format msgid "" "To select all posts for a given month, such as January of this year, visit " "<a href=\"%1$s\">%2$s</a>" msgstr "" -#: ../../Zotlabs/Module/Uexport.php:83 +#: ../../Zotlabs/Module/Uexport.php:84 #, php-format msgid "" "These content files may be imported or restored by visiting <a href=\"%1$s\">" @@ -11567,11 +11887,11 @@ msgid "" "or restore these in date order (oldest first)." msgstr "" -#: ../../Zotlabs/Module/Display.php:380 +#: ../../Zotlabs/Module/Display.php:372 msgid "Article" msgstr "" -#: ../../Zotlabs/Module/Display.php:425 +#: ../../Zotlabs/Module/Display.php:417 msgid "Item has been removed." msgstr "" @@ -11621,11 +11941,20 @@ msgid "Channel name" msgstr "" #: ../../Zotlabs/Module/New_channel.php:178 +#: ../../Zotlabs/Module/Settings/Channel.php:537 +msgid "Channel role and privacy" +msgstr "" + +#: ../../Zotlabs/Module/New_channel.php:178 msgid "" "Select a channel permission role compatible with your usage needs and " "privacy requirements." msgstr "" +#: ../../Zotlabs/Module/New_channel.php:178 +msgid "Read more about channel permission roles" +msgstr "" + #: ../../Zotlabs/Module/New_channel.php:181 msgid "Create a Channel" msgstr "" @@ -11654,7 +11983,7 @@ msgstr "" msgid "added your channel" msgstr "" -#: ../../Zotlabs/Module/Ping.php:418 ../../Zotlabs/Lib/Enotify.php:986 +#: ../../Zotlabs/Module/Ping.php:418 msgid "requires approval" msgstr "" @@ -11675,11 +12004,11 @@ msgstr "" msgid "shared a file with you" msgstr "" -#: ../../Zotlabs/Module/Ping.php:672 ../../Zotlabs/Module/Sse_bs.php:540 +#: ../../Zotlabs/Module/Ping.php:672 ../../Zotlabs/Module/Sse_bs.php:554 msgid "Private forum" msgstr "" -#: ../../Zotlabs/Module/Ping.php:672 ../../Zotlabs/Module/Sse_bs.php:540 +#: ../../Zotlabs/Module/Ping.php:672 ../../Zotlabs/Module/Sse_bs.php:554 msgid "Public forum" msgstr "" @@ -11813,43 +12142,43 @@ msgstr "" msgid "Expiring accounts" msgstr "" -#: ../../Zotlabs/Module/Admin.php:120 +#: ../../Zotlabs/Module/Admin.php:123 msgid "Message queues" msgstr "" -#: ../../Zotlabs/Module/Admin.php:134 +#: ../../Zotlabs/Module/Admin.php:137 msgid "Your software should be updated" msgstr "" -#: ../../Zotlabs/Module/Admin.php:139 +#: ../../Zotlabs/Module/Admin.php:142 msgid "Summary" msgstr "" -#: ../../Zotlabs/Module/Admin.php:142 +#: ../../Zotlabs/Module/Admin.php:145 msgid "Registered accounts" msgstr "" -#: ../../Zotlabs/Module/Admin.php:143 +#: ../../Zotlabs/Module/Admin.php:146 msgid "Pending registrations" msgstr "" -#: ../../Zotlabs/Module/Admin.php:144 +#: ../../Zotlabs/Module/Admin.php:147 msgid "Registered channels" msgstr "" -#: ../../Zotlabs/Module/Admin.php:145 +#: ../../Zotlabs/Module/Admin.php:148 msgid "Active addons" msgstr "" -#: ../../Zotlabs/Module/Admin.php:146 +#: ../../Zotlabs/Module/Admin.php:149 msgid "Version" msgstr "" -#: ../../Zotlabs/Module/Admin.php:147 +#: ../../Zotlabs/Module/Admin.php:150 msgid "Repository version (master)" msgstr "" -#: ../../Zotlabs/Module/Admin.php:148 +#: ../../Zotlabs/Module/Admin.php:151 msgid "Repository version (dev)" msgstr "" @@ -12088,7 +12417,7 @@ msgid "Use a photo from your albums" msgstr "" #: ../../Zotlabs/Module/Profile_photo.php:511 -#: ../../Zotlabs/Module/Cover_photo.php:432 ../../Zotlabs/Module/Wiki.php:405 +#: ../../Zotlabs/Module/Cover_photo.php:432 ../../Zotlabs/Module/Wiki.php:404 msgid "Choose a different album" msgstr "" @@ -12172,7 +12501,7 @@ msgstr "" #: ../../Zotlabs/Module/Connections.php:83 #: ../../Zotlabs/Module/Connections.php:92 ../../Zotlabs/Module/Menu.php:180 -#: ../../Zotlabs/Module/Notifications.php:50 +#: ../../Zotlabs/Module/Notifications.php:53 msgid "New" msgstr "" @@ -12481,7 +12810,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1720 +#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1725 msgid "Password Reset" msgstr "" @@ -12698,7 +13027,7 @@ msgid "Your full name" msgstr "" #: ../../Zotlabs/Module/Profiles.php:752 -msgid "Short title/tescription" +msgid "Short title/description" msgstr "" #: ../../Zotlabs/Module/Profiles.php:752 @@ -12797,12 +13126,12 @@ msgstr "" msgid "Communications" msgstr "" -#: ../../Zotlabs/Module/Subthread.php:143 +#: ../../Zotlabs/Module/Subthread.php:128 #, php-format msgid "%1$s is following %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Subthread.php:145 +#: ../../Zotlabs/Module/Subthread.php:130 #, php-format msgid "%1$s stopped following %2$s's %3$s" msgstr "" @@ -12869,72 +13198,120 @@ msgstr "" msgid "Rename Channel" msgstr "" -#: ../../Zotlabs/Module/Invite.php:37 -msgid "Total invitation limit exceeded." +#: ../../Zotlabs/Module/Invite.php:56 ../../Zotlabs/Module/Invite.php:310 +msgid "Invite App" +msgstr "" + +#: ../../Zotlabs/Module/Invite.php:68 +msgid "Register is closed" +msgstr "" + +#: ../../Zotlabs/Module/Invite.php:102 ../../Zotlabs/Module/Invite.php:549 +msgid "Note, the invitation code is valid up to" msgstr "" -#: ../../Zotlabs/Module/Invite.php:61 +#: ../../Zotlabs/Module/Invite.php:115 #, php-format -msgid "%s : Not a valid email address." +msgid "Too many recipients for one invitation (max %d)" msgstr "" -#: ../../Zotlabs/Module/Invite.php:75 -msgid "Please join us on $Projectname" +#: ../../Zotlabs/Module/Invite.php:119 +msgid "No recipients for this invitation" msgstr "" -#: ../../Zotlabs/Module/Invite.php:85 -msgid "Invitation limit exceeded. Please contact your site administrator." +#: ../../Zotlabs/Module/Invite.php:133 +#, php-format +msgid "(%s) : Not a valid email address" msgstr "" -#: ../../Zotlabs/Module/Invite.php:94 +#: ../../Zotlabs/Module/Invite.php:138 #, php-format -msgid "%d message sent." -msgid_plural "%d messages sent." -msgstr[0] "" -msgstr[1] "" +msgid "(%s) : Not a real email address" +msgstr "" -#: ../../Zotlabs/Module/Invite.php:110 -msgid "Invite App" +#: ../../Zotlabs/Module/Invite.php:145 +#, php-format +msgid "(%s) : Not allowed email address" +msgstr "" + +#: ../../Zotlabs/Module/Invite.php:158 +#, php-format +msgid "(%s) : email address already in use" +msgstr "" + +#: ../../Zotlabs/Module/Invite.php:165 +#, php-format +msgid "(%s) : Accepted email address" +msgstr "" + +#: ../../Zotlabs/Module/Invite.php:257 +#, php-format +msgid "To %s : Message delivery success." +msgstr "" + +#: ../../Zotlabs/Module/Invite.php:289 +#, php-format +msgid "%1$d mail(s) sent, %2$d mail error(s)" +msgstr "" + +#: ../../Zotlabs/Module/Invite.php:315 +msgid "Invites not proposed by configuration" +msgstr "" + +#: ../../Zotlabs/Module/Invite.php:316 +msgid "Contact the site admin" msgstr "" -#: ../../Zotlabs/Module/Invite.php:111 -msgid "Send email invitations to join this network" +#: ../../Zotlabs/Module/Invite.php:332 +msgid "Invites by users not enabled" msgstr "" -#: ../../Zotlabs/Module/Invite.php:124 +#: ../../Zotlabs/Module/Invite.php:337 msgid "You have no more invitations available" msgstr "" -#: ../../Zotlabs/Module/Invite.php:155 -msgid "Send invitations" +#: ../../Zotlabs/Module/Invite.php:353 +msgid "Not on xchan" msgstr "" -#: ../../Zotlabs/Module/Invite.php:156 -msgid "Enter email addresses, one per line:" +#: ../../Zotlabs/Module/Invite.php:386 +msgid "All users invitation limit exceeded." msgstr "" -#: ../../Zotlabs/Module/Invite.php:158 -msgid "Please join my community on $Projectname." +#: ../../Zotlabs/Module/Invite.php:404 +msgid "Invitation expires after" +msgstr "" + +#: ../../Zotlabs/Module/Invite.php:504 ../../Zotlabs/Module/Invite.php:543 +msgid "Invitation" +msgstr "" + +#: ../../Zotlabs/Module/Invite.php:534 +msgid "Send invitations" +msgstr "" + +#: ../../Zotlabs/Module/Invite.php:535 +msgid "Invitations I am using" msgstr "" -#: ../../Zotlabs/Module/Invite.php:160 -msgid "You will need to supply this invitation code:" +#: ../../Zotlabs/Module/Invite.php:536 +msgid "Invitations we are using" msgstr "" -#: ../../Zotlabs/Module/Invite.php:161 -msgid "1. Register at any $Projectname location (they are all inter-connected)" +#: ../../Zotlabs/Module/Invite.php:537 +msgid "§ Note, the email(s) sent will be recorded in the system logs" msgstr "" -#: ../../Zotlabs/Module/Invite.php:163 -msgid "2. Enter my $Projectname network address into the site searchbar." +#: ../../Zotlabs/Module/Invite.php:538 +msgid "Enter email addresses, one per line:" msgstr "" -#: ../../Zotlabs/Module/Invite.php:164 -msgid "or visit" +#: ../../Zotlabs/Module/Invite.php:540 +msgid "Invite template" msgstr "" -#: ../../Zotlabs/Module/Invite.php:166 -msgid "3. Click [Connect]" +#: ../../Zotlabs/Module/Invite.php:548 +msgid "Here you may enter personal notes to the recipient(s)" msgstr "" #: ../../Zotlabs/Module/Notes.php:57 @@ -13079,10 +13456,6 @@ msgstr "" msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:420 -msgid "or" -msgstr "" - #: ../../Zotlabs/Module/Settings/Channel.php:429 msgid "Your channel address is" msgstr "" @@ -13110,7 +13483,6 @@ msgid "Basic Settings" msgstr "" #: ../../Zotlabs/Module/Settings/Channel.php:502 -#: ../../Zotlabs/Module/Settings/Account.php:104 msgid "Email Address:" msgstr "" @@ -13429,59 +13801,63 @@ msgstr "" msgid "Remove this channel." msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:19 +#: ../../Zotlabs/Module/Settings/Account.php:21 msgid "Not valid email." msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:22 +#: ../../Zotlabs/Module/Settings/Account.php:24 msgid "Protected email address. Cannot change to that email." msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:31 +#: ../../Zotlabs/Module/Settings/Account.php:33 msgid "System failure storing new email. Please try again." msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:48 +#: ../../Zotlabs/Module/Settings/Account.php:51 msgid "Password verification failed." msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:55 +#: ../../Zotlabs/Module/Settings/Account.php:58 msgid "Passwords do not match. Password unchanged." msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:59 +#: ../../Zotlabs/Module/Settings/Account.php:62 msgid "Empty passwords are not allowed. Password unchanged." msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:73 +#: ../../Zotlabs/Module/Settings/Account.php:76 msgid "Password changed." msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:75 +#: ../../Zotlabs/Module/Settings/Account.php:78 msgid "Password update failed. Please try again." msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:99 +#: ../../Zotlabs/Module/Settings/Account.php:103 msgid "Account Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:100 +#: ../../Zotlabs/Module/Settings/Account.php:104 msgid "Current Password" msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:101 +#: ../../Zotlabs/Module/Settings/Account.php:105 msgid "Enter New Password" msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:102 +#: ../../Zotlabs/Module/Settings/Account.php:106 msgid "Confirm New Password" msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:102 +#: ../../Zotlabs/Module/Settings/Account.php:106 msgid "Leave password fields blank unless changing" msgstr "" -#: ../../Zotlabs/Module/Settings/Account.php:106 +#: ../../Zotlabs/Module/Settings/Account.php:108 +msgid "DId2 or Email Address:" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Account.php:110 msgid "Remove this account including all its channels" msgstr "" @@ -13993,135 +14369,135 @@ msgstr "" msgid "Provide a wiki for your channel" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:133 +#: ../../Zotlabs/Module/Wiki.php:132 msgid "Error retrieving wiki" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:140 +#: ../../Zotlabs/Module/Wiki.php:139 msgid "Error creating zip file export folder" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:191 +#: ../../Zotlabs/Module/Wiki.php:190 msgid "Error downloading wiki: " msgstr "" -#: ../../Zotlabs/Module/Wiki.php:212 ../../Zotlabs/Storage/Browser.php:404 +#: ../../Zotlabs/Module/Wiki.php:211 ../../Zotlabs/Storage/Browser.php:404 msgid "Download" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:216 +#: ../../Zotlabs/Module/Wiki.php:215 msgid "Wiki name" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:217 +#: ../../Zotlabs/Module/Wiki.php:216 msgid "Content type" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:219 ../../Zotlabs/Storage/Browser.php:378 +#: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Storage/Browser.php:378 msgid "Type" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:220 +#: ../../Zotlabs/Module/Wiki.php:219 msgid "Any type" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:227 +#: ../../Zotlabs/Module/Wiki.php:226 msgid "Lock content type" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:228 +#: ../../Zotlabs/Module/Wiki.php:227 msgid "Create a status post for this wiki" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:229 +#: ../../Zotlabs/Module/Wiki.php:228 msgid "Edit Wiki Name" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:274 +#: ../../Zotlabs/Module/Wiki.php:273 msgid "Wiki not found" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:300 +#: ../../Zotlabs/Module/Wiki.php:299 msgid "Rename page" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:321 +#: ../../Zotlabs/Module/Wiki.php:320 msgid "Error retrieving page content" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:329 ../../Zotlabs/Module/Wiki.php:331 +#: ../../Zotlabs/Module/Wiki.php:328 ../../Zotlabs/Module/Wiki.php:330 msgid "New page" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:366 +#: ../../Zotlabs/Module/Wiki.php:365 msgid "Revision Comparison" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:374 +#: ../../Zotlabs/Module/Wiki.php:373 msgid "Short description of your changes (optional)" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:394 +#: ../../Zotlabs/Module/Wiki.php:393 msgid "New page name" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:399 +#: ../../Zotlabs/Module/Wiki.php:398 msgid "Embed image from photo albums" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:410 +#: ../../Zotlabs/Module/Wiki.php:409 msgid "History" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:488 +#: ../../Zotlabs/Module/Wiki.php:487 msgid "Error creating wiki. Invalid name." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:495 +#: ../../Zotlabs/Module/Wiki.php:494 msgid "A wiki with this name already exists." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:508 +#: ../../Zotlabs/Module/Wiki.php:507 msgid "Wiki created, but error creating Home page." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:515 +#: ../../Zotlabs/Module/Wiki.php:514 msgid "Error creating wiki" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:539 +#: ../../Zotlabs/Module/Wiki.php:538 msgid "Error updating wiki. Invalid name." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:559 +#: ../../Zotlabs/Module/Wiki.php:557 msgid "Error updating wiki" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:574 +#: ../../Zotlabs/Module/Wiki.php:572 msgid "Wiki delete permission denied." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:584 +#: ../../Zotlabs/Module/Wiki.php:582 msgid "Error deleting wiki" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:617 +#: ../../Zotlabs/Module/Wiki.php:615 msgid "New page created" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:739 +#: ../../Zotlabs/Module/Wiki.php:741 msgid "Cannot delete Home" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:803 +#: ../../Zotlabs/Module/Wiki.php:817 msgid "Current Revision" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:803 +#: ../../Zotlabs/Module/Wiki.php:817 msgid "Selected Revision" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:853 +#: ../../Zotlabs/Module/Wiki.php:872 msgid "You must be authenticated." msgstr "" @@ -14399,15 +14775,15 @@ msgstr "" msgid "Details" msgstr "" -#: ../../Zotlabs/Module/Notifications.php:55 ../../Zotlabs/Module/Notify.php:61 +#: ../../Zotlabs/Module/Notifications.php:58 ../../Zotlabs/Module/Notify.php:61 msgid "No more system notifications." msgstr "" -#: ../../Zotlabs/Module/Notifications.php:59 ../../Zotlabs/Module/Notify.php:65 +#: ../../Zotlabs/Module/Notifications.php:62 ../../Zotlabs/Module/Notify.php:65 msgid "System Notifications" msgstr "" -#: ../../Zotlabs/Module/Notifications.php:60 +#: ../../Zotlabs/Module/Notifications.php:63 #: ../../Zotlabs/Lib/ThreadItem.php:484 msgid "Mark all seen" msgstr "" @@ -14625,32 +15001,32 @@ msgctxt "permcat" msgid "publisher" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2131 +#: ../../Zotlabs/Lib/Activity.php:2163 #, php-format msgid "Likes %1$s's %2$s" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2134 +#: ../../Zotlabs/Lib/Activity.php:2166 #, php-format msgid "Doesn't like %1$s's %2$s" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2140 +#: ../../Zotlabs/Lib/Activity.php:2172 #, php-format msgid "Will attend %s's event" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2143 +#: ../../Zotlabs/Lib/Activity.php:2175 #, php-format msgid "Will not attend %s's event" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2146 +#: ../../Zotlabs/Lib/Activity.php:2178 #, php-format msgid "May attend %s's event" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2149 +#: ../../Zotlabs/Lib/Activity.php:2181 #, php-format msgid "May not attend %s's event" msgstr "" @@ -14934,6 +15310,10 @@ msgstr "" msgid "created an event" msgstr "" +#: ../../Zotlabs/Lib/Enotify.php:986 +msgid "verified" +msgstr "" + #: ../../Zotlabs/Lib/Connect.php:271 msgid "error saving data" msgstr "" @@ -14958,11 +15338,11 @@ msgstr "" msgid "Room is full" msgstr "" -#: ../../Zotlabs/Lib/NativeWiki.php:145 +#: ../../Zotlabs/Lib/NativeWiki.php:146 msgid "Wiki updated successfully" msgstr "" -#: ../../Zotlabs/Lib/NativeWiki.php:199 +#: ../../Zotlabs/Lib/NativeWiki.php:206 msgid "Wiki files deleted successfully" msgstr "" @@ -15115,51 +15495,51 @@ msgstr "" msgid "Wiki page create failed." msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:122 +#: ../../Zotlabs/Lib/NativeWikiPage.php:123 msgid "Wiki not found." msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:133 +#: ../../Zotlabs/Lib/NativeWikiPage.php:134 msgid "Destination name already exists" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:166 -#: ../../Zotlabs/Lib/NativeWikiPage.php:361 +#: ../../Zotlabs/Lib/NativeWikiPage.php:167 +#: ../../Zotlabs/Lib/NativeWikiPage.php:368 msgid "Page not found" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:197 +#: ../../Zotlabs/Lib/NativeWikiPage.php:200 msgid "Error reading page content" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:352 -#: ../../Zotlabs/Lib/NativeWikiPage.php:401 -#: ../../Zotlabs/Lib/NativeWikiPage.php:468 -#: ../../Zotlabs/Lib/NativeWikiPage.php:509 +#: ../../Zotlabs/Lib/NativeWikiPage.php:359 +#: ../../Zotlabs/Lib/NativeWikiPage.php:409 +#: ../../Zotlabs/Lib/NativeWikiPage.php:480 +#: ../../Zotlabs/Lib/NativeWikiPage.php:522 msgid "Error reading wiki" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:389 +#: ../../Zotlabs/Lib/NativeWikiPage.php:396 msgid "Page update failed." msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:423 +#: ../../Zotlabs/Lib/NativeWikiPage.php:431 msgid "Nothing deleted" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:489 +#: ../../Zotlabs/Lib/NativeWikiPage.php:501 msgid "Compare: object not found." msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:495 +#: ../../Zotlabs/Lib/NativeWikiPage.php:508 msgid "Page updated" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:498 +#: ../../Zotlabs/Lib/NativeWikiPage.php:511 msgid "Untitled" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:504 +#: ../../Zotlabs/Lib/NativeWikiPage.php:517 msgid "Wiki resource_id required for git commit" msgstr "" @@ -15558,40 +15938,40 @@ msgid "" "an existing folder." msgstr "" -#: ../../boot.php:1690 +#: ../../boot.php:1695 msgid "Create an account to access services and applications" msgstr "" -#: ../../boot.php:1714 +#: ../../boot.php:1719 msgid "Login/Email" msgstr "" -#: ../../boot.php:1715 +#: ../../boot.php:1720 msgid "Password" msgstr "" -#: ../../boot.php:1716 +#: ../../boot.php:1721 msgid "Remember me" msgstr "" -#: ../../boot.php:1719 +#: ../../boot.php:1724 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:2588 +#: ../../boot.php:2603 #, php-format msgid "[$Projectname] Website SSL error for %s" msgstr "" -#: ../../boot.php:2593 +#: ../../boot.php:2608 msgid "Website SSL certificate is not valid. Please correct." msgstr "" -#: ../../boot.php:2709 +#: ../../boot.php:2724 #, php-format msgid "[$Projectname] Cron tasks not running on %s" msgstr "" -#: ../../boot.php:2714 +#: ../../boot.php:2729 msgid "Cron/Scheduled tasks not running." msgstr "" diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php index 4d989a212..247294d66 100644 --- a/vendor/composer/ClassLoader.php +++ b/vendor/composer/ClassLoader.php @@ -311,8 +311,10 @@ class ClassLoader spl_autoload_register(array($this, 'loadClass'), true, $prepend); if (null === $this->vendorDir) { - //no-op - } elseif ($prepend) { + return; + } + + if ($prepend) { self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders; } else { unset(self::$registeredLoaders[$this->vendorDir]); diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index cf769556b..19900534d 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -1314,6 +1314,7 @@ return array( 'Zotlabs\\Module\\Ratingsearch' => $baseDir . '/Zotlabs/Module/Ratingsearch.php', 'Zotlabs\\Module\\Rbmark' => $baseDir . '/Zotlabs/Module/Rbmark.php', 'Zotlabs\\Module\\React' => $baseDir . '/Zotlabs/Module/React.php', + 'Zotlabs\\Module\\Regate' => $baseDir . '/Zotlabs/Module/Regate.php', 'Zotlabs\\Module\\Regdir' => $baseDir . '/Zotlabs/Module/Regdir.php', 'Zotlabs\\Module\\Register' => $baseDir . '/Zotlabs/Module/Register.php', 'Zotlabs\\Module\\Regmod' => $baseDir . '/Zotlabs/Module/Regmod.php', @@ -1655,6 +1656,7 @@ return array( 'Zotlabs\\Update\\_1241' => $baseDir . '/Zotlabs/Update/_1241.php', 'Zotlabs\\Update\\_1242' => $baseDir . '/Zotlabs/Update/_1242.php', 'Zotlabs\\Update\\_1243' => $baseDir . '/Zotlabs/Update/_1243.php', + 'Zotlabs\\Update\\_1244' => $baseDir . '/Zotlabs/Update/_1244.php', 'Zotlabs\\Web\\Controller' => $baseDir . '/Zotlabs/Web/Controller.php', 'Zotlabs\\Web\\HTTPHeaders' => $baseDir . '/Zotlabs/Web/HTTPHeaders.php', 'Zotlabs\\Web\\HTTPSig' => $baseDir . '/Zotlabs/Web/HTTPSig.php', @@ -1662,6 +1664,7 @@ return array( 'Zotlabs\\Web\\Router' => $baseDir . '/Zotlabs/Web/Router.php', 'Zotlabs\\Web\\Session' => $baseDir . '/Zotlabs/Web/Session.php', 'Zotlabs\\Web\\SessionHandler' => $baseDir . '/Zotlabs/Web/SessionHandler.php', + 'Zotlabs\\Web\\SessionRedis' => $baseDir . '/Zotlabs/Web/SessionRedis.php', 'Zotlabs\\Web\\SubModule' => $baseDir . '/Zotlabs/Web/SubModule.php', 'Zotlabs\\Web\\WebServer' => $baseDir . '/Zotlabs/Web/WebServer.php', 'Zotlabs\\Widget\\Activity' => $baseDir . '/Zotlabs/Widget/Activity.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index daa4919d7..2d71ba507 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -1504,6 +1504,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Module\\Ratingsearch' => __DIR__ . '/../..' . '/Zotlabs/Module/Ratingsearch.php', 'Zotlabs\\Module\\Rbmark' => __DIR__ . '/../..' . '/Zotlabs/Module/Rbmark.php', 'Zotlabs\\Module\\React' => __DIR__ . '/../..' . '/Zotlabs/Module/React.php', + 'Zotlabs\\Module\\Regate' => __DIR__ . '/../..' . '/Zotlabs/Module/Regate.php', 'Zotlabs\\Module\\Regdir' => __DIR__ . '/../..' . '/Zotlabs/Module/Regdir.php', 'Zotlabs\\Module\\Register' => __DIR__ . '/../..' . '/Zotlabs/Module/Register.php', 'Zotlabs\\Module\\Regmod' => __DIR__ . '/../..' . '/Zotlabs/Module/Regmod.php', @@ -1845,6 +1846,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Update\\_1241' => __DIR__ . '/../..' . '/Zotlabs/Update/_1241.php', 'Zotlabs\\Update\\_1242' => __DIR__ . '/../..' . '/Zotlabs/Update/_1242.php', 'Zotlabs\\Update\\_1243' => __DIR__ . '/../..' . '/Zotlabs/Update/_1243.php', + 'Zotlabs\\Update\\_1244' => __DIR__ . '/../..' . '/Zotlabs/Update/_1244.php', 'Zotlabs\\Web\\Controller' => __DIR__ . '/../..' . '/Zotlabs/Web/Controller.php', 'Zotlabs\\Web\\HTTPHeaders' => __DIR__ . '/../..' . '/Zotlabs/Web/HTTPHeaders.php', 'Zotlabs\\Web\\HTTPSig' => __DIR__ . '/../..' . '/Zotlabs/Web/HTTPSig.php', @@ -1852,6 +1854,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Web\\Router' => __DIR__ . '/../..' . '/Zotlabs/Web/Router.php', 'Zotlabs\\Web\\Session' => __DIR__ . '/../..' . '/Zotlabs/Web/Session.php', 'Zotlabs\\Web\\SessionHandler' => __DIR__ . '/../..' . '/Zotlabs/Web/SessionHandler.php', + 'Zotlabs\\Web\\SessionRedis' => __DIR__ . '/../..' . '/Zotlabs/Web/SessionRedis.php', 'Zotlabs\\Web\\SubModule' => __DIR__ . '/../..' . '/Zotlabs/Web/SubModule.php', 'Zotlabs\\Web\\WebServer' => __DIR__ . '/../..' . '/Zotlabs/Web/WebServer.php', 'Zotlabs\\Widget\\Activity' => __DIR__ . '/../..' . '/Zotlabs/Widget/Activity.php', |