diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index 1d5e5118d..bd8317868 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -819,6 +819,15 @@ class Activity { /* Add mentions only if the targets are individuals */ $m = self::map_acl($i,(($i['allow_gid']) ? false : true)); $ret['tag'] = (($ret['tag']) ? array_merge($ret['tag'],$m) : $m); + $ret['to'] = [ $reply_url ]; + if (is_array($m) && $m && ! $ret['to']) { + $ret['to'] = []; + foreach ($m as $ma) { + if (is_array($ma) && $ma['type'] === 'Mention') { + $ret['to'][] = $ma['href']; + } + } + } } } else { @@ -874,10 +883,6 @@ class Activity { if (! $x) return; - $strict = (($mentions) ? true : get_config('activitypub','compliance')); - - $sql_extra = (($strict) ? " and xchan_network = 'activitypub' " : ''); - $details = q("select xchan_url, xchan_addr, xchan_name from xchan where xchan_hash in (" . implode(',',$x) . ") $sql_extra"); if ($details) { @@ -939,7 +944,7 @@ class Activity { ]; $ret['url'] = $p['xchan_url']; - if ($activitypub && $feature_complete) { + if ($activitypub && get_config('system','activitypub')) { if ($c) { $ret['inbox'] = z_root() . '/inbox/' . $c['channel_address']; @@ -954,6 +959,22 @@ class Activity { 'publicKeyPem' => $p['xchan_pubkey'] ]; + // map other nomadic identities linked with this channel + + $locations = []; + $locs = Libzot::encode_locations($c); + if ($locs) { + foreach ($locs as $loc) { + if ($loc['url'] !== z_root()) { + $locations[] = $loc['id_url']; + } + } + } + + if ($locations) { + $ret['alsoKnownAs'] = $locations; + } + $cp = get_cover_photo($c['channel_id'],'array'); if ($cp) { $ret['image'] = [ @@ -1286,7 +1307,6 @@ class Activity { AccessList::member_add($channel['channel_id'],'',$ret['xchan_hash'],$g['id']); } - return; } @@ -2238,10 +2258,27 @@ class Activity { } $allowed = false; - - if ($is_child_node) { - // in ActivityPub, anybody can post comments - $allowed = true; + $moderated = false; + + if ($is_child_node) { + $p = q("select id from item where mid = '%s' and uid = %d and item_wall = 1", + dbesc($item['parent_mid']), + intval($channel['channel_id']) + ); + if ($p) { + $allowed = perm_is_allowed($channel['channel_id'],$observer_hash,'post_comments'); + if (! $allowed) { + // let the sender know we received their comment but we don't permit spam here. + self::send_rejection_activity($channel,$observer_hash,$item); + } + } + else { + $allowed = true; + // reject public stream comments that weren't sent by the conversation owner + if ($is_sys_channel && $pubstream && $item['owner_xchan'] !== $observer_hash) { + $allowed = false; + } + } } elseif (perm_is_allowed($channel['channel_id'],$observer_hash,'send_stream') || ($is_sys_channel && $pubstream)) { $allowed = true; @@ -2918,4 +2955,35 @@ class Activity { return $content; } + static function send_rejection_activity($channel,$observer_hash,$item) { + + $recip = q("select * from hubloc where hubloc_hash = '%s' limit 1", + dbesc($observer_hash) + ); + if (! $recip) { + return; + } + + $arr = [ + 'id' => z_root() . '/bounces/' . new_uuid(), + 'to' => [ $observer_hash ], + 'type' => 'Reject', + 'actor' => channel_url($channel), + 'name' => 'Permission denied', + 'object' => $item['message_id'] + ]; + + $msg = array_merge(['@context' => [ + ACTIVITYSTREAMS_JSONLD_REV, + 'https://w3id.org/security/v1', + z_root() . ZOT_APSCHEMA_REV + ]], $arr); + + $queue_id = ActivityPub::queue_message($msg,$channel,$recip[0]); + do_delivery( [ $queue_id ] ); + + } + + + } diff --git a/Zotlabs/Lib/ActivityPub.php b/Zotlabs/Lib/ActivityPub.php index 7f66cd893..43f1fe623 100644 --- a/Zotlabs/Lib/ActivityPub.php +++ b/Zotlabs/Lib/ActivityPub.php @@ -157,7 +157,6 @@ class ActivityPub { static function queue_message($msg,$sender,$recip,$message_id = '') { - $dest_url = $recip['hubloc_callback']; logger('URL: ' . $dest_url, LOGGER_DEBUG); diff --git a/Zotlabs/Module/Acl.php b/Zotlabs/Module/Acl.php index 57ac7c755..9f100a429 100644 --- a/Zotlabs/Module/Acl.php +++ b/Zotlabs/Module/Acl.php @@ -85,7 +85,9 @@ class Acl extends \Zotlabs\Web\Controller { if($search) { $sql_extra = " AND pgrp.gname LIKE " . protect_sprintf( "'%" . dbesc($search) . "%'" ) . " "; $sql_extra2 = "AND ( xchan_name LIKE " . protect_sprintf( "'%" . dbesc($search) . "%'" ) . " OR xchan_addr LIKE " . protect_sprintf( "'%" . dbesc(punify($search)) . ((strpos($search,'@') === false) ? "%@%'" : "%'")) . ") "; - + + + // This horrible mess is needed because position also returns 0 if nothing is found. // Would be MUCH easier if it instead returned a very large value // Otherwise we could just @@ -96,11 +98,14 @@ class Acl extends \Zotlabs\Web\Controller { . " then POSITION('" . protect_sprintf(dbesc($search)) . "' IN xchan_name) else position('" . protect_sprintf(dbesc(punify($search))) . "' IN xchan_addr) end, "; - $sql_extra3 = "AND ( xchan_addr like " . protect_sprintf( "'%" . dbesc(punify($search)) . "%'" ) . " OR xchan_name like " . protect_sprintf( "'%" . dbesc($search) . "%'" ) . " OR abook_alias like " . protect_sprintf( "'%" . dbesc($search) . "%'" ) . " ) "; - + $sql_extra3 = "AND ( xchan_addr like " . protect_sprintf( "'%" . dbesc(punify($search)) . "%'" ) . " OR ( xchan_name like " . protect_sprintf( "'%" . dbesc($search) . "%'" ) . " OR abook_alias like " . protect_sprintf( "'%" . dbesc($search) . "%'" ) . " )) "; + + $sql_extra4 = "AND ( xchan_name LIKE " . protect_sprintf( "'%" . dbesc($search) . "%'" ) . " OR xchan_addr LIKE " . protect_sprintf( "'%" . dbesc(punify($search)) . ((strpos($search,'@') === false) ? "%@%'" : "%'")) . " OR abook_alias LIKE " . protect_sprintf( "'%" . dbesc($search) . "%'") . ") "; + + } else { - $sql_extra = $sql_extra2 = $sql_extra3 = ""; + $sql_extra = $sql_extra2 = $sql_extra3 = $sql_extra4 = ""; } @@ -214,13 +219,14 @@ class Acl extends \Zotlabs\Web\Controller { } // add connections - + $r = q("SELECT abook_id as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, xchan_type, abook_flags, abook_self FROM abook left join xchan on abook_xchan = xchan_hash - WHERE (abook_channel = %d $extra_channels_sql) AND abook_blocked = 0 and abook_pending = 0 and xchan_deleted = 0 $sql_extra2 order by $order_extra2 xchan_name asc" , + WHERE (abook_channel = %d $extra_channels_sql) AND abook_blocked = 0 and abook_pending = 0 and xchan_deleted = 0 $sql_extra4 order by xchan_name asc" , intval(local_channel()) ); - if($r2) + + if($r && $r2) $r = array_merge($r2,$r); } diff --git a/Zotlabs/Module/Admin/Site.php b/Zotlabs/Module/Admin/Site.php index 50375a437..6d9e0399a 100644 --- a/Zotlabs/Module/Admin/Site.php +++ b/Zotlabs/Module/Admin/Site.php @@ -77,6 +77,7 @@ class Site { $poll_interval = ((x($_POST,'poll_interval')) ? intval(trim($_POST['poll_interval'])) : 0); $maxloadavg = ((x($_POST,'maxloadavg')) ? intval(trim($_POST['maxloadavg'])) : 50); $feed_contacts = ((x($_POST,'feed_contacts')) ? intval($_POST['feed_contacts']) : 0); + $ap_contacts = ((x($_POST,'ap_contacts')) ? intval($_POST['ap_contacts']) : 0); $verify_email = ((x($_POST,'verify_email')) ? 1 : 0); $imagick_path = ((x($_POST,'imagick_path')) ? trim($_POST['imagick_path']) : ''); $thumbnail_security = ((x($_POST,'thumbnail_security')) ? intval($_POST['thumbnail_security']) : 0); @@ -87,6 +88,7 @@ class Site { $permissions_role = escape_tags(trim($_POST['permissions_role'])); set_config('system', 'feed_contacts', $feed_contacts); + set_config('system', 'activitypub', $ap_contacts); set_config('system', 'delivery_interval', $delivery_interval); set_config('system', 'delivery_batch_count', $delivery_batch_count); set_config('system', 'poll_interval', $poll_interval); @@ -305,6 +307,7 @@ class Site { // '$theme_mobile' => [ 'theme_mobile', t("Mobile system theme"), get_config('system','mobile_theme'), t("Theme for mobile devices"), $theme_choices_mobile ], // '$site_channel' => [ 'site_channel', t("Channel to use for this website's static pages"), get_config('system','site_channel'), t("Site Channel") ], '$feed_contacts' => [ 'feed_contacts', t('Allow Feeds as Connections'),get_config('system','feed_contacts'),t('(Heavy system resource usage)') ], + '$ap_contacts' => [ 'ap_contacts', t('Allow ActivityPub Connections'),get_config('system','activitypub'),t('Experimental and unsupported. ActivityPub does not fully support privacy and account mobility.') ], '$maximagesize' => [ 'maximagesize', t("Maximum image size"), intval(get_config('system','maximagesize')), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.") ], '$register_policy' => [ 'register_policy', t("Does this site allow new member registration?"), get_config('system','register_policy'), "", $register_choices ], '$invite_only' => [ 'invite_only', t("Invitation only"), get_config('system','invitation_only'), t("Only allow new member registrations with an invitation code. New member registration must be allowed for this to work.") ], @@ -338,7 +341,7 @@ class Site { '$imagick_path' => [ 'imagick_path', t("Path to ImageMagick convert program"), get_config('system','imagick_convert_path'), t("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") ], '$thumbnail_security' => [ 'thumbnail_security', t("Allow SVG thumbnails in file browser"), get_config('system','thumbnail_security',0), t("WARNING: SVG images may contain malicious code.") ], '$maxloadavg' => [ 'maxloadavg', t("Maximum Load Average"), ((intval(get_config('system','maxloadavg')) > 0)?get_config('system','maxloadavg'):50), t("Maximum system load before delivery and poll processes are deferred - default 50.") ], - '$default_expire_days' => [ 'default_expire_days', t('Expiration period in days for imported (grid/network) content'), intval(get_config('system','default_expire_days')), t('0 for no expiration of imported content') ], + '$default_expire_days' => [ 'default_expire_days', t('Expiration period in days for imported streams'), intval(get_config('system','default_expire_days')), t('0 for no expiration of imported content') ], '$active_expire_days' => [ 'active_expire_days', t('Do not expire any posts which have comments less than this many days ago'), intval(get_config('system','active_expire_days',7)), '' ], '$sellpage' => [ 'site_sellpage', t('Public servers: Optional landing (marketing) webpage for new registrants'), get_config('system','sellpage',''), sprintf( t('Create this page first. Default is %s/register'),z_root()) ], '$first_page' => [ 'first_page', t('Page to display after creating a new channel'), get_config('system','workflow_channel_next','profiles'), t('Default: profiles') ], diff --git a/Zotlabs/Module/Apschema.php b/Zotlabs/Module/Apschema.php index 117815bd8..9b9021f4e 100644 --- a/Zotlabs/Module/Apschema.php +++ b/Zotlabs/Module/Apschema.php @@ -17,6 +17,7 @@ class Apschema extends \Zotlabs\Web\Controller { 'ostatus' => 'http://ostatus.org#', 'conversation' => 'ostatus:conversation', 'sensitive' => 'as:sensitive', + 'alsoKnownAs' => 'as:alsoKnownAs', 'inheritPrivacy' => 'as:inheritPrivacy', 'commentPolicy' => 'zot:commentPolicy', 'topicalCollection' => 'zot:topicalCollection', diff --git a/Zotlabs/Module/Cover_photo.php b/Zotlabs/Module/Cover_photo.php index 06c6c2606..7daead679 100644 --- a/Zotlabs/Module/Cover_photo.php +++ b/Zotlabs/Module/Cover_photo.php @@ -1,6 +1,7 @@ 0 order by imgscale asc LIMIT 1", @@ -88,26 +90,26 @@ class Cover_photo extends \Zotlabs\Web\Controller { intval(local_channel()) ); - if($r) { + if ($r) { $max_thumb = intval(get_config('system','max_thumbnail',1600)); $iscaled = false; - if(intval($r[0]['height']) > $max_thumb || intval($r[0]['width']) > $max_thumb) { + if (intval($r[0]['height']) > $max_thumb || intval($r[0]['width']) > $max_thumb) { $imagick_path = get_config('system','imagick_convert_path'); - if($imagick_path && @file_exists($imagick_path) && intval($r[0]['os_storage'])) { + if ($imagick_path && @file_exists($imagick_path) && intval($r[0]['os_storage'])) { $fname = dbunescbin($r[0]['content']); $tmp_name = $fname . '-001'; $newsize = photo_calculate_scale(array_merge(getimagesize($fname),['max' => $max_thumb])); $cmd = $imagick_path . ' ' . escapeshellarg(PROJECT_BASE . '/' . $fname) . ' -resize ' . $newsize . ' ' . escapeshellarg(PROJECT_BASE . '/' . $tmp_name); // logger('imagick thumbnail command: ' . $cmd); - for($x = 0; $x < 4; $x ++) { + for ($x = 0; $x < 4; $x ++) { exec($cmd); - if(file_exists($tmp_name)) { + if (file_exists($tmp_name)) { break; } } - if(file_exists($tmp_name)) { + if (file_exists($tmp_name)) { $base_image = $r[0]; $gis = getimagesize($tmp_name); logger('gis: ' . print_r($gis,true)); @@ -119,13 +121,13 @@ logger('gis: ' . print_r($gis,true)); } } } - if(! $iscaled) { + if (! $iscaled) { $base_image = $r[0]; - $base_image['content'] = (($r[0]['os_storage']) ? @file_get_contents(dbunescbin($base_image['content'])) : dbunescbin($base_image['content'])); + $base_image['content'] = (($base_image['os_storage']) ? @file_get_contents(dbunescbin($base_image['content'])) : dbunescbin($base_image['content'])); } $im = photo_factory($base_image['content'], $base_image['mimetype']); - if($im->is_valid()) { + if ($im->is_valid()) { // We are scaling and cropping the relative pixel locations to the original photo instead of the // scaled photo we operated on. @@ -142,7 +144,7 @@ logger('gis: ' . print_r($gis,true)); $scaled_width = $g[0]['width']; $scaled_height = $g[0]['height']; - if((! $scaled_width) || (! $scaled_height)) { + if ((! $scaled_width) || (! $scaled_height)) { logger('potential divide by zero scaling cover photo'); return; } @@ -191,7 +193,7 @@ logger('gis: ' . print_r($gis,true)); $r3 = $im->storeThumbnail($p, PHOTO_RES_COVER_425); - if($r1 === false || $r2 === false || $r3 === false) { + if ($r1 === false || $r2 === false || $r3 === false) { // if one failed, delete them all so we can start over. notice( t('Image resize failed.') . EOL ); $x = q("delete from photo where resource_id = '%s' and uid = %d and imgscale >= 7 ", @@ -201,7 +203,7 @@ logger('gis: ' . print_r($gis,true)); return; } - $channel = \App::get_channel(); + $channel = App::get_channel(); $this->send_cover_photo_activity($channel,$base_image,$profile); @@ -217,24 +219,22 @@ logger('gis: ' . print_r($gis,true)); $hash = photo_new_resource(); $smallest = 0; - - require_once('include/attach.php'); - + $matches = []; $partial = false; - if(array_key_exists('HTTP_CONTENT_RANGE',$_SERVER)) { + if (array_key_exists('HTTP_CONTENT_RANGE',$_SERVER)) { $pm = preg_match('/bytes (\d*)\-(\d*)\/(\d*)/',$_SERVER['HTTP_CONTENT_RANGE'],$matches); - if($pm) { + if ($pm) { logger('Content-Range: ' . print_r($matches,true)); $partial = true; } } - if($partial) { + if ($partial) { $x = save_chunk($channel,$matches[1],$matches[2],$matches[3]); - if($x['partial']) { + if ($x['partial']) { header('Range: bytes=0-' . (($x['length']) ? $x['length'] - 1 : 0)); json_return_and_die($result); } @@ -251,7 +251,7 @@ logger('gis: ' . print_r($gis,true)); } } else { - if(! array_key_exists('userfile',$_FILES)) { + if (! array_key_exists('userfile',$_FILES)) { $_FILES['userfile'] = [ 'name' => $_FILES['files']['name'], 'type' => $_FILES['files']['type'], @@ -262,9 +262,9 @@ logger('gis: ' . print_r($gis,true)); } } - $res = attach_store(\App::get_channel(), get_observer_hash(), '', array('album' => t('Cover Photos'), 'hash' => $hash)); + $res = attach_store(App::get_channel(), get_observer_hash(), '', array('album' => t('Cover Photos'), 'hash' => $hash)); - logger('attach_store: ' . print_r($res,true)); + logger('attach_store: ' . print_r($res,true),LOGGER_DEBUG); json_return_and_die([ 'message' => $hash ]); @@ -272,7 +272,7 @@ logger('gis: ' . print_r($gis,true)); function send_cover_photo_activity($channel,$photo,$profile) { - $arr = array(); + $arr = []; $arr['item_thread_top'] = 1; $arr['item_origin'] = 1; $arr['item_wall'] = 1; @@ -281,12 +281,15 @@ logger('gis: ' . print_r($gis,true)); $arr['obj_type'] = ACTIVITY_OBJ_NOTE; $arr['verb'] = ACTIVITY_CREATE; - if($profile && stripos($profile['gender'],t('female')) !== false) + if ($profile && stripos($profile['gender'],t('female')) !== false) { $t = t('%1$s updated her %2$s'); - elseif($profile && stripos($profile['gender'],t('male')) !== false) + } + elseif ($profile && stripos($profile['gender'],t('male')) !== false) { $t = t('%1$s updated his %2$s'); - else + } + else { $t = t('%1$s updated their %2$s'); + } $ptext = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo['resource_id'] . ']' . t('cover photo') . '[/zrl]'; @@ -335,19 +338,19 @@ logger('gis: ' . print_r($gis,true)); function get() { - if(! local_channel()) { + if (! local_channel()) { notice( t('Permission denied.') . EOL ); return; } - $channel = \App::get_channel(); + $channel = App::get_channel(); $newuser = false; - if(argc() == 2 && argv(1) === 'new') + if (argc() == 2 && argv(1) === 'new') $newuser = true; - if(argv(1) === 'use') { + if (argv(1) === 'use') { if (argc() < 3) { notice( t('Permission denied.') . EOL ); return; @@ -361,14 +364,15 @@ logger('gis: ' . print_r($gis,true)); intval(local_channel()), dbesc($resource_id) ); - if(! $r) { + if (! $r) { notice( t('Photo not available.') . EOL ); return; } $havescale = false; - foreach($r as $rr) { - if($rr['imgscale'] == 7) + foreach ($r as $rr) { + if ($rr['imgscale'] == 7) { $havescale = true; + } } $r = q("SELECT content, mimetype, resource_id, os_storage FROM photo WHERE id = %d and uid = %d limit 1", @@ -376,74 +380,74 @@ logger('gis: ' . print_r($gis,true)); intval(local_channel()) ); - if(! $r) { + if (! $r) { notice( t('Photo not available.') . EOL ); return; } - if(intval($r[0]['os_storage'])) + if (intval($r[0]['os_storage'])) { $data = @file_get_contents(dbunescbin($r[0]['content'])); - else - $data = dbunescbin($r[0]['content']); + } + else { + $data = dbunescbin($r[0]['content']); + } $ph = photo_factory($data, $r[0]['mimetype']); $smallest = 0; - if($ph->is_valid()) { + if ($ph->is_valid()) { // go ahead as if we have just uploaded a new photo to crop $i = q("select resource_id, imgscale from photo where resource_id = '%s' and uid = %d and imgscale = 0", dbesc($r[0]['resource_id']), intval(local_channel()) ); - if($i) { + if ($i) { $hash = $i[0]['resource_id']; - foreach($i as $ii) { + foreach ($i as $ii) { $smallest = intval($ii['imgscale']); } } } - $this->cover_photo_crop_ui_head($a, $ph, $hash, $smallest); + $this->cover_photo_crop_ui_head($ph, $hash, $smallest); } - if(! x(\App::$data,'imagecrop')) { + if(! array_key_exists('imagecrop',App::$data)) { - $tpl = get_markup_template('cover_photo.tpl'); - - $o .= replace_macros($tpl,array( - '$user' => \App::$channel['channel_address'], - '$info' => t('Your cover photo may be visible to anybody on the internet'), - '$existing' => get_cover_photo(local_channel(),'array',PHOTO_RES_COVER_850), - '$lbl_upfile' => t('Upload File:'), - '$lbl_profiles' => t('Select a profile:'), - '$title' => t('Change Cover Photo'), - '$submit' => t('Upload'), - '$profiles' => $profiles, - '$embedPhotos' => t('Use a photo from your albums'), - '$embedPhotosModalTitle' => t('Use a photo from your albums'), + $o .= replace_macros(get_markup_template('cover_photo.tpl'), [ + '$user' => App::$channel['channel_address'], + '$info' => t('Your cover photo may be visible to anybody on the internet'), + '$existing' => get_cover_photo(local_channel(),'array',PHOTO_RES_COVER_850), + '$lbl_upfile' => t('Upload File:'), + '$lbl_profiles' => t('Select a profile:'), + '$title' => t('Change Cover Photo'), + '$submit' => t('Upload'), + '$profiles' => $profiles, + '$embedPhotos' => t('Use a photo from your albums'), + '$embedPhotosModalTitle' => t('Use a photo from your albums'), '$embedPhotosModalCancel' => t('Cancel'), - '$embedPhotosModalOK' => t('OK'), - '$modalchooseimages' => t('Choose images to embed'), - '$modalchoosealbum' => t('Choose an album'), - '$modaldiffalbum' => t('Choose a different album'), - '$modalerrorlist' => t('Error getting album list'), - '$modalerrorlink' => t('Error getting photo link'), - '$modalerroralbum' => t('Error getting album'), - '$form_security_token' => get_form_security_token("cover_photo"), - '$select' => t('Select previously uploaded photo'), + '$embedPhotosModalOK' => t('OK'), + '$modalchooseimages' => t('Choose images to embed'), + '$modalchoosealbum' => t('Choose an album'), + '$modaldiffalbum' => t('Choose a different album'), + '$modalerrorlist' => t('Error getting album list'), + '$modalerrorlink' => t('Error getting photo link'), + '$modalerroralbum' => t('Error getting album'), + '$form_security_token' => get_form_security_token("cover_photo"), + '$select' => t('Select previously uploaded photo'), - )); + ]); call_hooks('cover_photo_content_end', $o); return $o; } else { - $filename = \App::$data['imagecrop'] . '-3'; + $filename = App::$data['imagecrop'] . '-3'; $resolution = 3; - $tpl = get_markup_template("cropcover.tpl"); - $o .= replace_macros($tpl,array( + + $o .= replace_macros(get_markup_template('cropcover.tpl'), [ '$filename' => $filename, '$profile' => intval($_REQUEST['profile']), '$resource' => \App::$data['imagecrop'] . '-3', @@ -452,11 +456,9 @@ logger('gis: ' . print_r($gis,true)); '$desc' => t('Please adjust the image cropping for optimum viewing.'), '$form_security_token' => get_form_security_token("cover_photo"), '$done' => t('Done Editing') - )); + ]); return $o; } - - return; // NOTREACHED } /* @brief Generate the UI for photo-cropping @@ -467,27 +469,29 @@ logger('gis: ' . print_r($gis,true)); * */ - function cover_photo_crop_ui_head(&$a, $ph, $hash, $smallest){ + function cover_photo_crop_ui_head($ph, $hash, $smallest){ $max_length = get_config('system','max_image_length'); - if(! $max_length) + if (! $max_length) { $max_length = MAX_IMAGE_LENGTH; - if($max_length > 0) + } + if ($max_length > 0) { $ph->scaleImage($max_length); - + } + $width = $ph->getWidth(); $height = $ph->getHeight(); - if($width < 300 || $height < 300) { + if ($width < 300 || $height < 300) { $ph->scaleImageUp(240); $width = $ph->getWidth(); $height = $ph->getHeight(); } - \App::$data['imagecrop'] = $hash; - \App::$data['imagecrop_resolution'] = $smallest; - \App::$page['htmlhead'] .= replace_macros(get_markup_template("crophead.tpl"), array()); + App::$data['imagecrop'] = $hash; + App::$data['imagecrop_resolution'] = $smallest; + App::$page['htmlhead'] .= replace_macros(get_markup_template('crophead.tpl'), []); return; } diff --git a/Zotlabs/Module/Inbox.php b/Zotlabs/Module/Inbox.php index 5a1b6fff4..490c4b590 100644 --- a/Zotlabs/Module/Inbox.php +++ b/Zotlabs/Module/Inbox.php @@ -210,12 +210,12 @@ class Inbox extends Controller { case 'emojiReaction': // These require a resolvable object structure if (is_array($AS->obj)) { - // replies must go to the replyTo endpoint if the top level post originated here. $item = Activity::decode_note($AS); - if ($item['mid'] !== $item['parent_mid'] && stripos(z_root(), $item['parent_mid']) === 0) { - $item = null; - break; - } + // @wip replies must go to the replyTo endpoint if the top level post originated here. + //if ($item['mid'] !== $item['parent_mid'] && stripos(z_root(), $item['parent_mid']) === 0) { + // $item = null; + // break; + //} } else { logger('unresolved object: ' . print_r($AS->obj,true)); diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php index 914030a4b..c1b277e9c 100644 --- a/Zotlabs/Module/Ping.php +++ b/Zotlabs/Module/Ping.php @@ -5,6 +5,7 @@ namespace Zotlabs\Module; use App; use Zotlabs\Web\Controller; use Zotlabs\Lib\Enotify; +use Zotlabs\Lib\Apps; require_once('include/bbcode.php'); @@ -164,6 +165,10 @@ class Ping extends Controller { $notify_pubs = ((local_channel()) ? ($vnotify & VNOTIFY_PUBS) && $discover_tab_on : $discover_tab_on); + if ($notify_pubs && local_channel() && ! Apps::system_app_installed(local_channel(),'Public Stream')) { + $notify_pubs = false; + } + $sys = get_sys_channel(); if ($notify_pubs) { diff --git a/boot.php b/boot.php index e0d747691..37eac4407 100755 --- a/boot.php +++ b/boot.php @@ -48,7 +48,7 @@ require_once('include/items.php'); -define ( 'STD_VERSION', '19.9.18' ); +define ( 'STD_VERSION', '19.9.22' ); define ( 'ZOT_REVISION', '6.0' ); define ( 'DB_UPDATE_VERSION', 1236 ); @@ -470,7 +470,8 @@ define ( 'NAMESPACE_YMEDIA', 'http://search.yahoo.com/mrss/' ); define ( 'ACTIVITYSTREAMS_JSONLD_REV', 'https://www.w3.org/ns/activitystreams' ); -define ( 'ZOT_APSCHEMA_REV', '/apschema/v1.10' ); +define ( 'ZOT_APSCHEMA_REV', '/apschema/v1.11' ); + /** * activity stream defines */ diff --git a/include/bbcode.php b/include/bbcode.php index ba703de3c..f8e349a11 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -1125,8 +1125,9 @@ function bbcode($Text, $options = []) { } if (strpos($Text,'[/zrl]') !== false) { -// $Text = preg_replace("/\#\^\[zrl\]([$URLSearchString]*)\[\/zrl\]/ism", '#^$1', $Text); -// $Text = preg_replace("/\#\^\[zrl\=([$URLSearchString]*)\](.*?)\[\/zrl\]/ism", '#^$2', $Text); + // render hubzilla bookmarks as normal links + $Text = preg_replace("/\#\^\[zrl\]([$URLSearchString]*)\[\/zrl\]/ism", '$1', $Text); + $Text = preg_replace("/\#\^\[zrl\=([$URLSearchString]*)\](.*?)\[\/zrl\]/ism", '$2', $Text); $Text = preg_replace("/\[zrl\]([$URLSearchString]*)\[\/zrl\]/ism", '$1', $Text); $Text = preg_replace("/\@(\!?)\[zrl\=([$URLSearchString]*)\](.*?)\[\/zrl\]/ism", '@$1$3', $Text); $Text = preg_replace("/\[zrl\=([$URLSearchString]*)\](.*?)\[\/zrl\]/ism", '$2', $Text); @@ -1424,6 +1425,9 @@ function bbcode($Text, $options = []) { if($censored) { $Text = separate_img_links($Text); + + //@fixme make this work with OWA image links + $Text = preg_replace("/\/ism",' $2',$Text); } diff --git a/include/help.php b/include/help.php index d2a7a086f..70ff396ea 100644 --- a/include/help.php +++ b/include/help.php @@ -1,6 +1,6 @@ \\<\/a\>/ism', '
' . t('Link') . '
',$s); + return $x; } diff --git a/util/messages.po b/util/messages.po index e13013b03..e0f6603a2 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.3\n" +"Project-Id-Version: 19.9.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-07-22 18:37-0700\n" +"POT-Creation-Date: 2019-09-21 16:29-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -47,8 +47,8 @@ msgstr "" #: ../../Zotlabs/Access/PermissionRoles.php:187 #: ../../Zotlabs/Module/Manage.php:65 ../../Zotlabs/Module/Manage.php:162 -#: ../../Zotlabs/Module/Directory.php:391 ../../Zotlabs/Storage/Browser.php:131 -#: ../../include/text.php:2681 +#: ../../Zotlabs/Module/Directory.php:394 ../../Zotlabs/Storage/Browser.php:131 +#: ../../include/text.php:2724 msgid "Collection" msgstr "" @@ -163,7 +163,7 @@ msgid "To stop receiving these messages, please adjust your %s." msgstr "" #: ../../Zotlabs/Lib/Enotify.php:70 -#: ../../Zotlabs/Module/Settings/Channel.php:594 +#: ../../Zotlabs/Module/Settings/Channel.php:586 msgid "Notification Settings" msgstr "" @@ -443,12 +443,12 @@ msgstr "" #: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Common.php:42 #: ../../Zotlabs/Module/Block.php:25 ../../Zotlabs/Module/Block.php:75 #: ../../Zotlabs/Module/Cards.php:82 ../../Zotlabs/Module/Blocks.php:77 -#: ../../Zotlabs/Module/Blocks.php:84 ../../Zotlabs/Module/Connections.php:28 -#: ../../Zotlabs/Module/Appman.php:87 ../../Zotlabs/Module/Cover_photo.php:339 -#: ../../Zotlabs/Module/Cover_photo.php:352 -#: ../../Zotlabs/Module/Defperms.php:164 ../../Zotlabs/Module/Item.php:566 -#: ../../Zotlabs/Module/Item.php:588 ../../Zotlabs/Module/Item.php:599 -#: ../../Zotlabs/Module/Item.php:1512 ../../Zotlabs/Module/Editpost.php:17 +#: ../../Zotlabs/Module/Blocks.php:84 ../../Zotlabs/Module/Connections.php:32 +#: ../../Zotlabs/Module/Appman.php:87 ../../Zotlabs/Module/Cover_photo.php:342 +#: ../../Zotlabs/Module/Cover_photo.php:355 +#: ../../Zotlabs/Module/Defperms.php:164 ../../Zotlabs/Module/Item.php:567 +#: ../../Zotlabs/Module/Item.php:589 ../../Zotlabs/Module/Item.php:600 +#: ../../Zotlabs/Module/Item.php:1513 ../../Zotlabs/Module/Editpost.php:17 #: ../../Zotlabs/Module/Editlayout.php:71 #: ../../Zotlabs/Module/Editlayout.php:94 #: ../../Zotlabs/Module/Editwebpage.php:72 @@ -464,42 +464,36 @@ msgstr "" #: ../../Zotlabs/Module/Chat.php:112 ../../Zotlabs/Module/Chat.php:117 #: ../../Zotlabs/Module/Locs.php:90 ../../Zotlabs/Module/Layouts.php:77 #: ../../Zotlabs/Module/Layouts.php:84 ../../Zotlabs/Module/Layouts.php:95 -#: ../../Zotlabs/Module/Card_edit.php:53 ../../Zotlabs/Module/Cloud.php:42 -#: ../../Zotlabs/Module/Manage.php:14 ../../Zotlabs/Module/Mitem.php:133 -#: ../../Zotlabs/Module/Editblock.php:71 ../../Zotlabs/Module/Menu.php:132 -#: ../../Zotlabs/Module/Menu.php:143 ../../Zotlabs/Module/Register.php:80 -#: ../../Zotlabs/Module/Message.php:17 ../../Zotlabs/Module/Viewsrc.php:19 -#: ../../Zotlabs/Module/New_channel.php:115 +#: ../../Zotlabs/Module/Card_edit.php:53 ../../Zotlabs/Module/Manage.php:14 +#: ../../Zotlabs/Module/Mitem.php:133 ../../Zotlabs/Module/Editblock.php:71 +#: ../../Zotlabs/Module/Menu.php:132 ../../Zotlabs/Module/Menu.php:143 +#: ../../Zotlabs/Module/Register.php:80 ../../Zotlabs/Module/Message.php:17 +#: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/New_channel.php:115 #: ../../Zotlabs/Module/New_channel.php:140 #: ../../Zotlabs/Module/Calendar.php:263 #: ../../Zotlabs/Module/Notifications.php:11 -#: ../../Zotlabs/Module/Connedit.php:330 ../../Zotlabs/Module/Moderate.php:15 +#: ../../Zotlabs/Module/Connedit.php:322 ../../Zotlabs/Module/Moderate.php:15 #: ../../Zotlabs/Module/Webpages.php:134 ../../Zotlabs/Module/Page.php:38 #: ../../Zotlabs/Module/Page.php:137 ../../Zotlabs/Module/Profile.php:122 #: ../../Zotlabs/Module/Profile.php:138 ../../Zotlabs/Module/Pdledit.php:30 -#: ../../Zotlabs/Module/Profiles.php:201 ../../Zotlabs/Module/Profiles.php:635 +#: ../../Zotlabs/Module/Profiles.php:197 ../../Zotlabs/Module/Profiles.php:630 #: ../../Zotlabs/Module/Setup.php:221 ../../Zotlabs/Module/Photos.php:72 -#: ../../Zotlabs/Module/Poke.php:155 ../../Zotlabs/Module/Profile_photo.php:348 -#: ../../Zotlabs/Module/Profile_photo.php:361 ../../Zotlabs/Module/Mood.php:124 -#: ../../Zotlabs/Module/Events.php:296 ../../Zotlabs/Module/Regmod.php:20 +#: ../../Zotlabs/Module/Poke.php:155 ../../Zotlabs/Module/Profile_photo.php:342 +#: ../../Zotlabs/Module/Profile_photo.php:356 ../../Zotlabs/Module/Mood.php:124 +#: ../../Zotlabs/Module/Events.php:295 ../../Zotlabs/Module/Regmod.php:20 #: ../../Zotlabs/Module/Service_limits.php:11 #: ../../Zotlabs/Module/Settings.php:59 #: ../../Zotlabs/Module/Sharedwithme.php:16 ../../Zotlabs/Module/Sources.php:77 #: ../../Zotlabs/Module/Display.php:454 ../../Zotlabs/Module/Inspect.php:15 #: ../../Zotlabs/Module/Viewconnections.php:32 #: ../../Zotlabs/Module/Viewconnections.php:37 -#: ../../Zotlabs/Module/Suggestions.php:30 ../../Zotlabs/Web/WebServer.php:129 -#: ../../include/attach.php:153 ../../include/attach.php:200 -#: ../../include/attach.php:273 ../../include/attach.php:382 -#: ../../include/attach.php:396 ../../include/attach.php:403 -#: ../../include/attach.php:481 ../../include/attach.php:1041 -#: ../../include/attach.php:1115 ../../include/attach.php:1280 -#: ../../include/photos.php:30 ../../include/items.php:3479 -#: ../../extend/addon/a/articles/Mod_Article_edit.php:53 -#: ../../extend/addon/a/articles/Mod_Articles.php:78 -#: ../../extend/addon/a/wiki/Mod_Wiki.php:61 -#: ../../extend/addon/a/wiki/Mod_Wiki.php:283 -#: ../../extend/addon/a/wiki/Mod_Wiki.php:421 +#: ../../Zotlabs/Module/Suggestions.php:31 ../../Zotlabs/Web/WebServer.php:129 +#: ../../include/photos.php:30 ../../include/attach.php:153 +#: ../../include/attach.php:200 ../../include/attach.php:273 +#: ../../include/attach.php:382 ../../include/attach.php:396 +#: ../../include/attach.php:403 ../../include/attach.php:481 +#: ../../include/attach.php:1041 ../../include/attach.php:1115 +#: ../../include/attach.php:1280 ../../include/items.php:3485 msgid "Permission denied." msgstr "" @@ -507,741 +501,6 @@ msgstr "" msgid "Room is full" msgstr "" -#: ../../Zotlabs/Lib/PermissionDescription.php:34 -#: ../../include/acl_selectors.php:33 -msgid "Visible to your default audience" -msgstr "" - -#: ../../Zotlabs/Lib/PermissionDescription.php:107 -#: ../../include/acl_selectors.php:106 -msgid "Only me" -msgstr "" - -#: ../../Zotlabs/Lib/PermissionDescription.php:108 -msgid "Public" -msgstr "" - -#: ../../Zotlabs/Lib/PermissionDescription.php:109 -msgid "Anybody in the $Projectname network" -msgstr "" - -#: ../../Zotlabs/Lib/PermissionDescription.php:110 -#, php-format -msgid "Any account on %s" -msgstr "" - -#: ../../Zotlabs/Lib/PermissionDescription.php:111 -msgid "Any of my connections" -msgstr "" - -#: ../../Zotlabs/Lib/PermissionDescription.php:112 -msgid "Only connections I specifically allow" -msgstr "" - -#: ../../Zotlabs/Lib/PermissionDescription.php:113 -msgid "Anybody authenticated (could include visitors from other networks)" -msgstr "" - -#: ../../Zotlabs/Lib/PermissionDescription.php:114 -msgid "Any connections including those who haven't yet been approved" -msgstr "" - -#: ../../Zotlabs/Lib/PermissionDescription.php:150 -msgid "" -"This is your default setting for the audience of your normal stream, and " -"posts." -msgstr "" - -#: ../../Zotlabs/Lib/PermissionDescription.php:151 -msgid "" -"This is your default setting for who can view your default channel profile" -msgstr "" - -#: ../../Zotlabs/Lib/PermissionDescription.php:152 -msgid "This is your default setting for who can view your connections" -msgstr "" - -#: ../../Zotlabs/Lib/PermissionDescription.php:153 -msgid "" -"This is your default setting for who can view your file storage and photos" -msgstr "" - -#: ../../Zotlabs/Lib/PermissionDescription.php:154 -msgid "This is your default setting for the audience of your webpages" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:315 -msgid "Apps" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:316 ../../Zotlabs/Module/Settings/Network.php:100 -#: ../../include/features.php:430 -msgid "Affinity Tool" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:317 ../../include/features.php:136 -#: ../../include/nav.php:484 ../../extend/addon/a/articles/Mod_Articles.php:46 -#: ../../extend/addon/a/articles/Mod_Articles.php:214 -msgid "Articles" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:318 ../../Zotlabs/Module/Cards.php:204 -#: ../../include/conversation.php:1971 ../../include/nav.php:473 -msgid "Cards" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:319 ../../Zotlabs/Storage/Browser.php:140 -#: ../../include/nav.php:435 ../../include/nav.php:438 -msgid "Calendar" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:320 ../../Zotlabs/Module/Cdav.php:1066 -#: ../../Zotlabs/Widget/Appcategories.php:43 -#: ../../Zotlabs/Widget/Categories.php:75 -#: ../../Zotlabs/Widget/Categories.php:119 -#: ../../Zotlabs/Widget/Categories.php:166 ../../include/taxonomy.php:419 -#: ../../include/taxonomy.php:505 ../../include/taxonomy.php:525 -#: ../../include/taxonomy.php:546 -msgid "Categories" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:321 -msgid "Site Admin" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:322 -msgid "Content Filter" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:323 ../../Zotlabs/Lib/Apps.php:327 -#: ../../extend/addon/a/content_import/Mod_content_import.php:135 -msgid "Content Import" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:324 -msgid "Report Bug" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:325 -msgid "View Bookmarks" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:326 ../../Zotlabs/Widget/Chatroom_list.php:16 -#: ../../include/conversation.php:1945 ../../include/conversation.php:1948 -#: ../../include/nav.php:449 ../../include/nav.php:452 -msgid "Chatrooms" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:328 ../../Zotlabs/Module/Connections.php:297 -#: ../../Zotlabs/Module/Connedit.php:654 ../../Zotlabs/Module/Affinity.php:62 -#: ../../Zotlabs/Widget/Affinity.php:28 ../../include/connections.php:868 -msgid "Connections" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:329 -msgid "Expire Posts" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:330 -msgid "Remote Diagnostics" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:331 ../../Zotlabs/Module/Settings/Network.php:108 -#: ../../include/features.php:439 -msgid "Suggest Channels" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:332 ../../include/nav.php:113 -#: ../../include/nav.php:117 ../../boot.php:1626 -msgid "Login" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:333 -msgid "Channel Manager" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:334 ../../Zotlabs/Lib/Apps.php:374 -#: ../../Zotlabs/Widget/Notes.php:20 -msgid "Notes" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:335 -msgid "Stream" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:336 ../../Zotlabs/Module/Admin/Themes.php:125 -#: ../../Zotlabs/Module/Admin/Addons.php:342 -#: ../../Zotlabs/Widget/Newmember.php:46 -#: ../../Zotlabs/Widget/Settings_menu.php:119 ../../include/nav.php:92 -msgid "Settings" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:337 ../../Zotlabs/Module/Fbrowser.php:82 -#: ../../Zotlabs/Storage/Browser.php:278 ../../include/conversation.php:1920 -#: ../../include/nav.php:424 -msgid "Files" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:338 ../../Zotlabs/Module/Webpages.php:253 -#: ../../include/conversation.php:1993 ../../include/nav.php:496 -msgid "Webpages" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:339 ../../include/conversation.php:2009 -#: ../../include/nav.php:511 -msgid "Wiki" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:340 -msgid "Channel Home" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:341 ../../Zotlabs/Module/Connedit.php:535 -#: ../../include/nav.php:101 -msgid "View Profile" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:342 ../../Zotlabs/Module/Fbrowser.php:26 -#: ../../include/conversation.php:1912 ../../include/nav.php:416 -msgid "Photos" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:343 -msgid "Photomap" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:344 ../../Zotlabs/Widget/Activity_filter.php:53 -#: ../../include/conversation.php:1931 ../../include/conversation.php:1934 -msgid "Events" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:345 ../../Zotlabs/Widget/Tasklist.php:26 -msgid "Tasks" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:346 -msgid "No Comment" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:347 -msgid "Directory" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:348 ../../include/help.php:69 -#: ../../include/nav.php:163 ../../include/nav.php:298 -msgid "Help" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:349 -msgid "Mail" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:350 ../../Zotlabs/Module/Mood.php:152 -msgid "Mood" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:351 ../../Zotlabs/Module/Poke.php:197 -msgid "Poke" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:352 -msgid "Chat" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:353 ../../Zotlabs/Module/Connections.php:301 -#: ../../Zotlabs/Module/Search.php:45 ../../Zotlabs/Widget/Sitesearch.php:31 -#: ../../include/acl_selectors.php:118 ../../include/nav.php:178 -#: ../../include/text.php:941 ../../include/text.php:953 -msgid "Search" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:354 ../../Zotlabs/Widget/Stream_order.php:129 -msgid "Stream Order" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:355 -msgid "Probe" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:356 -msgid "Suggest" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:357 -msgid "Random Channel" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:358 -msgid "Invite" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:359 -msgid "Features" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:360 -msgid "Language" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:361 -msgid "Post" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:362 -#: ../../extend/addon/a/zotpost/Mod_zotpost.php:51 -msgid "ZotPost" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:363 -msgid "Profile Photo" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:364 ../../Zotlabs/Lib/Libprofile.php:534 -#: ../../Zotlabs/Lib/Activity.php:1898 ../../Zotlabs/Lib/Activity.php:1901 -#: ../../Zotlabs/Module/Profperm.php:117 -msgid "Profile" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:365 -msgid "Profiles" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:366 ../../Zotlabs/Lib/AccessList.php:337 -#: ../../Zotlabs/Module/Alist.php:113 ../../Zotlabs/Module/Alist.php:124 -#: ../../Zotlabs/Widget/Activity_filter.php:97 ../../include/nav.php:90 -msgid "Access Lists" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:367 -msgid "Notifications" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:368 -msgid "Order Apps" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:369 -msgid "CalDAV" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:370 -msgid "CardDAV" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:371 ../../Zotlabs/Module/Sources.php:99 -#: ../../Zotlabs/Widget/Settings_menu.php:111 -msgid "Channel Sources" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:372 -msgid "Gallery" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:373 -msgid "Guest Access" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:375 -msgid "OAuth Apps Manager" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:376 -msgid "OAuth2 Apps Manager" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:377 -msgid "PDL Editor" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:378 -#: ../../Zotlabs/Module/Settings/Permcats.php:100 -#: ../../Zotlabs/Widget/Settings_menu.php:94 -msgid "Permission Categories" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:379 -msgid "Premium Channel" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:380 ../../Zotlabs/Module/Pubstream.php:99 -#: ../../Zotlabs/Widget/Notifications.php:143 -msgid "Public Stream" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:381 -msgid "My Chatrooms" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:556 ../../Zotlabs/Module/Admin/Addons.php:451 -#: ../../Zotlabs/Module/Cdav.php:1050 ../../Zotlabs/Module/Cdav.php:1365 -#: ../../Zotlabs/Module/Connedit.php:851 ../../Zotlabs/Module/Profiles.php:800 -#: ../../Zotlabs/Module/Settings/Oauth.php:43 -#: ../../Zotlabs/Module/Settings/Oauth.php:114 -#: ../../Zotlabs/Module/Settings/Oauth2.php:49 -#: ../../Zotlabs/Module/Settings/Oauth2.php:123 -msgid "Update" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:556 ../../Zotlabs/Module/Admin/Addons.php:420 -msgid "Install" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:573 -msgid "Purchase" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:576 ../../Zotlabs/Lib/Libprofile.php:181 -#: ../../Zotlabs/Lib/Libprofile.php:185 ../../Zotlabs/Lib/ThreadItem.php:168 -#: ../../Zotlabs/Module/Alist.php:216 ../../Zotlabs/Module/Admin/Profs.php:175 -#: ../../Zotlabs/Module/Blocks.php:164 ../../Zotlabs/Module/Connections.php:246 -#: ../../Zotlabs/Module/Connections.php:285 -#: ../../Zotlabs/Module/Connections.php:305 -#: ../../Zotlabs/Module/Editlayout.php:118 -#: ../../Zotlabs/Module/Editwebpage.php:146 ../../Zotlabs/Module/Thing.php:273 -#: ../../Zotlabs/Module/Layouts.php:199 ../../Zotlabs/Module/Card_edit.php:101 -#: ../../Zotlabs/Module/Editblock.php:118 ../../Zotlabs/Module/Menu.php:178 -#: ../../Zotlabs/Module/Webpages.php:256 -#: ../../Zotlabs/Module/Settings/Oauth.php:150 -#: ../../Zotlabs/Module/Settings/Oauth2.php:173 -#: ../../Zotlabs/Storage/Browser.php:296 ../../Zotlabs/Widget/Cdav.php:138 -#: ../../Zotlabs/Widget/Cdav.php:175 ../../include/menu.php:121 -#: ../../extend/addon/a/articles/Mod_Article_edit.php:101 -#: ../../extend/addon/a/wiki/Mod_Wiki.php:212 -#: ../../extend/addon/a/wiki/Mod_Wiki.php:377 -msgid "Edit" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:577 ../../Zotlabs/Lib/ThreadItem.php:192 -#: ../../Zotlabs/Module/Admin/Profs.php:176 -#: ../../Zotlabs/Module/Admin/Accounts.php:175 -#: ../../Zotlabs/Module/Admin/Channels.php:151 -#: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Cdav.php:1053 -#: ../../Zotlabs/Module/Cdav.php:1366 ../../Zotlabs/Module/Connections.php:254 -#: ../../Zotlabs/Module/Editlayout.php:142 -#: ../../Zotlabs/Module/Editwebpage.php:171 ../../Zotlabs/Module/Thing.php:274 -#: ../../Zotlabs/Module/Card_edit.php:131 -#: ../../Zotlabs/Module/Editblock.php:143 ../../Zotlabs/Module/Connedit.php:595 -#: ../../Zotlabs/Module/Connedit.php:852 ../../Zotlabs/Module/Webpages.php:258 -#: ../../Zotlabs/Module/Profiles.php:801 ../../Zotlabs/Module/Photos.php:1190 -#: ../../Zotlabs/Module/Settings/Oauth.php:151 -#: ../../Zotlabs/Module/Settings/Oauth2.php:174 -#: ../../Zotlabs/Storage/Browser.php:297 ../../include/conversation.php:678 -#: ../../include/conversation.php:723 -#: ../../extend/addon/a/articles/Mod_Article_edit.php:133 -msgid "Delete" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:578 -msgid "Undelete" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:587 -msgid "Add to app-tray" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:588 -msgid "Remove from app-tray" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:589 -msgid "Pin to navbar" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:590 -msgid "Unpin from navbar" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:1075 ../../Zotlabs/Lib/Apps.php:1161 -#: ../../Zotlabs/Lib/Activity.php:1332 ../../Zotlabs/Module/Cdav.php:853 -#: ../../Zotlabs/Module/Cdav.php:854 ../../Zotlabs/Module/Cdav.php:861 -#: ../../Zotlabs/Module/Embedphotos.php:183 ../../Zotlabs/Module/Photos.php:809 -#: ../../Zotlabs/Module/Photos.php:1256 ../../Zotlabs/Storage/Browser.php:164 -#: ../../Zotlabs/Widget/Album.php:84 ../../Zotlabs/Widget/Portfolio.php:95 -#: ../../include/conversation.php:1117 -msgid "Unknown" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:35 -msgid "Requested channel is not available." -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:82 ../../Zotlabs/Module/Cards.php:38 -#: ../../Zotlabs/Module/Blocks.php:37 ../../Zotlabs/Module/Connect.php:19 -#: ../../Zotlabs/Module/Editlayout.php:35 -#: ../../Zotlabs/Module/Editwebpage.php:36 -#: ../../Zotlabs/Module/Filestorage.php:54 ../../Zotlabs/Module/Hcard.php:15 -#: ../../Zotlabs/Module/Layouts.php:37 ../../Zotlabs/Module/Editblock.php:35 -#: ../../Zotlabs/Module/Menu.php:94 ../../Zotlabs/Module/Webpages.php:40 -#: ../../Zotlabs/Module/Profile.php:27 -#: ../../extend/addon/a/articles/Mod_Articles.php:35 -msgid "Requested profile is not available." -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:174 ../../Zotlabs/Module/Profiles.php:728 -msgid "Change profile photo" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:181 ../../Zotlabs/Module/Profiles.php:831 -#: ../../include/nav.php:104 -msgid "Edit Profiles" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:182 -msgid "Create New Profile" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:185 ../../include/nav.php:106 -msgid "Edit Profile" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:200 ../../Zotlabs/Module/Profiles.php:821 -msgid "Profile Image" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:203 -msgid "Visible to everybody" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:204 ../../Zotlabs/Module/Profiles.php:725 -#: ../../Zotlabs/Module/Profiles.php:825 -msgid "Edit visibility" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:262 ../../Zotlabs/Module/Directory.php:389 -#: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Widget/Suggestions.php:46 -#: ../../include/connections.php:122 ../../include/conversation.php:1036 -msgid "Connect" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:277 ../../Zotlabs/Module/Directory.php:373 -#: ../../include/event.php:62 ../../include/event.php:118 -msgid "Location:" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:281 ../../Zotlabs/Lib/Libprofile.php:413 -msgid "Gender:" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:282 ../../Zotlabs/Lib/Libprofile.php:457 -msgid "Status:" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:283 ../../Zotlabs/Lib/Libprofile.php:481 -msgid "Homepage:" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:339 -msgid "Change your profile photo" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:366 ../../Zotlabs/Module/Profiles.php:935 -#: ../../Zotlabs/Module/Profiles.php:952 -msgid "Female" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:368 ../../Zotlabs/Module/Profiles.php:935 -#: ../../Zotlabs/Module/Profiles.php:952 -msgid "Male" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:370 -msgid "Trans" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:372 -msgid "Inter" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:374 ../../Zotlabs/Module/Profiles.php:935 -msgid "Neuter" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:376 ../../Zotlabs/Module/Profiles.php:935 -msgid "Non-specific" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:411 -#: ../../Zotlabs/Module/Settings/Channel.php:540 -msgid "Full Name:" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:418 -msgid "Like this channel" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:429 ../../Zotlabs/Lib/ThreadItem.php:258 -#: ../../Zotlabs/Module/Photos.php:1146 ../../include/taxonomy.php:675 -#: ../../include/conversation.php:2059 -msgctxt "noun" -msgid "Like" -msgid_plural "Likes" -msgstr[0] "" -msgstr[1] "" - -#: ../../Zotlabs/Lib/Libprofile.php:442 -msgid "j F, Y" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:443 -msgid "j F" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:450 -msgid "Birthday:" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:454 ../../Zotlabs/Module/Directory.php:368 -msgid "Age:" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:463 -#, php-format -msgid "for %1$d %2$s" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:475 -msgid "Tags:" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:479 -msgid "Sexual Preference:" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:483 ../../Zotlabs/Module/Directory.php:386 -msgid "Hometown:" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:485 -msgid "Political Views:" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:487 -msgid "Religion:" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:489 ../../Zotlabs/Module/Directory.php:388 -msgid "About:" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:491 -msgid "Hobbies/Interests:" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:493 -msgid "Likes:" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:495 -msgid "Dislikes:" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:497 -msgid "Contact information and Social Networks:" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:499 -msgid "My other channels:" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:501 -msgid "Musical interests:" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:503 -msgid "Books, literature:" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:505 -msgid "Television:" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:507 -msgid "Film/dance/culture/entertainment:" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:509 -msgid "Love/Romance:" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:511 -msgid "Work/employment:" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:513 -msgid "School/education:" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:536 -msgid "Like this thing" -msgstr "" - -#: ../../Zotlabs/Lib/Libprofile.php:537 ../../Zotlabs/Module/Cal.php:347 -#: ../../Zotlabs/Module/Events.php:732 -msgid "Export" -msgstr "" - -#: ../../Zotlabs/Lib/DB_Upgrade.php:67 -msgid "Source code of failed update: " -msgstr "" - -#: ../../Zotlabs/Lib/DB_Upgrade.php:88 -#, php-format -msgid "Update Error at %s" -msgstr "" - -#: ../../Zotlabs/Lib/DB_Upgrade.php:94 -#, php-format -msgid "Update %s failed. See error logs." -msgstr "" - -#: ../../Zotlabs/Lib/Permcat.php:73 -msgctxt "permcat" -msgid "default" -msgstr "" - -#: ../../Zotlabs/Lib/Permcat.php:124 -msgctxt "permcat" -msgid "follower" -msgstr "" - -#: ../../Zotlabs/Lib/Permcat.php:128 -msgctxt "permcat" -msgid "contributor" -msgstr "" - -#: ../../Zotlabs/Lib/Permcat.php:132 -msgctxt "permcat" -msgid "publisher" -msgstr "" - -#: ../../Zotlabs/Lib/Connect.php:41 -msgid "Channel is blocked on this site." -msgstr "" - -#: ../../Zotlabs/Lib/Connect.php:46 -msgid "Channel location missing." -msgstr "" - -#: ../../Zotlabs/Lib/Connect.php:105 -msgid "Remote channel or protocol unavailable." -msgstr "" - -#: ../../Zotlabs/Lib/Connect.php:139 -msgid "Channel discovery failed." -msgstr "" - -#: ../../Zotlabs/Lib/Connect.php:148 -msgid "Protocol not supported" -msgstr "" - -#: ../../Zotlabs/Lib/Connect.php:157 -msgid "Cannot connect to yourself." -msgstr "" - -#: ../../Zotlabs/Lib/Connect.php:264 -msgid "error saving data" -msgstr "" - #: ../../Zotlabs/Lib/ThreadItem.php:124 ../../include/conversation.php:687 msgid "Private Message" msgstr "" @@ -1250,6 +509,43 @@ msgstr "" msgid "Privacy conflict. Discretion advised." msgstr "" +#: ../../Zotlabs/Lib/ThreadItem.php:168 ../../Zotlabs/Lib/Libprofile.php:189 +#: ../../Zotlabs/Lib/Libprofile.php:193 ../../Zotlabs/Lib/Apps.php:576 +#: ../../Zotlabs/Module/Alist.php:216 ../../Zotlabs/Module/Admin/Profs.php:175 +#: ../../Zotlabs/Module/Blocks.php:164 ../../Zotlabs/Module/Connections.php:255 +#: ../../Zotlabs/Module/Connections.php:294 +#: ../../Zotlabs/Module/Connections.php:314 +#: ../../Zotlabs/Module/Editlayout.php:118 +#: ../../Zotlabs/Module/Editwebpage.php:146 ../../Zotlabs/Module/Thing.php:273 +#: ../../Zotlabs/Module/Layouts.php:199 ../../Zotlabs/Module/Card_edit.php:101 +#: ../../Zotlabs/Module/Editblock.php:118 ../../Zotlabs/Module/Menu.php:178 +#: ../../Zotlabs/Module/Webpages.php:256 +#: ../../Zotlabs/Module/Settings/Oauth.php:150 +#: ../../Zotlabs/Module/Settings/Oauth2.php:179 +#: ../../Zotlabs/Storage/Browser.php:296 ../../Zotlabs/Widget/Cdav.php:138 +#: ../../Zotlabs/Widget/Cdav.php:175 ../../include/menu.php:121 +msgid "Edit" +msgstr "" + +#: ../../Zotlabs/Lib/ThreadItem.php:192 ../../Zotlabs/Lib/Apps.php:577 +#: ../../Zotlabs/Module/Admin/Profs.php:176 +#: ../../Zotlabs/Module/Admin/Accounts.php:175 +#: ../../Zotlabs/Module/Admin/Channels.php:151 +#: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Cdav.php:1053 +#: ../../Zotlabs/Module/Cdav.php:1366 ../../Zotlabs/Module/Connections.php:263 +#: ../../Zotlabs/Module/Editlayout.php:142 +#: ../../Zotlabs/Module/Editwebpage.php:171 ../../Zotlabs/Module/Thing.php:274 +#: ../../Zotlabs/Module/Card_edit.php:131 +#: ../../Zotlabs/Module/Editblock.php:143 ../../Zotlabs/Module/Connedit.php:604 +#: ../../Zotlabs/Module/Connedit.php:862 ../../Zotlabs/Module/Webpages.php:258 +#: ../../Zotlabs/Module/Profiles.php:796 ../../Zotlabs/Module/Photos.php:1190 +#: ../../Zotlabs/Module/Settings/Oauth.php:151 +#: ../../Zotlabs/Module/Settings/Oauth2.php:180 +#: ../../Zotlabs/Storage/Browser.php:297 ../../include/conversation.php:678 +#: ../../include/conversation.php:723 +msgid "Delete" +msgstr "" + #: ../../Zotlabs/Lib/ThreadItem.php:196 ../../Zotlabs/Storage/Browser.php:286 msgid "Admin Delete" msgstr "" @@ -1291,8 +587,17 @@ msgstr "" msgid "View all" msgstr "" +#: ../../Zotlabs/Lib/ThreadItem.php:258 ../../Zotlabs/Lib/Libprofile.php:437 +#: ../../Zotlabs/Module/Photos.php:1146 ../../include/conversation.php:1934 +#: ../../include/taxonomy.php:675 +msgctxt "noun" +msgid "Like" +msgid_plural "Likes" +msgstr[0] "" +msgstr[1] "" + #: ../../Zotlabs/Lib/ThreadItem.php:263 ../../Zotlabs/Module/Photos.php:1151 -#: ../../include/conversation.php:2062 +#: ../../include/conversation.php:1937 msgctxt "noun" msgid "Dislike" msgid_plural "Dislikes" @@ -1430,7 +735,7 @@ msgid "Dislikes" msgstr "" #: ../../Zotlabs/Lib/ThreadItem.php:477 ../../Zotlabs/Module/Photos.php:1276 -#: ../../include/acl_selectors.php:125 ../../include/conversation.php:1436 +#: ../../include/conversation.php:1436 ../../include/acl_selectors.php:125 msgid "Close" msgstr "" @@ -1443,22 +748,22 @@ msgstr "" msgid "Please wait" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:541 ../../include/js_strings.php:7 +#: ../../Zotlabs/Lib/ThreadItem.php:543 ../../include/js_strings.php:7 #, php-format msgid "%s show all" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:879 ../../Zotlabs/Module/Photos.php:1106 +#: ../../Zotlabs/Lib/ThreadItem.php:873 ../../Zotlabs/Module/Photos.php:1106 #: ../../Zotlabs/Module/Photos.php:1224 msgid "This is you" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:881 ../../Zotlabs/Module/Photos.php:1108 +#: ../../Zotlabs/Lib/ThreadItem.php:875 ../../Zotlabs/Module/Photos.php:1108 #: ../../Zotlabs/Module/Photos.php:1226 ../../include/js_strings.php:6 msgid "Comment" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:882 ../../Zotlabs/Module/Alist.php:121 +#: ../../Zotlabs/Lib/ThreadItem.php:876 ../../Zotlabs/Module/Alist.php:121 #: ../../Zotlabs/Module/Alist.php:137 #: ../../Zotlabs/Module/Admin/Features.php:66 #: ../../Zotlabs/Module/Admin/Logs.php:84 @@ -1479,23 +784,23 @@ msgstr "" #: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Chat.php:242 #: ../../Zotlabs/Module/Locs.php:124 ../../Zotlabs/Module/Import_items.php:125 #: ../../Zotlabs/Module/Mitem.php:263 ../../Zotlabs/Module/Finger.php:22 -#: ../../Zotlabs/Module/Pconfig.php:120 ../../Zotlabs/Module/Connedit.php:816 -#: ../../Zotlabs/Module/Pdledit.php:111 ../../Zotlabs/Module/Profiles.php:723 +#: ../../Zotlabs/Module/Pconfig.php:120 ../../Zotlabs/Module/Connedit.php:826 +#: ../../Zotlabs/Module/Pdledit.php:111 ../../Zotlabs/Module/Profiles.php:718 #: ../../Zotlabs/Module/Setup.php:321 ../../Zotlabs/Module/Setup.php:364 #: ../../Zotlabs/Module/Photos.php:1069 ../../Zotlabs/Module/Photos.php:1109 #: ../../Zotlabs/Module/Photos.php:1227 ../../Zotlabs/Module/Poke.php:215 -#: ../../Zotlabs/Module/Mood.php:156 ../../Zotlabs/Module/Events.php:526 +#: ../../Zotlabs/Module/Mood.php:156 ../../Zotlabs/Module/Events.php:525 #: ../../Zotlabs/Module/Affinity.php:83 ../../Zotlabs/Module/Ap_probe.php:21 #: ../../Zotlabs/Module/Settings/Account.php:104 #: ../../Zotlabs/Module/Settings/Featured.php:56 #: ../../Zotlabs/Module/Settings/Network.php:41 #: ../../Zotlabs/Module/Settings/Oauth.php:88 -#: ../../Zotlabs/Module/Settings/Oauth2.php:95 #: ../../Zotlabs/Module/Settings/Permcats.php:116 #: ../../Zotlabs/Module/Settings/Display.php:183 #: ../../Zotlabs/Module/Settings/Tokens.php:170 #: ../../Zotlabs/Module/Settings/Features.php:59 -#: ../../Zotlabs/Module/Settings/Channel.php:534 +#: ../../Zotlabs/Module/Settings/Oauth2.php:99 +#: ../../Zotlabs/Module/Settings/Channel.php:531 #: ../../Zotlabs/Module/Sources.php:117 ../../Zotlabs/Module/Sources.php:154 #: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Module/Content_filter.php:66 #: ../../Zotlabs/Module/Zotfinger.php:25 @@ -1504,80 +809,496 @@ msgstr "" #: ../../extend/addon/a/logrot/logrot.php:36 #: ../../extend/addon/a/nsfw/Mod_Nsfw.php:50 #: ../../extend/addon/a/superblock/Mod_Superblock.php:114 -#: ../../extend/addon/a/wiki/Wiki_pages.php:41 -#: ../../extend/addon/a/wiki/Wiki_pages.php:98 -#: ../../extend/addon/a/wiki/Mod_Wiki.php:216 -#: ../../extend/addon/a/zotpost/Mod_zotpost.php:79 +#: ../../extend/addon/a/zotpost/Mod_zotpost.php:81 #: ../../extend/addon/a/content_import/Mod_content_import.php:142 #: ../../extend/addon/a/openstreetmap/openstreetmap.php:169 msgid "Submit" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:883 +#: ../../Zotlabs/Lib/ThreadItem.php:877 msgid "Add Conversation Mentions" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:884 ../../include/conversation.php:1371 +#: ../../Zotlabs/Lib/ThreadItem.php:878 ../../include/conversation.php:1371 msgid "Bold" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:885 ../../include/conversation.php:1372 +#: ../../Zotlabs/Lib/ThreadItem.php:879 ../../include/conversation.php:1372 msgid "Italic" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:886 ../../include/conversation.php:1373 +#: ../../Zotlabs/Lib/ThreadItem.php:880 ../../include/conversation.php:1373 msgid "Underline" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:887 ../../include/conversation.php:1374 +#: ../../Zotlabs/Lib/ThreadItem.php:881 ../../include/conversation.php:1374 msgid "Quote" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:888 ../../include/conversation.php:1375 +#: ../../Zotlabs/Lib/ThreadItem.php:882 ../../include/conversation.php:1375 msgid "Code" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:889 +#: ../../Zotlabs/Lib/ThreadItem.php:883 msgid "Image" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:890 ../../include/conversation.php:1376 +#: ../../Zotlabs/Lib/ThreadItem.php:884 ../../include/conversation.php:1376 msgid "Attach/Upload file" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:891 +#: ../../Zotlabs/Lib/ThreadItem.php:885 msgid "Insert Link" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:892 +#: ../../Zotlabs/Lib/ThreadItem.php:886 msgid "Video" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:893 ../../Zotlabs/Module/Webpages.php:263 -#: ../../Zotlabs/Module/Photos.php:1110 ../../Zotlabs/Module/Events.php:511 +#: ../../Zotlabs/Lib/ThreadItem.php:887 ../../Zotlabs/Module/Webpages.php:263 +#: ../../Zotlabs/Module/Photos.php:1110 ../../Zotlabs/Module/Events.php:510 #: ../../include/conversation.php:1313 msgid "Preview" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:897 ../../Zotlabs/Module/Chat.php:213 +#: ../../Zotlabs/Lib/ThreadItem.php:891 ../../Zotlabs/Module/Chat.php:213 #: ../../include/conversation.php:1430 msgid "Encrypt text" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:902 +#: ../../Zotlabs/Lib/ThreadItem.php:896 msgid "Your full name (required)" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:903 +#: ../../Zotlabs/Lib/ThreadItem.php:897 msgid "Your email address (required)" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:904 +#: ../../Zotlabs/Lib/ThreadItem.php:898 msgid "Your website URL (optional)" msgstr "" +#: ../../Zotlabs/Lib/PermissionDescription.php:34 +#: ../../include/acl_selectors.php:33 +msgid "Visible to your default audience" +msgstr "" + +#: ../../Zotlabs/Lib/PermissionDescription.php:107 +#: ../../include/acl_selectors.php:106 +msgid "Only me" +msgstr "" + +#: ../../Zotlabs/Lib/PermissionDescription.php:108 +msgid "Public" +msgstr "" + +#: ../../Zotlabs/Lib/PermissionDescription.php:109 +msgid "Anybody in the $Projectname network" +msgstr "" + +#: ../../Zotlabs/Lib/PermissionDescription.php:110 +#, php-format +msgid "Any account on %s" +msgstr "" + +#: ../../Zotlabs/Lib/PermissionDescription.php:111 +msgid "Any of my connections" +msgstr "" + +#: ../../Zotlabs/Lib/PermissionDescription.php:112 +msgid "Only connections I specifically allow" +msgstr "" + +#: ../../Zotlabs/Lib/PermissionDescription.php:113 +msgid "Anybody authenticated (could include visitors from other networks)" +msgstr "" + +#: ../../Zotlabs/Lib/PermissionDescription.php:114 +msgid "Any connections including those who haven't yet been approved" +msgstr "" + +#: ../../Zotlabs/Lib/PermissionDescription.php:150 +msgid "" +"This is your default setting for the audience of your normal stream, and " +"posts." +msgstr "" + +#: ../../Zotlabs/Lib/PermissionDescription.php:151 +msgid "" +"This is your default setting for who can view your default channel profile" +msgstr "" + +#: ../../Zotlabs/Lib/PermissionDescription.php:152 +msgid "This is your default setting for who can view your connections" +msgstr "" + +#: ../../Zotlabs/Lib/PermissionDescription.php:153 +msgid "" +"This is your default setting for who can view your file storage and photos" +msgstr "" + +#: ../../Zotlabs/Lib/PermissionDescription.php:154 +msgid "This is your default setting for the audience of your webpages" +msgstr "" + +#: ../../Zotlabs/Lib/Connect.php:41 ../../Zotlabs/Lib/Connect.php:145 +msgid "Channel is blocked on this site." +msgstr "" + +#: ../../Zotlabs/Lib/Connect.php:46 +msgid "Channel location missing." +msgstr "" + +#: ../../Zotlabs/Lib/Connect.php:105 +msgid "Remote channel or protocol unavailable." +msgstr "" + +#: ../../Zotlabs/Lib/Connect.php:139 +msgid "Channel discovery failed." +msgstr "" + +#: ../../Zotlabs/Lib/Connect.php:154 +msgid "Protocol not supported" +msgstr "" + +#: ../../Zotlabs/Lib/Connect.php:163 +msgid "Cannot connect to yourself." +msgstr "" + +#: ../../Zotlabs/Lib/Connect.php:270 +msgid "error saving data" +msgstr "" + +#: ../../Zotlabs/Lib/DB_Upgrade.php:67 +msgid "Source code of failed update: " +msgstr "" + +#: ../../Zotlabs/Lib/DB_Upgrade.php:88 +#, php-format +msgid "Update Error at %s" +msgstr "" + +#: ../../Zotlabs/Lib/DB_Upgrade.php:94 +#, php-format +msgid "Update %s failed. See error logs." +msgstr "" + +#: ../../Zotlabs/Lib/Permcat.php:73 +msgctxt "permcat" +msgid "default" +msgstr "" + +#: ../../Zotlabs/Lib/Permcat.php:124 +msgctxt "permcat" +msgid "follower" +msgstr "" + +#: ../../Zotlabs/Lib/Permcat.php:128 +msgctxt "permcat" +msgid "contributor" +msgstr "" + +#: ../../Zotlabs/Lib/Permcat.php:132 +msgctxt "permcat" +msgid "publisher" +msgstr "" + +#: ../../Zotlabs/Lib/Libzot.php:698 +msgid "Unable to verify channel signature" +msgstr "" + +#: ../../Zotlabs/Lib/Activity.php:1372 ../../Zotlabs/Lib/Apps.php:1075 +#: ../../Zotlabs/Lib/Apps.php:1161 ../../Zotlabs/Module/Cdav.php:853 +#: ../../Zotlabs/Module/Cdav.php:854 ../../Zotlabs/Module/Cdav.php:861 +#: ../../Zotlabs/Module/Embedphotos.php:183 ../../Zotlabs/Module/Photos.php:809 +#: ../../Zotlabs/Module/Photos.php:1256 ../../Zotlabs/Storage/Browser.php:164 +#: ../../Zotlabs/Widget/Album.php:84 ../../Zotlabs/Widget/Portfolio.php:95 +#: ../../include/conversation.php:1117 +msgid "Unknown" +msgstr "" + +#: ../../Zotlabs/Lib/Activity.php:1939 +#, php-format +msgid "Likes %1$s's %2$s" +msgstr "" + +#: ../../Zotlabs/Lib/Activity.php:1939 ../../Zotlabs/Lib/Activity.php:1942 +#: ../../Zotlabs/Lib/Libprofile.php:542 ../../Zotlabs/Lib/Apps.php:364 +#: ../../Zotlabs/Module/Profperm.php:117 +msgid "Profile" +msgstr "" + +#: ../../Zotlabs/Lib/Activity.php:1942 +#, php-format +msgid "Doesn't like %1$s's %2$s" +msgstr "" + +#: ../../Zotlabs/Lib/Activity.php:1945 +#, php-format +msgid "Will attend %1$s's %2$s" +msgstr "" + +#: ../../Zotlabs/Lib/Activity.php:1948 +#, php-format +msgid "Will not attend %1$s's %2$s" +msgstr "" + +#: ../../Zotlabs/Lib/Activity.php:1951 +#, php-format +msgid "May attend %1$s's %2$s" +msgstr "" + +#: ../../Zotlabs/Lib/Activity.php:1954 +#, php-format +msgid "May not attend %1$s's %2$s" +msgstr "" + +#: ../../Zotlabs/Lib/Activity.php:1957 ../../Zotlabs/Module/Share.php:102 +#: ../../include/items.php:2906 +#, php-format +msgid "🔁 Repeated %1$s's %2$s" +msgstr "" + +#: ../../Zotlabs/Lib/Activity.php:2590 ../../Zotlabs/Lib/Activity.php:2785 +#: ../../include/network.php:1909 +msgid "ActivityPub" +msgstr "" + +#: ../../Zotlabs/Lib/Activity.php:2741 ../../Zotlabs/Module/Like.php:340 +#: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Tagger.php:71 +#: ../../include/conversation.php:115 ../../include/text.php:1918 +msgid "photo" +msgstr "" + +#: ../../Zotlabs/Lib/Activity.php:2741 ../../Zotlabs/Module/Like.php:340 +#: ../../Zotlabs/Module/Subthread.php:111 ../../include/conversation.php:143 +#: ../../include/text.php:1924 +msgid "status" +msgstr "" + +#: ../../Zotlabs/Lib/Activity.php:2776 ../../Zotlabs/Module/Like.php:382 +#: ../../include/conversation.php:159 +#, php-format +msgid "%1$s likes %2$s's %3$s" +msgstr "" + +#: ../../Zotlabs/Lib/Activity.php:2778 ../../Zotlabs/Module/Like.php:384 +#: ../../include/conversation.php:162 +#, php-format +msgid "%1$s doesn't like %2$s's %3$s" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:35 +msgid "Requested channel is not available." +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:90 ../../Zotlabs/Module/Cards.php:38 +#: ../../Zotlabs/Module/Blocks.php:37 ../../Zotlabs/Module/Connect.php:19 +#: ../../Zotlabs/Module/Editlayout.php:35 +#: ../../Zotlabs/Module/Editwebpage.php:36 +#: ../../Zotlabs/Module/Filestorage.php:54 ../../Zotlabs/Module/Hcard.php:15 +#: ../../Zotlabs/Module/Layouts.php:37 ../../Zotlabs/Module/Editblock.php:35 +#: ../../Zotlabs/Module/Menu.php:94 ../../Zotlabs/Module/Webpages.php:40 +#: ../../Zotlabs/Module/Profile.php:27 +msgid "Requested profile is not available." +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:182 ../../Zotlabs/Module/Profiles.php:723 +msgid "Change profile photo" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:189 ../../Zotlabs/Module/Profiles.php:826 +#: ../../include/nav.php:106 +msgid "Edit Profiles" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:190 +msgid "Create New Profile" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:193 ../../include/nav.php:108 +msgid "Edit Profile" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:208 ../../Zotlabs/Module/Profiles.php:816 +msgid "Profile Image" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:211 +msgid "Visible to everybody" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:212 ../../Zotlabs/Module/Profiles.php:720 +#: ../../Zotlabs/Module/Profiles.php:820 +msgid "Edit visibility" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:270 ../../Zotlabs/Module/Directory.php:392 +#: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Widget/Suggestions.php:47 +#: ../../include/connections.php:132 ../../include/conversation.php:1036 +msgid "Connect" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:285 ../../Zotlabs/Module/Directory.php:376 +#: ../../include/event.php:62 ../../include/event.php:118 +msgid "Location:" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:289 ../../Zotlabs/Lib/Libprofile.php:421 +msgid "Gender:" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:290 ../../Zotlabs/Lib/Libprofile.php:465 +msgid "Status:" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:291 ../../Zotlabs/Lib/Libprofile.php:489 +msgid "Homepage:" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:347 +msgid "Change your profile photo" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:374 ../../Zotlabs/Module/Profiles.php:930 +#: ../../Zotlabs/Module/Profiles.php:947 +msgid "Female" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:376 ../../Zotlabs/Module/Profiles.php:930 +#: ../../Zotlabs/Module/Profiles.php:947 +msgid "Male" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:378 +msgid "Trans" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:380 +msgid "Inter" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:382 ../../Zotlabs/Module/Profiles.php:930 +msgid "Neuter" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:384 ../../Zotlabs/Module/Profiles.php:930 +msgid "Non-specific" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:419 +#: ../../Zotlabs/Module/Settings/Channel.php:537 +msgid "Full Name:" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:426 +msgid "Like this channel" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:450 +msgid "j F, Y" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:451 +msgid "j F" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:458 +msgid "Birthday:" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:462 ../../Zotlabs/Module/Directory.php:371 +msgid "Age:" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:471 +#, php-format +msgid "for %1$d %2$s" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:483 +msgid "Tags:" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:487 +msgid "Sexual Preference:" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:491 ../../Zotlabs/Module/Directory.php:389 +msgid "Hometown:" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:493 +msgid "Political Views:" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:495 +msgid "Religion:" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:497 ../../Zotlabs/Module/Directory.php:391 +msgid "About:" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:499 +msgid "Hobbies/Interests:" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:501 +msgid "Likes:" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:503 +msgid "Dislikes:" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:505 +msgid "Contact information and Social Networks:" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:507 +msgid "My other channels:" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:509 +msgid "Musical interests:" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:511 +msgid "Books, literature:" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:513 +msgid "Television:" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:515 +msgid "Film/dance/culture/entertainment:" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:517 +msgid "Love/Romance:" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:519 +msgid "Work/employment:" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:521 +msgid "School/education:" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:544 +msgid "Like this thing" +msgstr "" + +#: ../../Zotlabs/Lib/Libprofile.php:545 ../../Zotlabs/Module/Cal.php:347 +#: ../../Zotlabs/Module/Events.php:731 +msgid "Export" +msgstr "" + #: ../../Zotlabs/Lib/Language.php:408 ../../include/language.php:388 -#: ../../include/text.php:1722 +#: ../../include/text.php:1762 msgid "default" msgstr "" @@ -1600,6 +1321,12 @@ msgstr "" msgid "edit" msgstr "" +#: ../../Zotlabs/Lib/AccessList.php:337 ../../Zotlabs/Lib/Apps.php:366 +#: ../../Zotlabs/Module/Alist.php:113 ../../Zotlabs/Module/Alist.php:124 +#: ../../Zotlabs/Widget/Activity_filter.php:97 ../../include/nav.php:90 +msgid "Access Lists" +msgstr "" + #: ../../Zotlabs/Lib/AccessList.php:338 msgid "Edit list" msgstr "" @@ -1616,69 +1343,330 @@ msgstr "" msgid "add" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:1898 -#, php-format -msgid "Likes %1$s's %2$s" +#: ../../Zotlabs/Lib/Apps.php:315 +msgid "Apps" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:1901 -#, php-format -msgid "Doesn't like %1$s's %2$s" +#: ../../Zotlabs/Lib/Apps.php:316 ../../Zotlabs/Module/Connedit.php:652 +msgid "Friend Zoom" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:1904 -#, php-format -msgid "Will attend %1$s's %2$s" +#: ../../Zotlabs/Lib/Apps.php:317 ../../include/features.php:136 +#: ../../include/nav.php:478 +msgid "Articles" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:1907 -#, php-format -msgid "Will not attend %1$s's %2$s" +#: ../../Zotlabs/Lib/Apps.php:318 ../../Zotlabs/Module/Cards.php:204 +#: ../../include/conversation.php:1846 ../../include/nav.php:467 +msgid "Cards" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:1910 -#, php-format -msgid "May attend %1$s's %2$s" +#: ../../Zotlabs/Lib/Apps.php:319 ../../Zotlabs/Storage/Browser.php:140 +#: ../../include/nav.php:429 ../../include/nav.php:432 +msgid "Calendar" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:1913 -#, php-format -msgid "May not attend %1$s's %2$s" +#: ../../Zotlabs/Lib/Apps.php:320 ../../Zotlabs/Module/Cdav.php:1066 +#: ../../Zotlabs/Widget/Appcategories.php:43 +#: ../../Zotlabs/Widget/Categories.php:75 +#: ../../Zotlabs/Widget/Categories.php:119 +#: ../../Zotlabs/Widget/Categories.php:166 ../../include/taxonomy.php:419 +#: ../../include/taxonomy.php:505 ../../include/taxonomy.php:525 +#: ../../include/taxonomy.php:546 +msgid "Categories" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:1916 ../../Zotlabs/Module/Share.php:102 -#: ../../include/items.php:2900 -#, php-format -msgid "🔁 Repeated %1$s's %2$s" +#: ../../Zotlabs/Lib/Apps.php:321 +msgid "Site Admin" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2534 ../../Zotlabs/Lib/Activity.php:2729 -#: ../../include/network.php:1946 -msgid "ActivityPub" +#: ../../Zotlabs/Lib/Apps.php:322 +msgid "Content Filter" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2685 ../../Zotlabs/Module/Like.php:340 -#: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Tagger.php:71 -#: ../../include/conversation.php:115 ../../include/text.php:1878 -msgid "photo" +#: ../../Zotlabs/Lib/Apps.php:323 ../../Zotlabs/Lib/Apps.php:327 +#: ../../extend/addon/a/content_import/Mod_content_import.php:135 +msgid "Content Import" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2685 ../../Zotlabs/Module/Like.php:340 -#: ../../Zotlabs/Module/Subthread.php:111 ../../include/conversation.php:143 -#: ../../include/text.php:1884 -msgid "status" +#: ../../Zotlabs/Lib/Apps.php:324 +msgid "Report Bug" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2720 ../../Zotlabs/Module/Like.php:382 -#: ../../include/conversation.php:159 -#, php-format -msgid "%1$s likes %2$s's %3$s" +#: ../../Zotlabs/Lib/Apps.php:325 +msgid "View Bookmarks" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2722 ../../Zotlabs/Module/Like.php:384 -#: ../../include/conversation.php:162 -#, php-format -msgid "%1$s doesn't like %2$s's %3$s" +#: ../../Zotlabs/Lib/Apps.php:326 ../../Zotlabs/Widget/Chatroom_list.php:16 +#: ../../include/conversation.php:1820 ../../include/conversation.php:1823 +#: ../../include/nav.php:443 ../../include/nav.php:446 +msgid "Chatrooms" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:328 ../../Zotlabs/Module/Connections.php:306 +#: ../../Zotlabs/Module/Connedit.php:663 ../../Zotlabs/Module/Affinity.php:62 +#: ../../Zotlabs/Widget/Affinity.php:28 ../../include/connections.php:888 +msgid "Connections" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:329 +msgid "Expire Posts" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:330 +msgid "Remote Diagnostics" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:331 ../../Zotlabs/Module/Settings/Network.php:108 +#: ../../include/features.php:439 +msgid "Suggest Channels" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:332 ../../include/nav.php:115 +#: ../../include/nav.php:119 ../../boot.php:1632 +msgid "Login" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:333 +msgid "Channel Manager" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:334 ../../Zotlabs/Lib/Apps.php:374 +#: ../../Zotlabs/Widget/Notes.php:20 +msgid "Notes" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:335 +msgid "Stream" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:336 ../../Zotlabs/Module/Admin/Themes.php:125 +#: ../../Zotlabs/Module/Admin/Addons.php:342 +#: ../../Zotlabs/Widget/Settings_menu.php:119 +#: ../../Zotlabs/Widget/Newmember.php:51 ../../include/nav.php:92 +msgid "Settings" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:337 ../../Zotlabs/Module/Fbrowser.php:82 +#: ../../Zotlabs/Storage/Browser.php:278 ../../include/conversation.php:1795 +#: ../../include/nav.php:418 +msgid "Files" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:338 ../../Zotlabs/Module/Webpages.php:253 +#: ../../include/conversation.php:1868 ../../include/nav.php:490 +msgid "Webpages" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:339 ../../include/conversation.php:1884 +#: ../../include/nav.php:505 +msgid "Wiki" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:340 +msgid "Channel Home" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:341 ../../Zotlabs/Module/Connedit.php:536 +#: ../../include/nav.php:103 +msgid "View Profile" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:342 ../../Zotlabs/Module/Fbrowser.php:26 +#: ../../include/conversation.php:1787 ../../include/nav.php:410 +msgid "Photos" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:343 +msgid "Photomap" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:344 ../../Zotlabs/Widget/Activity_filter.php:53 +#: ../../include/conversation.php:1806 ../../include/conversation.php:1809 +msgid "Events" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:345 ../../Zotlabs/Widget/Tasklist.php:26 +msgid "Tasks" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:346 +msgid "No Comment" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:347 +msgid "Directory" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:348 ../../include/help.php:69 +#: ../../include/nav.php:165 ../../include/nav.php:292 +msgid "Help" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:349 +msgid "Mail" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:350 ../../Zotlabs/Module/Mood.php:152 +msgid "Mood" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:351 ../../Zotlabs/Module/Poke.php:197 +msgid "Poke" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:352 +msgid "Chat" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:353 ../../Zotlabs/Module/Connections.php:310 +#: ../../Zotlabs/Module/Search.php:45 ../../Zotlabs/Widget/Sitesearch.php:31 +#: ../../include/acl_selectors.php:118 ../../include/text.php:941 +#: ../../include/text.php:953 ../../include/nav.php:172 +msgid "Search" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:354 ../../Zotlabs/Widget/Stream_order.php:129 +msgid "Stream Order" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:355 +msgid "Probe" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:356 +msgid "Suggest" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:357 +msgid "Random Channel" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:358 +msgid "Invite" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:359 +msgid "Features" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:360 +msgid "Language" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:361 +msgid "Post" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:362 +#: ../../extend/addon/a/zotpost/Mod_zotpost.php:54 +msgid "ZotPost" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:363 +msgid "Profile Photo" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:365 +msgid "Profiles" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:367 +msgid "Notifications" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:368 +msgid "Order Apps" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:369 +msgid "CalDAV" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:370 +msgid "CardDAV" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:371 ../../Zotlabs/Module/Sources.php:99 +#: ../../Zotlabs/Widget/Settings_menu.php:111 +msgid "Channel Sources" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:372 +msgid "Gallery" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:373 +msgid "Guest Access" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:375 +msgid "OAuth Apps Manager" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:376 +msgid "OAuth2 Apps Manager" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:377 +msgid "PDL Editor" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:378 +#: ../../Zotlabs/Module/Settings/Permcats.php:100 +#: ../../Zotlabs/Widget/Settings_menu.php:94 +msgid "Permission Categories" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:379 +msgid "Premium Channel" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:380 ../../Zotlabs/Module/Pubstream.php:99 +#: ../../Zotlabs/Widget/Notifications.php:143 +msgid "Public Stream" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:381 +msgid "My Chatrooms" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:556 ../../Zotlabs/Module/Admin/Addons.php:451 +#: ../../Zotlabs/Module/Cdav.php:1050 ../../Zotlabs/Module/Cdav.php:1365 +#: ../../Zotlabs/Module/Connedit.php:861 ../../Zotlabs/Module/Profiles.php:795 +#: ../../Zotlabs/Module/Settings/Oauth.php:43 +#: ../../Zotlabs/Module/Settings/Oauth.php:114 +#: ../../Zotlabs/Module/Settings/Oauth2.php:50 +#: ../../Zotlabs/Module/Settings/Oauth2.php:128 +msgid "Update" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:556 ../../Zotlabs/Module/Admin/Addons.php:420 +msgid "Install" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:573 +msgid "Purchase" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:578 +msgid "Undelete" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:587 +msgid "Add to app-tray" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:588 +msgid "Remove from app-tray" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:589 +msgid "Pin to navbar" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:590 +msgid "Unpin from navbar" msgstr "" #: ../../Zotlabs/Lib/Libsync.php:841 @@ -1690,7 +1678,7 @@ msgstr "" msgid "Directory Options" msgstr "" -#: ../../Zotlabs/Lib/Libzotdir.php:167 +#: ../../Zotlabs/Lib/Libzotdir.php:167 ../../include/nav.php:94 msgid "Safe Mode" msgstr "" @@ -1703,22 +1691,20 @@ msgstr "" #: ../../Zotlabs/Module/Filestorage.php:207 ../../Zotlabs/Module/Mitem.php:180 #: ../../Zotlabs/Module/Mitem.php:181 ../../Zotlabs/Module/Mitem.php:260 #: ../../Zotlabs/Module/Mitem.php:261 ../../Zotlabs/Module/Menu.php:165 -#: ../../Zotlabs/Module/Menu.php:224 ../../Zotlabs/Module/Connedit.php:337 -#: ../../Zotlabs/Module/Connedit.php:712 ../../Zotlabs/Module/Profiles.php:681 -#: ../../Zotlabs/Module/Photos.php:689 ../../Zotlabs/Module/Events.php:503 -#: ../../Zotlabs/Module/Events.php:504 ../../Zotlabs/Module/Events.php:529 +#: ../../Zotlabs/Module/Menu.php:224 ../../Zotlabs/Module/Connedit.php:329 +#: ../../Zotlabs/Module/Connedit.php:721 ../../Zotlabs/Module/Profiles.php:676 +#: ../../Zotlabs/Module/Photos.php:689 ../../Zotlabs/Module/Events.php:502 +#: ../../Zotlabs/Module/Events.php:503 ../../Zotlabs/Module/Events.php:528 #: ../../Zotlabs/Module/Ap_probe.php:20 #: ../../Zotlabs/Module/Settings/Display.php:94 #: ../../Zotlabs/Module/Settings/Channel.php:335 #: ../../Zotlabs/Module/Sources.php:116 ../../Zotlabs/Module/Sources.php:151 #: ../../Zotlabs/Storage/Browser.php:411 #: ../../view/theme/redbasic/php/config.php:98 -#: ../../extend/addon/a/wiki/Mod_Wiki.php:228 -#: ../../extend/addon/a/wiki/Mod_Wiki.php:229 -#: ../../extend/addon/a/zotpost/Mod_zotpost.php:75 +#: ../../extend/addon/a/zotpost/Mod_zotpost.php:77 #: ../../extend/addon/a/content_import/Mod_content_import.php:137 #: ../../extend/addon/a/content_import/Mod_content_import.php:138 -#: ../../boot.php:1631 +#: ../../boot.php:1637 msgid "No" msgstr "" @@ -1731,21 +1717,19 @@ msgstr "" #: ../../Zotlabs/Module/Filestorage.php:207 ../../Zotlabs/Module/Mitem.php:180 #: ../../Zotlabs/Module/Mitem.php:181 ../../Zotlabs/Module/Mitem.php:260 #: ../../Zotlabs/Module/Mitem.php:261 ../../Zotlabs/Module/Menu.php:165 -#: ../../Zotlabs/Module/Menu.php:224 ../../Zotlabs/Module/Connedit.php:337 -#: ../../Zotlabs/Module/Profiles.php:681 ../../Zotlabs/Module/Photos.php:689 -#: ../../Zotlabs/Module/Events.php:503 ../../Zotlabs/Module/Events.php:504 -#: ../../Zotlabs/Module/Events.php:529 ../../Zotlabs/Module/Ap_probe.php:20 +#: ../../Zotlabs/Module/Menu.php:224 ../../Zotlabs/Module/Connedit.php:329 +#: ../../Zotlabs/Module/Profiles.php:676 ../../Zotlabs/Module/Photos.php:689 +#: ../../Zotlabs/Module/Events.php:502 ../../Zotlabs/Module/Events.php:503 +#: ../../Zotlabs/Module/Events.php:528 ../../Zotlabs/Module/Ap_probe.php:20 #: ../../Zotlabs/Module/Settings/Display.php:94 #: ../../Zotlabs/Module/Settings/Channel.php:335 #: ../../Zotlabs/Module/Sources.php:116 ../../Zotlabs/Module/Sources.php:151 #: ../../Zotlabs/Storage/Browser.php:411 #: ../../view/theme/redbasic/php/config.php:98 -#: ../../extend/addon/a/wiki/Mod_Wiki.php:228 -#: ../../extend/addon/a/wiki/Mod_Wiki.php:229 -#: ../../extend/addon/a/zotpost/Mod_zotpost.php:75 +#: ../../extend/addon/a/zotpost/Mod_zotpost.php:77 #: ../../extend/addon/a/content_import/Mod_content_import.php:137 #: ../../extend/addon/a/content_import/Mod_content_import.php:138 -#: ../../boot.php:1631 +#: ../../boot.php:1637 msgid "Yes" msgstr "" @@ -1761,10 +1745,6 @@ msgstr "" msgid "This Website Only" msgstr "" -#: ../../Zotlabs/Lib/Libzot.php:685 -msgid "Unable to verify channel signature" -msgstr "" - #: ../../Zotlabs/Module/Lockview.php:75 msgid "Remote privacy information not available." msgstr "" @@ -1774,7 +1754,7 @@ msgid "Visible to:" msgstr "" #: ../../Zotlabs/Module/Lockview.php:117 ../../Zotlabs/Module/Lockview.php:153 -#: ../../Zotlabs/Module/Acl.php:122 ../../include/acl_selectors.php:88 +#: ../../Zotlabs/Module/Acl.php:127 ../../include/acl_selectors.php:88 msgctxt "acl" msgid "Profile" msgstr "" @@ -1797,10 +1777,10 @@ msgstr "" #: ../../Zotlabs/Module/Alist.php:83 ../../Zotlabs/Module/Dreport.php:10 #: ../../Zotlabs/Module/Dreport.php:79 -#: ../../Zotlabs/Module/Import_items.php:116 ../../Zotlabs/Module/Cloud.php:128 +#: ../../Zotlabs/Module/Import_items.php:116 ../../Zotlabs/Module/Cloud.php:121 #: ../../Zotlabs/Module/Share.php:69 ../../Zotlabs/Module/Like.php:261 #: ../../Zotlabs/Module/Profperm.php:32 ../../Zotlabs/Module/Subthread.php:84 -#: ../../Zotlabs/Web/WebServer.php:128 ../../include/items.php:392 +#: ../../Zotlabs/Web/WebServer.php:128 ../../include/items.php:396 msgid "Permission denied" msgstr "" @@ -1819,16 +1799,13 @@ msgstr "" #: ../../Zotlabs/Module/Alist.php:125 #: ../../Zotlabs/Module/Admin/Channels.php:161 #: ../../Zotlabs/Module/Cdav.php:1349 ../../Zotlabs/Module/Chat.php:251 -#: ../../Zotlabs/Module/Connedit.php:835 +#: ../../Zotlabs/Module/Connedit.php:845 #: ../../Zotlabs/Module/Settings/Oauth.php:90 #: ../../Zotlabs/Module/Settings/Oauth.php:116 -#: ../../Zotlabs/Module/Settings/Oauth2.php:97 -#: ../../Zotlabs/Module/Settings/Oauth2.php:125 +#: ../../Zotlabs/Module/Settings/Oauth2.php:101 +#: ../../Zotlabs/Module/Settings/Oauth2.php:130 #: ../../Zotlabs/Module/Sharedwithme.php:104 #: ../../Zotlabs/Storage/Browser.php:291 -#: ../../extend/addon/a/wiki/NativeWikiPage.php:555 -#: ../../extend/addon/a/wiki/Wiki_page_history.php:22 -#: ../../extend/addon/a/wiki/Mod_Wiki.php:219 msgid "Name" msgstr "" @@ -2068,7 +2045,7 @@ msgstr "" #: ../../Zotlabs/Module/Filestorage.php:27 ../../Zotlabs/Module/Thing.php:101 #: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:50 #: ../../Zotlabs/Module/Display.php:458 ../../Zotlabs/Module/Inspect.php:32 -#: ../../include/items.php:3388 +#: ../../include/items.php:3394 msgid "Item not found." msgstr "" @@ -2179,25 +2156,22 @@ msgid "Install new repo" msgstr "" #: ../../Zotlabs/Module/Admin/Addons.php:421 ../../Zotlabs/Module/Cdav.php:1055 -#: ../../Zotlabs/Module/Cdav.php:1367 ../../Zotlabs/Module/Cover_photo.php:425 +#: ../../Zotlabs/Module/Cdav.php:1367 ../../Zotlabs/Module/Cover_photo.php:429 #: ../../Zotlabs/Module/Editpost.php:120 #: ../../Zotlabs/Module/Editlayout.php:144 #: ../../Zotlabs/Module/Editwebpage.php:173 ../../Zotlabs/Module/Filer.php:53 #: ../../Zotlabs/Module/Fbrowser.php:63 ../../Zotlabs/Module/Fbrowser.php:85 #: ../../Zotlabs/Module/Card_edit.php:133 -#: ../../Zotlabs/Module/Editblock.php:145 ../../Zotlabs/Module/Connedit.php:853 -#: ../../Zotlabs/Module/Profiles.php:802 -#: ../../Zotlabs/Module/Profile_photo.php:511 +#: ../../Zotlabs/Module/Editblock.php:145 ../../Zotlabs/Module/Connedit.php:863 +#: ../../Zotlabs/Module/Profiles.php:797 +#: ../../Zotlabs/Module/Profile_photo.php:509 #: ../../Zotlabs/Module/Settings/Oauth.php:89 #: ../../Zotlabs/Module/Settings/Oauth.php:115 -#: ../../Zotlabs/Module/Settings/Oauth2.php:96 -#: ../../Zotlabs/Module/Settings/Oauth2.php:124 +#: ../../Zotlabs/Module/Settings/Oauth2.php:100 +#: ../../Zotlabs/Module/Settings/Oauth2.php:129 #: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138 #: ../../include/conversation.php:1382 ../../include/conversation.php:1433 #: ../../include/conversation.php:1435 -#: ../../extend/addon/a/articles/Mod_Article_edit.php:135 -#: ../../extend/addon/a/wiki/Mod_Wiki.php:360 -#: ../../extend/addon/a/wiki/Mod_Wiki.php:394 msgid "Cancel" msgstr "" @@ -2534,8 +2508,8 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Accounts.php:171 #: ../../Zotlabs/Module/Admin/Accounts.php:183 -#: ../../Zotlabs/Module/Cdav.php:1353 ../../Zotlabs/Module/Connedit.php:839 -#: ../../Zotlabs/Module/Profiles.php:788 ../../include/network.php:1947 +#: ../../Zotlabs/Module/Cdav.php:1353 ../../Zotlabs/Module/Connedit.php:849 +#: ../../Zotlabs/Module/Profiles.php:783 ../../include/network.php:1910 msgid "Email" msgstr "" @@ -2544,7 +2518,7 @@ msgid "No registrations." msgstr "" #: ../../Zotlabs/Module/Admin/Accounts.php:173 -#: ../../Zotlabs/Module/Connections.php:268 ../../include/conversation.php:722 +#: ../../Zotlabs/Module/Connections.php:277 ../../include/conversation.php:722 msgid "Approve" msgstr "" @@ -2554,12 +2528,12 @@ msgid "Deny" msgstr "" #: ../../Zotlabs/Module/Admin/Accounts.php:176 -#: ../../Zotlabs/Module/Connedit.php:563 +#: ../../Zotlabs/Module/Connedit.php:564 msgid "Block" msgstr "" #: ../../Zotlabs/Module/Admin/Accounts.php:177 -#: ../../Zotlabs/Module/Connedit.php:563 +#: ../../Zotlabs/Module/Connedit.php:564 msgid "Unblock" msgstr "" @@ -2656,12 +2630,12 @@ msgid "Channels" msgstr "" #: ../../Zotlabs/Module/Admin/Channels.php:152 -#: ../../Zotlabs/Module/Directory.php:381 +#: ../../Zotlabs/Module/Connedit.php:580 ../../Zotlabs/Module/Directory.php:384 msgid "Censor" msgstr "" #: ../../Zotlabs/Module/Admin/Channels.php:153 -#: ../../Zotlabs/Module/Directory.php:381 +#: ../../Zotlabs/Module/Connedit.php:580 ../../Zotlabs/Module/Directory.php:384 msgid "Uncensor" msgstr "" @@ -2674,7 +2648,7 @@ msgid "Disallow Code" msgstr "" #: ../../Zotlabs/Module/Admin/Channels.php:156 -#: ../../include/conversation.php:1889 ../../include/nav.php:393 +#: ../../include/conversation.php:1764 ../../include/nav.php:387 msgid "Channel" msgstr "" @@ -2684,8 +2658,8 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Channels.php:162 #: ../../Zotlabs/Module/Cdav.php:1356 ../../Zotlabs/Module/Locs.php:121 -#: ../../Zotlabs/Module/Connedit.php:842 ../../Zotlabs/Module/Profiles.php:503 -#: ../../Zotlabs/Module/Profiles.php:791 +#: ../../Zotlabs/Module/Connedit.php:852 ../../Zotlabs/Module/Profiles.php:499 +#: ../../Zotlabs/Module/Profiles.php:786 msgid "Address" msgstr "" @@ -2705,7 +2679,7 @@ msgstr "" msgid "Site settings updated." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:193 ../../include/text.php:2942 +#: ../../Zotlabs/Module/Admin/Site.php:193 ../../include/text.php:2994 #: ../../view/theme/redbasic/php/config.php:15 msgid "Default" msgstr "" @@ -2838,95 +2812,95 @@ msgid "(Heavy system resource usage)" msgstr "" #: ../../Zotlabs/Module/Admin/Site.php:310 -msgid "Maximum image size" +msgid "Allow ActivityPub Connections" msgstr "" #: ../../Zotlabs/Module/Admin/Site.php:310 msgid "" +"Experimental and unsupported. ActivityPub does not fully support privacy and " +"account mobility." +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:311 +msgid "Maximum image size" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Site.php:311 +msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:311 +#: ../../Zotlabs/Module/Admin/Site.php:312 msgid "Does this site allow new member registration?" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:312 +#: ../../Zotlabs/Module/Admin/Site.php:313 msgid "Invitation only" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:312 +#: ../../Zotlabs/Module/Admin/Site.php:313 msgid "" "Only allow new member registrations with an invitation code. New member " "registration must be allowed for this to work." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:313 +#: ../../Zotlabs/Module/Admin/Site.php:314 msgid "Minimum age" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:313 +#: ../../Zotlabs/Module/Admin/Site.php:314 msgid "Minimum age (in years) for who may register on this site." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:314 +#: ../../Zotlabs/Module/Admin/Site.php:315 msgid "Which best describes the types of account offered by this hub?" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:314 +#: ../../Zotlabs/Module/Admin/Site.php:315 msgid "" "If a public server policy is selected, this information may be displayed on " "the public server site list." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:315 +#: ../../Zotlabs/Module/Admin/Site.php:316 msgid "Register text" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:315 +#: ../../Zotlabs/Module/Admin/Site.php:316 msgid "Will be displayed prominently on the registration page." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:317 +#: ../../Zotlabs/Module/Admin/Site.php:318 msgid "Site homepage to show visitors (default: login box)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:317 +#: ../../Zotlabs/Module/Admin/Site.php:318 msgid "" "example: 'public' to show public stream, 'page/sys/home' to show a system " "webpage called 'home' or 'include:home.html' to include a file." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:318 +#: ../../Zotlabs/Module/Admin/Site.php:319 msgid "Preserve site homepage URL" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:318 +#: ../../Zotlabs/Module/Admin/Site.php:319 msgid "" "Present the site homepage in a frame at the original location instead of " "redirecting" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:319 +#: ../../Zotlabs/Module/Admin/Site.php:320 msgid "Accounts abandoned after x days" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:319 +#: ../../Zotlabs/Module/Admin/Site.php:320 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:320 -msgid "Allowed friend domains" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Site.php:320 -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:321 msgid "Verify Email Addresses" msgstr "" @@ -3116,7 +3090,7 @@ msgid "" msgstr "" #: ../../Zotlabs/Module/Admin/Site.php:344 -msgid "Expiration period in days for imported (grid/network) content" +msgid "Expiration period in days for imported streams" msgstr "" #: ../../Zotlabs/Module/Admin/Site.php:344 @@ -3280,7 +3254,6 @@ msgstr "" #: ../../Zotlabs/Module/Cal.php:70 ../../Zotlabs/Module/Block.php:42 #: ../../Zotlabs/Module/Chanview.php:99 ../../Zotlabs/Module/Card_edit.php:46 #: ../../Zotlabs/Module/Page.php:79 ../../Zotlabs/Module/Wall_upload.php:31 -#: ../../extend/addon/a/articles/Mod_Article_edit.php:46 msgid "Channel not found." msgstr "" @@ -3288,42 +3261,42 @@ msgstr "" msgid "Permissions denied." msgstr "" -#: ../../Zotlabs/Module/Cal.php:271 ../../Zotlabs/Module/Events.php:645 +#: ../../Zotlabs/Module/Cal.php:271 ../../Zotlabs/Module/Events.php:644 msgid "l, F j" msgstr "" -#: ../../Zotlabs/Module/Cal.php:321 ../../Zotlabs/Module/Events.php:701 -#: ../../include/text.php:1700 +#: ../../Zotlabs/Module/Cal.php:321 ../../Zotlabs/Module/Events.php:700 +#: ../../include/text.php:1740 msgid "Link to Source" msgstr "" -#: ../../Zotlabs/Module/Cal.php:344 ../../Zotlabs/Module/Events.php:729 +#: ../../Zotlabs/Module/Cal.php:344 ../../Zotlabs/Module/Events.php:728 msgid "Edit Event" msgstr "" -#: ../../Zotlabs/Module/Cal.php:344 ../../Zotlabs/Module/Events.php:729 +#: ../../Zotlabs/Module/Cal.php:344 ../../Zotlabs/Module/Events.php:728 msgid "Create Event" msgstr "" #: ../../Zotlabs/Module/Cal.php:345 ../../Zotlabs/Module/Cal.php:352 #: ../../Zotlabs/Module/Cdav.php:1032 ../../Zotlabs/Module/Photos.php:960 -#: ../../Zotlabs/Module/Events.php:730 ../../Zotlabs/Module/Events.php:739 +#: ../../Zotlabs/Module/Events.php:729 ../../Zotlabs/Module/Events.php:738 msgid "Previous" msgstr "" #: ../../Zotlabs/Module/Cal.php:346 ../../Zotlabs/Module/Cal.php:353 #: ../../Zotlabs/Module/Cdav.php:1033 ../../Zotlabs/Module/Setup.php:275 -#: ../../Zotlabs/Module/Photos.php:969 ../../Zotlabs/Module/Events.php:731 -#: ../../Zotlabs/Module/Events.php:740 +#: ../../Zotlabs/Module/Photos.php:969 ../../Zotlabs/Module/Events.php:730 +#: ../../Zotlabs/Module/Events.php:739 msgid "Next" msgstr "" -#: ../../Zotlabs/Module/Cal.php:350 ../../include/text.php:2323 +#: ../../Zotlabs/Module/Cal.php:350 ../../include/text.php:2366 msgid "Import" msgstr "" #: ../../Zotlabs/Module/Cal.php:354 ../../Zotlabs/Module/Cdav.php:1034 -#: ../../Zotlabs/Module/Events.php:741 +#: ../../Zotlabs/Module/Events.php:740 msgid "Today" msgstr "" @@ -3419,7 +3392,6 @@ msgstr "" #: ../../Zotlabs/Module/Block.php:78 ../../Zotlabs/Module/Page.php:140 #: ../../Zotlabs/Module/Display.php:145 ../../Zotlabs/Module/Display.php:162 #: ../../Zotlabs/Module/Display.php:179 ../../Zotlabs/Web/Router.php:171 -#: ../../extend/addon/a/wiki/NativeWikiPage.php:516 msgid "Page not found." msgstr "" @@ -3435,11 +3407,10 @@ msgstr "" #: ../../Zotlabs/Module/Cdav.php:1056 ../../Zotlabs/Module/Cdav.php:1364 #: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Menu.php:184 #: ../../Zotlabs/Module/New_channel.php:196 -#: ../../Zotlabs/Module/Connedit.php:850 ../../Zotlabs/Module/Webpages.php:255 -#: ../../Zotlabs/Module/Profiles.php:799 ../../Zotlabs/Storage/Browser.php:282 +#: ../../Zotlabs/Module/Connedit.php:860 ../../Zotlabs/Module/Webpages.php:255 +#: ../../Zotlabs/Module/Profiles.php:794 ../../Zotlabs/Storage/Browser.php:282 #: ../../Zotlabs/Storage/Browser.php:396 ../../Zotlabs/Widget/Cdav.php:140 #: ../../Zotlabs/Widget/Cdav.php:178 -#: ../../extend/addon/a/articles/Mod_Articles.php:106 msgid "Create" msgstr "" @@ -3448,7 +3419,7 @@ msgstr "" msgid "Block Name" msgstr "" -#: ../../Zotlabs/Module/Blocks.php:158 ../../include/text.php:2299 +#: ../../Zotlabs/Module/Blocks.php:158 ../../include/text.php:2342 msgid "Blocks" msgstr "" @@ -3469,14 +3440,11 @@ msgstr "" #: ../../Zotlabs/Module/Blocks.php:165 ../../Zotlabs/Module/Layouts.php:200 #: ../../Zotlabs/Module/Webpages.php:257 ../../Zotlabs/Module/Photos.php:1089 #: ../../Zotlabs/Widget/Cdav.php:136 ../../include/conversation.php:1357 -#: ../../extend/addon/a/wiki/Mod_Wiki.php:297 msgid "Share" msgstr "" #: ../../Zotlabs/Module/Blocks.php:170 ../../Zotlabs/Module/Layouts.php:204 -#: ../../Zotlabs/Module/Webpages.php:262 ../../Zotlabs/Module/Events.php:735 -#: ../../extend/addon/a/wiki/Mod_Wiki.php:214 -#: ../../extend/addon/a/wiki/Mod_Wiki.php:402 +#: ../../Zotlabs/Module/Webpages.php:262 ../../Zotlabs/Module/Events.php:734 msgid "View" msgstr "" @@ -3528,11 +3496,11 @@ msgstr "" msgid "Link to source" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1009 ../../Zotlabs/Module/Events.php:493 +#: ../../Zotlabs/Module/Cdav.php:1009 ../../Zotlabs/Module/Events.php:492 msgid "Event title" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1010 ../../Zotlabs/Module/Events.php:499 +#: ../../Zotlabs/Module/Cdav.php:1010 ../../Zotlabs/Module/Events.php:498 msgid "Start date and time" msgstr "" @@ -3541,26 +3509,26 @@ msgid "End date and time" msgstr "" #: ../../Zotlabs/Module/Cdav.php:1012 ../../Zotlabs/Module/Appman.php:134 -#: ../../Zotlabs/Module/Events.php:506 +#: ../../Zotlabs/Module/Events.php:505 msgid "Description" msgstr "" #: ../../Zotlabs/Module/Cdav.php:1013 ../../Zotlabs/Module/Locs.php:120 -#: ../../Zotlabs/Module/Pubsites.php:56 ../../Zotlabs/Module/Profiles.php:510 -#: ../../Zotlabs/Module/Profiles.php:734 ../../Zotlabs/Module/Events.php:508 +#: ../../Zotlabs/Module/Pubsites.php:56 ../../Zotlabs/Module/Profiles.php:506 +#: ../../Zotlabs/Module/Profiles.php:729 ../../Zotlabs/Module/Events.php:507 #: ../../include/js_strings.php:25 msgid "Location" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1035 ../../Zotlabs/Module/Events.php:736 +#: ../../Zotlabs/Module/Cdav.php:1035 ../../Zotlabs/Module/Events.php:735 msgid "Month" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1036 ../../Zotlabs/Module/Events.php:737 +#: ../../Zotlabs/Module/Cdav.php:1036 ../../Zotlabs/Module/Events.php:736 msgid "Week" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1037 ../../Zotlabs/Module/Events.php:738 +#: ../../Zotlabs/Module/Cdav.php:1037 ../../Zotlabs/Module/Events.php:737 msgid "Day" msgstr "" @@ -3605,97 +3573,97 @@ msgstr "" msgid "Sorry! Editing of recurrent events is not yet implemented." msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1350 ../../Zotlabs/Module/Connedit.php:836 +#: ../../Zotlabs/Module/Cdav.php:1350 ../../Zotlabs/Module/Connedit.php:846 msgid "Organisation" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1351 ../../Zotlabs/Module/Connedit.php:837 +#: ../../Zotlabs/Module/Cdav.php:1351 ../../Zotlabs/Module/Connedit.php:847 msgid "Title" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1352 ../../Zotlabs/Module/Connedit.php:838 -#: ../../Zotlabs/Module/Profiles.php:787 +#: ../../Zotlabs/Module/Cdav.php:1352 ../../Zotlabs/Module/Connedit.php:848 +#: ../../Zotlabs/Module/Profiles.php:782 msgid "Phone" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1354 ../../Zotlabs/Module/Connedit.php:840 -#: ../../Zotlabs/Module/Profiles.php:789 +#: ../../Zotlabs/Module/Cdav.php:1354 ../../Zotlabs/Module/Connedit.php:850 +#: ../../Zotlabs/Module/Profiles.php:784 msgid "Instant messenger" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1355 ../../Zotlabs/Module/Connedit.php:841 -#: ../../Zotlabs/Module/Profiles.php:790 +#: ../../Zotlabs/Module/Cdav.php:1355 ../../Zotlabs/Module/Connedit.php:851 +#: ../../Zotlabs/Module/Profiles.php:785 msgid "Website" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1357 ../../Zotlabs/Module/Connedit.php:843 -#: ../../Zotlabs/Module/Profiles.php:792 +#: ../../Zotlabs/Module/Cdav.php:1357 ../../Zotlabs/Module/Connedit.php:853 +#: ../../Zotlabs/Module/Profiles.php:787 msgid "Note" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1358 ../../Zotlabs/Module/Connedit.php:844 -#: ../../Zotlabs/Module/Profiles.php:793 ../../include/connections.php:751 -#: ../../include/event.php:1352 +#: ../../Zotlabs/Module/Cdav.php:1358 ../../Zotlabs/Module/Connedit.php:854 +#: ../../Zotlabs/Module/Profiles.php:788 ../../include/connections.php:771 +#: ../../include/event.php:1354 msgid "Mobile" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1359 ../../Zotlabs/Module/Connedit.php:845 -#: ../../Zotlabs/Module/Profiles.php:794 ../../include/connections.php:752 -#: ../../include/event.php:1353 +#: ../../Zotlabs/Module/Cdav.php:1359 ../../Zotlabs/Module/Connedit.php:855 +#: ../../Zotlabs/Module/Profiles.php:789 ../../include/connections.php:772 +#: ../../include/event.php:1355 msgid "Home" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1360 ../../Zotlabs/Module/Connedit.php:846 -#: ../../Zotlabs/Module/Profiles.php:795 ../../include/connections.php:755 -#: ../../include/event.php:1356 +#: ../../Zotlabs/Module/Cdav.php:1360 ../../Zotlabs/Module/Connedit.php:856 +#: ../../Zotlabs/Module/Profiles.php:790 ../../include/connections.php:775 +#: ../../include/event.php:1358 msgid "Work" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1361 ../../Zotlabs/Module/Connedit.php:847 -#: ../../Zotlabs/Module/Profiles.php:796 ../../Zotlabs/Module/Profiles.php:935 -#: ../../Zotlabs/Module/Profiles.php:952 ../../Zotlabs/Module/Profiles.php:1002 -#: ../../Zotlabs/Module/Profiles.php:1038 ../../include/connections.php:758 -#: ../../include/connections.php:765 ../../include/event.php:1359 -#: ../../include/event.php:1366 +#: ../../Zotlabs/Module/Cdav.php:1361 ../../Zotlabs/Module/Connedit.php:857 +#: ../../Zotlabs/Module/Profiles.php:791 ../../Zotlabs/Module/Profiles.php:930 +#: ../../Zotlabs/Module/Profiles.php:947 ../../Zotlabs/Module/Profiles.php:997 +#: ../../Zotlabs/Module/Profiles.php:1033 ../../include/connections.php:778 +#: ../../include/connections.php:785 ../../include/event.php:1361 +#: ../../include/event.php:1368 msgid "Other" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1362 ../../Zotlabs/Module/Connedit.php:848 -#: ../../Zotlabs/Module/Profiles.php:797 +#: ../../Zotlabs/Module/Cdav.php:1362 ../../Zotlabs/Module/Connedit.php:858 +#: ../../Zotlabs/Module/Profiles.php:792 msgid "Add Contact" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1363 ../../Zotlabs/Module/Connedit.php:849 -#: ../../Zotlabs/Module/Profiles.php:798 +#: ../../Zotlabs/Module/Cdav.php:1363 ../../Zotlabs/Module/Connedit.php:859 +#: ../../Zotlabs/Module/Profiles.php:793 msgid "Add Field" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1368 ../../Zotlabs/Module/Connedit.php:854 +#: ../../Zotlabs/Module/Cdav.php:1368 ../../Zotlabs/Module/Connedit.php:864 msgid "P.O. Box" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1369 ../../Zotlabs/Module/Connedit.php:855 +#: ../../Zotlabs/Module/Cdav.php:1369 ../../Zotlabs/Module/Connedit.php:865 msgid "Additional" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1370 ../../Zotlabs/Module/Connedit.php:856 +#: ../../Zotlabs/Module/Cdav.php:1370 ../../Zotlabs/Module/Connedit.php:866 msgid "Street" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1371 ../../Zotlabs/Module/Connedit.php:857 +#: ../../Zotlabs/Module/Cdav.php:1371 ../../Zotlabs/Module/Connedit.php:867 msgid "Locality" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1372 ../../Zotlabs/Module/Connedit.php:858 +#: ../../Zotlabs/Module/Cdav.php:1372 ../../Zotlabs/Module/Connedit.php:868 msgid "Region" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1373 ../../Zotlabs/Module/Connedit.php:859 +#: ../../Zotlabs/Module/Cdav.php:1373 ../../Zotlabs/Module/Connedit.php:869 msgid "ZIP Code" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1374 ../../Zotlabs/Module/Connedit.php:860 -#: ../../Zotlabs/Module/Profiles.php:757 +#: ../../Zotlabs/Module/Cdav.php:1374 ../../Zotlabs/Module/Connedit.php:870 +#: ../../Zotlabs/Module/Profiles.php:752 msgid "Country" msgstr "" @@ -3762,8 +3730,8 @@ msgstr "" msgid "Documentation Search" msgstr "" -#: ../../Zotlabs/Module/Help.php:83 ../../include/conversation.php:1902 -#: ../../include/nav.php:406 +#: ../../Zotlabs/Module/Help.php:83 ../../include/conversation.php:1777 +#: ../../include/nav.php:400 msgid "About" msgstr "" @@ -3838,164 +3806,163 @@ msgstr "" msgid "Restricted or Premium Channel" msgstr "" -#: ../../Zotlabs/Module/Connections.php:54 -#: ../../Zotlabs/Module/Connections.php:106 -#: ../../Zotlabs/Module/Connections.php:221 +#: ../../Zotlabs/Module/Connections.php:59 +#: ../../Zotlabs/Module/Connections.php:115 +#: ../../Zotlabs/Module/Connections.php:230 msgid "Active" msgstr "" -#: ../../Zotlabs/Module/Connections.php:59 -#: ../../Zotlabs/Module/Connections.php:140 -#: ../../Zotlabs/Module/Connections.php:226 +#: ../../Zotlabs/Module/Connections.php:64 +#: ../../Zotlabs/Module/Connections.php:149 +#: ../../Zotlabs/Module/Connections.php:235 msgid "Blocked" msgstr "" -#: ../../Zotlabs/Module/Connections.php:64 -#: ../../Zotlabs/Module/Connections.php:147 -#: ../../Zotlabs/Module/Connections.php:225 +#: ../../Zotlabs/Module/Connections.php:69 +#: ../../Zotlabs/Module/Connections.php:156 +#: ../../Zotlabs/Module/Connections.php:234 msgid "Ignored" msgstr "" -#: ../../Zotlabs/Module/Connections.php:69 -#: ../../Zotlabs/Module/Connections.php:161 -#: ../../Zotlabs/Module/Connections.php:224 +#: ../../Zotlabs/Module/Connections.php:74 +#: ../../Zotlabs/Module/Connections.php:170 +#: ../../Zotlabs/Module/Connections.php:233 msgid "Hidden" msgstr "" -#: ../../Zotlabs/Module/Connections.php:74 -#: ../../Zotlabs/Module/Connections.php:154 +#: ../../Zotlabs/Module/Connections.php:79 +#: ../../Zotlabs/Module/Connections.php:163 msgid "Archived/Unreachable" msgstr "" -#: ../../Zotlabs/Module/Connections.php:79 -#: ../../Zotlabs/Module/Connections.php:88 ../../Zotlabs/Module/Menu.php:182 +#: ../../Zotlabs/Module/Connections.php:84 +#: ../../Zotlabs/Module/Connections.php:97 ../../Zotlabs/Module/Menu.php:182 #: ../../Zotlabs/Module/Notifications.php:50 -#: ../../include/conversation.php:1795 msgid "New" msgstr "" -#: ../../Zotlabs/Module/Connections.php:93 #: ../../Zotlabs/Module/Connections.php:102 -#: ../../Zotlabs/Module/Connedit.php:655 ../../Zotlabs/Module/Affinity.php:63 +#: ../../Zotlabs/Module/Connections.php:111 +#: ../../Zotlabs/Module/Connedit.php:664 ../../Zotlabs/Module/Affinity.php:63 #: ../../Zotlabs/Widget/Affinity.php:29 msgid "All" msgstr "" -#: ../../Zotlabs/Module/Connections.php:126 +#: ../../Zotlabs/Module/Connections.php:135 msgid "Active Connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:129 +#: ../../Zotlabs/Module/Connections.php:138 msgid "Show active connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:133 +#: ../../Zotlabs/Module/Connections.php:142 #: ../../Zotlabs/Widget/Notifications.php:85 msgid "New Connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:136 +#: ../../Zotlabs/Module/Connections.php:145 msgid "Show pending (new) connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:143 +#: ../../Zotlabs/Module/Connections.php:152 msgid "Only show blocked connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:150 +#: ../../Zotlabs/Module/Connections.php:159 msgid "Only show ignored connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:157 +#: ../../Zotlabs/Module/Connections.php:166 msgid "Only show archived/unreachable connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:164 +#: ../../Zotlabs/Module/Connections.php:173 msgid "Only show hidden connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:168 +#: ../../Zotlabs/Module/Connections.php:177 #: ../../Zotlabs/Module/Profperm.php:144 msgid "All Connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:171 +#: ../../Zotlabs/Module/Connections.php:180 msgid "Show all connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:222 +#: ../../Zotlabs/Module/Connections.php:231 msgid "Pending approval" msgstr "" -#: ../../Zotlabs/Module/Connections.php:223 +#: ../../Zotlabs/Module/Connections.php:232 msgid "Archived" msgstr "" -#: ../../Zotlabs/Module/Connections.php:227 +#: ../../Zotlabs/Module/Connections.php:236 msgid "Not connected at this location" msgstr "" -#: ../../Zotlabs/Module/Connections.php:244 +#: ../../Zotlabs/Module/Connections.php:253 #, php-format msgid "%1$s [%2$s]" msgstr "" -#: ../../Zotlabs/Module/Connections.php:245 +#: ../../Zotlabs/Module/Connections.php:254 msgid "Edit connection" msgstr "" -#: ../../Zotlabs/Module/Connections.php:247 +#: ../../Zotlabs/Module/Connections.php:256 msgid "Delete connection" msgstr "" -#: ../../Zotlabs/Module/Connections.php:256 +#: ../../Zotlabs/Module/Connections.php:265 msgid "Channel address" msgstr "" -#: ../../Zotlabs/Module/Connections.php:258 +#: ../../Zotlabs/Module/Connections.php:267 msgid "Network" msgstr "" -#: ../../Zotlabs/Module/Connections.php:261 +#: ../../Zotlabs/Module/Connections.php:270 msgid "Call" msgstr "" -#: ../../Zotlabs/Module/Connections.php:263 +#: ../../Zotlabs/Module/Connections.php:272 msgid "Status" msgstr "" -#: ../../Zotlabs/Module/Connections.php:265 +#: ../../Zotlabs/Module/Connections.php:274 msgid "Connected" msgstr "" -#: ../../Zotlabs/Module/Connections.php:267 +#: ../../Zotlabs/Module/Connections.php:276 msgid "Approve connection" msgstr "" -#: ../../Zotlabs/Module/Connections.php:269 +#: ../../Zotlabs/Module/Connections.php:278 msgid "Ignore connection" msgstr "" -#: ../../Zotlabs/Module/Connections.php:270 -#: ../../Zotlabs/Module/Connedit.php:571 +#: ../../Zotlabs/Module/Connections.php:279 +#: ../../Zotlabs/Module/Connedit.php:572 msgid "Ignore" msgstr "" -#: ../../Zotlabs/Module/Connections.php:271 +#: ../../Zotlabs/Module/Connections.php:280 msgid "Recent activity" msgstr "" -#: ../../Zotlabs/Module/Connections.php:302 +#: ../../Zotlabs/Module/Connections.php:311 msgid "Search your connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:303 +#: ../../Zotlabs/Module/Connections.php:312 msgid "Connections search" msgstr "" -#: ../../Zotlabs/Module/Connections.php:304 -#: ../../Zotlabs/Module/Directory.php:450 -#: ../../Zotlabs/Module/Directory.php:455 +#: ../../Zotlabs/Module/Connections.php:313 +#: ../../Zotlabs/Module/Directory.php:453 +#: ../../Zotlabs/Module/Directory.php:458 #: ../../Zotlabs/Widget/Findpeople.php:30 msgid "Find" msgstr "" @@ -4025,8 +3992,8 @@ msgid "Name of app" msgstr "" #: ../../Zotlabs/Module/Appman.php:132 ../../Zotlabs/Module/Appman.php:133 -#: ../../Zotlabs/Module/Profiles.php:745 ../../Zotlabs/Module/Profiles.php:749 -#: ../../Zotlabs/Module/Events.php:493 ../../Zotlabs/Module/Events.php:498 +#: ../../Zotlabs/Module/Profiles.php:740 ../../Zotlabs/Module/Profiles.php:744 +#: ../../Zotlabs/Module/Events.php:492 ../../Zotlabs/Module/Events.php:497 #: ../../include/datetime.php:211 msgid "Required" msgstr "" @@ -4059,164 +4026,157 @@ msgstr "" msgid "Location (URL) to purchase app" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:61 -#: ../../Zotlabs/Module/Profile_photo.php:65 +#: ../../Zotlabs/Module/Cover_photo.php:63 +#: ../../Zotlabs/Module/Profile_photo.php:63 msgid "Image uploaded but image cropping failed." msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:172 +#: ../../Zotlabs/Module/Cover_photo.php:174 #: ../../Zotlabs/Module/Cover_photo.php:265 msgid "Cover Photos" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:196 -#: ../../Zotlabs/Module/Profile_photo.php:143 +#: ../../Zotlabs/Module/Cover_photo.php:198 +#: ../../Zotlabs/Module/Profile_photo.php:140 msgid "Image resize failed." msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:210 -#: ../../Zotlabs/Module/Profile_photo.php:226 ../../include/photos.php:201 +#: ../../Zotlabs/Module/Cover_photo.php:212 +#: ../../Zotlabs/Module/Profile_photo.php:223 ../../include/photos.php:201 msgid "Unable to process image" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:284 ../../include/items.php:4331 +#: ../../Zotlabs/Module/Cover_photo.php:284 ../../include/items.php:4335 msgid "female" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:285 ../../include/items.php:4332 +#: ../../Zotlabs/Module/Cover_photo.php:285 ../../include/items.php:4336 #, php-format msgid "%1$s updated her %2$s" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:286 ../../include/items.php:4333 +#: ../../Zotlabs/Module/Cover_photo.php:287 ../../include/items.php:4337 msgid "male" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:287 ../../include/items.php:4334 +#: ../../Zotlabs/Module/Cover_photo.php:288 ../../include/items.php:4338 #, php-format msgid "%1$s updated his %2$s" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:289 ../../include/items.php:4336 +#: ../../Zotlabs/Module/Cover_photo.php:291 ../../include/items.php:4340 #, php-format msgid "%1$s updated their %2$s" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:291 ../../include/channel.php:1658 +#: ../../Zotlabs/Module/Cover_photo.php:294 ../../include/channel.php:1658 msgid "cover photo" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:365 -#: ../../Zotlabs/Module/Cover_photo.php:380 -#: ../../Zotlabs/Module/Profile_photo.php:389 -#: ../../Zotlabs/Module/Profile_photo.php:436 +#: ../../Zotlabs/Module/Cover_photo.php:368 +#: ../../Zotlabs/Module/Cover_photo.php:384 +#: ../../Zotlabs/Module/Profile_photo.php:383 +#: ../../Zotlabs/Module/Profile_photo.php:431 msgid "Photo not available." msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:416 +#: ../../Zotlabs/Module/Cover_photo.php:420 msgid "Your cover photo may be visible to anybody on the internet" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:418 -#: ../../Zotlabs/Module/Profile_photo.php:502 +#: ../../Zotlabs/Module/Cover_photo.php:422 +#: ../../Zotlabs/Module/Profile_photo.php:500 msgid "Upload File:" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:419 -#: ../../Zotlabs/Module/Profile_photo.php:503 +#: ../../Zotlabs/Module/Cover_photo.php:423 +#: ../../Zotlabs/Module/Profile_photo.php:501 msgid "Select a profile:" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:420 +#: ../../Zotlabs/Module/Cover_photo.php:424 msgid "Change Cover Photo" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:421 +#: ../../Zotlabs/Module/Cover_photo.php:425 #: ../../Zotlabs/Module/Embedphotos.php:194 ../../Zotlabs/Module/Photos.php:704 -#: ../../Zotlabs/Module/Profile_photo.php:505 +#: ../../Zotlabs/Module/Profile_photo.php:503 #: ../../Zotlabs/Storage/Browser.php:398 ../../Zotlabs/Widget/Album.php:97 #: ../../Zotlabs/Widget/Portfolio.php:110 ../../Zotlabs/Widget/Cdav.php:146 #: ../../Zotlabs/Widget/Cdav.php:182 msgid "Upload" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:423 -#: ../../Zotlabs/Module/Cover_photo.php:424 -#: ../../Zotlabs/Module/Profile_photo.php:509 -#: ../../Zotlabs/Module/Profile_photo.php:510 +#: ../../Zotlabs/Module/Cover_photo.php:427 +#: ../../Zotlabs/Module/Cover_photo.php:428 +#: ../../Zotlabs/Module/Profile_photo.php:507 +#: ../../Zotlabs/Module/Profile_photo.php:508 msgid "Use a photo from your albums" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:426 -#: ../../Zotlabs/Module/Profile_photo.php:512 +#: ../../Zotlabs/Module/Cover_photo.php:430 +#: ../../Zotlabs/Module/Profile_photo.php:510 #: ../../include/conversation.php:1383 ../../include/conversation.php:1432 #: ../../include/conversation.php:1434 -#: ../../extend/addon/a/wiki/Mod_Wiki.php:395 msgid "OK" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:427 -#: ../../Zotlabs/Module/Profile_photo.php:513 +#: ../../Zotlabs/Module/Cover_photo.php:431 +#: ../../Zotlabs/Module/Profile_photo.php:511 #: ../../include/conversation.php:1299 -#: ../../extend/addon/a/wiki/Mod_Wiki.php:396 msgid "Choose images to embed" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:428 -#: ../../Zotlabs/Module/Profile_photo.php:514 +#: ../../Zotlabs/Module/Cover_photo.php:432 +#: ../../Zotlabs/Module/Profile_photo.php:512 #: ../../include/conversation.php:1300 -#: ../../extend/addon/a/wiki/Mod_Wiki.php:397 msgid "Choose an album" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:429 -#: ../../Zotlabs/Module/Profile_photo.php:515 -#: ../../extend/addon/a/wiki/Mod_Wiki.php:398 +#: ../../Zotlabs/Module/Cover_photo.php:433 +#: ../../Zotlabs/Module/Profile_photo.php:513 msgid "Choose a different album" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:430 -#: ../../Zotlabs/Module/Profile_photo.php:516 +#: ../../Zotlabs/Module/Cover_photo.php:434 +#: ../../Zotlabs/Module/Profile_photo.php:514 #: ../../include/conversation.php:1302 -#: ../../extend/addon/a/wiki/Mod_Wiki.php:399 msgid "Error getting album list" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:431 -#: ../../Zotlabs/Module/Profile_photo.php:517 +#: ../../Zotlabs/Module/Cover_photo.php:435 +#: ../../Zotlabs/Module/Profile_photo.php:515 #: ../../include/conversation.php:1303 -#: ../../extend/addon/a/wiki/Mod_Wiki.php:400 msgid "Error getting photo link" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:432 -#: ../../Zotlabs/Module/Profile_photo.php:518 +#: ../../Zotlabs/Module/Cover_photo.php:436 +#: ../../Zotlabs/Module/Profile_photo.php:516 #: ../../include/conversation.php:1304 -#: ../../extend/addon/a/wiki/Mod_Wiki.php:401 msgid "Error getting album" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:435 -#: ../../Zotlabs/Module/Profile_photo.php:520 -msgid "Select existing photo" -msgstr "" - -#: ../../Zotlabs/Module/Cover_photo.php:452 -#: ../../Zotlabs/Module/Profile_photo.php:539 -msgid "Crop Image" -msgstr "" - -#: ../../Zotlabs/Module/Cover_photo.php:453 -#: ../../Zotlabs/Module/Profile_photo.php:540 -msgid "Please adjust the image cropping for optimum viewing." +#: ../../Zotlabs/Module/Cover_photo.php:438 +#: ../../Zotlabs/Module/Profile_photo.php:518 +msgid "Select previously uploaded photo" msgstr "" #: ../../Zotlabs/Module/Cover_photo.php:455 -#: ../../Zotlabs/Module/Profile_photo.php:542 +#: ../../Zotlabs/Module/Profile_photo.php:535 +msgid "Crop Image" +msgstr "" + +#: ../../Zotlabs/Module/Cover_photo.php:456 +#: ../../Zotlabs/Module/Profile_photo.php:536 +msgid "Please adjust the image cropping for optimum viewing." +msgstr "" + +#: ../../Zotlabs/Module/Cover_photo.php:458 +#: ../../Zotlabs/Module/Profile_photo.php:538 msgid "Done Editing" msgstr "" -#: ../../Zotlabs/Module/Defperms.php:59 ../../Zotlabs/Module/Connedit.php:92 +#: ../../Zotlabs/Module/Defperms.php:59 ../../Zotlabs/Module/Connedit.php:83 msgid "Could not access contact record." msgstr "" @@ -4227,38 +4187,38 @@ msgstr "" msgid "Settings updated." msgstr "" -#: ../../Zotlabs/Module/Defperms.php:228 ../../Zotlabs/Module/Connedit.php:779 +#: ../../Zotlabs/Module/Defperms.php:228 ../../Zotlabs/Module/Connedit.php:788 #: ../../Zotlabs/Widget/Settings_menu.php:103 msgid "Connection Default Permissions" msgstr "" -#: ../../Zotlabs/Module/Defperms.php:229 ../../Zotlabs/Module/Connedit.php:780 +#: ../../Zotlabs/Module/Defperms.php:229 ../../Zotlabs/Module/Connedit.php:789 msgid "Apply these permissions automatically" msgstr "" #: ../../Zotlabs/Module/Defperms.php:229 -#: ../../Zotlabs/Module/Settings/Channel.php:507 +#: ../../Zotlabs/Module/Settings/Channel.php:505 msgid "" "If enabled, connection requests will be approved without your interaction" msgstr "" -#: ../../Zotlabs/Module/Defperms.php:230 ../../Zotlabs/Module/Connedit.php:781 +#: ../../Zotlabs/Module/Defperms.php:230 ../../Zotlabs/Module/Connedit.php:790 msgid "Permission role" msgstr "" #: ../../Zotlabs/Module/Defperms.php:230 #: ../../Zotlabs/Module/New_channel.php:164 #: ../../Zotlabs/Module/New_channel.php:171 -#: ../../Zotlabs/Module/Connedit.php:781 -#: ../../Zotlabs/Widget/Notifications.php:163 ../../include/nav.php:302 +#: ../../Zotlabs/Module/Connedit.php:790 +#: ../../Zotlabs/Widget/Notifications.php:163 ../../include/nav.php:296 msgid "Loading" msgstr "" -#: ../../Zotlabs/Module/Defperms.php:231 ../../Zotlabs/Module/Connedit.php:782 +#: ../../Zotlabs/Module/Defperms.php:231 ../../Zotlabs/Module/Connedit.php:791 msgid "Add permission role" msgstr "" -#: ../../Zotlabs/Module/Defperms.php:235 ../../Zotlabs/Module/Connedit.php:795 +#: ../../Zotlabs/Module/Defperms.php:235 ../../Zotlabs/Module/Connedit.php:804 msgid "" "The permissions indicated on this page will be applied to all new " "connections." @@ -4268,19 +4228,19 @@ msgstr "" msgid "Automatic approval settings" msgstr "" -#: ../../Zotlabs/Module/Defperms.php:238 ../../Zotlabs/Module/Connedit.php:815 +#: ../../Zotlabs/Module/Defperms.php:238 ../../Zotlabs/Module/Connedit.php:825 #: ../../Zotlabs/Module/Settings/Permcats.php:111 #: ../../Zotlabs/Module/Settings/Tokens.php:165 msgid "inherited" msgstr "" -#: ../../Zotlabs/Module/Defperms.php:240 ../../Zotlabs/Module/Connedit.php:820 +#: ../../Zotlabs/Module/Defperms.php:240 ../../Zotlabs/Module/Connedit.php:830 #: ../../Zotlabs/Module/Settings/Permcats.php:109 #: ../../Zotlabs/Module/Settings/Tokens.php:163 msgid "My Settings" msgstr "" -#: ../../Zotlabs/Module/Defperms.php:243 ../../Zotlabs/Module/Connedit.php:822 +#: ../../Zotlabs/Module/Defperms.php:243 ../../Zotlabs/Module/Connedit.php:832 #: ../../Zotlabs/Module/Settings/Permcats.php:114 #: ../../Zotlabs/Module/Settings/Tokens.php:168 msgid "Individual Permissions" @@ -4292,40 +4252,40 @@ msgid "" "channel type and privacy settings." msgstr "" -#: ../../Zotlabs/Module/Item.php:528 +#: ../../Zotlabs/Module/Item.php:529 msgid "Unable to locate original post." msgstr "" -#: ../../Zotlabs/Module/Item.php:617 +#: ../../Zotlabs/Module/Item.php:618 msgid "Comment may be moderated." msgstr "" -#: ../../Zotlabs/Module/Item.php:833 +#: ../../Zotlabs/Module/Item.php:834 msgid "Empty post discarded." msgstr "" -#: ../../Zotlabs/Module/Item.php:1269 +#: ../../Zotlabs/Module/Item.php:1270 msgid "Duplicate post suppressed." msgstr "" -#: ../../Zotlabs/Module/Item.php:1414 +#: ../../Zotlabs/Module/Item.php:1415 msgid "System error. Post not saved." msgstr "" -#: ../../Zotlabs/Module/Item.php:1450 +#: ../../Zotlabs/Module/Item.php:1451 msgid "Your post/comment is awaiting approval." msgstr "" -#: ../../Zotlabs/Module/Item.php:1595 +#: ../../Zotlabs/Module/Item.php:1596 msgid "Unable to obtain post information from database." msgstr "" -#: ../../Zotlabs/Module/Item.php:1603 +#: ../../Zotlabs/Module/Item.php:1604 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "" -#: ../../Zotlabs/Module/Item.php:1610 +#: ../../Zotlabs/Module/Item.php:1611 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "" @@ -4334,8 +4294,6 @@ msgstr "" #: ../../Zotlabs/Module/Editwebpage.php:84 #: ../../Zotlabs/Module/Card_edit.php:19 ../../Zotlabs/Module/Card_edit.php:35 #: ../../Zotlabs/Module/Editblock.php:83 ../../Zotlabs/Module/Editblock.php:99 -#: ../../extend/addon/a/articles/Mod_Article_edit.php:19 -#: ../../extend/addon/a/articles/Mod_Article_edit.php:35 msgid "Item not found" msgstr "" @@ -4405,8 +4363,6 @@ msgid "Delivery report for %1$s" msgstr "" #: ../../Zotlabs/Module/Dreport.php:161 -#: ../../extend/addon/a/wiki/Wiki_pages.php:40 -#: ../../extend/addon/a/wiki/Wiki_pages.php:97 msgid "Options" msgstr "" @@ -4532,7 +4488,6 @@ msgstr "" #: ../../Zotlabs/Module/Editwebpage.php:147 ../../Zotlabs/Module/Chat.php:214 #: ../../Zotlabs/Module/Card_edit.php:103 #: ../../Zotlabs/Module/Editblock.php:120 ../../include/conversation.php:1251 -#: ../../extend/addon/a/articles/Mod_Article_edit.php:103 msgid "Insert web link" msgstr "" @@ -4693,7 +4648,7 @@ msgstr "" #: ../../Zotlabs/Module/Filestorage.php:191 ../../Zotlabs/Module/Thing.php:326 #: ../../Zotlabs/Module/Thing.php:379 ../../Zotlabs/Module/Chat.php:235 -#: ../../Zotlabs/Module/Connedit.php:617 ../../Zotlabs/Module/Photos.php:694 +#: ../../Zotlabs/Module/Connedit.php:626 ../../Zotlabs/Module/Photos.php:694 #: ../../Zotlabs/Module/Photos.php:1058 ../../include/acl_selectors.php:123 msgid "Permissions" msgstr "" @@ -4872,8 +4827,7 @@ msgid "No chatrooms available" msgstr "" #: ../../Zotlabs/Module/Chat.php:256 ../../Zotlabs/Module/Manage.php:143 -#: ../../Zotlabs/Module/Profiles.php:832 -#: ../../extend/addon/a/wiki/Mod_Wiki.php:215 +#: ../../Zotlabs/Module/Profiles.php:827 msgid "Create New" msgstr "" @@ -4941,7 +4895,7 @@ msgstr "" msgid "You have got no unseen posts..." msgstr "" -#: ../../Zotlabs/Module/Layouts.php:190 ../../include/text.php:2301 +#: ../../Zotlabs/Module/Layouts.php:190 ../../include/text.php:2344 msgid "Layouts" msgstr "" @@ -4961,7 +4915,6 @@ msgstr "" #: ../../Zotlabs/Module/Card_edit.php:119 #: ../../Zotlabs/Module/Editblock.php:133 ../../Zotlabs/Module/Photos.php:690 #: ../../Zotlabs/Module/Photos.php:1055 ../../include/conversation.php:1394 -#: ../../extend/addon/a/articles/Mod_Article_edit.php:119 msgid "Title (optional)" msgstr "" @@ -4986,20 +4939,20 @@ msgstr "" msgid "Use this form to import existing posts and content from an export file." msgstr "" -#: ../../Zotlabs/Module/Cloud.php:125 +#: ../../Zotlabs/Module/Cloud.php:118 msgid "Not found" msgstr "" -#: ../../Zotlabs/Module/Cloud.php:131 +#: ../../Zotlabs/Module/Cloud.php:124 msgid "Please refresh page" msgstr "" -#: ../../Zotlabs/Module/Cloud.php:134 +#: ../../Zotlabs/Module/Cloud.php:127 msgid "Unknown error" msgstr "" #: ../../Zotlabs/Module/Manage.php:66 ../../Zotlabs/Module/Manage.php:163 -#: ../../Zotlabs/Module/Directory.php:390 +#: ../../Zotlabs/Module/Directory.php:393 msgid "Group" msgstr "" @@ -5072,7 +5025,7 @@ msgid "Menu Item Permissions" msgstr "" #: ../../Zotlabs/Module/Mitem.php:172 ../../Zotlabs/Module/Mitem.php:251 -#: ../../Zotlabs/Module/Settings/Channel.php:570 +#: ../../Zotlabs/Module/Settings/Channel.php:562 msgid "(click to open/close)" msgstr "" @@ -5201,7 +5154,7 @@ msgid "Access list: " msgstr "" #: ../../Zotlabs/Module/Network.php:298 -#: ../../extend/addon/a/zotpost/Mod_zotpost.php:26 +#: ../../extend/addon/a/zotpost/Mod_zotpost.php:29 msgid "Invalid channel." msgstr "" @@ -5229,7 +5182,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1635 +#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1641 msgid "Password Reset" msgstr "" @@ -5315,7 +5268,7 @@ msgstr "" msgid "Submit and proceed" msgstr "" -#: ../../Zotlabs/Module/Menu.php:173 ../../include/text.php:2300 +#: ../../Zotlabs/Module/Menu.php:173 ../../include/text.php:2343 msgid "Menus" msgstr "" @@ -5486,7 +5439,7 @@ msgstr "" #: ../../Zotlabs/Module/Register.php:264 #: ../../Zotlabs/Module/New_channel.php:185 -#: ../../Zotlabs/Module/Settings/Channel.php:581 +#: ../../Zotlabs/Module/Settings/Channel.php:573 msgid "Channel role and privacy" msgstr "" @@ -5504,8 +5457,8 @@ msgstr "" msgid "yes" msgstr "" -#: ../../Zotlabs/Module/Register.php:293 ../../include/nav.php:151 -#: ../../boot.php:1606 +#: ../../Zotlabs/Module/Register.php:293 ../../include/nav.php:153 +#: ../../boot.php:1612 msgid "Register" msgstr "" @@ -5532,9 +5485,9 @@ msgid "thing" msgstr "" #: ../../Zotlabs/Module/Like.php:342 ../../Zotlabs/Module/Calendar.php:252 -#: ../../Zotlabs/Module/Events.php:285 ../../Zotlabs/Module/Tagger.php:75 -#: ../../include/event.php:1188 ../../include/conversation.php:118 -#: ../../include/text.php:1881 +#: ../../Zotlabs/Module/Events.php:284 ../../Zotlabs/Module/Tagger.php:75 +#: ../../include/conversation.php:118 ../../include/text.php:1921 +#: ../../include/event.php:1189 msgid "event" msgstr "" @@ -5661,23 +5614,23 @@ msgid "Event title and start time are required." msgstr "" #: ../../Zotlabs/Module/Calendar.php:117 ../../Zotlabs/Module/Calendar.php:257 -#: ../../Zotlabs/Module/Events.php:165 ../../Zotlabs/Module/Events.php:290 +#: ../../Zotlabs/Module/Events.php:165 ../../Zotlabs/Module/Events.php:289 msgid "Event not found." msgstr "" -#: ../../Zotlabs/Module/Calendar.php:419 ../../Zotlabs/Module/Events.php:673 +#: ../../Zotlabs/Module/Calendar.php:419 ../../Zotlabs/Module/Events.php:672 msgid "Edit event" msgstr "" -#: ../../Zotlabs/Module/Calendar.php:421 ../../Zotlabs/Module/Events.php:675 +#: ../../Zotlabs/Module/Calendar.php:421 ../../Zotlabs/Module/Events.php:674 msgid "Delete event" msgstr "" -#: ../../Zotlabs/Module/Calendar.php:449 ../../Zotlabs/Module/Events.php:710 +#: ../../Zotlabs/Module/Calendar.php:449 ../../Zotlabs/Module/Events.php:709 msgid "calendar" msgstr "" -#: ../../Zotlabs/Module/Calendar.php:482 ../../Zotlabs/Module/Events.php:831 +#: ../../Zotlabs/Module/Calendar.php:482 ../../Zotlabs/Module/Events.php:830 msgid "Failed to remove event" msgstr "" @@ -5689,157 +5642,161 @@ msgstr "" msgid "System Notifications" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:123 +#: ../../Zotlabs/Module/Connedit.php:114 msgid "Could not locate selected profile." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:199 +#: ../../Zotlabs/Module/Connedit.php:192 msgid "Connection updated." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:201 +#: ../../Zotlabs/Module/Connedit.php:194 msgid "Failed to update connection record." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:243 +#: ../../Zotlabs/Module/Connedit.php:236 msgid "is now connected to" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:368 +#: ../../Zotlabs/Module/Connedit.php:360 msgid "Could not access address book record." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:416 +#: ../../Zotlabs/Module/Connedit.php:408 msgid "Refresh failed - channel is currently unavailable." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:431 ../../Zotlabs/Module/Connedit.php:440 -#: ../../Zotlabs/Module/Connedit.php:449 ../../Zotlabs/Module/Connedit.php:458 -#: ../../Zotlabs/Module/Connedit.php:471 +#: ../../Zotlabs/Module/Connedit.php:423 ../../Zotlabs/Module/Connedit.php:432 +#: ../../Zotlabs/Module/Connedit.php:441 ../../Zotlabs/Module/Connedit.php:450 +#: ../../Zotlabs/Module/Connedit.php:459 ../../Zotlabs/Module/Connedit.php:472 msgid "Unable to set address book parameters." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:495 +#: ../../Zotlabs/Module/Connedit.php:496 msgid "Connection has been removed." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:538 +#: ../../Zotlabs/Module/Connedit.php:539 #, php-format msgid "View %s's profile" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:542 +#: ../../Zotlabs/Module/Connedit.php:543 msgid "Refresh Permissions" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:545 +#: ../../Zotlabs/Module/Connedit.php:546 msgid "Fetch updated permissions" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:549 +#: ../../Zotlabs/Module/Connedit.php:550 msgid "Refresh Photo" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:552 +#: ../../Zotlabs/Module/Connedit.php:553 msgid "Fetch updated photo" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:556 ../../include/conversation.php:1026 +#: ../../Zotlabs/Module/Connedit.php:557 ../../include/conversation.php:1026 msgid "Recent Activity" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:559 +#: ../../Zotlabs/Module/Connedit.php:560 msgid "View recent posts and comments" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:566 +#: ../../Zotlabs/Module/Connedit.php:567 msgid "Block (or Unblock) all communications with this connection" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:567 +#: ../../Zotlabs/Module/Connedit.php:568 msgid "This connection is blocked!" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:571 +#: ../../Zotlabs/Module/Connedit.php:572 msgid "Unignore" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:574 +#: ../../Zotlabs/Module/Connedit.php:575 msgid "Ignore (or Unignore) all inbound communications from this connection" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:575 +#: ../../Zotlabs/Module/Connedit.php:576 msgid "This connection is ignored!" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:579 +#: ../../Zotlabs/Module/Connedit.php:583 +msgid "Censor (or Uncensor) images from this connection" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:584 +msgid "This connection is censored!" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:588 msgid "Unarchive" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:579 +#: ../../Zotlabs/Module/Connedit.php:588 msgid "Archive" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:582 +#: ../../Zotlabs/Module/Connedit.php:591 msgid "" "Archive (or Unarchive) this connection - mark channel dead but keep content" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:583 +#: ../../Zotlabs/Module/Connedit.php:592 msgid "This connection is archived!" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:587 +#: ../../Zotlabs/Module/Connedit.php:596 msgid "Unhide" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:587 +#: ../../Zotlabs/Module/Connedit.php:596 msgid "Hide" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:590 +#: ../../Zotlabs/Module/Connedit.php:599 msgid "Hide or Unhide this connection from your other connections" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:591 +#: ../../Zotlabs/Module/Connedit.php:600 msgid "This connection is hidden!" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:598 +#: ../../Zotlabs/Module/Connedit.php:607 msgid "Delete this connection" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:606 +#: ../../Zotlabs/Module/Connedit.php:615 msgid "Fetch Vcard" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:609 +#: ../../Zotlabs/Module/Connedit.php:618 msgid "Fetch electronic calling card for this connection" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:620 +#: ../../Zotlabs/Module/Connedit.php:629 msgid "Open Individual Permissions section by default" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:643 -msgid "Affinity" +#: ../../Zotlabs/Module/Connedit.php:655 +msgid "Open Friend Zoom section by default" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:646 -msgid "Open Set Affinity section by default" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:650 ../../Zotlabs/Module/Affinity.php:58 +#: ../../Zotlabs/Module/Connedit.php:659 ../../Zotlabs/Module/Affinity.php:58 #: ../../Zotlabs/Widget/Affinity.php:24 msgid "Me" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:651 ../../Zotlabs/Module/Affinity.php:59 +#: ../../Zotlabs/Module/Connedit.php:660 ../../Zotlabs/Module/Affinity.php:59 #: ../../Zotlabs/Widget/Affinity.php:25 msgid "Family" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:652 ../../Zotlabs/Module/Profiles.php:1021 +#: ../../Zotlabs/Module/Connedit.php:661 ../../Zotlabs/Module/Profiles.php:1016 #: ../../Zotlabs/Module/Affinity.php:60 #: ../../Zotlabs/Module/Settings/Channel.php:70 #: ../../Zotlabs/Module/Settings/Channel.php:74 @@ -5851,135 +5808,144 @@ msgstr "" msgid "Friends" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:653 ../../Zotlabs/Module/Affinity.php:61 +#: ../../Zotlabs/Module/Connedit.php:662 ../../Zotlabs/Module/Affinity.php:61 #: ../../Zotlabs/Widget/Affinity.php:27 msgid "Peers" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:672 +#: ../../Zotlabs/Module/Connedit.php:681 msgid "Filter" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:675 +#: ../../Zotlabs/Module/Connedit.php:684 msgid "Open Custom Filter section by default" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:712 +#: ../../Zotlabs/Module/Connedit.php:721 msgid "Approve this connection" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:712 +#: ../../Zotlabs/Module/Connedit.php:721 msgid "Accept connection to allow communication" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:717 -msgid "Set Affinity" +#: ../../Zotlabs/Module/Connedit.php:726 +msgid "Set Friend Zoom" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:720 +#: ../../Zotlabs/Module/Connedit.php:729 msgid "Set Profile" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:723 -msgid "Set Affinity & Profile" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:767 -msgid "This connection is unreachable from this location." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:768 -msgid "This connection may be unreachable from other channel locations." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:770 -msgid "Location independence is not supported by their network." +#: ../../Zotlabs/Module/Connedit.php:732 +msgid "Set Friend Zoom & Profile" msgstr "" #: ../../Zotlabs/Module/Connedit.php:776 +msgid "This connection is unreachable from this location." +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:777 +msgid "This connection may be unreachable from other channel locations." +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:779 +msgid "Location independence is not supported by their network." +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:785 msgid "" "This connection is unreachable from this location. Location independence is " "not supported by their network." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:779 ../../include/items.php:3991 +#: ../../Zotlabs/Module/Connedit.php:788 ../../include/items.php:3995 #, php-format msgid "Connection: %s" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:780 +#: ../../Zotlabs/Module/Connedit.php:789 msgid "Connection requests will be approved without your interaction" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:789 +#: ../../Zotlabs/Module/Connedit.php:798 msgid "This connection's primary address is" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:790 +#: ../../Zotlabs/Module/Connedit.php:799 msgid "Available locations:" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:796 +#: ../../Zotlabs/Module/Connedit.php:805 msgid "Connection Tools" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:798 +#: ../../Zotlabs/Module/Connedit.php:807 msgid "Slide to adjust your degree of friendship" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:799 ../../include/js_strings.php:20 +#: ../../Zotlabs/Module/Connedit.php:808 ../../include/js_strings.php:20 msgid "Rating" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:800 +#: ../../Zotlabs/Module/Connedit.php:809 msgid "Slide to adjust your rating" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:801 ../../Zotlabs/Module/Connedit.php:806 +#: ../../Zotlabs/Module/Connedit.php:810 ../../Zotlabs/Module/Connedit.php:816 msgid "Optionally explain your rating" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:803 +#: ../../Zotlabs/Module/Connedit.php:812 msgid "Custom Filter" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:804 +#: ../../Zotlabs/Module/Connedit.php:813 #: ../../Zotlabs/Module/Content_filter.php:51 #: ../../Zotlabs/Module/Content_filter.php:59 msgid "Only import posts with this text" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:804 ../../Zotlabs/Module/Connedit.php:805 +#: ../../Zotlabs/Module/Connedit.php:813 ../../Zotlabs/Module/Connedit.php:814 msgid "" "words one per line or #tags, $categories, /patterns/, or lang=xx, leave " "blank to import all posts" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:805 +#: ../../Zotlabs/Module/Connedit.php:814 msgid "Do not import posts with this text" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:807 -msgid "This information is public!" +#: ../../Zotlabs/Module/Connedit.php:815 +#: ../../extend/addon/a/zotpost/Mod_zotpost.php:69 +msgid "Nickname" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:812 -msgid "Connection Pending Approval" +#: ../../Zotlabs/Module/Connedit.php:815 +msgid "optional - allows you to search by a name that you have chosen" msgstr "" #: ../../Zotlabs/Module/Connedit.php:817 +msgid "This information is public!" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:822 +msgid "Connection Pending Approval" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:827 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:819 +#: ../../Zotlabs/Module/Connedit.php:829 #: ../../Zotlabs/Module/Settings/Tokens.php:162 msgid "Their Settings" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:823 +#: ../../Zotlabs/Module/Connedit.php:833 #: ../../Zotlabs/Module/Settings/Permcats.php:115 #: ../../Zotlabs/Module/Settings/Tokens.php:169 msgid "" @@ -5988,7 +5954,7 @@ msgid "" "individual settings. You can not change those settings here." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:824 +#: ../../Zotlabs/Module/Connedit.php:834 msgid "" "Some permissions may be inherited from your channel's privacy settings, which have higher priority than " @@ -5996,11 +5962,11 @@ msgid "" "any impact unless the inherited setting changes." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:825 +#: ../../Zotlabs/Module/Connedit.php:835 msgid "Last update:" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:833 +#: ../../Zotlabs/Module/Connedit.php:843 msgid "Details" msgstr "" @@ -6119,7 +6085,7 @@ msgstr "" msgid "vcard" msgstr "" -#: ../../Zotlabs/Module/Acl.php:360 +#: ../../Zotlabs/Module/Acl.php:366 msgid "network" msgstr "" @@ -6155,500 +6121,500 @@ msgstr "" msgid "System layout" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:27 ../../Zotlabs/Module/Profiles.php:187 -#: ../../Zotlabs/Module/Profiles.php:241 ../../Zotlabs/Module/Profiles.php:659 +#: ../../Zotlabs/Module/Profiles.php:28 ../../Zotlabs/Module/Profiles.php:183 +#: ../../Zotlabs/Module/Profiles.php:237 ../../Zotlabs/Module/Profiles.php:654 msgid "Profile not found." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:47 +#: ../../Zotlabs/Module/Profiles.php:48 msgid "Profile deleted." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:71 ../../Zotlabs/Module/Profiles.php:108 +#: ../../Zotlabs/Module/Profiles.php:72 ../../Zotlabs/Module/Profiles.php:109 msgid "Profile-" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:93 ../../Zotlabs/Module/Profiles.php:130 +#: ../../Zotlabs/Module/Profiles.php:94 ../../Zotlabs/Module/Profiles.php:131 msgid "New profile created." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:114 +#: ../../Zotlabs/Module/Profiles.php:115 msgid "Profile unavailable to clone." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:149 +#: ../../Zotlabs/Module/Profiles.php:150 msgid "Profile unavailable to export." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:252 +#: ../../Zotlabs/Module/Profiles.php:248 msgid "Profile Name is required." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:460 +#: ../../Zotlabs/Module/Profiles.php:456 msgid "Marital Status" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:464 +#: ../../Zotlabs/Module/Profiles.php:460 msgid "Romantic Partner" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:468 ../../Zotlabs/Module/Profiles.php:773 +#: ../../Zotlabs/Module/Profiles.php:464 ../../Zotlabs/Module/Profiles.php:768 msgid "Likes" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:472 ../../Zotlabs/Module/Profiles.php:774 +#: ../../Zotlabs/Module/Profiles.php:468 ../../Zotlabs/Module/Profiles.php:769 msgid "Dislikes" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:476 ../../Zotlabs/Module/Profiles.php:781 +#: ../../Zotlabs/Module/Profiles.php:472 ../../Zotlabs/Module/Profiles.php:776 msgid "Work/Employment" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:479 +#: ../../Zotlabs/Module/Profiles.php:475 msgid "Religion" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:483 +#: ../../Zotlabs/Module/Profiles.php:479 msgid "Political Views" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:487 +#: ../../Zotlabs/Module/Profiles.php:483 msgid "Gender" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:491 +#: ../../Zotlabs/Module/Profiles.php:487 msgid "Sexual Preference" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:495 +#: ../../Zotlabs/Module/Profiles.php:491 msgid "Homepage" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:499 +#: ../../Zotlabs/Module/Profiles.php:495 msgid "Interests" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:595 +#: ../../Zotlabs/Module/Profiles.php:591 msgid "Profile updated." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:678 +#: ../../Zotlabs/Module/Profiles.php:673 msgid "Hide your connections list from viewers of this profile" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:722 +#: ../../Zotlabs/Module/Profiles.php:717 msgid "Edit Profile Details" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:724 +#: ../../Zotlabs/Module/Profiles.php:719 msgid "View this profile" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:726 +#: ../../Zotlabs/Module/Profiles.php:721 msgid "Profile Tools" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:727 +#: ../../Zotlabs/Module/Profiles.php:722 msgid "Change cover photo" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:729 +#: ../../Zotlabs/Module/Profiles.php:724 msgid "Create a new profile using these settings" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:730 +#: ../../Zotlabs/Module/Profiles.php:725 msgid "Clone this profile" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:731 +#: ../../Zotlabs/Module/Profiles.php:726 msgid "Delete this profile" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:732 +#: ../../Zotlabs/Module/Profiles.php:727 msgid "Add profile things" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:733 ../../include/conversation.php:1786 +#: ../../Zotlabs/Module/Profiles.php:728 msgid "Personal" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:735 +#: ../../Zotlabs/Module/Profiles.php:730 msgid "Relationship" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:736 ../../Zotlabs/Widget/Newmember.php:44 +#: ../../Zotlabs/Module/Profiles.php:731 ../../Zotlabs/Widget/Newmember.php:49 #: ../../include/datetime.php:58 msgid "Miscellaneous" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:738 +#: ../../Zotlabs/Module/Profiles.php:733 msgid "Import profile from file" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:739 +#: ../../Zotlabs/Module/Profiles.php:734 msgid "Export profile to file" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:740 +#: ../../Zotlabs/Module/Profiles.php:735 msgid "Your gender" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:741 +#: ../../Zotlabs/Module/Profiles.php:736 msgid "Marital status" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:742 +#: ../../Zotlabs/Module/Profiles.php:737 msgid "Sexual preference" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:745 +#: ../../Zotlabs/Module/Profiles.php:740 msgid "Profile name" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:749 +#: ../../Zotlabs/Module/Profiles.php:744 msgid "Your full name" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:750 +#: ../../Zotlabs/Module/Profiles.php:745 msgid "Title/Description" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:753 +#: ../../Zotlabs/Module/Profiles.php:748 msgid "Street address" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:754 +#: ../../Zotlabs/Module/Profiles.php:749 msgid "Locality/City" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:755 +#: ../../Zotlabs/Module/Profiles.php:750 msgid "Region/State" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:756 +#: ../../Zotlabs/Module/Profiles.php:751 msgid "Postal/Zip code" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:763 +#: ../../Zotlabs/Module/Profiles.php:758 msgid "Who (if applicable)" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:763 +#: ../../Zotlabs/Module/Profiles.php:758 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:764 +#: ../../Zotlabs/Module/Profiles.php:759 msgid "Since (date)" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:767 +#: ../../Zotlabs/Module/Profiles.php:762 msgid "Tell us about yourself" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:768 +#: ../../Zotlabs/Module/Profiles.php:763 msgid "Homepage URL" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:769 +#: ../../Zotlabs/Module/Profiles.php:764 msgid "Hometown" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:770 +#: ../../Zotlabs/Module/Profiles.php:765 msgid "Political views" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:771 +#: ../../Zotlabs/Module/Profiles.php:766 msgid "Religious views" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:772 +#: ../../Zotlabs/Module/Profiles.php:767 msgid "Keywords used in directory listings" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:772 +#: ../../Zotlabs/Module/Profiles.php:767 msgid "Example: fishing photography software" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:775 +#: ../../Zotlabs/Module/Profiles.php:770 msgid "Musical interests" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:776 +#: ../../Zotlabs/Module/Profiles.php:771 msgid "Books, literature" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:777 +#: ../../Zotlabs/Module/Profiles.php:772 msgid "Television" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:778 +#: ../../Zotlabs/Module/Profiles.php:773 msgid "Film/Dance/Culture/Entertainment" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:779 +#: ../../Zotlabs/Module/Profiles.php:774 msgid "Hobbies/Interests" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:780 +#: ../../Zotlabs/Module/Profiles.php:775 msgid "Love/Romance" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:782 +#: ../../Zotlabs/Module/Profiles.php:777 msgid "School/Education" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:783 +#: ../../Zotlabs/Module/Profiles.php:778 msgid "Contact information and social networks" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:784 +#: ../../Zotlabs/Module/Profiles.php:779 msgid "My other channels" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:786 +#: ../../Zotlabs/Module/Profiles.php:781 msgid "Communications" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:883 +#: ../../Zotlabs/Module/Profiles.php:878 msgid " and " msgstr "" -#: ../../Zotlabs/Module/Profiles.php:885 +#: ../../Zotlabs/Module/Profiles.php:880 msgid ", " msgstr "" -#: ../../Zotlabs/Module/Profiles.php:891 +#: ../../Zotlabs/Module/Profiles.php:886 msgid "public profile" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:900 +#: ../../Zotlabs/Module/Profiles.php:895 #, php-format msgid "%1$s changed %2$s to “%3$s”" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:901 +#: ../../Zotlabs/Module/Profiles.php:896 #, php-format msgid "Visit %1$s's %2$s" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:904 +#: ../../Zotlabs/Module/Profiles.php:899 #, php-format msgid "%1$s has an updated %2$s, changing %3$s." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:935 +#: ../../Zotlabs/Module/Profiles.php:930 msgid "Currently Male" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:935 +#: ../../Zotlabs/Module/Profiles.php:930 msgid "Currently Female" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:935 +#: ../../Zotlabs/Module/Profiles.php:930 msgid "Mostly Male" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:935 +#: ../../Zotlabs/Module/Profiles.php:930 msgid "Mostly Female" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:935 +#: ../../Zotlabs/Module/Profiles.php:930 msgid "Transgender" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:935 +#: ../../Zotlabs/Module/Profiles.php:930 msgid "Intersex" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:935 +#: ../../Zotlabs/Module/Profiles.php:930 msgid "Transsexual" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:935 +#: ../../Zotlabs/Module/Profiles.php:930 msgid "Hermaphrodite" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:935 +#: ../../Zotlabs/Module/Profiles.php:930 msgid "Undecided" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:983 ../../Zotlabs/Module/Profiles.php:1002 +#: ../../Zotlabs/Module/Profiles.php:978 ../../Zotlabs/Module/Profiles.php:997 msgid "Males" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:983 ../../Zotlabs/Module/Profiles.php:1002 +#: ../../Zotlabs/Module/Profiles.php:978 ../../Zotlabs/Module/Profiles.php:997 msgid "Females" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:983 +#: ../../Zotlabs/Module/Profiles.php:978 msgid "Gay" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:983 +#: ../../Zotlabs/Module/Profiles.php:978 msgid "Lesbian" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:983 +#: ../../Zotlabs/Module/Profiles.php:978 msgid "No Preference" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:983 +#: ../../Zotlabs/Module/Profiles.php:978 msgid "Bisexual" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:983 +#: ../../Zotlabs/Module/Profiles.php:978 msgid "Autosexual" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:983 +#: ../../Zotlabs/Module/Profiles.php:978 msgid "Abstinent" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:983 +#: ../../Zotlabs/Module/Profiles.php:978 msgid "Virgin" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:983 +#: ../../Zotlabs/Module/Profiles.php:978 msgid "Deviant" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:983 +#: ../../Zotlabs/Module/Profiles.php:978 msgid "Fetish" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:983 +#: ../../Zotlabs/Module/Profiles.php:978 msgid "Oodles" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:983 +#: ../../Zotlabs/Module/Profiles.php:978 msgid "Nonsexual" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:1021 -#: ../../Zotlabs/Module/Profiles.php:1038 +#: ../../Zotlabs/Module/Profiles.php:1016 +#: ../../Zotlabs/Module/Profiles.php:1033 msgid "Single" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:1021 +#: ../../Zotlabs/Module/Profiles.php:1016 msgid "Lonely" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:1021 +#: ../../Zotlabs/Module/Profiles.php:1016 msgid "Available" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:1021 +#: ../../Zotlabs/Module/Profiles.php:1016 msgid "Unavailable" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:1021 +#: ../../Zotlabs/Module/Profiles.php:1016 msgid "Has crush" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:1021 +#: ../../Zotlabs/Module/Profiles.php:1016 msgid "Infatuated" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:1021 -#: ../../Zotlabs/Module/Profiles.php:1038 +#: ../../Zotlabs/Module/Profiles.php:1016 +#: ../../Zotlabs/Module/Profiles.php:1033 msgid "Dating" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:1021 +#: ../../Zotlabs/Module/Profiles.php:1016 msgid "Unfaithful" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:1021 +#: ../../Zotlabs/Module/Profiles.php:1016 msgid "Sex Addict" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:1021 +#: ../../Zotlabs/Module/Profiles.php:1016 msgid "Friends/Benefits" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:1021 +#: ../../Zotlabs/Module/Profiles.php:1016 msgid "Casual" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:1021 +#: ../../Zotlabs/Module/Profiles.php:1016 msgid "Engaged" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:1021 -#: ../../Zotlabs/Module/Profiles.php:1038 +#: ../../Zotlabs/Module/Profiles.php:1016 +#: ../../Zotlabs/Module/Profiles.php:1033 msgid "Married" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:1021 +#: ../../Zotlabs/Module/Profiles.php:1016 msgid "Imaginarily married" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:1021 +#: ../../Zotlabs/Module/Profiles.php:1016 msgid "Partners" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:1021 -#: ../../Zotlabs/Module/Profiles.php:1038 +#: ../../Zotlabs/Module/Profiles.php:1016 +#: ../../Zotlabs/Module/Profiles.php:1033 msgid "Cohabiting" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:1021 +#: ../../Zotlabs/Module/Profiles.php:1016 msgid "Common law" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:1021 +#: ../../Zotlabs/Module/Profiles.php:1016 msgid "Happy" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:1021 +#: ../../Zotlabs/Module/Profiles.php:1016 msgid "Not looking" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:1021 +#: ../../Zotlabs/Module/Profiles.php:1016 msgid "Swinger" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:1021 +#: ../../Zotlabs/Module/Profiles.php:1016 msgid "Betrayed" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:1021 -#: ../../Zotlabs/Module/Profiles.php:1038 +#: ../../Zotlabs/Module/Profiles.php:1016 +#: ../../Zotlabs/Module/Profiles.php:1033 msgid "Separated" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:1021 +#: ../../Zotlabs/Module/Profiles.php:1016 msgid "Unstable" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:1021 -#: ../../Zotlabs/Module/Profiles.php:1038 +#: ../../Zotlabs/Module/Profiles.php:1016 +#: ../../Zotlabs/Module/Profiles.php:1033 msgid "Divorced" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:1021 +#: ../../Zotlabs/Module/Profiles.php:1016 msgid "Imaginarily divorced" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:1021 -#: ../../Zotlabs/Module/Profiles.php:1038 +#: ../../Zotlabs/Module/Profiles.php:1016 +#: ../../Zotlabs/Module/Profiles.php:1033 msgid "Widowed" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:1021 +#: ../../Zotlabs/Module/Profiles.php:1016 msgid "Uncertain" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:1021 -#: ../../Zotlabs/Module/Profiles.php:1038 +#: ../../Zotlabs/Module/Profiles.php:1016 +#: ../../Zotlabs/Module/Profiles.php:1033 msgid "It's complicated" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:1021 +#: ../../Zotlabs/Module/Profiles.php:1016 msgid "Don't care" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:1021 +#: ../../Zotlabs/Module/Profiles.php:1016 msgid "Ask me" msgstr "" @@ -7112,8 +7078,8 @@ msgid "Delete Photo" msgstr "" #: ../../Zotlabs/Module/Photos.php:535 ../../Zotlabs/Module/Search.php:25 -#: ../../Zotlabs/Module/Display.php:34 ../../Zotlabs/Module/Directory.php:76 -#: ../../Zotlabs/Module/Directory.php:83 +#: ../../Zotlabs/Module/Display.php:34 ../../Zotlabs/Module/Directory.php:79 +#: ../../Zotlabs/Module/Directory.php:86 #: ../../Zotlabs/Module/Viewconnections.php:27 msgid "Public access denied." msgstr "" @@ -7290,47 +7256,47 @@ msgstr "" msgid "Make this post private" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:119 -#: ../../Zotlabs/Module/Profile_photo.php:290 +#: ../../Zotlabs/Module/Profile_photo.php:116 +#: ../../Zotlabs/Module/Profile_photo.php:287 #: ../../include/photo_factory.php:367 msgid "Profile Photos" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:219 +#: ../../Zotlabs/Module/Profile_photo.php:216 msgid "" "Shift-reload the page or clear browser cache if the new photo does not " "display immediately." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:306 +#: ../../Zotlabs/Module/Profile_photo.php:301 msgid "Image upload failed." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:325 +#: ../../Zotlabs/Module/Profile_photo.php:320 msgid "Unable to process image." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:500 +#: ../../Zotlabs/Module/Profile_photo.php:498 msgid "" "Your default profile photo is visible to anybody on the internet. Profile " "photos for alternate profiles will inherit the permissions of the profile" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:500 +#: ../../Zotlabs/Module/Profile_photo.php:498 msgid "" "Your profile photo is visible to anybody on the internet and may be " "distributed to other websites." msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:504 +#: ../../Zotlabs/Module/Profile_photo.php:502 msgid "Use Photo for Profile" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:504 +#: ../../Zotlabs/Module/Profile_photo.php:502 msgid "Change Profile Photo" msgstr "" -#: ../../Zotlabs/Module/Profile_photo.php:505 +#: ../../Zotlabs/Module/Profile_photo.php:503 msgid "Use" msgstr "" @@ -7380,119 +7346,118 @@ msgid "This action is permanent and can not be undone!" msgstr "" #: ../../Zotlabs/Module/Removeme.php:70 -#: ../../Zotlabs/Module/Settings/Channel.php:647 +#: ../../Zotlabs/Module/Settings/Channel.php:639 msgid "Remove Channel" msgstr "" -#: ../../Zotlabs/Module/Events.php:477 +#: ../../Zotlabs/Module/Events.php:476 msgid "day(s)" msgstr "" -#: ../../Zotlabs/Module/Events.php:478 +#: ../../Zotlabs/Module/Events.php:477 msgid "week(s)" msgstr "" -#: ../../Zotlabs/Module/Events.php:479 +#: ../../Zotlabs/Module/Events.php:478 msgid "month(s)" msgstr "" -#: ../../Zotlabs/Module/Events.php:480 +#: ../../Zotlabs/Module/Events.php:479 msgid "year(s)" msgstr "" -#: ../../Zotlabs/Module/Events.php:493 +#: ../../Zotlabs/Module/Events.php:492 msgid "Edit event title" msgstr "" -#: ../../Zotlabs/Module/Events.php:495 +#: ../../Zotlabs/Module/Events.php:494 msgid "Categories (comma-separated list)" msgstr "" -#: ../../Zotlabs/Module/Events.php:496 +#: ../../Zotlabs/Module/Events.php:495 msgid "Edit Category" msgstr "" -#: ../../Zotlabs/Module/Events.php:496 +#: ../../Zotlabs/Module/Events.php:495 msgid "Category" msgstr "" -#: ../../Zotlabs/Module/Events.php:499 +#: ../../Zotlabs/Module/Events.php:498 msgid "Edit start date and time" msgstr "" -#: ../../Zotlabs/Module/Events.php:500 ../../Zotlabs/Module/Events.php:503 +#: ../../Zotlabs/Module/Events.php:499 ../../Zotlabs/Module/Events.php:502 msgid "Finish date and time are not known or not relevant" msgstr "" -#: ../../Zotlabs/Module/Events.php:502 +#: ../../Zotlabs/Module/Events.php:501 msgid "Edit finish date and time" msgstr "" -#: ../../Zotlabs/Module/Events.php:502 +#: ../../Zotlabs/Module/Events.php:501 msgid "Finish date and time" msgstr "" -#: ../../Zotlabs/Module/Events.php:504 ../../Zotlabs/Module/Events.php:505 +#: ../../Zotlabs/Module/Events.php:503 ../../Zotlabs/Module/Events.php:504 msgid "Adjust for viewer timezone" msgstr "" -#: ../../Zotlabs/Module/Events.php:504 +#: ../../Zotlabs/Module/Events.php:503 msgid "" "Important for events that happen in a particular place. Not practical for " "global holidays." msgstr "" -#: ../../Zotlabs/Module/Events.php:506 +#: ../../Zotlabs/Module/Events.php:505 msgid "Edit Description" msgstr "" -#: ../../Zotlabs/Module/Events.php:508 +#: ../../Zotlabs/Module/Events.php:507 msgid "Edit Location" msgstr "" -#: ../../Zotlabs/Module/Events.php:512 ../../include/conversation.php:1398 +#: ../../Zotlabs/Module/Events.php:511 ../../include/conversation.php:1398 msgid "Permission settings" msgstr "" -#: ../../Zotlabs/Module/Events.php:522 +#: ../../Zotlabs/Module/Events.php:521 msgid "Timezone:" msgstr "" -#: ../../Zotlabs/Module/Events.php:527 +#: ../../Zotlabs/Module/Events.php:526 msgid "Advanced Options" msgstr "" -#: ../../Zotlabs/Module/Events.php:529 +#: ../../Zotlabs/Module/Events.php:528 msgid "Event repeat" msgstr "" -#: ../../Zotlabs/Module/Events.php:530 +#: ../../Zotlabs/Module/Events.php:529 msgid "Repeat frequency" msgstr "" -#: ../../Zotlabs/Module/Events.php:531 +#: ../../Zotlabs/Module/Events.php:530 msgid "Repeat every" msgstr "" -#: ../../Zotlabs/Module/Events.php:532 +#: ../../Zotlabs/Module/Events.php:531 msgid "Number of total repeats" msgstr "" -#: ../../Zotlabs/Module/Events.php:828 +#: ../../Zotlabs/Module/Events.php:827 msgid "Event removed" msgstr "" #: ../../Zotlabs/Module/Affinity.php:26 -msgid "Affinity Tool settings updated." +msgid "Friend Zoom settings updated." msgstr "" #: ../../Zotlabs/Module/Affinity.php:37 msgid "" "This app (when installed) presents a slider control in your connection " "editor and also on your network page. The slider represents your degree of " -"friendship or affinity with each connection. It allows you to zoom " -"in or out and display conversations from only your closest friends or " -"everybody in your stream." +"friendship with each connection. It allows you to zoom in or out and display " +"conversations from only your closest friends or everybody in your stream." msgstr "" #: ../../Zotlabs/Module/Affinity.php:45 @@ -7510,7 +7475,7 @@ msgid "Refresh" msgstr "" #: ../../Zotlabs/Module/Affinity.php:83 -msgid "Affinity Tool Settings" +msgid "Friend Zoom Settings" msgstr "" #: ../../Zotlabs/Module/Regdir.php:52 ../../Zotlabs/Module/Dirsearch.php:31 @@ -7547,7 +7512,7 @@ msgid "Authentication failed." msgstr "" #: ../../Zotlabs/Module/Rmagic.php:75 ../../include/channel.php:1927 -#: ../../boot.php:1627 +#: ../../boot.php:1633 msgid "Remote Authentication" msgstr "" @@ -7632,7 +7597,7 @@ msgid "Leave password fields blank unless changing" msgstr "" #: ../../Zotlabs/Module/Settings/Account.php:105 -#: ../../Zotlabs/Module/Settings/Channel.php:541 +#: ../../Zotlabs/Module/Settings/Channel.php:538 msgid "Email Address:" msgstr "" @@ -7731,6 +7696,10 @@ msgstr "" msgid "Ability to display only posts that you've interacted on" msgstr "" +#: ../../Zotlabs/Module/Settings/Network.php:100 ../../include/features.php:430 +msgid "Affinity Tool" +msgstr "" + #: ../../Zotlabs/Module/Settings/Network.php:101 ../../include/features.php:431 msgid "Filter stream activity by depth of relationships" msgstr "" @@ -7758,14 +7727,14 @@ msgstr "" #: ../../Zotlabs/Module/Settings/Oauth.php:87 #: ../../Zotlabs/Module/Settings/Oauth.php:113 #: ../../Zotlabs/Module/Settings/Oauth.php:149 -#: ../../Zotlabs/Module/Settings/Oauth2.php:122 -#: ../../Zotlabs/Module/Settings/Oauth2.php:172 +#: ../../Zotlabs/Module/Settings/Oauth2.php:127 +#: ../../Zotlabs/Module/Settings/Oauth2.php:178 msgid "Add application" msgstr "" #: ../../Zotlabs/Module/Settings/Oauth.php:90 -#: ../../Zotlabs/Module/Settings/Oauth2.php:97 -#: ../../Zotlabs/Module/Settings/Oauth2.php:125 +#: ../../Zotlabs/Module/Settings/Oauth2.php:101 +#: ../../Zotlabs/Module/Settings/Oauth2.php:130 msgid "Name of application" msgstr "" @@ -7776,28 +7745,30 @@ msgstr "" #: ../../Zotlabs/Module/Settings/Oauth.php:91 #: ../../Zotlabs/Module/Settings/Oauth.php:92 -#: ../../Zotlabs/Module/Settings/Oauth2.php:98 -#: ../../Zotlabs/Module/Settings/Oauth2.php:126 +#: ../../Zotlabs/Module/Settings/Oauth2.php:102 +#: ../../Zotlabs/Module/Settings/Oauth2.php:103 +#: ../../Zotlabs/Module/Settings/Oauth2.php:131 +#: ../../Zotlabs/Module/Settings/Oauth2.php:132 msgid "Automatically generated - change if desired. Max length 20" msgstr "" #: ../../Zotlabs/Module/Settings/Oauth.php:92 #: ../../Zotlabs/Module/Settings/Oauth.php:118 -#: ../../Zotlabs/Module/Settings/Oauth2.php:98 -#: ../../Zotlabs/Module/Settings/Oauth2.php:126 +#: ../../Zotlabs/Module/Settings/Oauth2.php:103 +#: ../../Zotlabs/Module/Settings/Oauth2.php:132 msgid "Consumer Secret" msgstr "" #: ../../Zotlabs/Module/Settings/Oauth.php:93 #: ../../Zotlabs/Module/Settings/Oauth.php:119 -#: ../../Zotlabs/Module/Settings/Oauth2.php:99 -#: ../../Zotlabs/Module/Settings/Oauth2.php:127 +#: ../../Zotlabs/Module/Settings/Oauth2.php:104 +#: ../../Zotlabs/Module/Settings/Oauth2.php:133 msgid "Redirect" msgstr "" #: ../../Zotlabs/Module/Settings/Oauth.php:93 -#: ../../Zotlabs/Module/Settings/Oauth2.php:99 -#: ../../Zotlabs/Module/Settings/Oauth2.php:127 +#: ../../Zotlabs/Module/Settings/Oauth2.php:104 +#: ../../Zotlabs/Module/Settings/Oauth2.php:133 msgid "" "Redirect URI - leave blank unless your application specifically requires this" msgstr "" @@ -7821,53 +7792,20 @@ msgid "Connected Apps" msgstr "" #: ../../Zotlabs/Module/Settings/Oauth.php:152 -#: ../../Zotlabs/Module/Settings/Oauth2.php:175 +#: ../../Zotlabs/Module/Settings/Oauth2.php:181 msgid "Client key starts with" msgstr "" #: ../../Zotlabs/Module/Settings/Oauth.php:153 -#: ../../Zotlabs/Module/Settings/Oauth2.php:176 +#: ../../Zotlabs/Module/Settings/Oauth2.php:182 msgid "No name" msgstr "" #: ../../Zotlabs/Module/Settings/Oauth.php:154 -#: ../../Zotlabs/Module/Settings/Oauth2.php:177 +#: ../../Zotlabs/Module/Settings/Oauth2.php:183 msgid "Remove authorization" msgstr "" -#: ../../Zotlabs/Module/Settings/Oauth2.php:45 -msgid "Name and Secret are required" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Oauth2.php:94 -msgid "Add OAuth2 application" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Oauth2.php:100 -#: ../../Zotlabs/Module/Settings/Oauth2.php:128 -msgid "Grant Types" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Oauth2.php:100 -#: ../../Zotlabs/Module/Settings/Oauth2.php:101 -#: ../../Zotlabs/Module/Settings/Oauth2.php:128 -#: ../../Zotlabs/Module/Settings/Oauth2.php:129 -msgid "leave blank unless your application specifically requires this" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Oauth2.php:101 -#: ../../Zotlabs/Module/Settings/Oauth2.php:129 -msgid "Authorization scope" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Oauth2.php:113 -msgid "OAuth2 Application not found." -msgstr "" - -#: ../../Zotlabs/Module/Settings/Oauth2.php:171 -msgid "Connected OAuth2 Apps" -msgstr "" - #: ../../Zotlabs/Module/Settings/Permcats.php:24 msgid "Permission Name is required." msgstr "" @@ -8022,6 +7960,44 @@ msgstr "" msgid "Additional Features" msgstr "" +#: ../../Zotlabs/Module/Settings/Oauth2.php:46 +msgid "ID and Secret are required" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:98 +msgid "Add OAuth2 application" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:102 +#: ../../Zotlabs/Module/Settings/Oauth2.php:131 +msgid "Consumer ID" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:105 +#: ../../Zotlabs/Module/Settings/Oauth2.php:134 +msgid "Grant Types" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:105 +#: ../../Zotlabs/Module/Settings/Oauth2.php:106 +#: ../../Zotlabs/Module/Settings/Oauth2.php:134 +#: ../../Zotlabs/Module/Settings/Oauth2.php:135 +msgid "leave blank unless your application specifically requires this" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:106 +#: ../../Zotlabs/Module/Settings/Oauth2.php:135 +msgid "Authorization scope" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:118 +msgid "OAuth2 Application not found." +msgstr "" + +#: ../../Zotlabs/Module/Settings/Oauth2.php:177 +msgid "Connected OAuth2 Apps" +msgstr "" + #: ../../Zotlabs/Module/Settings/Channel.php:353 msgid "Nobody except yourself" msgstr "" @@ -8074,339 +8050,312 @@ msgstr "" msgid "Your files/photos are accessible via WebDAV at" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:507 +#: ../../Zotlabs/Module/Settings/Channel.php:505 msgid "Automatic membership approval" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:513 +#: ../../Zotlabs/Module/Settings/Channel.php:511 msgid "Enable hyperdrive" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:513 +#: ../../Zotlabs/Module/Settings/Channel.php:511 msgid "" "Import public third-party conversations in which your connections " "participate." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:532 +#: ../../Zotlabs/Module/Settings/Channel.php:530 msgid "Channel Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:539 +#: ../../Zotlabs/Module/Settings/Channel.php:536 msgid "Basic Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:542 +#: ../../Zotlabs/Module/Settings/Channel.php:539 msgid "Your Timezone:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:543 +#: ../../Zotlabs/Module/Settings/Channel.php:540 msgid "Default Post Location:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:543 +#: ../../Zotlabs/Module/Settings/Channel.php:540 msgid "Geographical location to display on your posts" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:544 +#: ../../Zotlabs/Module/Settings/Channel.php:541 msgid "Use Browser Location:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:546 +#: ../../Zotlabs/Module/Settings/Channel.php:543 msgid "Adult Content" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:546 +#: ../../Zotlabs/Module/Settings/Channel.php:543 msgid "" "This channel frequently or regularly publishes adult content. (Please tag " "any adult material and/or nudity with #NSFW)" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:548 +#: ../../Zotlabs/Module/Settings/Channel.php:545 msgid "Security and Privacy Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:550 +#: ../../Zotlabs/Module/Settings/Channel.php:547 msgid "Your permissions are already configured. Click to view/adjust" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:552 +#: ../../Zotlabs/Module/Settings/Channel.php:549 msgid "Hide my online presence" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:552 +#: ../../Zotlabs/Module/Settings/Channel.php:549 msgid "Prevents displaying in your profile that you are online" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:554 -msgid "Simple Privacy Settings:" +#: ../../Zotlabs/Module/Settings/Channel.php:555 +msgid "Allow others to tag your posts" msgstr "" #: ../../Zotlabs/Module/Settings/Channel.php:555 msgid "" -"Very Public - extremely permissive (should be used with caution)" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:556 -msgid "" -"Typical - default public, privacy when desired (similar to social " -"network permissions but with improved privacy)" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:557 -msgid "Private - default private, never open or public" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:558 -msgid "Blocked - default blocked to/from everybody" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:563 -msgid "Allow others to tag your posts" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:563 -msgid "" "Often used by the community to retro-actively flag inappropriate content" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:565 +#: ../../Zotlabs/Module/Settings/Channel.php:557 msgid "Channel Permission Limits" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:567 +#: ../../Zotlabs/Module/Settings/Channel.php:559 msgid "Expire other channel content after this many days" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:567 +#: ../../Zotlabs/Module/Settings/Channel.php:559 msgid "0 or blank to use the website limit." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:567 +#: ../../Zotlabs/Module/Settings/Channel.php:559 #, php-format msgid "This website expires after %d days." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:567 +#: ../../Zotlabs/Module/Settings/Channel.php:559 msgid "This website does not expire imported content." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:567 +#: ../../Zotlabs/Module/Settings/Channel.php:559 msgid "The website limit takes precedence if lower than your limit." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:568 +#: ../../Zotlabs/Module/Settings/Channel.php:560 msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:568 +#: ../../Zotlabs/Module/Settings/Channel.php:560 msgid "May reduce spam activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:569 +#: ../../Zotlabs/Module/Settings/Channel.php:561 msgid "Default Access List" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:571 +#: ../../Zotlabs/Module/Settings/Channel.php:563 msgid "Use my default audience setting for the type of object published" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:572 +#: ../../Zotlabs/Module/Settings/Channel.php:564 msgid "Profile to assign new connections" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:582 +#: ../../Zotlabs/Module/Settings/Channel.php:574 msgid "Default Permissions Group" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:588 +#: ../../Zotlabs/Module/Settings/Channel.php:580 msgid "Maximum private messages per day from unknown people:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:588 +#: ../../Zotlabs/Module/Settings/Channel.php:580 msgid "Useful to reduce spamming" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:595 +#: ../../Zotlabs/Module/Settings/Channel.php:587 msgid "By default post a status message when:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:596 +#: ../../Zotlabs/Module/Settings/Channel.php:588 msgid "accepting a friend request" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:597 +#: ../../Zotlabs/Module/Settings/Channel.php:589 msgid "joining a forum/community" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:598 +#: ../../Zotlabs/Module/Settings/Channel.php:590 msgid "making an interesting profile change" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:599 +#: ../../Zotlabs/Module/Settings/Channel.php:591 msgid "Send a notification email when:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:600 +#: ../../Zotlabs/Module/Settings/Channel.php:592 msgid "You receive a connection request" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:602 +#: ../../Zotlabs/Module/Settings/Channel.php:594 msgid "Someone writes on your profile wall" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:603 +#: ../../Zotlabs/Module/Settings/Channel.php:595 msgid "Someone writes a followup comment" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:606 +#: ../../Zotlabs/Module/Settings/Channel.php:598 msgid "You are tagged in a post" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:609 +#: ../../Zotlabs/Module/Settings/Channel.php:601 msgid "Someone likes your post/comment" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:612 +#: ../../Zotlabs/Module/Settings/Channel.php:604 msgid "Show visual notifications including:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:614 +#: ../../Zotlabs/Module/Settings/Channel.php:606 msgid "Unseen network activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:615 +#: ../../Zotlabs/Module/Settings/Channel.php:607 msgid "Unseen channel activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:617 +#: ../../Zotlabs/Module/Settings/Channel.php:609 msgid "Upcoming events" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:618 +#: ../../Zotlabs/Module/Settings/Channel.php:610 msgid "Events today" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:619 +#: ../../Zotlabs/Module/Settings/Channel.php:611 msgid "Upcoming birthdays" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:619 +#: ../../Zotlabs/Module/Settings/Channel.php:611 msgid "Not available in all themes" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:620 +#: ../../Zotlabs/Module/Settings/Channel.php:612 msgid "System (personal) notifications" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:621 +#: ../../Zotlabs/Module/Settings/Channel.php:613 msgid "System info messages" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:621 -#: ../../Zotlabs/Module/Settings/Channel.php:622 -#: ../../Zotlabs/Module/Settings/Channel.php:623 +#: ../../Zotlabs/Module/Settings/Channel.php:613 +#: ../../Zotlabs/Module/Settings/Channel.php:614 +#: ../../Zotlabs/Module/Settings/Channel.php:615 msgid "Recommended" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:622 +#: ../../Zotlabs/Module/Settings/Channel.php:614 msgid "System critical alerts" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:623 +#: ../../Zotlabs/Module/Settings/Channel.php:615 msgid "New connections" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:624 +#: ../../Zotlabs/Module/Settings/Channel.php:616 msgid "System Registrations" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:626 +#: ../../Zotlabs/Module/Settings/Channel.php:618 msgid "Unseen public activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:627 +#: ../../Zotlabs/Module/Settings/Channel.php:619 msgid "Unseen likes and dislikes" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:628 +#: ../../Zotlabs/Module/Settings/Channel.php:620 msgid "Unseen forum posts" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:629 +#: ../../Zotlabs/Module/Settings/Channel.php:621 msgid "Reported content" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:630 +#: ../../Zotlabs/Module/Settings/Channel.php:622 msgid "Email notification hub (hostname)" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:630 +#: ../../Zotlabs/Module/Settings/Channel.php:622 #, php-format msgid "" "If your channel is mirrored to multiple hubs, set this to your preferred " "location. This will prevent duplicate email notifications. Example: %s" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:631 +#: ../../Zotlabs/Module/Settings/Channel.php:623 msgid "Show new wall posts, private messages and connections under Notices" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:633 +#: ../../Zotlabs/Module/Settings/Channel.php:625 msgid "Notify me of events this many days in advance" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:633 +#: ../../Zotlabs/Module/Settings/Channel.php:625 msgid "Must be greater than 0" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:639 +#: ../../Zotlabs/Module/Settings/Channel.php:631 msgid "Advanced Account/Page Type Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:640 +#: ../../Zotlabs/Module/Settings/Channel.php:632 msgid "Change the behaviour of this account for special situations" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:642 +#: ../../Zotlabs/Module/Settings/Channel.php:634 msgid "Miscellaneous Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:643 -msgid "Default photo upload folder" +#: ../../Zotlabs/Module/Settings/Channel.php:635 +msgid "Default photo upload folder name" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:643 -#: ../../Zotlabs/Module/Settings/Channel.php:644 +#: ../../Zotlabs/Module/Settings/Channel.php:635 +#: ../../Zotlabs/Module/Settings/Channel.php:636 msgid "%Y - current year, %m - current month" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:644 -msgid "Default file upload folder" +#: ../../Zotlabs/Module/Settings/Channel.php:636 +msgid "Default file upload folder name" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:646 +#: ../../Zotlabs/Module/Settings/Channel.php:638 msgid "Personal menu to display in your channel pages" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:648 +#: ../../Zotlabs/Module/Settings/Channel.php:640 msgid "Remove this channel." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:649 -msgid "Firefox Share $Projectname provider" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:650 +#: ../../Zotlabs/Module/Settings/Channel.php:641 msgid "Start calendar week on Monday" msgstr "" -#: ../../Zotlabs/Module/Search.php:228 +#: ../../Zotlabs/Module/Search.php:229 #, php-format msgid "Items tagged with: %s" msgstr "" -#: ../../Zotlabs/Module/Search.php:230 +#: ../../Zotlabs/Module/Search.php:231 #, php-format msgid "Search results for: %s" msgstr "" @@ -8430,7 +8379,7 @@ msgid "NEW" msgstr "" #: ../../Zotlabs/Module/Sharedwithme.php:106 -#: ../../Zotlabs/Storage/Browser.php:293 ../../include/text.php:1330 +#: ../../Zotlabs/Storage/Browser.php:293 ../../include/text.php:1334 msgid "Size" msgstr "" @@ -8636,7 +8585,7 @@ msgid "Post not found." msgstr "" #: ../../Zotlabs/Module/Tagger.php:81 ../../include/conversation.php:145 -#: ../../include/text.php:1886 +#: ../../include/text.php:1926 msgid "comment" msgstr "" @@ -8657,91 +8606,91 @@ msgstr "" msgid "Select a tag to remove: " msgstr "" -#: ../../Zotlabs/Module/Directory.php:132 +#: ../../Zotlabs/Module/Directory.php:135 msgid "No default suggestions were found." msgstr "" -#: ../../Zotlabs/Module/Directory.php:307 +#: ../../Zotlabs/Module/Directory.php:310 #, php-format msgid "%d rating" msgid_plural "%d ratings" msgstr[0] "" msgstr[1] "" -#: ../../Zotlabs/Module/Directory.php:315 +#: ../../Zotlabs/Module/Directory.php:318 msgid "Gender: " msgstr "" -#: ../../Zotlabs/Module/Directory.php:316 +#: ../../Zotlabs/Module/Directory.php:319 msgid "Status: " msgstr "" -#: ../../Zotlabs/Module/Directory.php:317 +#: ../../Zotlabs/Module/Directory.php:320 msgid "Homepage: " msgstr "" -#: ../../Zotlabs/Module/Directory.php:379 +#: ../../Zotlabs/Module/Directory.php:382 msgid "Description:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:394 +#: ../../Zotlabs/Module/Directory.php:397 msgid "Keywords: " msgstr "" -#: ../../Zotlabs/Module/Directory.php:397 +#: ../../Zotlabs/Module/Directory.php:400 msgid "Don't suggest" msgstr "" -#: ../../Zotlabs/Module/Directory.php:399 +#: ../../Zotlabs/Module/Directory.php:402 msgid "Common connections (estimated):" msgstr "" -#: ../../Zotlabs/Module/Directory.php:445 +#: ../../Zotlabs/Module/Directory.php:448 msgid "Global Directory" msgstr "" -#: ../../Zotlabs/Module/Directory.php:445 +#: ../../Zotlabs/Module/Directory.php:448 msgid "Local Directory" msgstr "" -#: ../../Zotlabs/Module/Directory.php:451 +#: ../../Zotlabs/Module/Directory.php:454 msgid "Finding:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:454 +#: ../../Zotlabs/Module/Directory.php:457 #: ../../Zotlabs/Widget/Findpeople.php:31 msgid "Channel Suggestions" msgstr "" -#: ../../Zotlabs/Module/Directory.php:456 +#: ../../Zotlabs/Module/Directory.php:459 msgid "next page" msgstr "" -#: ../../Zotlabs/Module/Directory.php:456 +#: ../../Zotlabs/Module/Directory.php:459 msgid "previous page" msgstr "" -#: ../../Zotlabs/Module/Directory.php:457 +#: ../../Zotlabs/Module/Directory.php:460 msgid "Sort options" msgstr "" -#: ../../Zotlabs/Module/Directory.php:458 +#: ../../Zotlabs/Module/Directory.php:461 msgid "Alphabetic" msgstr "" -#: ../../Zotlabs/Module/Directory.php:459 +#: ../../Zotlabs/Module/Directory.php:462 msgid "Reverse Alphabetic" msgstr "" -#: ../../Zotlabs/Module/Directory.php:460 +#: ../../Zotlabs/Module/Directory.php:463 msgid "Newest to Oldest" msgstr "" -#: ../../Zotlabs/Module/Directory.php:461 +#: ../../Zotlabs/Module/Directory.php:464 msgid "Oldest to Newest" msgstr "" -#: ../../Zotlabs/Module/Directory.php:475 +#: ../../Zotlabs/Module/Directory.php:478 msgid "No entries (some entries may be hidden)." msgstr "" @@ -8790,6 +8739,24 @@ msgstr "" msgid "This app allows you to add categories to posts and events." msgstr "" +#: ../../Zotlabs/Module/Zotfinger.php:23 +msgid "Zotfinger Diagnostic" +msgstr "" + +#: ../../Zotlabs/Module/Zotfinger.php:24 +msgid "Lookup URL" +msgstr "" + +#: ../../Zotlabs/Module/Photomap.php:12 +msgid "" +"This app provides a displayable map when viewing detail of photos that " +"contain location information." +msgstr "" + +#: ../../Zotlabs/Module/Photomap.php:20 +msgid "This app is currently installed." +msgstr "" + #: ../../Zotlabs/Module/Viewconnections.php:62 msgid "No connections." msgstr "" @@ -8803,31 +8770,13 @@ msgstr "" msgid "View Connections" msgstr "" -#: ../../Zotlabs/Module/Zotfinger.php:23 -msgid "Zotfinger Diagnostic" -msgstr "" - -#: ../../Zotlabs/Module/Zotfinger.php:24 -msgid "Lookup URL" -msgstr "" - -#: ../../Zotlabs/Module/Suggestions.php:38 +#: ../../Zotlabs/Module/Suggestions.php:39 msgid "" "This app (when installed) displays a small number of friend suggestions on " "selected pages or you can run the app to display a full list of channel " "suggestions." msgstr "" -#: ../../Zotlabs/Module/Photomap.php:12 -msgid "" -"This app provides a displayable map when viewing detail of photos that " -"contain location information." -msgstr "" - -#: ../../Zotlabs/Module/Photomap.php:20 -msgid "This app is currently installed." -msgstr "" - #: ../../Zotlabs/Storage/Browser.php:107 ../../Zotlabs/Storage/Browser.php:295 msgid "parent" msgstr "" @@ -8861,7 +8810,6 @@ msgid "Add Files" msgstr "" #: ../../Zotlabs/Storage/Browser.php:292 -#: ../../extend/addon/a/wiki/Mod_Wiki.php:220 msgid "Type" msgstr "" @@ -8908,7 +8856,7 @@ msgstr "" msgid "DB updates" msgstr "" -#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:184 +#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:178 msgid "Admin" msgstr "" @@ -9028,58 +8976,6 @@ msgstr "" msgid "New Message" msgstr "" -#: ../../Zotlabs/Widget/Newmember.php:24 -msgid "Profile Creation" -msgstr "" - -#: ../../Zotlabs/Widget/Newmember.php:26 -msgid "Upload profile photo" -msgstr "" - -#: ../../Zotlabs/Widget/Newmember.php:27 -msgid "Upload cover photo" -msgstr "" - -#: ../../Zotlabs/Widget/Newmember.php:28 ../../include/nav.php:106 -msgid "Edit your profile" -msgstr "" - -#: ../../Zotlabs/Widget/Newmember.php:31 -msgid "Find and Connect with others" -msgstr "" - -#: ../../Zotlabs/Widget/Newmember.php:33 -msgid "View the directory" -msgstr "" - -#: ../../Zotlabs/Widget/Newmember.php:34 -msgid "View friend suggestions" -msgstr "" - -#: ../../Zotlabs/Widget/Newmember.php:35 -msgid "Manage your connections" -msgstr "" - -#: ../../Zotlabs/Widget/Newmember.php:38 -msgid "Communicate" -msgstr "" - -#: ../../Zotlabs/Widget/Newmember.php:40 -msgid "View your channel homepage" -msgstr "" - -#: ../../Zotlabs/Widget/Newmember.php:41 -msgid "View your network stream" -msgstr "" - -#: ../../Zotlabs/Widget/Newmember.php:57 -msgid "View public stream" -msgstr "" - -#: ../../Zotlabs/Widget/Newmember.php:61 ../../include/features.php:60 -msgid "New Member Links" -msgstr "" - #: ../../Zotlabs/Widget/Photo.php:48 ../../Zotlabs/Widget/Photo_rand.php:58 msgid "photo/image" msgstr "" @@ -9161,10 +9057,6 @@ msgstr "" msgid "Tags" msgstr "" -#: ../../Zotlabs/Widget/Affinity.php:37 -msgid "Friend zoom in/out" -msgstr "" - #: ../../Zotlabs/Widget/Common_friends.php:40 msgid "Common Connections" msgstr "" @@ -9293,15 +9185,19 @@ msgstr "" msgid "Activity Filters" msgstr "" -#: ../../Zotlabs/Widget/Suggestions.php:48 +#: ../../Zotlabs/Widget/Affinity.php:37 +msgid "Friend zoom in/out" +msgstr "" + +#: ../../Zotlabs/Widget/Suggestions.php:49 msgid "Ignore/Hide" msgstr "" -#: ../../Zotlabs/Widget/Suggestions.php:53 +#: ../../Zotlabs/Widget/Suggestions.php:54 msgid "Suggestions" msgstr "" -#: ../../Zotlabs/Widget/Suggestions.php:54 +#: ../../Zotlabs/Widget/Suggestions.php:55 msgid "See more..." msgstr "" @@ -9508,99 +9404,62 @@ msgstr "" msgid "Sorry, you have got no notifications at the moment" msgstr "" -#: ../../include/connections.php:145 -msgid "New window" +#: ../../Zotlabs/Widget/Newmember.php:29 +msgid "Profile Creation" msgstr "" -#: ../../include/connections.php:146 -msgid "Open the selected location in a different window or browser tab" +#: ../../Zotlabs/Widget/Newmember.php:31 +msgid "Upload profile photo" msgstr "" -#: ../../include/connections.php:753 ../../include/event.php:1354 -msgid "Home, Voice" +#: ../../Zotlabs/Widget/Newmember.php:32 +msgid "Upload cover photo" msgstr "" -#: ../../include/connections.php:754 ../../include/event.php:1355 -msgid "Home, Fax" +#: ../../Zotlabs/Widget/Newmember.php:33 ../../include/nav.php:108 +msgid "Edit your profile" msgstr "" -#: ../../include/connections.php:756 ../../include/event.php:1357 -msgid "Work, Voice" +#: ../../Zotlabs/Widget/Newmember.php:36 +msgid "Find and Connect with others" msgstr "" -#: ../../include/connections.php:757 ../../include/event.php:1358 -msgid "Work, Fax" +#: ../../Zotlabs/Widget/Newmember.php:38 +msgid "View the directory" msgstr "" -#: ../../include/connections.php:856 -msgid "No connections" +#: ../../Zotlabs/Widget/Newmember.php:39 +msgid "View friend suggestions" msgstr "" -#: ../../include/connections.php:888 -#, php-format -msgid "View all %s connections" +#: ../../Zotlabs/Widget/Newmember.php:40 +msgid "Manage your connections" msgstr "" -#: ../../include/connections.php:921 -#, php-format -msgid "Network: %s" +#: ../../Zotlabs/Widget/Newmember.php:43 +msgid "Communicate" msgstr "" -#: ../../include/feedutils.php:860 ../../include/text.php:1330 +#: ../../Zotlabs/Widget/Newmember.php:45 +msgid "View your channel homepage" +msgstr "" + +#: ../../Zotlabs/Widget/Newmember.php:46 +msgid "View your network stream" +msgstr "" + +#: ../../Zotlabs/Widget/Newmember.php:62 +msgid "View public stream" +msgstr "" + +#: ../../Zotlabs/Widget/Newmember.php:66 ../../include/features.php:60 +msgid "New Member Links" +msgstr "" + +#: ../../include/feedutils.php:860 ../../include/text.php:1334 msgid "unknown" msgstr "" -#: ../../include/bbcode.php:226 ../../include/bbcode.php:1378 -#: ../../include/bbcode.php:1381 ../../include/bbcode.php:1386 -#: ../../include/bbcode.php:1389 ../../include/bbcode.php:1392 -#: ../../include/bbcode.php:1395 ../../include/bbcode.php:1400 -#: ../../include/bbcode.php:1403 ../../include/bbcode.php:1408 -#: ../../include/bbcode.php:1411 ../../include/bbcode.php:1414 -#: ../../include/bbcode.php:1417 -msgid "Image/photo" -msgstr "" - -#: ../../include/bbcode.php:265 ../../include/bbcode.php:1428 -msgid "Encrypted content" -msgstr "" - -#: ../../include/bbcode.php:281 -#, php-format -msgid "Install %1$s element %2$s" -msgstr "" - -#: ../../include/bbcode.php:285 -#, php-format -msgid "" -"This post contains an installable %s element, however you lack permissions " -"to install it on this site." -msgstr "" - -#: ../../include/bbcode.php:510 -msgid "card" -msgstr "" - -#: ../../include/bbcode.php:512 -msgid "article" -msgstr "" - -#: ../../include/bbcode.php:595 ../../include/bbcode.php:603 -msgid "Click to open/close" -msgstr "" - -#: ../../include/bbcode.php:603 -msgid "spoiler" -msgstr "" - -#: ../../include/bbcode.php:905 ../../include/bbcode.php:1084 -#: ../../extend/addon/a/wiki/NativeWikiPage.php:596 -msgid "Different viewers will see this text differently" -msgstr "" - -#: ../../include/bbcode.php:1366 -msgid "$1 wrote:" -msgstr "" - #: ../../include/oembed.php:153 msgid "View PDF" msgstr "" @@ -9621,36 +9480,104 @@ msgstr "" msgid "Embedding disabled" msgstr "" -#: ../../include/channel.php:44 -msgid "Unable to obtain identity information from database" +#: ../../include/photos.php:156 +#, php-format +msgid "Image exceeds website size limit of %lu bytes" msgstr "" -#: ../../include/channel.php:77 -msgid "Empty name" +#: ../../include/photos.php:167 +msgid "Image file is empty." msgstr "" -#: ../../include/channel.php:80 -msgid "Name too long" +#: ../../include/photos.php:339 +msgid "Photo storage failed." msgstr "" -#: ../../include/channel.php:196 -msgid "No account identifier" +#: ../../include/photos.php:394 +msgid "a new photo" msgstr "" -#: ../../include/channel.php:208 -msgid "Nickname is required." +#: ../../include/photos.php:398 +#, php-format +msgctxt "photo_upload" +msgid "%1$s posted %2$s to %3$s" msgstr "" -#: ../../include/channel.php:290 -msgid "Unable to retrieve created identity" +#: ../../include/photos.php:697 ../../include/conversation.php:1790 +#: ../../include/nav.php:413 +msgid "Photo Albums" msgstr "" -#: ../../include/channel.php:388 -msgid "Default Profile" +#: ../../include/photos.php:702 +msgid "Upload New Photos" msgstr "" -#: ../../include/channel.php:585 ../../include/channel.php:674 -msgid "Unable to retrieve modified identity" +#: ../../include/account.php:31 +msgid "Not a valid email address" +msgstr "" + +#: ../../include/account.php:34 +msgid "Your email domain is not among those allowed on this site" +msgstr "" + +#: ../../include/account.php:41 +msgid "Your email address is already registered at this site." +msgstr "" + +#: ../../include/account.php:74 +msgid "An invitation is required." +msgstr "" + +#: ../../include/account.php:78 +msgid "Invitation could not be verified." +msgstr "" + +#: ../../include/account.php:156 +msgid "Please enter the required information." +msgstr "" + +#: ../../include/account.php:220 +msgid "Failed to store account information." +msgstr "" + +#: ../../include/account.php:309 +#, php-format +msgid "Registration confirmation for %s" +msgstr "" + +#: ../../include/account.php:385 +#, php-format +msgid "Registration request at %s" +msgstr "" + +#: ../../include/account.php:409 +msgid "your registration password" +msgstr "" + +#: ../../include/account.php:415 ../../include/account.php:478 +#, php-format +msgid "Registration details for %s" +msgstr "" + +#: ../../include/account.php:490 +msgid "Account approved." +msgstr "" + +#: ../../include/account.php:532 +#, php-format +msgid "Registration revoked for %s" +msgstr "" + +#: ../../include/account.php:819 ../../include/account.php:821 +msgid "Click here to upgrade." +msgstr "" + +#: ../../include/account.php:827 +msgid "This action exceeds the limits set by your subscription plan." +msgstr "" + +#: ../../include/account.php:832 +msgid "This action is not available under your subscription plan." msgstr "" #: ../../include/datetime.php:140 @@ -9665,7 +9592,7 @@ msgstr "" msgid "YYYY-MM-DD or MM-DD" msgstr "" -#: ../../include/datetime.php:238 ../../boot.php:2472 +#: ../../include/datetime.php:238 ../../boot.php:2478 msgid "never" msgstr "" @@ -9743,6 +9670,56 @@ msgstr "" msgid "Cannot locate DNS info for database server '%s'" msgstr "" +#: ../../include/bbcode.php:226 ../../include/bbcode.php:1384 +#: ../../include/bbcode.php:1387 ../../include/bbcode.php:1392 +#: ../../include/bbcode.php:1395 ../../include/bbcode.php:1398 +#: ../../include/bbcode.php:1401 ../../include/bbcode.php:1406 +#: ../../include/bbcode.php:1409 ../../include/bbcode.php:1414 +#: ../../include/bbcode.php:1417 ../../include/bbcode.php:1420 +#: ../../include/bbcode.php:1423 +msgid "Image/photo" +msgstr "" + +#: ../../include/bbcode.php:265 ../../include/bbcode.php:1443 +msgid "Encrypted content" +msgstr "" + +#: ../../include/bbcode.php:281 +#, php-format +msgid "Install %1$s element %2$s" +msgstr "" + +#: ../../include/bbcode.php:285 +#, php-format +msgid "" +"This post contains an installable %s element, however you lack permissions " +"to install it on this site." +msgstr "" + +#: ../../include/bbcode.php:510 +msgid "card" +msgstr "" + +#: ../../include/bbcode.php:512 +msgid "article" +msgstr "" + +#: ../../include/bbcode.php:595 ../../include/bbcode.php:603 +msgid "Click to open/close" +msgstr "" + +#: ../../include/bbcode.php:603 +msgid "spoiler" +msgstr "" + +#: ../../include/bbcode.php:905 ../../include/bbcode.php:1085 +msgid "Different viewers will see this text differently" +msgstr "" + +#: ../../include/bbcode.php:1371 +msgid "$1 wrote:" +msgstr "" + #: ../../include/js_strings.php:5 msgid "Delete this item?" msgstr "" @@ -9925,19 +9902,19 @@ msgstr "" msgid "timeago.numbers" msgstr "" -#: ../../include/js_strings.php:61 ../../include/text.php:1254 +#: ../../include/js_strings.php:61 ../../include/text.php:1258 msgid "January" msgstr "" -#: ../../include/js_strings.php:62 ../../include/text.php:1254 +#: ../../include/js_strings.php:62 ../../include/text.php:1258 msgid "February" msgstr "" -#: ../../include/js_strings.php:63 ../../include/text.php:1254 +#: ../../include/js_strings.php:63 ../../include/text.php:1258 msgid "March" msgstr "" -#: ../../include/js_strings.php:64 ../../include/text.php:1254 +#: ../../include/js_strings.php:64 ../../include/text.php:1258 msgid "April" msgstr "" @@ -9946,31 +9923,31 @@ msgctxt "long" msgid "May" msgstr "" -#: ../../include/js_strings.php:66 ../../include/text.php:1254 +#: ../../include/js_strings.php:66 ../../include/text.php:1258 msgid "June" msgstr "" -#: ../../include/js_strings.php:67 ../../include/text.php:1254 +#: ../../include/js_strings.php:67 ../../include/text.php:1258 msgid "July" msgstr "" -#: ../../include/js_strings.php:68 ../../include/text.php:1254 +#: ../../include/js_strings.php:68 ../../include/text.php:1258 msgid "August" msgstr "" -#: ../../include/js_strings.php:69 ../../include/text.php:1254 +#: ../../include/js_strings.php:69 ../../include/text.php:1258 msgid "September" msgstr "" -#: ../../include/js_strings.php:70 ../../include/text.php:1254 +#: ../../include/js_strings.php:70 ../../include/text.php:1258 msgid "October" msgstr "" -#: ../../include/js_strings.php:71 ../../include/text.php:1254 +#: ../../include/js_strings.php:71 ../../include/text.php:1258 msgid "November" msgstr "" -#: ../../include/js_strings.php:72 ../../include/text.php:1254 +#: ../../include/js_strings.php:72 ../../include/text.php:1258 msgid "December" msgstr "" @@ -10023,31 +10000,31 @@ msgstr "" msgid "Dec" msgstr "" -#: ../../include/js_strings.php:85 ../../include/text.php:1250 +#: ../../include/js_strings.php:85 ../../include/text.php:1254 msgid "Sunday" msgstr "" -#: ../../include/js_strings.php:86 ../../include/text.php:1250 +#: ../../include/js_strings.php:86 ../../include/text.php:1254 msgid "Monday" msgstr "" -#: ../../include/js_strings.php:87 ../../include/text.php:1250 +#: ../../include/js_strings.php:87 ../../include/text.php:1254 msgid "Tuesday" msgstr "" -#: ../../include/js_strings.php:88 ../../include/text.php:1250 +#: ../../include/js_strings.php:88 ../../include/text.php:1254 msgid "Wednesday" msgstr "" -#: ../../include/js_strings.php:89 ../../include/text.php:1250 +#: ../../include/js_strings.php:89 ../../include/text.php:1254 msgid "Thursday" msgstr "" -#: ../../include/js_strings.php:90 ../../include/text.php:1250 +#: ../../include/js_strings.php:90 ../../include/text.php:1254 msgid "Friday" msgstr "" -#: ../../include/js_strings.php:91 ../../include/text.php:1250 +#: ../../include/js_strings.php:91 ../../include/text.php:1254 msgid "Saturday" msgstr "" @@ -10104,6 +10081,38 @@ msgctxt "calendar" msgid "All day" msgstr "" +#: ../../include/channel.php:44 +msgid "Unable to obtain identity information from database" +msgstr "" + +#: ../../include/channel.php:77 +msgid "Empty name" +msgstr "" + +#: ../../include/channel.php:80 +msgid "Name too long" +msgstr "" + +#: ../../include/channel.php:196 +msgid "No account identifier" +msgstr "" + +#: ../../include/channel.php:208 +msgid "Nickname is required." +msgstr "" + +#: ../../include/channel.php:290 +msgid "Unable to retrieve created identity" +msgstr "" + +#: ../../include/channel.php:388 +msgid "Default Profile" +msgstr "" + +#: ../../include/channel.php:585 ../../include/channel.php:674 +msgid "Unable to retrieve modified identity" +msgstr "" + #: ../../include/attach.php:268 ../../include/attach.php:377 msgid "Item was not found." msgstr "" @@ -10170,191 +10179,6 @@ msgstr "" msgid "Empty path" msgstr "" -#: ../../include/photos.php:156 -#, php-format -msgid "Image exceeds website size limit of %lu bytes" -msgstr "" - -#: ../../include/photos.php:167 -msgid "Image file is empty." -msgstr "" - -#: ../../include/photos.php:339 -msgid "Photo storage failed." -msgstr "" - -#: ../../include/photos.php:394 -msgid "a new photo" -msgstr "" - -#: ../../include/photos.php:398 -#, php-format -msgctxt "photo_upload" -msgid "%1$s posted %2$s to %3$s" -msgstr "" - -#: ../../include/photos.php:697 ../../include/conversation.php:1915 -#: ../../include/nav.php:419 -msgid "Photo Albums" -msgstr "" - -#: ../../include/photos.php:702 -msgid "Upload New Photos" -msgstr "" - -#: ../../include/event.php:32 ../../include/event.php:101 -msgid "l F d, Y \\@ g:i A" -msgstr "" - -#: ../../include/event.php:40 ../../include/event.php:106 -msgid "Starts:" -msgstr "" - -#: ../../include/event.php:50 ../../include/event.php:110 -msgid "Finishes:" -msgstr "" - -#: ../../include/event.php:1045 -msgid "This event has been added to your calendar." -msgstr "" - -#: ../../include/event.php:1266 -msgid "Not specified" -msgstr "" - -#: ../../include/event.php:1267 -msgid "Needs Action" -msgstr "" - -#: ../../include/event.php:1268 -msgid "Completed" -msgstr "" - -#: ../../include/event.php:1269 -msgid "In Process" -msgstr "" - -#: ../../include/event.php:1270 -msgid "Cancelled" -msgstr "" - -#: ../../include/network.php:812 -msgid "view full size" -msgstr "" - -#: ../../include/network.php:1941 ../../include/network.php:1942 -msgid "Friendica" -msgstr "" - -#: ../../include/network.php:1943 -msgid "OStatus" -msgstr "" - -#: ../../include/network.php:1944 -msgid "GNU-Social" -msgstr "" - -#: ../../include/network.php:1945 -msgid "RSS/Atom" -msgstr "" - -#: ../../include/network.php:1948 -msgid "Diaspora" -msgstr "" - -#: ../../include/network.php:1949 -msgid "Facebook" -msgstr "" - -#: ../../include/network.php:1950 -msgid "Zot" -msgstr "" - -#: ../../include/network.php:1951 -msgid "LinkedIn" -msgstr "" - -#: ../../include/network.php:1952 -msgid "XMPP/IM" -msgstr "" - -#: ../../include/network.php:1953 -msgid "MySpace" -msgstr "" - -#: ../../include/items.php:958 ../../include/items.php:1018 -msgid "(Unknown)" -msgstr "" - -#: ../../include/items.php:1200 -msgid "Visible to anybody on the internet." -msgstr "" - -#: ../../include/items.php:1202 -msgid "Visible to you only." -msgstr "" - -#: ../../include/items.php:1204 -msgid "Visible to anybody in this network." -msgstr "" - -#: ../../include/items.php:1206 -msgid "Visible to anybody authenticated." -msgstr "" - -#: ../../include/items.php:1208 -#, php-format -msgid "Visible to anybody on %s." -msgstr "" - -#: ../../include/items.php:1210 -msgid "Visible to all connections." -msgstr "" - -#: ../../include/items.php:1212 -msgid "Visible to approved connections." -msgstr "" - -#: ../../include/items.php:1214 -msgid "Visible to specific connections." -msgstr "" - -#: ../../include/items.php:3958 -msgid "Privacy group not found." -msgstr "" - -#: ../../include/items.php:3974 -msgid "Privacy group is empty." -msgstr "" - -#: ../../include/items.php:3981 -#, php-format -msgid "Privacy group: %s" -msgstr "" - -#: ../../include/items.php:3993 -msgid "Connection not found." -msgstr "" - -#: ../../include/items.php:4338 -msgid "profile photo" -msgstr "" - -#: ../../include/items.php:4534 -#, php-format -msgid "[Edited %s]" -msgstr "" - -#: ../../include/items.php:4534 -msgctxt "edit_activity" -msgid "Post" -msgstr "" - -#: ../../include/items.php:4534 -msgctxt "edit_activity" -msgid "Comment" -msgstr "" - #: ../../include/auth.php:196 msgid "Delegation session ended." msgstr "" @@ -10375,306 +10199,42 @@ msgstr "" msgid "Login failed." msgstr "" -#: ../../include/account.php:37 -msgid "Not a valid email address" +#: ../../include/connections.php:157 +msgid "New window" msgstr "" -#: ../../include/account.php:39 -msgid "Your email domain is not among those allowed on this site" +#: ../../include/connections.php:158 +msgid "Open the selected location in a different window or browser tab" msgstr "" -#: ../../include/account.php:45 -msgid "Your email address is already registered at this site." +#: ../../include/connections.php:773 ../../include/event.php:1356 +msgid "Home, Voice" msgstr "" -#: ../../include/account.php:77 -msgid "An invitation is required." +#: ../../include/connections.php:774 ../../include/event.php:1357 +msgid "Home, Fax" msgstr "" -#: ../../include/account.php:81 -msgid "Invitation could not be verified." +#: ../../include/connections.php:776 ../../include/event.php:1359 +msgid "Work, Voice" msgstr "" -#: ../../include/account.php:158 -msgid "Please enter the required information." +#: ../../include/connections.php:777 ../../include/event.php:1360 +msgid "Work, Fax" msgstr "" -#: ../../include/account.php:224 -msgid "Failed to store account information." +#: ../../include/connections.php:876 +msgid "No connections" msgstr "" -#: ../../include/account.php:313 +#: ../../include/connections.php:908 #, php-format -msgid "Registration confirmation for %s" +msgid "View all %s connections" msgstr "" -#: ../../include/account.php:384 +#: ../../include/connections.php:941 #, php-format -msgid "Registration request at %s" -msgstr "" - -#: ../../include/account.php:406 -msgid "your registration password" -msgstr "" - -#: ../../include/account.php:412 ../../include/account.php:474 -#, php-format -msgid "Registration details for %s" -msgstr "" - -#: ../../include/account.php:485 -msgid "Account approved." -msgstr "" - -#: ../../include/account.php:525 -#, php-format -msgid "Registration revoked for %s" -msgstr "" - -#: ../../include/account.php:804 ../../include/account.php:806 -msgid "Click here to upgrade." -msgstr "" - -#: ../../include/account.php:812 -msgid "This action exceeds the limits set by your subscription plan." -msgstr "" - -#: ../../include/account.php:817 -msgid "This action is not available under your subscription plan." -msgstr "" - -#: ../../include/features.php:56 -msgid "General Features" -msgstr "" - -#: ../../include/features.php:61 -msgid "Display new member quick links menu" -msgstr "" - -#: ../../include/features.php:69 -msgid "Advanced Profiles" -msgstr "" - -#: ../../include/features.php:70 -msgid "Additional profile sections and selections" -msgstr "" - -#: ../../include/features.php:116 -msgid "Private Notes" -msgstr "" - -#: ../../include/features.php:117 -msgid "Enables a tool to store notes and reminders (note: not encrypted)" -msgstr "" - -#: ../../include/features.php:137 -msgid "Create interactive articles" -msgstr "" - -#: ../../include/features.php:154 -msgid "Photo Location" -msgstr "" - -#: ../../include/features.php:155 -msgid "If location data is available on uploaded photos, link this to a map." -msgstr "" - -#: ../../include/features.php:183 -msgid "Event Timezone Selection" -msgstr "" - -#: ../../include/features.php:184 -msgid "Allow event creation in timezones other than your own." -msgstr "" - -#: ../../include/features.php:202 -msgid "Advanced Directory Search" -msgstr "" - -#: ../../include/features.php:203 -msgid "Allows creation of complex directory search queries" -msgstr "" - -#: ../../include/features.php:211 -msgid "Advanced Theme and Layout Settings" -msgstr "" - -#: ../../include/features.php:212 -msgid "Allows fine tuning of themes and page layouts" -msgstr "" - -#: ../../include/features.php:221 -msgid "Access Control and Permissions" -msgstr "" - -#: ../../include/features.php:225 -msgid "Privacy Groups" -msgstr "" - -#: ../../include/features.php:226 -msgid "Enable management and selection of privacy groups" -msgstr "" - -#: ../../include/features.php:262 -msgid "OAuth2 Clients" -msgstr "" - -#: ../../include/features.php:263 -msgid "Manage OAuth2 authenticatication tokens for mobile and remote apps." -msgstr "" - -#: ../../include/features.php:283 -msgid "Post Composition Features" -msgstr "" - -#: ../../include/features.php:359 -msgid "Auto-save drafts of posts and comments" -msgstr "" - -#: ../../include/features.php:360 -msgid "" -"Automatically saves post and comment drafts in local browser storage to help " -"prevent accidental loss of compositions" -msgstr "" - -#: ../../include/features.php:371 -msgid "Network and Stream Filtering" -msgstr "" - -#: ../../include/features.php:461 -msgid "Post/Comment Tools" -msgstr "" - -#: ../../include/features.php:465 -msgid "Community Tagging" -msgstr "" - -#: ../../include/features.php:466 -msgid "Ability to tag existing posts" -msgstr "" - -#: ../../include/features.php:474 -msgid "Post Categories" -msgstr "" - -#: ../../include/features.php:475 -msgid "Add categories to your posts" -msgstr "" - -#: ../../include/features.php:483 -msgid "Emoji Reactions" -msgstr "" - -#: ../../include/features.php:484 -msgid "Add emoji reaction ability to posts" -msgstr "" - -#: ../../include/features.php:493 -msgid "Ability to file posts under folders" -msgstr "" - -#: ../../include/features.php:501 -msgid "Dislike Posts" -msgstr "" - -#: ../../include/features.php:502 -msgid "Ability to dislike posts/comments" -msgstr "" - -#: ../../include/features.php:519 -msgid "Tag Cloud" -msgstr "" - -#: ../../include/features.php:520 -msgid "Provide a personal tag cloud on your channel page" -msgstr "" - -#: ../../include/acl_selectors.php:113 -msgid "Who can see this?" -msgstr "" - -#: ../../include/acl_selectors.php:114 -msgid "Custom selection" -msgstr "" - -#: ../../include/acl_selectors.php:115 -msgid "" -"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit " -"the scope of \"Show\"." -msgstr "" - -#: ../../include/acl_selectors.php:116 -msgid "Show" -msgstr "" - -#: ../../include/acl_selectors.php:117 -msgid "Don't show" -msgstr "" - -#: ../../include/acl_selectors.php:150 -msgid "" -"Post permissions cannot be changed after a post is shared.
These " -"permissions set who is allowed to view the post." -msgstr "" - -#: ../../include/import.php:28 -msgid "Unable to import a removed channel." -msgstr "" - -#: ../../include/import.php:54 -msgid "" -"Cannot create a duplicate channel identifier on this system. Import failed." -msgstr "" - -#: ../../include/import.php:75 -msgid "Unable to create a unique channel address. Import failed." -msgstr "" - -#: ../../include/import.php:121 -msgid "Cloned channel not found. Import failed." -msgstr "" - -#: ../../include/zid.php:357 -#, php-format -msgid "OpenWebAuth: %1$s welcomes %2$s" -msgstr "" - -#: ../../include/security.php:576 -msgid "" -"The form security token was not correct. This probably happened because the " -"form has been opened for too long (>3 hours) before submitting it." -msgstr "" - -#: ../../include/taxonomy.php:322 -msgid "Trending" -msgstr "" - -#: ../../include/taxonomy.php:566 -msgid "Keywords" -msgstr "" - -#: ../../include/taxonomy.php:587 -msgid "have" -msgstr "" - -#: ../../include/taxonomy.php:587 -msgid "has" -msgstr "" - -#: ../../include/taxonomy.php:588 -msgid "want" -msgstr "" - -#: ../../include/taxonomy.php:588 -msgid "wants" -msgstr "" - -#: ../../include/taxonomy.php:589 -msgid "likes" -msgstr "" - -#: ../../include/taxonomy.php:590 -msgid "dislikes" +msgid "Network: %s" msgstr "" #: ../../include/conversation.php:168 @@ -10697,8 +10257,8 @@ msgstr "" msgid "%1$s poked %2$s" msgstr "" -#: ../../include/conversation.php:250 ../../include/text.php:1019 -#: ../../include/text.php:1023 +#: ../../include/conversation.php:250 ../../include/text.php:1023 +#: ../../include/text.php:1027 msgid "poked" msgstr "" @@ -10853,7 +10413,6 @@ msgid "Embed content if possible" msgstr "" #: ../../include/conversation.php:1381 -#: ../../extend/addon/a/wiki/Mod_Wiki.php:393 msgid "Embed an image from your albums" msgstr "" @@ -10897,134 +10456,773 @@ msgstr "" msgid "Post to Collections" msgstr "" -#: ../../include/conversation.php:1771 -msgid "Commented Order" -msgstr "" - -#: ../../include/conversation.php:1774 -msgid "Sort by Comment Date" -msgstr "" - -#: ../../include/conversation.php:1778 -msgid "Posted Order" -msgstr "" - -#: ../../include/conversation.php:1781 -msgid "Sort by Post Date" -msgstr "" - -#: ../../include/conversation.php:1789 -msgid "Posts that mention or involve you" -msgstr "" - -#: ../../include/conversation.php:1798 -msgid "Activity Stream - by date" -msgstr "" - -#: ../../include/conversation.php:1804 -msgid "Starred" -msgstr "" - -#: ../../include/conversation.php:1807 -msgid "Favourite Posts" -msgstr "" - -#: ../../include/conversation.php:1814 -msgid "Spam" -msgstr "" - -#: ../../include/conversation.php:1817 -msgid "Posts flagged as SPAM" -msgstr "" - -#: ../../include/conversation.php:1892 ../../include/nav.php:396 +#: ../../include/conversation.php:1767 ../../include/nav.php:390 msgid "Status Messages and Posts" msgstr "" -#: ../../include/conversation.php:1905 ../../include/nav.php:409 +#: ../../include/conversation.php:1780 ../../include/nav.php:403 msgid "Profile Details" msgstr "" -#: ../../include/conversation.php:1923 ../../include/nav.php:427 +#: ../../include/conversation.php:1798 ../../include/nav.php:421 msgid "Files and Storage" msgstr "" -#: ../../include/conversation.php:1960 ../../include/nav.php:462 +#: ../../include/conversation.php:1835 ../../include/nav.php:456 msgid "Bookmarks" msgstr "" -#: ../../include/conversation.php:1963 ../../include/nav.php:465 +#: ../../include/conversation.php:1838 ../../include/nav.php:459 msgid "Saved Bookmarks" msgstr "" -#: ../../include/conversation.php:1974 ../../include/nav.php:476 +#: ../../include/conversation.php:1849 ../../include/nav.php:470 msgid "View Cards" msgstr "" -#: ../../include/conversation.php:1982 +#: ../../include/conversation.php:1857 msgid "articles" msgstr "" -#: ../../include/conversation.php:1985 ../../include/nav.php:487 +#: ../../include/conversation.php:1860 ../../include/nav.php:481 msgid "View Articles" msgstr "" -#: ../../include/conversation.php:1996 ../../include/nav.php:499 +#: ../../include/conversation.php:1871 ../../include/nav.php:493 msgid "View Webpages" msgstr "" -#: ../../include/conversation.php:2006 ../../include/nav.php:508 -#: ../../extend/addon/a/wiki/Wiki_list.php:18 -#: ../../extend/addon/a/wiki/Mod_Wiki.php:207 +#: ../../include/conversation.php:1881 ../../include/nav.php:502 msgid "Wikis" msgstr "" -#: ../../include/conversation.php:2065 +#: ../../include/conversation.php:1940 msgctxt "noun" msgid "Attending" msgid_plural "Attending" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:2068 +#: ../../include/conversation.php:1943 msgctxt "noun" msgid "Not Attending" msgid_plural "Not Attending" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:2071 +#: ../../include/conversation.php:1946 msgctxt "noun" msgid "Undecided" msgid_plural "Undecided" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:2074 +#: ../../include/conversation.php:1949 msgctxt "noun" msgid "Agree" msgid_plural "Agrees" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:2077 +#: ../../include/conversation.php:1952 msgctxt "noun" msgid "Disagree" msgid_plural "Disagrees" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:2080 +#: ../../include/conversation.php:1955 msgctxt "noun" msgid "Abstain" msgid_plural "Abstains" msgstr[0] "" msgstr[1] "" -#: ../../include/message.php:14 ../../include/text.php:1602 +#: ../../include/features.php:56 +msgid "General Features" +msgstr "" + +#: ../../include/features.php:61 +msgid "Display new member quick links menu" +msgstr "" + +#: ../../include/features.php:69 +msgid "Advanced Profiles" +msgstr "" + +#: ../../include/features.php:70 +msgid "Additional profile sections and selections" +msgstr "" + +#: ../../include/features.php:116 +msgid "Private Notes" +msgstr "" + +#: ../../include/features.php:117 +msgid "Enables a tool to store notes and reminders (note: not encrypted)" +msgstr "" + +#: ../../include/features.php:137 +msgid "Create interactive articles" +msgstr "" + +#: ../../include/features.php:154 +msgid "Photo Location" +msgstr "" + +#: ../../include/features.php:155 +msgid "If location data is available on uploaded photos, link this to a map." +msgstr "" + +#: ../../include/features.php:183 +msgid "Event Timezone Selection" +msgstr "" + +#: ../../include/features.php:184 +msgid "Allow event creation in timezones other than your own." +msgstr "" + +#: ../../include/features.php:202 +msgid "Advanced Directory Search" +msgstr "" + +#: ../../include/features.php:203 +msgid "Allows creation of complex directory search queries" +msgstr "" + +#: ../../include/features.php:211 +msgid "Advanced Theme and Layout Settings" +msgstr "" + +#: ../../include/features.php:212 +msgid "Allows fine tuning of themes and page layouts" +msgstr "" + +#: ../../include/features.php:221 +msgid "Access Control and Permissions" +msgstr "" + +#: ../../include/features.php:225 +msgid "Privacy Groups" +msgstr "" + +#: ../../include/features.php:226 +msgid "Enable management and selection of privacy groups" +msgstr "" + +#: ../../include/features.php:262 +msgid "OAuth2 Clients" +msgstr "" + +#: ../../include/features.php:263 +msgid "Manage OAuth2 authenticatication tokens for mobile and remote apps." +msgstr "" + +#: ../../include/features.php:283 +msgid "Post Composition Features" +msgstr "" + +#: ../../include/features.php:359 +msgid "Auto-save drafts of posts and comments" +msgstr "" + +#: ../../include/features.php:360 +msgid "" +"Automatically saves post and comment drafts in local browser storage to help " +"prevent accidental loss of compositions" +msgstr "" + +#: ../../include/features.php:371 +msgid "Network and Stream Filtering" +msgstr "" + +#: ../../include/features.php:461 +msgid "Post/Comment Tools" +msgstr "" + +#: ../../include/features.php:465 +msgid "Community Tagging" +msgstr "" + +#: ../../include/features.php:466 +msgid "Ability to tag existing posts" +msgstr "" + +#: ../../include/features.php:474 +msgid "Post Categories" +msgstr "" + +#: ../../include/features.php:475 +msgid "Add categories to your posts" +msgstr "" + +#: ../../include/features.php:483 +msgid "Emoji Reactions" +msgstr "" + +#: ../../include/features.php:484 +msgid "Add emoji reaction ability to posts" +msgstr "" + +#: ../../include/features.php:493 +msgid "Ability to file posts under folders" +msgstr "" + +#: ../../include/features.php:501 +msgid "Dislike Posts" +msgstr "" + +#: ../../include/features.php:502 +msgid "Ability to dislike posts/comments" +msgstr "" + +#: ../../include/features.php:519 +msgid "Tag Cloud" +msgstr "" + +#: ../../include/features.php:520 +msgid "Provide a personal tag cloud on your channel page" +msgstr "" + +#: ../../include/items.php:962 ../../include/items.php:1022 +msgid "(Unknown)" +msgstr "" + +#: ../../include/items.php:1204 +msgid "Visible to anybody on the internet." +msgstr "" + +#: ../../include/items.php:1206 +msgid "Visible to you only." +msgstr "" + +#: ../../include/items.php:1208 +msgid "Visible to anybody in this network." +msgstr "" + +#: ../../include/items.php:1210 +msgid "Visible to anybody authenticated." +msgstr "" + +#: ../../include/items.php:1212 +#, php-format +msgid "Visible to anybody on %s." +msgstr "" + +#: ../../include/items.php:1214 +msgid "Visible to all connections." +msgstr "" + +#: ../../include/items.php:1216 +msgid "Visible to approved connections." +msgstr "" + +#: ../../include/items.php:1218 +msgid "Visible to specific connections." +msgstr "" + +#: ../../include/items.php:3962 +msgid "Privacy group not found." +msgstr "" + +#: ../../include/items.php:3978 +msgid "Privacy group is empty." +msgstr "" + +#: ../../include/items.php:3985 +#, php-format +msgid "Privacy group: %s" +msgstr "" + +#: ../../include/items.php:3997 +msgid "Connection not found." +msgstr "" + +#: ../../include/items.php:4342 +msgid "profile photo" +msgstr "" + +#: ../../include/items.php:4538 +#, php-format +msgid "[Edited %s]" +msgstr "" + +#: ../../include/items.php:4538 +msgctxt "edit_activity" +msgid "Post" +msgstr "" + +#: ../../include/items.php:4538 +msgctxt "edit_activity" +msgid "Comment" +msgstr "" + +#: ../../include/acl_selectors.php:113 +msgid "Who can see this?" +msgstr "" + +#: ../../include/acl_selectors.php:114 +msgid "Custom selection" +msgstr "" + +#: ../../include/acl_selectors.php:115 +msgid "" +"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit " +"the scope of \"Show\"." +msgstr "" + +#: ../../include/acl_selectors.php:116 +msgid "Show" +msgstr "" + +#: ../../include/acl_selectors.php:117 +msgid "Don't show" +msgstr "" + +#: ../../include/acl_selectors.php:150 +msgid "" +"Post permissions cannot be changed after a post is shared.
These " +"permissions set who is allowed to view the post." +msgstr "" + +#: ../../include/text.php:489 +msgid "prev" +msgstr "" + +#: ../../include/text.php:491 +msgid "first" +msgstr "" + +#: ../../include/text.php:520 +msgid "last" +msgstr "" + +#: ../../include/text.php:523 +msgid "next" +msgstr "" + +#: ../../include/text.php:534 +msgid "older" +msgstr "" + +#: ../../include/text.php:536 +msgid "newer" +msgstr "" + +#: ../../include/text.php:1023 ../../include/text.php:1027 +msgid "poke" +msgstr "" + +#: ../../include/text.php:1028 +msgid "ping" +msgstr "" + +#: ../../include/text.php:1028 +msgid "pinged" +msgstr "" + +#: ../../include/text.php:1029 +msgid "prod" +msgstr "" + +#: ../../include/text.php:1029 +msgid "prodded" +msgstr "" + +#: ../../include/text.php:1030 +msgid "slap" +msgstr "" + +#: ../../include/text.php:1030 +msgid "slapped" +msgstr "" + +#: ../../include/text.php:1031 +msgid "finger" +msgstr "" + +#: ../../include/text.php:1031 +msgid "fingered" +msgstr "" + +#: ../../include/text.php:1032 +msgid "rebuff" +msgstr "" + +#: ../../include/text.php:1032 +msgid "rebuffed" +msgstr "" + +#: ../../include/text.php:1055 +msgid "happy" +msgstr "" + +#: ../../include/text.php:1056 +msgid "sad" +msgstr "" + +#: ../../include/text.php:1057 +msgid "mellow" +msgstr "" + +#: ../../include/text.php:1058 +msgid "tired" +msgstr "" + +#: ../../include/text.php:1059 +msgid "perky" +msgstr "" + +#: ../../include/text.php:1060 +msgid "angry" +msgstr "" + +#: ../../include/text.php:1061 +msgid "stupefied" +msgstr "" + +#: ../../include/text.php:1062 +msgid "puzzled" +msgstr "" + +#: ../../include/text.php:1063 +msgid "interested" +msgstr "" + +#: ../../include/text.php:1064 +msgid "bitter" +msgstr "" + +#: ../../include/text.php:1065 +msgid "cheerful" +msgstr "" + +#: ../../include/text.php:1066 +msgid "alive" +msgstr "" + +#: ../../include/text.php:1067 +msgid "annoyed" +msgstr "" + +#: ../../include/text.php:1068 +msgid "anxious" +msgstr "" + +#: ../../include/text.php:1069 +msgid "cranky" +msgstr "" + +#: ../../include/text.php:1070 +msgid "disturbed" +msgstr "" + +#: ../../include/text.php:1071 +msgid "frustrated" +msgstr "" + +#: ../../include/text.php:1072 +msgid "depressed" +msgstr "" + +#: ../../include/text.php:1073 +msgid "motivated" +msgstr "" + +#: ../../include/text.php:1074 +msgid "relaxed" +msgstr "" + +#: ../../include/text.php:1075 +msgid "surprised" +msgstr "" + +#: ../../include/text.php:1258 +msgid "May" +msgstr "" + +#: ../../include/text.php:1332 +msgid "Unknown Attachment" +msgstr "" + +#: ../../include/text.php:1370 +msgid "remove category" +msgstr "" + +#: ../../include/text.php:1444 +msgid "remove from file" +msgstr "" + +#: ../../include/text.php:1565 +msgid "Added to your calendar" +msgstr "" + +#: ../../include/text.php:1634 +msgid "Link" +msgstr "" + +#: ../../include/text.php:1642 ../../include/message.php:14 msgid "Download binary/encrypted content" msgstr "" +#: ../../include/text.php:1770 +msgid "Page layout" +msgstr "" + +#: ../../include/text.php:1770 +msgid "You can create your own with the layouts tool" +msgstr "" + +#: ../../include/text.php:1780 +msgid "BBcode" +msgstr "" + +#: ../../include/text.php:1781 +msgid "HTML" +msgstr "" + +#: ../../include/text.php:1782 +msgid "Markdown" +msgstr "" + +#: ../../include/text.php:1783 +msgid "Text" +msgstr "" + +#: ../../include/text.php:1784 +msgid "Comanche Layout" +msgstr "" + +#: ../../include/text.php:1789 +msgid "PHP" +msgstr "" + +#: ../../include/text.php:1798 +msgid "Page content type" +msgstr "" + +#: ../../include/text.php:1931 +msgid "activity" +msgstr "" + +#: ../../include/text.php:2016 +msgid "a-z, 0-9, -, and _ only" +msgstr "" + +#: ../../include/text.php:2339 +msgid "Design Tools" +msgstr "" + +#: ../../include/text.php:2345 +msgid "Pages" +msgstr "" + +#: ../../include/text.php:2367 +msgid "Import website..." +msgstr "" + +#: ../../include/text.php:2368 +msgid "Select folder to import" +msgstr "" + +#: ../../include/text.php:2369 +msgid "Import from a zipped folder:" +msgstr "" + +#: ../../include/text.php:2370 +msgid "Import from cloud files:" +msgstr "" + +#: ../../include/text.php:2371 +msgid "/cloud/channel/path/to/folder" +msgstr "" + +#: ../../include/text.php:2372 +msgid "Enter path to website files" +msgstr "" + +#: ../../include/text.php:2373 +msgid "Select folder" +msgstr "" + +#: ../../include/text.php:2374 +msgid "Export website..." +msgstr "" + +#: ../../include/text.php:2375 +msgid "Export to a zip file" +msgstr "" + +#: ../../include/text.php:2376 +msgid "website.zip" +msgstr "" + +#: ../../include/text.php:2377 +msgid "Enter a name for the zip file." +msgstr "" + +#: ../../include/text.php:2378 +msgid "Export to cloud files" +msgstr "" + +#: ../../include/text.php:2379 +msgid "/path/to/export/folder" +msgstr "" + +#: ../../include/text.php:2380 +msgid "Enter a path to a cloud files destination." +msgstr "" + +#: ../../include/text.php:2381 +msgid "Specify folder" +msgstr "" + +#: ../../include/zid.php:357 +#, php-format +msgid "OpenWebAuth: %1$s welcomes %2$s" +msgstr "" + +#: ../../include/security.php:576 +msgid "" +"The form security token was not correct. This probably happened because the " +"form has been opened for too long (>3 hours) before submitting it." +msgstr "" + +#: ../../include/taxonomy.php:322 +msgid "Trending" +msgstr "" + +#: ../../include/taxonomy.php:566 +msgid "Keywords" +msgstr "" + +#: ../../include/taxonomy.php:587 +msgid "have" +msgstr "" + +#: ../../include/taxonomy.php:587 +msgid "has" +msgstr "" + +#: ../../include/taxonomy.php:588 +msgid "want" +msgstr "" + +#: ../../include/taxonomy.php:588 +msgid "wants" +msgstr "" + +#: ../../include/taxonomy.php:589 +msgid "likes" +msgstr "" + +#: ../../include/taxonomy.php:590 +msgid "dislikes" +msgstr "" + +#: ../../include/event.php:32 ../../include/event.php:101 +msgid "l F d, Y \\@ g:i A" +msgstr "" + +#: ../../include/event.php:40 ../../include/event.php:106 +msgid "Starts:" +msgstr "" + +#: ../../include/event.php:50 ../../include/event.php:110 +msgid "Finishes:" +msgstr "" + +#: ../../include/event.php:1045 +msgid "This event has been added to your calendar." +msgstr "" + +#: ../../include/event.php:1268 +msgid "Not specified" +msgstr "" + +#: ../../include/event.php:1269 +msgid "Needs Action" +msgstr "" + +#: ../../include/event.php:1270 +msgid "Completed" +msgstr "" + +#: ../../include/event.php:1271 +msgid "In Process" +msgstr "" + +#: ../../include/event.php:1272 +msgid "Cancelled" +msgstr "" + +#: ../../include/import.php:28 +msgid "Unable to import a removed channel." +msgstr "" + +#: ../../include/import.php:55 +msgid "" +"A channel with these settings was discovered and is not usable as it was " +"removed or reserved for system use. Import failed." +msgstr "" + +#: ../../include/import.php:64 +msgid "" +"Cannot create a duplicate channel identifier on this system. Import failed." +msgstr "" + +#: ../../include/import.php:85 +msgid "Unable to create a unique channel address. Import failed." +msgstr "" + +#: ../../include/import.php:131 +msgid "Cloned channel not found. Import failed." +msgstr "" + +#: ../../include/network.php:767 +msgid "view full size" +msgstr "" + +#: ../../include/network.php:1904 ../../include/network.php:1905 +msgid "Friendica" +msgstr "" + +#: ../../include/network.php:1906 +msgid "OStatus" +msgstr "" + +#: ../../include/network.php:1907 +msgid "GNU-Social" +msgstr "" + +#: ../../include/network.php:1908 +msgid "RSS/Atom" +msgstr "" + +#: ../../include/network.php:1911 +msgid "Diaspora" +msgstr "" + +#: ../../include/network.php:1912 +msgid "Facebook" +msgstr "" + +#: ../../include/network.php:1913 +msgid "Zot" +msgstr "" + +#: ../../include/network.php:1914 +msgid "LinkedIn" +msgstr "" + +#: ../../include/network.php:1915 +msgid "XMPP/IM" +msgstr "" + +#: ../../include/network.php:1916 +msgid "MySpace" +msgstr "" + #: ../../include/message.php:33 msgid "Unable to determine sender." msgstr "" @@ -11061,367 +11259,87 @@ msgstr "" msgid "Account/Channel Settings" msgstr "" -#: ../../include/nav.php:98 ../../include/nav.php:127 ../../include/nav.php:146 -#: ../../boot.php:1625 +#: ../../include/nav.php:94 +msgid "(is off)" +msgstr "" + +#: ../../include/nav.php:94 +msgid "(is on)" +msgstr "" + +#: ../../include/nav.php:94 +msgid "Image filtering" +msgstr "" + +#: ../../include/nav.php:100 ../../include/nav.php:129 +#: ../../include/nav.php:148 ../../boot.php:1631 msgid "Logout" msgstr "" -#: ../../include/nav.php:98 ../../include/nav.php:127 +#: ../../include/nav.php:100 ../../include/nav.php:129 msgid "End this session" msgstr "" -#: ../../include/nav.php:101 +#: ../../include/nav.php:103 msgid "Your profile page" msgstr "" -#: ../../include/nav.php:104 +#: ../../include/nav.php:106 msgid "Manage/Edit profiles" msgstr "" -#: ../../include/nav.php:113 ../../include/nav.php:117 +#: ../../include/nav.php:115 ../../include/nav.php:119 msgid "Sign in" msgstr "" -#: ../../include/nav.php:144 +#: ../../include/nav.php:146 msgid "Take me home" msgstr "" -#: ../../include/nav.php:146 +#: ../../include/nav.php:148 msgid "Log me out of this site" msgstr "" -#: ../../include/nav.php:151 +#: ../../include/nav.php:153 msgid "Create an account" msgstr "" -#: ../../include/nav.php:163 +#: ../../include/nav.php:165 msgid "Help and documentation" msgstr "" -#: ../../include/nav.php:178 -msgid "Search site @name, !forum, #tag, ?docs, content" +#: ../../include/nav.php:172 +msgid "Search site @name, #tag, content" msgstr "" -#: ../../include/nav.php:184 +#: ../../include/nav.php:178 msgid "Site Setup and Configuration" msgstr "" -#: ../../include/nav.php:297 +#: ../../include/nav.php:291 msgid "Powered by $Projectname" msgstr "" -#: ../../include/nav.php:308 -msgid "@name, !forum, #tag, content" +#: ../../include/nav.php:302 +msgid "@name, #tag, content" msgstr "" -#: ../../include/nav.php:309 +#: ../../include/nav.php:303 msgid "Please wait..." msgstr "" -#: ../../include/nav.php:315 +#: ../../include/nav.php:309 msgid "Add/Manage Apps" msgstr "" -#: ../../include/nav.php:316 +#: ../../include/nav.php:310 msgid "Arrange Apps" msgstr "" -#: ../../include/nav.php:317 +#: ../../include/nav.php:311 msgid "Toggle System Apps" msgstr "" -#: ../../include/text.php:489 -msgid "prev" -msgstr "" - -#: ../../include/text.php:491 -msgid "first" -msgstr "" - -#: ../../include/text.php:520 -msgid "last" -msgstr "" - -#: ../../include/text.php:523 -msgid "next" -msgstr "" - -#: ../../include/text.php:534 -msgid "older" -msgstr "" - -#: ../../include/text.php:536 -msgid "newer" -msgstr "" - -#: ../../include/text.php:1019 ../../include/text.php:1023 -msgid "poke" -msgstr "" - -#: ../../include/text.php:1024 -msgid "ping" -msgstr "" - -#: ../../include/text.php:1024 -msgid "pinged" -msgstr "" - -#: ../../include/text.php:1025 -msgid "prod" -msgstr "" - -#: ../../include/text.php:1025 -msgid "prodded" -msgstr "" - -#: ../../include/text.php:1026 -msgid "slap" -msgstr "" - -#: ../../include/text.php:1026 -msgid "slapped" -msgstr "" - -#: ../../include/text.php:1027 -msgid "finger" -msgstr "" - -#: ../../include/text.php:1027 -msgid "fingered" -msgstr "" - -#: ../../include/text.php:1028 -msgid "rebuff" -msgstr "" - -#: ../../include/text.php:1028 -msgid "rebuffed" -msgstr "" - -#: ../../include/text.php:1051 -msgid "happy" -msgstr "" - -#: ../../include/text.php:1052 -msgid "sad" -msgstr "" - -#: ../../include/text.php:1053 -msgid "mellow" -msgstr "" - -#: ../../include/text.php:1054 -msgid "tired" -msgstr "" - -#: ../../include/text.php:1055 -msgid "perky" -msgstr "" - -#: ../../include/text.php:1056 -msgid "angry" -msgstr "" - -#: ../../include/text.php:1057 -msgid "stupefied" -msgstr "" - -#: ../../include/text.php:1058 -msgid "puzzled" -msgstr "" - -#: ../../include/text.php:1059 -msgid "interested" -msgstr "" - -#: ../../include/text.php:1060 -msgid "bitter" -msgstr "" - -#: ../../include/text.php:1061 -msgid "cheerful" -msgstr "" - -#: ../../include/text.php:1062 -msgid "alive" -msgstr "" - -#: ../../include/text.php:1063 -msgid "annoyed" -msgstr "" - -#: ../../include/text.php:1064 -msgid "anxious" -msgstr "" - -#: ../../include/text.php:1065 -msgid "cranky" -msgstr "" - -#: ../../include/text.php:1066 -msgid "disturbed" -msgstr "" - -#: ../../include/text.php:1067 -msgid "frustrated" -msgstr "" - -#: ../../include/text.php:1068 -msgid "depressed" -msgstr "" - -#: ../../include/text.php:1069 -msgid "motivated" -msgstr "" - -#: ../../include/text.php:1070 -msgid "relaxed" -msgstr "" - -#: ../../include/text.php:1071 -msgid "surprised" -msgstr "" - -#: ../../include/text.php:1254 -msgid "May" -msgstr "" - -#: ../../include/text.php:1328 -msgid "Unknown Attachment" -msgstr "" - -#: ../../include/text.php:1366 -msgid "remove category" -msgstr "" - -#: ../../include/text.php:1440 -msgid "remove from file" -msgstr "" - -#: ../../include/text.php:1532 -msgid "Added to your calendar" -msgstr "" - -#: ../../include/text.php:1730 -msgid "Page layout" -msgstr "" - -#: ../../include/text.php:1730 -msgid "You can create your own with the layouts tool" -msgstr "" - -#: ../../include/text.php:1740 ../../extend/addon/a/wiki/Wiki_pages.php:37 -#: ../../extend/addon/a/wiki/Wiki_pages.php:94 -#: ../../extend/addon/a/wiki/Mod_Wiki.php:218 -#: ../../extend/addon/a/wiki/Mod_Wiki.php:363 -msgid "BBcode" -msgstr "" - -#: ../../include/text.php:1741 -msgid "HTML" -msgstr "" - -#: ../../include/text.php:1742 ../../extend/addon/a/wiki/Wiki_pages.php:37 -#: ../../extend/addon/a/wiki/Wiki_pages.php:94 -#: ../../extend/addon/a/wiki/Mod_Wiki.php:218 -#: ../../extend/addon/a/wiki/Mod_Wiki.php:363 -msgid "Markdown" -msgstr "" - -#: ../../include/text.php:1743 ../../extend/addon/a/wiki/Wiki_pages.php:37 -#: ../../extend/addon/a/wiki/Wiki_pages.php:94 -#: ../../extend/addon/a/wiki/Mod_Wiki.php:218 -msgid "Text" -msgstr "" - -#: ../../include/text.php:1744 -msgid "Comanche Layout" -msgstr "" - -#: ../../include/text.php:1749 -msgid "PHP" -msgstr "" - -#: ../../include/text.php:1758 -msgid "Page content type" -msgstr "" - -#: ../../include/text.php:1891 -msgid "activity" -msgstr "" - -#: ../../include/text.php:1976 -msgid "a-z, 0-9, -, and _ only" -msgstr "" - -#: ../../include/text.php:2296 -msgid "Design Tools" -msgstr "" - -#: ../../include/text.php:2302 -msgid "Pages" -msgstr "" - -#: ../../include/text.php:2324 -msgid "Import website..." -msgstr "" - -#: ../../include/text.php:2325 -msgid "Select folder to import" -msgstr "" - -#: ../../include/text.php:2326 -msgid "Import from a zipped folder:" -msgstr "" - -#: ../../include/text.php:2327 -msgid "Import from cloud files:" -msgstr "" - -#: ../../include/text.php:2328 -msgid "/cloud/channel/path/to/folder" -msgstr "" - -#: ../../include/text.php:2329 -msgid "Enter path to website files" -msgstr "" - -#: ../../include/text.php:2330 -msgid "Select folder" -msgstr "" - -#: ../../include/text.php:2331 -msgid "Export website..." -msgstr "" - -#: ../../include/text.php:2332 -msgid "Export to a zip file" -msgstr "" - -#: ../../include/text.php:2333 -msgid "website.zip" -msgstr "" - -#: ../../include/text.php:2334 -msgid "Enter a name for the zip file." -msgstr "" - -#: ../../include/text.php:2335 -msgid "Export to cloud files" -msgstr "" - -#: ../../include/text.php:2336 -msgid "/path/to/export/folder" -msgstr "" - -#: ../../include/text.php:2337 -msgid "Enter a path to a cloud files destination." -msgstr "" - -#: ../../include/text.php:2338 -msgid "Specify folder" -msgstr "" - #: ../../util/nconfig.php:34 msgid "Source channel not found." msgstr "" @@ -11519,29 +11437,6 @@ msgstr "" msgid "Cover Photo" msgstr "" -#: ../../extend/addon/a/articles/Mod_Article_edit.php:132 -msgid "Edit Article" -msgstr "" - -#: ../../extend/addon/a/articles/Mod_Articles.php:41 -msgid "" -"This addon app provides a blog that is separate from your social stream. " -"Visitors may comment but the content remains on this site and is not " -"propagated elsewhere." -msgstr "" - -#: ../../extend/addon/a/articles/Mod_Articles.php:105 -msgid "Add Article" -msgstr "" - -#: ../../extend/addon/a/articles/articles.php:37 -msgid "Can view my articles" -msgstr "" - -#: ../../extend/addon/a/articles/articles.php:38 -msgid "Can write to my articles" -msgstr "" - #: ../../extend/addon/a/ldapauth/ldapauth.php:70 msgid "An account has been created for you." msgstr "" @@ -11621,7 +11516,7 @@ msgid "" msgstr "" #: ../../extend/addon/a/superblock/Mod_Superblock.php:66 -#: ../../extend/addon/a/superblock/superblock.php:409 +#: ../../extend/addon/a/superblock/superblock.php:389 msgid "superblock settings updated" msgstr "" @@ -11647,307 +11542,50 @@ msgstr "" msgid "Superblock Settings" msgstr "" -#: ../../extend/addon/a/superblock/superblock.php:361 +#: ../../extend/addon/a/superblock/superblock.php:341 msgid "Block Completely" msgstr "" -#: ../../extend/addon/a/wiki/NativeWikiPage.php:40 -#: ../../extend/addon/a/wiki/NativeWikiPage.php:91 -msgid "(No Title)" -msgstr "" - -#: ../../extend/addon/a/wiki/NativeWikiPage.php:104 -msgid "Wiki page create failed." -msgstr "" - -#: ../../extend/addon/a/wiki/NativeWikiPage.php:117 -msgid "Wiki not found." -msgstr "" - -#: ../../extend/addon/a/wiki/NativeWikiPage.php:128 -msgid "Destination name already exists" -msgstr "" - -#: ../../extend/addon/a/wiki/NativeWikiPage.php:160 -#: ../../extend/addon/a/wiki/NativeWikiPage.php:356 -msgid "Page not found" -msgstr "" - -#: ../../extend/addon/a/wiki/NativeWikiPage.php:191 -msgid "Error reading page content" -msgstr "" - -#: ../../extend/addon/a/wiki/NativeWikiPage.php:347 -#: ../../extend/addon/a/wiki/NativeWikiPage.php:397 -#: ../../extend/addon/a/wiki/NativeWikiPage.php:464 -#: ../../extend/addon/a/wiki/NativeWikiPage.php:505 -msgid "Error reading wiki" -msgstr "" - -#: ../../extend/addon/a/wiki/NativeWikiPage.php:385 -msgid "Page update failed." -msgstr "" - -#: ../../extend/addon/a/wiki/NativeWikiPage.php:419 -msgid "Nothing deleted" -msgstr "" - -#: ../../extend/addon/a/wiki/NativeWikiPage.php:485 -msgid "Compare: object not found." -msgstr "" - -#: ../../extend/addon/a/wiki/NativeWikiPage.php:491 -msgid "Page updated" -msgstr "" - -#: ../../extend/addon/a/wiki/NativeWikiPage.php:494 -msgid "Untitled" -msgstr "" - -#: ../../extend/addon/a/wiki/NativeWikiPage.php:500 -msgid "Wiki resource_id required for git commit" -msgstr "" - -#: ../../extend/addon/a/wiki/NativeWikiPage.php:556 -#: ../../extend/addon/a/wiki/Wiki_page_history.php:23 -msgctxt "wiki_history" -msgid "Message" -msgstr "" - -#: ../../extend/addon/a/wiki/NativeWikiPage.php:557 -#: ../../extend/addon/a/wiki/Wiki_page_history.php:24 -msgid "Date" -msgstr "" - -#: ../../extend/addon/a/wiki/NativeWikiPage.php:558 -#: ../../extend/addon/a/wiki/Wiki_page_history.php:25 -#: ../../extend/addon/a/wiki/Mod_Wiki.php:359 -msgid "Revert" -msgstr "" - -#: ../../extend/addon/a/wiki/NativeWikiPage.php:559 -#: ../../extend/addon/a/wiki/Wiki_page_history.php:26 -msgid "Compare" -msgstr "" - -#: ../../extend/addon/a/wiki/Wiki_pages.php:33 -#: ../../extend/addon/a/wiki/Wiki_pages.php:90 -msgid "Add new page" -msgstr "" - -#: ../../extend/addon/a/wiki/Wiki_pages.php:84 -msgid "Wiki Pages" -msgstr "" - -#: ../../extend/addon/a/wiki/Wiki_pages.php:95 -msgid "Page name" -msgstr "" - -#: ../../extend/addon/a/wiki/wiki.php:44 -msgid "Can view my wiki pages" -msgstr "" - -#: ../../extend/addon/a/wiki/wiki.php:45 -msgid "Can write to my wiki pages" -msgstr "" - -#: ../../extend/addon/a/wiki/NativeWiki.php:141 -msgid "Wiki updated successfully" -msgstr "" - -#: ../../extend/addon/a/wiki/NativeWiki.php:195 -msgid "Wiki files deleted successfully" -msgstr "" - -#: ../../extend/addon/a/wiki/Mod_Wiki.php:38 -msgid "Profile Unavailable." -msgstr "" - -#: ../../extend/addon/a/wiki/Mod_Wiki.php:51 -msgid "This addon app provides a wiki for your channel." -msgstr "" - -#: ../../extend/addon/a/wiki/Mod_Wiki.php:79 -msgid "Invalid channel" -msgstr "" - -#: ../../extend/addon/a/wiki/Mod_Wiki.php:134 -msgid "Error retrieving wiki" -msgstr "" - -#: ../../extend/addon/a/wiki/Mod_Wiki.php:141 -msgid "Error creating zip file export folder" -msgstr "" - -#: ../../extend/addon/a/wiki/Mod_Wiki.php:192 -msgid "Error downloading wiki: " -msgstr "" - -#: ../../extend/addon/a/wiki/Mod_Wiki.php:213 -msgid "Download" -msgstr "" - -#: ../../extend/addon/a/wiki/Mod_Wiki.php:217 -msgid "Wiki name" -msgstr "" - -#: ../../extend/addon/a/wiki/Mod_Wiki.php:218 -msgid "Content type" -msgstr "" - -#: ../../extend/addon/a/wiki/Mod_Wiki.php:221 -msgid "Any type" -msgstr "" - -#: ../../extend/addon/a/wiki/Mod_Wiki.php:228 -msgid "Lock content type" -msgstr "" - -#: ../../extend/addon/a/wiki/Mod_Wiki.php:229 -msgid "Create a status post for this wiki" -msgstr "" - -#: ../../extend/addon/a/wiki/Mod_Wiki.php:230 -msgid "Edit Wiki Name" -msgstr "" - -#: ../../extend/addon/a/wiki/Mod_Wiki.php:272 -msgid "Wiki not found" -msgstr "" - -#: ../../extend/addon/a/wiki/Mod_Wiki.php:296 -msgid "Rename page" -msgstr "" - -#: ../../extend/addon/a/wiki/Mod_Wiki.php:318 -msgid "Error retrieving page content" -msgstr "" - -#: ../../extend/addon/a/wiki/Mod_Wiki.php:326 -#: ../../extend/addon/a/wiki/Mod_Wiki.php:328 -msgid "New page" -msgstr "" - -#: ../../extend/addon/a/wiki/Mod_Wiki.php:358 -msgid "Revision Comparison" -msgstr "" - -#: ../../extend/addon/a/wiki/Mod_Wiki.php:366 -msgid "Short description of your changes (optional)" -msgstr "" - -#: ../../extend/addon/a/wiki/Mod_Wiki.php:377 -msgid "Source" -msgstr "" - -#: ../../extend/addon/a/wiki/Mod_Wiki.php:387 -msgid "New page name" -msgstr "" - -#: ../../extend/addon/a/wiki/Mod_Wiki.php:392 -msgid "Embed image from photo albums" -msgstr "" - -#: ../../extend/addon/a/wiki/Mod_Wiki.php:403 -msgid "History" -msgstr "" - -#: ../../extend/addon/a/wiki/Mod_Wiki.php:481 -msgid "Error creating wiki. Invalid name." -msgstr "" - -#: ../../extend/addon/a/wiki/Mod_Wiki.php:488 -msgid "A wiki with this name already exists." -msgstr "" - -#: ../../extend/addon/a/wiki/Mod_Wiki.php:501 -msgid "Wiki created, but error creating Home page." -msgstr "" - -#: ../../extend/addon/a/wiki/Mod_Wiki.php:508 -msgid "Error creating wiki" -msgstr "" - -#: ../../extend/addon/a/wiki/Mod_Wiki.php:531 -msgid "Error updating wiki. Invalid name." -msgstr "" - -#: ../../extend/addon/a/wiki/Mod_Wiki.php:551 -msgid "Error updating wiki" -msgstr "" - -#: ../../extend/addon/a/wiki/Mod_Wiki.php:566 -msgid "Wiki delete permission denied." -msgstr "" - -#: ../../extend/addon/a/wiki/Mod_Wiki.php:576 -msgid "Error deleting wiki" -msgstr "" - -#: ../../extend/addon/a/wiki/Mod_Wiki.php:609 -msgid "New page created" -msgstr "" - -#: ../../extend/addon/a/wiki/Mod_Wiki.php:731 -msgid "Cannot delete Home" -msgstr "" - -#: ../../extend/addon/a/wiki/Mod_Wiki.php:795 -msgid "Current Revision" -msgstr "" - -#: ../../extend/addon/a/wiki/Mod_Wiki.php:795 -msgid "Selected Revision" -msgstr "" - -#: ../../extend/addon/a/wiki/Mod_Wiki.php:844 -msgid "You must be authenticated." -msgstr "" - -#: ../../extend/addon/a/zotpost/Mod_zotpost.php:21 +#: ../../extend/addon/a/zotpost/Mod_zotpost.php:24 msgid "Channel is required." msgstr "" -#: ../../extend/addon/a/zotpost/Mod_zotpost.php:34 +#: ../../extend/addon/a/zotpost/Mod_zotpost.php:37 msgid "Zotpost Settings saved." msgstr "" -#: ../../extend/addon/a/zotpost/Mod_zotpost.php:42 +#: ../../extend/addon/a/zotpost/Mod_zotpost.php:45 msgid "" "This addon app allows you to cross-post to other Zot services and channels. " "After installing the app, select it to configure the destination settings " "and preferences." msgstr "" -#: ../../extend/addon/a/zotpost/Mod_zotpost.php:63 +#: ../../extend/addon/a/zotpost/Mod_zotpost.php:65 msgid "Zot server URL" msgstr "" -#: ../../extend/addon/a/zotpost/Mod_zotpost.php:63 +#: ../../extend/addon/a/zotpost/Mod_zotpost.php:65 msgid "https://example.com" msgstr "" -#: ../../extend/addon/a/zotpost/Mod_zotpost.php:67 +#: ../../extend/addon/a/zotpost/Mod_zotpost.php:69 msgid "Zot channel name" msgstr "" -#: ../../extend/addon/a/zotpost/Mod_zotpost.php:67 -msgid "Nickname" -msgstr "" - -#: ../../extend/addon/a/zotpost/Mod_zotpost.php:71 +#: ../../extend/addon/a/zotpost/Mod_zotpost.php:73 msgid "Zot password" msgstr "" -#: ../../extend/addon/a/zotpost/Mod_zotpost.php:75 +#: ../../extend/addon/a/zotpost/Mod_zotpost.php:77 msgid "Send public postings to Zot channel by default" msgstr "" -#: ../../extend/addon/a/zotpost/Mod_zotpost.php:79 +#: ../../extend/addon/a/zotpost/Mod_zotpost.php:81 msgid "Zotpost Settings" msgstr "" -#: ../../extend/addon/a/zotpost/zotpost.php:45 +#: ../../extend/addon/a/zotpost/zotpost.php:40 msgid "Post to Zot" msgstr "" @@ -12055,40 +11693,40 @@ msgstr "" msgid "Include a marker on the map." msgstr "" -#: ../../boot.php:1605 +#: ../../boot.php:1611 msgid "Create an account to access services and applications" msgstr "" -#: ../../boot.php:1629 +#: ../../boot.php:1635 msgid "Login/Email" msgstr "" -#: ../../boot.php:1630 +#: ../../boot.php:1636 msgid "Password" msgstr "" -#: ../../boot.php:1631 +#: ../../boot.php:1637 msgid "Remember me" msgstr "" -#: ../../boot.php:1634 +#: ../../boot.php:1640 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:2417 +#: ../../boot.php:2423 #, php-format msgid "[$Projectname] Website SSL error for %s" msgstr "" -#: ../../boot.php:2422 +#: ../../boot.php:2428 msgid "Website SSL certificate is not valid. Please correct." msgstr "" -#: ../../boot.php:2466 +#: ../../boot.php:2472 #, php-format msgid "[$Projectname] Cron tasks not running on %s" msgstr "" -#: ../../boot.php:2471 +#: ../../boot.php:2477 msgid "Cron/Scheduled tasks not running." msgstr "" diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 6b4b1ae55..bc8021dbb 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -113,6 +113,7 @@
{{include file="field_checkbox.tpl" field=$verify_email}} {{include file="field_checkbox.tpl" field=$feed_contacts}} + {{include file="field_checkbox.tpl" field=$ap_contacts}} {{include file="field_checkbox.tpl" field=$force_publish}} {{include file="field_checkbox.tpl" field=$disable_discover_tab}} {{include file="field_checkbox.tpl" field=$site_firehose}}