diff options
79 files changed, 4885 insertions, 4327 deletions
@@ -1,3 +1,95 @@ +Hubzilla 5.0 (????-??-??) + - Deprecate $a variable for *_plugin_admin() and *_plugin_admin_post() + - Support remote host cache directives on profile photo fetching + - Disable community tags until it is agreed upon on how to implement in zot6 or activitypub + - Improve home install setup script + - Cryptojs moved to addon + - Implement "more encryption" feature with the SJCL library + - Add minimum form lifetime check + - Improve updateConvItems() performance + - Improve infinite scroll experience + - Introduce a software bill of material (wip) + - Implement new forum behaviour (direct-message a forum to post on its wall) for cross-plattform forum compatibility + - Allow apps to be both pinned and starred independently + - Add images load status to spinnner if preload images is enabled + - Deprecate premium channel app + - Allow to set different values for left and right aside width in $theme.php + - Display complete permission info only to channel owner + - Set CURLOPT_ENCODING to empty string so that compressed content will be uncompressed + - Force browser photo revalidation + - Deprecate ACTIVITY_OBJ_FILE and ACTIVITY_OBJ_WIKI in favour of other object types (Document, Audio, Video) + - Use $mid as plink to prevent to long plinks + - Handle some basic friendica attachment bbcodes + - Deprecate is_edit_activity() + - Deprecate voting feature in favour of polls + - Show event timezone if it differs from the channel timezone + - Avoid multiple run of expiry procedure on large sites + - Implement zot6 as the primary protocol + - Introduce polls + - Provide titles for wiki links markup + - Implement DAV calendars sync with clones + - Optional events and poll filters for mod network + - Add new addon hook get_banner + - Provide tools to deal with spam channels for primary directory admin + - Introduce pinned posts for mod channel + - Refactor notifications to utilize server sent events + - Provide more descriptive connection status icons + + + Bugfixes + - Apply channel name changes to all associated xchans + - Show unchecked box in connedit if value is false + - Reset their_perms before setting new permissions to reflect permission retractions on local hub + - Respect advanced profile setting in sexual preference selector + - Do not allow invite codes to be reused unlimited times + - Fix issue with quoted hashtags/mentions + - Fix issue generating photo thumbnails when uploaded via davfs + - Do not call System::get_platform_name() within t() unless needed + - Fix wrong URL detection with Markdown support enabled + - Fix once cached embedded content is used and stored forever + + Addons + - Diaspora: remove relay@relay.iliketoat.net as default relay (it does not exist anymore) + - Diaspora: provide UI for admin to configure relay + - Diaspora: move the-federation.info registration to statistics addon + - Deprecate $a variable for *_plugin_admin() and *_plugin_admin_post() + - Chess: moved to addons-unmaintained repository + - Introduce cryptojs addon to allow decryption of legacy e2ee notes + - Introduce the hide aside addon - fade out aside areas after a while when using endless scroll + - Gallery: only show first row of images in the preview + - Gallery: restrict height of images to divmore_height + - Diaspora: make sure we only provide strings for unxmlify() + - Pubcrawl: fix federation with pixelfed + - Pubcrawl: dismiss announce if we already have the original item + - Gallery: implement view_storage permission for channel_apps() + - Cart: order currency param must be added to the sdk script url + - Diaspora utilize Lib/Connect + - Cart: utilize Lib/Connect + - Cart: add per item and per order customer data entry + - Pubcrawl: implement polls + - Chord Generator: moved to addons-unmaintained repository + - Custom Home: moved to addons-unmaintained repository + - Flattr Widget: moved to addons-unmaintained repository + - Friendica Photo Migrator: moved to addons-unmaintained repository + - Jappix Mini: moved to addons-unmaintained repository + - Mahjongg: moved to addons-unmaintained repository + - Torch: moved to addons-unmaintained repository + - Tour: moved to addons-unmaintained repository + - Introduce navbanner_option addon + - Pubcrawl: support image description + - Queueworker: fix duplicate checking + - Diaspora: fix dreport + - Move legacy zot/diaspora mail frontend from core to mail addon + - Diaspora: improve sql queries performance + - Pubcrawl: introduce pubcrawl_activity_mod_init() + - Twitter: replace Hubzilla bookmark with unicode icon + - Pubcrawl: add sys channel to local subscribers + - Pubcrawl: deal with arrays in attributedTo + - Workflow: various fixes + - Channelreputation: various fixes + - Introduce SSE addon to provide realtime notifications utilizing server sent events + + Hubzilla 4.6 (2019-12-04) - Improve opengraph support for channels - Add opengraph support for articles diff --git a/Zotlabs/Daemon/Directory.php b/Zotlabs/Daemon/Directory.php index c8cdafdf5..55d485a5b 100644 --- a/Zotlabs/Daemon/Directory.php +++ b/Zotlabs/Daemon/Directory.php @@ -2,6 +2,10 @@ namespace Zotlabs\Daemon; +use Zotlabs\Lib\Libzot; +use Zotlabs\Lib\Libzotdir; +use Zotlabs\Lib\Queue; + require_once('include/zot.php'); require_once('include/dir_fns.php'); require_once('include/queue_fn.php'); @@ -42,7 +46,7 @@ class Directory { // this is an in-memory update and we don't need to send a network packet. - local_dir_update($argv[1],$force); + Libzotdir::local_dir_update($argv[1],$force); q("update channel set channel_dirdate = '%s' where channel_id = %d", dbesc(datetime_convert()), @@ -58,13 +62,15 @@ class Directory { // otherwise send the changes upstream - $directory = find_upstream_directory($dirmode); + $directory = Libzotdir::find_upstream_directory($dirmode); $url = $directory['url'] . '/post'; // ensure the upstream directory is updated - $packet = zot_build_packet($channel,(($force) ? 'force_refresh' : 'refresh')); - $z = zot_zot($url,$packet); + + $packet = Libzot::build_packet($channel,(($force) ? 'force_refresh' : 'refresh')); + $z = Libzot::zot($url,$packet,$channel); + // re-queue if unsuccessful @@ -76,7 +82,7 @@ class Directory { $hash = random_string(); - queue_insert(array( + Queue::insert(array( 'hash' => $hash, 'account_id' => $channel['channel_account_id'], 'channel_id' => $channel['channel_id'], diff --git a/Zotlabs/Daemon/Gprobe.php b/Zotlabs/Daemon/Gprobe.php index f1ffb2d81..6951aa1d4 100644 --- a/Zotlabs/Daemon/Gprobe.php +++ b/Zotlabs/Daemon/Gprobe.php @@ -2,7 +2,9 @@ namespace Zotlabs\Daemon; -require_once('include/zot.php'); +use Zotlabs\Lib\Libzot; +use Zotlabs\Lib\Webfinger; +use Zotlabs\Lib\Zotfinger; // performs zot_finger on $argv[1], which is a hex_encoded webbie/reddress @@ -22,12 +24,16 @@ class Gprobe { ); if(! $r) { - $j = \Zotlabs\Zot\Finger::run($url,null); - if($j['success']) { - $y = import_xchan($j); + $href = Webfinger::zot_url(punify($url)); + if($href) { + $zf = Zotfinger::exec($href, null); + } + if(is_array($zf) && array_path_exists('signature/signer',$zf) && $zf['signature']['signer'] === $href && intval($zf['signature']['header_valid'])) { + $xc = Libzot::import_xchan($zf['data']); } } return; + } } diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php index 0efa93cce..8ea75af61 100644 --- a/Zotlabs/Daemon/Notifier.php +++ b/Zotlabs/Daemon/Notifier.php @@ -45,18 +45,18 @@ require_once('include/bbcode.php'); * * where COMMAND is one of the following: * - * activity (in diaspora.php, dfrn_confirm.php, profiles.php) - * comment-import (in diaspora.php, items.php) - * comment-new (in item.php) - * drop (in diaspora.php, items.php, photos.php) - * edit_post (in item.php) - * event (in events.php) - * expire (in items.php) - * like (in like.php, poke.php) - * mail (in message.php) - * tag (in photos.php, poke.php, tagger.php) - * tgroup (in items.php) - * wall-new (in photos.php, item.php) + * activity (in diaspora.php, dfrn_confirm.php, profiles.php) + * comment-import (in diaspora.php, items.php) + * comment-new (in item.php) + * drop (in diaspora.php, items.php, photos.php) + * edit_post (in item.php) + * event (in events.php) + * expire (in items.php) + * like (in like.php, poke.php) + * mail (in message.php) + * tag (in photos.php, poke.php, tagger.php) + * tgroup (in items.php) + * wall-new (in photos.php, item.php) * * and ITEM_ID is the id of the item in the database that needs to be sent to others. * @@ -66,9 +66,10 @@ require_once('include/bbcode.php'); * permission_reject abook_id * permission_update abook_id * refresh_all channel_id + * purge channel_id xchan_hash * purge_all channel_id * expire channel_id - * relay item_id (item was relayed to owner, we will deliver it as owner) + * relay item_id (item was relayed to owner, we will deliver it as owner) * single_activity item_id (deliver to a singleton network from the appropriate clone) * single_mail mail_id (deliver to a singleton network from the appropriate clone) * location channel_id @@ -240,25 +241,40 @@ class Notifier { $packet_type = 'location'; $location = true; } + elseif($cmd === 'purge') { + $xchan = $argv[3]; + logger('notifier: purge: ' . $item_id . ' => ' . $xchan); + if (! $xchan) { + return; + } + + $channel = channelx_by_n($item_id); + $recipients[] = $xchan; + $private = true; + $packet_type = 'purge'; + $packet_recips[] = ['hash' => $xchan]; + } elseif($cmd === 'purge_all') { + logger('notifier: purge_all: ' . $item_id); - $s = q("select * from channel where channel_id = %d limit 1", - intval($item_id) - ); - if($s) - $channel = $s[0]; - $uid = $item_id; - $recipients = array(); + $channel = channelx_by_n($item_id); + + $recipients = []; $r = q("select abook_xchan from abook where abook_channel = %d and abook_self = 0", intval($item_id) ); - if($r) { - foreach($r as $rr) { - $recipients[] = $rr['abook_xchan']; - } + if (! $r) { + return; + } + foreach ($r as $rr) { + $recipients[] = $rr['abook_xchan']; + $packet_recips[] = ['hash' => $rr['abook_xchan']]; } + $private = false; $packet_type = 'purge'; + + } else { @@ -278,6 +294,12 @@ class Notifier { $r = fetch_post_tags($r); $target_item = $r[0]; + + if(in_array($target_item['author']['xchan_network'], ['rss', 'anon'])) { + logger('notifier: target item author is not a fetchable actor', LOGGER_DEBUG); + return; + } + $deleted_item = false; if(intval($target_item['item_deleted'])) { @@ -379,7 +401,6 @@ class Notifier { logger('target_item: ' . print_r($target_item,true), LOGGER_DEBUG); logger('encoded: ' . print_r($activity,true), LOGGER_DEBUG); - // Send comments to the owner to re-deliver to everybody in the conversation // We only do this if the item in question originated on this site. This prevents looping. // To clarify, a site accepting a new comment is responsible for sending it to the owner for relay. @@ -542,17 +563,40 @@ class Notifier { // Now we have collected recipients (except for external mentions, FIXME) // Let's reduce this to a set of hubs; checking that the site is not dead. - $r = q("select hubloc.*, site.site_crypto, site.site_flags, site.site_version, site.site_project from hubloc left join site on site_url = hubloc_url where hubloc_hash in (" . protect_sprintf(implode(',',$recipients)) . ") - and hubloc_error = 0 and hubloc_deleted = 0 and ( site_dead = 0 OR site_dead is null ) " + $hubs = q("select hubloc.*, site.site_crypto, site.site_flags, site.site_version, site.site_project, site.site_dead from hubloc left join site on site_url = hubloc_url + where hubloc_hash in (" . protect_sprintf(implode(',',$recipients)) . ") + and hubloc_error = 0 and hubloc_deleted = 0" ); + + // public posts won't make it to the local public stream unless there's a recipient on this site. + // This code block sees if it's a public post and localhost is missing, and if so adds an entry for the local sys channel to the $hubs list + + if (! $private) { + $found_localhost = false; + if ($hubs) { + foreach ($hubs as $h) { + if ($h['hubloc_url'] === z_root()) { + $found_localhost = true; + break; + } + } + } + if (! $found_localhost) { + $localhub = q("select hubloc.*, site.site_crypto, site.site_flags, site.site_version, site.site_project, site.site_dead from hubloc + left join site on site_url = hubloc_url where hubloc_id_url = '%s' and hubloc_error = 0 and hubloc_deleted = 0", + dbesc(z_root() . '/channel/sys') + ); + if ($localhub) { + $hubs = array_merge($hubs, $localhub); + } + } + } - if(! $r) { + if(! $hubs) { logger('notifier: no hubs', LOGGER_NORMAL, LOG_NOTICE); return; } - $hubs = $r; - /** * Reduce the hubs to those that are unique. For zot hubs, we need to verify uniqueness by the sitekey, * since it may have been a re-install which has not yet been detected and pruned. @@ -565,8 +609,15 @@ class Notifier { $keys = []; // array of keys to check uniquness for zot hubs $urls = []; // array of urls to check uniqueness of hubs from other networks $hub_env = []; // per-hub envelope so we don't broadcast the entire envelope to all + $dead = []; // known dead hubs - report them as undeliverable foreach($hubs as $hub) { + + if (intval($hub['site_dead'])) { + $dead[] = $hub; + continue; + } + if($env_recips) { foreach($env_recips as $er) { if($hub['hubloc_hash'] === $er['hash']) { @@ -793,6 +844,24 @@ class Notifier { logger('notifier: basic loop complete.', LOGGER_DEBUG); + if ($dead) { + foreach ($dead as $deceased) { + if (is_array($target_item) && (! $target_item['item_deleted']) && (! get_config('system','disable_dreport'))) { + q("insert into dreport ( dreport_mid, dreport_site, dreport_recip, dreport_name, dreport_result, dreport_time, dreport_xchan, dreport_queue ) + values ( '%s', '%s','%s','%s','%s','%s','%s','%s' ) ", + dbesc($target_item['mid']), + dbesc($deceased['hubloc_host']), + dbesc($deceased['hubloc_host']), + dbesc($deceased['hubloc_host']), + dbesc('undeliverable/unresponsive site'), + dbesc(datetime_convert()), + dbesc($channel['channel_hash']), + dbesc(random_string(48)) + ); + } + } + } + call_hooks('notifier_end',$target_item); logger('notifer: complete.'); diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index 83c04c042..08e5ffaca 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -168,7 +168,7 @@ class Activity { if($r) { xchan_query($r,true); $r = fetch_post_tags($r,true); - if ($r[0]['verb'] === 'Create' && $r[0]['obj_type'] === ACTIVITY_OBJ_EVENT) { + if (in_array($r[0]['verb'], ['Create', 'Invite']) && $r[0]['obj_type'] === ACTIVITY_OBJ_EVENT) { $r[0]['verb'] = 'Invite'; return self::encode_activity($r[0]); } @@ -319,6 +319,26 @@ class Activity { $ret = Activity::encode_object($i['obj']); } + if (intval($i['item_deleted'])) { + $ret['type'] = 'Tombstone'; + $ret['formerType'] = $objtype; + $ret['id'] = $i['mid']; + if($i['id'] != $i['parent']) + $ret['inReplyTo'] = $i['thr_parent']; + + $ret['to'] = [ ACTIVITY_PUBLIC_INBOX ]; + return $ret; + } + + if ($i['obj']) { + if (is_array($i['obj'])) { + $ret = $i['obj']; + } + else { + $ret = json_decode($i['obj'],true); + } + } + $ret['type'] = $objtype; if ($objtype === 'Question') { @@ -632,7 +652,7 @@ class Activity { - static function encode_activity($i) { + static function encode_activity($i, $recurse = false) { $ret = []; $reply = false; @@ -643,41 +663,47 @@ class Activity { $ret['obj'] = []; } - if (intval($i['item_deleted'])) { - $ret['type'] = 'Delete'; - $ret['id'] = str_replace('/item/','/activity/',$i['mid']) . '#delete'; + $ret['type'] = self::activity_mapper($i['verb']); + $fragment = ''; + + if (intval($i['item_deleted']) && !$recurse) { + $is_response = false; + + if (ActivityStreams::is_response_activity($ret['type'])) { + $ret['type'] = 'Undo'; + $fragment = 'undo'; + $is_response = true; + } + else { + $ret['type'] = 'Delete'; + $fragment = 'delete'; + } + + $ret['id'] = str_replace('/item/','/activity/',$i['mid']) . '#' . $fragment; $actor = self::encode_person($i['author'],false); if ($actor) $ret['actor'] = $actor; else return []; - if ($i['obj']) { - if (! is_array($i['obj'])) { - $i['obj'] = json_decode($i['obj'],true); + $obj = (($is_response) ? self::encode_activity($i,true) : self::encode_item($i,true)); + if ($obj) { + if (array_path_exists('object/id',$obj)) { + $obj['object'] = $obj['object']['id']; } - $obj = self::encode_object($i['obj']); - if ($obj) - $ret['object'] = $obj; - else - return []; - } - else { - $obj = self::encode_item($i); - if ($obj) - $ret['object'] = $obj; - else - return []; + unset($obj['cc']); + $obj['to'] = [ ACTIVITY_PUBLIC_INBOX ]; + $ret['object'] = $obj; } + else + return []; $ret['to'] = [ ACTIVITY_PUBLIC_INBOX ]; + return $ret; } - - $ret['type'] = self::activity_mapper($i['verb']); - if($ret['type'] === 'emojiReaction') { // There may not be an object for these items for legacy reasons - it should be the conversation parent. $p = q("select * from item where mid = '%s' and uid = %d", @@ -1072,6 +1098,8 @@ class Activity { 'http://purl.org/zot/activity/attendno' => 'Reject', 'http://purl.org/zot/activity/attendmaybe' => 'TentativeAccept', 'Invite' => 'Invite', + 'Delete' => 'Delete', + 'Undo' => 'Undo' ]; call_hooks('activity_mapper',$acts); @@ -1119,6 +1147,8 @@ class Activity { 'http://purl.org/zot/activity/attendno' => 'Reject', 'http://purl.org/zot/activity/attendmaybe' => 'TentativeAccept', 'Invite' => 'Invite', + 'Delete' => 'Delete', + 'Undo' => 'Undo' ]; call_hooks('activity_decode_mapper',$acts); @@ -1155,7 +1185,9 @@ class Activity { 'Question' => 'Question', 'Document' => 'Document', 'Audio' => 'Audio', - 'Video' => 'Video' + 'Video' => 'Video', + 'Delete' => 'Delete', + 'Undo' => 'Undo' ]; call_hooks('activity_obj_decode_mapper',$objs); @@ -1192,7 +1224,9 @@ class Activity { 'Invite' => 'Invite', 'Question' => 'Question', 'Audio' => 'Audio', - 'Video' => 'Video' + 'Video' => 'Video', + 'Delete' => 'Delete', + 'Undo' => 'Undo' ]; call_hooks('activity_obj_mapper',$objs); @@ -1702,6 +1736,23 @@ class Activity { $s['aid'] = $channel['channel_account_id']; $s['uid'] = $channel['channel_id']; + + // Make sure we use the zot6 identity where applicable + + $s['author_xchan'] = self::find_best_identity($s['author_xchan']); + $s['owner_xchan'] = self::find_best_identity($s['owner_xchan']); + + if(!$s['author_xchan']) { + logger('No author: ' . print_r($act, true)); + } + + if(!$s['owner_xchan']) { + logger('No owner: ' . print_r($act, true)); + } + + if(!$s['author_xchan'] || !$s['owner_xchan']) + return; + $s['mid'] = urldecode($act->obj['id']); $s['uuid'] = $act->obj['diaspora:guid']; $s['plink'] = urldecode($act->obj['id']); @@ -2017,13 +2068,13 @@ class Activity { $s['expires'] = datetime_convert('UTC','UTC',$act->obj['expires']); } - if(in_array($act->type, [ 'Like', 'Dislike', 'Flag', 'Block', 'Announce', 'Accept', 'Reject', 'TentativeAccept', 'emojiReaction' ])) { + if(ActivityStreams::is_response_activity($act->type)) { $response_activity = true; $s['mid'] = $act->id; - $s['parent_mid'] = $act->obj['id']; - $s['uuid'] = $act->{'diaspora:guid'}; + // $s['parent_mid'] = $act->obj['id']; + $s['uuid'] = $act->data['diaspora:guid']; // over-ride the object timestamp with the activity @@ -2089,12 +2140,10 @@ class Activity { $s['edited'] = datetime_convert(); } - if($act->type === 'Tombstone' || $act->type === 'Delete' || ($act->type === 'Create' && $act->obj['type'] === 'Tombstone')) { + if(in_array($act->type, [ 'Delete', 'Undo', 'Tombstone' ]) || ($act->type === 'Create' && $act->obj['type'] === 'Tombstone')) { $s['item_deleted'] = 1; } - - $s['obj_type'] = self::activity_obj_decode_mapper($act->obj['type']); if($s['obj_type'] === ACTIVITY_OBJ_NOTE && $s['mid'] !== $s['parent_mid']) { $s['obj_type'] = ACTIVITY_OBJ_COMMENT; @@ -2445,11 +2494,22 @@ class Activity { $item['aid'] = $channel['channel_account_id']; $item['uid'] = $channel['channel_id']; - if(! ( $item['author_xchan'] && $item['owner_xchan'])) { - logger('owner or author missing.'); - return; + // Make sure we use the zot6 identity where applicable + + $item['author_xchan'] = self::find_best_identity($item['author_xchan']); + $item['owner_xchan'] = self::find_best_identity($item['owner_xchan']); + + if(!$item['author_xchan']) { + logger('No author: ' . print_r($act, true)); + } + + if(!$item['owner_xchan']) { + logger('No owner: ' . print_r($act, true)); } + if(!$item['author_xchan'] || !$item['owner_xchan']) + return; + if($channel['channel_system']) { if(! MessageFilter::evaluate($item,get_config('system','pubstream_incl'),get_config('system','pubstream_excl'))) { logger('post is filtered'); @@ -2645,6 +2705,7 @@ class Activity { static public function fetch_and_store_replies($channel, $arr) { logger('fetching replies'); + logger(print_r($arr,true)); $p = []; @@ -2889,7 +2950,7 @@ class Activity { $s['parent_mid'] = $s['mid']; - $post_type = (($parent_item['resource_type'] === 'photo') ? t('photo') : t('status')); + $post_type = (($parent_item['resource_type'] === 'photo') ? t('photo') : t('post')); $links = array(array('rel' => 'alternate','type' => 'text/html', 'href' => $parent_item['plink'])); $objtype = (($parent_item['resource_type'] === 'photo') ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE ); @@ -3106,5 +3167,45 @@ class Activity { return $content; } + // Find either an Authorization: Bearer token or 'token' request variable + // in the current web request and return it + + static function token_from_request() { + + foreach ( [ 'REDIRECT_REMOTE_USER', 'HTTP_AUTHORIZATION' ] as $s ) { + $auth = ((array_key_exists($s,$_SERVER) && strpos($_SERVER[$s],'Bearer ') === 0) + ? str_replace('Bearer ', EMPTY_STR, $_SERVER[$s]) + : EMPTY_STR + ); + if ($auth) { + break; + } + } + + if (! $auth) { + if (array_key_exists('token',$_REQUEST) && $_REQUEST['token']) { + $auth = $_REQUEST['token']; + } + } + + return $auth; + } + + static function find_best_identity($xchan) { + + if(filter_var($xchan, FILTER_VALIDATE_URL)) { + $r = q("select hubloc_hash, hubloc_network from hubloc where hubloc_id_url = '%s' and hubloc_network in ('zot6', 'zot') and hubloc_deleted = 0", + dbesc($xchan) + ); + if ($r) { + $r = Libzot::zot_record_preferred($r); + logger('find_best_identity: ' . $xchan . ' > ' . $r['hubloc_hash']); + return $r['hubloc_hash']; + } + } + + return $xchan; + + } } diff --git a/Zotlabs/Lib/ActivityStreams.php b/Zotlabs/Lib/ActivityStreams.php index b1ef59364..a0ba52aa6 100644 --- a/Zotlabs/Lib/ActivityStreams.php +++ b/Zotlabs/Lib/ActivityStreams.php @@ -274,12 +274,19 @@ class ActivityStreams { return self::fetch($url); } - static function fetch($url,$channel = null) { - return Activity::fetch($url,$channel); + static function fetch($url, $channel = null) { + return Activity::fetch($url, $channel); } static function is_an_actor($s) { - return(in_array($s,[ 'Application','Group','Organization','Person','Service' ])); + return (in_array($s, [ 'Application','Group','Organization','Person','Service' ])); + } + + static function is_response_activity($s) { + if (! $s) { + return false; + } + return (in_array($s, [ 'Like', 'Dislike', 'Flag', 'Block', 'Announce', 'Accept', 'Reject', 'TentativeAccept', 'TentativeReject', 'emojiReaction', 'EmojiReaction', 'EmojiReact' ])); } /** @@ -402,7 +409,6 @@ class ActivityStreams { return $x; } - static function is_as_request() { $x = getBestSupportedMimeType([ @@ -415,5 +421,4 @@ class ActivityStreams { } - } diff --git a/Zotlabs/Lib/Connect.php b/Zotlabs/Lib/Connect.php index caac30f7a..481b02ce2 100644 --- a/Zotlabs/Lib/Connect.php +++ b/Zotlabs/Lib/Connect.php @@ -187,12 +187,8 @@ class Connect { // Always set these "remote" permissions for feeds since we cannot interact with them // to negotiate a suitable permission response - $p = get_abconfig($uid,$xchan_hash,'system','their_perms',EMPTY_STR); - if ($p) { - $p .= ','; - } - $p .= 'view_stream,republish'; - set_abconfig($uid,$xchan_hash,'system','their_perms',$p); + set_abconfig($uid,$xchan_hash,'their_perms','view_stream',1); + set_abconfig($uid,$xchan_hash,'their_perms','republish',1); } diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php index 03a824b9b..c78325ee3 100644 --- a/Zotlabs/Lib/Enotify.php +++ b/Zotlabs/Lib/Enotify.php @@ -966,8 +966,8 @@ class Enotify { 'url' => $rr['xchan_url'], 'photo' => $rr['xchan_photo_s'], 'when' => $when, - 'hclass' => ('notify-unseen'), - 'message' => t('posted an event') + 'hclass' => (($today) ? 'notify-unseen bg-warning' : 'notify-unseen'), + 'message' => t('created an event') ]; return $x; diff --git a/Zotlabs/Lib/Libsync.php b/Zotlabs/Lib/Libsync.php index b7cda1770..cff320e11 100644 --- a/Zotlabs/Lib/Libsync.php +++ b/Zotlabs/Lib/Libsync.php @@ -819,9 +819,9 @@ class Libsync { } if(intval($r[0]['hubloc_primary']) && (! $location['primary'])) { - $m = q("update hubloc set hubloc_primary = 0, hubloc_updated = '%s' where hubloc_id = %d", + $m = q("update hubloc set hubloc_primary = 0, hubloc_updated = '%s' where hubloc_id_url = '%s'", dbesc(datetime_convert()), - intval($r[0]['hubloc_id']) + dbesc($r[0]['hubloc_id_url']) ); $r[0]['hubloc_primary'] = intval($location['primary']); hubloc_change_primary($r[0]); @@ -848,18 +848,18 @@ class Libsync { } } if(intval($r[0]['hubloc_deleted']) && (! intval($location['deleted']))) { - $n = q("update hubloc set hubloc_deleted = 0, hubloc_updated = '%s' where hubloc_id = %d", + $n = q("update hubloc set hubloc_deleted = 0, hubloc_updated = '%s' where hubloc_id_url = '%s'", dbesc(datetime_convert()), - intval($r[0]['hubloc_id']) + dbesc($r[0]['hubloc_id_url']) ); $what .= 'undelete_hub '; $changed = true; } elseif((! intval($r[0]['hubloc_deleted'])) && (intval($location['deleted']))) { logger('deleting hubloc: ' . $r[0]['hubloc_addr']); - $n = q("update hubloc set hubloc_deleted = 1, hubloc_updated = '%s' where hubloc_id = %d", + $n = q("update hubloc set hubloc_deleted = 1, hubloc_updated = '%s' where hubloc_id_url = '%s'", dbesc(datetime_convert()), - intval($r[0]['hubloc_id']) + dbesc($r[0]['hubloc_id_url']) ); $what .= 'delete_hub '; $changed = true; @@ -918,9 +918,9 @@ class Libsync { foreach($xisting as $x) { if(! array_key_exists('updated',$x)) { logger('Deleting unreferenced hub location ' . $x['hubloc_addr']); - $r = q("update hubloc set hubloc_deleted = 1, hubloc_updated = '%s' where hubloc_id = %d", + $r = q("update hubloc set hubloc_deleted = 1, hubloc_updated = '%s' where hubloc_id_url = '%s'", dbesc(datetime_convert()), - intval($x['hubloc_id']) + dbesc($x['hubloc_id_url']) ); $what .= 'removed_hub '; $changed = true; diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php index f4eb26463..f0fe3ab24 100644 --- a/Zotlabs/Lib/Libzot.php +++ b/Zotlabs/Lib/Libzot.php @@ -326,14 +326,10 @@ class Libzot { if($permissions && is_array($permissions)) { $old_read_stream_perm = get_abconfig($channel['channel_id'],$x['hash'],'their_perms','view_stream'); - // We need to reset their_perms prior to setting the new ones. - // Otherwise withdrawn permissions will not take effect locally. - q("DELETE FROM abconfig WHERE chan = %d AND xchan = '%s' AND cat = 'their_perms'", - intval($channel['channel_id']), - dbesc($x['hash']) - ); - foreach($permissions as $p) { - set_abconfig($channel['channel_id'],$x['hash'],'their_perms',$p,'1'); + $permissions = Permissions::FilledPerms($permissions); + + foreach($permissions as $k => $v) { + set_abconfig($channel['channel_id'],$x['hash'],'their_perms',$k,$v); } } @@ -1141,6 +1137,7 @@ class Libzot { } logger($AS->debug(),LOGGER_DATA); + } @@ -1201,10 +1198,6 @@ class Libzot { if(in_array($env['type'],['activity','response'])) { - $arr = Activity::decode_note($AS); - - //logger($AS->debug()); - $r = q("select hubloc_hash, hubloc_network from hubloc where hubloc_id_url = '%s' ", dbesc($AS->actor['id']) ); @@ -1215,6 +1208,10 @@ class Libzot { $arr['author_xchan'] = $r['hubloc_hash']; } + if (! $arr['author_xchan']) { + logger('No author!'); + return; + } $s = q("select hubloc_hash from hubloc where hubloc_id_url = '%s' and hubloc_network = 'zot6' limit 1", dbesc($env['sender']) @@ -1496,13 +1493,14 @@ class Libzot { // Try again using the delivery channel credentials. // We will also need to re-parse the $item array, // but preserve any values that were set during anonymous parsing. - + $o = Activity::fetch($act->obj,$channel); if($o) { $act->obj = $o; $arr = array_merge(Activity::decode_note($act),$arr); } else { + $DR->update('Incomplete or corrupt activity'); $result[] = $DR->get(); continue; @@ -1725,7 +1723,7 @@ class Libzot { $arr['aid'] = $channel['channel_account_id']; $arr['uid'] = $channel['channel_id']; - $item_id = self::delete_imported_item($sender,$arr,$channel['channel_id'],$relay); + $item_id = self::delete_imported_item($sender,$act,$arr,$channel['channel_id'],$relay); $DR->update(($item_id) ? 'deleted' : 'delete_failed'); $result[] = $DR->get(); @@ -1739,11 +1737,15 @@ class Libzot { continue; } + // reactions such as like and dislike could have an mid with /activity/ in it. + // Check for both forms in order to prevent duplicates. - $r = q("select * from item where mid = '%s' and uid = %d limit 1", + $r = q("select * from item where mid in ('%s','%s') and uid = %d limit 1", dbesc($arr['mid']), + dbesc(str_replace(z_root() . '/activity/', z_root() . '/item/', $arr['mid'])), intval($channel['channel_id']) ); + if($r) { // We already have this post. $item_id = $r[0]['id']; @@ -2104,7 +2106,7 @@ class Libzot { * @return boolean|int post_id */ - static function delete_imported_item($sender, $item, $uid, $relay) { + static function delete_imported_item($sender, $act, $item, $uid, $relay) { logger('invoked', LOGGER_DEBUG); @@ -2112,38 +2114,39 @@ class Libzot { $item_found = false; $post_id = 0; + if ($item['verb'] === 'Tombstone') { + // The id of the deleted thing is the item mid (activity id) + $mid = $item['mid']; + } + else { + // The id is the object id if the type is Undo or Delete + $mid = ((is_array($act->obj)) ? $act->obj['id'] : $act->obj); + } + + // we may have stored either the object id or the activity id if it was a response activity (like, dislike, etc.) + $r = q("select * from item where ( author_xchan = '%s' or owner_xchan = '%s' or source_xchan = '%s' ) - and mid = '%s' and uid = %d limit 1", + and mid IN ('%s', '%s') and uid = %d limit 1", dbesc($sender), dbesc($sender), dbesc($sender), - dbesc($item['mid']), + dbesc($mid), + dbesc(str_replace('/activity/','/item/',$mid)), intval($uid) ); if($r) { $stored = $r[0]; - if($stored['author_xchan'] === $sender || $stored['owner_xchan'] === $sender || $stored['source_xchan'] === $sender) - $ownership_valid = true; + // we proved ownership in the sql query + $ownership_valid = true; $post_id = $stored['id']; $item_found = true; } else { - - // perhaps the item is still in transit and the delete notification got here before the actual item did. Store it with the deleted flag set. - // item_store() won't try to deliver any notifications or start delivery chains if this flag is set. - // This means we won't end up with potentially even more delivery threads trying to push this delete notification. - // But this will ensure that if the (undeleted) original post comes in at a later date, we'll reject it because it will have an older timestamp. - - logger('delete received for non-existent item - storing item data.'); - - if($item['author_xchan'] === $sender || $item['owner_xchan'] === $sender || $item['source_xchan'] === $sender) { - $ownership_valid = true; - $item_result = item_store($item); - $post_id = $item_result['item_id']; - } + // this will fail with an ownership issue, so explain the real reason + logger('delete received for non-existent item or not owned by sender - ignoring.'); } if($ownership_valid === false) { diff --git a/Zotlabs/Lib/Libzotdir.php b/Zotlabs/Lib/Libzotdir.php index 1cb52275c..b02516a98 100644 --- a/Zotlabs/Lib/Libzotdir.php +++ b/Zotlabs/Lib/Libzotdir.php @@ -3,6 +3,8 @@ namespace Zotlabs\Lib; use Zotlabs\Lib\Libzot; +use Zotlabs\Lib\Zotfinger; +use Zotlabs\Lib\Webfinger; require_once('include/permissions.php'); @@ -307,9 +309,9 @@ class Libzotdir { if ($ud['ud_addr'] && (! ($ud['ud_flags'] & UPDATE_FLAGS_DELETED))) { $success = false; - $href = \Zotlabs\Lib\Webfinger::zot_url(punify($ud['ud_addr'])); + $href = Webfinger::zot_url(punify($ud['ud_addr'])); if($href) { - $zf = \Zotlabs\Lib\Zotfinger::exec($href); + $zf = Zotfinger::exec($href); } if(is_array($zf) && array_path_exists('signature/signer',$zf) && $zf['signature']['signer'] === $href && intval($zf['signature']['header_valid'])) { $xc = Libzot::import_xchan($zf['data'], 0, $ud); @@ -339,7 +341,7 @@ class Libzotdir { logger('local_dir_update: uid: ' . $uid, LOGGER_DEBUG); - $p = q("select channel.channel_hash, channel_address, channel_timezone, profile.* from profile left join channel on channel_id = uid where uid = %d and is_default = 1", + $p = q("select channel.channel_hash, channel_address, channel_timezone, channel_portable_id, profile.* from profile left join channel on channel_id = uid where uid = %d and is_default = 1", intval($uid) ); @@ -348,6 +350,7 @@ class Libzotdir { if ($p) { $hash = $p[0]['channel_hash']; + $legacy_hash = $p[0]['channel_portable_id']; $profile['description'] = $p[0]['pdesc']; $profile['birthday'] = $p[0]['dob']; @@ -381,14 +384,15 @@ class Libzotdir { logger('hidden: ' . $hidden); - $r = q("select xchan_hidden from xchan where xchan_hash = '%s' limit 1", + $r = q("select xchan_hidden from xchan where xchan_hash = '%s'", dbesc($p[0]['channel_hash']) ); if(intval($r[0]['xchan_hidden']) != $hidden) { - $r = q("update xchan set xchan_hidden = %d where xchan_hash = '%s'", + $r = q("update xchan set xchan_hidden = %d where xchan_hash in ('%s', '%s')", intval($hidden), - dbesc($p[0]['channel_hash']) + dbesc($hash), + dbesc($legacy_hash) ); } @@ -402,11 +406,13 @@ class Libzotdir { } else { // they may have made it private - $r = q("delete from xprof where xprof_hash = '%s'", - dbesc($hash) + q("delete from xprof where xprof_hash in ('%s', '%s')", + dbesc($hash), + dbesc($legacy_hash) ); - $r = q("delete from xtag where xtag_hash = '%s'", - dbesc($hash) + q("delete from xtag where xtag_hash in ('%s', '%s')", + dbesc($hash), + dbesc($legacy_hash) ); } diff --git a/Zotlabs/Lib/Share.php b/Zotlabs/Lib/Share.php index f8b636c10..419e6ed5f 100644 --- a/Zotlabs/Lib/Share.php +++ b/Zotlabs/Lib/Share.php @@ -128,7 +128,7 @@ class Share { "' profile='" . $this->item['author']['xchan_url'] . "' avatar='" . $this->item['author']['xchan_photo_s'] . "' link='" . $this->item['plink'] . - "' auth='" . (($this->item['author']['network'] === 'zot') ? 'true' : 'false') . + "' auth='" . ((in_array($this->item['author']['xchan_network'], ['zot6', 'zot'])) ? 'true' : 'false') . "' posted='" . $this->item['created'] . "' message_id='" . $this->item['mid'] . "']"; diff --git a/Zotlabs/Lib/Webfinger.php b/Zotlabs/Lib/Webfinger.php index c2364ac4d..611c36889 100644 --- a/Zotlabs/Lib/Webfinger.php +++ b/Zotlabs/Lib/Webfinger.php @@ -106,4 +106,4 @@ class Webfinger { -}
\ No newline at end of file +} diff --git a/Zotlabs/Lib/Zotfinger.php b/Zotlabs/Lib/Zotfinger.php index 2d2e6796b..722e34dfc 100644 --- a/Zotlabs/Lib/Zotfinger.php +++ b/Zotlabs/Lib/Zotfinger.php @@ -60,4 +60,4 @@ class Zotfinger { -}
\ No newline at end of file +} diff --git a/Zotlabs/Module/Activity.php b/Zotlabs/Module/Activity.php index 9971ee60f..b75f0b245 100644 --- a/Zotlabs/Module/Activity.php +++ b/Zotlabs/Module/Activity.php @@ -21,7 +21,6 @@ class Activity extends Controller { if (Libzot::is_zot_request()) { $item_id = argv(1); - if (! $item_id) http_status_exit(404, 'Not found'); @@ -170,6 +169,99 @@ class Activity extends Controller { } + if(ActivityStreams::is_as_request()) { + + $item_id = argv(1); + + if (! $item_id) { + return; + } + + $ob_authorise = false; + $item_uid = 0; + + $bear = ZlibActivity::token_from_request(); + if ($bear) { + logger('bear: ' . $bear, LOGGER_DEBUG); + $t = q("select item.uid, iconfig.v from iconfig left join item on iid = item.id where cat = 'ocap' and item.uuid = '%s'", + dbesc($item_id) + ); + if ($t) { + foreach ($t as $token) { + if ($token['v'] === $bear) { + $ob_authorize = true; + $item_uid = $token['uid']; + break; + } + } + } + } + + $item_normal = " and item.item_hidden = 0 and item.item_type = 0 and item.item_unpublished = 0 + and item.item_delayed = 0 and item.item_blocked = 0 "; + + $sigdata = HTTPSig::verify(EMPTY_STR); + if ($sigdata['portable_id'] && $sigdata['header_valid']) { + $portable_id = $sigdata['portable_id']; + if (! check_channelallowed($portable_id)) { + http_status_exit(403, 'Permission denied'); + } + if (! check_siteallowed($sigdata['signer'])) { + http_status_exit(403, 'Permission denied'); + } + observer_auth($portable_id); + } + + // if passed an owner_id of 0 to item_permissions_sql(), we force "guest access" or observer checking + // Give ocap tokens priority + + if ($ob_authorize) { + $sql_extra = " and item.uid = " . intval($token['uid']) . " "; + } + else { + $sql_extra = item_permissions_sql(0); + } + + $r = q("select * from item where uuid = '%s' $item_normal $sql_extra limit 1", + dbesc($item_id) + ); + + if (! $r) { + $r = q("select * from item where uuid = '%s' $item_normal limit 1", + dbesc($item_id) + ); + if($r) { + http_status_exit(403, 'Forbidden'); + } + http_status_exit(404, 'Not found'); + } + + xchan_query($r,true); + $items = fetch_post_tags($r,false); + + $channel = channelx_by_n($items[0]['uid']); + + $x = array_merge( ['@context' => [ + ACTIVITYSTREAMS_JSONLD_REV, + 'https://w3id.org/security/v1', + z_root() . ZOT_APSCHEMA_REV + ]], ZlibActivity::encode_activity($items[0],true)); + + $headers = []; + $headers['Content-Type'] = 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"' ; + $x['signature'] = LDSignatures::sign($x,$channel); + $ret = json_encode($x, JSON_UNESCAPED_SLASHES); + $headers['Date'] = datetime_convert('UTC','UTC', 'now', 'D, d M Y H:i:s \\G\\M\\T'); + $headers['Digest'] = HTTPSig::generate_digest_header($ret); + $headers['(request-target)'] = strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI']; + + $h = HTTPSig::create_sig($headers,$channel['channel_prvkey'],channel_url($channel)); + HTTPSig::set_headers($h); + echo $ret; + killme(); + + } + goaway(z_root() . '/item/' . argv(1)); } diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php index 9c8cddab3..307be048a 100644 --- a/Zotlabs/Module/Channel.php +++ b/Zotlabs/Module/Channel.php @@ -442,44 +442,12 @@ class Channel extends Controller { } - $update_unseen = ''; - - if($page_mode === 'list') { - - /** - * in "list mode", only mark the parent item and any like activities as "seen". - * We won't distinguish between comment likes and post likes. The important thing - * is that the number of unseen comments will be accurate. The SQL to separate the - * comment likes could also get somewhat hairy. - */ - - if($parents_str) { - $update_unseen = " AND ( id IN ( " . dbesc($parents_str) . " )"; - $update_unseen .= " OR ( parent IN ( " . dbesc($parents_str) . " ) AND verb in ( '" . dbesc(ACTIVITY_LIKE) . "','" . dbesc(ACTIVITY_DISLIKE) . "' ))) "; - } - } - else { - if($parents_str) { - $update_unseen = " AND parent IN ( " . dbesc($parents_str) . " )"; - } - } - - if($is_owner && $update_unseen) { - $x = [ 'channel_id' => local_channel(), 'update' => 'unset' ]; - call_hooks('update_unseen',$x); - if($x['update'] === 'unset' || intval($x['update'])) { - $r = q("UPDATE item SET item_unseen = 0 where item_unseen = 1 and item_wall = 1 AND uid = %d $update_unseen", - intval(local_channel()) - ); - } - } - // Add pinned content if(! x($_REQUEST,'mid') && ! $search) { - $pinned = new \Zotlabs\Widget\Pinned; - $r = $pinned->widget(intval(App::$profile['profile_uid']), [ITEM_TYPE_POST]); - $o .= $r['html']; - } + $pinned = new \Zotlabs\Widget\Pinned; + $r = $pinned->widget(intval(App::$profile['profile_uid']), [ITEM_TYPE_POST]); + $o .= $r['html']; + } $mode = (($search) ? 'search' : 'channel'); diff --git a/Zotlabs/Module/Chanview.php b/Zotlabs/Module/Chanview.php index 20ac41fbe..12e1891d4 100644 --- a/Zotlabs/Module/Chanview.php +++ b/Zotlabs/Module/Chanview.php @@ -1,31 +1,35 @@ <?php namespace Zotlabs\Module; -require_once('include/zot.php'); +use App; +use Zotlabs\Lib\Libzot; +use Zotlabs\Lib\Webfinger; +use Zotlabs\Lib\Zotfinger; + class Chanview extends \Zotlabs\Web\Controller { function get() { - $observer = \App::get_observer(); + $observer = App::get_observer(); $xchan = null; $r = null; if($_REQUEST['hash']) { - $r = q("select * from xchan where xchan_hash = '%s' limit 1", + $r = q("select * from xchan where xchan_hash = '%s'", dbesc($_REQUEST['hash']) ); } if($_REQUEST['address']) { - $r = q("select * from xchan where xchan_addr = '%s' limit 1", + $r = q("select * from xchan where xchan_addr = '%s'", dbesc(punify($_REQUEST['address'])) ); } elseif(local_channel() && intval($_REQUEST['cid'])) { $r = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash - WHERE abook_channel = %d and abook_id = %d LIMIT 1", + WHERE abook_channel = %d and abook_id = %d", intval(local_channel()), intval($_REQUEST['cid']) ); @@ -35,12 +39,12 @@ class Chanview extends \Zotlabs\Web\Controller { // if somebody re-installed they will have more than one xchan, use the most recent name date as this is // the most useful consistently ascending table item we have. - $r = q("select * from xchan where xchan_url = '%s' order by xchan_name_date desc limit 1", + $r = q("select * from xchan where xchan_url = '%s' order by xchan_name_date desc", dbesc($_REQUEST['url']) ); } if($r) { - \App::$poi = $r[0]; + App::$poi = Libzot::zot_record_preferred($r, 'xchan_network'); } @@ -49,43 +53,45 @@ class Chanview extends \Zotlabs\Web\Controller { // address, we can and should try to import it. If it's just a hash, we can't continue, but we // probably wouldn't have a hash if we don't already have an xchan for this channel. - if(! \App::$poi) { + if(! App::$poi) { logger('mod_chanview: fallback'); - // This is hackish - construct a zot address from the url - if($_REQUEST['url']) { - if(preg_match('/https?\:\/\/(.*?)(\/channel\/|\/profile\/)(.*?)$/ism',$_REQUEST['url'],$matches)) { - $_REQUEST['address'] = $matches[3] . '@' . $matches[1]; + + if($_REQUEST['address']) { + $href = Webfinger::zot_url(punify($_REQUEST['address'])); + if($href) { + $_REQUEST['url'] = $href; } - logger('mod_chanview: constructed address ' . print_r($matches,true)); } $r = null; - if($_REQUEST['address']) { - $j = \Zotlabs\Zot\Finger::run($_REQUEST['address'],null); - if($j['success']) { - import_xchan($j); - $r = q("select * from xchan where xchan_addr = '%s' limit 1", - dbesc($_REQUEST['address']) + if($_REQUEST['url']) { + + $zf = Zotfinger::exec($_REQUEST['url'], null); + + if(array_path_exists('signature/signer',$zf) && $zf['signature']['signer'] === $_REQUEST['url'] && intval($zf['signature']['header_valid'])) { + Libzot::import_xchan($j); + $r = q("select * from xchan where xchan_url = '%s'", + dbesc($_REQUEST['url']) ); if($r) { - \App::$poi = $r[0]; + App::$poi = Libzot::zot_record_preferred($r, 'xchan_network'); } } if(! $r) { - if(discover_by_webbie($_REQUEST['address'])) { - $r = q("select * from xchan where xchan_addr = '%s' limit 1", - dbesc($_REQUEST['address']) + if(discover_by_webbie($_REQUEST['url'])) { + $r = q("select * from xchan where xchan_url = '%s'", + dbesc($_REQUEST['url']) ); if($r) { - \App::$poi = $r[0]; + App::$poi = Libzot::zot_record_preferred($r, 'xchan_network'); } } } } } - if(! \App::$poi) { + if(! App::$poi) { notice( t('Channel not found.') . EOL); return; } @@ -93,19 +99,17 @@ class Chanview extends \Zotlabs\Web\Controller { $is_zot = false; $connected = false; - if (\App::$poi) { - $url = \App::$poi['xchan_url']; - if(in_array(\App::$poi['xchan_network'], ['zot', 'zot6'])) { - $is_zot = true; - } - if(local_channel()) { - $c = q("select abook_id from abook where abook_channel = %d and abook_xchan = '%s' limit 1", - intval(local_channel()), - dbesc(\App::$poi['xchan_hash']) - ); - if($c) - $connected = true; - } + $url = App::$poi['xchan_url']; + if(in_array(App::$poi['xchan_network'], ['zot', 'zot6'])) { + $is_zot = true; + } + if(local_channel()) { + $c = q("select abook_id from abook where abook_channel = %d and abook_xchan = '%s' limit 1", + intval(local_channel()), + dbesc(App::$poi['xchan_hash']) + ); + if($c) + $connected = true; } // We will load the chanview template if it's a foreign network, diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php index c0df57390..0fc807d42 100644 --- a/Zotlabs/Module/Connedit.php +++ b/Zotlabs/Module/Connedit.php @@ -7,9 +7,16 @@ namespace Zotlabs\Module; * */ +use App; use Zotlabs\Lib\Apps; use Zotlabs\Lib\Libzot; use Zotlabs\Lib\Libsync; +use Zotlabs\Daemon\Master; +use Zotlabs\Web\Controller; +use Zotlabs\Access\Permissions; +use Zotlabs\Access\PermissionLimits; +use Zotlabs\Web\HTTPHeaders; +use Zotlabs\Lib\Permcat; require_once('include/socgraph.php'); require_once('include/selectors.php'); @@ -17,7 +24,7 @@ require_once('include/group.php'); require_once('include/photos.php'); -class Connedit extends \Zotlabs\Web\Controller { +class Connedit extends Controller { /* @brief Initialize the connection-editor * @@ -37,12 +44,12 @@ class Connedit extends \Zotlabs\Web\Controller { intval(argv(1)) ); if($r) { - \App::$poi = array_shift($r); + App::$poi = array_shift($r); } } - $channel = \App::get_channel(); + $channel = App::get_channel(); if($channel) head_set_icon($channel['xchan_photo_s']); @@ -62,7 +69,7 @@ class Connedit extends \Zotlabs\Web\Controller { if(! $contact_id) return; - $channel = \App::get_channel(); + $channel = App::get_channel(); // TODO if configured for hassle-free permissions, we'll post the form with ajax as soon as the // connection enable is toggled to a special autopost url and set permissions immediately, leaving @@ -141,7 +148,7 @@ class Connedit extends \Zotlabs\Web\Controller { $rating_text = trim(escape_tags($_REQUEST['rating_text'])); - $all_perms = \Zotlabs\Access\Permissions::Perms(); + $all_perms = Permissions::Perms(); if($all_perms) { foreach($all_perms as $perm => $desc) { @@ -213,7 +220,7 @@ class Connedit extends \Zotlabs\Web\Controller { $record = $z[0]['xlink_id']; } if($record) { - \Zotlabs\Daemon\Master::Summon(array('Ratenotif','rating',$record)); + Master::Summon(array('Ratenotif','rating',$record)); } } @@ -228,7 +235,7 @@ class Connedit extends \Zotlabs\Web\Controller { // request. The workaround is to approve the connection, then go back and // adjust permissions as desired. - $p = \Zotlabs\Access\Permissions::connect_perms(local_channel()); + $p = Permissions::connect_perms(local_channel()); $my_perms = $p['perms']; if($my_perms) { foreach($my_perms as $k => $v) { @@ -258,12 +265,12 @@ class Connedit extends \Zotlabs\Web\Controller { else notice( t('Failed to update connection record.') . EOL); - if(! intval(\App::$poi['abook_self'])) { + if(! intval(App::$poi['abook_self'])) { if($new_friend) { - \Zotlabs\Daemon\Master::Summon( [ 'Notifier', 'permission_accept', $contact_id ] ); + Master::Summon( [ 'Notifier', 'permission_accept', $contact_id ] ); } - \Zotlabs\Daemon\Master::Summon( [ + Master::Summon( [ 'Notifier', (($new_friend) ? 'permission_create' : 'permission_update'), $contact_id @@ -276,7 +283,7 @@ class Connedit extends \Zotlabs\Web\Controller { require_once('include/group.php'); $g = group_rec_byhash(local_channel(),$default_group); if($g) - group_add_member(local_channel(),'',\App::$poi['abook_xchan'],$g['id']); + group_add_member(local_channel(),'',App::$poi['abook_xchan'],$g['id']); } // Check if settings permit ("post new friend activity" is allowed, and @@ -300,19 +307,19 @@ class Connedit extends \Zotlabs\Web\Controller { $xarr['item_private'] = (($xarr['allow_cid']||$xarr['allow_gid']||$xarr['deny_cid']||$xarr['deny_gid']) ? 1 : 0); $obj = array( 'type' => ACTIVITY_OBJ_PERSON, - 'title' => \App::$poi['xchan_name'], - 'id' => \App::$poi['xchan_hash'], + 'title' => App::$poi['xchan_name'], + 'id' => App::$poi['xchan_hash'], 'link' => array( - array('rel' => 'alternate', 'type' => 'text/html', 'href' => \App::$poi['xchan_url']), - array('rel' => 'photo', 'type' => \App::$poi['xchan_photo_mimetype'], 'href' => \App::$poi['xchan_photo_l']) + array('rel' => 'alternate', 'type' => 'text/html', 'href' => App::$poi['xchan_url']), + array('rel' => 'photo', 'type' => App::$poi['xchan_photo_mimetype'], 'href' => App::$poi['xchan_photo_l']) ), ); $xarr['obj'] = json_encode($obj); $xarr['obj_type'] = ACTIVITY_OBJ_PERSON; - $xarr['body'] = '[zrl=' . $channel['xchan_url'] . ']' . $channel['xchan_name'] . '[/zrl]' . ' ' . t('is now connected to') . ' ' . '[zrl=' . \App::$poi['xchan_url'] . ']' . \App::$poi['xchan_name'] . '[/zrl]'; + $xarr['body'] = '[zrl=' . $channel['xchan_url'] . ']' . $channel['xchan_name'] . '[/zrl]' . ' ' . t('is now connected to') . ' ' . '[zrl=' . App::$poi['xchan_url'] . ']' . App::$poi['xchan_name'] . '[/zrl]'; - $xarr['body'] .= "\n\n\n" . '[zrl=' . \App::$poi['xchan_url'] . '][zmg=80x80]' . \App::$poi['xchan_photo_m'] . '[/zmg][/zrl]'; + $xarr['body'] .= "\n\n\n" . '[zrl=' . App::$poi['xchan_url'] . '][zmg=80x80]' . App::$poi['xchan_photo_m'] . '[/zmg][/zrl]'; post_activity_item($xarr); @@ -320,7 +327,7 @@ class Connedit extends \Zotlabs\Web\Controller { // pull in a bit of content if there is any to pull in - \Zotlabs\Daemon\Master::Summon(array('Onepoll',$contact_id)); + Master::Summon(array('Onepoll',$contact_id)); } @@ -333,11 +340,11 @@ class Connedit extends \Zotlabs\Web\Controller { intval($contact_id) ); if($r) { - \App::$poi = $r[0]; + App::$poi = $r[0]; } if($new_friend) { - $arr = array('channel_id' => local_channel(), 'abook' => \App::$poi); + $arr = array('channel_id' => local_channel(), 'abook' => App::$poi); call_hooks('accept_follow', $arr); } @@ -357,23 +364,23 @@ class Connedit extends \Zotlabs\Web\Controller { function connedit_clone(&$a) { - if(! \App::$poi) + if(! App::$poi) return; - $channel = \App::get_channel(); + $channel = App::get_channel(); $r = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d and abook_id = %d LIMIT 1", intval(local_channel()), - intval(\App::$poi['abook_id']) + intval(App::$poi['abook_id']) ); if($r) { - \App::$poi = array_shift($r); + App::$poi = array_shift($r); } - $clone = \App::$poi; + $clone = App::$poi; unset($clone['abook_id']); unset($clone['abook_account']); @@ -402,11 +409,11 @@ class Connedit extends \Zotlabs\Web\Controller { } $section = ((array_key_exists('section',$_REQUEST)) ? $_REQUEST['section'] : ''); - $channel = \App::get_channel(); + $channel = App::get_channel(); $yes_no = array(t('No'),t('Yes')); - $connect_perms = \Zotlabs\Access\Permissions::connect_perms(local_channel()); + $connect_perms = Permissions::connect_perms(local_channel()); $o .= "<script>function connectDefaultShare() { \$('.abook-edit-me').each(function() { @@ -427,7 +434,7 @@ class Connedit extends \Zotlabs\Web\Controller { return; $cmd = argv(2); - + $orig_record = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_id = %d AND abook_channel = %d AND abook_self = 0 LIMIT 1", intval($contact_id), @@ -441,7 +448,7 @@ class Connedit extends \Zotlabs\Web\Controller { if($cmd === 'update') { // pull feed and consume it, which should subscribe to the hub. - \Zotlabs\Daemon\Master::Summon(array('Poller',$contact_id)); + Master::Summon(array('Poller',$contact_id)); goaway(z_root() . '/connedit/' . $contact_id); } @@ -451,7 +458,7 @@ class Connedit extends \Zotlabs\Web\Controller { $recurse = 0; $x = z_fetch_url(zid($url),false,$recurse,['session' => true]); if($x['success']) { - $h = new \Zotlabs\Web\HTTPHeaders($x['header']); + $h = new HTTPHeaders($x['header']); $fields = $h->fetch(); if($fields) { foreach($fields as $y) { @@ -482,17 +489,17 @@ class Connedit extends \Zotlabs\Web\Controller { if($cmd === 'refresh') { if($orig_record[0]['xchan_network'] === 'zot') { - if(! zot_refresh($orig_record[0],\App::get_channel())) + if(! zot_refresh($orig_record[0],App::get_channel())) notice( t('Refresh failed - channel is currently unavailable.') ); } elseif($orig_record[0]['xchan_network'] === 'zot6') { - if(! Libzot::refresh($orig_record[0],\App::get_channel())) + if(! Libzot::refresh($orig_record[0],App::get_channel())) notice( t('Refresh failed - channel is currently unavailable.') ); } else { // if you are on a different network we'll force a refresh of the connection basic info - \Zotlabs\Daemon\Master::Summon(array('Notifier','permission_update',$contact_id)); + Master::Summon(array('Notifier','permission_update',$contact_id)); } goaway(z_root() . '/connedit/' . $contact_id); } @@ -550,15 +557,10 @@ class Connedit extends \Zotlabs\Web\Controller { if($cmd === 'drop') { - - // @FIXME - // We need to send either a purge or a refresh packet to the other side (the channel being unfriended). - // The issue is that the abook DB record _may_ get destroyed when we call contact_remove. As the notifier - // runs in the background there could be a race condition preventing this packet from being sent in all - // cases. - // PLACEHOLDER - contact_remove(local_channel(), $orig_record[0]['abook_id']); + + Master::Summon( [ 'Notifier', 'purge', local_channel(), $orig_record[0]['xchan_hash'] ] ); + Libsync::build_sync_packet(0 /* use the current local_channel */, array('abook' => array(array( 'abook_xchan' => $orig_record[0]['abook_xchan'], @@ -574,13 +576,13 @@ class Connedit extends \Zotlabs\Web\Controller { } } - if(\App::$poi) { + if(App::$poi) { $abook_prev = 0; $abook_next = 0; - $contact_id = \App::$poi['abook_id']; - $contact = \App::$poi; + $contact_id = App::$poi['abook_id']; + $contact = App::$poi; $cn = q("SELECT abook_id, xchan_name from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and abook_self = 0 and xchan_deleted = 0 order by xchan_name", intval(local_channel()) @@ -788,9 +790,9 @@ class Connedit extends \Zotlabs\Web\Controller { $perms = array(); - $channel = \App::get_channel(); + $channel = App::get_channel(); - $global_perms = \Zotlabs\Access\Permissions::Perms(); + $global_perms = Permissions::Perms(); $existing = get_all_perms(local_channel(),$contact['abook_xchan'],false); @@ -822,7 +824,7 @@ class Connedit extends \Zotlabs\Web\Controller { $thisperm = get_abconfig(local_channel(),$contact['abook_xchan'],'my_perms',$k); //fixme - $checkinherited = \Zotlabs\Access\PermissionLimits::Get(local_channel(),$k); + $checkinherited = PermissionLimits::Get(local_channel(),$k); // For auto permissions (when $self is true) we don't want to look at existing // permissions because they are enabled for the channel owner @@ -835,7 +837,7 @@ class Connedit extends \Zotlabs\Web\Controller { $perms[] = array('perms_' . $k, $v, ((array_key_exists($k,$their_perms)) ? intval($their_perms[$k]) : ''),$thisperm, 1, (($checkinherited & PERMS_SPECIFIC) ? '' : '1'), '', $checkinherited); } - $pcat = new \Zotlabs\Lib\Permcat(local_channel()); + $pcat = new Permcat(local_channel()); $pcatlist = $pcat->listing(); $permcats = []; if($pcatlist) { diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php index f45f37001..3d61d7018 100644 --- a/Zotlabs/Module/Display.php +++ b/Zotlabs/Module/Display.php @@ -47,7 +47,6 @@ class Display extends \Zotlabs\Web\Controller { } $observer_is_owner = false; - $updateable = false; if(local_channel() && (! $update)) { @@ -274,9 +273,6 @@ class Display extends \Zotlabs\Web\Controller { intval(local_channel()), dbesc($target_item['parent_mid']) ); - if($r) { - $updateable = true; - } } if(! $r) { @@ -318,9 +314,6 @@ class Display extends \Zotlabs\Web\Controller { intval(local_channel()), dbesc($target_item['parent_mid']) ); - if($r) { - $updateable = true; - } } if($r === null) { @@ -432,13 +425,6 @@ class Display extends \Zotlabs\Web\Controller { killme(); } - - if($updateable) { - $x = q("UPDATE item SET item_unseen = 0 where item_unseen = 1 AND uid = %d and parent = %d ", - intval(local_channel()), - intval($r[0]['item_id']) - ); - } $o .= '<div id="content-complete"></div>'; diff --git a/Zotlabs/Module/Hq.php b/Zotlabs/Module/Hq.php index 5b331f4c1..e2678c07f 100644 --- a/Zotlabs/Module/Hq.php +++ b/Zotlabs/Module/Hq.php @@ -199,8 +199,6 @@ class Hq extends \Zotlabs\Web\Controller { ]); } - $updateable = false; - if($load && $target_item) { $r = null; @@ -213,10 +211,6 @@ class Hq extends \Zotlabs\Web\Controller { dbesc($target_item['parent_mid']) ); - if($r) { - $updateable = true; - } - if(!$r) { $sys_item = true; @@ -243,10 +237,6 @@ class Hq extends \Zotlabs\Web\Controller { dbesc($target_item['parent_mid']) ); - if($r) { - $updateable = true; - } - if(!$r) { $sys_item = true; @@ -283,13 +273,6 @@ class Hq extends \Zotlabs\Web\Controller { $o .= conversation($items, 'hq', $update, 'client'); - if($updateable) { - $x = q("UPDATE item SET item_unseen = 0 WHERE item_unseen = 1 AND uid = %d AND parent = %d ", - intval(local_channel()), - intval($r[0]['item_id']) - ); - } - $o .= '<div id="content-complete"></div>'; return $o; diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php index d8c837522..922a2ef06 100644 --- a/Zotlabs/Module/Item.php +++ b/Zotlabs/Module/Item.php @@ -157,6 +157,106 @@ class Item extends Controller { } + if(ActivityStreams::is_as_request()) { + + $item_id = argv(1); + if(! $item_id) + http_status_exit(404, 'Not found'); + + $portable_id = EMPTY_STR; + + $item_normal = " and item.item_hidden = 0 and item.item_type = 0 and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_blocked = 0 "; + + $i = null; + + // do we have the item (at all)? + // add preferential bias to item owners (item_wall = 1) + + $r = q("select * from item where mid = '%s' or uuid = '%s' $item_normal order by item_wall desc limit 1", + dbesc(z_root() . '/item/' . $item_id), + dbesc($item_id) + ); + + if (! $r) { + http_status_exit(404,'Not found'); + } + + // process an authenticated fetch + + $sigdata = HTTPSig::verify(EMPTY_STR); + if ($sigdata['portable_id'] && $sigdata['header_valid']) { + $portable_id = $sigdata['portable_id']; + if (! check_channelallowed($portable_id)) { + http_status_exit(403, 'Permission denied'); + } + if (! check_siteallowed($sigdata['signer'])) { + http_status_exit(403, 'Permission denied'); + } + observer_auth($portable_id); + + $i = q("select id as item_id from item where mid = '%s' $item_normal and owner_xchan = '%s' limit 1 ", + dbesc($r[0]['parent_mid']), + dbesc($portable_id) + ); + } + elseif (Config::get('system','require_authenticated_fetch',false)) { + http_status_exit(403,'Permission denied'); + } + + // if we don't have a parent id belonging to the signer see if we can obtain one as a visitor that we have permission to access + // with a bias towards those items owned by channels on this site (item_wall = 1) + + $sql_extra = item_permissions_sql(0); + + if (! $i) { + $i = q("select id as item_id from item where mid = '%s' $item_normal $sql_extra order by item_wall desc limit 1", + dbesc($r[0]['parent_mid']) + ); + } + + if(! $i) { + http_status_exit(403,'Forbidden'); + } + + // If we get to this point we have determined we can access the original in $r (fetched much further above), so use it. + + xchan_query($r,true); + $items = fetch_post_tags($r,false); + + $chan = channelx_by_n($items[0]['uid']); + + if(! $chan) + http_status_exit(404, 'Not found'); + + if(! perm_is_allowed($chan['channel_id'],get_observer_hash(),'view_stream')) + http_status_exit(403, 'Forbidden'); + + $i = Activity::encode_item($items[0],true); + + if(! $i) + http_status_exit(404, 'Not found'); + + $x = array_merge(['@context' => [ + ACTIVITYSTREAMS_JSONLD_REV, + 'https://w3id.org/security/v1', + z_root() . ZOT_APSCHEMA_REV + ]], $i); + + $headers = []; + $headers['Content-Type'] = 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"' ; + $x['signature'] = LDSignatures::sign($x,$chan); + $ret = json_encode($x, JSON_UNESCAPED_SLASHES); + $headers['Date'] = datetime_convert('UTC','UTC', 'now', 'D, d M Y H:i:s \\G\\M\\T'); + $headers['Digest'] = HTTPSig::generate_digest_header($ret); + $headers['(request-target)'] = strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI']; + $h = HTTPSig::create_sig($headers,$chan['channel_prvkey'],channel_url($chan)); + HTTPSig::set_headers($h); + echo $ret; + killme(); + + } + + if(argc() > 1 && argv(1) !== 'drop') { $x = q("select uid, item_wall, llink, mid from item where mid = '%s' or mid = '%s' ", dbesc(z_root() . '/item/' . argv(1)), diff --git a/Zotlabs/Module/Like.php b/Zotlabs/Module/Like.php index edd4cfac8..8ffa7f66c 100644 --- a/Zotlabs/Module/Like.php +++ b/Zotlabs/Module/Like.php @@ -441,15 +441,15 @@ class Like extends \Zotlabs\Web\Controller { if($extended_like) { - $ulink = '[zrl=' . $ch[0]['xchan_url'] . ']' . $ch[0]['xchan_name'] . '[/zrl]'; - $alink = '[zrl=' . $observer['xchan_url'] . ']' . $observer['xchan_name'] . '[/zrl]'; + $ulink = '[zrl=' . $ch[0]['xchan_url'] . '][bdi]' . $ch[0]['xchan_name'] . '[/bdi][/zrl]'; + $alink = '[zrl=' . $observer['xchan_url'] . '][bdi]' . $observer['xchan_name'] . '[/bdi][/zrl]'; $private = (($public) ? 0 : 1); } else { $arr['parent'] = $item['id']; $arr['thr_parent'] = $item['mid']; - $ulink = '[zrl=' . $item_author['xchan_url'] . ']' . $item_author['xchan_name'] . '[/zrl]'; - $alink = '[zrl=' . $observer['xchan_url'] . ']' . $observer['xchan_name'] . '[/zrl]'; + $ulink = '[zrl=' . $item_author['xchan_url'] . '][bdi]' . $item_author['xchan_name'] . '[/bdi][/zrl]'; + $alink = '[zrl=' . $observer['xchan_url'] . '][bdi]' . $observer['xchan_name'] . '[/bdi][/zrl]'; $plink = '[zrl=' . z_root() . '/display/' . gen_link_id($item['mid']) . ']' . $post_type . '[/zrl]'; $allow_cid = $item['allow_cid']; $allow_gid = $item['allow_gid']; diff --git a/Zotlabs/Module/Locs.php b/Zotlabs/Module/Locs.php index 47ece8041..4c935a6a2 100644 --- a/Zotlabs/Module/Locs.php +++ b/Zotlabs/Module/Locs.php @@ -1,22 +1,24 @@ <?php namespace Zotlabs\Module; /** @file */ +use App; +use Zotlabs\Web\Controller; +use Zotlabs\Daemon\Master; - -class Locs extends \Zotlabs\Web\Controller { +class Locs extends Controller { function post() { if(! local_channel()) return; - $channel = \App::get_channel(); + $channel = App::get_channel(); if($_REQUEST['primary']) { $hubloc_id = intval($_REQUEST['primary']); if($hubloc_id) { - $r = q("select hubloc_id from hubloc where hubloc_id = %d and hubloc_hash = '%s' limit 1", + $r = q("select * from hubloc where hubloc_id = %d and hubloc_hash = '%s' limit 1", intval($hubloc_id), dbesc($channel['channel_hash']) ); @@ -26,15 +28,16 @@ class Locs extends \Zotlabs\Web\Controller { return; } - $r = q("update hubloc set hubloc_primary = 0 where hubloc_primary = 1 and hubloc_hash = '%s' ", - dbesc($channel['channel_hash']) + q("UPDATE hubloc SET hubloc_primary = 0 WHERE hubloc_primary = 1 AND (hubloc_hash = '%s' OR hubloc_hash = '%s')", + dbesc($channel['channel_hash']), + dbesc($channel['channel_portable_id']) ); - $r = q("update hubloc set hubloc_primary = 1 where hubloc_id = %d and hubloc_hash = '%s'", + q("UPDATE hubloc SET hubloc_primary = 1 WHERE hubloc_id = %d AND hubloc_hash = '%s'", intval($hubloc_id), dbesc($channel['channel_hash']) ); - - \Zotlabs\Daemon\Master::Summon(array('Notifier','location',$channel['channel_id'])); + + Master::Summon( [ 'Notifier', 'refresh_all', $channel['channel_id'] ] ); return; } } @@ -68,11 +71,12 @@ class Locs extends \Zotlabs\Web\Controller { } } - $r = q("update hubloc set hubloc_deleted = 1 where hubloc_id = %d and hubloc_hash = '%s'", - intval($hubloc_id), - dbesc($channel['channel_hash']) + q("UPDATE hubloc SET hubloc_deleted = 1 WHERE hubloc_id_url = '%s' AND (hubloc_hash = '%s' OR hubloc_hash = '%s')", + dbesc($r[0]['hubloc_id_url']), + dbesc($channel['channel_hash']), + dbesc($channel['channel_portable_id']) ); - \Zotlabs\Daemon\Master::Summon(array('Notifier','location',$channel['channel_id'])); + Master::Summon( [ 'Notifier', 'refresh_all', $channel['channel_id'] ] ); return; } } @@ -88,10 +92,10 @@ class Locs extends \Zotlabs\Web\Controller { return; } - $channel = \App::get_channel(); + $channel = App::get_channel(); if($_REQUEST['sync']) { - \Zotlabs\Daemon\Master::Summon(array('Notifier','location',$channel['channel_id'])); + Master::Summon( [ 'Notifier', 'refresh_all', $channel['channel_id'] ] ); info( t('Syncing locations') . EOL); goaway(z_root() . '/locs'); } diff --git a/Zotlabs/Module/Magic.php b/Zotlabs/Module/Magic.php index 6ac656a04..b4372e26d 100644 --- a/Zotlabs/Module/Magic.php +++ b/Zotlabs/Module/Magic.php @@ -1,214 +1,133 @@ <?php namespace Zotlabs\Module; +use App; +use Zotlabs\Web\Controller; use Zotlabs\Web\HTTPSig; +use Zotlabs\Lib\Libzot; +use Zotlabs\Lib\SConfig; -@require_once('include/zot.php'); - - -class Magic extends \Zotlabs\Web\Controller { +class Magic extends Controller { function init() { + + $ret = [ + 'success' => false, + 'url' => '', + 'message' => '' + ]; - $ret = array('success' => false, 'url' => '', 'message' => ''); logger('mod_magic: invoked', LOGGER_DEBUG); - - logger('mod_magic: args: ' . print_r($_REQUEST,true),LOGGER_DATA); - - $addr = ((x($_REQUEST,'addr')) ? $_REQUEST['addr'] : ''); - $bdest = ((x($_REQUEST,'bdest')) ? $_REQUEST['bdest'] : ''); - $dest = ((x($_REQUEST,'dest')) ? $_REQUEST['dest'] : ''); - $test = ((x($_REQUEST,'test')) ? intval($_REQUEST['test']) : 0); - $rev = ((x($_REQUEST,'rev')) ? intval($_REQUEST['rev']) : 0); - $owa = ((x($_REQUEST,'owa')) ? intval($_REQUEST['owa']) : 0); - $delegate = ((x($_REQUEST,'delegate')) ? $_REQUEST['delegate'] : ''); - - if($bdest) + + logger('args: ' . print_r($_REQUEST,true),LOGGER_DATA); + + $addr = ((x($_REQUEST,'addr')) ? $_REQUEST['addr'] : ''); + $bdest = ((x($_REQUEST,'bdest')) ? $_REQUEST['bdest'] : ''); + $dest = ((x($_REQUEST,'dest')) ? $_REQUEST['dest'] : ''); + $rev = ((x($_REQUEST,'rev')) ? intval($_REQUEST['rev']) : 0); + $owa = ((x($_REQUEST,'owa')) ? intval($_REQUEST['owa']) : 0); + $delegate = ((x($_REQUEST,'delegate')) ? $_REQUEST['delegate'] : ''); + + // bdest is preferred as it is hex-encoded and can survive url rewrite and argument parsing + + if ($bdest) { $dest = hex2bin($bdest); + } $parsed = parse_url($dest); - if(! $parsed) { - if($test) { - $ret['message'] .= 'could not parse ' . $dest . EOL; - return($ret); - } + + if (! $parsed) { goaway($dest); } - + $basepath = $parsed['scheme'] . '://' . $parsed['host'] . (($parsed['port']) ? ':' . $parsed['port'] : ''); - - $x = q("select * from hubloc where hubloc_url = '%s' order by hubloc_connected desc limit 1", - dbesc($basepath) - ); - - if(! $x) { - - /* - * We have no records for, or prior communications with this hub. - * If an address was supplied, let's finger them to create a hub record. - * Otherwise we'll use the special address '[system]' which will return - * either a system channel or the first available normal channel. We don't - * really care about what channel is returned - we need the hub information - * from that response so that we can create signed auth packets destined - * for that hub. - * - */ - - $j = \Zotlabs\Zot\Finger::run((($addr) ? $addr : '[system]@' . $parsed['host']),null); - if($j['success']) { - import_xchan($j); - - // Now try again - - $x = q("select * from hubloc where hubloc_url = '%s' order by hubloc_connected desc limit 1", - dbesc($basepath) - ); - } - } - - if(! $x) { - if($rev) - goaway($dest); - else { - logger('mod_magic: no channels found for requested hub.' . print_r($_REQUEST,true)); - if($test) { - $ret['message'] .= 'This site has no previous connections with ' . $basepath . EOL; - return $ret; - } - notice( t('Hub not found.') . EOL); - return; - } - } - + $owapath = SConfig::get($basepath,'system','openwebauth', $basepath . '/owa'); + // This is ready-made for a plugin that provides a blacklist or "ask me" before blindly authenticating. // By default, we'll proceed without asking. - - $arr = array( - 'channel_id' => local_channel(), - 'xchan' => $x[0], + + $arr = [ + 'channel_id' => local_channel(), 'destination' => $dest, - 'proceed' => true - ); - + 'proceed' => true + ]; + call_hooks('magic_auth',$arr); $dest = $arr['destination']; - if(! $arr['proceed']) { - if($test) { - $ret['message'] .= 'cancelled by plugin.' . EOL; - return $ret; - } + if (! $arr['proceed']) { goaway($dest); } - - if((get_observer_hash()) && ($x[0]['hubloc_url'] === z_root())) { + + if((get_observer_hash()) && (stripos($dest,z_root()) === 0)) { + // We are already authenticated on this site and a registered observer. - // Just redirect. - if($test) { - $ret['success'] = true; - $ret['message'] .= 'Local site - you are already authenticated.' . EOL; - return $ret; - } - - $delegation_success = false; - if($delegate) { + // First check if this is a delegate request on the local system and process accordingly. + // Otherwise redirect. + + if ($delegate) { + $r = q("select * from channel left join hubloc on channel_hash = hubloc_hash where hubloc_addr = '%s' limit 1", dbesc($delegate) ); - - if($r && intval($r[0]['channel_id'])) { - $allowed = perm_is_allowed($r[0]['channel_id'],get_observer_hash(),'delegate'); - if($allowed) { + + if ($r) { + $c = array_shift($r); + if (perm_is_allowed($c['channel_id'],get_observer_hash(),'delegate')) { $tmp = $_SESSION; - $_SESSION['delegate_push'] = $tmp; - $_SESSION['delegate_channel'] = $r[0]['channel_id']; - $_SESSION['delegate'] = get_observer_hash(); - $_SESSION['account_id'] = intval($r[0]['channel_account_id']); - change_channel($r[0]['channel_id']); - - $delegation_success = true; + $_SESSION['delegate_push'] = $tmp; + $_SESSION['delegate_channel'] = $c['channel_id']; + $_SESSION['delegate'] = get_observer_hash(); + $_SESSION['account_id'] = intval($c['channel_account_id']); + + change_channel($c['channel_id']); } } } - - - - // FIXME: check and honour local delegation - - + goaway($dest); } - - if(local_channel()) { - $channel = \App::get_channel(); - + + if (local_channel()) { + $channel = App::get_channel(); + // OpenWebAuth - if($owa) { + if ($owa) { $dest = strip_zids($dest); $dest = strip_query_param($dest,'f'); + // We now post to the OWA endpoint. This improves security by providing a signed digest + $data = json_encode([ 'OpenWebAuth' => random_string() ]); $headers = []; $headers['Accept'] = 'application/x-zot+json' ; + $headers['Content-Type'] = 'application/x-zot+json' ; $headers['X-Open-Web-Auth'] = random_string(); - $headers['Host'] = $parsed['host']; $headers['Digest'] = HTTPSig::generate_digest_header($data); + $headers['Host'] = $parsed['host']; + $headers['(request-target)'] = 'post ' . '/owa'; - $headers = HTTPSig::create_sig($headers,$channel['channel_prvkey'], 'acct:' . channel_reddress($channel),true,'sha512'); - $x = z_post_url($basepath . '/owa',$data,$redirects,[ 'headers' => $headers ]); - - if($x['success']) { + $headers = HTTPSig::create_sig($headers,$channel['channel_prvkey'], channel_url($channel),true,'sha512'); + $x = z_post_url($owapath,$data,$redirects,[ 'headers' => $headers ]); + logger('owa fetch returned: ' . print_r($x,true),LOGGER_DATA); + if ($x['success']) { $j = json_decode($x['body'],true); - if($j['success']) { + if ($j['success'] && $j['encrypted_token']) { + // decrypt the token using our private key $token = ''; - if($j['encrypted_token']) { - openssl_private_decrypt(base64url_decode($j['encrypted_token']),$token,$channel['channel_prvkey']); - } - else { - $token = $j['token']; - } - - $strp = strpbrk($dest,'?&'); - $args = (($strp) ? '&owt=' . $token : '?f=&owt=' . $token) . (($delegate) ? '&delegate=1' : ''); + openssl_private_decrypt(base64url_decode($j['encrypted_token']),$token,$channel['channel_prvkey']); + $x = strpbrk($dest,'?&'); + // redirect using the encrypted token which will be exchanged for an authenticated session + $args = (($x) ? '&owt=' . $token : '?f=&owt=' . $token) . (($delegate) ? '&delegate=1' : ''); goaway($dest . $args); } } - goaway($dest); - } - - - $token = random_string(); - - \Zotlabs\Lib\Verify::create('auth',$channel['channel_id'],$token,$x[0]['hubloc_url']); - - $target_url = $x[0]['hubloc_callback'] . '/?f=&auth=' . urlencode(channel_reddress($channel)) - . '&sec=' . $token . '&dest=' . urlencode($dest) . '&version=' . ZOT_REVISION; - - if($delegate) - $target_url .= '&delegate=' . urlencode($delegate); - - logger('mod_magic: redirecting to: ' . $target_url, LOGGER_DEBUG); - - if($test) { - $ret['success'] = true; - $ret['url'] = $target_url; - $ret['message'] = 'token ' . $token . ' created for channel ' . $channel['channel_id'] . ' for url ' . $x[0]['hubloc_url'] . EOL; - return $ret; } - - goaway($target_url); - } - - if($test) { - $ret['message'] = 'Not authenticated or invalid arguments to mod_magic' . EOL; - return $ret; - } - + goaway($dest); - } - + } diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index fe1aa4386..bbacbb21e 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -133,8 +133,6 @@ class Network extends \Zotlabs\Web\Controller { $pf = ((x($_GET,'pf')) ? $_GET['pf'] : ''); $unseen = ((x($_GET,'unseen')) ? $_GET['unseen'] : ''); - $deftag = ''; - if (Apps::system_app_installed(local_channel(),'Affinity Tool')) { $affinity_locked = intval(get_pconfig(local_channel(),'affinity','lock',1)); if ($affinity_locked) { @@ -160,10 +158,7 @@ class Network extends \Zotlabs\Web\Controller { goaway(z_root() . '/network'); // NOTREACHED } - if($pf) - $deftag = '!{' . (($cid_r[0]['xchan_addr']) ? $cid_r[0]['xchan_addr'] : $cid_r[0]['xchan_url']) . '}'; - else - $def_acl = [ 'allow_cid' => '<' . $cid_r[0]['abook_xchan'] . '>', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '' ]; + $def_acl = [ 'allow_cid' => '<' . $cid_r[0]['abook_xchan'] . '>', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '' ]; } if(! $update) { @@ -177,6 +172,17 @@ class Network extends \Zotlabs\Web\Controller { nav_set_selected('Network'); + $bang = '!'; + + if($cid_r) { + $forums = get_forum_channels($channel['channel_id']); + if($forums) { + $forum_xchans = ids_to_array($forums, 'xchan_hash'); + if(in_array($cid_r[0]['abook_xchan'], $forum_xchans)) + $bang = $cid_r[0]['abook_xchan']; + } + } + $channel_acl = array( 'allow_cid' => $channel['channel_allow_cid'], 'allow_gid' => $channel['channel_allow_gid'], @@ -184,7 +190,7 @@ class Network extends \Zotlabs\Web\Controller { 'deny_gid' => $channel['channel_deny_gid'] ); - $private_editing = ((($group || $cid) && (! intval($_GET['pf']))) ? true : false); + $private_editing = (($group || $cid) ? true : false); $x = array( 'is_owner' => true, @@ -194,7 +200,7 @@ class Network extends \Zotlabs\Web\Controller { 'lockstate' => (($private_editing || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), 'acl' => populate_acl((($private_editing) ? $def_acl : $channel_acl), true, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post'), 'permissions' => (($private_editing) ? $def_acl : $channel_acl), - 'bang' => (($private_editing) ? '!' : ''), + 'bang' => (($private_editing) ? $bang : ''), 'visitor' => true, 'profile_uid' => local_channel(), 'editor_autocomplete' => true, @@ -203,9 +209,6 @@ class Network extends \Zotlabs\Web\Controller { 'jotnets' => true, 'reset' => t('Reset form') ); - if($deftag) - $x['pretext'] = $deftag; - $status_editor = status_editor($a,$x,false,'Network'); $o .= $status_editor; @@ -490,7 +493,6 @@ class Network extends \Zotlabs\Web\Controller { $page_mode = 'client'; $parents_str = ''; - $update_unseen = ''; $simple_update = (($update) ? " and item_unseen = 1 " : ''); @@ -529,9 +531,6 @@ class Network extends \Zotlabs\Web\Controller { ); $parents_str = ids_to_querystr($items,'item_id'); - if($parents_str) { - $update_unseen = " AND id IN ( " . dbesc($parents_str) . " )"; - } require_once('include/items.php'); @@ -595,35 +594,6 @@ class Network extends \Zotlabs\Web\Controller { $items = array(); } - if($page_mode === 'list') { - - /** - * in "list mode", only mark the parent item and any like activities as "seen". - * We won't distinguish between comment likes and post likes. The important thing - * is that the number of unseen comments will be accurate. The SQL to separate the - * comment likes could also get somewhat hairy. - */ - - if($parents_str) { - $update_unseen = " AND ( id IN ( " . dbesc($parents_str) . " )"; - $update_unseen .= " OR ( parent IN ( " . dbesc($parents_str) . " ) AND verb in ( '" . dbesc(ACTIVITY_LIKE) . "','" . dbesc(ACTIVITY_DISLIKE) . "' ))) "; - } - } - else { - if($parents_str) { - $update_unseen = " AND parent IN ( " . dbesc($parents_str) . " )"; - } - } - } - - if($update_unseen) { - $x = [ 'channel_id' => local_channel(), 'update' => 'unset' ]; - call_hooks('update_unseen',$x); - if($x['update'] === 'unset' || intval($x['update'])) { - $r = q("UPDATE item SET item_unseen = 0 WHERE item_unseen = 1 AND uid = %d $update_unseen ", - intval(local_channel()) - ); - } } $mode = (($nouveau) ? 'network-new' : 'network'); diff --git a/Zotlabs/Module/Oep.php b/Zotlabs/Module/Oep.php index 3977ac8dd..75304161b 100644 --- a/Zotlabs/Module/Oep.php +++ b/Zotlabs/Module/Oep.php @@ -125,7 +125,7 @@ class Oep extends \Zotlabs\Web\Controller { "' profile='".$p[0]['author']['xchan_url'] . "' avatar='".$p[0]['author']['xchan_photo_s']. "' link='".$p[0]['plink']. - "' auth='".(($p[0]['author']['network'] === 'zot') ? 'true' : 'false') . + "' auth='".((in_array($p[0]['author']['xchan_network'], ['zot6','zot'])) ? 'true' : 'false') . "' posted='".$p[0]['created']. "' message_id='".$p[0]['mid']."']"; if($p[0]['title']) @@ -213,7 +213,7 @@ class Oep extends \Zotlabs\Web\Controller { "' profile='".$p[0]['author']['xchan_url'] . "' avatar='".$p[0]['author']['xchan_photo_s']. "' link='".$p[0]['plink']. - "' auth='".(($p[0]['author']['network'] === 'zot') ? 'true' : 'false') . + "' auth='".((in_array($p[0]['author']['xchan_network'], ['zot6','zot'])) ? 'true' : 'false') . "' posted='".$p[0]['created']. "' message_id='".$p[0]['mid']."']"; if($p[0]['title']) @@ -299,7 +299,7 @@ class Oep extends \Zotlabs\Web\Controller { "' profile='".$p[0]['author']['xchan_url'] . "' avatar='".$p[0]['author']['xchan_photo_s']. "' link='".$p[0]['plink']. - "' auth='".(($p[0]['author']['network'] === 'zot') ? 'true' : 'false') . + "' auth='".((in_array($p[0]['author']['xchan_network'], ['zot6','zot'])) ? 'true' : 'false') . "' posted='".$p[0]['created']. "' message_id='".$p[0]['mid']."']"; if($p[0]['title']) @@ -374,7 +374,7 @@ class Oep extends \Zotlabs\Web\Controller { "' profile='".$p[0]['author']['xchan_url'] . "' avatar='".$p[0]['author']['xchan_photo_s']. "' link='".$p[0]['plink']. - "' auth='".(($p[0]['author']['network'] === 'zot') ? 'true' : 'false') . + "' auth='".((in_array($p[0]['author']['xchan_network'], ['zot6','zot'])) ? 'true' : 'false') . "' posted='".$p[0]['created']. "' message_id='".$p[0]['mid']."']"; if($p[0]['title']) diff --git a/Zotlabs/Module/Owa.php b/Zotlabs/Module/Owa.php index 4c6fd6216..561e35754 100644 --- a/Zotlabs/Module/Owa.php +++ b/Zotlabs/Module/Owa.php @@ -3,10 +3,12 @@ namespace Zotlabs\Module; use Zotlabs\Web\HTTPSig; +use Zotlabs\Lib\Verify; +use Zotlabs\Web\Controller; /** * OpenWebAuth verifier and token generator - * See https://macgirvin.com/wiki/mike/OpenWebAuth/Home + * See spec/OpenWebAuth/Home.md * Requests to this endpoint should be signed using HTTP Signatures * using the 'Authorization: Signature' authentication method * If the signature verifies a token is returned. @@ -14,74 +16,51 @@ use Zotlabs\Web\HTTPSig; * This token may be exchanged for an authenticated cookie. */ -class Owa extends \Zotlabs\Web\Controller { +class Owa extends Controller { function init() { $ret = [ 'success' => false ]; - foreach([ 'REDIRECT_REMOTE_USER', 'HTTP_AUTHORIZATION' ] as $head) { - if(array_key_exists($head,$_SERVER) && substr(trim($_SERVER[$head]),0,9) === 'Signature') { - if($head !== 'HTTP_AUTHORIZATION') { - $_SERVER['HTTP_AUTHORIZATION'] = $_SERVER[$head]; - continue; - } - - $sigblock = HTTPSig::parse_sigheader($_SERVER[$head]); - if($sigblock) { - $keyId = $sigblock['keyId']; - - if($keyId) { - - // Hubzilla connections can have both zot6 and zot hublocs - // The connections will usually be zot6 so match those first - - $r = q("select * from hubloc left join xchan on hubloc_hash = xchan_hash - where ( hubloc_addr = '%s' or hubloc_id_url = '%s' ) and hubloc_network = 'zot6' ", - dbesc(str_replace('acct:','',$keyId)), - dbesc($keyId) - ); + if (array_key_exists('REDIRECT_REMOTE_USER',$_SERVER) && (! array_key_exists('HTTP_AUTHORIZATION',$_SERVER))) { + $_SERVER['HTTP_AUTHORIZATION'] = $_SERVER['REDIRECT_REMOTE_USER']; + } - // If nothing was found, try searching on any network - - if (! $r) { + if (array_key_exists('HTTP_AUTHORIZATION',$_SERVER) && substr(trim($_SERVER['HTTP_AUTHORIZATION']),0,9) === 'Signature') { + $sigblock = HTTPSig::parse_sigheader($_SERVER['HTTP_AUTHORIZATION']); + if ($sigblock) { + $keyId = $sigblock['keyId']; + if ($keyId) { + $r = q("select * from hubloc left join xchan on hubloc_hash = xchan_hash + where ( hubloc_addr = '%s' or hubloc_id_url = '%s' ) ", + dbesc(str_replace('acct:','',$keyId)), + dbesc($keyId) + ); + if (! $r) { + $found = discover_by_webbie(str_replace('acct:','',$keyId)); + if ($found) { $r = q("select * from hubloc left join xchan on hubloc_hash = xchan_hash - where ( hubloc_addr = '%s' or hubloc_id_url = '%s' )", + where ( hubloc_addr = '%s' or hubloc_id_url = '%s' ) ", dbesc(str_replace('acct:','',$keyId)), dbesc($keyId) ); } - - // If nothing was found on any network, use network discovery and create a new record - - if (! $r) { - $found = discover_by_webbie(str_replace('acct:','',$keyId)); - if($found) { - $r = q("select * from hubloc left join xchan on hubloc_hash = xchan_hash - where ( hubloc_addr = '%s' or hubloc_id_url = '%s' ) ", - dbesc(str_replace('acct:','',$keyId)), - dbesc($keyId) - ); - } - } - - if ($r) { - foreach($r as $hubloc) { - $verified = HTTPSig::verify(file_get_contents('php://input'),$hubloc['xchan_pubkey']); - if($verified && $verified['header_signed'] && $verified['header_valid']) { - logger('OWA header: ' . print_r($verified,true),LOGGER_DATA); - logger('OWA success: ' . $hubloc['hubloc_addr'],LOGGER_DATA); - $ret['success'] = true; - $token = random_string(32); - \Zotlabs\Lib\Verify::create('owt',0,$token,$hubloc['hubloc_network'] . ',' . $hubloc['hubloc_addr']); - $result = ''; - openssl_public_encrypt($token,$result,$hubloc['xchan_pubkey']); - $ret['encrypted_token'] = base64url_encode($result); - break; - } - else { - logger('OWA fail: ' . $hubloc['hubloc_id'] . ' ' . $hubloc['hubloc_addr']); - } + } + if ($r) { + foreach ($r as $hubloc) { + $verified = HTTPSig::verify(file_get_contents('php://input')); + if ($verified && $verified['header_signed'] && $verified['header_valid'] && ($verified['content_valid'] || (! $verified['content_signed']))) { + logger('OWA header: ' . print_r($verified,true),LOGGER_DATA); + logger('OWA success: ' . $hubloc['hubloc_addr'],LOGGER_DATA); + $ret['success'] = true; + $token = random_string(32); + Verify::create('owt',0,$token,$hubloc['hubloc_addr']); + $result = ''; + openssl_public_encrypt($token,$result,$hubloc['xchan_pubkey']); + $ret['encrypted_token'] = base64url_encode($result); + break; + } else { + logger('OWA fail: ' . $hubloc['hubloc_id'] . ' ' . $hubloc['hubloc_addr']); } } } diff --git a/Zotlabs/Module/Profiles.php b/Zotlabs/Module/Profiles.php index 7deceabab..9ac0e725e 100644 --- a/Zotlabs/Module/Profiles.php +++ b/Zotlabs/Module/Profiles.php @@ -607,10 +607,10 @@ class Profiles extends \Zotlabs\Web\Controller { $channel = \App::get_channel(); if($namechanged && $is_default) { - $r = q("UPDATE xchan SET xchan_name = '%s', xchan_name_date = '%s' WHERE xchan_hash = '%s'", + $r = q("UPDATE xchan SET xchan_name = '%s', xchan_name_date = '%s' WHERE xchan_url = '%s'", dbesc($name), dbesc(datetime_convert()), - dbesc($channel['xchan_hash']) + dbesc(z_root() . '/channel/' . $channel['channel_address']) ); $r = q("UPDATE channel SET channel_name = '%s' WHERE channel_hash = '%s'", dbesc($name), diff --git a/Zotlabs/Module/Pubstream.php b/Zotlabs/Module/Pubstream.php index 76a3e0d9e..55c96b23d 100644 --- a/Zotlabs/Module/Pubstream.php +++ b/Zotlabs/Module/Pubstream.php @@ -264,7 +264,6 @@ class Pubstream extends \Zotlabs\Web\Controller { // Then fetch all the children of the parents that are on this page $parents_str = ''; - $update_unseen = ''; if($r) { diff --git a/Zotlabs/Module/Regdir.php b/Zotlabs/Module/Regdir.php index f4d16c562..e49f89231 100644 --- a/Zotlabs/Module/Regdir.php +++ b/Zotlabs/Module/Regdir.php @@ -1,6 +1,9 @@ <?php namespace Zotlabs\Module; +use Zotlabs\Lib\Zotfinger; +use Zotlabs\Web\Controller; + /** * With args, register a directory server for this realm. * With no args, return a JSON array of directory servers for this realm. @@ -14,7 +17,7 @@ namespace Zotlabs\Module; * @param App &$a */ -class Regdir extends \Zotlabs\Web\Controller { +class Regdir extends Controller { function init() { @@ -25,7 +28,7 @@ class Regdir extends \Zotlabs\Web\Controller { $valid = 0; // we probably don't need the realm as we will find out in the probe. - // What we may want to die is throw an error if you're trying to register in a different realm + // What we may want to do is throw an error if you're trying to register in a different realm // so this configuration issue can be discovered. $realm = $_REQUEST['realm']; @@ -59,34 +62,28 @@ class Regdir extends \Zotlabs\Web\Controller { json_return_and_die($result); } - $j = \Zotlabs\Zot\Finger::run('[system]@' . $m['host']); - if($j['success'] && $j['guid']) { - $x = import_xchan($j); - if($x['success']) { - $result['success'] = true; - } + $j = Zotfinger::exec($url); + if($j) { + $result['success'] = true; } - - if(! $result['success']) + else { $valid = 0; - + } + q("update site set site_valid = %d where site_url = '%s'", intval($valid), strtolower($url) ); - + json_return_and_die($result); - } else { - - // We can put this in the sql without the condition after 31 august 2015 assuming - // most directory servers will have updated by then - // This just makes sure it happens if I forget + + } + else { - $sql_extra = ((datetime_convert() > datetime_convert('UTC','UTC','2015-08-31')) ? ' and site_valid = 1 ' : '' ); if ($dirmode == DIRECTORY_MODE_STANDALONE) { $r = array(array('site_url' => z_root())); } else { - $r = q("select site_url from site where site_flags in ( 1, 2 ) and site_realm = '%s' and site_type = %d $sql_extra ", + $r = q("select site_url from site where site_flags in ( 1, 2 ) and site_realm = '%s' and site_type = %d and site_valid = 1 ", dbesc(get_directory_realm()), intval(SITE_TYPE_ZOT) ); diff --git a/Zotlabs/Module/Removeaccount.php b/Zotlabs/Module/Removeaccount.php index 9d2bbd0de..cd18b79c0 100644 --- a/Zotlabs/Module/Removeaccount.php +++ b/Zotlabs/Module/Removeaccount.php @@ -37,7 +37,7 @@ class Removeaccount extends \Zotlabs\Web\Controller { } } - $global_remove = intval($_POST['global']); + $global_remove = 0; //intval($_POST['global']); account_remove($account_id, 1 - $global_remove); } @@ -57,7 +57,7 @@ class Removeaccount extends \Zotlabs\Web\Controller { '$title' => t('Remove This Account'), '$desc' => array(t('WARNING: '), t('This account and all its channels will be completely removed from the network. '), t('This action is permanent and can not be undone!')), '$passwd' => t('Please enter your password for verification:'), - '$global' => array('global', t('Remove this account, all its channels and all its channel clones from the network'), false, t('By default only the instances of the channels located on this hub will be removed from the network')), + // '$global' => array('global', t('Remove this account, all its channels and all its channel clones from the network'), false, t('By default only the instances of the channels located on this hub will be removed from the network')), '$submit' => t('Remove Account') )); diff --git a/Zotlabs/Module/Removeme.php b/Zotlabs/Module/Removeme.php index 451e280c3..876d61ca6 100644 --- a/Zotlabs/Module/Removeme.php +++ b/Zotlabs/Module/Removeme.php @@ -37,7 +37,7 @@ class Removeme extends \Zotlabs\Web\Controller { } } - $global_remove = intval($_POST['global']); + $global_remove = 0; //intval($_POST['global']); channel_remove(local_channel(),1 - $global_remove,true); @@ -60,7 +60,7 @@ class Removeme extends \Zotlabs\Web\Controller { '$title' => t('Remove This Channel'), '$desc' => [ t('WARNING: '), t('This channel will be completely removed from the network. '), t('This action is permanent and can not be undone!') ], '$passwd' => t('Please enter your password for verification:'), - '$global' => [ 'global', t('Remove this channel and all its clones from the network'), false, t('By default only the instance of the channel located on this hub will be removed from the network'), [ t('No'),t('Yes') ] ], + // '$global' => [ 'global', t('Remove this channel and all its clones from the network'), false, t('By default only the instance of the channel located on this hub will be removed from the network'), [ t('No'),t('Yes') ] ], '$submit' => t('Remove Channel') )); diff --git a/Zotlabs/Module/Rmagic.php b/Zotlabs/Module/Rmagic.php index 8c1e5cdab..ab9ad059e 100644 --- a/Zotlabs/Module/Rmagic.php +++ b/Zotlabs/Module/Rmagic.php @@ -1,6 +1,7 @@ <?php namespace Zotlabs\Module; +use Zotlabs\Lib\Libzot; class Rmagic extends \Zotlabs\Web\Controller { @@ -11,23 +12,24 @@ class Rmagic extends \Zotlabs\Web\Controller { $me = get_my_address(); if($me) { - $r = q("select hubloc_url from hubloc where hubloc_addr = '%s' limit 1", + $r = q("select hubloc_url from hubloc where hubloc_addr = '%s'", dbesc($me) ); if(! $r) { $w = discover_by_webbie($me); if($w) { - $r = q("select hubloc_url from hubloc where hubloc_addr = '%s' limit 1", + $r = q("select hubloc_url from hubloc where hubloc_addr = '%s'", dbesc($me) ); } } - if($r) { - if($r[0]['hubloc_url'] === z_root()) + if($r) { + $r = Libzot::zot_record_preferred($r); + if($r['hubloc_url'] === z_root()) goaway(z_root() . '/login'); $dest = bin2hex(z_root() . '/' . str_replace(['rmagic','zid='],['','zid_='],\App::$query_string)); - goaway($r[0]['hubloc_url'] . '/magic' . '?f=&owa=1&bdest=' . $dest); + goaway($r['hubloc_url'] . '/magic' . '?f=&owa=1&bdest=' . $dest); } } } @@ -55,13 +57,13 @@ class Rmagic extends \Zotlabs\Web\Controller { $r = null; if($address) { - $r = q("select hubloc_url from hubloc where hubloc_addr = '%s' limit 1", + $r = q("select hubloc_url from hubloc where hubloc_addr = '%s'", dbesc($address) ); if(! $r) { $w = discover_by_webbie($address); if($w) { - $r = q("select hubloc_url from hubloc where hubloc_addr = '%s' limit 1", + $r = q("select hubloc_url from hubloc where hubloc_addr = '%s'", dbesc($address) ); } @@ -69,7 +71,8 @@ class Rmagic extends \Zotlabs\Web\Controller { } if($r) { - $url = $r[0]['hubloc_url']; + $r = Libzot::zot_record_preferred($r); + $url = $r['hubloc_url']; } else { $url = 'https://' . substr($address,strpos($address,'@')+1); diff --git a/Zotlabs/Module/Settings/Channel.php b/Zotlabs/Module/Settings/Channel.php index ab9b72490..2eed1efc9 100644 --- a/Zotlabs/Module/Settings/Channel.php +++ b/Zotlabs/Module/Settings/Channel.php @@ -274,10 +274,11 @@ class Channel { } if($name_change) { - $r = q("update xchan set xchan_name = '%s', xchan_name_date = '%s' where xchan_hash = '%s'", + // change name on all associated xchans by matching the url + $r = q("update xchan set xchan_name = '%s', xchan_name_date = '%s' where xchan_url = '%s'", dbesc($username), dbesc(datetime_convert()), - dbesc($channel['channel_hash']) + dbesc(z_root() . '/channel/' . $channel['channel_address']) ); $r = q("update profile set fullname = '%s' where uid = %d and is_default = 1", dbesc($username), diff --git a/Zotlabs/Module/Sse_bs.php b/Zotlabs/Module/Sse_bs.php index 6d5acf276..e3439e7dd 100644 --- a/Zotlabs/Module/Sse_bs.php +++ b/Zotlabs/Module/Sse_bs.php @@ -36,12 +36,15 @@ class Sse_bs extends Controller { self::$vnotify = get_pconfig(self::$uid, 'system', 'vnotify', -1); self::$evdays = intval(get_pconfig(self::$uid, 'system', 'evdays')); - self::$limit = 100; + self::$limit = 50; self::$offset = 0; self::$xchans = ''; - if(!empty($_GET['nquery']) && $_GET['nquery'] !== '%') { - $nquery = $_GET['nquery']; + if($_REQUEST['sse_rmids']) + self::mark_read($_REQUEST['sse_rmids']); + + if(!empty($_REQUEST['nquery']) && $_REQUEST['nquery'] !== '%') { + $nquery = $_REQUEST['nquery']; $x = q("SELECT xchan_hash FROM xchan WHERE xchan_name LIKE '%s' OR xchan_addr LIKE '%s'", dbesc($nquery . '%'), @@ -108,6 +111,31 @@ class Sse_bs extends Controller { json_return_and_die($result); } + function mark_read($arr) { + + if(! self::$uid) + return; + + $mids = []; + $str = ''; + + foreach($arr as $a) { + $mids[] = '\'' . dbesc(@base64url_decode(substr($a,4))) . '\''; + } + + $str = implode($mids, ','); + + $x = [ 'channel_id' => self::$uid, 'update' => 'unset' ]; + call_hooks('update_unseen',$x); + + if($x['update'] === 'unset' || intval($x['update'])) { + q("UPDATE item SET item_unseen = 0 WHERE uid = %d AND mid in (". $str . ") AND item_unseen = 1", + intval(self::$uid) + ); + } + + } + function bs_network($notifications) { $result['network']['notifications'] = []; @@ -163,9 +191,10 @@ class Sse_bs extends Controller { $r = q("SELECT count(id) as total FROM item WHERE uid = %d and item_unseen = 1 AND item_wall = 0 AND item_private IN (0, 1) + AND obj_type NOT IN ('Document', 'Video', 'Audio', 'Image') + AND author_xchan != '%s' $item_normal - $sql_extra - AND author_xchan != '%s'", + $sql_extra", intval(self::$uid), dbesc(self::$ob_hash) ); diff --git a/Zotlabs/Web/WebServer.php b/Zotlabs/Web/WebServer.php index 909823ec4..ac792dd69 100644 --- a/Zotlabs/Web/WebServer.php +++ b/Zotlabs/Web/WebServer.php @@ -62,7 +62,8 @@ class WebServer { $_SESSION['my_address'] = $_GET['zid']; $_SESSION['authenticated'] = 0; } - zid_init(); + if(! $_SESSION['authenticated']) + zid_init(); } } diff --git a/app/probe.apd b/app/probe.apd index 097219292..1cc8bd991 100644 --- a/app/probe.apd +++ b/app/probe.apd @@ -1,5 +1,5 @@ -version: 2 -url: $baseurl/probe +version: 3 +url: $baseurl/zot_probe requires: local_channel name: Remote Diagnostics photo: icon:user-md @@ -50,7 +50,7 @@ require_once('include/attach.php'); require_once('include/bbcode.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '5.1' ); +define ( 'STD_VERSION', '5.1.2' ); define ( 'ZOT_REVISION', '6.0' ); define ( 'DB_UPDATE_VERSION', 1238 ); diff --git a/images/default_cover_photos/bggenerator/1200.png b/images/default_cover_photos/bggenerator/1200.png Binary files differnew file mode 100644 index 000000000..53aaafd7f --- /dev/null +++ b/images/default_cover_photos/bggenerator/1200.png diff --git a/images/default_cover_photos/bggenerator/425.png b/images/default_cover_photos/bggenerator/425.png Binary files differnew file mode 100644 index 000000000..5dbfe1e2b --- /dev/null +++ b/images/default_cover_photos/bggenerator/425.png diff --git a/images/default_cover_photos/bggenerator/850.png b/images/default_cover_photos/bggenerator/850.png Binary files differnew file mode 100644 index 000000000..e9f476f86 --- /dev/null +++ b/images/default_cover_photos/bggenerator/850.png diff --git a/include/acl_selectors.php b/include/acl_selectors.php index 35e385058..a3476439a 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -79,24 +79,44 @@ function populate_acl($defaults = null,$show_jotnets = true, $emptyACL_descripti $custom = false; } - $r = q("SELECT id, profile_guid, profile_name from profile where is_default = 0 and uid = %d order by profile_name", + $r = q("SELECT id, hash, gname FROM pgrp WHERE deleted = 0 AND uid = %d ORDER BY gname ASC", intval(local_channel()) ); + if($r) { - foreach($r as $rv) { - $selected = (($single_group && 'vp.' . $rv['profile_guid'] === $allow_gid[0]) ? ' selected = "selected" ' : ''); - $groups .= '<option id="' . 'vp' . $rv['id'] . '" value="' . 'vp.' . $rv['profile_guid'] . '"' . $selected . '>' . t('Profile','acl') . ' ' . $rv['profile_name'] . '</option>' . "\r\n"; + $groups .= '<optgroup label = "' . t('Privacy Groups').'">'; + foreach($r as $rr) { + $selected = (($single_group && $rr['hash'] === $allow_gid[0]) ? ' selected = "selected" ' : ''); + $groups .= '<option id="' . $rr['id'] . '" value="' . $rr['hash'] . '"' . $selected . '>' . $rr['gname'] . '</option>' . "\r\n"; } + $groups .= '</optgroup>'; } - $r = q("SELECT id, hash, gname FROM pgrp WHERE deleted = 0 AND uid = %d ORDER BY gname ASC", + $r = q("SELECT id, profile_guid, profile_name from profile where is_default = 0 and uid = %d order by profile_name", intval(local_channel()) ); if($r) { - foreach($r as $rr) { - $selected = (($single_group && $rr['hash'] === $allow_gid[0]) ? ' selected = "selected" ' : ''); - $groups .= '<option id="' . $rr['id'] . '" value="' . $rr['hash'] . '"' . $selected . '>' . $rr['gname'] . '</option>' . "\r\n"; + $groups .= '<optgroup label = "' . t('Profile-Based Privacy Groups').'">'; + foreach($r as $rv) { + $selected = (($single_group && 'vp.' . $rv['profile_guid'] === $allow_gid[0]) ? ' selected = "selected" ' : ''); + $groups .= '<option id="' . 'vp' . $rv['id'] . '" value="' . 'vp.' . $rv['profile_guid'] . '"' . $selected . '>' . $rv['profile_name'] . '</option>' . "\r\n"; + } + $groups .= '</optgroup>'; + } + + // $dialog_description is only set in places where we set permissions for a post. + // Abuse this fact to decide if forums should be displayed or not. + if($dialog_description) { + $forums = get_forum_channels(local_channel(),1); + if($forums) { + $groups .= '<optgroup label = "' . t('Forums').'">'; + foreach($forums as $f) { + $private = (($f['private_forum']) ? ' (' . t('Private Forum') . ')' : ''); + $selected = (($single_group && $f['hash'] === $allow_cid[0]) ? ' selected = "selected" ' : ''); + $groups .= '<option id="^' . $f['abook_id'] . '" value="^' . $f['xchan_hash'] . '"' . $selected . '>' . $f['xchan_name'] . $private . '</option>' . "\r\n"; + } + $groups .= '</optgroup>'; } } @@ -104,17 +124,18 @@ function populate_acl($defaults = null,$show_jotnets = true, $emptyACL_descripti $o = replace_macros($tpl, array( '$showall' => $showall_caption, '$onlyme' => t('Only me'), - '$groups' => $groups, + '$groups' => $groups, '$public_selected' => (($has_acl) ? false : true), '$justme_selected' => $just_me, '$custom_selected' => $custom, '$showallOrigin' => $showall_origin, '$showallIcon' => $showall_icon, - '$select_label' => t('Who can see this?'), + '$select_label' => t('Share with'), '$custom' => t('Custom selection'), - '$showlimitedDesc' => t('Select "Show" to allow viewing. "Don\'t show" lets you override and limit the scope of "Show".'), - '$show' => t('Show'), - '$hide' => t("Don't show"), + '$custom_label' => t('Advanced'), + '$showlimitedDesc' => t('Select "Allow" to allow viewing. "Don\'t allow" lets you override and limit the scope of "Allow".'), + '$show' => t('Allow'), + '$hide' => t("Don't allow"), '$search' => t('Search'), '$allowcid' => json_encode($allow_cid), '$allowgid' => json_encode($allow_gid), diff --git a/include/bbcode.php b/include/bbcode.php index e5b2a068a..d79429719 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -218,7 +218,7 @@ function bb_replace_images($body, $images) { // We're depending on the property of 'foreach' (specified on the PHP website) that // it loops over the array starting from the first element and going sequentially // to the last element - $newbody = str_replace('[$#saved_image' . $cnt . '#$]', '<img src="' . $image .'" alt="' . t('Image/photo') . '" />', $newbody); + $newbody = str_replace('[$#saved_image' . $cnt . '#$]', '<img src="' . $image .'" alt="' . t('Image/photo') . '" loading="eager" />', $newbody); $cnt++; } // logger('replace_images: ' . $newbody); @@ -513,7 +513,7 @@ function bb_ShareAttributes($match) { $headline = '<div id="shared_container_' . $rnd . '" class="shared_container"> <div id="shared_header_' . $rnd . '" class="shared_header">'; if ($avatar != "") - $headline .= '<a href="' . (($auth) ? zid($profile) : $profile) . '" ><img src="' . $avatar . '" alt="' . $author . '" height="32" width="32" /></a>'; + $headline .= '<a href="' . (($auth) ? zid($profile) : $profile) . '" ><img src="' . $avatar . '" alt="' . $author . '" height="32" width="32" loading="lazy" /></a>'; if(strpos($link,'/cards/')) $type = t('card'); @@ -881,7 +881,7 @@ function bb_imgoptions($match) { // now assemble the resulting img tag from these components - $output = '<img ' . (($match[1] === 'z') ? 'class="zrl" ' : '') . ' '; + $output = '<img ' . (($match[1] === 'z') ? 'class="zrl" loading="eager"' : '') . ' '; if ($width) { $style .= 'width: 100%; max-width: ' . $width . 'px; '; @@ -1483,19 +1483,19 @@ function bbcode($Text, $options = []) { // Images // [img]pathtoimage[/img] if (strpos($Text,'[/img]') !== false) { - $Text = preg_replace("/\[img\](.*?)\[\/img\]/ism", '<img style="max-width: 100%;" src="$1" alt="' . t('Image/photo') . '" />', $Text); + $Text = preg_replace("/\[img\](.*?)\[\/img\]/ism", '<img style="max-width: 100%;" src="$1" alt="' . t('Image/photo') . '" loading="eager" />', $Text); } // [img=pathtoimage]image description[/img] if (strpos($Text,'[/img]') !== false) { - $Text = preg_replace("/\[img=http(.*?)\](.*?)\[\/img\]/ism", '<img style="max-width: 100%;" src="http$1" alt="$2" title="$2"/>', $Text); + $Text = preg_replace("/\[img=http(.*?)\](.*?)\[\/img\]/ism", '<img style="max-width: 100%;" src="http$1" alt="$2" title="$2" loading="eager" />', $Text); } // [zmg]pathtoimage[/zmg] if (strpos($Text,'[/zmg]') !== false) { - $Text = preg_replace("/\[zmg\](.*?)\[\/zmg\]/ism", '<img class="zrl" style="max-width: 100%;" src="$1" alt="' . t('Image/photo') . '" />', $Text); + $Text = preg_replace("/\[zmg\](.*?)\[\/zmg\]/ism", '<img class="zrl" style="max-width: 100%;" src="$1" alt="' . t('Image/photo') . '" loading="eager" />', $Text); } // [zmg=pathtoimage]image description[/zmg] if (strpos($Text,'[/zmg]') !== false) { - $Text = preg_replace("/\[zmg=http(.*?)\](.*?)\[\/zmg\]/ism", '<img class="zrl" style="max-width: 100%;" src="http$1" alt="$2" title="$2"/>', $Text); + $Text = preg_replace("/\[zmg=http(.*?)\](.*?)\[\/zmg\]/ism", '<img class="zrl" style="max-width: 100%;" src="http$1" alt="$2" title="$2" loading="eager" />', $Text); } $Text = preg_replace_callback("/\[([zi])mg([ \=])(.*?)\](.*?)\[\/[zi]mg\]/ism",'bb_imgoptions',$Text); diff --git a/include/channel.php b/include/channel.php index 05f1bd34b..e2be4d8a8 100644 --- a/include/channel.php +++ b/include/channel.php @@ -341,6 +341,7 @@ function create_identity($arr) { 'hubloc_guid' => $guid, 'hubloc_guid_sig' => $zsig, 'hubloc_hash' => $zhash, + 'hubloc_id_url' => channel_url($ret['channel']), 'hubloc_addr' => channel_reddress($ret['channel']), 'hubloc_primary' => intval($primary), 'hubloc_url' => z_root(), @@ -360,7 +361,7 @@ function create_identity($arr) { 'hubloc_guid' => $guid, 'hubloc_guid_sig' => $sig, 'hubloc_hash' => $hash, - 'hubloc_id_url' => channel_url($ret['channel']), + 'hubloc_id_url' => channel_url($ret['channel']), 'hubloc_addr' => channel_reddress($ret['channel']), 'hubloc_primary' => intval($primary), 'hubloc_url' => z_root(), @@ -1924,7 +1925,7 @@ function zid_init() { call_hooks('zid_init', $arr); if(! local_channel()) { - $r = q("select * from hubloc where hubloc_addr = '%s' order by hubloc_connected desc", + $r = q("select hubloc_url, hubloc_hash, hubloc_network from hubloc where hubloc_addr = '%s' order by hubloc_connected desc", dbesc($tmp_str) ); if(! $r) { @@ -1933,6 +1934,7 @@ function zid_init() { if($r) { $r = Libzot::zot_record_preferred($r); } + if($r && remote_channel() && remote_channel() === $r['hubloc_hash']) return; @@ -2382,8 +2384,8 @@ function get_zcard($channel, $observer_hash = '', $args = array()) { $cover = $r[0]; $cover['href'] = z_root() . '/photo/' . $r[0]['resource_id'] . '-' . $r[0]['imgscale']; } else { - $default_cover = get_config('system','default_cover_photo','pexels-94622'); - $cover = [ 'href' => z_root() . '/images/default_cover_photos/' . $default_cover . '/' . $cover_width . '.jpg' ]; + $default_cover = get_config('system','default_cover_photo','bggenerator'); + $cover = [ 'href' => z_root() . '/images/default_cover_photos/' . $default_cover . '/' . $cover_width . '.png' ]; } $o .= replace_macros(get_markup_template('zcard.tpl'), array( @@ -2456,8 +2458,8 @@ function get_zcard_embed($channel, $observer_hash = '', $args = array()) { $cover['href'] = z_root() . '/photo/' . $r[0]['resource_id'] . '-' . $r[0]['imgscale']; } else { - $default_cover = get_config('system','default_cover_photo','pexels-94622'); - $cover = [ 'href' => z_root() . '/images/default_cover_photos/' . $default_cover . '/' . $cover_width . '.jpg' ]; + $default_cover = get_config('system','default_cover_photo','bggenerator'); + $cover = [ 'href' => z_root() . '/images/default_cover_photos/' . $default_cover . '/' . $cover_width . '.png' ]; } $o .= replace_macros(get_markup_template('zcard_embed.tpl'),array( @@ -2714,6 +2716,9 @@ function account_remove($account_id, $local = true, $unset_session = true) { logger('account_remove: ' . $account_id); + // Global removal (all clones) not currently supported + $local = true; + if(! intval($account_id)) { logger('No account.'); return false; @@ -2774,6 +2779,11 @@ function channel_remove($channel_id, $local = true, $unset_session = false) { if(! $channel_id) return; + // global removal (all clones) not currently supported + // hence this operation _may_ leave orphan data on remote servers + + $local = true; + logger('Removing channel: ' . $channel_id); logger('local only: ' . intval($local)); @@ -2792,6 +2802,7 @@ function channel_remove($channel_id, $local = true, $unset_session = false) { */ call_hooks('channel_remove', $r[0]); +/* if(! $local) { if(intval($r[0]['channel_removed'])) { @@ -2811,17 +2822,20 @@ function channel_remove($channel_id, $local = true, $unset_session = false) { logger('deleting hublocs',LOGGER_DEBUG); - $r = q("update hubloc set hubloc_deleted = 1 where hubloc_hash = '%s'", - dbesc($channel['channel_hash']) + $r = q("UPDATE hubloc SET hubloc_deleted = 1 WHERE hubloc_hash = '%s' OR hubloc_hash = '%s'", + dbesc($channel['channel_hash']), + dbesc($channel['channel_portable_id']) + ); - $r = q("update xchan set xchan_deleted = 1 where xchan_hash = '%s'", - dbesc($channel['channel_hash']) + $r = q("UPDATE xchan SET xchan_deleted = 1 WHERE xchan_hash = '%s' OR xchan_hash = '%s'", + dbesc($channel['channel_hash']), + dbesc($channel['channel_portable_id']) ); Master::Summon(array('Notifier','purge_all',$channel_id)); } - +*/ $r = q("select iid from iconfig left join item on item.id = iconfig.iid where item.uid = %d", @@ -2900,8 +2914,9 @@ function channel_remove($channel_id, $local = true, $unset_session = false) { logger('deleting hublocs',LOGGER_DEBUG); - $r = q("update hubloc set hubloc_deleted = 1 where hubloc_hash = '%s' and hubloc_url = '%s' ", + $r = q("UPDATE hubloc SET hubloc_deleted = 1 WHERE (hubloc_hash = '%s' OR hubloc_hash = '%s') AND hubloc_url = '%s' ", dbesc($channel['channel_hash']), + dbesc($channel['channel_portable_id']), dbesc(z_root()) ); @@ -2916,14 +2931,14 @@ function channel_remove($channel_id, $local = true, $unset_session = false) { $hublocs = count($r); if(! $hublocs) { - $r = q("update xchan set xchan_deleted = 1 where xchan_hash = '%s' ", - dbesc($channel['channel_hash']) + $r = q("UPDATE xchan SET xchan_deleted = 1 WHERE xchan_hash = '%s' OR xchan_hash = '%s'", + dbesc($channel['channel_hash']), + dbesc($channel['channel_portable_id']) ); } //remove from file system - $f = 'store/' . $channel['channel_address']; if(is_dir($f)) { @rrmdir($f); diff --git a/include/connections.php b/include/connections.php index c7ec163c8..658fb6ee6 100644 --- a/include/connections.php +++ b/include/connections.php @@ -446,8 +446,13 @@ function contact_remove($channel_id, $abook_id) { ); $r = q("delete from abconfig where chan = %d and xchan = '%s'", - intval($channel_id), - dbesc($abook['abook_xchan']) + intval($channel_id), + dbesc($abook['abook_xchan']) + ); + + $r = q("delete from source where src_channel_id = %d and src_xchan = '%s'", + intval($channel_id), + dbesc($abook['abook_xchan']) ); return true; @@ -775,7 +780,7 @@ function vcard_query(&$r) { function z6trans_connections() { - $r = q("SELECT DISTINCT abook.abook_xchan, hubloc.hubloc_addr, hubloc.hubloc_url, hubloc.hubloc_guid, site.site_project, site.site_version FROM abook + $r = dbq("SELECT DISTINCT abook.abook_xchan, hubloc.hubloc_addr, hubloc.hubloc_url, hubloc.hubloc_guid, site.site_project, site.site_version FROM abook LEFT JOIN hubloc ON abook_xchan = hubloc_hash LEFT JOIN site ON hubloc_url = site_url WHERE abook.abook_self = 0 AND hubloc.hubloc_network = 'zot' @@ -806,7 +811,7 @@ function z6trans_connections() { logger("z6trans_connections: transition $zot_xchan to $zot6_xchan"); - q("START TRANSACTION"); + dbq("START TRANSACTION"); $q1 = q("UPDATE abook set abook_xchan = '%s' WHERE abook_xchan = '%s'", dbesc($zot6_xchan), @@ -824,13 +829,13 @@ function z6trans_connections() { ); if($q1 && $q2 && $q3) { - q("COMMIT"); + dbq("COMMIT"); logger("z6trans_connections: completed"); continue; } logger("z6trans_connections: failed - performing rollback"); - q("ROLLBACK"); + dbq("ROLLBACK"); } } diff --git a/include/conversation.php b/include/conversation.php index b43a6f47e..e77404cff 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -102,22 +102,33 @@ function localize_item(&$item){ logger('localize_item: failed to decode object: ' . print_r($item['obj'],true)); } - if($obj['author'] && $obj['author']['link']) + if(is_array($obj['author']) && $obj['author']['link']) $author_link = get_rel_link($obj['author']['link'],'alternate'); + elseif(is_array($obj['actor']) && $obj['actor']['url']) + $author_link = ((is_array($obj['actor']['url'])) ? $obj['actor']['url'][0]['href'] : $obj['actor']['url']); else $author_link = ''; $author_name = (($obj['author'] && $obj['author']['name']) ? $obj['author']['name'] : ''); - $item_url = get_rel_link($obj['link'],'alternate'); + if(!$author_name) + $author_name = ((is_array($obj['actor']) && $obj['actor']['name']) ? $obj['actor']['name'] : ''); + + if(is_array($obj['link'])) + $item_url = get_rel_link($obj['link'],'alternate'); + + if(!$item_url) + $item_url = $obj['id']; $Bphoto = ''; switch($obj['type']) { case ACTIVITY_OBJ_PHOTO: + case 'Photo': $post_type = t('photo'); break; case ACTIVITY_OBJ_EVENT: + case 'Event': $post_type = t('event'); break; case ACTIVITY_OBJ_PERSON: @@ -142,9 +153,10 @@ function localize_item(&$item){ break; case ACTIVITY_OBJ_NOTE: + case 'Note': default: - $post_type = t('status'); - if($obj['id'] != $obj['parent']) + $post_type = t('post'); + if(($obj['parent'] && $obj['id'] != $obj['parent']) || $obj['inReplyTo']) $post_type = t('comment'); break; } diff --git a/include/dir_fns.php b/include/dir_fns.php index 34a6f13cd..f477b35dd 100644 --- a/include/dir_fns.php +++ b/include/dir_fns.php @@ -3,6 +3,10 @@ * @file include/dir_fns.php */ +use Zotlabs\Lib\Libzot; +use Zotlabs\Lib\Webfinger; +use Zotlabs\Lib\Zotfinger; + require_once('include/permissions.php'); /** @@ -67,15 +71,10 @@ function check_upstream_directory() { $isadir = true; if ($directory) { - $h = parse_url($directory); - if ($h) { - $j = Zotlabs\Zot\Finger::run('[system]@' . $h['host']); - if ($j['success']) { - if (array_key_exists('site', $j) && array_key_exists('directory_mode', $j['site'])) { - if ($j['site']['directory_mode'] === 'normal') { - $isadir = false; - } - } + $j = Zotfinger::exec($directory); + if (array_path_exists('data/directory_mode',$j)) { + if ($j['data']['directory_mode'] === 'normal') { + $isadir = false; } } } @@ -341,9 +340,9 @@ function update_directory_entry($ud) { // Hubzilla channels running traditional zot which have not upgraded can or will be dropped from the directory or // "not found" at the end of the transition period as the directory will only serve zot6 entries at that time. - $uri = \Zotlabs\Lib\Webfinger::zot_url($ud['ud_addr']); + $uri = Webfinger::zot_url($ud['ud_addr']); if($uri) { - $record = \Zotlabs\Lib\Zotfinger::exec($uri); + $record = Zotfinger::exec($uri); // Check the HTTP signature diff --git a/include/event.php b/include/event.php index 679440726..765086167 100644 --- a/include/event.php +++ b/include/event.php @@ -1247,7 +1247,7 @@ function event_store_item($arr, $event) { $item_arr['deny_cid'] = $arr['deny_cid']; $item_arr['deny_gid'] = $arr['deny_gid']; $item_arr['item_private'] = $private; - $item_arr['verb'] = ACTIVITY_POST; + $item_arr['verb'] = 'Invite'; $item_arr['item_wall'] = $item_wall; $item_arr['item_origin'] = $item_origin; $item_arr['item_thread_top'] = $item_thread_top; diff --git a/include/hubloc.php b/include/hubloc.php index 059a4dadc..6b896c627 100644 --- a/include/hubloc.php +++ b/include/hubloc.php @@ -247,6 +247,7 @@ function hubloc_change_primary($hubloc) { * * We use the post url to distinguish between http and https hublocs. * The https might be alive, and the http dead. + * Also set site_dead for the corresponding entry in the site table. * * @param string $posturl Hubloc callback url which to disable */ @@ -255,6 +256,13 @@ function hubloc_mark_as_down($posturl) { intval(HUBLOC_OFFLINE), dbesc($posturl) ); + + // extract the baseurl and set site.site_dead to match + $m = parse_url($posturl); + $h = $m['scheme'] . '://' . $m['host']; + $r = q("update site set site_dead = 1 where site_url = '%s'", + dbesc($h) + ); } diff --git a/include/items.php b/include/items.php index 0cfa2a340..960aa3580 100755 --- a/include/items.php +++ b/include/items.php @@ -3175,6 +3175,7 @@ function start_delivery_chain($channel, $item, $item_id, $parent, $group = false // This MAY cause you to run afoul of copyright law. $rewrite_author = intval(get_abconfig($channel['channel_id'],$item['owner_xchan'],'system','rself')); + if($rewrite_author) { $item['author_xchan'] = $channel['channel_hash']; @@ -3246,7 +3247,7 @@ function start_delivery_chain($channel, $item, $item_id, $parent, $group = false "' portable_id='" . $item['author']['xchan_hash'] . "' avatar='" . $item['author']['xchan_photo_s'] . "' link='" . $item['plink'] . - "' auth='" . ((in_array($item['author']['network'], ['zot','zot6'])) ? 'true' : 'false') . + "' auth='" . ((in_array($item['author']['xchan_network'], ['zot6','zot'])) ? 'true' : 'false') . "' posted='" . $item['created'] . "' message_id='" . $item['mid'] . "']"; diff --git a/include/network.php b/include/network.php index d9d534cd7..4457f59bc 100644 --- a/include/network.php +++ b/include/network.php @@ -1120,9 +1120,9 @@ function discover_by_webbie($webbie, $protocol = '') { continue; } - $x = Libzot::import_xchan($record['data']); - if($x['success']) { - return $x['hash']; + $y = Libzot::import_xchan($record['data']); + if($y['success']) { + return $y['hash']; } } } @@ -2061,3 +2061,23 @@ function get_request_string($url) { return '/' . ((count($a) > 3) ? $a[3] : EMPTY_STR); } + + +/* + * + * Takes the output of parse_url and builds a URL from it + * + */ + +function unparse_url($parsed_url) { + $scheme = isset($parsed_url['scheme']) ? $parsed_url['scheme'] . '://' : ''; + $host = isset($parsed_url['host']) ? $parsed_url['host'] : ''; + $port = isset($parsed_url['port']) ? ':' . $parsed_url['port'] : ''; + $user = isset($parsed_url['user']) ? $parsed_url['user'] : ''; + $pass = isset($parsed_url['pass']) ? ':' . $parsed_url['pass'] : ''; + $pass = ($user || $pass) ? "$pass@" : ''; + $path = isset($parsed_url['path']) ? $parsed_url['path'] : ''; + $query = isset($parsed_url['query']) ? '?' . $parsed_url['query'] : ''; + $fragment = isset($parsed_url['fragment']) ? '#' . $parsed_url['fragment'] : ''; + return "$scheme$user$pass$host$port$path$query$fragment"; +} diff --git a/include/socgraph.php b/include/socgraph.php index 3d26f5cfd..3da4dce63 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -158,7 +158,7 @@ function poco_load($xchan = '', $url = null) { if($address) { if($network === 'zot6') { $j = Zotfinger::exec($profile_url); - if(is_array($j) && array_path_exists('signature/signer',$j) && $j['signature']['signer'] === $profile_url && intval($j['signature']['header_valid'])) { + if(array_path_exists('signature/signer',$j) && $j['signature']['signer'] === $profile_url && intval($j['signature']['header_valid'])) { Libzot::import_xchan($j['data']); } $x = q("select xchan_hash from xchan where xchan_hash = '%s' limit 1", diff --git a/include/text.php b/include/text.php index e798bf8f8..a300ccf58 100644 --- a/include/text.php +++ b/include/text.php @@ -659,6 +659,26 @@ function hz_syslog($msg, $priority = LOG_INFO) { closelog(); } +/** + * @brief like hz_syslog() but with a function backtrace to pinpoint certain classes + * of problems which show up deep in the calling stack. + * + * @param string $msg Message to log + * @param int $priority - compatible with syslog + */ +function bt_syslog($msg, $priority = LOG_INFO) { + $stack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); + if($stack) { + for($x = 1; $x < count($stack); $x ++) { + $s = 'stack: ' . basename($stack[$x]['file']) . ':' . $stack[$x]['line'] . ':' . $stack[$x]['function'] . '()'; + openlog("bt-log", LOG_PID | LOG_PERROR, LOG_LOCAL0); + syslog($priority, $msg); + closelog(); + } + } +} + + /** * @brief Logging function for Hubzilla. @@ -742,7 +762,6 @@ function btlogger($msg, $level = LOGGER_NORMAL, $priority = LOG_INFO) { for($x = 1; $x < count($stack); $x ++) { $s = 'stack: ' . basename($stack[$x]['file']) . ':' . $stack[$x]['line'] . ':' . $stack[$x]['function'] . '()'; logger($s,$level, $priority); - if(file_exists(BTLOGGER_DEBUG_FILE) && is_writable(BTLOGGER_DEBUG_FILE)) { @file_put_contents(BTLOGGER_DEBUG_FILE, $s . PHP_EOL, FILE_APPEND); } @@ -2236,7 +2255,7 @@ function item_post_type($item) { $post_type = t('event'); break; default: - $post_type = t('status'); + $post_type = t('post'); if($item['mid'] != $item['parent_mid']) $post_type = t('comment'); break; @@ -3661,11 +3680,15 @@ function get_forum_channels($uid) { if(! $uid) return; - $xf = false; + if(App::$data['forum_channels']) + return App::$data['forum_channels']; + + $xf = ''; $x1 = q("select xchan from abconfig where chan = %d and cat = 'their_perms' and k = 'send_stream' and v = '0'", intval($uid) ); + if($x1) { $xc = ids_to_querystr($x1,'xchan',true); @@ -3673,22 +3696,21 @@ function get_forum_channels($uid) { intval($uid) ); - if($x2) { - $xf = ids_to_querystr($x2,'xchan',true); + $xf = ids_to_querystr($x2,'xchan',true); + $sql_extra = (($xf) ? ' and not xchan in (' . $xf . ')' : ''); - // private forums - $x3 = q("select xchan from abconfig where chan = %d and cat = 'their_perms' and k = 'post_wall' and v = '1' and xchan in (" . $xc . ") and not xchan in (" . $xf . ") ", - intval(local_channel()) - ); - if($x3) { - $xf = ids_to_querystr(array_merge($x2,$x3),'xchan',true); - } + // private forums + $x3 = q("select xchan from abconfig where chan = %d and cat = 'their_perms' and k = 'post_wall' and v = '1' and xchan in (" . $xc . ") $sql_extra ", + intval(local_channel()) + ); + if($x3) { + $xf = ids_to_querystr(array_merge($x2,$x3),'xchan',true); } } - $sql_extra = (($xf) ? " and ( xchan_hash in (" . $xf . ") or xchan_pubforum = 1 ) " : " and xchan_pubforum = 1 "); + $sql_extra_1 = (($xf) ? " and ( xchan_hash in (" . $xf . ") or xchan_pubforum = 1 ) " : " and xchan_pubforum = 1 "); - $r = q("select abook_id, xchan_hash, xchan_name, xchan_url, xchan_addr, xchan_photo_s from abook left join xchan on abook_xchan = xchan_hash where xchan_deleted = 0 and abook_channel = %d and abook_pending = 0 and abook_ignored = 0 and abook_blocked = 0 and abook_archived = 0 $sql_extra order by xchan_name", + $r = q("select abook_id, xchan_hash, xchan_name, xchan_url, xchan_addr, xchan_photo_s from abook left join xchan on abook_xchan = xchan_hash where xchan_deleted = 0 and abook_channel = %d and abook_pending = 0 and abook_ignored = 0 and abook_blocked = 0 and abook_archived = 0 $sql_extra_1 order by xchan_name", intval($uid) ); @@ -3702,6 +3724,8 @@ function get_forum_channels($uid) { } } + App::$data['forum_channels'] = $r; + return $r; } @@ -3816,3 +3840,12 @@ function unserialise($x) { return ((is_array($y)) ? $y : $x); } +/** + * @brief Remove new lines and tabs from strings. + * + * @return string + */ +function sanitize_text_field($str) { + return preg_replace('/\s+/S', ' ', $str); +} + diff --git a/include/xchan.php b/include/xchan.php index d69d707aa..5de828e7f 100644 --- a/include/xchan.php +++ b/include/xchan.php @@ -25,7 +25,7 @@ function xchan_store_lowlevel($arr) { 'xchan_connurl' => ((array_key_exists('xchan_connurl',$arr)) ? $arr['xchan_connurl'] : ''), 'xchan_follow' => ((array_key_exists('xchan_follow',$arr)) ? $arr['xchan_follow'] : ''), 'xchan_connpage' => ((array_key_exists('xchan_connpage',$arr)) ? $arr['xchan_connpage'] : ''), - 'xchan_name' => ((array_key_exists('xchan_name',$arr)) ? $arr['xchan_name'] : ''), + 'xchan_name' => ((array_key_exists('xchan_name',$arr)) ? sanitize_text_field($arr['xchan_name']) : ''), 'xchan_network' => ((array_key_exists('xchan_network',$arr)) ? $arr['xchan_network'] : ''), 'xchan_instance_url' => ((array_key_exists('xchan_instance_url',$arr)) ? $arr['xchan_instance_url'] : ''), 'xchan_flags' => ((array_key_exists('xchan_flags',$arr)) ? intval($arr['xchan_flags']) : 0), @@ -264,4 +264,4 @@ function xchan_change_key($oldx,$newx,$data) { foreach($acls as $k => $v) { xchan_keychange_acl($k,$v,$oldx,$newx); } -}
\ No newline at end of file +} diff --git a/include/zid.php b/include/zid.php index 10e09e212..538adcc41 100644 --- a/include/zid.php +++ b/include/zid.php @@ -2,7 +2,6 @@ use Zotlabs\Lib\Libzot; use Zotlabs\Lib\Verify; -use Zotlabs\Zot\Finger; function is_matrix_url($url) { @@ -280,44 +279,39 @@ function owt_init($token) { Verify::purge('owt', '3 MINUTE'); - $key = Verify::get_meta('owt', 0, $token); + $ob_hash = Verify::get_meta('owt', 0, $token); - if($key === false) { - return; - } - - $parts = explode(',',$key,2); - if(count($parts) < 2) { + if($ob_hash === false) { return; } $r = q("select * from hubloc left join xchan on xchan_hash = hubloc_hash - where hubloc_network = '%s' and hubloc_addr = '%s' order by hubloc_id desc", - dbesc($parts[0]), - dbesc($parts[1]) + where hubloc_addr = '%s' or hubloc_id_url = '%s' or hubloc_hash = '%s' order by hubloc_id desc", + dbesc($ob_hash), + dbesc($ob_hash), + dbesc($ob_hash) ); if(! $r) { - // finger them if they can't be found. - // @todo check that this is still needed. Discovery should have been performed in the Owa module. - - $j = \Zotlabs\Zot\Finger::run($parts[1], null); - if ($j['success']) { - import_xchan($j); + $wf = discover_by_webbie($ob_hash); + if($wf) { $r = q("select * from hubloc left join xchan on xchan_hash = hubloc_hash - where hubloc_network = '%s' and hubloc_addr = '%s' order by hubloc_id desc", - dbesc($parts[0]), - dbesc($parts[1]) + where hubloc_addr = '%s' or hubloc_id_url = '%s' or hubloc_hash = '%s' order by hubloc_id desc", + dbesc($ob_hash), + dbesc($ob_hash), + dbesc($ob_hash) ); } } if(! $r) { - logger('owt: unable to finger ' . $key); + logger('owt: unable to finger ' . $ob_hash); return; } - - $hubloc = $r[0]; + + $r = Libzot::zot_record_preferred($r); + + $hubloc = $r; $_SESSION['authenticated'] = 1; @@ -343,7 +337,7 @@ function owt_init($token) { if (! $delegate_success) { // normal visitor (remote_channel) login session credentials $_SESSION['visitor_id'] = $hubloc['xchan_hash']; - $_SESSION['my_url'] = $hubloc['xchan_url']; + $_SESSION['my_url'] = $hubloc['xchan_url']; $_SESSION['my_address'] = $hubloc['hubloc_addr']; $_SESSION['remote_hub'] = $hubloc['hubloc_url']; $_SESSION['DNT'] = 1; diff --git a/include/zot.php b/include/zot.php index e10ef6fd7..8a2177de7 100644 --- a/include/zot.php +++ b/include/zot.php @@ -9,6 +9,8 @@ */ use Zotlabs\Lib\DReport; +use Zotlabs\Lib\Libzot; +use Zotlabs\Lib\Activity; require_once('include/crypto.php'); require_once('include/items.php'); @@ -1952,6 +1954,34 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $ intval($channel['channel_id']), dbesc($arr['owner_xchan']) ); + + if(! $ab) { + + $best_owner_xchan = find_best_zot_identity($arr['owner_xchan']); + + $ab = q("select * from abook where abook_channel = %d and abook_xchan = '%s'", + intval($channel['channel_id']), + dbesc($best_owner_xchan) + ); + + if($ab) { + logger('rewrite owner: ' . $arr['owner_xchan'] . ' > ' . $best_owner_xchan); + $arr['owner_xchan'] = $best_owner_xchan; + } + } + + $best_author_xchan = find_best_zot_identity($arr['author_xchan']); + + $ab_author = q("select * from abook where abook_channel = %d and abook_xchan = '%s'", + intval($channel['channel_id']), + dbesc($best_author_xchan) + ); + + if($ab_author) { + logger('rewrite author: ' . $arr['author_xchan'] . ' > ' . $best_author_xchan); + $arr['author_xchan'] = $best_author_xchan; + } + $abook = (($ab) ? $ab[0] : null); if(intval($arr['item_deleted'])) { @@ -5341,3 +5371,24 @@ function zot_record_preferred($arr, $check = 'hubloc_network') { return $arr[0]; } + +function find_best_zot_identity($xchan) { + + $r = q("select hubloc_addr from hubloc where hubloc_hash = '%s' and hubloc_network in ('zot6', 'zot') and hubloc_deleted = 0", + dbesc($xchan) + ); + + if ($r) { + + $r = q("select hubloc_hash, hubloc_network from hubloc where hubloc_addr = '%s' and hubloc_network in ('zot6', 'zot') and hubloc_deleted = 0", + dbesc($r[0]['hubloc_addr']) + ); + if ($r) { + $r = Libzot::zot_record_preferred($r); + logger('find_best_zot_identity: ' . $xchan . ' > ' . $r['hubloc_hash']); + return $r['hubloc_hash']; + } + } + + return $xchan; +} diff --git a/util/hmessages.po b/util/hmessages.po index bd102535d..5600f9fda 100644 --- a/util/hmessages.po +++ b/util/hmessages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 5.0RC\n" +"Project-Id-Version: 5.1.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-09-17 11:07+0000\n" +"POT-Creation-Date: 2020-10-25 07:30+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -21,7 +21,7 @@ msgstr "" #: ../../addon/cart/submodules/orderoptions.php:335 #: ../../addon/cart/submodules/orderoptions.php:359 #: ../../addon/cart/submodules/orderoptions.php:435 -#: ../../addon/cart/submodules/orderoptions.php:459 ../../include/text.php:3360 +#: ../../addon/cart/submodules/orderoptions.php:459 ../../include/text.php:3379 #: ../../Zotlabs/Module/Admin/Site.php:185 msgid "Default" msgstr "" @@ -53,9 +53,9 @@ msgstr "" #: ../../addon/cart/submodules/hzservices.php:643 #: ../../addon/cart/submodules/orderoptions.php:312 #: ../../addon/cart/submodules/orderoptions.php:412 -#: ../../addon/cart/submodules/manualcat.php:252 +#: ../../addon/cart/submodules/manualcat.php:248 #: ../../addon/cart/Settings/Cart.php:132 -#: ../../addon/cart/Settings/Cart.php:142 ../../addon/cart/cart.php:1261 +#: ../../addon/cart/Settings/Cart.php:142 ../../addon/cart/cart.php:1376 #: ../../addon/nofed/Mod_Nofed.php:53 #: ../../addon/smileybutton/Mod_Smileybutton.php:55 #: ../../addon/redfiles/redfiles.php:124 ../../addon/diaspora/diaspora.php:75 @@ -105,7 +105,7 @@ msgstr "" #: ../../Zotlabs/Module/Affinity.php:87 ../../Zotlabs/Module/Rate.php:166 #: ../../Zotlabs/Module/Settings/Network.php:62 #: ../../Zotlabs/Module/Settings/Features.php:48 -#: ../../Zotlabs/Module/Settings/Channel.php:494 +#: ../../Zotlabs/Module/Settings/Channel.php:495 #: ../../Zotlabs/Module/Settings/Account.php:103 #: ../../Zotlabs/Module/Settings/Events.php:42 #: ../../Zotlabs/Module/Settings/Manage.php:43 @@ -121,8 +121,8 @@ msgstr "" #: ../../Zotlabs/Module/Defperms.php:266 ../../Zotlabs/Module/Pconfig.php:116 #: ../../Zotlabs/Module/Oauth2.php:116 ../../Zotlabs/Module/Thing.php:328 #: ../../Zotlabs/Module/Thing.php:381 ../../Zotlabs/Module/Pdledit.php:108 -#: ../../Zotlabs/Module/Wiki.php:215 ../../Zotlabs/Module/Connedit.php:905 -#: ../../Zotlabs/Module/Locs.php:121 ../../Zotlabs/Module/Sources.php:125 +#: ../../Zotlabs/Module/Wiki.php:215 ../../Zotlabs/Module/Connedit.php:907 +#: ../../Zotlabs/Module/Locs.php:125 ../../Zotlabs/Module/Sources.php:125 #: ../../Zotlabs/Module/Sources.php:162 ../../Zotlabs/Lib/ThreadItem.php:825 msgid "Submit" msgstr "" @@ -167,32 +167,31 @@ msgstr "" #: ../../addon/cart/submodules/paypalbuttonV2.php:88 #: ../../addon/cart/submodules/paypalbuttonV2.php:96 #: ../../addon/cart/submodules/manualcat.php:63 +#: ../../addon/cart/submodules/manualcat.php:254 #: ../../addon/cart/submodules/manualcat.php:258 -#: ../../addon/cart/submodules/manualcat.php:262 #: ../../addon/cart/Settings/Cart.php:61 ../../addon/cart/Settings/Cart.php:73 -#: ../../addon/cart/cart.php:1255 ../../addon/nofed/Mod_Nofed.php:42 +#: ../../addon/cart/cart.php:1370 ../../addon/nofed/Mod_Nofed.php:42 #: ../../addon/smileybutton/Mod_Smileybutton.php:44 #: ../../addon/libertree/Mod_Libertree.php:59 #: ../../addon/socialauth/Mod_SocialAuth.php:214 #: ../../addon/ljpost/Mod_Ljpost.php:63 ../../addon/ljpost/Mod_Ljpost.php:67 -#: ../../addon/ljpost/Mod_Ljpost.php:71 ../../include/conversation.php:1451 -#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144 -#: ../../include/dir_fns.php:145 ../../Zotlabs/Module/Import.php:638 +#: ../../addon/ljpost/Mod_Ljpost.php:71 ../../include/conversation.php:1463 +#: ../../include/dir_fns.php:142 ../../include/dir_fns.php:143 +#: ../../include/dir_fns.php:144 ../../Zotlabs/Module/Import.php:638 #: ../../Zotlabs/Module/Import.php:642 ../../Zotlabs/Module/Import.php:643 #: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:177 #: ../../Zotlabs/Module/Mitem.php:256 ../../Zotlabs/Module/Mitem.php:257 #: ../../Zotlabs/Module/Filestorage.php:198 #: ../../Zotlabs/Module/Filestorage.php:206 -#: ../../Zotlabs/Module/Admin/Site.php:253 ../../Zotlabs/Module/Removeme.php:63 -#: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Events.php:479 -#: ../../Zotlabs/Module/Api.php:99 ../../Zotlabs/Module/Photos.php:672 -#: ../../Zotlabs/Module/Profiles.php:683 -#: ../../Zotlabs/Module/Settings/Channel.php:310 +#: ../../Zotlabs/Module/Admin/Site.php:253 ../../Zotlabs/Module/Events.php:478 +#: ../../Zotlabs/Module/Events.php:479 ../../Zotlabs/Module/Api.php:99 +#: ../../Zotlabs/Module/Photos.php:672 ../../Zotlabs/Module/Profiles.php:683 +#: ../../Zotlabs/Module/Settings/Channel.php:311 #: ../../Zotlabs/Module/Settings/Display.php:90 #: ../../Zotlabs/Module/Menu.php:163 ../../Zotlabs/Module/Menu.php:222 #: ../../Zotlabs/Module/Defperms.php:198 ../../Zotlabs/Module/Wiki.php:227 -#: ../../Zotlabs/Module/Wiki.php:228 ../../Zotlabs/Module/Connedit.php:407 -#: ../../Zotlabs/Module/Connedit.php:797 ../../Zotlabs/Module/Sources.php:124 +#: ../../Zotlabs/Module/Wiki.php:228 ../../Zotlabs/Module/Connedit.php:414 +#: ../../Zotlabs/Module/Connedit.php:799 ../../Zotlabs/Module/Sources.php:124 #: ../../Zotlabs/Module/Sources.php:159 ../../Zotlabs/Lib/Libzotdir.php:162 #: ../../Zotlabs/Lib/Libzotdir.php:163 ../../Zotlabs/Lib/Libzotdir.php:165 #: ../../Zotlabs/Storage/Browser.php:411 ../../boot.php:1703 @@ -231,31 +230,30 @@ msgstr "" #: ../../addon/cart/submodules/paypalbuttonV2.php:88 #: ../../addon/cart/submodules/paypalbuttonV2.php:96 #: ../../addon/cart/submodules/manualcat.php:63 +#: ../../addon/cart/submodules/manualcat.php:254 #: ../../addon/cart/submodules/manualcat.php:258 -#: ../../addon/cart/submodules/manualcat.php:262 #: ../../addon/cart/Settings/Cart.php:61 ../../addon/cart/Settings/Cart.php:73 -#: ../../addon/cart/cart.php:1255 ../../addon/nofed/Mod_Nofed.php:42 +#: ../../addon/cart/cart.php:1370 ../../addon/nofed/Mod_Nofed.php:42 #: ../../addon/smileybutton/Mod_Smileybutton.php:44 #: ../../addon/libertree/Mod_Libertree.php:59 #: ../../addon/socialauth/Mod_SocialAuth.php:214 #: ../../addon/ljpost/Mod_Ljpost.php:63 ../../addon/ljpost/Mod_Ljpost.php:67 -#: ../../addon/ljpost/Mod_Ljpost.php:71 ../../include/conversation.php:1451 -#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144 -#: ../../include/dir_fns.php:145 ../../Zotlabs/Module/Import.php:638 +#: ../../addon/ljpost/Mod_Ljpost.php:71 ../../include/conversation.php:1463 +#: ../../include/dir_fns.php:142 ../../include/dir_fns.php:143 +#: ../../include/dir_fns.php:144 ../../Zotlabs/Module/Import.php:638 #: ../../Zotlabs/Module/Import.php:642 ../../Zotlabs/Module/Import.php:643 #: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:177 #: ../../Zotlabs/Module/Mitem.php:256 ../../Zotlabs/Module/Mitem.php:257 #: ../../Zotlabs/Module/Filestorage.php:198 #: ../../Zotlabs/Module/Filestorage.php:206 -#: ../../Zotlabs/Module/Admin/Site.php:255 ../../Zotlabs/Module/Removeme.php:63 -#: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Events.php:479 -#: ../../Zotlabs/Module/Api.php:98 ../../Zotlabs/Module/Photos.php:672 -#: ../../Zotlabs/Module/Profiles.php:683 -#: ../../Zotlabs/Module/Settings/Channel.php:310 +#: ../../Zotlabs/Module/Admin/Site.php:255 ../../Zotlabs/Module/Events.php:478 +#: ../../Zotlabs/Module/Events.php:479 ../../Zotlabs/Module/Api.php:98 +#: ../../Zotlabs/Module/Photos.php:672 ../../Zotlabs/Module/Profiles.php:683 +#: ../../Zotlabs/Module/Settings/Channel.php:311 #: ../../Zotlabs/Module/Settings/Display.php:90 #: ../../Zotlabs/Module/Menu.php:163 ../../Zotlabs/Module/Menu.php:222 #: ../../Zotlabs/Module/Defperms.php:198 ../../Zotlabs/Module/Wiki.php:227 -#: ../../Zotlabs/Module/Wiki.php:228 ../../Zotlabs/Module/Connedit.php:407 +#: ../../Zotlabs/Module/Wiki.php:228 ../../Zotlabs/Module/Connedit.php:414 #: ../../Zotlabs/Module/Sources.php:124 ../../Zotlabs/Module/Sources.php:159 #: ../../Zotlabs/Lib/Libzotdir.php:162 ../../Zotlabs/Lib/Libzotdir.php:163 #: ../../Zotlabs/Lib/Libzotdir.php:165 ../../Zotlabs/Storage/Browser.php:411 @@ -349,9 +347,9 @@ msgstr "" #: ../../addon/channelreputation/channelreputation.php:101 #: ../../addon/channelreputation/channelreputation.php:102 -#: ../../addon/cart/myshop.php:141 ../../addon/cart/myshop.php:177 -#: ../../addon/cart/myshop.php:211 ../../addon/cart/myshop.php:259 -#: ../../addon/cart/myshop.php:294 ../../addon/cart/myshop.php:317 +#: ../../addon/cart/myshop.php:144 ../../addon/cart/myshop.php:180 +#: ../../addon/cart/myshop.php:214 ../../addon/cart/myshop.php:261 +#: ../../addon/cart/myshop.php:296 ../../addon/cart/myshop.php:319 msgid "Access Denied" msgstr "" @@ -414,7 +412,7 @@ msgid "Channel Reputation" msgstr "" #: ../../addon/channelreputation/channelreputation.php:233 -#: ../../include/acl_selectors.php:125 ../../Zotlabs/Widget/Pinned.php:160 +#: ../../include/acl_selectors.php:146 ../../Zotlabs/Widget/Pinned.php:160 #: ../../Zotlabs/Module/Photos.php:1274 ../../Zotlabs/Lib/ThreadItem.php:495 msgid "Close" msgstr "" @@ -565,13 +563,13 @@ msgid "Page to load after image selection." msgstr "" #: ../../addon/openclipatar/openclipatar.php:57 ../../include/nav.php:112 -#: ../../include/conversation.php:1065 ../../Zotlabs/Module/Connedit.php:609 +#: ../../include/conversation.php:1077 ../../Zotlabs/Module/Connedit.php:611 #: ../../Zotlabs/Lib/Apps.php:344 msgid "View Profile" msgstr "" #: ../../addon/openclipatar/openclipatar.php:58 ../../include/nav.php:117 -#: ../../include/channel.php:1527 +#: ../../include/channel.php:1528 msgid "Edit Profile" msgstr "" @@ -678,8 +676,8 @@ msgstr "" msgid "Queueworker Settings" msgstr "" -#: ../../addon/queueworker/Mod_Queueworker.php:119 ../../include/text.php:1132 -#: ../../include/text.php:1144 ../../Zotlabs/Widget/Notes.php:23 +#: ../../addon/queueworker/Mod_Queueworker.php:119 ../../include/text.php:1151 +#: ../../include/text.php:1163 ../../Zotlabs/Widget/Notes.php:23 #: ../../Zotlabs/Module/Admin/Profs.php:94 #: ../../Zotlabs/Module/Admin/Profs.php:114 ../../Zotlabs/Module/Filer.php:53 #: ../../Zotlabs/Module/Rbmark.php:32 ../../Zotlabs/Module/Rbmark.php:104 @@ -733,7 +731,7 @@ msgstr "" msgid "Photo Gallery" msgstr "" -#: ../../addon/gallery/Mod_Gallery.php:49 ../../include/channel.php:1424 +#: ../../addon/gallery/Mod_Gallery.php:49 ../../include/channel.php:1425 #: ../../Zotlabs/Module/Hcard.php:12 ../../Zotlabs/Module/Editwebpage.php:32 #: ../../Zotlabs/Module/Profile.php:20 ../../Zotlabs/Module/Webpages.php:39 #: ../../Zotlabs/Module/Filestorage.php:53 ../../Zotlabs/Module/Connect.php:17 @@ -764,7 +762,7 @@ msgstr "" #: ../../addon/openid/Mod_Id.php:53 ../../addon/mail/Mod_Mail.php:25 #: ../../addon/pumpio/pumpio.php:44 ../../addon/keepout/keepout.php:36 -#: ../../include/photos.php:27 ../../include/items.php:3965 +#: ../../include/photos.php:27 ../../include/items.php:3966 #: ../../include/attach.php:156 ../../include/attach.php:205 #: ../../include/attach.php:278 ../../include/attach.php:386 #: ../../include/attach.php:400 ../../include/attach.php:407 @@ -784,8 +782,8 @@ msgstr "" #: ../../Zotlabs/Module/Chat.php:118 #: ../../Zotlabs/Module/Channel_calendar.php:230 #: ../../Zotlabs/Module/Like.php:193 ../../Zotlabs/Module/Poke.php:157 -#: ../../Zotlabs/Module/Item.php:383 ../../Zotlabs/Module/Item.php:402 -#: ../../Zotlabs/Module/Item.php:412 ../../Zotlabs/Module/Item.php:1328 +#: ../../Zotlabs/Module/Item.php:483 ../../Zotlabs/Module/Item.php:502 +#: ../../Zotlabs/Module/Item.php:512 ../../Zotlabs/Module/Item.php:1428 #: ../../Zotlabs/Module/Mitem.php:129 ../../Zotlabs/Module/Profile.php:85 #: ../../Zotlabs/Module/Profile.php:101 #: ../../Zotlabs/Module/Sharedwithme.php:19 @@ -799,7 +797,7 @@ msgstr "" #: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Events.php:277 #: ../../Zotlabs/Module/Manage.php:10 ../../Zotlabs/Module/Authtest.php:16 #: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Moderate.php:15 -#: ../../Zotlabs/Module/Display.php:456 ../../Zotlabs/Module/Common.php:38 +#: ../../Zotlabs/Module/Display.php:442 ../../Zotlabs/Module/Common.php:38 #: ../../Zotlabs/Module/New_channel.php:105 #: ../../Zotlabs/Module/New_channel.php:130 #: ../../Zotlabs/Module/Service_limits.php:11 ../../Zotlabs/Module/Mood.php:126 @@ -826,22 +824,22 @@ msgstr "" #: ../../Zotlabs/Module/Thing.php:343 ../../Zotlabs/Module/Pdledit.php:35 #: ../../Zotlabs/Module/Wiki.php:59 ../../Zotlabs/Module/Wiki.php:285 #: ../../Zotlabs/Module/Wiki.php:428 ../../Zotlabs/Module/Suggest.php:32 -#: ../../Zotlabs/Module/Connedit.php:400 +#: ../../Zotlabs/Module/Connedit.php:407 #: ../../Zotlabs/Module/Notifications.php:11 #: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78 -#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Locs.php:87 +#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Locs.php:91 #: ../../Zotlabs/Module/Sources.php:80 ../../Zotlabs/Lib/Chatroom.php:135 -#: ../../Zotlabs/Web/WebServer.php:115 +#: ../../Zotlabs/Web/WebServer.php:116 msgid "Permission denied." msgstr "" #: ../../addon/openid/Mod_Id.php:85 ../../include/selectors.php:60 -#: ../../include/selectors.php:77 ../../include/channel.php:1707 +#: ../../include/selectors.php:77 ../../include/channel.php:1708 msgid "Male" msgstr "" #: ../../addon/openid/Mod_Id.php:87 ../../include/selectors.php:60 -#: ../../include/selectors.php:77 ../../include/channel.php:1705 +#: ../../include/selectors.php:77 ../../include/channel.php:1706 msgid "Female" msgstr "" @@ -891,7 +889,7 @@ msgstr "" #: ../../Zotlabs/Module/Cdav.php:1372 #: ../../Zotlabs/Module/Admin/Accounts.php:171 #: ../../Zotlabs/Module/Admin/Accounts.php:183 -#: ../../Zotlabs/Module/Profiles.php:789 ../../Zotlabs/Module/Connedit.php:928 +#: ../../Zotlabs/Module/Profiles.php:789 ../../Zotlabs/Module/Connedit.php:930 msgid "Email" msgstr "" @@ -1110,7 +1108,7 @@ msgstr "" msgid "Channel is required." msgstr "" -#: ../../addon/redred/Mod_Redred.php:29 ../../Zotlabs/Module/Network.php:326 +#: ../../addon/redred/Mod_Redred.php:29 ../../Zotlabs/Module/Network.php:329 msgid "Invalid channel." msgstr "" @@ -1170,7 +1168,7 @@ msgstr "" #: ../../Zotlabs/Module/Like.php:295 ../../Zotlabs/Module/Cloud.php:119 #: ../../Zotlabs/Module/Share.php:72 ../../Zotlabs/Module/Subthread.php:86 #: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:82 -#: ../../Zotlabs/Web/WebServer.php:114 +#: ../../Zotlabs/Web/WebServer.php:115 msgid "Permission denied" msgstr "" @@ -1213,11 +1211,11 @@ msgstr "" msgid "0 or blank to import all available" msgstr "" -#: ../../addon/redphotos/redphotohelper.php:71 ../../addon/pubcrawl/as.php:1810 -#: ../../addon/diaspora/Receiver.php:1597 ../../include/text.php:2233 -#: ../../include/conversation.php:118 ../../Zotlabs/Module/Like.php:386 +#: ../../addon/redphotos/redphotohelper.php:71 ../../addon/pubcrawl/as.php:1841 +#: ../../addon/diaspora/Receiver.php:1597 ../../include/text.php:2252 +#: ../../include/conversation.php:128 ../../Zotlabs/Module/Like.php:386 #: ../../Zotlabs/Module/Tagger.php:71 ../../Zotlabs/Module/Subthread.php:112 -#: ../../Zotlabs/Lib/Activity.php:2892 +#: ../../Zotlabs/Lib/Activity.php:2953 msgid "photo" msgstr "" @@ -1537,16 +1535,16 @@ msgstr "" msgid "Until modified date yyyy-mm-dd" msgstr "" -#: ../../addon/hsse/hsse.php:82 ../../include/conversation.php:1313 +#: ../../addon/hsse/hsse.php:82 ../../include/conversation.php:1325 msgid "Set your location" msgstr "" -#: ../../addon/hsse/hsse.php:83 ../../include/conversation.php:1314 +#: ../../addon/hsse/hsse.php:83 ../../include/conversation.php:1326 msgid "Clear browser location" msgstr "" #: ../../addon/hsse/hsse.php:95 ../../addon/mail/Mod_Mail.php:166 -#: ../../addon/mail/Mod_Mail.php:309 ../../include/conversation.php:1326 +#: ../../addon/mail/Mod_Mail.php:309 ../../include/conversation.php:1338 #: ../../Zotlabs/Module/Article_edit.php:100 #: ../../Zotlabs/Module/Card_edit.php:101 #: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Chat.php:220 @@ -1554,124 +1552,124 @@ msgstr "" msgid "Insert web link" msgstr "" -#: ../../addon/hsse/hsse.php:99 ../../include/conversation.php:1330 +#: ../../addon/hsse/hsse.php:99 ../../include/conversation.php:1342 msgid "Embed (existing) photo from your photo albums" msgstr "" #: ../../addon/hsse/hsse.php:134 ../../addon/mail/Mod_Mail.php:119 -#: ../../addon/mail/Mod_Mail.php:240 ../../include/conversation.php:1365 +#: ../../addon/mail/Mod_Mail.php:240 ../../include/conversation.php:1377 #: ../../Zotlabs/Module/Chat.php:218 msgid "Please enter a link URL:" msgstr "" -#: ../../addon/hsse/hsse.php:135 ../../include/conversation.php:1366 +#: ../../addon/hsse/hsse.php:135 ../../include/conversation.php:1378 msgid "Tag term:" msgstr "" -#: ../../addon/hsse/hsse.php:136 ../../include/conversation.php:1367 +#: ../../addon/hsse/hsse.php:136 ../../include/conversation.php:1379 msgid "Where are you right now?" msgstr "" -#: ../../addon/hsse/hsse.php:139 ../../include/conversation.php:1370 +#: ../../addon/hsse/hsse.php:139 ../../include/conversation.php:1382 #: ../../Zotlabs/Module/Profile_photo.php:509 #: ../../Zotlabs/Module/Cover_photo.php:430 ../../Zotlabs/Module/Wiki.php:403 msgid "Choose images to embed" msgstr "" -#: ../../addon/hsse/hsse.php:140 ../../include/conversation.php:1371 +#: ../../addon/hsse/hsse.php:140 ../../include/conversation.php:1383 #: ../../Zotlabs/Module/Profile_photo.php:510 #: ../../Zotlabs/Module/Cover_photo.php:431 ../../Zotlabs/Module/Wiki.php:404 msgid "Choose an album" msgstr "" -#: ../../addon/hsse/hsse.php:141 ../../include/conversation.php:1372 +#: ../../addon/hsse/hsse.php:141 ../../include/conversation.php:1384 msgid "Choose a different album..." msgstr "" -#: ../../addon/hsse/hsse.php:142 ../../include/conversation.php:1373 +#: ../../addon/hsse/hsse.php:142 ../../include/conversation.php:1385 #: ../../Zotlabs/Module/Profile_photo.php:512 #: ../../Zotlabs/Module/Cover_photo.php:433 ../../Zotlabs/Module/Wiki.php:406 msgid "Error getting album list" msgstr "" -#: ../../addon/hsse/hsse.php:143 ../../include/conversation.php:1374 +#: ../../addon/hsse/hsse.php:143 ../../include/conversation.php:1386 #: ../../Zotlabs/Module/Profile_photo.php:513 #: ../../Zotlabs/Module/Cover_photo.php:434 ../../Zotlabs/Module/Wiki.php:407 msgid "Error getting photo link" msgstr "" -#: ../../addon/hsse/hsse.php:144 ../../include/conversation.php:1375 +#: ../../addon/hsse/hsse.php:144 ../../include/conversation.php:1387 #: ../../Zotlabs/Module/Profile_photo.php:514 #: ../../Zotlabs/Module/Cover_photo.php:435 ../../Zotlabs/Module/Wiki.php:408 msgid "Error getting album" msgstr "" -#: ../../addon/hsse/hsse.php:145 ../../include/conversation.php:1376 +#: ../../addon/hsse/hsse.php:145 ../../include/conversation.php:1388 msgid "Comments enabled" msgstr "" -#: ../../addon/hsse/hsse.php:146 ../../include/conversation.php:1377 +#: ../../addon/hsse/hsse.php:146 ../../include/conversation.php:1389 msgid "Comments disabled" msgstr "" -#: ../../addon/hsse/hsse.php:153 ../../include/conversation.php:1387 +#: ../../addon/hsse/hsse.php:153 ../../include/conversation.php:1399 #: ../../Zotlabs/Module/Webpages.php:262 ../../Zotlabs/Module/Events.php:486 #: ../../Zotlabs/Module/Photos.php:1098 ../../Zotlabs/Lib/ThreadItem.php:835 msgid "Preview" msgstr "" -#: ../../addon/hsse/hsse.php:186 ../../include/conversation.php:1420 +#: ../../addon/hsse/hsse.php:186 ../../include/conversation.php:1432 #: ../../Zotlabs/Widget/Cdav.php:136 ../../Zotlabs/Module/Webpages.php:256 #: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1077 #: ../../Zotlabs/Module/Wiki.php:301 ../../Zotlabs/Module/Layouts.php:194 msgid "Share" msgstr "" -#: ../../addon/hsse/hsse.php:195 ../../include/conversation.php:1429 +#: ../../addon/hsse/hsse.php:195 ../../include/conversation.php:1441 msgid "Page link name" msgstr "" -#: ../../addon/hsse/hsse.php:198 ../../include/conversation.php:1432 +#: ../../addon/hsse/hsse.php:198 ../../include/conversation.php:1444 msgid "Post as" msgstr "" -#: ../../addon/hsse/hsse.php:200 ../../include/conversation.php:1434 +#: ../../addon/hsse/hsse.php:200 ../../include/conversation.php:1446 #: ../../Zotlabs/Lib/ThreadItem.php:826 msgid "Bold" msgstr "" -#: ../../addon/hsse/hsse.php:201 ../../include/conversation.php:1435 +#: ../../addon/hsse/hsse.php:201 ../../include/conversation.php:1447 #: ../../Zotlabs/Lib/ThreadItem.php:827 msgid "Italic" msgstr "" -#: ../../addon/hsse/hsse.php:202 ../../include/conversation.php:1436 +#: ../../addon/hsse/hsse.php:202 ../../include/conversation.php:1448 #: ../../Zotlabs/Lib/ThreadItem.php:828 msgid "Underline" msgstr "" -#: ../../addon/hsse/hsse.php:203 ../../include/conversation.php:1437 +#: ../../addon/hsse/hsse.php:203 ../../include/conversation.php:1449 #: ../../Zotlabs/Lib/ThreadItem.php:829 msgid "Quote" msgstr "" -#: ../../addon/hsse/hsse.php:204 ../../include/conversation.php:1438 +#: ../../addon/hsse/hsse.php:204 ../../include/conversation.php:1450 #: ../../Zotlabs/Lib/ThreadItem.php:830 msgid "Code" msgstr "" -#: ../../addon/hsse/hsse.php:205 ../../include/conversation.php:1439 +#: ../../addon/hsse/hsse.php:205 ../../include/conversation.php:1451 #: ../../Zotlabs/Lib/ThreadItem.php:832 msgid "Attach/Upload file" msgstr "" -#: ../../addon/hsse/hsse.php:208 ../../include/conversation.php:1442 +#: ../../addon/hsse/hsse.php:208 ../../include/conversation.php:1454 #: ../../Zotlabs/Module/Wiki.php:400 msgid "Embed an image from your albums" msgstr "" #: ../../addon/hsse/hsse.php:209 ../../addon/hsse/hsse.php:258 -#: ../../include/conversation.php:1443 ../../include/conversation.php:1496 +#: ../../include/conversation.php:1455 ../../include/conversation.php:1508 #: ../../Zotlabs/Module/Article_edit.php:130 #: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88 #: ../../Zotlabs/Module/Card_edit.php:131 ../../Zotlabs/Module/Oauth.php:112 @@ -1686,30 +1684,30 @@ msgstr "" #: ../../Zotlabs/Module/Cover_photo.php:428 #: ../../Zotlabs/Module/Profiles.php:803 ../../Zotlabs/Module/Oauth2.php:117 #: ../../Zotlabs/Module/Oauth2.php:145 ../../Zotlabs/Module/Wiki.php:368 -#: ../../Zotlabs/Module/Wiki.php:401 ../../Zotlabs/Module/Connedit.php:942 +#: ../../Zotlabs/Module/Wiki.php:401 ../../Zotlabs/Module/Connedit.php:944 msgid "Cancel" msgstr "" #: ../../addon/hsse/hsse.php:210 ../../addon/hsse/hsse.php:257 -#: ../../include/conversation.php:1444 ../../include/conversation.php:1495 +#: ../../include/conversation.php:1456 ../../include/conversation.php:1507 #: ../../Zotlabs/Module/Profile_photo.php:508 #: ../../Zotlabs/Module/Cover_photo.php:429 ../../Zotlabs/Module/Wiki.php:402 msgid "OK" msgstr "" -#: ../../addon/hsse/hsse.php:212 ../../include/conversation.php:1446 +#: ../../addon/hsse/hsse.php:212 ../../include/conversation.php:1458 msgid "Toggle voting" msgstr "" -#: ../../addon/hsse/hsse.php:215 ../../include/conversation.php:1453 +#: ../../addon/hsse/hsse.php:215 ../../include/conversation.php:1465 msgid "Disable comments" msgstr "" -#: ../../addon/hsse/hsse.php:216 ../../include/conversation.php:1454 +#: ../../addon/hsse/hsse.php:216 ../../include/conversation.php:1466 msgid "Toggle comments" msgstr "" -#: ../../addon/hsse/hsse.php:221 ../../include/conversation.php:1459 +#: ../../addon/hsse/hsse.php:221 ../../include/conversation.php:1471 #: ../../Zotlabs/Module/Article_edit.php:116 #: ../../Zotlabs/Module/Card_edit.php:117 #: ../../Zotlabs/Module/Editblock.php:129 ../../Zotlabs/Module/Photos.php:673 @@ -1717,30 +1715,30 @@ msgstr "" msgid "Title (optional)" msgstr "" -#: ../../addon/hsse/hsse.php:224 ../../include/conversation.php:1462 +#: ../../addon/hsse/hsse.php:224 ../../include/conversation.php:1474 msgid "Categories (optional, comma-separated list)" msgstr "" -#: ../../addon/hsse/hsse.php:225 ../../include/conversation.php:1463 +#: ../../addon/hsse/hsse.php:225 ../../include/conversation.php:1475 #: ../../Zotlabs/Module/Events.php:487 msgid "Permission settings" msgstr "" -#: ../../addon/hsse/hsse.php:247 ../../include/conversation.php:1485 +#: ../../addon/hsse/hsse.php:247 ../../include/conversation.php:1497 msgid "Other networks and post services" msgstr "" #: ../../addon/hsse/hsse.php:250 ../../addon/mail/Mod_Mail.php:170 -#: ../../addon/mail/Mod_Mail.php:313 ../../include/conversation.php:1488 +#: ../../addon/mail/Mod_Mail.php:313 ../../include/conversation.php:1500 msgid "Set expiration date" msgstr "" -#: ../../addon/hsse/hsse.php:253 ../../include/conversation.php:1491 +#: ../../addon/hsse/hsse.php:253 ../../include/conversation.php:1503 msgid "Set publish date" msgstr "" #: ../../addon/hsse/hsse.php:255 ../../addon/mail/Mod_Mail.php:172 -#: ../../addon/mail/Mod_Mail.php:315 ../../include/conversation.php:1493 +#: ../../addon/mail/Mod_Mail.php:315 ../../include/conversation.php:1505 #: ../../Zotlabs/Module/Chat.php:219 ../../Zotlabs/Lib/ThreadItem.php:839 msgid "Encrypt text" msgstr "" @@ -1855,39 +1853,37 @@ msgstr "" msgid "Enter some text" msgstr "" -#: ../../addon/pubcrawl/as.php:1134 ../../include/cdav.php:158 +#: ../../addon/pubcrawl/as.php:1135 ../../include/cdav.php:158 #: ../../include/cdav.php:159 ../../include/cdav.php:167 -#: ../../include/conversation.php:1196 ../../Zotlabs/Widget/Album.php:84 +#: ../../include/conversation.php:1208 ../../Zotlabs/Widget/Album.php:84 #: ../../Zotlabs/Widget/Pinned.php:270 ../../Zotlabs/Widget/Portfolio.php:95 #: ../../Zotlabs/Module/Embedphotos.php:176 ../../Zotlabs/Module/Photos.php:792 -#: ../../Zotlabs/Module/Photos.php:1254 ../../Zotlabs/Lib/Activity.php:1458 +#: ../../Zotlabs/Module/Photos.php:1254 ../../Zotlabs/Lib/Activity.php:1492 #: ../../Zotlabs/Lib/Apps.php:1112 ../../Zotlabs/Lib/Apps.php:1196 #: ../../Zotlabs/Storage/Browser.php:164 msgid "Unknown" msgstr "" -#: ../../addon/pubcrawl/as.php:1428 ../../addon/pubcrawl/as.php:1662 -#: ../../addon/pubcrawl/as.php:1856 ../../include/network.php:1735 -#: ../../Zotlabs/Lib/Activity.php:2742 ../../Zotlabs/Lib/Activity.php:2936 +#: ../../addon/pubcrawl/as.php:1429 ../../addon/pubcrawl/as.php:1679 +#: ../../addon/pubcrawl/as.php:1887 ../../include/network.php:1735 +#: ../../Zotlabs/Lib/Activity.php:2803 ../../Zotlabs/Lib/Activity.php:2997 msgid "ActivityPub" msgstr "" -#: ../../addon/pubcrawl/as.php:1810 ../../addon/diaspora/Receiver.php:1597 -#: ../../include/text.php:2239 ../../include/conversation.php:146 +#: ../../addon/pubcrawl/as.php:1841 ../../addon/diaspora/Receiver.php:1597 #: ../../Zotlabs/Module/Like.php:386 ../../Zotlabs/Module/Subthread.php:112 -#: ../../Zotlabs/Lib/Activity.php:2892 msgid "status" msgstr "" -#: ../../addon/pubcrawl/as.php:1847 ../../addon/diaspora/Receiver.php:1537 -#: ../../include/conversation.php:162 ../../Zotlabs/Module/Like.php:422 -#: ../../Zotlabs/Lib/Activity.php:2927 +#: ../../addon/pubcrawl/as.php:1878 ../../addon/diaspora/Receiver.php:1537 +#: ../../include/conversation.php:174 ../../Zotlabs/Module/Like.php:422 +#: ../../Zotlabs/Lib/Activity.php:2988 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "" -#: ../../addon/pubcrawl/as.php:1849 ../../include/conversation.php:165 -#: ../../Zotlabs/Module/Like.php:424 ../../Zotlabs/Lib/Activity.php:2929 +#: ../../addon/pubcrawl/as.php:1880 ../../include/conversation.php:177 +#: ../../Zotlabs/Module/Like.php:424 ../../Zotlabs/Lib/Activity.php:2990 #, php-format msgid "%1$s doesn't like %2$s's %3$s" msgstr "" @@ -2182,7 +2178,7 @@ msgstr "" #: ../../Zotlabs/Module/Cdav.php:1368 ../../Zotlabs/Module/Sharedwithme.php:106 #: ../../Zotlabs/Module/Admin/Channels.php:159 #: ../../Zotlabs/Module/Oauth2.php:118 ../../Zotlabs/Module/Oauth2.php:146 -#: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Module/Connedit.php:924 +#: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Module/Connedit.php:926 #: ../../Zotlabs/Lib/NativeWikiPage.php:564 #: ../../Zotlabs/Storage/Browser.php:291 msgid "Name" @@ -2190,7 +2186,7 @@ msgstr "" #: ../../addon/rendezvous/rendezvous.php:173 #: ../../addon/cart/submodules/hzservices.php:655 -#: ../../addon/cart/submodules/manualcat.php:264 +#: ../../addon/cart/submodules/manualcat.php:260 #: ../../Zotlabs/Module/Cdav.php:1010 ../../Zotlabs/Module/Events.php:481 #: ../../Zotlabs/Module/Appman.php:145 ../../Zotlabs/Module/Rbmark.php:101 msgid "Description" @@ -2646,7 +2642,7 @@ msgstr "" #: ../../addon/cart/widgets/catalogitem.php:57 #: ../../addon/cart/submodules/hzservices.php:658 -#: ../../addon/cart/submodules/manualcat.php:267 +#: ../../addon/cart/submodules/manualcat.php:263 msgid "Price" msgstr "" @@ -2661,7 +2657,7 @@ msgstr "" #: ../../addon/cart/manual_payments.php:68 #: ../../addon/cart/submodules/paypalbutton.php:392 #: ../../addon/cart/submodules/paypalbuttonV2.php:409 -#: ../../addon/cart/cart.php:1463 +#: ../../addon/cart/cart.php:1578 msgid "Order not found." msgstr "" @@ -2672,7 +2668,7 @@ msgstr "" #: ../../addon/cart/manual_payments.php:93 #: ../../addon/cart/submodules/paypalbutton.php:456 #: ../../addon/cart/submodules/paypalbuttonV2.php:478 -#: ../../addon/cart/myshop.php:37 ../../addon/cart/cart.php:1441 +#: ../../addon/cart/myshop.php:37 ../../addon/cart/cart.php:1556 #: ../../Zotlabs/Module/Wiki.php:77 msgid "Invalid channel" msgstr "" @@ -2727,12 +2723,12 @@ msgid "Enable Hubzilla Services Module" msgstr "" #: ../../addon/cart/submodules/hzservices.php:162 -#: ../../addon/cart/submodules/manualcat.php:176 +#: ../../addon/cart/submodules/manualcat.php:172 msgid "New Sku" msgstr "" #: ../../addon/cart/submodules/hzservices.php:197 -#: ../../addon/cart/submodules/manualcat.php:212 +#: ../../addon/cart/submodules/manualcat.php:208 msgid "Cannot save edits to locked item." msgstr "" @@ -2764,17 +2760,17 @@ msgid "You must be using a local account to purchase this service." msgstr "" #: ../../addon/cart/submodules/hzservices.php:647 -#: ../../addon/cart/submodules/manualcat.php:256 +#: ../../addon/cart/submodules/manualcat.php:252 msgid "Changes Locked" msgstr "" #: ../../addon/cart/submodules/hzservices.php:651 -#: ../../addon/cart/submodules/manualcat.php:260 +#: ../../addon/cart/submodules/manualcat.php:256 msgid "Item available for purchase." msgstr "" #: ../../addon/cart/submodules/hzservices.php:661 -#: ../../addon/cart/submodules/manualcat.php:270 +#: ../../addon/cart/submodules/manualcat.php:266 msgid "Photo URL" msgstr "" @@ -2873,12 +2869,12 @@ msgstr "" msgid "Access Denied." msgstr "" -#: ../../addon/cart/myshop.php:111 ../../addon/cart/cart.php:1331 +#: ../../addon/cart/myshop.php:112 ../../addon/cart/cart.php:1446 msgid "Order Not Found" msgstr "" -#: ../../addon/cart/myshop.php:186 ../../addon/cart/myshop.php:220 -#: ../../addon/cart/myshop.php:269 ../../addon/cart/myshop.php:327 +#: ../../addon/cart/myshop.php:189 ../../addon/cart/myshop.php:223 +#: ../../addon/cart/myshop.php:271 ../../addon/cart/myshop.php:329 msgid "Invalid Item" msgstr "" @@ -2894,68 +2890,68 @@ msgstr "" msgid "Base Merchant Currency" msgstr "" -#: ../../addon/cart/Settings/Cart.php:129 ../../addon/cart/cart.php:1260 +#: ../../addon/cart/Settings/Cart.php:129 ../../addon/cart/cart.php:1375 msgid "Cart Settings" msgstr "" -#: ../../addon/cart/cart.php:153 +#: ../../addon/cart/cart.php:252 msgid "DB Cleanup Failure" msgstr "" -#: ../../addon/cart/cart.php:559 +#: ../../addon/cart/cart.php:674 msgid "[cart] Item Added" msgstr "" -#: ../../addon/cart/cart.php:948 +#: ../../addon/cart/cart.php:1063 msgid "Order already checked out." msgstr "" -#: ../../addon/cart/cart.php:1253 +#: ../../addon/cart/cart.php:1368 msgid "Drop database tables when uninstalling." msgstr "" -#: ../../addon/cart/cart.php:1272 ../../addon/cart/cart.php:1275 +#: ../../addon/cart/cart.php:1387 ../../addon/cart/cart.php:1390 msgid "Shop" msgstr "" -#: ../../addon/cart/cart.php:1295 ../../addon/flashcards/Mod_Flashcards.php:51 +#: ../../addon/cart/cart.php:1410 ../../addon/flashcards/Mod_Flashcards.php:51 #: ../../Zotlabs/Module/Wiki.php:35 msgid "Profile Unavailable." msgstr "" -#: ../../addon/cart/cart.php:1392 +#: ../../addon/cart/cart.php:1507 msgid "Cart utilities for orders and payments" msgstr "" -#: ../../addon/cart/cart.php:1430 +#: ../../addon/cart/cart.php:1545 msgid "You must be logged into the Grid to shop." msgstr "" -#: ../../addon/cart/cart.php:1471 +#: ../../addon/cart/cart.php:1592 msgid "Access denied." msgstr "" -#: ../../addon/cart/cart.php:1523 ../../addon/cart/cart.php:1666 +#: ../../addon/cart/cart.php:1644 ../../addon/cart/cart.php:1787 msgid "No Order Found" msgstr "" -#: ../../addon/cart/cart.php:1532 +#: ../../addon/cart/cart.php:1653 msgid "An unknown error has occurred Please start again." msgstr "" -#: ../../addon/cart/cart.php:1675 +#: ../../addon/cart/cart.php:1796 msgid "Requirements not met." msgstr "" -#: ../../addon/cart/cart.php:1675 +#: ../../addon/cart/cart.php:1796 msgid "Review your order and complete any needed requirements." msgstr "" -#: ../../addon/cart/cart.php:1701 +#: ../../addon/cart/cart.php:1822 msgid "Invalid Payment Type. Please start again." msgstr "" -#: ../../addon/cart/cart.php:1708 +#: ../../addon/cart/cart.php:1829 msgid "Order not found" msgstr "" @@ -3155,7 +3151,7 @@ msgstr "" msgid "This channel" msgstr "" -#: ../../addon/workflow/workflow.php:285 ../../Zotlabs/Module/Locs.php:119 +#: ../../addon/workflow/workflow.php:285 ../../Zotlabs/Module/Locs.php:123 msgid "Primary" msgstr "" @@ -3187,7 +3183,7 @@ msgstr "" #: ../../addon/workflow/workflow.php:2617 #: ../../addon/workflow/workflow.php:2678 ../../Zotlabs/Module/Cdav.php:1370 -#: ../../Zotlabs/Module/Connedit.php:926 +#: ../../Zotlabs/Module/Connedit.php:928 msgid "Title" msgstr "" @@ -3406,10 +3402,10 @@ msgid "Not allowed." msgstr "" #: ../../addon/flashcards/Mod_Flashcards.php:254 -#: ../../include/acl_selectors.php:123 ../../Zotlabs/Module/Chat.php:241 +#: ../../include/acl_selectors.php:144 ../../Zotlabs/Module/Chat.php:241 #: ../../Zotlabs/Module/Filestorage.php:190 ../../Zotlabs/Module/Photos.php:677 #: ../../Zotlabs/Module/Photos.php:1046 ../../Zotlabs/Module/Thing.php:321 -#: ../../Zotlabs/Module/Thing.php:374 ../../Zotlabs/Module/Connedit.php:691 +#: ../../Zotlabs/Module/Thing.php:374 ../../Zotlabs/Module/Connedit.php:693 msgid "Permissions" msgstr "" @@ -3419,12 +3415,12 @@ msgid "Set/edit permissions" msgstr "" #: ../../addon/flashcards/Mod_Flashcards.php:284 -#: ../../addon/flashcards/Mod_Flashcards.php:285 ../../include/items.php:3888 +#: ../../addon/flashcards/Mod_Flashcards.php:285 ../../include/items.php:3889 #: ../../Zotlabs/Module/Filestorage.php:26 #: ../../Zotlabs/Module/Admin/Themes.php:72 #: ../../Zotlabs/Module/Admin/Addons.php:260 #: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:45 -#: ../../Zotlabs/Module/Display.php:460 ../../Zotlabs/Module/Admin.php:62 +#: ../../Zotlabs/Module/Display.php:446 ../../Zotlabs/Module/Admin.php:62 #: ../../Zotlabs/Module/Thing.php:96 msgid "Item not found." msgstr "" @@ -3888,7 +3884,7 @@ msgstr "" msgid "Posted by" msgstr "" -#: ../../addon/mdpost/mdpost.php:41 ../../include/text.php:2097 +#: ../../addon/mdpost/mdpost.php:41 ../../include/text.php:2116 #: ../../Zotlabs/Widget/Wiki_pages.php:38 #: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../Zotlabs/Module/Wiki.php:217 #: ../../Zotlabs/Module/Wiki.php:371 @@ -4008,20 +4004,20 @@ msgstr "" msgid "XMPP Settings" msgstr "" -#: ../../include/zot.php:773 +#: ../../include/zot.php:775 msgid "Invalid data packet" msgstr "" -#: ../../include/zot.php:800 ../../Zotlabs/Lib/Libzot.php:652 +#: ../../include/zot.php:802 ../../Zotlabs/Lib/Libzot.php:656 msgid "Unable to verify channel signature" msgstr "" -#: ../../include/zot.php:2627 ../../Zotlabs/Lib/Libsync.php:740 +#: ../../include/zot.php:2657 ../../Zotlabs/Lib/Libsync.php:740 #, php-format msgid "Unable to verify site signature for %s" msgstr "" -#: ../../include/zot.php:4342 +#: ../../include/zot.php:4372 msgid "invalid target signature" msgstr "" @@ -4049,52 +4045,52 @@ msgstr "" msgid "newer" msgstr "" -#: ../../include/text.php:1005 +#: ../../include/text.php:1024 msgid "No connections" msgstr "" -#: ../../include/text.php:1017 ../../include/features.php:133 +#: ../../include/text.php:1036 ../../include/features.php:133 #: ../../Zotlabs/Module/Connections.php:374 ../../Zotlabs/Lib/Apps.php:333 msgid "Connections" msgstr "" -#: ../../include/text.php:1025 ../../Zotlabs/Module/Viewconnections.php:80 +#: ../../include/text.php:1044 ../../Zotlabs/Module/Viewconnections.php:80 #: ../../Zotlabs/Module/Connections.php:288 msgid "Accepts" msgstr "" -#: ../../include/text.php:1028 ../../Zotlabs/Module/Viewconnections.php:83 +#: ../../include/text.php:1047 ../../Zotlabs/Module/Viewconnections.php:83 #: ../../Zotlabs/Module/Connections.php:291 msgid "Comments" msgstr "" -#: ../../include/text.php:1033 ../../Zotlabs/Module/Viewconnections.php:88 +#: ../../include/text.php:1052 ../../Zotlabs/Module/Viewconnections.php:88 #: ../../Zotlabs/Module/Connections.php:296 msgid "Stream items" msgstr "" -#: ../../include/text.php:1038 ../../Zotlabs/Module/Viewconnections.php:93 +#: ../../include/text.php:1057 ../../Zotlabs/Module/Viewconnections.php:93 #: ../../Zotlabs/Module/Connections.php:301 msgid "Wall posts" msgstr "" -#: ../../include/text.php:1042 ../../Zotlabs/Module/Viewconnections.php:97 +#: ../../include/text.php:1061 ../../Zotlabs/Module/Viewconnections.php:97 #: ../../Zotlabs/Module/Connections.php:305 msgid "Nothing" msgstr "" -#: ../../include/text.php:1057 +#: ../../include/text.php:1076 #, php-format msgid "View all %s connections" msgstr "" -#: ../../include/text.php:1120 +#: ../../include/text.php:1139 #, php-format msgid "Network: %s" msgstr "" -#: ../../include/text.php:1131 ../../include/text.php:1143 -#: ../../include/nav.php:188 ../../include/acl_selectors.php:118 +#: ../../include/text.php:1150 ../../include/text.php:1162 +#: ../../include/nav.php:188 ../../include/acl_selectors.php:139 #: ../../Zotlabs/Widget/Sitesearch.php:31 #: ../../Zotlabs/Widget/Activity_filter.php:193 #: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:378 @@ -4102,406 +4098,412 @@ msgstr "" msgid "Search" msgstr "" -#: ../../include/text.php:1223 ../../include/text.php:1227 +#: ../../include/text.php:1242 ../../include/text.php:1246 msgid "poke" msgstr "" -#: ../../include/text.php:1223 ../../include/text.php:1227 -#: ../../include/conversation.php:255 +#: ../../include/text.php:1242 ../../include/text.php:1246 +#: ../../include/conversation.php:267 msgid "poked" msgstr "" -#: ../../include/text.php:1228 +#: ../../include/text.php:1247 msgid "ping" msgstr "" -#: ../../include/text.php:1228 +#: ../../include/text.php:1247 msgid "pinged" msgstr "" -#: ../../include/text.php:1229 +#: ../../include/text.php:1248 msgid "prod" msgstr "" -#: ../../include/text.php:1229 +#: ../../include/text.php:1248 msgid "prodded" msgstr "" -#: ../../include/text.php:1230 +#: ../../include/text.php:1249 msgid "slap" msgstr "" -#: ../../include/text.php:1230 +#: ../../include/text.php:1249 msgid "slapped" msgstr "" -#: ../../include/text.php:1231 +#: ../../include/text.php:1250 msgid "finger" msgstr "" -#: ../../include/text.php:1231 +#: ../../include/text.php:1250 msgid "fingered" msgstr "" -#: ../../include/text.php:1232 +#: ../../include/text.php:1251 msgid "rebuff" msgstr "" -#: ../../include/text.php:1232 +#: ../../include/text.php:1251 msgid "rebuffed" msgstr "" -#: ../../include/text.php:1255 +#: ../../include/text.php:1274 msgid "happy" msgstr "" -#: ../../include/text.php:1256 +#: ../../include/text.php:1275 msgid "sad" msgstr "" -#: ../../include/text.php:1257 +#: ../../include/text.php:1276 msgid "mellow" msgstr "" -#: ../../include/text.php:1258 +#: ../../include/text.php:1277 msgid "tired" msgstr "" -#: ../../include/text.php:1259 +#: ../../include/text.php:1278 msgid "perky" msgstr "" -#: ../../include/text.php:1260 +#: ../../include/text.php:1279 msgid "angry" msgstr "" -#: ../../include/text.php:1261 +#: ../../include/text.php:1280 msgid "stupefied" msgstr "" -#: ../../include/text.php:1262 +#: ../../include/text.php:1281 msgid "puzzled" msgstr "" -#: ../../include/text.php:1263 +#: ../../include/text.php:1282 msgid "interested" msgstr "" -#: ../../include/text.php:1264 +#: ../../include/text.php:1283 msgid "bitter" msgstr "" -#: ../../include/text.php:1265 +#: ../../include/text.php:1284 msgid "cheerful" msgstr "" -#: ../../include/text.php:1266 +#: ../../include/text.php:1285 msgid "alive" msgstr "" -#: ../../include/text.php:1267 +#: ../../include/text.php:1286 msgid "annoyed" msgstr "" -#: ../../include/text.php:1268 +#: ../../include/text.php:1287 msgid "anxious" msgstr "" -#: ../../include/text.php:1269 +#: ../../include/text.php:1288 msgid "cranky" msgstr "" -#: ../../include/text.php:1270 +#: ../../include/text.php:1289 msgid "disturbed" msgstr "" -#: ../../include/text.php:1271 +#: ../../include/text.php:1290 msgid "frustrated" msgstr "" -#: ../../include/text.php:1272 +#: ../../include/text.php:1291 msgid "depressed" msgstr "" -#: ../../include/text.php:1273 +#: ../../include/text.php:1292 msgid "motivated" msgstr "" -#: ../../include/text.php:1274 +#: ../../include/text.php:1293 msgid "relaxed" msgstr "" -#: ../../include/text.php:1275 +#: ../../include/text.php:1294 msgid "surprised" msgstr "" -#: ../../include/text.php:1463 ../../include/js_strings.php:99 +#: ../../include/text.php:1482 ../../include/js_strings.php:99 msgid "Monday" msgstr "" -#: ../../include/text.php:1463 ../../include/js_strings.php:100 +#: ../../include/text.php:1482 ../../include/js_strings.php:100 msgid "Tuesday" msgstr "" -#: ../../include/text.php:1463 ../../include/js_strings.php:101 +#: ../../include/text.php:1482 ../../include/js_strings.php:101 msgid "Wednesday" msgstr "" -#: ../../include/text.php:1463 ../../include/js_strings.php:102 +#: ../../include/text.php:1482 ../../include/js_strings.php:102 msgid "Thursday" msgstr "" -#: ../../include/text.php:1463 ../../include/js_strings.php:103 +#: ../../include/text.php:1482 ../../include/js_strings.php:103 msgid "Friday" msgstr "" -#: ../../include/text.php:1463 ../../include/js_strings.php:104 +#: ../../include/text.php:1482 ../../include/js_strings.php:104 msgid "Saturday" msgstr "" -#: ../../include/text.php:1463 ../../include/js_strings.php:98 +#: ../../include/text.php:1482 ../../include/js_strings.php:98 msgid "Sunday" msgstr "" -#: ../../include/text.php:1467 ../../include/js_strings.php:74 +#: ../../include/text.php:1486 ../../include/js_strings.php:74 msgid "January" msgstr "" -#: ../../include/text.php:1467 ../../include/js_strings.php:75 +#: ../../include/text.php:1486 ../../include/js_strings.php:75 msgid "February" msgstr "" -#: ../../include/text.php:1467 ../../include/js_strings.php:76 +#: ../../include/text.php:1486 ../../include/js_strings.php:76 msgid "March" msgstr "" -#: ../../include/text.php:1467 ../../include/js_strings.php:77 +#: ../../include/text.php:1486 ../../include/js_strings.php:77 msgid "April" msgstr "" -#: ../../include/text.php:1467 +#: ../../include/text.php:1486 msgid "May" msgstr "" -#: ../../include/text.php:1467 ../../include/js_strings.php:79 +#: ../../include/text.php:1486 ../../include/js_strings.php:79 msgid "June" msgstr "" -#: ../../include/text.php:1467 ../../include/js_strings.php:80 +#: ../../include/text.php:1486 ../../include/js_strings.php:80 msgid "July" msgstr "" -#: ../../include/text.php:1467 ../../include/js_strings.php:81 +#: ../../include/text.php:1486 ../../include/js_strings.php:81 msgid "August" msgstr "" -#: ../../include/text.php:1467 ../../include/js_strings.php:82 +#: ../../include/text.php:1486 ../../include/js_strings.php:82 msgid "September" msgstr "" -#: ../../include/text.php:1467 ../../include/js_strings.php:83 +#: ../../include/text.php:1486 ../../include/js_strings.php:83 msgid "October" msgstr "" -#: ../../include/text.php:1467 ../../include/js_strings.php:84 +#: ../../include/text.php:1486 ../../include/js_strings.php:84 msgid "November" msgstr "" -#: ../../include/text.php:1467 ../../include/js_strings.php:85 +#: ../../include/text.php:1486 ../../include/js_strings.php:85 msgid "December" msgstr "" -#: ../../include/text.php:1541 +#: ../../include/text.php:1560 msgid "Unknown Attachment" msgstr "" -#: ../../include/text.php:1543 ../../Zotlabs/Module/Sharedwithme.php:108 +#: ../../include/text.php:1562 ../../Zotlabs/Module/Sharedwithme.php:108 #: ../../Zotlabs/Storage/Browser.php:293 msgid "Size" msgstr "" -#: ../../include/text.php:1543 ../../include/feedutils.php:871 +#: ../../include/text.php:1562 ../../include/feedutils.php:871 msgid "unknown" msgstr "" -#: ../../include/text.php:1579 +#: ../../include/text.php:1598 msgid "remove category" msgstr "" -#: ../../include/text.php:1655 +#: ../../include/text.php:1674 msgid "remove from file" msgstr "" -#: ../../include/text.php:1824 ../../include/message.php:13 +#: ../../include/text.php:1843 ../../include/message.php:13 msgid "Download binary/encrypted content" msgstr "" -#: ../../include/text.php:1895 +#: ../../include/text.php:1914 msgid "Poll has ended." msgstr "" -#: ../../include/text.php:1898 +#: ../../include/text.php:1917 #, php-format msgid "Poll ends: %s" msgstr "" -#: ../../include/text.php:1903 ../../Zotlabs/Lib/ThreadItem.php:444 +#: ../../include/text.php:1922 ../../Zotlabs/Lib/ThreadItem.php:444 msgid "Vote" msgstr "" -#: ../../include/text.php:2055 ../../Zotlabs/Module/Events.php:669 +#: ../../include/text.php:2074 ../../Zotlabs/Module/Events.php:669 msgid "Link to Source" msgstr "" -#: ../../include/text.php:2077 ../../include/language.php:424 +#: ../../include/text.php:2096 ../../include/language.php:424 msgid "default" msgstr "" -#: ../../include/text.php:2085 +#: ../../include/text.php:2104 msgid "Page layout" msgstr "" -#: ../../include/text.php:2085 +#: ../../include/text.php:2104 msgid "You can create your own with the layouts tool" msgstr "" -#: ../../include/text.php:2095 ../../Zotlabs/Widget/Wiki_pages.php:38 +#: ../../include/text.php:2114 ../../Zotlabs/Widget/Wiki_pages.php:38 #: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../Zotlabs/Module/Wiki.php:217 #: ../../Zotlabs/Module/Wiki.php:371 msgid "BBcode" msgstr "" -#: ../../include/text.php:2096 +#: ../../include/text.php:2115 msgid "HTML" msgstr "" -#: ../../include/text.php:2098 ../../Zotlabs/Widget/Wiki_pages.php:38 +#: ../../include/text.php:2117 ../../Zotlabs/Widget/Wiki_pages.php:38 #: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../Zotlabs/Module/Wiki.php:217 msgid "Text" msgstr "" -#: ../../include/text.php:2099 +#: ../../include/text.php:2118 msgid "Comanche Layout" msgstr "" -#: ../../include/text.php:2104 +#: ../../include/text.php:2123 msgid "PHP" msgstr "" -#: ../../include/text.php:2113 +#: ../../include/text.php:2132 msgid "Page content type" msgstr "" -#: ../../include/text.php:2236 ../../include/event.php:1259 -#: ../../include/conversation.php:121 +#: ../../include/text.php:2255 ../../include/event.php:1259 +#: ../../include/conversation.php:132 #: ../../Zotlabs/Module/Channel_calendar.php:219 #: ../../Zotlabs/Module/Like.php:388 ../../Zotlabs/Module/Tagger.php:75 #: ../../Zotlabs/Module/Events.php:266 msgid "event" msgstr "" -#: ../../include/text.php:2241 ../../include/conversation.php:148 +#: ../../include/text.php:2258 ../../include/conversation.php:158 +#: ../../include/bbcode.php:523 ../../include/markdown.php:204 +#: ../../Zotlabs/Module/Tagger.php:79 ../../Zotlabs/Lib/Activity.php:2953 +msgid "post" +msgstr "" + +#: ../../include/text.php:2260 ../../include/conversation.php:160 #: ../../Zotlabs/Module/Tagger.php:81 msgid "comment" msgstr "" -#: ../../include/text.php:2246 +#: ../../include/text.php:2265 msgid "activity" msgstr "" -#: ../../include/text.php:2249 +#: ../../include/text.php:2268 msgid "poll" msgstr "" -#: ../../include/text.php:2350 +#: ../../include/text.php:2369 msgid "a-z, 0-9, -, and _ only" msgstr "" -#: ../../include/text.php:2676 +#: ../../include/text.php:2695 msgid "Design Tools" msgstr "" -#: ../../include/text.php:2679 ../../Zotlabs/Module/Blocks.php:154 +#: ../../include/text.php:2698 ../../Zotlabs/Module/Blocks.php:154 msgid "Blocks" msgstr "" -#: ../../include/text.php:2680 ../../Zotlabs/Module/Menu.php:171 +#: ../../include/text.php:2699 ../../Zotlabs/Module/Menu.php:171 msgid "Menus" msgstr "" -#: ../../include/text.php:2681 ../../Zotlabs/Module/Layouts.php:184 +#: ../../include/text.php:2700 ../../Zotlabs/Module/Layouts.php:184 msgid "Layouts" msgstr "" -#: ../../include/text.php:2682 +#: ../../include/text.php:2701 msgid "Pages" msgstr "" -#: ../../include/text.php:2694 +#: ../../include/text.php:2713 msgid "Import" msgstr "" -#: ../../include/text.php:2695 +#: ../../include/text.php:2714 msgid "Import website..." msgstr "" -#: ../../include/text.php:2696 +#: ../../include/text.php:2715 msgid "Select folder to import" msgstr "" -#: ../../include/text.php:2697 +#: ../../include/text.php:2716 msgid "Import from a zipped folder:" msgstr "" -#: ../../include/text.php:2698 +#: ../../include/text.php:2717 msgid "Import from cloud files:" msgstr "" -#: ../../include/text.php:2699 +#: ../../include/text.php:2718 msgid "/cloud/channel/path/to/folder" msgstr "" -#: ../../include/text.php:2700 +#: ../../include/text.php:2719 msgid "Enter path to website files" msgstr "" -#: ../../include/text.php:2701 +#: ../../include/text.php:2720 msgid "Select folder" msgstr "" -#: ../../include/text.php:2702 +#: ../../include/text.php:2721 msgid "Export website..." msgstr "" -#: ../../include/text.php:2703 +#: ../../include/text.php:2722 msgid "Export to a zip file" msgstr "" -#: ../../include/text.php:2704 +#: ../../include/text.php:2723 msgid "website.zip" msgstr "" -#: ../../include/text.php:2705 +#: ../../include/text.php:2724 msgid "Enter a name for the zip file." msgstr "" -#: ../../include/text.php:2706 +#: ../../include/text.php:2725 msgid "Export to cloud files" msgstr "" -#: ../../include/text.php:2707 +#: ../../include/text.php:2726 msgid "/path/to/export/folder" msgstr "" -#: ../../include/text.php:2708 +#: ../../include/text.php:2727 msgid "Enter a path to a cloud files destination." msgstr "" -#: ../../include/text.php:2709 +#: ../../include/text.php:2728 msgid "Specify folder" msgstr "" -#: ../../include/text.php:3082 ../../Zotlabs/Storage/Browser.php:131 +#: ../../include/text.php:3101 ../../Zotlabs/Storage/Browser.php:131 msgid "Collection" msgstr "" @@ -4523,7 +4525,7 @@ msgid "Finishes:" msgstr "" #: ../../include/event.php:63 ../../include/event.php:134 -#: ../../include/channel.php:1618 ../../Zotlabs/Module/Directory.php:352 +#: ../../include/channel.php:1619 ../../Zotlabs/Module/Directory.php:352 msgid "Location:" msgstr "" @@ -4563,46 +4565,46 @@ msgstr "" msgid "Cancelled" msgstr "" -#: ../../include/event.php:1422 ../../include/connections.php:728 +#: ../../include/event.php:1422 ../../include/connections.php:733 #: ../../Zotlabs/Module/Cdav.php:1377 ../../Zotlabs/Module/Profiles.php:794 -#: ../../Zotlabs/Module/Connedit.php:933 +#: ../../Zotlabs/Module/Connedit.php:935 msgid "Mobile" msgstr "" -#: ../../include/event.php:1423 ../../include/connections.php:729 +#: ../../include/event.php:1423 ../../include/connections.php:734 #: ../../Zotlabs/Module/Cdav.php:1378 ../../Zotlabs/Module/Profiles.php:795 -#: ../../Zotlabs/Module/Connedit.php:934 +#: ../../Zotlabs/Module/Connedit.php:936 msgid "Home" msgstr "" -#: ../../include/event.php:1424 ../../include/connections.php:730 +#: ../../include/event.php:1424 ../../include/connections.php:735 msgid "Home, Voice" msgstr "" -#: ../../include/event.php:1425 ../../include/connections.php:731 +#: ../../include/event.php:1425 ../../include/connections.php:736 msgid "Home, Fax" msgstr "" -#: ../../include/event.php:1426 ../../include/connections.php:732 +#: ../../include/event.php:1426 ../../include/connections.php:737 #: ../../Zotlabs/Module/Cdav.php:1379 ../../Zotlabs/Module/Profiles.php:796 -#: ../../Zotlabs/Module/Connedit.php:935 +#: ../../Zotlabs/Module/Connedit.php:937 msgid "Work" msgstr "" -#: ../../include/event.php:1427 ../../include/connections.php:733 +#: ../../include/event.php:1427 ../../include/connections.php:738 msgid "Work, Voice" msgstr "" -#: ../../include/event.php:1428 ../../include/connections.php:734 +#: ../../include/event.php:1428 ../../include/connections.php:739 msgid "Work, Fax" msgstr "" #: ../../include/event.php:1429 ../../include/event.php:1436 #: ../../include/selectors.php:60 ../../include/selectors.php:77 #: ../../include/selectors.php:115 ../../include/selectors.php:151 -#: ../../include/connections.php:735 ../../include/connections.php:742 +#: ../../include/connections.php:740 ../../include/connections.php:747 #: ../../Zotlabs/Module/Cdav.php:1380 ../../Zotlabs/Module/Profiles.php:797 -#: ../../Zotlabs/Module/Connedit.php:936 +#: ../../Zotlabs/Module/Connedit.php:938 #: ../../Zotlabs/Access/PermissionRoles.php:310 msgid "Other" msgstr "" @@ -4997,7 +4999,7 @@ msgid "Rate This Channel (this is public)" msgstr "" #: ../../include/js_strings.php:20 ../../Zotlabs/Module/Rate.php:155 -#: ../../Zotlabs/Module/Connedit.php:888 +#: ../../Zotlabs/Module/Connedit.php:890 msgid "Rating" msgstr "" @@ -5016,7 +5018,7 @@ msgstr "" #: ../../include/js_strings.php:25 ../../Zotlabs/Module/Pubsites.php:52 #: ../../Zotlabs/Module/Cdav.php:1011 ../../Zotlabs/Module/Events.php:483 #: ../../Zotlabs/Module/Profiles.php:511 ../../Zotlabs/Module/Profiles.php:736 -#: ../../Zotlabs/Module/Locs.php:117 +#: ../../Zotlabs/Module/Locs.php:121 msgid "Location" msgstr "" @@ -5283,9 +5285,9 @@ msgstr "" msgid "Not Found" msgstr "" -#: ../../include/help.php:132 ../../Zotlabs/Module/Display.php:140 -#: ../../Zotlabs/Module/Display.php:157 ../../Zotlabs/Module/Display.php:177 -#: ../../Zotlabs/Module/Display.php:183 ../../Zotlabs/Module/Page.php:136 +#: ../../include/help.php:132 ../../Zotlabs/Module/Display.php:139 +#: ../../Zotlabs/Module/Display.php:156 ../../Zotlabs/Module/Display.php:176 +#: ../../Zotlabs/Module/Display.php:182 ../../Zotlabs/Module/Page.php:136 #: ../../Zotlabs/Module/Block.php:77 ../../Zotlabs/Lib/NativeWikiPage.php:521 #: ../../Zotlabs/Web/Router.php:185 msgid "Page not found." @@ -5402,7 +5404,8 @@ msgid_plural "%d invitations available" msgstr[0] "" msgstr[1] "" -#: ../../include/contact_widgets.php:16 ../../Zotlabs/Module/Admin/Site.php:291 +#: ../../include/contact_widgets.php:16 ../../include/acl_selectors.php:135 +#: ../../Zotlabs/Module/Admin/Site.php:291 msgid "Advanced" msgstr "" @@ -5503,6 +5506,7 @@ msgid "Manage your channels" msgstr "" #: ../../include/nav.php:101 ../../include/group.php:321 +#: ../../include/acl_selectors.php:87 #: ../../Zotlabs/Widget/Activity_filter.php:82 #: ../../Zotlabs/Module/Group.php:142 ../../Zotlabs/Module/Group.php:154 #: ../../Zotlabs/Lib/Group.php:324 ../../Zotlabs/Lib/Apps.php:364 @@ -5537,7 +5541,7 @@ msgstr "" msgid "Your profile page" msgstr "" -#: ../../include/nav.php:115 ../../include/channel.php:1523 +#: ../../include/nav.php:115 ../../include/channel.php:1524 #: ../../Zotlabs/Module/Profiles.php:832 msgid "Edit Profiles" msgstr "" @@ -5595,7 +5599,7 @@ msgstr "" #: ../../include/nav.php:324 ../../Zotlabs/Widget/Notifications.php:182 #: ../../Zotlabs/Module/New_channel.php:157 #: ../../Zotlabs/Module/New_channel.php:164 -#: ../../Zotlabs/Module/Defperms.php:257 ../../Zotlabs/Module/Connedit.php:870 +#: ../../Zotlabs/Module/Defperms.php:257 ../../Zotlabs/Module/Connedit.php:872 msgid "Loading" msgstr "" @@ -5860,91 +5864,91 @@ msgstr "" msgid "Cannot connect to yourself." msgstr "" -#: ../../include/conversation.php:124 ../../Zotlabs/Module/Like.php:129 +#: ../../include/conversation.php:135 ../../Zotlabs/Module/Like.php:129 msgid "channel" msgstr "" -#: ../../include/conversation.php:171 +#: ../../include/conversation.php:183 #, php-format msgid "likes %1$s's %2$s" msgstr "" -#: ../../include/conversation.php:174 +#: ../../include/conversation.php:186 #, php-format msgid "doesn't like %1$s's %2$s" msgstr "" -#: ../../include/conversation.php:214 ../../include/conversation.php:216 +#: ../../include/conversation.php:226 ../../include/conversation.php:228 #, php-format msgid "%1$s is now connected with %2$s" msgstr "" -#: ../../include/conversation.php:251 +#: ../../include/conversation.php:263 #, php-format msgid "%1$s poked %2$s" msgstr "" -#: ../../include/conversation.php:274 ../../Zotlabs/Module/Mood.php:76 +#: ../../include/conversation.php:286 ../../Zotlabs/Module/Mood.php:76 #, php-format msgctxt "mood" msgid "%1$s is %2$s" msgstr "" -#: ../../include/conversation.php:503 ../../Zotlabs/Lib/ThreadItem.php:500 +#: ../../include/conversation.php:515 ../../Zotlabs/Lib/ThreadItem.php:500 msgid "This is an unsaved preview" msgstr "" -#: ../../include/conversation.php:639 ../../Zotlabs/Module/Photos.php:1112 +#: ../../include/conversation.php:651 ../../Zotlabs/Module/Photos.php:1112 msgctxt "title" msgid "Likes" msgstr "" -#: ../../include/conversation.php:640 ../../Zotlabs/Module/Photos.php:1112 +#: ../../include/conversation.php:652 ../../Zotlabs/Module/Photos.php:1112 msgctxt "title" msgid "Dislikes" msgstr "" -#: ../../include/conversation.php:641 ../../Zotlabs/Widget/Pinned.php:77 +#: ../../include/conversation.php:653 ../../Zotlabs/Widget/Pinned.php:77 #: ../../Zotlabs/Module/Photos.php:1113 msgctxt "title" msgid "Agree" msgstr "" -#: ../../include/conversation.php:642 ../../Zotlabs/Widget/Pinned.php:78 +#: ../../include/conversation.php:654 ../../Zotlabs/Widget/Pinned.php:78 #: ../../Zotlabs/Module/Photos.php:1113 msgctxt "title" msgid "Disagree" msgstr "" -#: ../../include/conversation.php:643 ../../Zotlabs/Widget/Pinned.php:79 +#: ../../include/conversation.php:655 ../../Zotlabs/Widget/Pinned.php:79 #: ../../Zotlabs/Module/Photos.php:1113 msgctxt "title" msgid "Abstain" msgstr "" -#: ../../include/conversation.php:644 ../../Zotlabs/Widget/Pinned.php:66 +#: ../../include/conversation.php:656 ../../Zotlabs/Widget/Pinned.php:66 #: ../../Zotlabs/Module/Photos.php:1114 msgctxt "title" msgid "Attending" msgstr "" -#: ../../include/conversation.php:645 ../../Zotlabs/Widget/Pinned.php:67 +#: ../../include/conversation.php:657 ../../Zotlabs/Widget/Pinned.php:67 #: ../../Zotlabs/Module/Photos.php:1114 msgctxt "title" msgid "Not attending" msgstr "" -#: ../../include/conversation.php:646 ../../Zotlabs/Widget/Pinned.php:68 +#: ../../include/conversation.php:658 ../../Zotlabs/Widget/Pinned.php:68 #: ../../Zotlabs/Module/Photos.php:1114 msgctxt "title" msgid "Might attend" msgstr "" -#: ../../include/conversation.php:716 ../../Zotlabs/Lib/ThreadItem.php:180 +#: ../../include/conversation.php:728 ../../Zotlabs/Lib/ThreadItem.php:180 msgid "Select" msgstr "" -#: ../../include/conversation.php:717 ../../include/conversation.php:762 +#: ../../include/conversation.php:729 ../../include/conversation.php:774 #: ../../Zotlabs/Module/Article_edit.php:128 #: ../../Zotlabs/Module/Card_edit.php:129 ../../Zotlabs/Module/Oauth.php:174 #: ../../Zotlabs/Module/Editwebpage.php:167 ../../Zotlabs/Module/Cdav.php:1052 @@ -5957,208 +5961,208 @@ msgstr "" #: ../../Zotlabs/Module/Connections.php:328 #: ../../Zotlabs/Module/Photos.php:1178 ../../Zotlabs/Module/Profiles.php:802 #: ../../Zotlabs/Module/Oauth2.php:195 ../../Zotlabs/Module/Thing.php:269 -#: ../../Zotlabs/Module/Connedit.php:669 ../../Zotlabs/Module/Connedit.php:941 +#: ../../Zotlabs/Module/Connedit.php:671 ../../Zotlabs/Module/Connedit.php:943 #: ../../Zotlabs/Lib/Apps.php:558 ../../Zotlabs/Lib/ThreadItem.php:170 #: ../../Zotlabs/Storage/Browser.php:297 msgid "Delete" msgstr "" -#: ../../include/conversation.php:721 ../../Zotlabs/Lib/ThreadItem.php:273 +#: ../../include/conversation.php:733 ../../Zotlabs/Lib/ThreadItem.php:273 msgid "Toggle Star Status" msgstr "" -#: ../../include/conversation.php:726 ../../Zotlabs/Lib/ThreadItem.php:103 +#: ../../include/conversation.php:738 ../../Zotlabs/Lib/ThreadItem.php:103 msgid "Private Message" msgstr "" -#: ../../include/conversation.php:733 ../../Zotlabs/Widget/Pinned.php:88 +#: ../../include/conversation.php:745 ../../Zotlabs/Widget/Pinned.php:88 #: ../../Zotlabs/Lib/ThreadItem.php:284 msgid "Message signature validated" msgstr "" -#: ../../include/conversation.php:734 ../../Zotlabs/Widget/Pinned.php:89 +#: ../../include/conversation.php:746 ../../Zotlabs/Widget/Pinned.php:89 #: ../../Zotlabs/Lib/ThreadItem.php:285 msgid "Message signature incorrect" msgstr "" -#: ../../include/conversation.php:761 +#: ../../include/conversation.php:773 #: ../../Zotlabs/Module/Admin/Accounts.php:173 #: ../../Zotlabs/Module/Connections.php:342 msgid "Approve" msgstr "" -#: ../../include/conversation.php:766 +#: ../../include/conversation.php:778 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: ../../include/conversation.php:786 +#: ../../include/conversation.php:798 msgid "Categories:" msgstr "" -#: ../../include/conversation.php:787 +#: ../../include/conversation.php:799 msgid "Filed under:" msgstr "" -#: ../../include/conversation.php:793 ../../Zotlabs/Widget/Pinned.php:133 +#: ../../include/conversation.php:805 ../../Zotlabs/Widget/Pinned.php:133 #: ../../Zotlabs/Lib/ThreadItem.php:429 #, php-format msgid "from %s" msgstr "" -#: ../../include/conversation.php:796 ../../Zotlabs/Widget/Pinned.php:136 +#: ../../include/conversation.php:808 ../../Zotlabs/Widget/Pinned.php:136 #: ../../Zotlabs/Lib/ThreadItem.php:432 #, php-format msgid "last edited: %s" msgstr "" -#: ../../include/conversation.php:797 ../../Zotlabs/Widget/Pinned.php:137 +#: ../../include/conversation.php:809 ../../Zotlabs/Widget/Pinned.php:137 #: ../../Zotlabs/Lib/ThreadItem.php:433 #, php-format msgid "Expires: %s" msgstr "" -#: ../../include/conversation.php:812 +#: ../../include/conversation.php:824 msgid "View in context" msgstr "" -#: ../../include/conversation.php:814 ../../Zotlabs/Module/Photos.php:1078 +#: ../../include/conversation.php:826 ../../Zotlabs/Module/Photos.php:1078 #: ../../Zotlabs/Lib/ThreadItem.php:501 msgid "Please wait" msgstr "" -#: ../../include/conversation.php:913 +#: ../../include/conversation.php:925 msgid "remove" msgstr "" -#: ../../include/conversation.php:917 +#: ../../include/conversation.php:929 msgid "Loading..." msgstr "" -#: ../../include/conversation.php:918 ../../Zotlabs/Lib/ThreadItem.php:301 +#: ../../include/conversation.php:930 ../../Zotlabs/Lib/ThreadItem.php:301 msgid "Conversation Tools" msgstr "" -#: ../../include/conversation.php:919 +#: ../../include/conversation.php:931 msgid "Delete Selected Items" msgstr "" -#: ../../include/conversation.php:962 +#: ../../include/conversation.php:974 msgid "View Source" msgstr "" -#: ../../include/conversation.php:972 +#: ../../include/conversation.php:984 msgid "Follow Thread" msgstr "" -#: ../../include/conversation.php:981 +#: ../../include/conversation.php:993 msgid "Unfollow Thread" msgstr "" -#: ../../include/conversation.php:1075 ../../Zotlabs/Module/Connedit.php:630 +#: ../../include/conversation.php:1087 ../../Zotlabs/Module/Connedit.php:632 msgid "Recent Activity" msgstr "" -#: ../../include/conversation.php:1085 ../../include/connections.php:110 -#: ../../include/channel.php:1603 ../../Zotlabs/Widget/Suggestions.php:46 +#: ../../include/conversation.php:1097 ../../include/connections.php:110 +#: ../../include/channel.php:1604 ../../Zotlabs/Widget/Suggestions.php:46 #: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Module/Directory.php:368 #: ../../Zotlabs/Module/Connections.php:349 ../../Zotlabs/Module/Suggest.php:71 msgid "Connect" msgstr "" -#: ../../include/conversation.php:1095 +#: ../../include/conversation.php:1107 msgid "Edit Connection" msgstr "" -#: ../../include/conversation.php:1105 +#: ../../include/conversation.php:1117 msgid "Message" msgstr "" -#: ../../include/conversation.php:1115 ../../Zotlabs/Module/Pubsites.php:35 +#: ../../include/conversation.php:1127 ../../Zotlabs/Module/Pubsites.php:35 #: ../../Zotlabs/Module/Ratings.php:97 msgid "Ratings" msgstr "" -#: ../../include/conversation.php:1125 ../../Zotlabs/Module/Poke.php:199 +#: ../../include/conversation.php:1137 ../../Zotlabs/Module/Poke.php:199 #: ../../Zotlabs/Lib/Apps.php:351 msgid "Poke" msgstr "" -#: ../../include/conversation.php:1247 +#: ../../include/conversation.php:1259 #, php-format msgid "%s likes this." msgstr "" -#: ../../include/conversation.php:1247 +#: ../../include/conversation.php:1259 #, php-format msgid "%s doesn't like this." msgstr "" -#: ../../include/conversation.php:1251 +#: ../../include/conversation.php:1263 #, php-format msgid "<span %1$s>%2$d people</span> like this." msgid_plural "<span %1$s>%2$d people</span> like this." msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1253 +#: ../../include/conversation.php:1265 #, php-format msgid "<span %1$s>%2$d people</span> don't like this." msgid_plural "<span %1$s>%2$d people</span> don't like this." msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1259 +#: ../../include/conversation.php:1271 msgid "and" msgstr "" -#: ../../include/conversation.php:1262 +#: ../../include/conversation.php:1274 #, php-format msgid ", and %d other people" msgid_plural ", and %d other people" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1263 +#: ../../include/conversation.php:1275 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:1263 +#: ../../include/conversation.php:1275 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:1447 +#: ../../include/conversation.php:1459 msgid "Toggle poll" msgstr "" -#: ../../include/conversation.php:1448 +#: ../../include/conversation.php:1460 msgid "Option" msgstr "" -#: ../../include/conversation.php:1449 +#: ../../include/conversation.php:1461 msgid "Add option" msgstr "" -#: ../../include/conversation.php:1450 +#: ../../include/conversation.php:1462 msgid "Minutes" msgstr "" -#: ../../include/conversation.php:1450 +#: ../../include/conversation.php:1462 msgid "Hours" msgstr "" -#: ../../include/conversation.php:1450 +#: ../../include/conversation.php:1462 msgid "Days" msgstr "" -#: ../../include/conversation.php:1451 +#: ../../include/conversation.php:1463 msgid "Allow multiple answers" msgstr "" -#: ../../include/conversation.php:1734 ../../include/taxonomy.php:659 -#: ../../include/channel.php:1766 ../../Zotlabs/Module/Photos.php:1135 +#: ../../include/conversation.php:1746 ../../include/taxonomy.php:659 +#: ../../include/channel.php:1767 ../../Zotlabs/Module/Photos.php:1135 #: ../../Zotlabs/Lib/ThreadItem.php:242 msgctxt "noun" msgid "Like" @@ -6166,7 +6170,7 @@ msgid_plural "Likes" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1737 ../../Zotlabs/Module/Photos.php:1140 +#: ../../include/conversation.php:1749 ../../Zotlabs/Module/Photos.php:1140 #: ../../Zotlabs/Lib/ThreadItem.php:247 msgctxt "noun" msgid "Dislike" @@ -6174,42 +6178,42 @@ msgid_plural "Dislikes" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1740 +#: ../../include/conversation.php:1752 msgctxt "noun" msgid "Attending" msgid_plural "Attending" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1743 +#: ../../include/conversation.php:1755 msgctxt "noun" msgid "Not Attending" msgid_plural "Not Attending" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1746 +#: ../../include/conversation.php:1758 msgctxt "noun" msgid "Undecided" msgid_plural "Undecided" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1749 +#: ../../include/conversation.php:1761 msgctxt "noun" msgid "Agree" msgid_plural "Agrees" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1752 +#: ../../include/conversation.php:1764 msgctxt "noun" msgid "Disagree" msgid_plural "Disagrees" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1755 +#: ../../include/conversation.php:1767 msgctxt "noun" msgid "Abstain" msgid_plural "Abstains" @@ -6276,11 +6280,11 @@ msgstr "" msgid "Hermaphrodite" msgstr "" -#: ../../include/selectors.php:60 ../../include/channel.php:1711 +#: ../../include/selectors.php:60 ../../include/channel.php:1712 msgid "Neuter" msgstr "" -#: ../../include/selectors.php:60 ../../include/channel.php:1713 +#: ../../include/selectors.php:60 ../../include/channel.php:1714 msgid "Non-specific" msgstr "" @@ -6376,15 +6380,15 @@ msgstr "" msgid "Sex Addict" msgstr "" -#: ../../include/selectors.php:134 ../../include/channel.php:504 -#: ../../include/channel.php:505 ../../include/channel.php:512 +#: ../../include/selectors.php:134 ../../include/channel.php:505 +#: ../../include/channel.php:506 ../../include/channel.php:513 #: ../../Zotlabs/Widget/Affinity.php:32 #: ../../Zotlabs/Module/Settings/Channel.php:71 #: ../../Zotlabs/Module/Settings/Channel.php:75 #: ../../Zotlabs/Module/Settings/Channel.php:76 #: ../../Zotlabs/Module/Settings/Channel.php:79 #: ../../Zotlabs/Module/Settings/Channel.php:90 -#: ../../Zotlabs/Module/Connedit.php:726 +#: ../../Zotlabs/Module/Connedit.php:728 msgid "Friends" msgstr "" @@ -6595,67 +6599,67 @@ msgstr "" msgid "Visible to specific connections." msgstr "" -#: ../../include/items.php:4465 ../../Zotlabs/Module/Group.php:62 +#: ../../include/items.php:4466 ../../Zotlabs/Module/Group.php:62 #: ../../Zotlabs/Module/Group.php:214 msgid "Privacy group not found." msgstr "" -#: ../../include/items.php:4481 +#: ../../include/items.php:4482 msgid "Privacy group is empty." msgstr "" -#: ../../include/items.php:4488 +#: ../../include/items.php:4489 #, php-format msgid "Privacy group: %s" msgstr "" -#: ../../include/items.php:4498 ../../Zotlabs/Module/Connedit.php:868 +#: ../../include/items.php:4499 ../../Zotlabs/Module/Connedit.php:870 #, php-format msgid "Connection: %s" msgstr "" -#: ../../include/items.php:4500 +#: ../../include/items.php:4501 msgid "Connection not found." msgstr "" -#: ../../include/items.php:4834 ../../Zotlabs/Module/Cover_photo.php:297 +#: ../../include/items.php:4835 ../../Zotlabs/Module/Cover_photo.php:297 msgid "female" msgstr "" -#: ../../include/items.php:4835 ../../Zotlabs/Module/Cover_photo.php:298 +#: ../../include/items.php:4836 ../../Zotlabs/Module/Cover_photo.php:298 #, php-format msgid "%1$s updated her %2$s" msgstr "" -#: ../../include/items.php:4836 ../../Zotlabs/Module/Cover_photo.php:299 +#: ../../include/items.php:4837 ../../Zotlabs/Module/Cover_photo.php:299 msgid "male" msgstr "" -#: ../../include/items.php:4837 ../../Zotlabs/Module/Cover_photo.php:300 +#: ../../include/items.php:4838 ../../Zotlabs/Module/Cover_photo.php:300 #, php-format msgid "%1$s updated his %2$s" msgstr "" -#: ../../include/items.php:4839 ../../Zotlabs/Module/Cover_photo.php:302 +#: ../../include/items.php:4840 ../../Zotlabs/Module/Cover_photo.php:302 #, php-format msgid "%1$s updated their %2$s" msgstr "" -#: ../../include/items.php:4841 +#: ../../include/items.php:4842 msgid "profile photo" msgstr "" -#: ../../include/items.php:5033 +#: ../../include/items.php:5034 #, php-format msgid "[Edited %s]" msgstr "" -#: ../../include/items.php:5033 +#: ../../include/items.php:5034 msgctxt "edit_activity" msgid "Post" msgstr "" -#: ../../include/items.php:5033 +#: ../../include/items.php:5034 msgctxt "edit_activity" msgid "Comment" msgstr "" @@ -6810,8 +6814,8 @@ msgstr "" msgid "%1$s's bookmarks" msgstr "" -#: ../../include/menu.php:120 ../../include/channel.php:1523 -#: ../../include/channel.php:1527 ../../Zotlabs/Widget/Cdav.php:138 +#: ../../include/menu.php:120 ../../include/channel.php:1524 +#: ../../include/channel.php:1528 ../../Zotlabs/Widget/Cdav.php:138 #: ../../Zotlabs/Widget/Cdav.php:175 ../../Zotlabs/Module/Article_edit.php:98 #: ../../Zotlabs/Module/Group.php:253 ../../Zotlabs/Module/Card_edit.php:99 #: ../../Zotlabs/Module/Oauth.php:173 ../../Zotlabs/Module/Editwebpage.php:142 @@ -6874,11 +6878,6 @@ msgstr "" msgid "article" msgstr "" -#: ../../include/bbcode.php:523 ../../include/markdown.php:204 -#: ../../Zotlabs/Module/Tagger.php:79 -msgid "post" -msgstr "" - #: ../../include/bbcode.php:527 ../../include/markdown.php:202 #, php-format msgid "%1$s wrote the following %2$s %3$s" @@ -6929,12 +6928,12 @@ msgstr "" msgid "Nickname is required." msgstr "" -#: ../../include/channel.php:225 ../../include/channel.php:705 +#: ../../include/channel.php:225 ../../include/channel.php:706 #: ../../Zotlabs/Module/Changeaddr.php:46 msgid "Reserved nickname. Please choose another." msgstr "" -#: ../../include/channel.php:230 ../../include/channel.php:710 +#: ../../include/channel.php:230 ../../include/channel.php:711 #: ../../Zotlabs/Module/Changeaddr.php:51 msgid "" "Nickname has unsupported characters or is already being used on this site." @@ -6944,195 +6943,195 @@ msgstr "" msgid "Unable to retrieve created identity" msgstr "" -#: ../../include/channel.php:440 +#: ../../include/channel.php:441 msgid "Default Profile" msgstr "" -#: ../../include/channel.php:638 ../../include/channel.php:727 +#: ../../include/channel.php:639 ../../include/channel.php:728 msgid "Unable to retrieve modified identity" msgstr "" -#: ../../include/channel.php:1370 +#: ../../include/channel.php:1371 msgid "Requested channel is not available." msgstr "" -#: ../../include/channel.php:1516 ../../Zotlabs/Module/Profiles.php:730 +#: ../../include/channel.php:1517 ../../Zotlabs/Module/Profiles.php:730 msgid "Change profile photo" msgstr "" -#: ../../include/channel.php:1524 +#: ../../include/channel.php:1525 msgid "Create New Profile" msgstr "" -#: ../../include/channel.php:1542 ../../Zotlabs/Module/Profiles.php:822 +#: ../../include/channel.php:1543 ../../Zotlabs/Module/Profiles.php:822 msgid "Profile Image" msgstr "" -#: ../../include/channel.php:1545 +#: ../../include/channel.php:1546 msgid "Visible to everybody" msgstr "" -#: ../../include/channel.php:1546 ../../Zotlabs/Module/Profiles.php:727 +#: ../../include/channel.php:1547 ../../Zotlabs/Module/Profiles.php:727 #: ../../Zotlabs/Module/Profiles.php:826 msgid "Edit visibility" msgstr "" -#: ../../include/channel.php:1622 ../../include/channel.php:1750 +#: ../../include/channel.php:1623 ../../include/channel.php:1751 msgid "Gender:" msgstr "" -#: ../../include/channel.php:1623 ../../include/channel.php:1794 +#: ../../include/channel.php:1624 ../../include/channel.php:1795 msgid "Status:" msgstr "" -#: ../../include/channel.php:1624 ../../include/channel.php:1818 +#: ../../include/channel.php:1625 ../../include/channel.php:1819 msgid "Homepage:" msgstr "" -#: ../../include/channel.php:1625 +#: ../../include/channel.php:1626 msgid "Online Now" msgstr "" -#: ../../include/channel.php:1678 +#: ../../include/channel.php:1679 msgid "Change your profile photo" msgstr "" -#: ../../include/channel.php:1709 +#: ../../include/channel.php:1710 msgid "Trans" msgstr "" -#: ../../include/channel.php:1748 ../../Zotlabs/Module/Settings/Channel.php:500 +#: ../../include/channel.php:1749 ../../Zotlabs/Module/Settings/Channel.php:501 msgid "Full Name:" msgstr "" -#: ../../include/channel.php:1755 +#: ../../include/channel.php:1756 msgid "Like this channel" msgstr "" -#: ../../include/channel.php:1779 +#: ../../include/channel.php:1780 msgid "j F, Y" msgstr "" -#: ../../include/channel.php:1780 +#: ../../include/channel.php:1781 msgid "j F" msgstr "" -#: ../../include/channel.php:1787 +#: ../../include/channel.php:1788 msgid "Birthday:" msgstr "" -#: ../../include/channel.php:1791 ../../Zotlabs/Module/Directory.php:347 +#: ../../include/channel.php:1792 ../../Zotlabs/Module/Directory.php:347 msgid "Age:" msgstr "" -#: ../../include/channel.php:1800 +#: ../../include/channel.php:1801 #, php-format msgid "for %1$d %2$s" msgstr "" -#: ../../include/channel.php:1812 +#: ../../include/channel.php:1813 msgid "Tags:" msgstr "" -#: ../../include/channel.php:1816 +#: ../../include/channel.php:1817 msgid "Sexual Preference:" msgstr "" -#: ../../include/channel.php:1820 ../../Zotlabs/Module/Directory.php:365 +#: ../../include/channel.php:1821 ../../Zotlabs/Module/Directory.php:365 msgid "Hometown:" msgstr "" -#: ../../include/channel.php:1822 +#: ../../include/channel.php:1823 msgid "Political Views:" msgstr "" -#: ../../include/channel.php:1824 +#: ../../include/channel.php:1825 msgid "Religion:" msgstr "" -#: ../../include/channel.php:1826 ../../Zotlabs/Module/Directory.php:367 +#: ../../include/channel.php:1827 ../../Zotlabs/Module/Directory.php:367 msgid "About:" msgstr "" -#: ../../include/channel.php:1828 +#: ../../include/channel.php:1829 msgid "Hobbies/Interests:" msgstr "" -#: ../../include/channel.php:1830 +#: ../../include/channel.php:1831 msgid "Likes:" msgstr "" -#: ../../include/channel.php:1832 +#: ../../include/channel.php:1833 msgid "Dislikes:" msgstr "" -#: ../../include/channel.php:1834 +#: ../../include/channel.php:1835 msgid "Contact information and Social Networks:" msgstr "" -#: ../../include/channel.php:1836 +#: ../../include/channel.php:1837 msgid "My other channels:" msgstr "" -#: ../../include/channel.php:1838 +#: ../../include/channel.php:1839 msgid "Musical interests:" msgstr "" -#: ../../include/channel.php:1840 +#: ../../include/channel.php:1841 msgid "Books, literature:" msgstr "" -#: ../../include/channel.php:1842 +#: ../../include/channel.php:1843 msgid "Television:" msgstr "" -#: ../../include/channel.php:1844 +#: ../../include/channel.php:1845 msgid "Film/dance/culture/entertainment:" msgstr "" -#: ../../include/channel.php:1846 +#: ../../include/channel.php:1847 msgid "Love/Romance:" msgstr "" -#: ../../include/channel.php:1848 +#: ../../include/channel.php:1849 msgid "Work/employment:" msgstr "" -#: ../../include/channel.php:1850 +#: ../../include/channel.php:1851 msgid "School/education:" msgstr "" -#: ../../include/channel.php:1871 ../../Zotlabs/Module/Profperm.php:113 +#: ../../include/channel.php:1872 ../../Zotlabs/Module/Profperm.php:113 #: ../../Zotlabs/Lib/Apps.php:362 msgid "Profile" msgstr "" -#: ../../include/channel.php:1873 +#: ../../include/channel.php:1874 msgid "Like this thing" msgstr "" -#: ../../include/channel.php:1874 ../../Zotlabs/Module/Events.php:699 +#: ../../include/channel.php:1875 ../../Zotlabs/Module/Events.php:699 msgid "Export" msgstr "" -#: ../../include/channel.php:2312 ../../Zotlabs/Module/Cover_photo.php:304 +#: ../../include/channel.php:2314 ../../Zotlabs/Module/Cover_photo.php:304 msgid "cover photo" msgstr "" -#: ../../include/channel.php:2601 ../../Zotlabs/Module/Rmagic.php:93 +#: ../../include/channel.php:2603 ../../Zotlabs/Module/Rmagic.php:96 #: ../../boot.php:1699 msgid "Remote Authentication" msgstr "" -#: ../../include/channel.php:2602 ../../Zotlabs/Module/Rmagic.php:94 +#: ../../include/channel.php:2604 ../../Zotlabs/Module/Rmagic.php:97 msgid "Enter your channel address (e.g. channel@example.com)" msgstr "" -#: ../../include/channel.php:2603 ../../Zotlabs/Module/Rmagic.php:95 +#: ../../include/channel.php:2605 ../../Zotlabs/Module/Rmagic.php:98 msgid "Authenticate" msgstr "" -#: ../../include/channel.php:2758 ../../Zotlabs/Module/Admin/Accounts.php:91 +#: ../../include/channel.php:2763 ../../Zotlabs/Module/Admin/Accounts.php:91 #, php-format msgid "Account '%s' deleted" msgstr "" @@ -7142,40 +7141,49 @@ msgstr "" msgid "Visible to your default audience" msgstr "" -#: ../../include/acl_selectors.php:88 ../../Zotlabs/Module/Lockview.php:117 -#: ../../Zotlabs/Module/Lockview.php:153 ../../Zotlabs/Module/Acl.php:121 -msgctxt "acl" -msgid "Profile" +#: ../../include/acl_selectors.php:100 +msgid "Profile-Based Privacy Groups" msgstr "" -#: ../../include/acl_selectors.php:106 +#: ../../include/acl_selectors.php:113 ../../Zotlabs/Widget/Forums.php:100 +#: ../../Zotlabs/Widget/Activity_filter.php:115 +#: ../../Zotlabs/Widget/Notifications.php:139 +#: ../../Zotlabs/Widget/Notifications.php:140 +msgid "Forums" +msgstr "" + +#: ../../include/acl_selectors.php:115 +msgid "Private Forum" +msgstr "" + +#: ../../include/acl_selectors.php:126 #: ../../Zotlabs/Lib/PermissionDescription.php:107 msgid "Only me" msgstr "" -#: ../../include/acl_selectors.php:113 -msgid "Who can see this?" +#: ../../include/acl_selectors.php:133 +msgid "Share with" msgstr "" -#: ../../include/acl_selectors.php:114 +#: ../../include/acl_selectors.php:134 msgid "Custom selection" msgstr "" -#: ../../include/acl_selectors.php:115 +#: ../../include/acl_selectors.php:136 msgid "" -"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit " -"the scope of \"Show\"." +"Select \"Allow\" to allow viewing. \"Don't allow\" lets you override and " +"limit the scope of \"Allow\"." msgstr "" -#: ../../include/acl_selectors.php:116 -msgid "Show" +#: ../../include/acl_selectors.php:137 ../../Zotlabs/Module/Authorize.php:32 +msgid "Allow" msgstr "" -#: ../../include/acl_selectors.php:117 ../../Zotlabs/Widget/Pinned.php:158 -msgid "Don't show" +#: ../../include/acl_selectors.php:138 +msgid "Don't allow" msgstr "" -#: ../../include/acl_selectors.php:150 +#: ../../include/acl_selectors.php:171 #, php-format msgid "" "Post permissions %s cannot be changed %s after a post is shared.</br />These " @@ -7202,23 +7210,23 @@ msgstr "" msgid "Embedding disabled" msgstr "" -#: ../../include/dir_fns.php:141 ../../Zotlabs/Lib/Libzotdir.php:160 +#: ../../include/dir_fns.php:140 ../../Zotlabs/Lib/Libzotdir.php:160 msgid "Directory Options" msgstr "" -#: ../../include/dir_fns.php:143 ../../Zotlabs/Lib/Libzotdir.php:162 +#: ../../include/dir_fns.php:142 ../../Zotlabs/Lib/Libzotdir.php:162 msgid "Safe Mode" msgstr "" -#: ../../include/dir_fns.php:144 ../../Zotlabs/Lib/Libzotdir.php:163 +#: ../../include/dir_fns.php:143 ../../Zotlabs/Lib/Libzotdir.php:163 msgid "Public Forums Only" msgstr "" -#: ../../include/dir_fns.php:145 ../../Zotlabs/Lib/Libzotdir.php:165 +#: ../../include/dir_fns.php:144 ../../Zotlabs/Lib/Libzotdir.php:165 msgid "This Website Only" msgstr "" -#: ../../include/zid.php:370 +#: ../../include/zid.php:364 #, php-format msgid "OpenWebAuth: %1$s welcomes %2$s" msgstr "" @@ -7394,6 +7402,10 @@ msgstr "" msgid "Pinned post" msgstr "" +#: ../../Zotlabs/Widget/Pinned.php:158 +msgid "Don't show" +msgstr "" + #: ../../Zotlabs/Widget/Activity.php:50 msgctxt "widget" msgid "Activity" @@ -7442,7 +7454,7 @@ msgstr "" #: ../../Zotlabs/Module/New_channel.php:189 ../../Zotlabs/Module/Cards.php:113 #: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Profiles.php:800 #: ../../Zotlabs/Module/Articles.php:117 ../../Zotlabs/Module/Menu.php:182 -#: ../../Zotlabs/Module/Connedit.php:939 ../../Zotlabs/Module/Layouts.php:185 +#: ../../Zotlabs/Module/Connedit.php:941 ../../Zotlabs/Module/Layouts.php:185 #: ../../Zotlabs/Storage/Browser.php:282 ../../Zotlabs/Storage/Browser.php:396 msgid "Create" msgstr "" @@ -7535,13 +7547,6 @@ msgstr "" msgid "See more..." msgstr "" -#: ../../Zotlabs/Widget/Forums.php:100 -#: ../../Zotlabs/Widget/Activity_filter.php:115 -#: ../../Zotlabs/Widget/Notifications.php:139 -#: ../../Zotlabs/Widget/Notifications.php:140 -msgid "Forums" -msgstr "" - #: ../../Zotlabs/Widget/Bookmarkedchats.php:24 msgid "Bookmarked Chatrooms" msgstr "" @@ -7863,21 +7868,21 @@ msgstr "" msgid "New Member Links" msgstr "" -#: ../../Zotlabs/Widget/Affinity.php:30 ../../Zotlabs/Module/Connedit.php:724 +#: ../../Zotlabs/Widget/Affinity.php:30 ../../Zotlabs/Module/Connedit.php:726 msgid "Me" msgstr "" -#: ../../Zotlabs/Widget/Affinity.php:31 ../../Zotlabs/Module/Connedit.php:725 +#: ../../Zotlabs/Widget/Affinity.php:31 ../../Zotlabs/Module/Connedit.php:727 msgid "Family" msgstr "" -#: ../../Zotlabs/Widget/Affinity.php:33 ../../Zotlabs/Module/Connedit.php:727 +#: ../../Zotlabs/Widget/Affinity.php:33 ../../Zotlabs/Module/Connedit.php:729 msgid "Acquaintances" msgstr "" #: ../../Zotlabs/Widget/Affinity.php:34 ../../Zotlabs/Module/Connections.php:97 #: ../../Zotlabs/Module/Connections.php:111 -#: ../../Zotlabs/Module/Connedit.php:728 +#: ../../Zotlabs/Module/Connedit.php:730 msgid "All" msgstr "" @@ -8088,27 +8093,27 @@ msgstr "" msgid "Expires (yyyy-mm-dd)" msgstr "" -#: ../../Zotlabs/Module/Tokens.php:180 ../../Zotlabs/Module/Connedit.php:908 +#: ../../Zotlabs/Module/Tokens.php:180 ../../Zotlabs/Module/Connedit.php:910 msgid "Their Settings" msgstr "" #: ../../Zotlabs/Module/Tokens.php:181 ../../Zotlabs/Module/Permcats.php:122 -#: ../../Zotlabs/Module/Defperms.php:267 ../../Zotlabs/Module/Connedit.php:909 +#: ../../Zotlabs/Module/Defperms.php:267 ../../Zotlabs/Module/Connedit.php:911 msgid "My Settings" msgstr "" #: ../../Zotlabs/Module/Tokens.php:183 ../../Zotlabs/Module/Permcats.php:124 -#: ../../Zotlabs/Module/Defperms.php:265 ../../Zotlabs/Module/Connedit.php:904 +#: ../../Zotlabs/Module/Defperms.php:265 ../../Zotlabs/Module/Connedit.php:906 msgid "inherited" msgstr "" #: ../../Zotlabs/Module/Tokens.php:186 ../../Zotlabs/Module/Permcats.php:127 -#: ../../Zotlabs/Module/Defperms.php:270 ../../Zotlabs/Module/Connedit.php:911 +#: ../../Zotlabs/Module/Defperms.php:270 ../../Zotlabs/Module/Connedit.php:913 msgid "Individual Permissions" msgstr "" #: ../../Zotlabs/Module/Tokens.php:187 ../../Zotlabs/Module/Permcats.php:128 -#: ../../Zotlabs/Module/Connedit.php:912 +#: ../../Zotlabs/Module/Connedit.php:914 msgid "" "Some permissions may be inherited from your channel's <a href=\"settings" "\"><strong>privacy settings</strong></a>, which have higher priority than " @@ -8126,7 +8131,7 @@ msgstr "" #: ../../Zotlabs/Module/Article_edit.php:44 #: ../../Zotlabs/Module/Wall_upload.php:31 -#: ../../Zotlabs/Module/Card_edit.php:44 ../../Zotlabs/Module/Chanview.php:89 +#: ../../Zotlabs/Module/Card_edit.php:44 ../../Zotlabs/Module/Chanview.php:95 #: ../../Zotlabs/Module/Cal.php:31 ../../Zotlabs/Module/Page.php:75 #: ../../Zotlabs/Module/Block.php:41 msgid "Channel not found." @@ -8140,25 +8145,25 @@ msgstr "" msgid "No such group" msgstr "" -#: ../../Zotlabs/Module/Network.php:159 +#: ../../Zotlabs/Module/Network.php:157 msgid "No such channel" msgstr "" -#: ../../Zotlabs/Module/Network.php:174 ../../Zotlabs/Module/Channel.php:195 +#: ../../Zotlabs/Module/Network.php:169 ../../Zotlabs/Module/Channel.php:195 msgid "Search Results For:" msgstr "" -#: ../../Zotlabs/Module/Network.php:204 ../../Zotlabs/Module/Channel.php:230 +#: ../../Zotlabs/Module/Network.php:210 ../../Zotlabs/Module/Channel.php:230 #: ../../Zotlabs/Module/Hq.php:134 ../../Zotlabs/Module/Pubstream.php:99 -#: ../../Zotlabs/Module/Display.php:80 +#: ../../Zotlabs/Module/Display.php:79 msgid "Reset form" msgstr "" -#: ../../Zotlabs/Module/Network.php:243 +#: ../../Zotlabs/Module/Network.php:246 msgid "Privacy group is empty" msgstr "" -#: ../../Zotlabs/Module/Network.php:253 +#: ../../Zotlabs/Module/Network.php:256 msgid "Privacy group: " msgstr "" @@ -8278,16 +8283,20 @@ msgstr "" msgid "You must be logged in to see this page." msgstr "" -#: ../../Zotlabs/Module/Z6trans.php:80 -msgid "Update to Hubzilla 5.0 setp 2" +#: ../../Zotlabs/Module/Z6trans.php:19 +msgid "Update to Hubzilla 5.0 step 2" msgstr "" -#: ../../Zotlabs/Module/Z6trans.php:82 +#: ../../Zotlabs/Module/Z6trans.php:21 msgid "To complete the update please run" msgstr "" -#: ../../Zotlabs/Module/Z6trans.php:88 -msgid "INFO: this command can take a very long time depending on your DB size." +#: ../../Zotlabs/Module/Z6trans.php:23 +msgid "php util/z6convert.php" +msgstr "" + +#: ../../Zotlabs/Module/Z6trans.php:25 +msgid "from the terminal." msgstr "" #: ../../Zotlabs/Module/Register.php:52 @@ -8394,7 +8403,7 @@ msgstr "" #: ../../Zotlabs/Module/Register.php:264 #: ../../Zotlabs/Module/New_channel.php:178 -#: ../../Zotlabs/Module/Settings/Channel.php:536 +#: ../../Zotlabs/Module/Settings/Channel.php:537 msgid "Channel role and privacy" msgstr "" @@ -8958,7 +8967,7 @@ msgstr "" msgid "Insufficient permissions. Request redirected to profile page." msgstr "" -#: ../../Zotlabs/Module/Channel.php:497 ../../Zotlabs/Module/Display.php:383 +#: ../../Zotlabs/Module/Channel.php:465 ../../Zotlabs/Module/Display.php:376 msgid "" "You must enable javascript for your browser to be able to view this content." msgstr "" @@ -9128,7 +9137,7 @@ msgstr "" #: ../../Zotlabs/Module/Cdav.php:1049 ../../Zotlabs/Module/Cdav.php:1384 #: ../../Zotlabs/Module/Admin/Addons.php:457 #: ../../Zotlabs/Module/Profiles.php:801 ../../Zotlabs/Module/Oauth2.php:58 -#: ../../Zotlabs/Module/Oauth2.php:144 ../../Zotlabs/Module/Connedit.php:940 +#: ../../Zotlabs/Module/Oauth2.php:144 ../../Zotlabs/Module/Connedit.php:942 #: ../../Zotlabs/Lib/Apps.php:536 msgid "Update" msgstr "" @@ -9205,7 +9214,7 @@ msgstr "" msgid "Edit Webpage" msgstr "" -#: ../../Zotlabs/Module/Dirsearch.php:28 ../../Zotlabs/Module/Regdir.php:49 +#: ../../Zotlabs/Module/Dirsearch.php:28 ../../Zotlabs/Module/Regdir.php:52 msgid "This site is not a directory server" msgstr "" @@ -9221,7 +9230,7 @@ msgstr "" msgid "You have got no unseen posts..." msgstr "" -#: ../../Zotlabs/Module/Pin.php:35 ../../Zotlabs/Module/Item.php:348 +#: ../../Zotlabs/Module/Pin.php:35 ../../Zotlabs/Module/Item.php:448 msgid "Unable to locate original post." msgstr "" @@ -9513,73 +9522,73 @@ msgstr "" msgid "Sorry! Editing of recurrent events is not yet implemented." msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1369 ../../Zotlabs/Module/Connedit.php:925 +#: ../../Zotlabs/Module/Cdav.php:1369 ../../Zotlabs/Module/Connedit.php:927 msgid "Organisation" msgstr "" #: ../../Zotlabs/Module/Cdav.php:1371 ../../Zotlabs/Module/Profiles.php:788 -#: ../../Zotlabs/Module/Connedit.php:927 +#: ../../Zotlabs/Module/Connedit.php:929 msgid "Phone" msgstr "" #: ../../Zotlabs/Module/Cdav.php:1373 ../../Zotlabs/Module/Profiles.php:790 -#: ../../Zotlabs/Module/Connedit.php:929 +#: ../../Zotlabs/Module/Connedit.php:931 msgid "Instant messenger" msgstr "" #: ../../Zotlabs/Module/Cdav.php:1374 ../../Zotlabs/Module/Profiles.php:791 -#: ../../Zotlabs/Module/Connedit.php:930 +#: ../../Zotlabs/Module/Connedit.php:932 msgid "Website" msgstr "" #: ../../Zotlabs/Module/Cdav.php:1375 #: ../../Zotlabs/Module/Admin/Channels.php:160 #: ../../Zotlabs/Module/Profiles.php:504 ../../Zotlabs/Module/Profiles.php:792 -#: ../../Zotlabs/Module/Connedit.php:931 ../../Zotlabs/Module/Locs.php:118 +#: ../../Zotlabs/Module/Connedit.php:933 ../../Zotlabs/Module/Locs.php:122 msgid "Address" msgstr "" #: ../../Zotlabs/Module/Cdav.php:1376 ../../Zotlabs/Module/Profiles.php:793 -#: ../../Zotlabs/Module/Connedit.php:932 +#: ../../Zotlabs/Module/Connedit.php:934 msgid "Note" msgstr "" #: ../../Zotlabs/Module/Cdav.php:1381 ../../Zotlabs/Module/Profiles.php:798 -#: ../../Zotlabs/Module/Connedit.php:937 +#: ../../Zotlabs/Module/Connedit.php:939 msgid "Add Contact" msgstr "" #: ../../Zotlabs/Module/Cdav.php:1382 ../../Zotlabs/Module/Profiles.php:799 -#: ../../Zotlabs/Module/Connedit.php:938 +#: ../../Zotlabs/Module/Connedit.php:940 msgid "Add Field" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1387 ../../Zotlabs/Module/Connedit.php:943 +#: ../../Zotlabs/Module/Cdav.php:1387 ../../Zotlabs/Module/Connedit.php:945 msgid "P.O. Box" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1388 ../../Zotlabs/Module/Connedit.php:944 +#: ../../Zotlabs/Module/Cdav.php:1388 ../../Zotlabs/Module/Connedit.php:946 msgid "Additional" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1389 ../../Zotlabs/Module/Connedit.php:945 +#: ../../Zotlabs/Module/Cdav.php:1389 ../../Zotlabs/Module/Connedit.php:947 msgid "Street" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1390 ../../Zotlabs/Module/Connedit.php:946 +#: ../../Zotlabs/Module/Cdav.php:1390 ../../Zotlabs/Module/Connedit.php:948 msgid "Locality" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1391 ../../Zotlabs/Module/Connedit.php:947 +#: ../../Zotlabs/Module/Cdav.php:1391 ../../Zotlabs/Module/Connedit.php:949 msgid "Region" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1392 ../../Zotlabs/Module/Connedit.php:948 +#: ../../Zotlabs/Module/Cdav.php:1392 ../../Zotlabs/Module/Connedit.php:950 msgid "ZIP Code" msgstr "" #: ../../Zotlabs/Module/Cdav.php:1393 ../../Zotlabs/Module/Profiles.php:759 -#: ../../Zotlabs/Module/Connedit.php:949 +#: ../../Zotlabs/Module/Connedit.php:951 msgid "Country" msgstr "" @@ -9599,32 +9608,38 @@ msgstr "" msgid "Visible to:" msgstr "" -#: ../../Zotlabs/Module/Item.php:634 +#: ../../Zotlabs/Module/Lockview.php:117 ../../Zotlabs/Module/Lockview.php:153 +#: ../../Zotlabs/Module/Acl.php:121 +msgctxt "acl" +msgid "Profile" +msgstr "" + +#: ../../Zotlabs/Module/Item.php:734 msgid "Empty post discarded." msgstr "" -#: ../../Zotlabs/Module/Item.php:1086 +#: ../../Zotlabs/Module/Item.php:1186 msgid "Duplicate post suppressed." msgstr "" -#: ../../Zotlabs/Module/Item.php:1231 +#: ../../Zotlabs/Module/Item.php:1331 msgid "System error. Post not saved." msgstr "" -#: ../../Zotlabs/Module/Item.php:1265 +#: ../../Zotlabs/Module/Item.php:1365 msgid "Your comment is awaiting approval." msgstr "" -#: ../../Zotlabs/Module/Item.php:1382 +#: ../../Zotlabs/Module/Item.php:1482 msgid "Unable to obtain post information from database." msgstr "" -#: ../../Zotlabs/Module/Item.php:1389 +#: ../../Zotlabs/Module/Item.php:1489 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "" -#: ../../Zotlabs/Module/Item.php:1396 +#: ../../Zotlabs/Module/Item.php:1496 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "" @@ -9655,7 +9670,7 @@ msgid "Menu Item Permissions" msgstr "" #: ../../Zotlabs/Module/Mitem.php:168 ../../Zotlabs/Module/Mitem.php:247 -#: ../../Zotlabs/Module/Settings/Channel.php:527 +#: ../../Zotlabs/Module/Settings/Channel.php:528 msgid "(click to open/close)" msgstr "" @@ -9978,7 +9993,7 @@ msgstr "" msgid "Unknown error" msgstr "" -#: ../../Zotlabs/Module/Share.php:104 ../../Zotlabs/Lib/Activity.php:2068 +#: ../../Zotlabs/Module/Share.php:104 ../../Zotlabs/Lib/Activity.php:2119 #, php-format msgid "🔁 Repeated %1$s's %2$s" msgstr "" @@ -10021,10 +10036,6 @@ msgstr "" msgid "Do you authorize the app %s to access your channel data?" msgstr "" -#: ../../Zotlabs/Module/Authorize.php:32 -msgid "Allow" -msgstr "" - #: ../../Zotlabs/Module/Authorize.php:33 #: ../../Zotlabs/Module/Admin/Accounts.php:174 msgid "Deny" @@ -10302,12 +10313,12 @@ msgid "No registrations." msgstr "" #: ../../Zotlabs/Module/Admin/Accounts.php:176 -#: ../../Zotlabs/Module/Connedit.php:637 +#: ../../Zotlabs/Module/Connedit.php:639 msgid "Block" msgstr "" #: ../../Zotlabs/Module/Admin/Accounts.php:177 -#: ../../Zotlabs/Module/Connedit.php:637 +#: ../../Zotlabs/Module/Connedit.php:639 msgid "Unblock" msgstr "" @@ -10598,7 +10609,7 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Site.php:321 #: ../../Zotlabs/Module/Admin/Site.php:322 -#: ../../Zotlabs/Module/Connedit.php:893 ../../Zotlabs/Module/Connedit.php:894 +#: ../../Zotlabs/Module/Connedit.php:895 ../../Zotlabs/Module/Connedit.php:896 msgid "" "words one per line or #tags or /patterns/ or lang=xx, leave blank to import " "all posts" @@ -11168,18 +11179,8 @@ msgstr "" msgid "Please enter your password for verification:" msgstr "" -#: ../../Zotlabs/Module/Removeme.php:63 -msgid "Remove this channel and all its clones from the network" -msgstr "" - -#: ../../Zotlabs/Module/Removeme.php:63 -msgid "" -"By default only the instance of the channel located on this hub will be " -"removed from the network" -msgstr "" - #: ../../Zotlabs/Module/Removeme.php:64 -#: ../../Zotlabs/Module/Settings/Channel.php:595 +#: ../../Zotlabs/Module/Settings/Channel.php:596 msgid "Remove Channel" msgstr "" @@ -11292,7 +11293,7 @@ msgstr "" msgid "Delegated Channel" msgstr "" -#: ../../Zotlabs/Module/Chanview.php:128 +#: ../../Zotlabs/Module/Chanview.php:132 msgid "toggle full screen mode" msgstr "" @@ -11429,18 +11430,6 @@ msgid "" "network. " msgstr "" -#: ../../Zotlabs/Module/Removeaccount.php:60 -msgid "" -"Remove this account, all its channels and all its channel clones from the " -"network" -msgstr "" - -#: ../../Zotlabs/Module/Removeaccount.php:60 -msgid "" -"By default only the instances of the channels located on this hub will be " -"removed from the network" -msgstr "" - #: ../../Zotlabs/Module/Removeaccount.php:61 #: ../../Zotlabs/Module/Settings/Account.php:105 msgid "Remove Account" @@ -11520,11 +11509,11 @@ msgid "" "or restore these in date order (oldest first)." msgstr "" -#: ../../Zotlabs/Module/Display.php:401 +#: ../../Zotlabs/Module/Display.php:394 msgid "Article" msgstr "" -#: ../../Zotlabs/Module/Display.php:453 +#: ../../Zotlabs/Module/Display.php:439 msgid "Item has been removed." msgstr "" @@ -11599,10 +11588,6 @@ msgstr "" msgid "Validate" msgstr "" -#: ../../Zotlabs/Module/Magic.php:78 -msgid "Hub not found." -msgstr "" - #: ../../Zotlabs/Module/Ping.php:337 ../../Zotlabs/Lib/Enotify.php:948 msgid "sent you a private message" msgstr "" @@ -11623,7 +11608,7 @@ msgstr "" msgid "[today]" msgstr "" -#: ../../Zotlabs/Module/Ping.php:456 ../../Zotlabs/Lib/Enotify.php:970 +#: ../../Zotlabs/Module/Ping.php:456 msgid "posted an event" msgstr "" @@ -11632,11 +11617,11 @@ msgstr "" msgid "shared a file with you" msgstr "" -#: ../../Zotlabs/Module/Ping.php:672 ../../Zotlabs/Module/Sse_bs.php:510 +#: ../../Zotlabs/Module/Ping.php:672 ../../Zotlabs/Module/Sse_bs.php:539 msgid "Private forum" msgstr "" -#: ../../Zotlabs/Module/Ping.php:672 ../../Zotlabs/Module/Sse_bs.php:510 +#: ../../Zotlabs/Module/Ping.php:672 ../../Zotlabs/Module/Sse_bs.php:539 msgid "Public forum" msgstr "" @@ -12215,7 +12200,7 @@ msgid "Ignore connection" msgstr "" #: ../../Zotlabs/Module/Connections.php:344 -#: ../../Zotlabs/Module/Connedit.php:645 +#: ../../Zotlabs/Module/Connedit.php:647 msgid "Ignore" msgstr "" @@ -12992,393 +12977,393 @@ msgstr "" msgid "Additional Features" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:328 +#: ../../Zotlabs/Module/Settings/Channel.php:329 msgid "Nobody except yourself" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:329 +#: ../../Zotlabs/Module/Settings/Channel.php:330 msgid "Only those you specifically allow" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:330 +#: ../../Zotlabs/Module/Settings/Channel.php:331 msgid "Approved connections" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:331 +#: ../../Zotlabs/Module/Settings/Channel.php:332 msgid "Any connections" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:332 +#: ../../Zotlabs/Module/Settings/Channel.php:333 msgid "Anybody on this website" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:333 +#: ../../Zotlabs/Module/Settings/Channel.php:334 msgid "Anybody in this network" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:334 +#: ../../Zotlabs/Module/Settings/Channel.php:335 msgid "Anybody authenticated" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:335 +#: ../../Zotlabs/Module/Settings/Channel.php:336 msgid "Anybody on the internet" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:410 +#: ../../Zotlabs/Module/Settings/Channel.php:411 msgid "Publish your default profile in the network directory" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:415 +#: ../../Zotlabs/Module/Settings/Channel.php:416 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:419 +#: ../../Zotlabs/Module/Settings/Channel.php:420 msgid "or" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:428 +#: ../../Zotlabs/Module/Settings/Channel.php:429 msgid "Your channel address is" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:431 +#: ../../Zotlabs/Module/Settings/Channel.php:432 msgid "Your files/photos are accessible via WebDAV at" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:471 +#: ../../Zotlabs/Module/Settings/Channel.php:472 msgid "Automatic membership approval" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:471 +#: ../../Zotlabs/Module/Settings/Channel.php:472 #: ../../Zotlabs/Module/Defperms.php:256 msgid "" "If enabled, connection requests will be approved without your interaction" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:492 +#: ../../Zotlabs/Module/Settings/Channel.php:493 msgid "Channel Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:499 +#: ../../Zotlabs/Module/Settings/Channel.php:500 msgid "Basic Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:501 +#: ../../Zotlabs/Module/Settings/Channel.php:502 #: ../../Zotlabs/Module/Settings/Account.php:104 msgid "Email Address:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:502 +#: ../../Zotlabs/Module/Settings/Channel.php:503 msgid "Your Timezone:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:503 +#: ../../Zotlabs/Module/Settings/Channel.php:504 msgid "Default Post Location:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:503 +#: ../../Zotlabs/Module/Settings/Channel.php:504 msgid "Geographical location to display on your posts" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:504 +#: ../../Zotlabs/Module/Settings/Channel.php:505 msgid "Use Browser Location:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:506 +#: ../../Zotlabs/Module/Settings/Channel.php:507 msgid "Adult Content" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:506 +#: ../../Zotlabs/Module/Settings/Channel.php:507 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:508 +#: ../../Zotlabs/Module/Settings/Channel.php:509 msgid "Security and Privacy Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:510 +#: ../../Zotlabs/Module/Settings/Channel.php:511 msgid "Your permissions are already configured. Click to view/adjust" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:512 +#: ../../Zotlabs/Module/Settings/Channel.php:513 msgid "Hide my online presence" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:512 +#: ../../Zotlabs/Module/Settings/Channel.php:513 msgid "Prevents displaying in your profile that you are online" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:514 +#: ../../Zotlabs/Module/Settings/Channel.php:515 msgid "Simple Privacy Settings:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:515 +#: ../../Zotlabs/Module/Settings/Channel.php:516 msgid "" "Very Public - <em>extremely permissive (should be used with caution)</em>" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:516 +#: ../../Zotlabs/Module/Settings/Channel.php:517 msgid "" "Typical - <em>default public, privacy when desired (similar to social " "network permissions but with improved privacy)</em>" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:517 +#: ../../Zotlabs/Module/Settings/Channel.php:518 msgid "Private - <em>default private, never open or public</em>" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:518 +#: ../../Zotlabs/Module/Settings/Channel.php:519 msgid "Blocked - <em>default blocked to/from everybody</em>" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:520 +#: ../../Zotlabs/Module/Settings/Channel.php:521 msgid "Allow others to tag your posts" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:520 +#: ../../Zotlabs/Module/Settings/Channel.php:521 msgid "" "Often used by the community to retro-actively flag inappropriate content" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:522 +#: ../../Zotlabs/Module/Settings/Channel.php:523 msgid "Channel Permission Limits" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:524 +#: ../../Zotlabs/Module/Settings/Channel.php:525 msgid "Expire other channel content after this many days" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:524 +#: ../../Zotlabs/Module/Settings/Channel.php:525 msgid "0 or blank to use the website limit." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:524 +#: ../../Zotlabs/Module/Settings/Channel.php:525 #, php-format msgid "This website expires after %d days." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:524 +#: ../../Zotlabs/Module/Settings/Channel.php:525 msgid "This website does not expire imported content." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:524 +#: ../../Zotlabs/Module/Settings/Channel.php:525 msgid "The website limit takes precedence if lower than your limit." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:525 +#: ../../Zotlabs/Module/Settings/Channel.php:526 msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:525 +#: ../../Zotlabs/Module/Settings/Channel.php:526 msgid "May reduce spam activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:526 +#: ../../Zotlabs/Module/Settings/Channel.php:527 msgid "Default Privacy Group" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:528 +#: ../../Zotlabs/Module/Settings/Channel.php:529 msgid "Use my default audience setting for the type of object published" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:537 +#: ../../Zotlabs/Module/Settings/Channel.php:538 msgid "Default permissions category" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:543 +#: ../../Zotlabs/Module/Settings/Channel.php:544 msgid "Maximum private messages per day from unknown people:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:543 +#: ../../Zotlabs/Module/Settings/Channel.php:544 msgid "Useful to reduce spamming" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:546 +#: ../../Zotlabs/Module/Settings/Channel.php:547 #: ../../Zotlabs/Lib/Enotify.php:68 msgid "Notification Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:547 +#: ../../Zotlabs/Module/Settings/Channel.php:548 msgid "By default post a status message when:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:548 +#: ../../Zotlabs/Module/Settings/Channel.php:549 msgid "accepting a friend request" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:549 +#: ../../Zotlabs/Module/Settings/Channel.php:550 msgid "joining a forum/community" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:550 +#: ../../Zotlabs/Module/Settings/Channel.php:551 msgid "making an <em>interesting</em> profile change" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:551 +#: ../../Zotlabs/Module/Settings/Channel.php:552 msgid "Send a notification email when:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:552 +#: ../../Zotlabs/Module/Settings/Channel.php:553 msgid "You receive a connection request" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:553 +#: ../../Zotlabs/Module/Settings/Channel.php:554 msgid "Your connections are confirmed" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:554 +#: ../../Zotlabs/Module/Settings/Channel.php:555 msgid "Someone writes on your profile wall" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:555 +#: ../../Zotlabs/Module/Settings/Channel.php:556 msgid "Someone writes a followup comment" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:556 +#: ../../Zotlabs/Module/Settings/Channel.php:557 msgid "You receive a private message" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:557 +#: ../../Zotlabs/Module/Settings/Channel.php:558 msgid "You receive a friend suggestion" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:558 +#: ../../Zotlabs/Module/Settings/Channel.php:559 msgid "You are tagged in a post" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:559 +#: ../../Zotlabs/Module/Settings/Channel.php:560 msgid "You are poked/prodded/etc. in a post" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:561 +#: ../../Zotlabs/Module/Settings/Channel.php:562 msgid "Someone likes your post/comment" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:564 +#: ../../Zotlabs/Module/Settings/Channel.php:565 msgid "Show visual notifications including:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:566 +#: ../../Zotlabs/Module/Settings/Channel.php:567 msgid "Unseen stream activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:567 +#: ../../Zotlabs/Module/Settings/Channel.php:568 msgid "Unseen channel activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:568 +#: ../../Zotlabs/Module/Settings/Channel.php:569 msgid "Unseen private messages" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:568 -#: ../../Zotlabs/Module/Settings/Channel.php:573 +#: ../../Zotlabs/Module/Settings/Channel.php:569 #: ../../Zotlabs/Module/Settings/Channel.php:574 #: ../../Zotlabs/Module/Settings/Channel.php:575 +#: ../../Zotlabs/Module/Settings/Channel.php:576 msgid "Recommended" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:569 +#: ../../Zotlabs/Module/Settings/Channel.php:570 msgid "Upcoming events" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:570 +#: ../../Zotlabs/Module/Settings/Channel.php:571 msgid "Events today" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:571 +#: ../../Zotlabs/Module/Settings/Channel.php:572 msgid "Upcoming birthdays" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:571 +#: ../../Zotlabs/Module/Settings/Channel.php:572 msgid "Not available in all themes" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:572 +#: ../../Zotlabs/Module/Settings/Channel.php:573 msgid "System (personal) notifications" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:573 +#: ../../Zotlabs/Module/Settings/Channel.php:574 msgid "System info messages" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:574 +#: ../../Zotlabs/Module/Settings/Channel.php:575 msgid "System critical alerts" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:575 +#: ../../Zotlabs/Module/Settings/Channel.php:576 msgid "New connections" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:576 +#: ../../Zotlabs/Module/Settings/Channel.php:577 msgid "System Registrations" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:577 +#: ../../Zotlabs/Module/Settings/Channel.php:578 msgid "Unseen shared files" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:578 +#: ../../Zotlabs/Module/Settings/Channel.php:579 msgid "Unseen public stream activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:579 +#: ../../Zotlabs/Module/Settings/Channel.php:580 msgid "Unseen likes and dislikes" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:580 +#: ../../Zotlabs/Module/Settings/Channel.php:581 msgid "Unseen forum posts" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:581 +#: ../../Zotlabs/Module/Settings/Channel.php:582 msgid "Email notification hub (hostname)" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:581 +#: ../../Zotlabs/Module/Settings/Channel.php:582 #, 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:582 +#: ../../Zotlabs/Module/Settings/Channel.php:583 msgid "Show new wall posts, private messages and connections under Notices" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:584 +#: ../../Zotlabs/Module/Settings/Channel.php:585 msgid "Notify me of events this many days in advance" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:584 +#: ../../Zotlabs/Module/Settings/Channel.php:585 msgid "Must be greater than 0" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:589 +#: ../../Zotlabs/Module/Settings/Channel.php:590 msgid "Advanced Account/Page Type Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:590 +#: ../../Zotlabs/Module/Settings/Channel.php:591 msgid "Change the behaviour of this account for special situations" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:592 +#: ../../Zotlabs/Module/Settings/Channel.php:593 msgid "Miscellaneous Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:593 +#: ../../Zotlabs/Module/Settings/Channel.php:594 msgid "Default photo upload folder" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:593 #: ../../Zotlabs/Module/Settings/Channel.php:594 +#: ../../Zotlabs/Module/Settings/Channel.php:595 msgid "%Y - current year, %m - current month" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:594 +#: ../../Zotlabs/Module/Settings/Channel.php:595 msgid "Default file upload folder" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:596 +#: ../../Zotlabs/Module/Settings/Channel.php:597 msgid "Remove this channel." msgstr "" @@ -13625,7 +13610,7 @@ msgstr "" msgid "Submit and proceed" msgstr "" -#: ../../Zotlabs/Module/Menu.php:177 ../../Zotlabs/Module/Locs.php:120 +#: ../../Zotlabs/Module/Menu.php:177 ../../Zotlabs/Module/Locs.php:124 msgid "Drop" msgstr "" @@ -13677,7 +13662,7 @@ msgstr "" msgid "Allow bookmarks" msgstr "" -#: ../../Zotlabs/Module/Defperms.php:68 ../../Zotlabs/Module/Connedit.php:82 +#: ../../Zotlabs/Module/Defperms.php:68 ../../Zotlabs/Module/Connedit.php:89 msgid "Could not access contact record." msgstr "" @@ -13689,23 +13674,23 @@ msgstr "" msgid "Set custom default permissions for new connections" msgstr "" -#: ../../Zotlabs/Module/Defperms.php:255 ../../Zotlabs/Module/Connedit.php:868 +#: ../../Zotlabs/Module/Defperms.php:255 ../../Zotlabs/Module/Connedit.php:870 msgid "Connection Default Permissions" msgstr "" -#: ../../Zotlabs/Module/Defperms.php:256 ../../Zotlabs/Module/Connedit.php:869 +#: ../../Zotlabs/Module/Defperms.php:256 ../../Zotlabs/Module/Connedit.php:871 msgid "Apply these permissions automatically" msgstr "" -#: ../../Zotlabs/Module/Defperms.php:257 ../../Zotlabs/Module/Connedit.php:870 +#: ../../Zotlabs/Module/Defperms.php:257 ../../Zotlabs/Module/Connedit.php:872 msgid "Permission role" msgstr "" -#: ../../Zotlabs/Module/Defperms.php:258 ../../Zotlabs/Module/Connedit.php:871 +#: ../../Zotlabs/Module/Defperms.php:258 ../../Zotlabs/Module/Connedit.php:873 msgid "Add permission role" msgstr "" -#: ../../Zotlabs/Module/Defperms.php:262 ../../Zotlabs/Module/Connedit.php:884 +#: ../../Zotlabs/Module/Defperms.php:262 ../../Zotlabs/Module/Connedit.php:886 msgid "" "The permissions indicated on this page will be applied to all new " "connections." @@ -13902,7 +13887,7 @@ msgstr "" msgid "Add Thing to your Profile" msgstr "" -#: ../../Zotlabs/Module/Rmagic.php:44 +#: ../../Zotlabs/Module/Rmagic.php:46 msgid "Authentication failed." msgstr "" @@ -14107,244 +14092,244 @@ msgid "" "hours." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:113 +#: ../../Zotlabs/Module/Connedit.php:120 msgid "Could not locate selected profile." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:257 +#: ../../Zotlabs/Module/Connedit.php:264 msgid "Connection updated." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:259 +#: ../../Zotlabs/Module/Connedit.php:266 msgid "Failed to update connection record." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:313 +#: ../../Zotlabs/Module/Connedit.php:320 msgid "is now connected to" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:438 +#: ../../Zotlabs/Module/Connedit.php:445 msgid "Could not access address book record." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:486 ../../Zotlabs/Module/Connedit.php:490 +#: ../../Zotlabs/Module/Connedit.php:493 ../../Zotlabs/Module/Connedit.php:497 msgid "Refresh failed - channel is currently unavailable." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:505 ../../Zotlabs/Module/Connedit.php:514 -#: ../../Zotlabs/Module/Connedit.php:523 ../../Zotlabs/Module/Connedit.php:532 -#: ../../Zotlabs/Module/Connedit.php:545 +#: ../../Zotlabs/Module/Connedit.php:512 ../../Zotlabs/Module/Connedit.php:521 +#: ../../Zotlabs/Module/Connedit.php:530 ../../Zotlabs/Module/Connedit.php:539 +#: ../../Zotlabs/Module/Connedit.php:552 msgid "Unable to set address book parameters." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:569 +#: ../../Zotlabs/Module/Connedit.php:571 msgid "Connection has been removed." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:612 +#: ../../Zotlabs/Module/Connedit.php:614 #, php-format msgid "View %s's profile" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:616 +#: ../../Zotlabs/Module/Connedit.php:618 msgid "Refresh Permissions" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:619 +#: ../../Zotlabs/Module/Connedit.php:621 msgid "Fetch updated permissions" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:623 +#: ../../Zotlabs/Module/Connedit.php:625 msgid "Refresh Photo" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:626 +#: ../../Zotlabs/Module/Connedit.php:628 msgid "Fetch updated photo" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:633 +#: ../../Zotlabs/Module/Connedit.php:635 msgid "View recent posts and comments" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:640 +#: ../../Zotlabs/Module/Connedit.php:642 msgid "Block (or Unblock) all communications with this connection" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:641 +#: ../../Zotlabs/Module/Connedit.php:643 msgid "This connection is blocked!" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:645 +#: ../../Zotlabs/Module/Connedit.php:647 msgid "Unignore" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:648 +#: ../../Zotlabs/Module/Connedit.php:650 msgid "Ignore (or Unignore) all inbound communications from this connection" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:649 +#: ../../Zotlabs/Module/Connedit.php:651 msgid "This connection is ignored!" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:653 +#: ../../Zotlabs/Module/Connedit.php:655 msgid "Unarchive" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:653 +#: ../../Zotlabs/Module/Connedit.php:655 msgid "Archive" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:656 +#: ../../Zotlabs/Module/Connedit.php:658 msgid "" "Archive (or Unarchive) this connection - mark channel dead but keep content" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:657 +#: ../../Zotlabs/Module/Connedit.php:659 msgid "This connection is archived!" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:661 +#: ../../Zotlabs/Module/Connedit.php:663 msgid "Unhide" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:661 +#: ../../Zotlabs/Module/Connedit.php:663 msgid "Hide" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:664 +#: ../../Zotlabs/Module/Connedit.php:666 msgid "Hide or Unhide this connection from your other connections" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:665 +#: ../../Zotlabs/Module/Connedit.php:667 msgid "This connection is hidden!" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:672 +#: ../../Zotlabs/Module/Connedit.php:674 msgid "Delete this connection" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:680 +#: ../../Zotlabs/Module/Connedit.php:682 msgid "Fetch Vcard" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:683 +#: ../../Zotlabs/Module/Connedit.php:685 msgid "Fetch electronic calling card for this connection" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:694 +#: ../../Zotlabs/Module/Connedit.php:696 msgid "Open Individual Permissions section by default" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:717 +#: ../../Zotlabs/Module/Connedit.php:719 msgid "Affinity" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:720 +#: ../../Zotlabs/Module/Connedit.php:722 msgid "Open Set Affinity section by default" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:757 +#: ../../Zotlabs/Module/Connedit.php:759 msgid "Filter" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:760 +#: ../../Zotlabs/Module/Connedit.php:762 msgid "Open Custom Filter section by default" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:797 +#: ../../Zotlabs/Module/Connedit.php:799 msgid "Approve this connection" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:797 +#: ../../Zotlabs/Module/Connedit.php:799 msgid "Accept connection to allow communication" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:802 +#: ../../Zotlabs/Module/Connedit.php:804 msgid "Set Affinity" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:805 +#: ../../Zotlabs/Module/Connedit.php:807 msgid "Set Profile" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:808 +#: ../../Zotlabs/Module/Connedit.php:810 msgid "Set Affinity & Profile" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:856 +#: ../../Zotlabs/Module/Connedit.php:858 msgid "This connection is unreachable from this location." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:857 +#: ../../Zotlabs/Module/Connedit.php:859 msgid "This connection may be unreachable from other channel locations." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:859 +#: ../../Zotlabs/Module/Connedit.php:861 msgid "Location independence is not supported by their network." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:865 +#: ../../Zotlabs/Module/Connedit.php:867 msgid "" "This connection is unreachable from this location. Location independence is " "not supported by their network." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:869 +#: ../../Zotlabs/Module/Connedit.php:871 msgid "Connection requests will be approved without your interaction" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:878 +#: ../../Zotlabs/Module/Connedit.php:880 msgid "This connection's primary address is" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:879 +#: ../../Zotlabs/Module/Connedit.php:881 msgid "Available locations:" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:885 +#: ../../Zotlabs/Module/Connedit.php:887 msgid "Connection Tools" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:887 +#: ../../Zotlabs/Module/Connedit.php:889 msgid "Slide to adjust your degree of friendship" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:889 +#: ../../Zotlabs/Module/Connedit.php:891 msgid "Slide to adjust your rating" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:890 ../../Zotlabs/Module/Connedit.php:895 +#: ../../Zotlabs/Module/Connedit.php:892 ../../Zotlabs/Module/Connedit.php:897 msgid "Optionally explain your rating" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:892 +#: ../../Zotlabs/Module/Connedit.php:894 msgid "Custom Filter" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:893 +#: ../../Zotlabs/Module/Connedit.php:895 msgid "Only import posts with this text" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:894 +#: ../../Zotlabs/Module/Connedit.php:896 msgid "Do not import posts with this text" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:896 +#: ../../Zotlabs/Module/Connedit.php:898 msgid "This information is public!" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:901 +#: ../../Zotlabs/Module/Connedit.php:903 msgid "Connection Pending Approval" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:906 +#: ../../Zotlabs/Module/Connedit.php:908 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:913 +#: ../../Zotlabs/Module/Connedit.php:915 msgid "" "Some permissions may be inherited from your channel's <a href=\"settings" "\"><strong>privacy settings</strong></a>, which have higher priority than " @@ -14352,11 +14337,11 @@ msgid "" "any impact unless the inherited setting changes." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:914 +#: ../../Zotlabs/Module/Connedit.php:916 msgid "Last update:" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:922 +#: ../../Zotlabs/Module/Connedit.php:924 msgid "Details" msgstr "" @@ -14385,47 +14370,47 @@ msgstr "" msgid "Download PDL file" msgstr "" -#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54 +#: ../../Zotlabs/Module/Locs.php:27 ../../Zotlabs/Module/Locs.php:57 msgid "Location not found." msgstr "" -#: ../../Zotlabs/Module/Locs.php:62 +#: ../../Zotlabs/Module/Locs.php:65 msgid "Location lookup failed." msgstr "" -#: ../../Zotlabs/Module/Locs.php:66 +#: ../../Zotlabs/Module/Locs.php:69 msgid "" "Please select another location to become primary before removing the primary " "location." msgstr "" -#: ../../Zotlabs/Module/Locs.php:95 +#: ../../Zotlabs/Module/Locs.php:99 msgid "Syncing locations" msgstr "" -#: ../../Zotlabs/Module/Locs.php:105 +#: ../../Zotlabs/Module/Locs.php:109 msgid "No locations found." msgstr "" -#: ../../Zotlabs/Module/Locs.php:116 +#: ../../Zotlabs/Module/Locs.php:120 msgid "Manage Channel Locations" msgstr "" -#: ../../Zotlabs/Module/Locs.php:122 +#: ../../Zotlabs/Module/Locs.php:126 msgid "Sync Now" msgstr "" -#: ../../Zotlabs/Module/Locs.php:123 +#: ../../Zotlabs/Module/Locs.php:127 msgid "Please wait several minutes between consecutive operations." msgstr "" -#: ../../Zotlabs/Module/Locs.php:124 +#: ../../Zotlabs/Module/Locs.php:128 msgid "" "When possible, drop a location by logging into that website/hub and removing " "your channel." msgstr "" -#: ../../Zotlabs/Module/Locs.php:125 +#: ../../Zotlabs/Module/Locs.php:129 msgid "Use this form to drop the location if the hub is no longer operating." msgstr "" @@ -14586,32 +14571,32 @@ msgctxt "permcat" msgid "publisher" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2045 +#: ../../Zotlabs/Lib/Activity.php:2096 #, php-format msgid "Likes %1$s's %2$s" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2048 +#: ../../Zotlabs/Lib/Activity.php:2099 #, php-format msgid "Doesn't like %1$s's %2$s" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2054 +#: ../../Zotlabs/Lib/Activity.php:2105 #, php-format msgid "Will attend %s's event" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2057 +#: ../../Zotlabs/Lib/Activity.php:2108 #, php-format msgid "Will not attend %s's event" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2060 +#: ../../Zotlabs/Lib/Activity.php:2111 #, php-format msgid "May attend %s's event" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2063 +#: ../../Zotlabs/Lib/Activity.php:2114 #, php-format msgid "May not attend %s's event" msgstr "" @@ -14891,7 +14876,11 @@ msgstr "" msgid "edited a comment dated %s" msgstr "" -#: ../../Zotlabs/Lib/Connect.php:275 +#: ../../Zotlabs/Lib/Enotify.php:970 +msgid "created an event" +msgstr "" + +#: ../../Zotlabs/Lib/Connect.php:271 msgid "error saving data" msgstr "" diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 984a5b4f9..122bb5904 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -11,29 +11,6 @@ nav .dropdown-menu { min-width: 16rem; } -@media screen and (min-width: 992px) { - nav .badge { - top: 0px; - left: 0px; - line-height: 0.75; - } -} - -@media screen and (max-width: 992px) { - .navbar { - padding: .5rem 7px; - } - - nav .badge { - top: 0.5rem; - left: 1.5rem; - } -} - -.widget .badge { - font-size: 100%; -} - .nav-item.nav-item-hack { height: 2.3rem; } @@ -77,10 +54,6 @@ nav .dropdown-menu { } /* nav overrides end */ -.list-group-item:hover { - text-decoration: none; -} - label { font-weight: bold; } diff --git a/view/es-es/hmessages.po b/view/es-es/hmessages.po index 569a24983..ea2b77f3a 100644 --- a/view/es-es/hmessages.po +++ b/view/es-es/hmessages.po @@ -5,8 +5,8 @@ # Translators: # Alfonso Martínez <alfonsomthd@tutanota.com>, 2015 # inboxwall <axetransit@gmail.com>, 2015 -# jeroenpraat <jeroenpraat@disroot.org>, 2015 -# Manuel Jiménez Friaza <mjfriaza@disroot.org>, 2017-2019 +# jeroenpraat, 2015 +# Manuel Jiménez Friaza <mjfriaza@disroot.org>, 2017-2020 # Manuel Jiménez Friaza <mjfriaza@disroot.org>, 2015-2017 # Rafael, 2015 # tony baldwin <tonybaldwin@gmx.com>, 2014 @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: hubzilla\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-11 08:09+0000\n" -"PO-Revision-Date: 2019-11-16 14:43+0000\n" +"POT-Creation-Date: 2020-09-17 11:07+0000\n" +"PO-Revision-Date: 2020-09-26 10:15+0000\n" "Last-Translator: Manuel Jiménez Friaza <mjfriaza@disroot.org>\n" "Language-Team: Spanish (Spain) (http://www.transifex.com/Friendica/hubzilla/language/es_ES/)\n" "MIME-Version: 1.0\n" @@ -23,8 +23,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: es_ES\n" "Plural-Forms: nplurals=2; plural=(n != 1 ? 1 : 0);\n" -#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3231 -#: ../../Zotlabs/Module/Admin/Site.php:187 + +#: ../../view/theme/redbasic/php/config.php:15 +#: ../../addon/cart/submodules/orderoptions.php:335 +#: ../../addon/cart/submodules/orderoptions.php:359 +#: ../../addon/cart/submodules/orderoptions.php:435 +#: ../../addon/cart/submodules/orderoptions.php:459 +#: ../../include/text.php:3360 ../../Zotlabs/Module/Admin/Site.php:185 msgid "Default" msgstr "Predeterminado" @@ -34,7 +39,7 @@ msgid "Focus (Hubzilla default)" msgstr "Focus (predefinido)" #: ../../view/theme/redbasic/php/config.php:94 -#: ../../addon/channelreputation/channelreputation.php:142 +#: ../../addon/channelreputation/channelreputation.php:143 #: ../../addon/openclipatar/openclipatar.php:53 #: ../../addon/photocache/Mod_Photocache.php:67 #: ../../addon/redred/Mod_Redred.php:90 @@ -42,92 +47,91 @@ msgstr "Focus (predefinido)" #: ../../addon/statusnet/Mod_Statusnet.php:193 #: ../../addon/statusnet/Mod_Statusnet.php:251 #: ../../addon/statusnet/Mod_Statusnet.php:306 -#: ../../addon/statusnet/statusnet.php:602 -#: ../../addon/frphotos/frphotos.php:97 ../../addon/rtof/Mod_Rtof.php:72 -#: ../../addon/wppost/Mod_Wppost.php:97 +#: ../../addon/statusnet/statusnet.php:602 ../../addon/rtof/Mod_Rtof.php:72 +#: ../../addon/wppost/Mod_Wppost.php:109 #: ../../addon/content_import/Mod_content_import.php:142 -#: ../../addon/openstreetmap/openstreetmap.php:153 +#: ../../addon/openstreetmap/openstreetmap.php:155 #: ../../addon/ijpost/Mod_Ijpost.php:72 #: ../../addon/pubcrawl/Mod_Pubcrawl.php:65 -#: ../../addon/dwpost/Mod_Dwpost.php:71 +#: ../../addon/dwpost/Mod_Dwpost.php:80 #: ../../addon/startpage/Mod_Startpage.php:73 -#: ../../addon/twitter/Mod_Twitter.php:184 +#: ../../addon/mail/Mod_Mail.php:310 ../../addon/twitter/Mod_Twitter.php:184 #: ../../addon/pumpio/Mod_Pumpio.php:115 #: ../../addon/cart/submodules/subscriptions.php:410 -#: ../../addon/cart/submodules/hzservices.php:642 -#: ../../addon/cart/submodules/manualcat.php:250 -#: ../../addon/cart/Settings/Cart.php:114 ../../addon/cart/cart.php:1258 +#: ../../addon/cart/submodules/hzservices.php:643 +#: ../../addon/cart/submodules/orderoptions.php:312 +#: ../../addon/cart/submodules/orderoptions.php:412 +#: ../../addon/cart/submodules/manualcat.php:252 +#: ../../addon/cart/Settings/Cart.php:132 +#: ../../addon/cart/Settings/Cart.php:142 ../../addon/cart/cart.php:1261 #: ../../addon/nofed/Mod_Nofed.php:53 #: ../../addon/smileybutton/Mod_Smileybutton.php:55 -#: ../../addon/redfiles/redfiles.php:124 -#: ../../addon/diaspora/Mod_Diaspora.php:102 ../../addon/piwik/piwik.php:95 -#: ../../addon/workflow/workflow.php:1256 -#: ../../addon/workflow/workflow.php:1302 -#: ../../addon/workflow/workflow.php:1399 -#: ../../addon/workflow/workflow.php:2398 +#: ../../addon/redfiles/redfiles.php:124 ../../addon/diaspora/diaspora.php:75 +#: ../../addon/diaspora/Mod_Diaspora.php:100 ../../addon/piwik/piwik.php:95 +#: ../../addon/workflow/workflow.php:1461 +#: ../../addon/workflow/workflow.php:1520 +#: ../../addon/workflow/workflow.php:1639 +#: ../../addon/workflow/workflow.php:2742 #: ../../addon/workflow/Settings/Mod_WorkflowSettings.php:94 #: ../../addon/likebanner/likebanner.php:57 -#: ../../addon/chords/Mod_Chords.php:60 ../../addon/fuzzloc/Mod_Fuzzloc.php:56 -#: ../../addon/flattrwidget/Mod_Flattrwidget.php:92 -#: ../../addon/hubwall/hubwall.php:95 -#: ../../addon/flashcards/Mod_Flashcards.php:213 +#: ../../addon/fuzzloc/Mod_Fuzzloc.php:56 ../../addon/hubwall/hubwall.php:95 +#: ../../addon/flashcards/Mod_Flashcards.php:262 #: ../../addon/libertree/Mod_Libertree.php:70 ../../addon/logrot/logrot.php:35 -#: ../../addon/skeleton/Mod_Skeleton.php:51 ../../addon/nsfw/Mod_Nsfw.php:61 -#: ../../addon/mailtest/mailtest.php:100 ../../addon/ljpost/Mod_Ljpost.php:78 -#: ../../addon/hzfiles/hzfiles.php:86 -#: ../../addon/jappixmini/Mod_Jappixmini.php:261 +#: ../../addon/skeleton/Mod_Skeleton.php:51 +#: ../../addon/socialauth/Mod_SocialAuth.php:330 +#: ../../addon/nsfw/Mod_Nsfw.php:61 ../../addon/mailtest/mailtest.php:100 +#: ../../addon/ljpost/Mod_Ljpost.php:82 ../../addon/hzfiles/hzfiles.php:86 #: ../../addon/pageheader/Mod_Pageheader.php:54 ../../addon/irc/irc.php:45 #: ../../addon/xmpp/Mod_Xmpp.php:70 ../../include/js_strings.php:22 #: ../../Zotlabs/Widget/Wiki_pages.php:42 #: ../../Zotlabs/Widget/Wiki_pages.php:99 #: ../../Zotlabs/Widget/Eventstools.php:16 ../../Zotlabs/Module/Tokens.php:188 #: ../../Zotlabs/Module/Import_items.php:129 -#: ../../Zotlabs/Module/Import.php:646 ../../Zotlabs/Module/Setup.php:304 -#: ../../Zotlabs/Module/Setup.php:344 ../../Zotlabs/Module/Group.php:150 -#: ../../Zotlabs/Module/Group.php:166 ../../Zotlabs/Module/Oauth.php:111 -#: ../../Zotlabs/Module/Chat.php:211 ../../Zotlabs/Module/Chat.php:250 +#: ../../Zotlabs/Module/Import.php:649 ../../Zotlabs/Module/Setup.php:304 +#: ../../Zotlabs/Module/Setup.php:344 ../../Zotlabs/Module/Group.php:151 +#: ../../Zotlabs/Module/Group.php:167 ../../Zotlabs/Module/Oauth.php:111 +#: ../../Zotlabs/Module/Chat.php:209 ../../Zotlabs/Module/Chat.php:248 #: ../../Zotlabs/Module/Poke.php:217 ../../Zotlabs/Module/Mitem.php:259 #: ../../Zotlabs/Module/Filestorage.php:203 -#: ../../Zotlabs/Module/Connect.php:124 ../../Zotlabs/Module/Editpost.php:86 +#: ../../Zotlabs/Module/Connect.php:107 ../../Zotlabs/Module/Editpost.php:86 #: ../../Zotlabs/Module/Admin/Themes.php:158 #: ../../Zotlabs/Module/Admin/Features.php:66 -#: ../../Zotlabs/Module/Admin/Security.php:112 +#: ../../Zotlabs/Module/Admin/Security.php:120 #: ../../Zotlabs/Module/Admin/Accounts.php:168 -#: ../../Zotlabs/Module/Admin/Site.php:289 +#: ../../Zotlabs/Module/Admin/Site.php:287 #: ../../Zotlabs/Module/Admin/Logs.php:84 #: ../../Zotlabs/Module/Admin/Channels.php:147 #: ../../Zotlabs/Module/Admin/Account_edit.php:73 #: ../../Zotlabs/Module/Admin/Profs.php:178 #: ../../Zotlabs/Module/Admin/Addons.php:442 -#: ../../Zotlabs/Module/Events.php:501 ../../Zotlabs/Module/Permcats.php:128 +#: ../../Zotlabs/Module/Events.php:501 ../../Zotlabs/Module/Permcats.php:129 #: ../../Zotlabs/Module/Mood.php:158 ../../Zotlabs/Module/Appman.php:155 #: ../../Zotlabs/Module/Email_validation.php:40 -#: ../../Zotlabs/Module/Photos.php:1055 ../../Zotlabs/Module/Photos.php:1096 -#: ../../Zotlabs/Module/Photos.php:1215 ../../Zotlabs/Module/Profiles.php:723 +#: ../../Zotlabs/Module/Photos.php:1057 ../../Zotlabs/Module/Photos.php:1097 +#: ../../Zotlabs/Module/Photos.php:1215 ../../Zotlabs/Module/Profiles.php:725 #: ../../Zotlabs/Module/Invite.php:168 ../../Zotlabs/Module/Xchan.php:15 -#: ../../Zotlabs/Module/Mail.php:436 ../../Zotlabs/Module/Affinity.php:87 -#: ../../Zotlabs/Module/Rate.php:166 -#: ../../Zotlabs/Module/Settings/Network.php:61 -#: ../../Zotlabs/Module/Settings/Features.php:46 -#: ../../Zotlabs/Module/Settings/Channel.php:493 +#: ../../Zotlabs/Module/Affinity.php:87 ../../Zotlabs/Module/Rate.php:166 +#: ../../Zotlabs/Module/Settings/Network.php:62 +#: ../../Zotlabs/Module/Settings/Features.php:48 +#: ../../Zotlabs/Module/Settings/Channel.php:494 #: ../../Zotlabs/Module/Settings/Account.php:103 -#: ../../Zotlabs/Module/Settings/Events.php:41 -#: ../../Zotlabs/Module/Settings/Manage.php:41 -#: ../../Zotlabs/Module/Settings/Channel_home.php:89 -#: ../../Zotlabs/Module/Settings/Calendar.php:41 -#: ../../Zotlabs/Module/Settings/Display.php:189 -#: ../../Zotlabs/Module/Settings/Directory.php:41 -#: ../../Zotlabs/Module/Settings/Editor.php:41 -#: ../../Zotlabs/Module/Settings/Connections.php:41 -#: ../../Zotlabs/Module/Settings/Photos.php:41 -#: ../../Zotlabs/Module/Settings/Profiles.php:50 -#: ../../Zotlabs/Module/Settings/Conversation.php:48 -#: ../../Zotlabs/Module/Defperms.php:265 ../../Zotlabs/Module/Pconfig.php:116 -#: ../../Zotlabs/Module/Oauth2.php:116 ../../Zotlabs/Module/Thing.php:326 -#: ../../Zotlabs/Module/Thing.php:379 ../../Zotlabs/Module/Pdledit.php:107 -#: ../../Zotlabs/Module/Wiki.php:215 ../../Zotlabs/Module/Connedit.php:904 +#: ../../Zotlabs/Module/Settings/Events.php:42 +#: ../../Zotlabs/Module/Settings/Manage.php:43 +#: ../../Zotlabs/Module/Settings/Channel_home.php:91 +#: ../../Zotlabs/Module/Settings/Calendar.php:42 +#: ../../Zotlabs/Module/Settings/Display.php:190 +#: ../../Zotlabs/Module/Settings/Directory.php:42 +#: ../../Zotlabs/Module/Settings/Editor.php:42 +#: ../../Zotlabs/Module/Settings/Connections.php:42 +#: ../../Zotlabs/Module/Settings/Photos.php:42 +#: ../../Zotlabs/Module/Settings/Profiles.php:52 +#: ../../Zotlabs/Module/Settings/Conversation.php:49 +#: ../../Zotlabs/Module/Defperms.php:266 ../../Zotlabs/Module/Pconfig.php:116 +#: ../../Zotlabs/Module/Oauth2.php:116 ../../Zotlabs/Module/Thing.php:328 +#: ../../Zotlabs/Module/Thing.php:381 ../../Zotlabs/Module/Pdledit.php:108 +#: ../../Zotlabs/Module/Wiki.php:215 ../../Zotlabs/Module/Connedit.php:905 #: ../../Zotlabs/Module/Locs.php:121 ../../Zotlabs/Module/Sources.php:125 -#: ../../Zotlabs/Module/Sources.php:162 ../../Zotlabs/Lib/ThreadItem.php:796 +#: ../../Zotlabs/Module/Sources.php:162 ../../Zotlabs/Lib/ThreadItem.php:825 msgid "Submit" msgstr "Enviar" @@ -141,121 +145,131 @@ msgstr "Estrechar la barra de navegación" #: ../../view/theme/redbasic/php/config.php:99 #: ../../view/theme/redbasic/php/config.php:116 -#: ../../addon/channelreputation/channelreputation.php:110 +#: ../../addon/channelreputation/channelreputation.php:111 #: ../../addon/redred/Mod_Redred.php:63 #: ../../addon/statusnet/Mod_Statusnet.php:260 #: ../../addon/statusnet/Mod_Statusnet.php:282 #: ../../addon/statusnet/Mod_Statusnet.php:291 -#: ../../addon/rtof/Mod_Rtof.php:49 ../../addon/wppost/Mod_Wppost.php:82 -#: ../../addon/wppost/Mod_Wppost.php:86 +#: ../../addon/rtof/Mod_Rtof.php:49 ../../addon/wppost/Mod_Wppost.php:86 +#: ../../addon/wppost/Mod_Wppost.php:90 ../../addon/wppost/Mod_Wppost.php:94 #: ../../addon/content_import/Mod_content_import.php:137 #: ../../addon/content_import/Mod_content_import.php:138 #: ../../addon/ijpost/Mod_Ijpost.php:61 #: ../../addon/pubcrawl/Mod_Pubcrawl.php:45 -#: ../../addon/dwpost/Mod_Dwpost.php:60 +#: ../../addon/dwpost/Mod_Dwpost.php:61 ../../addon/dwpost/Mod_Dwpost.php:65 #: ../../addon/twitter/Mod_Twitter.php:162 #: ../../addon/twitter/Mod_Twitter.php:171 #: ../../addon/pumpio/Mod_Pumpio.php:94 ../../addon/pumpio/Mod_Pumpio.php:98 #: ../../addon/pumpio/Mod_Pumpio.php:102 #: ../../addon/cart/submodules/subscriptions.php:153 #: ../../addon/cart/submodules/subscriptions.php:425 -#: ../../addon/cart/submodules/hzservices.php:64 -#: ../../addon/cart/submodules/hzservices.php:648 -#: ../../addon/cart/submodules/hzservices.php:652 +#: ../../addon/cart/submodules/hzservices.php:65 +#: ../../addon/cart/submodules/hzservices.php:649 +#: ../../addon/cart/submodules/hzservices.php:653 +#: ../../addon/cart/submodules/orderoptions.php:72 +#: ../../addon/cart/submodules/orderoptions.php:338 +#: ../../addon/cart/submodules/orderoptions.php:362 +#: ../../addon/cart/submodules/orderoptions.php:438 +#: ../../addon/cart/submodules/orderoptions.php:462 #: ../../addon/cart/submodules/paypalbutton.php:87 #: ../../addon/cart/submodules/paypalbutton.php:95 +#: ../../addon/cart/submodules/paypalbuttonV2.php:88 +#: ../../addon/cart/submodules/paypalbuttonV2.php:96 #: ../../addon/cart/submodules/manualcat.php:63 -#: ../../addon/cart/submodules/manualcat.php:256 -#: ../../addon/cart/submodules/manualcat.php:260 -#: ../../addon/cart/Settings/Cart.php:59 ../../addon/cart/Settings/Cart.php:71 -#: ../../addon/cart/cart.php:1252 ../../addon/nofed/Mod_Nofed.php:42 +#: ../../addon/cart/submodules/manualcat.php:258 +#: ../../addon/cart/submodules/manualcat.php:262 +#: ../../addon/cart/Settings/Cart.php:61 ../../addon/cart/Settings/Cart.php:73 +#: ../../addon/cart/cart.php:1255 ../../addon/nofed/Mod_Nofed.php:42 #: ../../addon/smileybutton/Mod_Smileybutton.php:44 #: ../../addon/libertree/Mod_Libertree.php:59 -#: ../../addon/ljpost/Mod_Ljpost.php:62 ../../addon/ljpost/Mod_Ljpost.php:66 -#: ../../addon/jappixmini/Mod_Jappixmini.php:161 -#: ../../addon/jappixmini/Mod_Jappixmini.php:191 -#: ../../addon/jappixmini/Mod_Jappixmini.php:199 -#: ../../addon/jappixmini/Mod_Jappixmini.php:203 -#: ../../addon/jappixmini/Mod_Jappixmini.php:207 ../../include/dir_fns.php:143 -#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145 -#: ../../Zotlabs/Module/Import.php:635 ../../Zotlabs/Module/Import.php:639 -#: ../../Zotlabs/Module/Import.php:640 ../../Zotlabs/Module/Mitem.php:176 -#: ../../Zotlabs/Module/Mitem.php:177 ../../Zotlabs/Module/Mitem.php:256 -#: ../../Zotlabs/Module/Mitem.php:257 ../../Zotlabs/Module/Filestorage.php:198 +#: ../../addon/socialauth/Mod_SocialAuth.php:214 +#: ../../addon/ljpost/Mod_Ljpost.php:63 ../../addon/ljpost/Mod_Ljpost.php:67 +#: ../../addon/ljpost/Mod_Ljpost.php:71 ../../include/conversation.php:1451 +#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144 +#: ../../include/dir_fns.php:145 ../../Zotlabs/Module/Import.php:638 +#: ../../Zotlabs/Module/Import.php:642 ../../Zotlabs/Module/Import.php:643 +#: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:177 +#: ../../Zotlabs/Module/Mitem.php:256 ../../Zotlabs/Module/Mitem.php:257 +#: ../../Zotlabs/Module/Filestorage.php:198 #: ../../Zotlabs/Module/Filestorage.php:206 -#: ../../Zotlabs/Module/Admin/Site.php:255 +#: ../../Zotlabs/Module/Admin/Site.php:253 #: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Events.php:478 #: ../../Zotlabs/Module/Events.php:479 ../../Zotlabs/Module/Api.php:99 -#: ../../Zotlabs/Module/Photos.php:670 ../../Zotlabs/Module/Profiles.php:681 -#: ../../Zotlabs/Module/Settings/Channel.php:309 -#: ../../Zotlabs/Module/Settings/Display.php:89 +#: ../../Zotlabs/Module/Photos.php:672 ../../Zotlabs/Module/Profiles.php:683 +#: ../../Zotlabs/Module/Settings/Channel.php:310 +#: ../../Zotlabs/Module/Settings/Display.php:90 #: ../../Zotlabs/Module/Menu.php:163 ../../Zotlabs/Module/Menu.php:222 -#: ../../Zotlabs/Module/Defperms.php:197 ../../Zotlabs/Module/Wiki.php:227 -#: ../../Zotlabs/Module/Wiki.php:228 ../../Zotlabs/Module/Connedit.php:406 -#: ../../Zotlabs/Module/Connedit.php:796 ../../Zotlabs/Module/Sources.php:124 +#: ../../Zotlabs/Module/Defperms.php:198 ../../Zotlabs/Module/Wiki.php:227 +#: ../../Zotlabs/Module/Wiki.php:228 ../../Zotlabs/Module/Connedit.php:407 +#: ../../Zotlabs/Module/Connedit.php:797 ../../Zotlabs/Module/Sources.php:124 #: ../../Zotlabs/Module/Sources.php:159 ../../Zotlabs/Lib/Libzotdir.php:162 #: ../../Zotlabs/Lib/Libzotdir.php:163 ../../Zotlabs/Lib/Libzotdir.php:165 -#: ../../Zotlabs/Storage/Browser.php:411 ../../boot.php:1679 +#: ../../Zotlabs/Storage/Browser.php:411 ../../boot.php:1703 msgid "No" msgstr "No" #: ../../view/theme/redbasic/php/config.php:99 #: ../../view/theme/redbasic/php/config.php:116 -#: ../../addon/channelreputation/channelreputation.php:110 +#: ../../addon/channelreputation/channelreputation.php:111 #: ../../addon/redred/Mod_Redred.php:63 #: ../../addon/statusnet/Mod_Statusnet.php:260 #: ../../addon/statusnet/Mod_Statusnet.php:282 #: ../../addon/statusnet/Mod_Statusnet.php:291 -#: ../../addon/rtof/Mod_Rtof.php:49 ../../addon/wppost/Mod_Wppost.php:82 -#: ../../addon/wppost/Mod_Wppost.php:86 +#: ../../addon/rtof/Mod_Rtof.php:49 ../../addon/wppost/Mod_Wppost.php:86 +#: ../../addon/wppost/Mod_Wppost.php:90 ../../addon/wppost/Mod_Wppost.php:94 #: ../../addon/content_import/Mod_content_import.php:137 #: ../../addon/content_import/Mod_content_import.php:138 #: ../../addon/ijpost/Mod_Ijpost.php:61 #: ../../addon/pubcrawl/Mod_Pubcrawl.php:45 -#: ../../addon/dwpost/Mod_Dwpost.php:60 +#: ../../addon/dwpost/Mod_Dwpost.php:61 ../../addon/dwpost/Mod_Dwpost.php:65 #: ../../addon/twitter/Mod_Twitter.php:162 #: ../../addon/twitter/Mod_Twitter.php:171 #: ../../addon/pumpio/Mod_Pumpio.php:94 ../../addon/pumpio/Mod_Pumpio.php:98 #: ../../addon/pumpio/Mod_Pumpio.php:102 #: ../../addon/cart/submodules/subscriptions.php:153 #: ../../addon/cart/submodules/subscriptions.php:425 -#: ../../addon/cart/submodules/hzservices.php:64 -#: ../../addon/cart/submodules/hzservices.php:648 -#: ../../addon/cart/submodules/hzservices.php:652 +#: ../../addon/cart/submodules/hzservices.php:65 +#: ../../addon/cart/submodules/hzservices.php:649 +#: ../../addon/cart/submodules/hzservices.php:653 +#: ../../addon/cart/submodules/orderoptions.php:72 +#: ../../addon/cart/submodules/orderoptions.php:337 +#: ../../addon/cart/submodules/orderoptions.php:361 +#: ../../addon/cart/submodules/orderoptions.php:437 +#: ../../addon/cart/submodules/orderoptions.php:461 #: ../../addon/cart/submodules/paypalbutton.php:87 #: ../../addon/cart/submodules/paypalbutton.php:95 +#: ../../addon/cart/submodules/paypalbuttonV2.php:88 +#: ../../addon/cart/submodules/paypalbuttonV2.php:96 #: ../../addon/cart/submodules/manualcat.php:63 -#: ../../addon/cart/submodules/manualcat.php:256 -#: ../../addon/cart/submodules/manualcat.php:260 -#: ../../addon/cart/Settings/Cart.php:59 ../../addon/cart/Settings/Cart.php:71 -#: ../../addon/cart/cart.php:1252 ../../addon/nofed/Mod_Nofed.php:42 +#: ../../addon/cart/submodules/manualcat.php:258 +#: ../../addon/cart/submodules/manualcat.php:262 +#: ../../addon/cart/Settings/Cart.php:61 ../../addon/cart/Settings/Cart.php:73 +#: ../../addon/cart/cart.php:1255 ../../addon/nofed/Mod_Nofed.php:42 #: ../../addon/smileybutton/Mod_Smileybutton.php:44 #: ../../addon/libertree/Mod_Libertree.php:59 -#: ../../addon/ljpost/Mod_Ljpost.php:62 ../../addon/ljpost/Mod_Ljpost.php:66 -#: ../../addon/jappixmini/Mod_Jappixmini.php:161 -#: ../../addon/jappixmini/Mod_Jappixmini.php:191 -#: ../../addon/jappixmini/Mod_Jappixmini.php:199 -#: ../../addon/jappixmini/Mod_Jappixmini.php:203 -#: ../../addon/jappixmini/Mod_Jappixmini.php:207 ../../include/dir_fns.php:143 -#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145 -#: ../../Zotlabs/Module/Import.php:635 ../../Zotlabs/Module/Import.php:639 -#: ../../Zotlabs/Module/Import.php:640 ../../Zotlabs/Module/Mitem.php:176 -#: ../../Zotlabs/Module/Mitem.php:177 ../../Zotlabs/Module/Mitem.php:256 -#: ../../Zotlabs/Module/Mitem.php:257 ../../Zotlabs/Module/Filestorage.php:198 +#: ../../addon/socialauth/Mod_SocialAuth.php:214 +#: ../../addon/ljpost/Mod_Ljpost.php:63 ../../addon/ljpost/Mod_Ljpost.php:67 +#: ../../addon/ljpost/Mod_Ljpost.php:71 ../../include/conversation.php:1451 +#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144 +#: ../../include/dir_fns.php:145 ../../Zotlabs/Module/Import.php:638 +#: ../../Zotlabs/Module/Import.php:642 ../../Zotlabs/Module/Import.php:643 +#: ../../Zotlabs/Module/Mitem.php:176 ../../Zotlabs/Module/Mitem.php:177 +#: ../../Zotlabs/Module/Mitem.php:256 ../../Zotlabs/Module/Mitem.php:257 +#: ../../Zotlabs/Module/Filestorage.php:198 #: ../../Zotlabs/Module/Filestorage.php:206 -#: ../../Zotlabs/Module/Admin/Site.php:257 +#: ../../Zotlabs/Module/Admin/Site.php:255 #: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Events.php:478 #: ../../Zotlabs/Module/Events.php:479 ../../Zotlabs/Module/Api.php:98 -#: ../../Zotlabs/Module/Photos.php:670 ../../Zotlabs/Module/Profiles.php:681 -#: ../../Zotlabs/Module/Settings/Channel.php:309 -#: ../../Zotlabs/Module/Settings/Display.php:89 +#: ../../Zotlabs/Module/Photos.php:672 ../../Zotlabs/Module/Profiles.php:683 +#: ../../Zotlabs/Module/Settings/Channel.php:310 +#: ../../Zotlabs/Module/Settings/Display.php:90 #: ../../Zotlabs/Module/Menu.php:163 ../../Zotlabs/Module/Menu.php:222 -#: ../../Zotlabs/Module/Defperms.php:197 ../../Zotlabs/Module/Wiki.php:227 -#: ../../Zotlabs/Module/Wiki.php:228 ../../Zotlabs/Module/Connedit.php:406 +#: ../../Zotlabs/Module/Defperms.php:198 ../../Zotlabs/Module/Wiki.php:227 +#: ../../Zotlabs/Module/Wiki.php:228 ../../Zotlabs/Module/Connedit.php:407 #: ../../Zotlabs/Module/Sources.php:124 ../../Zotlabs/Module/Sources.php:159 #: ../../Zotlabs/Lib/Libzotdir.php:162 ../../Zotlabs/Lib/Libzotdir.php:163 #: ../../Zotlabs/Lib/Libzotdir.php:165 ../../Zotlabs/Storage/Browser.php:411 -#: ../../boot.php:1679 +#: ../../boot.php:1703 msgid "Yes" msgstr "Sí" @@ -343,91 +357,91 @@ msgstr "Mostrar ajustes avanzados" msgid "Source channel not found." msgstr "No se ha encontrado el canal de origen." -#: ../../addon/channelreputation/channelreputation.php:100 #: ../../addon/channelreputation/channelreputation.php:101 +#: ../../addon/channelreputation/channelreputation.php:102 #: ../../addon/cart/myshop.php:141 ../../addon/cart/myshop.php:177 #: ../../addon/cart/myshop.php:211 ../../addon/cart/myshop.php:259 #: ../../addon/cart/myshop.php:294 ../../addon/cart/myshop.php:317 msgid "Access Denied" msgstr "Acceso denegado" -#: ../../addon/channelreputation/channelreputation.php:108 +#: ../../addon/channelreputation/channelreputation.php:109 msgid "Enable Community Moderation" msgstr "Habilitar la moderación de la comunidad" -#: ../../addon/channelreputation/channelreputation.php:116 +#: ../../addon/channelreputation/channelreputation.php:117 msgid "Reputation automatically given to new members" msgstr "La reputación se otorga automáticamente a los nuevos miembros" -#: ../../addon/channelreputation/channelreputation.php:117 +#: ../../addon/channelreputation/channelreputation.php:118 msgid "Reputation will never fall below this value" msgstr "La reputación nunca caerá por debajo de este valor" -#: ../../addon/channelreputation/channelreputation.php:118 +#: ../../addon/channelreputation/channelreputation.php:119 msgid "Minimum reputation before posting is allowed" msgstr "Reputación mínima antes de que se permita el envío de entradas" -#: ../../addon/channelreputation/channelreputation.php:119 +#: ../../addon/channelreputation/channelreputation.php:120 msgid "Minimum reputation before commenting is allowed" msgstr "Mínima reputación antes de que se permitan los comentarios" -#: ../../addon/channelreputation/channelreputation.php:120 +#: ../../addon/channelreputation/channelreputation.php:121 msgid "Minimum reputation before a member is able to moderate other posts" msgstr "Reputación mínima antes de que un miembro sea capaz de moderar otros mensajes" -#: ../../addon/channelreputation/channelreputation.php:121 +#: ../../addon/channelreputation/channelreputation.php:122 msgid "" "Max ratio of moderator's reputation that can be added to/deducted from " "reputation of person being moderated" msgstr "Proporción máxima de la reputación del moderador que puede ser añadida/descontada de la reputación de la persona que está siendo moderada." -#: ../../addon/channelreputation/channelreputation.php:122 +#: ../../addon/channelreputation/channelreputation.php:123 msgid "Reputation \"cost\" to post" msgstr "\"Coste\" de la reputación a contabilizar" -#: ../../addon/channelreputation/channelreputation.php:123 +#: ../../addon/channelreputation/channelreputation.php:124 msgid "Reputation \"cost\" to comment" msgstr "\"Coste\" de la reputación para comentar" -#: ../../addon/channelreputation/channelreputation.php:124 +#: ../../addon/channelreputation/channelreputation.php:125 msgid "" "Reputation automatically recovers at this rate per hour until it reaches " "minimum_to_post" msgstr "La reputación se recupera automáticamente a esta tasa por hora hasta que alcanza el mínimo_a_post" -#: ../../addon/channelreputation/channelreputation.php:125 +#: ../../addon/channelreputation/channelreputation.php:126 msgid "" "When minimum_to_moderate > reputation > minimum_to_post reputation recovers " "at this rate per hour" msgstr "Cuando el mínimo_a_moderar > reputación > mínimo_a_publicar la reputación se recupera a esta tasa por hora " -#: ../../addon/channelreputation/channelreputation.php:139 +#: ../../addon/channelreputation/channelreputation.php:140 msgid "Community Moderation Settings" msgstr "Configuración de la moderación de la comunidad" -#: ../../addon/channelreputation/channelreputation.php:229 +#: ../../addon/channelreputation/channelreputation.php:232 msgid "Channel Reputation" msgstr "Reputación del canal" -#: ../../addon/channelreputation/channelreputation.php:230 -#: ../../include/acl_selectors.php:125 ../../Zotlabs/Module/Photos.php:1274 -#: ../../Zotlabs/Lib/ThreadItem.php:463 +#: ../../addon/channelreputation/channelreputation.php:233 +#: ../../include/acl_selectors.php:125 ../../Zotlabs/Widget/Pinned.php:160 +#: ../../Zotlabs/Module/Photos.php:1274 ../../Zotlabs/Lib/ThreadItem.php:495 msgid "Close" msgstr "Cerrar" -#: ../../addon/channelreputation/channelreputation.php:233 +#: ../../addon/channelreputation/channelreputation.php:236 msgid "An Error has occurred." msgstr "Se ha producido un error." -#: ../../addon/channelreputation/channelreputation.php:251 +#: ../../addon/channelreputation/channelreputation.php:254 msgid "Upvote" msgstr "Votar a favor" -#: ../../addon/channelreputation/channelreputation.php:252 +#: ../../addon/channelreputation/channelreputation.php:255 msgid "Downvote" msgstr "Votar en contra" -#: ../../addon/channelreputation/channelreputation.php:374 +#: ../../addon/channelreputation/channelreputation.php:414 msgid "Can moderate reputation on my channel." msgstr "Se puede moderar la reputación en mi canal." @@ -446,37 +460,36 @@ msgstr "App Superblock" #: ../../addon/gallery/Mod_Gallery.php:58 #: ../../addon/planets/Mod_Planets.php:20 ../../addon/redred/Mod_Redred.php:50 #: ../../addon/statusnet/Mod_Statusnet.php:146 -#: ../../addon/rtof/Mod_Rtof.php:36 ../../addon/wppost/Mod_Wppost.php:41 +#: ../../addon/rtof/Mod_Rtof.php:36 ../../addon/wppost/Mod_Wppost.php:43 #: ../../addon/hsse/Mod_Hsse.php:21 ../../addon/ijpost/Mod_Ijpost.php:35 #: ../../addon/pubcrawl/Mod_Pubcrawl.php:40 -#: ../../addon/dwpost/Mod_Dwpost.php:36 +#: ../../addon/dwpost/Mod_Dwpost.php:39 #: ../../addon/startpage/Mod_Startpage.php:50 #: ../../addon/twitter/Mod_Twitter.php:78 ../../addon/pumpio/Mod_Pumpio.php:53 #: ../../addon/sendzid/Mod_Sendzid.php:20 ../../addon/nofed/Mod_Nofed.php:33 #: ../../addon/smileybutton/Mod_Smileybutton.php:35 #: ../../addon/diaspora/Mod_Diaspora.php:58 #: ../../addon/fuzzloc/Mod_Fuzzloc.php:34 -#: ../../addon/flattrwidget/Mod_Flattrwidget.php:53 #: ../../addon/libertree/Mod_Libertree.php:35 +#: ../../addon/hideaside/Mod_Hideaside.php:23 #: ../../addon/skeleton/Mod_Skeleton.php:32 ../../addon/nsfw/Mod_Nsfw.php:33 -#: ../../addon/gnusoc/Mod_Gnusoc.php:22 ../../addon/ljpost/Mod_Ljpost.php:37 -#: ../../addon/jappixmini/Mod_Jappixmini.php:96 +#: ../../addon/gnusoc/Mod_Gnusoc.php:22 ../../addon/ljpost/Mod_Ljpost.php:38 #: ../../addon/authchoose/Mod_Authchoose.php:28 #: ../../addon/pageheader/Mod_Pageheader.php:34 #: ../../addon/xmpp/Mod_Xmpp.php:35 ../../Zotlabs/Module/Tokens.php:99 -#: ../../Zotlabs/Module/Group.php:106 ../../Zotlabs/Module/Oauth.php:100 -#: ../../Zotlabs/Module/Chat.php:102 ../../Zotlabs/Module/Poke.php:165 -#: ../../Zotlabs/Module/Cdav.php:899 ../../Zotlabs/Module/Webpages.php:48 -#: ../../Zotlabs/Module/Connect.php:104 ../../Zotlabs/Module/Pubstream.php:20 -#: ../../Zotlabs/Module/Permcats.php:62 ../../Zotlabs/Module/Lang.php:17 -#: ../../Zotlabs/Module/Uexport.php:61 ../../Zotlabs/Module/Mood.php:134 -#: ../../Zotlabs/Module/Cards.php:51 ../../Zotlabs/Module/Articles.php:52 -#: ../../Zotlabs/Module/Bookmarks.php:78 ../../Zotlabs/Module/Probe.php:18 -#: ../../Zotlabs/Module/Invite.php:110 ../../Zotlabs/Module/Notes.php:56 -#: ../../Zotlabs/Module/Affinity.php:52 ../../Zotlabs/Module/Defperms.php:189 -#: ../../Zotlabs/Module/Oauth2.php:106 ../../Zotlabs/Module/Randprof.php:29 -#: ../../Zotlabs/Module/Pdledit.php:42 ../../Zotlabs/Module/Wiki.php:52 -#: ../../Zotlabs/Module/Suggest.php:40 ../../Zotlabs/Module/Sources.php:88 +#: ../../Zotlabs/Module/Group.php:107 ../../Zotlabs/Module/Oauth.php:100 +#: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Poke.php:165 +#: ../../Zotlabs/Module/Cdav.php:872 ../../Zotlabs/Module/Webpages.php:48 +#: ../../Zotlabs/Module/Pubstream.php:20 ../../Zotlabs/Module/Permcats.php:63 +#: ../../Zotlabs/Module/Lang.php:17 ../../Zotlabs/Module/Uexport.php:61 +#: ../../Zotlabs/Module/Mood.php:134 ../../Zotlabs/Module/Cards.php:51 +#: ../../Zotlabs/Module/Articles.php:52 ../../Zotlabs/Module/Bookmarks.php:78 +#: ../../Zotlabs/Module/Probe.php:18 ../../Zotlabs/Module/Invite.php:110 +#: ../../Zotlabs/Module/Notes.php:57 ../../Zotlabs/Module/Affinity.php:52 +#: ../../Zotlabs/Module/Defperms.php:190 ../../Zotlabs/Module/Oauth2.php:106 +#: ../../Zotlabs/Module/Randprof.php:29 ../../Zotlabs/Module/Pdledit.php:43 +#: ../../Zotlabs/Module/Wiki.php:52 ../../Zotlabs/Module/Suggest.php:40 +#: ../../Zotlabs/Module/Sources.php:88 msgid "Not Installed" msgstr "No instalado/a" @@ -499,9 +512,9 @@ msgstr "No hay canales bloqueados actualmente" #: ../../addon/superblock/Mod_Superblock.php:91 #: ../../Zotlabs/Module/Tagrm.php:137 #: ../../Zotlabs/Module/Admin/Addons.php:459 -#: ../../Zotlabs/Module/Profile_photo.php:499 -#: ../../Zotlabs/Module/Cover_photo.php:430 -#: ../../Zotlabs/Module/Photos.php:993 +#: ../../Zotlabs/Module/Profile_photo.php:501 +#: ../../Zotlabs/Module/Cover_photo.php:424 +#: ../../Zotlabs/Module/Photos.php:995 msgid "Remove" msgstr "Eliminar" @@ -513,6 +526,7 @@ msgstr "App NSA Bait " #: ../../addon/nsabait/Mod_Nsabait.php:24 #: ../../addon/rainbowtag/Mod_Rainbowtag.php:26 #: ../../addon/planets/Mod_Planets.php:23 ../../addon/hsse/Mod_Hsse.php:26 +#: ../../addon/hideaside/Mod_Hideaside.php:27 #: ../../addon/authchoose/Mod_Authchoose.php:33 msgid "Installed" msgstr "Instalado" @@ -562,14 +576,14 @@ msgstr "Regresar después" msgid "Page to load after image selection." msgstr "Página para cargar después de la selección de imágenes." -#: ../../addon/openclipatar/openclipatar.php:57 ../../include/nav.php:110 -#: ../../include/conversation.php:1038 ../../Zotlabs/Module/Connedit.php:608 -#: ../../Zotlabs/Lib/Apps.php:343 +#: ../../addon/openclipatar/openclipatar.php:57 ../../include/nav.php:112 +#: ../../include/conversation.php:1065 ../../Zotlabs/Module/Connedit.php:609 +#: ../../Zotlabs/Lib/Apps.php:344 msgid "View Profile" msgstr "Ver el perfil" -#: ../../addon/openclipatar/openclipatar.php:58 ../../include/nav.php:115 -#: ../../include/channel.php:1430 +#: ../../addon/openclipatar/openclipatar.php:58 ../../include/nav.php:117 +#: ../../include/channel.php:1527 msgid "Edit Profile" msgstr "Editar el perfil" @@ -644,7 +658,7 @@ msgid "Unknown error. Please try again later." msgstr "Error desconocido. Por favor, inténtelo otra vez." #: ../../addon/openclipatar/openclipatar.php:298 -#: ../../Zotlabs/Module/Profile_photo.php:252 +#: ../../Zotlabs/Module/Profile_photo.php:254 msgid "" "Shift-reload the page or clear browser cache if the new photo does not " "display immediately." @@ -655,7 +669,7 @@ msgid "Profile photo updated successfully." msgstr "Se ha actualizado con éxito la foto de perfil." #: ../../addon/bookmarker/bookmarker.php:38 -#: ../../Zotlabs/Lib/ThreadItem.php:440 +#: ../../Zotlabs/Lib/ThreadItem.php:472 msgid "Save Bookmarks" msgstr "Guardar en Marcadores" @@ -677,171 +691,14 @@ msgstr "Haga una pausa antes de comenzar la siguiente tarea: (microsegundos. Mí msgid "Queueworker Settings" msgstr "Configuración del gestor de procesos de trabajo en cola" -#: ../../addon/queueworker/Mod_Queueworker.php:119 ../../include/text.php:1106 -#: ../../include/text.php:1118 ../../Zotlabs/Widget/Notes.php:23 +#: ../../addon/queueworker/Mod_Queueworker.php:119 ../../include/text.php:1132 +#: ../../include/text.php:1144 ../../Zotlabs/Widget/Notes.php:23 #: ../../Zotlabs/Module/Admin/Profs.php:94 #: ../../Zotlabs/Module/Admin/Profs.php:114 ../../Zotlabs/Module/Filer.php:53 #: ../../Zotlabs/Module/Rbmark.php:32 ../../Zotlabs/Module/Rbmark.php:104 msgid "Save" msgstr "Guardar" -#: ../../addon/tour/tour.php:76 -msgid "Edit your profile and change settings." -msgstr "Editar su perfil y cambiar los ajustes." - -#: ../../addon/tour/tour.php:77 -msgid "Click here to see activity from your connections." -msgstr "Pulsar aquí para ver la actividad de sus conexiones." - -#: ../../addon/tour/tour.php:78 -msgid "Click here to see your channel home." -msgstr "Pulsar aquí para ver la página de inicio de su canal." - -#: ../../addon/tour/tour.php:79 -msgid "You can access your private messages from here." -msgstr "Puede acceder a sus mensajes privados desde aquí." - -#: ../../addon/tour/tour.php:80 -msgid "Create new events here." -msgstr "Crear nuevos eventos aquí." - -#: ../../addon/tour/tour.php:81 -msgid "" -"You can accept new connections and change permissions for existing ones " -"here. You can also e.g. create groups of contacts." -msgstr "Puede aceptar nuevas conexiones y cambiar permisos para las que ya existen aquí. También puede, por ejemplo, crear grupos de contactos." - -#: ../../addon/tour/tour.php:82 -msgid "System notifications will arrive here" -msgstr "Las notificaciones del sistema llegarán aquí" - -#: ../../addon/tour/tour.php:83 -msgid "Search for content and users" -msgstr "Buscar contenido y usuarios" - -#: ../../addon/tour/tour.php:84 -msgid "Browse for new contacts" -msgstr "Buscar nuevos contactos" - -#: ../../addon/tour/tour.php:85 -msgid "Launch installed apps" -msgstr "Iniciar aplicaciones instaladas" - -#: ../../addon/tour/tour.php:86 -msgid "Looking for help? Click here." -msgstr "¿Busca ayuda? Pulse aquí." - -#: ../../addon/tour/tour.php:87 -msgid "" -"New events have occurred in your network. Click here to see what has " -"happened!" -msgstr "Se han producido nuevos eventos en su red. ¡Haga clic aquí para ver lo que ha sucedido!" - -#: ../../addon/tour/tour.php:88 -msgid "You have received a new private message. Click here to see from who!" -msgstr "Ha recibido un nuevo mensaje privado. Haga clic aquí para ver de quién!" - -#: ../../addon/tour/tour.php:89 -msgid "There are events this week. Click here too see which!" -msgstr "Hay eventos esta semana. Haga clic aquí para ver cuáles!" - -#: ../../addon/tour/tour.php:90 -msgid "You have received a new introduction. Click here to see who!" -msgstr "Ha recibido una nueva solicitud de conexión. ¡Pulse aquí para ver de quién!" - -#: ../../addon/tour/tour.php:91 -msgid "" -"There is a new system notification. Click here to see what has happened!" -msgstr "Hay una nueva notificación del sistema. ¡Haga clic aquí para ver lo que ha sucedido!" - -#: ../../addon/tour/tour.php:94 -msgid "Click here to share text, images, videos and sound." -msgstr "Haga clic aquí para compartir texto, imágenes, vídeos y sonido." - -#: ../../addon/tour/tour.php:95 -msgid "You can write an optional title for your update (good for long posts)." -msgstr "Puede escribir un título opcional para su actualización (bueno para los mensajes largos)." - -#: ../../addon/tour/tour.php:96 -msgid "Entering some categories here makes it easier to find your post later." -msgstr "Al ingresar algunos temas aquí, es más fácil encontrar su publicación más tarde." - -#: ../../addon/tour/tour.php:97 -msgid "Share photos, links, location, etc." -msgstr "Compartir fotos, enlaces, ubicación, etc." - -#: ../../addon/tour/tour.php:98 -msgid "" -"Only want to share content for a while? Make it expire at a certain date." -msgstr "¿Solo quieres compartir contenido durante un tiempo? Haga que expire en una fecha determinada." - -#: ../../addon/tour/tour.php:99 -msgid "You can password protect content." -msgstr "Puede proteger contenido con una contraseña." - -#: ../../addon/tour/tour.php:100 -msgid "Choose who you share with." -msgstr "Elegir con quién compartir." - -#: ../../addon/tour/tour.php:102 -msgid "Click here when you are done." -msgstr "Haga clic aquí cuando haya terminado." - -#: ../../addon/tour/tour.php:105 -msgid "Adjust from which channels posts should be displayed." -msgstr "Ajustar de qué canales se deben mostrar las publicaciones." - -#: ../../addon/tour/tour.php:106 -msgid "Only show posts from channels in the specified privacy group." -msgstr "Mostrar solo las entradas de los canales de un grupo específico de canales." - -#: ../../addon/tour/tour.php:110 -msgid "Easily find posts containing tags (keywords preceded by the \"#\" symbol)." -msgstr "Encuentre fácilmente entradas que contengan etiquetas (palabras clave precedidas del símbolo \"#\")." - -#: ../../addon/tour/tour.php:111 -msgid "Easily find posts in given category." -msgstr "Encuentre fácilmente las publicaciones en una categoría dada." - -#: ../../addon/tour/tour.php:112 -msgid "Easily find posts by date." -msgstr "Encuentre fácilmente entradas por fechas." - -#: ../../addon/tour/tour.php:113 -msgid "" -"Suggested users who have volounteered to be shown as suggestions, and who we" -" think you might find interesting." -msgstr "Se sugiere a los usuarios que se han ofrecido voluntariamente que se muestren como sugerencias, y que creemos que podrían resultar interesantes." - -#: ../../addon/tour/tour.php:114 -msgid "Here you see channels you have connected to." -msgstr "Aquí puede ver los canales a los que está conectado." - -#: ../../addon/tour/tour.php:115 -msgid "Save your search so you can repeat it at a later date." -msgstr "Guarde su búsqueda para poder repetirla en una fecha posterior." - -#: ../../addon/tour/tour.php:118 -msgid "" -"If you see this icon you can be sure that the sender is who it say it is. It" -" is normal that it is not always possible to verify the sender, so the icon " -"will be missing sometimes. There is usually no need to worry about that." -msgstr "Si ve este icono puede estar seguro de que el remitente es quien dice ser. Es normal que no siempre sea posible verificar el remitente, por lo que el icono faltará en ocasiones. Por lo general, no hay necesidad de preocuparse por eso." - -#: ../../addon/tour/tour.php:119 -msgid "" -"Danger! It seems someone tried to forge a message! This message is not " -"necessarily from who it says it is from!" -msgstr "¡Peligro! ¡Parece que alguien intentó falsificar un mensaje! ¡Este mensaje no es necesariamente de quien dice que es!" - -#: ../../addon/tour/tour.php:126 -msgid "" -"Welcome to Hubzilla! Would you like to see a tour of the UI?</p> <p>You can " -"pause it at any time and continue where you left off by reloading the page, " -"or navigting to another page.</p><p>You can also advance by pressing the " -"return key" -msgstr "¡Bienvenido/a a Hubzilla! ¿Quiere hacer un recorrido por la interfaz de usuario?</p> <p> Puede detenerlo en cualquier momento y continuar donde lo dejó recargando la página o navegando a otra.</p> <p> También puede avanzar pulsando la tecla de retorno" - #: ../../addon/rainbowtag/Mod_Rainbowtag.php:15 msgid "Add some colour to tag clouds" msgstr "Añadir color a las nubes de etiquetas" @@ -881,15 +738,15 @@ msgstr "En píxeles. Desde 1 hasta 1024, 0 será reemplazado por el predetermina msgid "Photo Cache" msgstr "Photo Cache" -#: ../../addon/gallery/gallery.php:38 ../../addon/gallery/Mod_Gallery.php:136 +#: ../../addon/gallery/gallery.php:43 ../../addon/gallery/Mod_Gallery.php:136 msgid "Gallery" msgstr "Galería" -#: ../../addon/gallery/gallery.php:41 +#: ../../addon/gallery/gallery.php:46 msgid "Photo Gallery" msgstr "Galería de fotos" -#: ../../addon/gallery/Mod_Gallery.php:49 ../../include/channel.php:1327 +#: ../../addon/gallery/Mod_Gallery.php:49 ../../include/channel.php:1424 #: ../../Zotlabs/Module/Hcard.php:12 ../../Zotlabs/Module/Editwebpage.php:32 #: ../../Zotlabs/Module/Profile.php:20 ../../Zotlabs/Module/Webpages.php:39 #: ../../Zotlabs/Module/Filestorage.php:53 ../../Zotlabs/Module/Connect.php:17 @@ -918,34 +775,34 @@ msgid "" "Set a random planet from the Star Wars Empire as your location when posting" msgstr "Establecer un planeta aleatorio del Imperio de la Guerra de las Galaxias como su ubicación cuando publique." -#: ../../addon/openid/Mod_Id.php:53 ../../addon/pumpio/pumpio.php:44 -#: ../../addon/keepout/keepout.php:36 -#: ../../addon/flashcards/Mod_Flashcards.php:276 ../../include/photos.php:27 -#: ../../include/items.php:3796 ../../include/attach.php:150 -#: ../../include/attach.php:199 ../../include/attach.php:272 -#: ../../include/attach.php:380 ../../include/attach.php:394 -#: ../../include/attach.php:401 ../../include/attach.php:483 -#: ../../include/attach.php:1043 ../../include/attach.php:1117 -#: ../../include/attach.php:1280 ../../Zotlabs/Module/Article_edit.php:51 +#: ../../addon/openid/Mod_Id.php:53 ../../addon/mail/Mod_Mail.php:25 +#: ../../addon/pumpio/pumpio.php:44 ../../addon/keepout/keepout.php:36 +#: ../../include/photos.php:27 ../../include/items.php:3965 +#: ../../include/attach.php:156 ../../include/attach.php:205 +#: ../../include/attach.php:278 ../../include/attach.php:386 +#: ../../include/attach.php:400 ../../include/attach.php:407 +#: ../../include/attach.php:489 ../../include/attach.php:1055 +#: ../../include/attach.php:1129 ../../include/attach.php:1292 +#: ../../Zotlabs/Module/Article_edit.php:51 #: ../../Zotlabs/Module/Network.php:19 ../../Zotlabs/Module/Register.php:80 #: ../../Zotlabs/Module/Setup.php:206 #: ../../Zotlabs/Module/Viewconnections.php:28 #: ../../Zotlabs/Module/Viewconnections.php:33 -#: ../../Zotlabs/Module/Channel.php:169 ../../Zotlabs/Module/Channel.php:332 -#: ../../Zotlabs/Module/Channel.php:371 ../../Zotlabs/Module/Group.php:14 -#: ../../Zotlabs/Module/Group.php:30 ../../Zotlabs/Module/Card_edit.php:51 +#: ../../Zotlabs/Module/Channel.php:181 ../../Zotlabs/Module/Channel.php:348 +#: ../../Zotlabs/Module/Channel.php:387 ../../Zotlabs/Module/Group.php:15 +#: ../../Zotlabs/Module/Group.php:31 ../../Zotlabs/Module/Card_edit.php:51 #: ../../Zotlabs/Module/Editwebpage.php:68 #: ../../Zotlabs/Module/Editwebpage.php:89 #: ../../Zotlabs/Module/Editwebpage.php:107 -#: ../../Zotlabs/Module/Editwebpage.php:121 ../../Zotlabs/Module/Chat.php:115 -#: ../../Zotlabs/Module/Chat.php:120 -#: ../../Zotlabs/Module/Channel_calendar.php:224 -#: ../../Zotlabs/Module/Like.php:187 ../../Zotlabs/Module/Poke.php:157 -#: ../../Zotlabs/Module/Item.php:417 ../../Zotlabs/Module/Item.php:436 -#: ../../Zotlabs/Module/Item.php:446 ../../Zotlabs/Module/Item.php:1315 +#: ../../Zotlabs/Module/Editwebpage.php:121 ../../Zotlabs/Module/Chat.php:113 +#: ../../Zotlabs/Module/Chat.php:118 +#: ../../Zotlabs/Module/Channel_calendar.php:230 +#: ../../Zotlabs/Module/Like.php:193 ../../Zotlabs/Module/Poke.php:157 +#: ../../Zotlabs/Module/Item.php:383 ../../Zotlabs/Module/Item.php:402 +#: ../../Zotlabs/Module/Item.php:412 ../../Zotlabs/Module/Item.php:1328 #: ../../Zotlabs/Module/Mitem.php:129 ../../Zotlabs/Module/Profile.php:85 #: ../../Zotlabs/Module/Profile.php:101 -#: ../../Zotlabs/Module/Sharedwithme.php:16 +#: ../../Zotlabs/Module/Sharedwithme.php:19 #: ../../Zotlabs/Module/Webpages.php:133 #: ../../Zotlabs/Module/Filestorage.php:17 #: ../../Zotlabs/Module/Filestorage.php:72 @@ -956,7 +813,7 @@ msgstr "Establecer un planeta aleatorio del Imperio de la Guerra de las Galaxias #: ../../Zotlabs/Module/Achievements.php:34 #: ../../Zotlabs/Module/Events.php:277 ../../Zotlabs/Module/Manage.php:10 #: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Viewsrc.php:19 -#: ../../Zotlabs/Module/Moderate.php:13 ../../Zotlabs/Module/Display.php:451 +#: ../../Zotlabs/Module/Moderate.php:15 ../../Zotlabs/Module/Display.php:456 #: ../../Zotlabs/Module/Common.php:38 ../../Zotlabs/Module/New_channel.php:105 #: ../../Zotlabs/Module/New_channel.php:130 #: ../../Zotlabs/Module/Service_limits.php:11 @@ -964,41 +821,41 @@ msgstr "Establecer un planeta aleatorio del Imperio de la Guerra de las Galaxias #: ../../Zotlabs/Module/Cards.php:86 ../../Zotlabs/Module/Api.php:24 #: ../../Zotlabs/Module/Regmod.php:20 ../../Zotlabs/Module/Blocks.php:73 #: ../../Zotlabs/Module/Blocks.php:80 ../../Zotlabs/Module/Message.php:18 -#: ../../Zotlabs/Module/Profile_photo.php:336 -#: ../../Zotlabs/Module/Profile_photo.php:349 +#: ../../Zotlabs/Module/Vote.php:19 ../../Zotlabs/Module/Profile_photo.php:338 +#: ../../Zotlabs/Module/Profile_photo.php:351 #: ../../Zotlabs/Module/Editblock.php:67 ../../Zotlabs/Module/Settings.php:59 #: ../../Zotlabs/Module/Editlayout.php:67 #: ../../Zotlabs/Module/Editlayout.php:90 #: ../../Zotlabs/Module/Connections.php:32 -#: ../../Zotlabs/Module/Cover_photo.php:347 -#: ../../Zotlabs/Module/Cover_photo.php:360 ../../Zotlabs/Module/Photos.php:69 +#: ../../Zotlabs/Module/Cover_photo.php:341 +#: ../../Zotlabs/Module/Cover_photo.php:354 ../../Zotlabs/Module/Photos.php:71 #: ../../Zotlabs/Module/Page.php:34 ../../Zotlabs/Module/Page.php:133 -#: ../../Zotlabs/Module/Profiles.php:198 ../../Zotlabs/Module/Profiles.php:635 +#: ../../Zotlabs/Module/Profiles.php:200 ../../Zotlabs/Module/Profiles.php:637 #: ../../Zotlabs/Module/Articles.php:89 ../../Zotlabs/Module/Bookmarks.php:70 #: ../../Zotlabs/Module/Invite.php:21 ../../Zotlabs/Module/Invite.php:102 -#: ../../Zotlabs/Module/Mail.php:150 ../../Zotlabs/Module/Block.php:24 -#: ../../Zotlabs/Module/Block.php:74 ../../Zotlabs/Module/Rate.php:113 -#: ../../Zotlabs/Module/Menu.php:130 ../../Zotlabs/Module/Menu.php:141 -#: ../../Zotlabs/Module/Defperms.php:181 ../../Zotlabs/Module/Thing.php:280 -#: ../../Zotlabs/Module/Thing.php:300 ../../Zotlabs/Module/Thing.php:341 -#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Wiki.php:59 -#: ../../Zotlabs/Module/Wiki.php:285 ../../Zotlabs/Module/Wiki.php:428 -#: ../../Zotlabs/Module/Suggest.php:32 ../../Zotlabs/Module/Connedit.php:399 +#: ../../Zotlabs/Module/Block.php:24 ../../Zotlabs/Module/Block.php:74 +#: ../../Zotlabs/Module/Rate.php:113 ../../Zotlabs/Module/Menu.php:130 +#: ../../Zotlabs/Module/Menu.php:141 ../../Zotlabs/Module/Defperms.php:182 +#: ../../Zotlabs/Module/Thing.php:282 ../../Zotlabs/Module/Thing.php:302 +#: ../../Zotlabs/Module/Thing.php:343 ../../Zotlabs/Module/Pdledit.php:35 +#: ../../Zotlabs/Module/Wiki.php:59 ../../Zotlabs/Module/Wiki.php:285 +#: ../../Zotlabs/Module/Wiki.php:428 ../../Zotlabs/Module/Suggest.php:32 +#: ../../Zotlabs/Module/Connedit.php:400 #: ../../Zotlabs/Module/Notifications.php:11 #: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78 #: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Locs.php:87 -#: ../../Zotlabs/Module/Sources.php:80 ../../Zotlabs/Lib/Chatroom.php:133 -#: ../../Zotlabs/Web/WebServer.php:123 +#: ../../Zotlabs/Module/Sources.php:80 ../../Zotlabs/Lib/Chatroom.php:135 +#: ../../Zotlabs/Web/WebServer.php:115 msgid "Permission denied." msgstr "Acceso denegado." #: ../../addon/openid/Mod_Id.php:85 ../../include/selectors.php:60 -#: ../../include/selectors.php:77 ../../include/channel.php:1610 +#: ../../include/selectors.php:77 ../../include/channel.php:1707 msgid "Male" msgstr "Hombre" #: ../../addon/openid/Mod_Id.php:87 ../../include/selectors.php:60 -#: ../../include/selectors.php:77 ../../include/channel.php:1608 +#: ../../include/selectors.php:77 ../../include/channel.php:1705 msgid "Female" msgstr "Mujer" @@ -1012,7 +869,7 @@ msgstr "Error de protocolo OpenID. No se recuperó ninguna ID." msgid "Welcome %s. Remote authentication successful." msgstr "Bienvenido %s. La identificación desde su servidor se ha llevado a cabo correctamente." -#: ../../addon/openid/Mod_Openid.php:188 ../../include/auth.php:317 +#: ../../addon/openid/Mod_Openid.php:188 ../../include/auth.php:320 msgid "Login failed." msgstr "El acceso ha fallado." @@ -1046,16 +903,16 @@ msgstr "Nombre completo" #: ../../addon/openid/MysqlProvider.php:56 #: ../../addon/openid/MysqlProvider.php:57 #: ../../addon/redred/Mod_Redred.php:71 ../../addon/rtof/Mod_Rtof.php:57 -#: ../../include/network.php:1732 ../../Zotlabs/Module/Cdav.php:1377 +#: ../../include/network.php:1736 ../../Zotlabs/Module/Cdav.php:1372 #: ../../Zotlabs/Module/Admin/Accounts.php:171 #: ../../Zotlabs/Module/Admin/Accounts.php:183 -#: ../../Zotlabs/Module/Profiles.php:787 ../../Zotlabs/Module/Connedit.php:927 +#: ../../Zotlabs/Module/Profiles.php:789 ../../Zotlabs/Module/Connedit.php:928 msgid "Email" msgstr "Correo electrónico" #: ../../addon/openid/MysqlProvider.php:58 #: ../../addon/openid/MysqlProvider.php:59 -#: ../../addon/openid/MysqlProvider.php:60 ../../Zotlabs/Lib/Apps.php:360 +#: ../../addon/openid/MysqlProvider.php:60 ../../Zotlabs/Lib/Apps.php:361 msgid "Profile Photo" msgstr "Foto del perfil" @@ -1083,16 +940,16 @@ msgstr "Foto del perfil 80px" msgid "Profile Photo 128px" msgstr "Foto del perfil 128px" -#: ../../addon/openid/MysqlProvider.php:67 +#: ../../addon/openid/MysqlProvider.php:67 ../../include/event.php:123 msgid "Timezone" msgstr "Zona horaria" #: ../../addon/openid/MysqlProvider.php:68 -#: ../../Zotlabs/Module/Profiles.php:767 +#: ../../Zotlabs/Module/Profiles.php:769 msgid "Homepage URL" msgstr "Dirección de la página personal" -#: ../../addon/openid/MysqlProvider.php:69 ../../Zotlabs/Lib/Apps.php:358 +#: ../../addon/openid/MysqlProvider.php:69 ../../Zotlabs/Lib/Apps.php:359 msgid "Language" msgstr "Idioma" @@ -1113,7 +970,7 @@ msgid "Birthdate" msgstr "Fecha de nacimiento" #: ../../addon/openid/MysqlProvider.php:74 -#: ../../Zotlabs/Module/Profiles.php:486 +#: ../../Zotlabs/Module/Profiles.php:488 msgid "Gender" msgstr "Género" @@ -1268,7 +1125,7 @@ msgstr "Tenga en cuenta que las estadísticas de Diaspora y Friendica se refiere msgid "Channel is required." msgstr "Se requiere un canal." -#: ../../addon/redred/Mod_Redred.php:29 ../../Zotlabs/Module/Network.php:325 +#: ../../addon/redred/Mod_Redred.php:29 ../../Zotlabs/Module/Network.php:326 msgid "Invalid channel." msgstr "El canal no es válido." @@ -1306,7 +1163,6 @@ msgid "Hubzilla channel name" msgstr "Nombre del canal de Hubzilla" #: ../../addon/redred/Mod_Redred.php:79 -#: ../../addon/jappixmini/Mod_Jappixmini.php:195 msgid "Hubzilla password" msgstr "Contraseña de Hubzilla" @@ -1323,14 +1179,13 @@ msgid "Photos imported" msgstr "Se han importado las fotos" #: ../../addon/redphotos/redphotos.php:119 -#: ../../addon/frphotos/frphotos.php:82 ../../addon/redfiles/redfiles.php:109 -#: ../../addon/hzfiles/hzfiles.php:75 ../../include/items.php:435 -#: ../../Zotlabs/Module/Import_items.php:120 -#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Group.php:98 -#: ../../Zotlabs/Module/Like.php:301 ../../Zotlabs/Module/Cloud.php:119 -#: ../../Zotlabs/Module/Share.php:71 ../../Zotlabs/Module/Subthread.php:86 +#: ../../addon/redfiles/redfiles.php:109 ../../addon/hzfiles/hzfiles.php:75 +#: ../../include/items.php:439 ../../Zotlabs/Module/Import_items.php:120 +#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Group.php:99 +#: ../../Zotlabs/Module/Like.php:295 ../../Zotlabs/Module/Cloud.php:119 +#: ../../Zotlabs/Module/Share.php:72 ../../Zotlabs/Module/Subthread.php:86 #: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:82 -#: ../../Zotlabs/Web/WebServer.php:122 +#: ../../Zotlabs/Web/WebServer.php:114 msgid "Permission denied" msgstr "Permiso denegado" @@ -1374,10 +1229,10 @@ msgid "0 or blank to import all available" msgstr "0 o en blanco para importar todos los disponibles" #: ../../addon/redphotos/redphotohelper.php:71 -#: ../../addon/pubcrawl/as.php:1692 ../../addon/diaspora/Receiver.php:1592 -#: ../../include/text.php:2119 ../../include/conversation.php:116 -#: ../../Zotlabs/Module/Like.php:392 ../../Zotlabs/Module/Tagger.php:69 -#: ../../Zotlabs/Module/Subthread.php:112 ../../Zotlabs/Lib/Activity.php:2444 +#: ../../addon/pubcrawl/as.php:1810 ../../addon/diaspora/Receiver.php:1597 +#: ../../include/text.php:2233 ../../include/conversation.php:118 +#: ../../Zotlabs/Module/Like.php:386 ../../Zotlabs/Module/Tagger.php:71 +#: ../../Zotlabs/Module/Subthread.php:112 ../../Zotlabs/Lib/Activity.php:2892 msgid "photo" msgstr "foto" @@ -1509,7 +1364,7 @@ msgid "Post to GNU social" msgstr "Publicar en GNU social" #: ../../addon/statusnet/statusnet.php:593 -#: ../../Zotlabs/Module/Admin/Site.php:297 +#: ../../Zotlabs/Module/Admin/Site.php:295 msgid "Site name" msgstr "Nombre del sitio" @@ -1517,13 +1372,13 @@ msgstr "Nombre del sitio" msgid "API URL" msgstr "URL de la API" -#: ../../addon/statusnet/statusnet.php:595 ../../addon/twitter/twitter.php:501 +#: ../../addon/statusnet/statusnet.php:595 ../../addon/twitter/twitter.php:506 #: ../../Zotlabs/Module/Oauth.php:115 ../../Zotlabs/Module/Oauth.php:141 #: ../../Zotlabs/Module/Oauth2.php:119 ../../Zotlabs/Module/Oauth2.php:147 msgid "Consumer Secret" msgstr "Consumer Secret" -#: ../../addon/statusnet/statusnet.php:596 ../../addon/twitter/twitter.php:500 +#: ../../addon/statusnet/statusnet.php:596 ../../addon/twitter/twitter.php:505 #: ../../Zotlabs/Module/Oauth.php:114 ../../Zotlabs/Module/Oauth.php:140 msgid "Consumer Key" msgstr "Consumer Key" @@ -1532,26 +1387,6 @@ msgstr "Consumer Key" msgid "Application name" msgstr "Nombre de la aplicación" -#: ../../addon/frphotos/frphotos.php:92 -msgid "Friendica Photo Album Import" -msgstr "Importar un álbum de fotos de Friendica" - -#: ../../addon/frphotos/frphotos.php:93 -msgid "This will import all your Friendica photo albums to this Red channel." -msgstr "Esto importará todos sus álbumes de fotos de Friendica a este canal de Hubzilla." - -#: ../../addon/frphotos/frphotos.php:94 -msgid "Friendica Server base URL" -msgstr "URL base del servidor de Friendica" - -#: ../../addon/frphotos/frphotos.php:95 -msgid "Friendica Login Username" -msgstr "Nombre de inicio de sesión en Friendica" - -#: ../../addon/frphotos/frphotos.php:96 -msgid "Friendica Login Password" -msgstr "Contraseña de inicio de sesión en Friendica" - #: ../../addon/rtof/Mod_Rtof.php:24 msgid "Friendica Crosspost Connector Settings saved." msgstr "Se han guardado los ajustes del conector de publicación cruzada con Friendica." @@ -1592,51 +1427,66 @@ msgstr "Publicar en Friendica" msgid "Post to WordPress" msgstr "Publicar en WordPress" -#: ../../addon/wppost/Mod_Wppost.php:28 +#: ../../addon/wppost/wppost.php:173 ../../addon/wppost/Mod_Wppost.php:98 +#: ../../addon/dwpost/Mod_Dwpost.php:69 ../../addon/dwpost/dwpost.php:134 +#: ../../addon/ljpost/ljpost.php:134 ../../Zotlabs/Module/Wiki.php:384 +msgid "Source" +msgstr "Fuente" + +#: ../../addon/wppost/Mod_Wppost.php:30 msgid "Wordpress Settings saved." msgstr "Se han guardado los ajustes de WordPress." -#: ../../addon/wppost/Mod_Wppost.php:41 +#: ../../addon/wppost/Mod_Wppost.php:43 msgid "Wordpress Post App" msgstr "App Publicar en Wordpress" -#: ../../addon/wppost/Mod_Wppost.php:42 +#: ../../addon/wppost/Mod_Wppost.php:44 msgid "Post to WordPress or anything else which uses the wordpress XMLRPC API" msgstr "Publicar en WordPress o cualquier otra cosa que utilice la API XMLRPC de wordpress" -#: ../../addon/wppost/Mod_Wppost.php:65 +#: ../../addon/wppost/Mod_Wppost.php:69 msgid "WordPress username" msgstr "Nombre de usuario de WordPress" -#: ../../addon/wppost/Mod_Wppost.php:69 +#: ../../addon/wppost/Mod_Wppost.php:73 msgid "WordPress password" msgstr "Contraseña de WordPress" -#: ../../addon/wppost/Mod_Wppost.php:73 +#: ../../addon/wppost/Mod_Wppost.php:77 msgid "WordPress API URL" msgstr "URL de la API de WordPress" -#: ../../addon/wppost/Mod_Wppost.php:74 +#: ../../addon/wppost/Mod_Wppost.php:78 msgid "Typically https://your-blog.tld/xmlrpc.php" msgstr "Habitualmente https://your-blog.tld/xmlrpc.php" -#: ../../addon/wppost/Mod_Wppost.php:77 +#: ../../addon/wppost/Mod_Wppost.php:81 msgid "WordPress blogid" msgstr "Blog de WordPress" -#: ../../addon/wppost/Mod_Wppost.php:78 +#: ../../addon/wppost/Mod_Wppost.php:82 msgid "For multi-user sites such as wordpress.com, otherwise leave blank" msgstr "Para sitios multiusuario como wordpress.com, de lo contrario, dejar en blanco" -#: ../../addon/wppost/Mod_Wppost.php:82 +#: ../../addon/wppost/Mod_Wppost.php:86 msgid "Post to WordPress by default" msgstr "Publicar en WordPress por defecto" -#: ../../addon/wppost/Mod_Wppost.php:86 +#: ../../addon/wppost/Mod_Wppost.php:90 msgid "Forward comments (requires hubzilla_wp plugin)" msgstr "Reenviar comentarios (requerido por el plugin hubzilla_wp)" -#: ../../addon/wppost/Mod_Wppost.php:94 +#: ../../addon/wppost/Mod_Wppost.php:94 ../../addon/dwpost/Mod_Dwpost.php:65 +#: ../../addon/ljpost/Mod_Ljpost.php:71 +msgid "Add link to original post" +msgstr "Añadir enlace a la entrada original" + +#: ../../addon/wppost/Mod_Wppost.php:98 ../../addon/dwpost/Mod_Dwpost.php:69 +msgid "Link description (default:" +msgstr "Descripción del enlace (por defecto: " + +#: ../../addon/wppost/Mod_Wppost.php:106 msgid "Wordpress Post" msgstr "Publicar en Wordpress" @@ -1661,7 +1511,7 @@ msgid "" msgstr "Este complemento copia el contenido existente y el almacenamiento de ficheros en un canal clonado/copiado. Una vez instalada la aplicación, visite la aplicación recién instalada. Esto le permitirá establecer la ubicación de su canal original y un rango de fechas opcional de ficheros/conversaciones para copiar." #: ../../addon/content_import/Mod_content_import.php:135 -#: ../../Zotlabs/Lib/Apps.php:331 +#: ../../Zotlabs/Lib/Apps.php:332 msgid "Content Import" msgstr "Importación de contenidos" @@ -1702,211 +1552,211 @@ msgstr "Modificado desde la fecha yyyy-mm-dd" msgid "Until modified date yyyy-mm-dd" msgstr "Modificado hasta la fecha yyyy-mm-dd" -#: ../../addon/hsse/hsse.php:82 ../../include/conversation.php:1285 +#: ../../addon/hsse/hsse.php:82 ../../include/conversation.php:1313 msgid "Set your location" msgstr "Establecer su ubicación" -#: ../../addon/hsse/hsse.php:83 ../../include/conversation.php:1286 +#: ../../addon/hsse/hsse.php:83 ../../include/conversation.php:1314 msgid "Clear browser location" msgstr "Eliminar los datos de localización geográfica del navegador" -#: ../../addon/hsse/hsse.php:95 ../../include/conversation.php:1298 +#: ../../addon/hsse/hsse.php:95 ../../addon/mail/Mod_Mail.php:166 +#: ../../addon/mail/Mod_Mail.php:309 ../../include/conversation.php:1326 #: ../../Zotlabs/Module/Article_edit.php:100 #: ../../Zotlabs/Module/Card_edit.php:101 -#: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Chat.php:222 -#: ../../Zotlabs/Module/Editblock.php:116 ../../Zotlabs/Module/Mail.php:292 -#: ../../Zotlabs/Module/Mail.php:435 +#: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Chat.php:220 +#: ../../Zotlabs/Module/Editblock.php:116 msgid "Insert web link" msgstr "Insertar enlace web" -#: ../../addon/hsse/hsse.php:99 ../../include/conversation.php:1302 +#: ../../addon/hsse/hsse.php:99 ../../include/conversation.php:1330 msgid "Embed (existing) photo from your photo albums" msgstr "Insertar una foto de sus álbumes" -#: ../../addon/hsse/hsse.php:134 ../../include/conversation.php:1337 -#: ../../Zotlabs/Module/Chat.php:220 ../../Zotlabs/Module/Mail.php:245 -#: ../../Zotlabs/Module/Mail.php:366 +#: ../../addon/hsse/hsse.php:134 ../../addon/mail/Mod_Mail.php:119 +#: ../../addon/mail/Mod_Mail.php:240 ../../include/conversation.php:1365 +#: ../../Zotlabs/Module/Chat.php:218 msgid "Please enter a link URL:" msgstr "Por favor, introduzca la dirección del enlace:" -#: ../../addon/hsse/hsse.php:135 ../../include/conversation.php:1338 +#: ../../addon/hsse/hsse.php:135 ../../include/conversation.php:1366 msgid "Tag term:" msgstr "Término de la etiqueta:" -#: ../../addon/hsse/hsse.php:136 ../../include/conversation.php:1339 +#: ../../addon/hsse/hsse.php:136 ../../include/conversation.php:1367 msgid "Where are you right now?" msgstr "¿Donde está ahora?" -#: ../../addon/hsse/hsse.php:139 ../../include/conversation.php:1342 -#: ../../Zotlabs/Module/Profile_photo.php:507 -#: ../../Zotlabs/Module/Cover_photo.php:436 ../../Zotlabs/Module/Wiki.php:403 +#: ../../addon/hsse/hsse.php:139 ../../include/conversation.php:1370 +#: ../../Zotlabs/Module/Profile_photo.php:509 +#: ../../Zotlabs/Module/Cover_photo.php:430 ../../Zotlabs/Module/Wiki.php:403 msgid "Choose images to embed" msgstr "Elegir imágenes para incluir" -#: ../../addon/hsse/hsse.php:140 ../../include/conversation.php:1343 -#: ../../Zotlabs/Module/Profile_photo.php:508 -#: ../../Zotlabs/Module/Cover_photo.php:437 ../../Zotlabs/Module/Wiki.php:404 +#: ../../addon/hsse/hsse.php:140 ../../include/conversation.php:1371 +#: ../../Zotlabs/Module/Profile_photo.php:510 +#: ../../Zotlabs/Module/Cover_photo.php:431 ../../Zotlabs/Module/Wiki.php:404 msgid "Choose an album" msgstr "Elegir un álbum" -#: ../../addon/hsse/hsse.php:141 ../../include/conversation.php:1344 +#: ../../addon/hsse/hsse.php:141 ../../include/conversation.php:1372 msgid "Choose a different album..." msgstr "Elegir un álbum diferente..." -#: ../../addon/hsse/hsse.php:142 ../../include/conversation.php:1345 -#: ../../Zotlabs/Module/Profile_photo.php:510 -#: ../../Zotlabs/Module/Cover_photo.php:439 ../../Zotlabs/Module/Wiki.php:406 +#: ../../addon/hsse/hsse.php:142 ../../include/conversation.php:1373 +#: ../../Zotlabs/Module/Profile_photo.php:512 +#: ../../Zotlabs/Module/Cover_photo.php:433 ../../Zotlabs/Module/Wiki.php:406 msgid "Error getting album list" msgstr "Error al obtener la lista de álbumes" -#: ../../addon/hsse/hsse.php:143 ../../include/conversation.php:1346 -#: ../../Zotlabs/Module/Profile_photo.php:511 -#: ../../Zotlabs/Module/Cover_photo.php:440 ../../Zotlabs/Module/Wiki.php:407 +#: ../../addon/hsse/hsse.php:143 ../../include/conversation.php:1374 +#: ../../Zotlabs/Module/Profile_photo.php:513 +#: ../../Zotlabs/Module/Cover_photo.php:434 ../../Zotlabs/Module/Wiki.php:407 msgid "Error getting photo link" msgstr "Error al obtener el enlace de la foto" -#: ../../addon/hsse/hsse.php:144 ../../include/conversation.php:1347 -#: ../../Zotlabs/Module/Profile_photo.php:512 -#: ../../Zotlabs/Module/Cover_photo.php:441 ../../Zotlabs/Module/Wiki.php:408 +#: ../../addon/hsse/hsse.php:144 ../../include/conversation.php:1375 +#: ../../Zotlabs/Module/Profile_photo.php:514 +#: ../../Zotlabs/Module/Cover_photo.php:435 ../../Zotlabs/Module/Wiki.php:408 msgid "Error getting album" msgstr "Error al obtener el álbum" -#: ../../addon/hsse/hsse.php:145 ../../include/conversation.php:1348 +#: ../../addon/hsse/hsse.php:145 ../../include/conversation.php:1376 msgid "Comments enabled" msgstr "Comentarios habilitados" -#: ../../addon/hsse/hsse.php:146 ../../include/conversation.php:1349 +#: ../../addon/hsse/hsse.php:146 ../../include/conversation.php:1377 msgid "Comments disabled" msgstr "Comentarios deshabilitados" -#: ../../addon/hsse/hsse.php:153 ../../include/conversation.php:1359 +#: ../../addon/hsse/hsse.php:153 ../../include/conversation.php:1387 #: ../../Zotlabs/Module/Webpages.php:262 ../../Zotlabs/Module/Events.php:486 -#: ../../Zotlabs/Module/Photos.php:1097 ../../Zotlabs/Lib/ThreadItem.php:806 +#: ../../Zotlabs/Module/Photos.php:1098 ../../Zotlabs/Lib/ThreadItem.php:835 msgid "Preview" msgstr "Previsualizar" -#: ../../addon/hsse/hsse.php:186 ../../include/conversation.php:1392 +#: ../../addon/hsse/hsse.php:186 ../../include/conversation.php:1420 #: ../../Zotlabs/Widget/Cdav.php:136 ../../Zotlabs/Module/Webpages.php:256 -#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1075 +#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1077 #: ../../Zotlabs/Module/Wiki.php:301 ../../Zotlabs/Module/Layouts.php:194 msgid "Share" msgstr "Compartir" -#: ../../addon/hsse/hsse.php:195 ../../include/conversation.php:1401 +#: ../../addon/hsse/hsse.php:195 ../../include/conversation.php:1429 msgid "Page link name" msgstr "Nombre del enlace de la página" -#: ../../addon/hsse/hsse.php:198 ../../include/conversation.php:1404 +#: ../../addon/hsse/hsse.php:198 ../../include/conversation.php:1432 msgid "Post as" msgstr "Publicar como" -#: ../../addon/hsse/hsse.php:200 ../../include/conversation.php:1406 -#: ../../Zotlabs/Lib/ThreadItem.php:797 +#: ../../addon/hsse/hsse.php:200 ../../include/conversation.php:1434 +#: ../../Zotlabs/Lib/ThreadItem.php:826 msgid "Bold" msgstr "Negrita" -#: ../../addon/hsse/hsse.php:201 ../../include/conversation.php:1407 -#: ../../Zotlabs/Lib/ThreadItem.php:798 +#: ../../addon/hsse/hsse.php:201 ../../include/conversation.php:1435 +#: ../../Zotlabs/Lib/ThreadItem.php:827 msgid "Italic" msgstr "Itálico " -#: ../../addon/hsse/hsse.php:202 ../../include/conversation.php:1408 -#: ../../Zotlabs/Lib/ThreadItem.php:799 +#: ../../addon/hsse/hsse.php:202 ../../include/conversation.php:1436 +#: ../../Zotlabs/Lib/ThreadItem.php:828 msgid "Underline" msgstr "Subrayar" -#: ../../addon/hsse/hsse.php:203 ../../include/conversation.php:1409 -#: ../../Zotlabs/Lib/ThreadItem.php:800 +#: ../../addon/hsse/hsse.php:203 ../../include/conversation.php:1437 +#: ../../Zotlabs/Lib/ThreadItem.php:829 msgid "Quote" msgstr "Citar" -#: ../../addon/hsse/hsse.php:204 ../../include/conversation.php:1410 -#: ../../Zotlabs/Lib/ThreadItem.php:801 +#: ../../addon/hsse/hsse.php:204 ../../include/conversation.php:1438 +#: ../../Zotlabs/Lib/ThreadItem.php:830 msgid "Code" msgstr "Código" -#: ../../addon/hsse/hsse.php:205 ../../include/conversation.php:1411 -#: ../../Zotlabs/Lib/ThreadItem.php:803 +#: ../../addon/hsse/hsse.php:205 ../../include/conversation.php:1439 +#: ../../Zotlabs/Lib/ThreadItem.php:832 msgid "Attach/Upload file" msgstr "Adjuntar/cargar fichero" -#: ../../addon/hsse/hsse.php:208 ../../include/conversation.php:1414 +#: ../../addon/hsse/hsse.php:208 ../../include/conversation.php:1442 #: ../../Zotlabs/Module/Wiki.php:400 msgid "Embed an image from your albums" msgstr "Incluir una imagen de sus álbumes" #: ../../addon/hsse/hsse.php:209 ../../addon/hsse/hsse.php:258 -#: ../../include/conversation.php:1415 ../../include/conversation.php:1464 +#: ../../include/conversation.php:1443 ../../include/conversation.php:1496 #: ../../Zotlabs/Module/Article_edit.php:130 #: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88 #: ../../Zotlabs/Module/Card_edit.php:131 ../../Zotlabs/Module/Oauth.php:112 #: ../../Zotlabs/Module/Oauth.php:138 ../../Zotlabs/Module/Editwebpage.php:169 -#: ../../Zotlabs/Module/Cdav.php:1081 ../../Zotlabs/Module/Cdav.php:1391 +#: ../../Zotlabs/Module/Cdav.php:1054 ../../Zotlabs/Module/Cdav.php:1386 #: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138 #: ../../Zotlabs/Module/Editpost.php:110 #: ../../Zotlabs/Module/Admin/Addons.php:427 -#: ../../Zotlabs/Module/Profile_photo.php:505 +#: ../../Zotlabs/Module/Profile_photo.php:507 #: ../../Zotlabs/Module/Editblock.php:141 ../../Zotlabs/Module/Filer.php:55 #: ../../Zotlabs/Module/Editlayout.php:140 -#: ../../Zotlabs/Module/Cover_photo.php:434 -#: ../../Zotlabs/Module/Profiles.php:801 ../../Zotlabs/Module/Oauth2.php:117 +#: ../../Zotlabs/Module/Cover_photo.php:428 +#: ../../Zotlabs/Module/Profiles.php:803 ../../Zotlabs/Module/Oauth2.php:117 #: ../../Zotlabs/Module/Oauth2.php:145 ../../Zotlabs/Module/Wiki.php:368 -#: ../../Zotlabs/Module/Wiki.php:401 ../../Zotlabs/Module/Connedit.php:941 +#: ../../Zotlabs/Module/Wiki.php:401 ../../Zotlabs/Module/Connedit.php:942 msgid "Cancel" msgstr "Cancelar" #: ../../addon/hsse/hsse.php:210 ../../addon/hsse/hsse.php:257 -#: ../../include/conversation.php:1416 ../../include/conversation.php:1463 -#: ../../Zotlabs/Module/Profile_photo.php:506 -#: ../../Zotlabs/Module/Cover_photo.php:435 ../../Zotlabs/Module/Wiki.php:402 +#: ../../include/conversation.php:1444 ../../include/conversation.php:1495 +#: ../../Zotlabs/Module/Profile_photo.php:508 +#: ../../Zotlabs/Module/Cover_photo.php:429 ../../Zotlabs/Module/Wiki.php:402 msgid "OK" msgstr "OK" -#: ../../addon/hsse/hsse.php:212 ../../include/conversation.php:1418 +#: ../../addon/hsse/hsse.php:212 ../../include/conversation.php:1446 msgid "Toggle voting" msgstr "Cambiar votación" -#: ../../addon/hsse/hsse.php:215 ../../include/conversation.php:1421 +#: ../../addon/hsse/hsse.php:215 ../../include/conversation.php:1453 msgid "Disable comments" msgstr "Dehabilitar los comentarios" -#: ../../addon/hsse/hsse.php:216 ../../include/conversation.php:1422 +#: ../../addon/hsse/hsse.php:216 ../../include/conversation.php:1454 msgid "Toggle comments" msgstr "Activar o desactivar los comentarios" -#: ../../addon/hsse/hsse.php:221 ../../include/conversation.php:1427 +#: ../../addon/hsse/hsse.php:221 ../../include/conversation.php:1459 #: ../../Zotlabs/Module/Article_edit.php:116 #: ../../Zotlabs/Module/Card_edit.php:117 -#: ../../Zotlabs/Module/Editblock.php:129 ../../Zotlabs/Module/Photos.php:671 -#: ../../Zotlabs/Module/Photos.php:1041 +#: ../../Zotlabs/Module/Editblock.php:129 ../../Zotlabs/Module/Photos.php:673 +#: ../../Zotlabs/Module/Photos.php:1043 msgid "Title (optional)" msgstr "Título (opcional)" -#: ../../addon/hsse/hsse.php:224 ../../include/conversation.php:1430 +#: ../../addon/hsse/hsse.php:224 ../../include/conversation.php:1462 msgid "Categories (optional, comma-separated list)" msgstr "Temas (opcional, lista separada por comas)" -#: ../../addon/hsse/hsse.php:225 ../../include/conversation.php:1431 +#: ../../addon/hsse/hsse.php:225 ../../include/conversation.php:1463 #: ../../Zotlabs/Module/Events.php:487 msgid "Permission settings" msgstr "Configuración de permisos" -#: ../../addon/hsse/hsse.php:247 ../../include/conversation.php:1453 +#: ../../addon/hsse/hsse.php:247 ../../include/conversation.php:1485 msgid "Other networks and post services" msgstr "Otras redes y servicios de publicación" -#: ../../addon/hsse/hsse.php:250 ../../include/conversation.php:1456 -#: ../../Zotlabs/Module/Mail.php:296 ../../Zotlabs/Module/Mail.php:439 +#: ../../addon/hsse/hsse.php:250 ../../addon/mail/Mod_Mail.php:170 +#: ../../addon/mail/Mod_Mail.php:313 ../../include/conversation.php:1488 msgid "Set expiration date" msgstr "Configurar fecha de caducidad" -#: ../../addon/hsse/hsse.php:253 ../../include/conversation.php:1459 +#: ../../addon/hsse/hsse.php:253 ../../include/conversation.php:1491 msgid "Set publish date" msgstr "Establecer la fecha de publicación" -#: ../../addon/hsse/hsse.php:255 ../../include/conversation.php:1461 -#: ../../Zotlabs/Module/Chat.php:221 ../../Zotlabs/Module/Mail.php:298 -#: ../../Zotlabs/Module/Mail.php:441 ../../Zotlabs/Lib/ThreadItem.php:810 +#: ../../addon/hsse/hsse.php:255 ../../addon/mail/Mod_Mail.php:172 +#: ../../addon/mail/Mod_Mail.php:315 ../../include/conversation.php:1493 +#: ../../Zotlabs/Module/Chat.php:219 ../../Zotlabs/Lib/ThreadItem.php:839 msgid "Encrypt text" msgstr "Cifrar texto" @@ -1922,53 +1772,54 @@ msgstr "App WYSIWYG Status" msgid "WYSIWYG Status" msgstr "Estado de WYSIWYG" -#: ../../addon/openstreetmap/openstreetmap.php:131 +#: ../../addon/openstreetmap/openstreetmap.php:133 msgid "View Larger" msgstr "Ver más grande" -#: ../../addon/openstreetmap/openstreetmap.php:154 +#: ../../addon/openstreetmap/openstreetmap.php:156 msgid "Tile Server URL" msgstr "URL del servidor de mosaicos de imágenes " -#: ../../addon/openstreetmap/openstreetmap.php:154 +#: ../../addon/openstreetmap/openstreetmap.php:156 msgid "" "A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" " "target=\"_blank\">public tile servers</a>" msgstr "Una lista de <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">servidores públicos de mosaicos de imágenes</a>" -#: ../../addon/openstreetmap/openstreetmap.php:155 +#: ../../addon/openstreetmap/openstreetmap.php:157 msgid "Nominatim (reverse geocoding) Server URL" msgstr "URL del servidor nominatim (geocodificación inversa)" -#: ../../addon/openstreetmap/openstreetmap.php:155 +#: ../../addon/openstreetmap/openstreetmap.php:157 msgid "" "A list of <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" " "target=\"_blank\">Nominatim servers</a>" msgstr "Una lista de <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" target=\"_blank\">servidores nominatim</a>" -#: ../../addon/openstreetmap/openstreetmap.php:156 +#: ../../addon/openstreetmap/openstreetmap.php:158 msgid "Default zoom" msgstr "Zoom predeterminado" -#: ../../addon/openstreetmap/openstreetmap.php:156 +#: ../../addon/openstreetmap/openstreetmap.php:158 msgid "" "The default zoom level. (1:world, 18:highest, also depends on tile server)" msgstr "El nivel de zoom predeterminado. (1: mundo, 18: el más alto, también depende del servidor del mosaico de imágenes)" -#: ../../addon/openstreetmap/openstreetmap.php:157 +#: ../../addon/openstreetmap/openstreetmap.php:159 msgid "Include marker on map" msgstr "Incluir un marcador en el mapa" -#: ../../addon/openstreetmap/openstreetmap.php:157 +#: ../../addon/openstreetmap/openstreetmap.php:159 msgid "Include a marker on the map." msgstr "Incluir un marcador en el mapa." -#: ../../addon/openstreetmap/openstreetmap.php:169 +#: ../../addon/openstreetmap/openstreetmap.php:171 #: ../../addon/rendezvous/rendezvous.php:82 -#: ../../addon/twitter/twitter.php:489 ../../addon/msgfooter/msgfooter.php:54 -#: ../../addon/piwik/piwik.php:116 ../../addon/logrot/logrot.php:54 -#: ../../addon/xmpp/xmpp.php:54 ../../Zotlabs/Module/Settings/Channel.php:266 -#: ../../Zotlabs/Module/Defperms.php:111 +#: ../../addon/twitter/twitter.php:494 ../../addon/msgfooter/msgfooter.php:54 +#: ../../addon/diaspora/diaspora.php:93 ../../addon/piwik/piwik.php:116 +#: ../../addon/logrot/logrot.php:54 ../../addon/xmpp/xmpp.php:54 +#: ../../Zotlabs/Module/Settings/Channel.php:267 +#: ../../Zotlabs/Module/Defperms.php:112 msgid "Settings updated." msgstr "Ajustes actualizados." @@ -2020,38 +1871,39 @@ msgstr "Generador QR" msgid "Enter some text" msgstr "Escribir algún texto" -#: ../../addon/pubcrawl/as.php:1080 ../../include/conversation.php:1166 -#: ../../Zotlabs/Widget/Album.php:84 ../../Zotlabs/Widget/Portfolio.php:95 -#: ../../Zotlabs/Module/Embedphotos.php:174 ../../Zotlabs/Module/Cdav.php:871 -#: ../../Zotlabs/Module/Cdav.php:872 ../../Zotlabs/Module/Cdav.php:879 -#: ../../Zotlabs/Module/Photos.php:790 ../../Zotlabs/Module/Photos.php:1254 -#: ../../Zotlabs/Lib/Activity.php:1192 ../../Zotlabs/Lib/Apps.php:1114 -#: ../../Zotlabs/Lib/Apps.php:1198 ../../Zotlabs/Storage/Browser.php:164 +#: ../../addon/pubcrawl/as.php:1134 ../../include/cdav.php:158 +#: ../../include/cdav.php:159 ../../include/cdav.php:167 +#: ../../include/conversation.php:1196 ../../Zotlabs/Widget/Album.php:84 +#: ../../Zotlabs/Widget/Pinned.php:270 ../../Zotlabs/Widget/Portfolio.php:95 +#: ../../Zotlabs/Module/Embedphotos.php:176 +#: ../../Zotlabs/Module/Photos.php:792 ../../Zotlabs/Module/Photos.php:1254 +#: ../../Zotlabs/Lib/Activity.php:1458 ../../Zotlabs/Lib/Apps.php:1112 +#: ../../Zotlabs/Lib/Apps.php:1196 ../../Zotlabs/Storage/Browser.php:164 msgid "Unknown" msgstr "Desconocido" -#: ../../addon/pubcrawl/as.php:1348 ../../addon/pubcrawl/as.php:1544 -#: ../../addon/pubcrawl/as.php:1738 ../../include/network.php:1731 -#: ../../Zotlabs/Lib/Activity.php:2294 ../../Zotlabs/Lib/Activity.php:2488 +#: ../../addon/pubcrawl/as.php:1428 ../../addon/pubcrawl/as.php:1662 +#: ../../addon/pubcrawl/as.php:1856 ../../include/network.php:1735 +#: ../../Zotlabs/Lib/Activity.php:2742 ../../Zotlabs/Lib/Activity.php:2936 msgid "ActivityPub" msgstr "ActivityPub" -#: ../../addon/pubcrawl/as.php:1692 ../../addon/diaspora/Receiver.php:1592 -#: ../../include/text.php:2125 ../../include/conversation.php:144 -#: ../../Zotlabs/Module/Like.php:392 ../../Zotlabs/Module/Subthread.php:112 -#: ../../Zotlabs/Lib/Activity.php:2444 +#: ../../addon/pubcrawl/as.php:1810 ../../addon/diaspora/Receiver.php:1597 +#: ../../include/text.php:2239 ../../include/conversation.php:146 +#: ../../Zotlabs/Module/Like.php:386 ../../Zotlabs/Module/Subthread.php:112 +#: ../../Zotlabs/Lib/Activity.php:2892 msgid "status" msgstr "el mensaje de estado " -#: ../../addon/pubcrawl/as.php:1729 ../../addon/diaspora/Receiver.php:1532 -#: ../../include/conversation.php:160 ../../Zotlabs/Module/Like.php:447 -#: ../../Zotlabs/Lib/Activity.php:2479 +#: ../../addon/pubcrawl/as.php:1847 ../../addon/diaspora/Receiver.php:1537 +#: ../../include/conversation.php:162 ../../Zotlabs/Module/Like.php:422 +#: ../../Zotlabs/Lib/Activity.php:2927 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "A %1$s le gusta %3$s de %2$s" -#: ../../addon/pubcrawl/as.php:1731 ../../include/conversation.php:163 -#: ../../Zotlabs/Module/Like.php:449 ../../Zotlabs/Lib/Activity.php:2481 +#: ../../addon/pubcrawl/as.php:1849 ../../include/conversation.php:165 +#: ../../Zotlabs/Module/Like.php:424 ../../Zotlabs/Lib/Activity.php:2929 #, php-format msgid "%1$s doesn't like %2$s's %3$s" msgstr "A %1$s no le gusta %3$s de %2$s" @@ -2101,35 +1953,35 @@ msgstr "Se ha creado una cuenta para usted." msgid "Authentication successful but rejected: account creation is disabled." msgstr "Autenticación correcta pero rechazada: la creación de cuentas está deshabilitada." -#: ../../addon/dwpost/Mod_Dwpost.php:24 +#: ../../addon/dwpost/Mod_Dwpost.php:26 msgid "Dreamwidth Crosspost Connector Settings saved." msgstr "Se han guardado los ajustes del conector de publicación cruzada Dreamwidth." -#: ../../addon/dwpost/Mod_Dwpost.php:36 +#: ../../addon/dwpost/Mod_Dwpost.php:39 msgid "Dreamwidth Crosspost Connector App" msgstr "App Dreamwidth Crosspost Connector" -#: ../../addon/dwpost/Mod_Dwpost.php:37 -msgid "Relay public postings to Dreamwidth" -msgstr "Retransmisión de entradas públicas a Dreamwidth" +#: ../../addon/dwpost/Mod_Dwpost.php:40 +msgid "Relay public posts to Dreamwidth" +msgstr "Reenviar las entradas públicas a Dreamwidth" -#: ../../addon/dwpost/Mod_Dwpost.php:52 +#: ../../addon/dwpost/Mod_Dwpost.php:53 msgid "Dreamwidth username" msgstr "Nombre de usuario en Dreamwidth" -#: ../../addon/dwpost/Mod_Dwpost.php:56 +#: ../../addon/dwpost/Mod_Dwpost.php:57 msgid "Dreamwidth password" msgstr "Contraseña en Dreamwidth" -#: ../../addon/dwpost/Mod_Dwpost.php:60 +#: ../../addon/dwpost/Mod_Dwpost.php:61 msgid "Post to Dreamwidth by default" msgstr "Publicar en Dreamwidth de forma predeterminada" -#: ../../addon/dwpost/Mod_Dwpost.php:68 +#: ../../addon/dwpost/Mod_Dwpost.php:77 msgid "Dreamwidth Crosspost Connector" msgstr "Dreamwidth Crosspost Connector" -#: ../../addon/dwpost/dwpost.php:47 +#: ../../addon/dwpost/dwpost.php:49 msgid "Post to Dreamwidth" msgstr "Publicar en Dreamwidth" @@ -2290,7 +2142,7 @@ msgid "Errors encountered deleting database table " msgstr "Errores encontrados al eliminar la tabla de la base de datos" #: ../../addon/rendezvous/rendezvous.php:95 -#: ../../addon/twitter/twitter.php:498 +#: ../../addon/twitter/twitter.php:503 msgid "Submit Settings" msgstr "Enviar los ajustes" @@ -2342,22 +2194,22 @@ msgstr "Reunámonos aquí" #: ../../addon/rendezvous/rendezvous.php:172 #: ../../Zotlabs/Widget/Wiki_page_history.php:22 -#: ../../Zotlabs/Module/Group.php:154 ../../Zotlabs/Module/Oauth.php:113 -#: ../../Zotlabs/Module/Oauth.php:139 ../../Zotlabs/Module/Chat.php:259 -#: ../../Zotlabs/Module/Cdav.php:1373 -#: ../../Zotlabs/Module/Sharedwithme.php:104 +#: ../../Zotlabs/Module/Group.php:155 ../../Zotlabs/Module/Oauth.php:113 +#: ../../Zotlabs/Module/Oauth.php:139 ../../Zotlabs/Module/Chat.php:257 +#: ../../Zotlabs/Module/Cdav.php:1368 +#: ../../Zotlabs/Module/Sharedwithme.php:106 #: ../../Zotlabs/Module/Admin/Channels.php:159 #: ../../Zotlabs/Module/Oauth2.php:118 ../../Zotlabs/Module/Oauth2.php:146 -#: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Module/Connedit.php:923 -#: ../../Zotlabs/Lib/NativeWikiPage.php:561 +#: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Module/Connedit.php:924 +#: ../../Zotlabs/Lib/NativeWikiPage.php:564 #: ../../Zotlabs/Storage/Browser.php:291 msgid "Name" msgstr "Nombre" #: ../../addon/rendezvous/rendezvous.php:173 -#: ../../addon/cart/submodules/hzservices.php:654 -#: ../../addon/cart/submodules/manualcat.php:262 -#: ../../Zotlabs/Module/Cdav.php:1037 ../../Zotlabs/Module/Events.php:481 +#: ../../addon/cart/submodules/hzservices.php:655 +#: ../../addon/cart/submodules/manualcat.php:264 +#: ../../Zotlabs/Module/Cdav.php:1010 ../../Zotlabs/Module/Events.php:481 #: ../../Zotlabs/Module/Appman.php:145 ../../Zotlabs/Module/Rbmark.php:101 msgid "Description" msgstr "Descripción" @@ -2465,6 +2317,105 @@ msgstr "Ejemplos: "aplicaciones", "mi red?f=&gid=37" (grupo msgid "Startpage" msgstr "Startpage" +#: ../../addon/mail/Mod_Mail.php:39 +msgid "Messages" +msgstr "Mensajes" + +#: ../../addon/mail/Mod_Mail.php:52 +msgid "message" +msgstr "mensaje" + +#: ../../addon/mail/Mod_Mail.php:92 +msgid "Message recalled." +msgstr "Mensaje revocado." + +#: ../../addon/mail/Mod_Mail.php:105 +msgid "Conversation removed." +msgstr "Conversación eliminada." + +#: ../../addon/mail/Mod_Mail.php:120 ../../addon/mail/Mod_Mail.php:241 +msgid "Expires YYYY-MM-DD HH:MM" +msgstr "Caduca YYYY-MM-DD HH:MM" + +#: ../../addon/mail/Mod_Mail.php:148 +msgid "Requested channel is not in this network" +msgstr "El canal solicitado no existe en esta red" + +#: ../../addon/mail/Mod_Mail.php:156 +msgid "Send Private Message" +msgstr "Enviar un mensaje privado" + +#: ../../addon/mail/Mod_Mail.php:157 ../../addon/mail/Mod_Mail.php:300 +msgid "To:" +msgstr "Para:" + +#: ../../addon/mail/Mod_Mail.php:160 ../../addon/mail/Mod_Mail.php:302 +msgid "Subject:" +msgstr "Asunto:" + +#: ../../addon/mail/Mod_Mail.php:163 ../../Zotlabs/Module/Invite.php:157 +msgid "Your message:" +msgstr "Su mensaje:" + +#: ../../addon/mail/Mod_Mail.php:165 ../../addon/mail/Mod_Mail.php:308 +msgid "Attach file" +msgstr "Adjuntar fichero" + +#: ../../addon/mail/Mod_Mail.php:167 +msgid "Send" +msgstr "Enviar" + +#: ../../addon/mail/Mod_Mail.php:271 +msgid "Delete message" +msgstr "Borrar mensaje" + +#: ../../addon/mail/Mod_Mail.php:272 +msgid "Delivery report" +msgstr "Informe de transmisión" + +#: ../../addon/mail/Mod_Mail.php:273 +msgid "Recall message" +msgstr "Revocar el mensaje" + +#: ../../addon/mail/Mod_Mail.php:275 +msgid "Message has been recalled." +msgstr "El mensaje ha sido revocado." + +#: ../../addon/mail/Mod_Mail.php:293 +msgid "Delete Conversation" +msgstr "Eliminar conversación" + +#: ../../addon/mail/Mod_Mail.php:295 +msgid "" +"No secure communications available. You <strong>may</strong> be able to " +"respond from the sender's profile page." +msgstr "Comunicación segura no disponible. Pero <strong>puede</strong> responder desde la página del perfil del remitente." + +#: ../../addon/mail/Mod_Mail.php:299 +msgid "Send Reply" +msgstr "Responder" + +#: ../../addon/mail/Mod_Mail.php:304 +#, php-format +msgid "Your message for %s (%s):" +msgstr "Su mensaje para %s (%s):" + +#: ../../addon/mail/Mod_Mail.php:384 +msgid "Unable to lookup recipient." +msgstr "No se puede asociar a un destinatario." + +#: ../../addon/mail/Mod_Mail.php:391 +msgid "Unable to communicate with requested channel." +msgstr "No se puede establecer la comunicación con el canal solicitado." + +#: ../../addon/mail/Mod_Mail.php:398 +msgid "Cannot verify requested channel." +msgstr "No se puede verificar el canal solicitado." + +#: ../../addon/mail/Mod_Mail.php:416 +msgid "Selected channel has private message restrictions. Send failed." +msgstr "El canal seleccionado tiene restricciones sobre los mensajes privados. El envío falló." + #: ../../addon/adultphotoflag/adultphotoflag.php:24 msgid "Flag Adult Photos" msgstr "Indicador (\"flag\") de fotos de adultos" @@ -2713,8 +2664,8 @@ msgid "Send ZID" msgstr "Enviar ZID" #: ../../addon/cart/widgets/catalogitem.php:57 -#: ../../addon/cart/submodules/hzservices.php:657 -#: ../../addon/cart/submodules/manualcat.php:265 +#: ../../addon/cart/submodules/hzservices.php:658 +#: ../../addon/cart/submodules/manualcat.php:267 msgid "Price" msgstr "Precio" @@ -2728,7 +2679,8 @@ msgstr "Los pagos manuales no están habilitados." #: ../../addon/cart/manual_payments.php:68 #: ../../addon/cart/submodules/paypalbutton.php:392 -#: ../../addon/cart/cart.php:1460 +#: ../../addon/cart/submodules/paypalbuttonV2.php:409 +#: ../../addon/cart/cart.php:1463 msgid "Order not found." msgstr "El pedido no se ha encontrado." @@ -2738,7 +2690,8 @@ msgstr "Terminado" #: ../../addon/cart/manual_payments.php:93 #: ../../addon/cart/submodules/paypalbutton.php:456 -#: ../../addon/cart/myshop.php:37 ../../addon/cart/cart.php:1438 +#: ../../addon/cart/submodules/paypalbuttonV2.php:478 +#: ../../addon/cart/myshop.php:37 ../../addon/cart/cart.php:1441 #: ../../Zotlabs/Module/Wiki.php:77 msgid "Invalid channel" msgstr "Canal no válido" @@ -2788,109 +2741,149 @@ msgstr "Cuantía" msgid "Term" msgstr "Condición" -#: ../../addon/cart/submodules/hzservices.php:62 +#: ../../addon/cart/submodules/hzservices.php:63 msgid "Enable Hubzilla Services Module" msgstr "Habilitar el Módulo de Servicios de Hubzilla" -#: ../../addon/cart/submodules/hzservices.php:161 -#: ../../addon/cart/submodules/manualcat.php:174 +#: ../../addon/cart/submodules/hzservices.php:162 +#: ../../addon/cart/submodules/manualcat.php:176 msgid "New Sku" msgstr "Nuevo SKU (número de referencia)" -#: ../../addon/cart/submodules/hzservices.php:196 -#: ../../addon/cart/submodules/manualcat.php:210 +#: ../../addon/cart/submodules/hzservices.php:197 +#: ../../addon/cart/submodules/manualcat.php:212 msgid "Cannot save edits to locked item." msgstr "No se pueden guardar las ediciones en el elemento bloqueado." -#: ../../addon/cart/submodules/hzservices.php:245 -#: ../../addon/cart/submodules/hzservices.php:332 +#: ../../addon/cart/submodules/hzservices.php:246 +#: ../../addon/cart/submodules/hzservices.php:333 msgid "SKU not found." msgstr "No se ha encontrado el SKU" -#: ../../addon/cart/submodules/hzservices.php:298 -#: ../../addon/cart/submodules/hzservices.php:302 +#: ../../addon/cart/submodules/hzservices.php:299 +#: ../../addon/cart/submodules/hzservices.php:303 msgid "Invalid Activation Directive." msgstr "Directiva de activación no válida." -#: ../../addon/cart/submodules/hzservices.php:373 -#: ../../addon/cart/submodules/hzservices.php:377 +#: ../../addon/cart/submodules/hzservices.php:374 +#: ../../addon/cart/submodules/hzservices.php:378 msgid "Invalid Deactivation Directive." msgstr "Directiva de desactivación no válida" -#: ../../addon/cart/submodules/hzservices.php:563 +#: ../../addon/cart/submodules/hzservices.php:564 msgid "Add to this privacy group" msgstr "Añadir a este grupo de canales" -#: ../../addon/cart/submodules/hzservices.php:579 +#: ../../addon/cart/submodules/hzservices.php:580 msgid "Set user service class" msgstr "Configurar la clase de servicio al usuario" -#: ../../addon/cart/submodules/hzservices.php:606 +#: ../../addon/cart/submodules/hzservices.php:607 msgid "You must be using a local account to purchase this service." msgstr "Usted debe estar usando una cuenta local para comprar este servicio." -#: ../../addon/cart/submodules/hzservices.php:646 -#: ../../addon/cart/submodules/manualcat.php:254 +#: ../../addon/cart/submodules/hzservices.php:647 +#: ../../addon/cart/submodules/manualcat.php:256 msgid "Changes Locked" msgstr "Cambios bloqueados" -#: ../../addon/cart/submodules/hzservices.php:650 -#: ../../addon/cart/submodules/manualcat.php:258 +#: ../../addon/cart/submodules/hzservices.php:651 +#: ../../addon/cart/submodules/manualcat.php:260 msgid "Item available for purchase." msgstr "Artículo disponible para la compra." -#: ../../addon/cart/submodules/hzservices.php:660 -#: ../../addon/cart/submodules/manualcat.php:268 +#: ../../addon/cart/submodules/hzservices.php:661 +#: ../../addon/cart/submodules/manualcat.php:270 msgid "Photo URL" msgstr "URL de la foto" -#: ../../addon/cart/submodules/hzservices.php:664 +#: ../../addon/cart/submodules/hzservices.php:665 msgid "Add buyer to privacy group" msgstr "Agregar comprador al grupo de canales" -#: ../../addon/cart/submodules/hzservices.php:669 +#: ../../addon/cart/submodules/hzservices.php:670 msgid "Add buyer as connection" msgstr "Añadir comprador como conexión" -#: ../../addon/cart/submodules/hzservices.php:677 -#: ../../addon/cart/submodules/hzservices.php:719 +#: ../../addon/cart/submodules/hzservices.php:678 +#: ../../addon/cart/submodules/hzservices.php:720 msgid "Set Service Class" msgstr "Establecer clase de servicio" +#: ../../addon/cart/submodules/orderoptions.php:70 +msgid "Enable Order/Item Options" +msgstr "Habilitar las opciones de pedido/artículo" + +#: ../../addon/cart/submodules/orderoptions.php:333 +#: ../../addon/cart/submodules/orderoptions.php:357 +#: ../../addon/cart/submodules/orderoptions.php:433 +#: ../../addon/cart/submodules/orderoptions.php:457 +msgid "Label" +msgstr "Etiqueta" + +#: ../../addon/cart/submodules/orderoptions.php:334 +#: ../../addon/cart/submodules/orderoptions.php:358 +#: ../../addon/cart/submodules/orderoptions.php:434 +#: ../../addon/cart/submodules/orderoptions.php:458 +#: ../../include/datetime.php:211 ../../Zotlabs/Module/Events.php:468 +#: ../../Zotlabs/Module/Events.php:473 ../../Zotlabs/Module/Appman.php:143 +#: ../../Zotlabs/Module/Appman.php:144 ../../Zotlabs/Module/Profiles.php:747 +#: ../../Zotlabs/Module/Profiles.php:751 +msgid "Required" +msgstr "Obligatorio" + +#: ../../addon/cart/submodules/orderoptions.php:336 +#: ../../addon/cart/submodules/orderoptions.php:360 +#: ../../addon/cart/submodules/orderoptions.php:436 +#: ../../addon/cart/submodules/orderoptions.php:460 +msgid "Instructions" +msgstr "Instrucciones" + #: ../../addon/cart/submodules/paypalbutton.php:85 msgid "Enable Paypal Button Module" msgstr "Habilitar el módulo del botón de Paypal" #: ../../addon/cart/submodules/paypalbutton.php:93 +#: ../../addon/cart/submodules/paypalbuttonV2.php:94 msgid "Use Production Key" msgstr "Utilizar clave en entorno de producción" #: ../../addon/cart/submodules/paypalbutton.php:100 +#: ../../addon/cart/submodules/paypalbuttonV2.php:101 msgid "Paypal Sandbox Client Key" msgstr "Clave de cliente en el entorno de pruebas de Paypal" #: ../../addon/cart/submodules/paypalbutton.php:107 +#: ../../addon/cart/submodules/paypalbuttonV2.php:108 msgid "Paypal Sandbox Secret Key" msgstr "Clave secreta en el entorno de pruebas de Paypal" #: ../../addon/cart/submodules/paypalbutton.php:113 +#: ../../addon/cart/submodules/paypalbuttonV2.php:114 msgid "Paypal Production Client Key" msgstr "Clave de cliente en el entorno de producción de Paypal" #: ../../addon/cart/submodules/paypalbutton.php:120 +#: ../../addon/cart/submodules/paypalbuttonV2.php:121 msgid "Paypal Production Secret Key" msgstr "Clave secreta en el entorno de producción de Paypal" #: ../../addon/cart/submodules/paypalbutton.php:252 +#: ../../addon/cart/submodules/paypalbuttonV2.php:264 msgid "Paypal button payments are not enabled." msgstr "Los pagos con el botón de Paypal no están habilitados." #: ../../addon/cart/submodules/paypalbutton.php:270 +#: ../../addon/cart/submodules/paypalbuttonV2.php:282 msgid "" "Paypal button payments are not properly configured. Please choose another " "payment option." msgstr "Los pagos con el botón de Paypal no están configurados correctamente. Por favor, elija otra opción de pago." +#: ../../addon/cart/submodules/paypalbuttonV2.php:86 +msgid "Enable Paypal Button Module (API-v2)" +msgstr "Habilitar el módulo de botones de Paypal (API-v2)" + #: ../../addon/cart/submodules/manualcat.php:61 msgid "Enable Manual Cart Module" msgstr "Habilitar el módulo de carro manual" @@ -2899,7 +2892,7 @@ msgstr "Habilitar el módulo de carro manual" msgid "Access Denied." msgstr "Acceso denegado" -#: ../../addon/cart/myshop.php:111 ../../addon/cart/cart.php:1328 +#: ../../addon/cart/myshop.php:111 ../../addon/cart/cart.php:1331 msgid "Order Not Found" msgstr "No se ha encontrado el pedido" @@ -2908,72 +2901,80 @@ msgstr "No se ha encontrado el pedido" msgid "Invalid Item" msgstr "Elemento no válido" -#: ../../addon/cart/Settings/Cart.php:56 +#: ../../addon/cart/Settings/Cart.php:58 msgid "Enable Test Catalog" msgstr "Habilitar el catálogo de pruebas" -#: ../../addon/cart/Settings/Cart.php:68 +#: ../../addon/cart/Settings/Cart.php:70 msgid "Enable Manual Payments" msgstr "Permitir pagos manuales" -#: ../../addon/cart/Settings/Cart.php:88 +#: ../../addon/cart/Settings/Cart.php:90 msgid "Base Merchant Currency" msgstr "Divida base del vendedor" -#: ../../addon/cart/Settings/Cart.php:111 ../../addon/cart/cart.php:1257 +#: ../../addon/cart/Settings/Cart.php:129 ../../addon/cart/cart.php:1260 msgid "Cart Settings" msgstr "Configuración del carro de la compra" -#: ../../addon/cart/cart.php:150 +#: ../../addon/cart/cart.php:153 msgid "DB Cleanup Failure" msgstr "Fallo de limpieza de la base de datos" -#: ../../addon/cart/cart.php:556 +#: ../../addon/cart/cart.php:559 msgid "[cart] Item Added" msgstr "[cesta] Artículo añadido" -#: ../../addon/cart/cart.php:945 +#: ../../addon/cart/cart.php:948 msgid "Order already checked out." msgstr "El pedido ya ha sido revisado" -#: ../../addon/cart/cart.php:1250 +#: ../../addon/cart/cart.php:1253 msgid "Drop database tables when uninstalling." msgstr "Eliminar tablas de la base de datos al desinstalar." -#: ../../addon/cart/cart.php:1269 ../../addon/cart/cart.php:1272 +#: ../../addon/cart/cart.php:1272 ../../addon/cart/cart.php:1275 msgid "Shop" msgstr "Comprar" -#: ../../addon/cart/cart.php:1292 ../../addon/flashcards/Mod_Flashcards.php:37 +#: ../../addon/cart/cart.php:1295 ../../addon/flashcards/Mod_Flashcards.php:51 #: ../../Zotlabs/Module/Wiki.php:35 msgid "Profile Unavailable." msgstr "Perfil no disponible" -#: ../../addon/cart/cart.php:1389 +#: ../../addon/cart/cart.php:1392 msgid "Cart utilities for orders and payments" msgstr "Utilidades del carro para pedidos y pagos" -#: ../../addon/cart/cart.php:1427 +#: ../../addon/cart/cart.php:1430 msgid "You must be logged into the Grid to shop." msgstr "Debe iniciar sesión en la red para comprar." -#: ../../addon/cart/cart.php:1468 +#: ../../addon/cart/cart.php:1471 msgid "Access denied." msgstr "Acceso denegado" -#: ../../addon/cart/cart.php:1520 ../../addon/cart/cart.php:1663 +#: ../../addon/cart/cart.php:1523 ../../addon/cart/cart.php:1666 msgid "No Order Found" msgstr "No se ha encontrado ningún pedido" -#: ../../addon/cart/cart.php:1529 +#: ../../addon/cart/cart.php:1532 msgid "An unknown error has occurred Please start again." msgstr "Se ha producido un error desconocido Vuelva a empezar." -#: ../../addon/cart/cart.php:1696 +#: ../../addon/cart/cart.php:1675 +msgid "Requirements not met." +msgstr "No se cumplen los requisitos." + +#: ../../addon/cart/cart.php:1675 +msgid "Review your order and complete any needed requirements." +msgstr "Revise su pedido y complete los requisitos necesarios." + +#: ../../addon/cart/cart.php:1701 msgid "Invalid Payment Type. Please start again." msgstr "Tipo de pago no válido. Por favor, empiece de nuevo." -#: ../../addon/cart/cart.php:1703 +#: ../../addon/cart/cart.php:1708 msgid "Order not found" msgstr "El pedido no se ha encontrado" @@ -3019,7 +3020,7 @@ msgstr "Ocultar el botón y mostrar los smilies directamente." msgid "Smileybutton Settings" msgstr "Ajustes de Smileybutton" -#: ../../addon/redfiles/redfilehelper.php:64 +#: ../../addon/redfiles/redfilehelper.php:64 ../../include/attach.php:2035 msgid "file" msgstr "fichero" @@ -3031,21 +3032,38 @@ msgstr "Importar repositorio de ficheros de Redmatrix" msgid "This will import all your Redmatrix cloud files to this channel." msgstr "Esto importará todos sus ficheros de la nube de Redmatrix a este canal." +#: ../../addon/diaspora/diaspora.php:66 +msgid "" +"Please install the statistics addon to be able to configure a diaspora relay" +msgstr "Por favor, instale el complemento de estadísticas para poder configurar el reenvío de diaspora" + +#: ../../addon/diaspora/diaspora.php:76 +msgid "Diaspora Relay Handle" +msgstr "Gestionar el reenvío de Diaspora" + +#: ../../addon/diaspora/diaspora.php:76 +msgid "Address of a diaspora relay. Example: relay@diasporarelay.tld" +msgstr "La dirección de una transmisión de diaspora. Ejemplo: relay@diasporarelay.tld" + +#: ../../addon/diaspora/diaspora.php:96 +msgid "Diaspora relay could not be imported" +msgstr "El reenvío de Diaspora no ha podido ser importado" + #: ../../addon/diaspora/p.php:48 ../../addon/diaspora/util.php:336 #: ../../addon/diaspora/util.php:349 ../../Zotlabs/Lib/Enotify.php:61 msgid "$projectname" msgstr "$projectname" -#: ../../addon/diaspora/import_diaspora.php:18 +#: ../../addon/diaspora/import_diaspora.php:19 msgid "No username found in import file." msgstr "No se ha encontrado el nombre de usuario en el fichero de importación." -#: ../../addon/diaspora/import_diaspora.php:43 ../../include/import.php:75 +#: ../../addon/diaspora/import_diaspora.php:44 ../../include/import.php:76 msgid "Unable to create a unique channel address. Import failed." msgstr "No se ha podido crear una dirección de canal única. Ha fallado la importación." -#: ../../addon/diaspora/import_diaspora.php:141 -#: ../../Zotlabs/Module/Import.php:594 +#: ../../addon/diaspora/import_diaspora.php:142 +#: ../../Zotlabs/Module/Import.php:597 msgid "Import completed." msgstr "Importación completada." @@ -3064,43 +3082,43 @@ msgstr "El protocolo de Diaspora no admite la independencia de la ubicación. La msgid "Diaspora Protocol App" msgstr "App Protocolo Diaspora" -#: ../../addon/diaspora/Mod_Diaspora.php:77 +#: ../../addon/diaspora/Mod_Diaspora.php:75 msgid "Allow any Diaspora member to comment on your public posts" msgstr "Permitir a cualquier miembro de Diaspora comentar sus entradas públicas" -#: ../../addon/diaspora/Mod_Diaspora.php:81 +#: ../../addon/diaspora/Mod_Diaspora.php:79 msgid "Prevent your hashtags from being redirected to other sites" msgstr "Impedir que sus \"hashtags\" sean redirigidos a otros sitios " -#: ../../addon/diaspora/Mod_Diaspora.php:85 +#: ../../addon/diaspora/Mod_Diaspora.php:83 msgid "" "Sign and forward posts and comments with no existing Diaspora signature" msgstr "Firmar y enviar entradas y comentarios sin firma de Diaspora" -#: ../../addon/diaspora/Mod_Diaspora.php:90 +#: ../../addon/diaspora/Mod_Diaspora.php:88 msgid "Followed hashtags (comma separated, do not include the #)" msgstr "\"Hashtags\" seguidos (separados por comas, sin incluir #)" -#: ../../addon/diaspora/Mod_Diaspora.php:99 +#: ../../addon/diaspora/Mod_Diaspora.php:97 msgid "Diaspora Protocol" msgstr "Protocolo Diaspora" -#: ../../addon/diaspora/Receiver.php:1536 +#: ../../addon/diaspora/Receiver.php:1541 #, php-format msgid "%1$s dislikes %2$s's %3$s" msgstr "a %1$s no le gusta el %3$s de %2$s" -#: ../../addon/diaspora/Receiver.php:2178 ../../Zotlabs/Module/Like.php:457 +#: ../../addon/diaspora/Receiver.php:2184 ../../Zotlabs/Module/Like.php:432 #, php-format msgid "%1$s is attending %2$s's %3$s" msgstr "%3$s de %2$s: %1$s participa" -#: ../../addon/diaspora/Receiver.php:2180 ../../Zotlabs/Module/Like.php:459 +#: ../../addon/diaspora/Receiver.php:2186 ../../Zotlabs/Module/Like.php:434 #, php-format msgid "%1$s is not attending %2$s's %3$s" msgstr "%3$s de %2$s: %1$s no participa" -#: ../../addon/diaspora/Receiver.php:2182 ../../Zotlabs/Module/Like.php:461 +#: ../../addon/diaspora/Receiver.php:2188 ../../Zotlabs/Module/Like.php:436 #, php-format msgid "%1$s may attend %2$s's %3$s" msgstr "%3$s de %2$s: %1$s quizá participe" @@ -3149,63 +3167,67 @@ msgstr "Habilitar la interfaz JavaScript de seguimiento de errores" msgid "This feature requires Piwik >= 2.2.0" msgstr "Esta funcionalidad requiere Piwik >= 2.2.0" -#: ../../addon/workflow/workflow.php:212 +#: ../../addon/workflow/workflow.php:222 msgid "Workflow user." msgstr "Usuario de Workflow." -#: ../../addon/workflow/workflow.php:259 +#: ../../addon/workflow/workflow.php:272 msgid "This channel" msgstr "Este canal" -#: ../../addon/workflow/workflow.php:272 ../../Zotlabs/Module/Locs.php:119 +#: ../../addon/workflow/workflow.php:285 ../../Zotlabs/Module/Locs.php:119 msgid "Primary" msgstr "Primario" -#: ../../addon/workflow/workflow.php:480 -#: ../../addon/workflow/workflow.php:1233 -#: ../../addon/workflow/workflow.php:1251 +#: ../../addon/workflow/workflow.php:541 +#: ../../addon/workflow/workflow.php:1437 +#: ../../addon/workflow/workflow.php:1456 msgid "Workflow" msgstr "Workflow" -#: ../../addon/workflow/workflow.php:1250 +#: ../../addon/workflow/workflow.php:1425 +msgid "No Workflows Available" +msgstr "No hay flujos de trabajo disponibles" + +#: ../../addon/workflow/workflow.php:1455 msgid "Add item to which workflow" msgstr "A qué Workflow añadir un elemento" -#: ../../addon/workflow/workflow.php:1297 -#: ../../addon/workflow/workflow.php:1394 +#: ../../addon/workflow/workflow.php:1515 +#: ../../addon/workflow/workflow.php:1634 msgid "Create Workflow Item" msgstr "Crear elemento de Workflow" -#: ../../addon/workflow/workflow.php:2270 +#: ../../addon/workflow/workflow.php:2596 msgid "Link" msgstr "Enlazar" -#: ../../addon/workflow/workflow.php:2272 +#: ../../addon/workflow/workflow.php:2598 msgid "Web link." msgstr "Enlace Web." -#: ../../addon/workflow/workflow.php:2291 -#: ../../addon/workflow/workflow.php:2344 ../../Zotlabs/Module/Cdav.php:1375 -#: ../../Zotlabs/Module/Connedit.php:925 +#: ../../addon/workflow/workflow.php:2617 +#: ../../addon/workflow/workflow.php:2678 ../../Zotlabs/Module/Cdav.php:1370 +#: ../../Zotlabs/Module/Connedit.php:926 msgid "Title" msgstr "Título" -#: ../../addon/workflow/workflow.php:2293 -#: ../../addon/workflow/workflow.php:2346 +#: ../../addon/workflow/workflow.php:2619 +#: ../../addon/workflow/workflow.php:2680 msgid "Brief description or title" msgstr "Breve descripción o título" -#: ../../addon/workflow/workflow.php:2299 ../../Zotlabs/Widget/Notes.php:21 -#: ../../Zotlabs/Lib/Apps.php:369 +#: ../../addon/workflow/workflow.php:2625 ../../Zotlabs/Widget/Notes.php:21 +#: ../../Zotlabs/Lib/Apps.php:370 msgid "Notes" msgstr "Notas" -#: ../../addon/workflow/workflow.php:2301 -#: ../../addon/workflow/workflow.php:2354 +#: ../../addon/workflow/workflow.php:2627 +#: ../../addon/workflow/workflow.php:2688 msgid "Notes and Info" msgstr "Notas e información" -#: ../../addon/workflow/workflow.php:2352 +#: ../../addon/workflow/workflow.php:2686 msgid "Body" msgstr "Cuerpo" @@ -3307,52 +3329,6 @@ msgstr "Múestrenos su agrado en Hubzilla" msgid "Embed:" msgstr "Incorporado: " -#: ../../addon/chords/chords.php:33 -msgid "Quick Reference" -msgstr "Referencia rápida" - -#: ../../addon/chords/Mod_Chords.php:44 -msgid "" -"This is a fairly comprehensive and complete guitar chord dictionary which " -"will list most of the available ways to play a certain chord, starting from " -"the base of the fingerboard up to a few frets beyond the twelfth fret " -"(beyond which everything repeats). A couple of non-standard tunings are " -"provided for the benefit of slide players, etc." -msgstr "Se trata de un diccionario bastante amplio y completo de acordes de guitarra que enumerará la mayor parte de las formas disponibles para tocar un acorde determinado, partiendo de la base del diapasón hasta unos pocos trastes más allá del traste doce (más allá del cual todo se repite). Se proporcionan un par de afinaciones no convencionales para provecho de los guitarristas con \"slides\" ( barras de acero), etc." - -#: ../../addon/chords/Mod_Chords.php:46 -msgid "" -"Chord names start with a root note (A-G) and may include sharps (#) and " -"flats (b). This software will parse most of the standard naming conventions " -"such as maj, min, dim, sus(2 or 4), aug, with optional repeating elements." -msgstr "Los nombres de acordes comienzan con una nota fundamental (La-Sol) y pueden incluir sostenidos (#) y bemoles (b). Este software analizará la mayor parte de las convenciones de nomenclatura estándar como maj, min, tenue, SUS (2 ó 4), aug, con la repetición de elementos opcionales." - -#: ../../addon/chords/Mod_Chords.php:48 -msgid "" -"Valid examples include A, A7, Am7, Amaj7, Amaj9, Ammaj7, Aadd4, Asus2Add4, " -"E7b13b11 ..." -msgstr "Ejemplos válidos son A, A7, Am7, Amaj7, Amaj9, Ammaj7, Aadd4, Asus2Add4, E7b13b11 ..." - -#: ../../addon/chords/Mod_Chords.php:51 -msgid "Guitar Chords" -msgstr "Acordes de guitarra" - -#: ../../addon/chords/Mod_Chords.php:52 -msgid "The complete online chord dictionary" -msgstr "El diccionario completo de acordes en línea" - -#: ../../addon/chords/Mod_Chords.php:57 -msgid "Tuning" -msgstr "Afinación" - -#: ../../addon/chords/Mod_Chords.php:58 -msgid "Chord name: example: Em7" -msgstr "Nombre del acorde, por ejemplo: Em7" - -#: ../../addon/chords/Mod_Chords.php:59 -msgid "Show for left handed stringing" -msgstr "Mostrar para tocadores zurdos" - #: ../../addon/opensearch/opensearch.php:26 #, php-format msgctxt "opensearch" @@ -3398,70 +3374,6 @@ msgstr "Offset máximo en metros" msgid "Fuzzy Location" msgstr "Fuzzy Location" -#: ../../addon/flattrwidget/flattrwidget.php:50 -msgid "Flattr this!" -msgstr "¡Apoyar esto en Flattr!" - -#: ../../addon/flattrwidget/Mod_Flattrwidget.php:41 -msgid "Flattr widget settings updated." -msgstr "Los ajustes del widget Flattr han sido actualizados." - -#: ../../addon/flattrwidget/Mod_Flattrwidget.php:53 -msgid "Flattr Widget App" -msgstr "App Flattr Widget" - -#: ../../addon/flattrwidget/Mod_Flattrwidget.php:54 -msgid "Add a Flattr button to your channel page" -msgstr "Proporcionar un botón Flattr a la página de su canal" - -#: ../../addon/flattrwidget/Mod_Flattrwidget.php:65 -msgid "Flattr user" -msgstr "Usuario en Flattr" - -#: ../../addon/flattrwidget/Mod_Flattrwidget.php:69 -msgid "URL of the Thing to flattr" -msgstr "URL de la Cosa para apoyar en flattr" - -#: ../../addon/flattrwidget/Mod_Flattrwidget.php:69 -msgid "If empty channel URL is used" -msgstr "Si está vacío, se usa la URL del canal" - -#: ../../addon/flattrwidget/Mod_Flattrwidget.php:73 -msgid "Title of the Thing to flattr" -msgstr "Título de la Cosa para apoyar en flattr" - -#: ../../addon/flattrwidget/Mod_Flattrwidget.php:73 -msgid "If empty \"channel name on The Hubzilla\" will be used" -msgstr "Si está vacío, se usará \"nombre del canal en Hubzilla\"" - -#: ../../addon/flattrwidget/Mod_Flattrwidget.php:77 -msgid "Static or dynamic flattr button" -msgstr "Botón de flattr estático o dinámico" - -#: ../../addon/flattrwidget/Mod_Flattrwidget.php:77 -msgid "static" -msgstr "estático" - -#: ../../addon/flattrwidget/Mod_Flattrwidget.php:77 -msgid "dynamic" -msgstr "dinámico" - -#: ../../addon/flattrwidget/Mod_Flattrwidget.php:81 -msgid "Alignment of the widget" -msgstr "Alineamiento del widget" - -#: ../../addon/flattrwidget/Mod_Flattrwidget.php:81 -msgid "left" -msgstr "izquierda" - -#: ../../addon/flattrwidget/Mod_Flattrwidget.php:81 -msgid "right" -msgstr "derecha" - -#: ../../addon/flattrwidget/Mod_Flattrwidget.php:89 -msgid "Flattr Widget" -msgstr "Flattr Widget" - #: ../../addon/hubwall/hubwall.php:19 msgid "Send email to all members" msgstr "Enviar un correo electrónico a todos los miembros" @@ -3511,32 +3423,32 @@ msgstr "%s : Falló el envío del mensaje." msgid "Message sent to %s. New account registration: %s" msgstr "Mensaje enviado a %s. Registro de una nueva cuenta: %s" -#: ../../addon/flashcards/Mod_Flashcards.php:169 +#: ../../addon/flashcards/Mod_Flashcards.php:218 msgid "Not allowed." msgstr "No permitido/a." -#: ../../addon/flashcards/Mod_Flashcards.php:205 -#: ../../include/acl_selectors.php:123 ../../Zotlabs/Module/Chat.php:243 +#: ../../addon/flashcards/Mod_Flashcards.php:254 +#: ../../include/acl_selectors.php:123 ../../Zotlabs/Module/Chat.php:241 #: ../../Zotlabs/Module/Filestorage.php:190 -#: ../../Zotlabs/Module/Photos.php:675 ../../Zotlabs/Module/Photos.php:1044 -#: ../../Zotlabs/Module/Thing.php:319 ../../Zotlabs/Module/Thing.php:372 -#: ../../Zotlabs/Module/Connedit.php:690 +#: ../../Zotlabs/Module/Photos.php:677 ../../Zotlabs/Module/Photos.php:1046 +#: ../../Zotlabs/Module/Thing.php:321 ../../Zotlabs/Module/Thing.php:374 +#: ../../Zotlabs/Module/Connedit.php:691 msgid "Permissions" msgstr "Permisos" -#: ../../addon/flashcards/Mod_Flashcards.php:212 +#: ../../addon/flashcards/Mod_Flashcards.php:261 #: ../../Zotlabs/Module/Filestorage.php:197 msgid "Set/edit permissions" msgstr "Establecer/editar los permisos" -#: ../../addon/flashcards/Mod_Flashcards.php:235 -#: ../../addon/flashcards/Mod_Flashcards.php:236 ../../include/items.php:3719 +#: ../../addon/flashcards/Mod_Flashcards.php:284 +#: ../../addon/flashcards/Mod_Flashcards.php:285 ../../include/items.php:3888 #: ../../Zotlabs/Module/Filestorage.php:26 #: ../../Zotlabs/Module/Admin/Themes.php:72 #: ../../Zotlabs/Module/Admin/Addons.php:260 #: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:45 -#: ../../Zotlabs/Module/Display.php:455 ../../Zotlabs/Module/Admin.php:62 -#: ../../Zotlabs/Module/Thing.php:94 +#: ../../Zotlabs/Module/Display.php:460 ../../Zotlabs/Module/Admin.php:62 +#: ../../Zotlabs/Module/Thing.php:96 msgid "Item not found." msgstr "Elemento no encontrado." @@ -3588,7 +3500,7 @@ msgstr "No lo menciones." msgid "<blush>" msgstr "<sonrojo>" -#: ../../addon/buglink/buglink.php:16 ../../Zotlabs/Lib/Apps.php:327 +#: ../../addon/buglink/buglink.php:16 ../../Zotlabs/Lib/Apps.php:328 msgid "Report Bug" msgstr "Informe de errores" @@ -3699,6 +3611,16 @@ msgstr "Su cuenta en %s caducará en unos pocos días." msgid "Your $Productname test account is about to expire." msgstr "Su cuenta de prueba de $Productname está a punto de caducar." +#: ../../addon/hideaside/Mod_Hideaside.php:23 +#: ../../addon/hideaside/Mod_Hideaside.php:27 +msgid "Hide Aside App" +msgstr "App de ocultamiento del panel lateral" + +#: ../../addon/hideaside/Mod_Hideaside.php:24 +#: ../../addon/hideaside/Mod_Hideaside.php:28 +msgid "Fade out aside areas after a while when using endless scroll" +msgstr "Se desvanecen las áreas laterales cuando se usa un scroll sin fin" + #: ../../addon/skeleton/Mod_Skeleton.php:32 msgid "Skeleton App" msgstr "App Skeleton" @@ -3719,6 +3641,86 @@ msgstr "Un ajuste" msgid "Skeleton Settings" msgstr "Ajustes de Skeleton" +#: ../../addon/socialauth/Mod_SocialAuth.php:104 +#: ../../addon/socialauth/Mod_SocialAuth.php:176 +msgid "Network error" +msgstr "Error de red" + +#: ../../addon/socialauth/Mod_SocialAuth.php:108 +#: ../../addon/socialauth/Mod_SocialAuth.php:180 +msgid "API error" +msgstr "Error de API" + +#: ../../addon/socialauth/Mod_SocialAuth.php:112 +#: ../../addon/socialauth/Mod_SocialAuth.php:184 +msgid "Unknown issue" +msgstr "Problema desconocido" + +#: ../../addon/socialauth/Mod_SocialAuth.php:168 +msgid "Unable to login using email address " +msgstr "Imposible iniciar sesión usando la dirección de correo electrónico" + +#: ../../addon/socialauth/Mod_SocialAuth.php:202 +msgid "Sign in to Hubzilla using a social account" +msgstr "Iniciar sesión en Hubzilla usando una cuenta social" + +#: ../../addon/socialauth/Mod_SocialAuth.php:207 +msgid "Social Authentication using your social media account" +msgstr "Autenticación usando su cuenta de medios sociales" + +#: ../../addon/socialauth/Mod_SocialAuth.php:211 +msgid "" +"This app enables one or more social provider sign-in buttons on the login " +"page." +msgstr "Esta aplicación habilita uno o más botones de inicio de sesión de proveedores sociales en la página de inicio de sesión." + +#: ../../addon/socialauth/Mod_SocialAuth.php:229 +msgid "Add an identity provider" +msgstr "Añadir un proveedor de identidad" + +#: ../../addon/socialauth/Mod_SocialAuth.php:256 +msgid "Enable " +msgstr "Habilitar" + +#: ../../addon/socialauth/Mod_SocialAuth.php:263 +msgid "Key" +msgstr "Clave" + +#: ../../addon/socialauth/Mod_SocialAuth.php:263 +#: ../../addon/socialauth/Mod_SocialAuth.php:268 +#: ../../addon/socialauth/Mod_SocialAuth.php:284 +#: ../../addon/socialauth/Mod_SocialAuth.php:297 +msgid "Word" +msgstr "Palabra" + +#: ../../addon/socialauth/Mod_SocialAuth.php:268 +msgid "Secret" +msgstr "Secret" + +#: ../../addon/socialauth/Mod_SocialAuth.php:297 +msgid "Add a custom provider" +msgstr "Añadir un proveedor personalizado" + +#: ../../addon/socialauth/Mod_SocialAuth.php:317 +msgid "Remove an identity provider" +msgstr "Eliminar un proveedor de identidad" + +#: ../../addon/socialauth/Mod_SocialAuth.php:327 +msgid "Social authentication" +msgstr "Autenticación social" + +#: ../../addon/socialauth/Mod_SocialAuth.php:366 +msgid "Error while saving provider settings" +msgstr "Se ha producido un error mientras se guardaban los ajustes" + +#: ../../addon/socialauth/Mod_SocialAuth.php:382 +msgid "Custom provider already exists" +msgstr "Ya existe un proveedor personalizado" + +#: ../../addon/socialauth/Mod_SocialAuth.php:399 +msgid "Social authentication settings saved." +msgstr "Se han guardado los ajustes de la autenticación social." + #: ../../addon/nsfw/nsfw.php:152 msgid "Possible adult content" msgstr "Posible contenido para adultos" @@ -3872,31 +3874,31 @@ msgstr "No se pudo enviar el correo." msgid "Mail Test" msgstr "Prueba de correo" -#: ../../addon/ljpost/Mod_Ljpost.php:37 +#: ../../addon/ljpost/Mod_Ljpost.php:38 msgid "Livejournal Crosspost Connector App" msgstr "App Livejournal Crosspost Connector" -#: ../../addon/ljpost/Mod_Ljpost.php:38 +#: ../../addon/ljpost/Mod_Ljpost.php:39 msgid "Relay public posts to Livejournal" msgstr "Retransmisión de entradas públicas a Livejournal" -#: ../../addon/ljpost/Mod_Ljpost.php:54 +#: ../../addon/ljpost/Mod_Ljpost.php:55 msgid "Livejournal username" msgstr "Nombre de usuario en Livejournal" -#: ../../addon/ljpost/Mod_Ljpost.php:58 +#: ../../addon/ljpost/Mod_Ljpost.php:59 msgid "Livejournal password" msgstr "Contraseña en Livejournal" -#: ../../addon/ljpost/Mod_Ljpost.php:62 +#: ../../addon/ljpost/Mod_Ljpost.php:63 msgid "Post to Livejournal by default" msgstr "Publicar en Livejournal por defecto" -#: ../../addon/ljpost/Mod_Ljpost.php:66 +#: ../../addon/ljpost/Mod_Ljpost.php:67 msgid "Send wall-to-wall posts to Livejournal" msgstr "Enviar entradas de Muro-Muro a Livejournal" -#: ../../addon/ljpost/Mod_Ljpost.php:75 +#: ../../addon/ljpost/Mod_Ljpost.php:79 msgid "Livejournal Crosspost Connector" msgstr "Livejournal Crosspost Connector" @@ -3904,64 +3906,11 @@ msgstr "Livejournal Crosspost Connector" msgid "Post to Livejournal" msgstr "Publicar en Livejournal" -#: ../../addon/ljpost/ljpost.php:125 +#: ../../addon/ljpost/ljpost.php:127 msgid "Posted by" msgstr "Publicado por " -#: ../../addon/chess/Mod_Chess.php:180 ../../addon/chess/Mod_Chess.php:377 -msgid "Invalid game." -msgstr "Juego no válido." - -#: ../../addon/chess/Mod_Chess.php:186 ../../addon/chess/Mod_Chess.php:417 -msgid "You are not a player in this game." -msgstr "Usted no participa en este juego." - -#: ../../addon/chess/Mod_Chess.php:242 -msgid "You must be a local channel to create a game." -msgstr "Debe ser un canal local para crear un juego" - -#: ../../addon/chess/Mod_Chess.php:260 -msgid "You must select one opponent that is not yourself." -msgstr "Debe seleccionar un oponente que no sea usted mismo." - -#: ../../addon/chess/Mod_Chess.php:271 -msgid "Random color chosen." -msgstr "Elegido un color aleatorio." - -#: ../../addon/chess/Mod_Chess.php:279 -msgid "Error creating new game." -msgstr "Error al crear un nuevo juego." - -#: ../../addon/chess/Mod_Chess.php:306 ../../include/channel.php:1273 -msgid "Requested channel is not available." -msgstr "El canal solicitado no está disponible." - -#: ../../addon/chess/Mod_Chess.php:311 ../../addon/chess/Mod_Chess.php:333 -msgid "Chess not installed." -msgstr "Chess no está instalado." - -#: ../../addon/chess/Mod_Chess.php:326 -msgid "You must select a local channel /chess/channelname" -msgstr "Debe seleccionar un canal local /chess/nombredelcanal" - -#: ../../addon/chess/Mod_Chess.php:343 ../../Zotlabs/Module/Ochannel.php:32 -#: ../../Zotlabs/Module/Channel.php:42 ../../Zotlabs/Module/Chat.php:31 -msgid "You must be logged in to see this page." -msgstr "Debe haber iniciado sesión para poder ver esta página." - -#: ../../addon/chess/Mod_Chess.php:447 ../../include/help.php:132 -#: ../../Zotlabs/Module/Display.php:140 ../../Zotlabs/Module/Display.php:157 -#: ../../Zotlabs/Module/Display.php:174 ../../Zotlabs/Module/Display.php:180 -#: ../../Zotlabs/Module/Page.php:136 ../../Zotlabs/Module/Block.php:77 -#: ../../Zotlabs/Lib/NativeWikiPage.php:521 ../../Zotlabs/Web/Router.php:185 -msgid "Page not found." -msgstr "Página no encontrada." - -#: ../../addon/chess/chess.php:645 -msgid "Enable notifications" -msgstr "Habilitar notificaciones" - -#: ../../addon/mdpost/mdpost.php:41 ../../include/text.php:1983 +#: ../../addon/mdpost/mdpost.php:41 ../../include/text.php:2097 #: ../../Zotlabs/Widget/Wiki_pages.php:38 #: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../Zotlabs/Module/Wiki.php:217 #: ../../Zotlabs/Module/Wiki.php:371 @@ -3984,74 +3933,6 @@ msgstr "Esto importará todos sus ficheros en la nube desde otro servidor." msgid "Hubzilla Server base URL" msgstr "URL base del servidor Hubzilla" -#: ../../addon/jappixmini/Mod_Jappixmini.php:96 -msgid "Jappixmini App" -msgstr "App Jappixmini" - -#: ../../addon/jappixmini/Mod_Jappixmini.php:97 -msgid "Provides a Facebook-like chat using Jappix Mini" -msgstr "Proporciona un chat similar al de Facebook utilizando Jappix Mini" - -#: ../../addon/jappixmini/Mod_Jappixmini.php:157 -#: ../../include/channel.php:1526 ../../include/channel.php:1697 -msgid "Status:" -msgstr "Estado:" - -#: ../../addon/jappixmini/Mod_Jappixmini.php:161 -msgid "Hide Jappixmini Chat-Widget from the webinterface" -msgstr "Ocultar el widget de chat Jappixmini en la interfaz web" - -#: ../../addon/jappixmini/Mod_Jappixmini.php:166 -msgid "Jabber username" -msgstr "Nombre de usuario en Jabber" - -#: ../../addon/jappixmini/Mod_Jappixmini.php:172 -msgid "Jabber server" -msgstr "Servidor de Jabber" - -#: ../../addon/jappixmini/Mod_Jappixmini.php:178 -msgid "Jabber BOSH host URL" -msgstr "URL del host BOSH de Jabber" - -#: ../../addon/jappixmini/Mod_Jappixmini.php:185 -msgid "Jabber password" -msgstr "Contraseña en Jabber" - -#: ../../addon/jappixmini/Mod_Jappixmini.php:191 -msgid "Encrypt Jabber password with Hubzilla password" -msgstr "Cifrar la contraseña de Jabber con la contraseña de Hubzilla" - -#: ../../addon/jappixmini/Mod_Jappixmini.php:191 -#: ../../Zotlabs/Module/Settings/Channel.php:567 -#: ../../Zotlabs/Module/Settings/Channel.php:572 -#: ../../Zotlabs/Module/Settings/Channel.php:573 -#: ../../Zotlabs/Module/Settings/Channel.php:574 -msgid "Recommended" -msgstr "Recomendado" - -#: ../../addon/jappixmini/Mod_Jappixmini.php:199 -#: ../../addon/jappixmini/Mod_Jappixmini.php:203 -msgid "Approve subscription requests from Hubzilla contacts automatically" -msgstr "Aprobar automáticamente las solicitudes de suscripción de los contactos de Hubzilla" - -#: ../../addon/jappixmini/Mod_Jappixmini.php:207 -msgid "Purge internal list of jabber addresses of contacts" -msgstr "Purgar la lista interna de las direcciones de contactos de jabber" - -#: ../../addon/jappixmini/Mod_Jappixmini.php:212 -msgid "Configuration Help" -msgstr "Ayuda para los ajustes" - -#: ../../addon/jappixmini/Mod_Jappixmini.php:216 -#: ../../Zotlabs/Module/Cdav.php:1386 ../../Zotlabs/Module/Profiles.php:796 -#: ../../Zotlabs/Module/Connedit.php:936 -msgid "Add Contact" -msgstr "Añadir un contacto" - -#: ../../addon/jappixmini/Mod_Jappixmini.php:258 -msgid "Jappixmini Settings" -msgstr "Ajustes de Jappixmini" - #: ../../addon/authchoose/Mod_Authchoose.php:22 msgid "" "Allow magic authentication only to websites of your immediate connections" @@ -4149,20 +4030,20 @@ msgstr "Servidor BOSH de Jabber" msgid "XMPP Settings" msgstr "Ajustes de XMPP" -#: ../../include/zot.php:774 +#: ../../include/zot.php:773 msgid "Invalid data packet" msgstr "Paquete de datos no válido" -#: ../../include/zot.php:801 ../../Zotlabs/Lib/Libzot.php:652 +#: ../../include/zot.php:800 ../../Zotlabs/Lib/Libzot.php:652 msgid "Unable to verify channel signature" msgstr "No ha sido posible de verificar la firma del canal" -#: ../../include/zot.php:2628 ../../Zotlabs/Lib/Libsync.php:733 +#: ../../include/zot.php:2627 ../../Zotlabs/Lib/Libsync.php:740 #, php-format msgid "Unable to verify site signature for %s" msgstr "No ha sido posible de verificar la firma del sitio para %s" -#: ../../include/zot.php:4325 +#: ../../include/zot.php:4342 msgid "invalid target signature" msgstr "La firma recibida no es válida" @@ -4190,536 +4071,578 @@ msgstr "más antiguas" msgid "newer" msgstr "más recientes" -#: ../../include/text.php:1000 +#: ../../include/text.php:1005 msgid "No connections" msgstr "Sin conexiones" -#: ../../include/text.php:1012 ../../include/features.php:133 -#: ../../Zotlabs/Module/Connections.php:351 ../../Zotlabs/Lib/Apps.php:332 +#: ../../include/text.php:1017 ../../include/features.php:133 +#: ../../Zotlabs/Module/Connections.php:374 ../../Zotlabs/Lib/Apps.php:333 msgid "Connections" msgstr "Conexiones" -#: ../../include/text.php:1032 +#: ../../include/text.php:1025 ../../Zotlabs/Module/Viewconnections.php:80 +#: ../../Zotlabs/Module/Connections.php:288 +msgid "Accepts" +msgstr "Se acepta" + +#: ../../include/text.php:1028 ../../Zotlabs/Module/Viewconnections.php:83 +#: ../../Zotlabs/Module/Connections.php:291 +msgid "Comments" +msgstr "Comentarios" + +#: ../../include/text.php:1033 ../../Zotlabs/Module/Viewconnections.php:88 +#: ../../Zotlabs/Module/Connections.php:296 +msgid "Stream items" +msgstr "Elementos del stream" + +#: ../../include/text.php:1038 ../../Zotlabs/Module/Viewconnections.php:93 +#: ../../Zotlabs/Module/Connections.php:301 +msgid "Wall posts" +msgstr "Entradas del Muro" + +#: ../../include/text.php:1042 ../../Zotlabs/Module/Viewconnections.php:97 +#: ../../Zotlabs/Module/Connections.php:305 +msgid "Nothing" +msgstr "Nada" + +#: ../../include/text.php:1057 #, php-format msgid "View all %s connections" msgstr "Ver todas las %s conexiones" -#: ../../include/text.php:1094 +#: ../../include/text.php:1120 #, php-format msgid "Network: %s" msgstr "Red %s" -#: ../../include/text.php:1105 ../../include/text.php:1117 -#: ../../include/nav.php:186 ../../include/acl_selectors.php:118 +#: ../../include/text.php:1131 ../../include/text.php:1143 +#: ../../include/nav.php:188 ../../include/acl_selectors.php:118 #: ../../Zotlabs/Widget/Sitesearch.php:31 -#: ../../Zotlabs/Widget/Activity_filter.php:151 -#: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:355 -#: ../../Zotlabs/Lib/Apps.php:352 +#: ../../Zotlabs/Widget/Activity_filter.php:193 +#: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:378 +#: ../../Zotlabs/Lib/Apps.php:353 msgid "Search" msgstr "Buscar" -#: ../../include/text.php:1197 ../../include/text.php:1201 +#: ../../include/text.php:1223 ../../include/text.php:1227 msgid "poke" msgstr "un toque" -#: ../../include/text.php:1197 ../../include/text.php:1201 -#: ../../include/conversation.php:251 +#: ../../include/text.php:1223 ../../include/text.php:1227 +#: ../../include/conversation.php:255 msgid "poked" msgstr "ha dado un toque a" -#: ../../include/text.php:1202 +#: ../../include/text.php:1228 msgid "ping" msgstr "un \"ping\"" -#: ../../include/text.php:1202 +#: ../../include/text.php:1228 msgid "pinged" msgstr "ha enviado un \"ping\" a" -#: ../../include/text.php:1203 +#: ../../include/text.php:1229 msgid "prod" msgstr "una incitación " -#: ../../include/text.php:1203 +#: ../../include/text.php:1229 msgid "prodded" msgstr "ha incitado a " -#: ../../include/text.php:1204 +#: ../../include/text.php:1230 msgid "slap" msgstr "una bofetada " -#: ../../include/text.php:1204 +#: ../../include/text.php:1230 msgid "slapped" msgstr "ha abofeteado a " -#: ../../include/text.php:1205 +#: ../../include/text.php:1231 msgid "finger" msgstr "un \"finger\" " -#: ../../include/text.php:1205 +#: ../../include/text.php:1231 msgid "fingered" msgstr "envió un \"finger\" a" -#: ../../include/text.php:1206 +#: ../../include/text.php:1232 msgid "rebuff" msgstr "un reproche" -#: ../../include/text.php:1206 +#: ../../include/text.php:1232 msgid "rebuffed" msgstr "ha hecho un reproche a " -#: ../../include/text.php:1229 +#: ../../include/text.php:1255 msgid "happy" msgstr "feliz " -#: ../../include/text.php:1230 +#: ../../include/text.php:1256 msgid "sad" msgstr "triste " -#: ../../include/text.php:1231 +#: ../../include/text.php:1257 msgid "mellow" msgstr "tranquilo/a" -#: ../../include/text.php:1232 +#: ../../include/text.php:1258 msgid "tired" msgstr "cansado/a " -#: ../../include/text.php:1233 +#: ../../include/text.php:1259 msgid "perky" msgstr "vivaz" -#: ../../include/text.php:1234 +#: ../../include/text.php:1260 msgid "angry" msgstr "enfadado/a" -#: ../../include/text.php:1235 +#: ../../include/text.php:1261 msgid "stupefied" msgstr "asombrado/a" -#: ../../include/text.php:1236 +#: ../../include/text.php:1262 msgid "puzzled" msgstr "perplejo/a" -#: ../../include/text.php:1237 +#: ../../include/text.php:1263 msgid "interested" msgstr "interesado/a" -#: ../../include/text.php:1238 +#: ../../include/text.php:1264 msgid "bitter" msgstr "amargado/a" -#: ../../include/text.php:1239 +#: ../../include/text.php:1265 msgid "cheerful" msgstr "alegre" -#: ../../include/text.php:1240 +#: ../../include/text.php:1266 msgid "alive" msgstr "animado/a" -#: ../../include/text.php:1241 +#: ../../include/text.php:1267 msgid "annoyed" msgstr "molesto/a" -#: ../../include/text.php:1242 +#: ../../include/text.php:1268 msgid "anxious" msgstr "ansioso/a" -#: ../../include/text.php:1243 +#: ../../include/text.php:1269 msgid "cranky" msgstr "de mal humor" -#: ../../include/text.php:1244 +#: ../../include/text.php:1270 msgid "disturbed" msgstr "perturbado/a" -#: ../../include/text.php:1245 +#: ../../include/text.php:1271 msgid "frustrated" msgstr "frustrado/a" -#: ../../include/text.php:1246 +#: ../../include/text.php:1272 msgid "depressed" msgstr "deprimido/a" -#: ../../include/text.php:1247 +#: ../../include/text.php:1273 msgid "motivated" msgstr "motivado/a" -#: ../../include/text.php:1248 +#: ../../include/text.php:1274 msgid "relaxed" msgstr "relajado/a" -#: ../../include/text.php:1249 +#: ../../include/text.php:1275 msgid "surprised" msgstr "sorprendido/a" -#: ../../include/text.php:1437 ../../include/js_strings.php:96 +#: ../../include/text.php:1463 ../../include/js_strings.php:99 msgid "Monday" msgstr "lunes" -#: ../../include/text.php:1437 ../../include/js_strings.php:97 +#: ../../include/text.php:1463 ../../include/js_strings.php:100 msgid "Tuesday" msgstr "martes" -#: ../../include/text.php:1437 ../../include/js_strings.php:98 +#: ../../include/text.php:1463 ../../include/js_strings.php:101 msgid "Wednesday" msgstr "miércoles" -#: ../../include/text.php:1437 ../../include/js_strings.php:99 +#: ../../include/text.php:1463 ../../include/js_strings.php:102 msgid "Thursday" msgstr "jueves" -#: ../../include/text.php:1437 ../../include/js_strings.php:100 +#: ../../include/text.php:1463 ../../include/js_strings.php:103 msgid "Friday" msgstr "viernes" -#: ../../include/text.php:1437 ../../include/js_strings.php:101 +#: ../../include/text.php:1463 ../../include/js_strings.php:104 msgid "Saturday" msgstr "sábado" -#: ../../include/text.php:1437 ../../include/js_strings.php:95 +#: ../../include/text.php:1463 ../../include/js_strings.php:98 msgid "Sunday" msgstr "domingo" -#: ../../include/text.php:1441 ../../include/js_strings.php:71 +#: ../../include/text.php:1467 ../../include/js_strings.php:74 msgid "January" msgstr "enero" -#: ../../include/text.php:1441 ../../include/js_strings.php:72 +#: ../../include/text.php:1467 ../../include/js_strings.php:75 msgid "February" msgstr "febrero" -#: ../../include/text.php:1441 ../../include/js_strings.php:73 +#: ../../include/text.php:1467 ../../include/js_strings.php:76 msgid "March" msgstr "marzo" -#: ../../include/text.php:1441 ../../include/js_strings.php:74 +#: ../../include/text.php:1467 ../../include/js_strings.php:77 msgid "April" msgstr "abril" -#: ../../include/text.php:1441 +#: ../../include/text.php:1467 msgid "May" msgstr "mayo" -#: ../../include/text.php:1441 ../../include/js_strings.php:76 +#: ../../include/text.php:1467 ../../include/js_strings.php:79 msgid "June" msgstr "junio" -#: ../../include/text.php:1441 ../../include/js_strings.php:77 +#: ../../include/text.php:1467 ../../include/js_strings.php:80 msgid "July" msgstr "julio" -#: ../../include/text.php:1441 ../../include/js_strings.php:78 +#: ../../include/text.php:1467 ../../include/js_strings.php:81 msgid "August" msgstr "agosto" -#: ../../include/text.php:1441 ../../include/js_strings.php:79 +#: ../../include/text.php:1467 ../../include/js_strings.php:82 msgid "September" msgstr "septiembre" -#: ../../include/text.php:1441 ../../include/js_strings.php:80 +#: ../../include/text.php:1467 ../../include/js_strings.php:83 msgid "October" msgstr "octubre" -#: ../../include/text.php:1441 ../../include/js_strings.php:81 +#: ../../include/text.php:1467 ../../include/js_strings.php:84 msgid "November" msgstr "noviembre" -#: ../../include/text.php:1441 ../../include/js_strings.php:82 +#: ../../include/text.php:1467 ../../include/js_strings.php:85 msgid "December" msgstr "diciembre" -#: ../../include/text.php:1515 +#: ../../include/text.php:1541 msgid "Unknown Attachment" msgstr "Adjunto no reconocido" -#: ../../include/text.php:1517 ../../Zotlabs/Module/Sharedwithme.php:106 +#: ../../include/text.php:1543 ../../Zotlabs/Module/Sharedwithme.php:108 #: ../../Zotlabs/Storage/Browser.php:293 msgid "Size" msgstr "Tamaño" -#: ../../include/text.php:1517 ../../include/feedutils.php:870 +#: ../../include/text.php:1543 ../../include/feedutils.php:871 msgid "unknown" msgstr "desconocido" -#: ../../include/text.php:1553 +#: ../../include/text.php:1579 msgid "remove category" msgstr "eliminar el tema" -#: ../../include/text.php:1629 +#: ../../include/text.php:1655 msgid "remove from file" msgstr "eliminar del fichero" -#: ../../include/text.php:1793 ../../include/message.php:13 +#: ../../include/text.php:1824 ../../include/message.php:13 msgid "Download binary/encrypted content" msgstr "Descargar contenido binario o cifrado" -#: ../../include/text.php:1941 ../../Zotlabs/Module/Events.php:669 +#: ../../include/text.php:1895 +msgid "Poll has ended." +msgstr "La encuesta ha terminado" + +#: ../../include/text.php:1898 +#, php-format +msgid "Poll ends: %s" +msgstr "Finales de la encuesta: %s" + +#: ../../include/text.php:1903 ../../Zotlabs/Lib/ThreadItem.php:444 +msgid "Vote" +msgstr "Votar" + +#: ../../include/text.php:2055 ../../Zotlabs/Module/Events.php:669 msgid "Link to Source" msgstr "Enlazar con la entrada en su ubicación original" -#: ../../include/text.php:1963 ../../include/language.php:423 +#: ../../include/text.php:2077 ../../include/language.php:424 msgid "default" msgstr "por defecto" -#: ../../include/text.php:1971 +#: ../../include/text.php:2085 msgid "Page layout" msgstr "Plantilla de la página" -#: ../../include/text.php:1971 +#: ../../include/text.php:2085 msgid "You can create your own with the layouts tool" msgstr "Puede crear su propia disposición gráfica con la herramienta de plantillas" -#: ../../include/text.php:1981 ../../Zotlabs/Widget/Wiki_pages.php:38 +#: ../../include/text.php:2095 ../../Zotlabs/Widget/Wiki_pages.php:38 #: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../Zotlabs/Module/Wiki.php:217 #: ../../Zotlabs/Module/Wiki.php:371 msgid "BBcode" msgstr "BBcode" -#: ../../include/text.php:1982 +#: ../../include/text.php:2096 msgid "HTML" msgstr "HTML" -#: ../../include/text.php:1984 ../../Zotlabs/Widget/Wiki_pages.php:38 +#: ../../include/text.php:2098 ../../Zotlabs/Widget/Wiki_pages.php:38 #: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../Zotlabs/Module/Wiki.php:217 msgid "Text" msgstr "Texto" -#: ../../include/text.php:1985 +#: ../../include/text.php:2099 msgid "Comanche Layout" msgstr "Plantilla de Comanche" -#: ../../include/text.php:1990 +#: ../../include/text.php:2104 msgid "PHP" msgstr "PHP" -#: ../../include/text.php:1999 +#: ../../include/text.php:2113 msgid "Page content type" msgstr "Tipo de contenido de la página" -#: ../../include/text.php:2122 ../../include/event.php:1213 -#: ../../include/conversation.php:119 -#: ../../Zotlabs/Module/Channel_calendar.php:213 -#: ../../Zotlabs/Module/Like.php:394 ../../Zotlabs/Module/Tagger.php:73 +#: ../../include/text.php:2236 ../../include/event.php:1259 +#: ../../include/conversation.php:121 +#: ../../Zotlabs/Module/Channel_calendar.php:219 +#: ../../Zotlabs/Module/Like.php:388 ../../Zotlabs/Module/Tagger.php:75 #: ../../Zotlabs/Module/Events.php:266 msgid "event" msgstr "el/su evento" -#: ../../include/text.php:2127 ../../include/conversation.php:146 -#: ../../Zotlabs/Module/Tagger.php:79 +#: ../../include/text.php:2241 ../../include/conversation.php:148 +#: ../../Zotlabs/Module/Tagger.php:81 msgid "comment" msgstr "el comentario" -#: ../../include/text.php:2132 +#: ../../include/text.php:2246 msgid "activity" msgstr "la/su actividad" -#: ../../include/text.php:2233 +#: ../../include/text.php:2249 +msgid "poll" +msgstr "encuesta" + +#: ../../include/text.php:2350 msgid "a-z, 0-9, -, and _ only" msgstr "a-z, 0-9, -, and _ only" -#: ../../include/text.php:2559 +#: ../../include/text.php:2676 msgid "Design Tools" msgstr "Herramientas de diseño web" -#: ../../include/text.php:2562 ../../Zotlabs/Module/Blocks.php:154 +#: ../../include/text.php:2679 ../../Zotlabs/Module/Blocks.php:154 msgid "Blocks" msgstr "Bloques" -#: ../../include/text.php:2563 ../../Zotlabs/Module/Menu.php:171 +#: ../../include/text.php:2680 ../../Zotlabs/Module/Menu.php:171 msgid "Menus" msgstr "Menús" -#: ../../include/text.php:2564 ../../Zotlabs/Module/Layouts.php:184 +#: ../../include/text.php:2681 ../../Zotlabs/Module/Layouts.php:184 msgid "Layouts" msgstr "Plantillas" -#: ../../include/text.php:2565 +#: ../../include/text.php:2682 msgid "Pages" msgstr "Páginas" -#: ../../include/text.php:2577 +#: ../../include/text.php:2694 msgid "Import" msgstr "Importar" -#: ../../include/text.php:2578 +#: ../../include/text.php:2695 msgid "Import website..." msgstr "Importar un sitio web..." -#: ../../include/text.php:2579 +#: ../../include/text.php:2696 msgid "Select folder to import" msgstr "Seleccionar la carpeta que se va a importar" -#: ../../include/text.php:2580 +#: ../../include/text.php:2697 msgid "Import from a zipped folder:" msgstr "Importar desde una carpeta comprimida: " -#: ../../include/text.php:2581 +#: ../../include/text.php:2698 msgid "Import from cloud files:" msgstr "Importar desde los ficheros en la nube: " -#: ../../include/text.php:2582 +#: ../../include/text.php:2699 msgid "/cloud/channel/path/to/folder" msgstr "/cloud/canal/ruta/a la/carpeta" -#: ../../include/text.php:2583 +#: ../../include/text.php:2700 msgid "Enter path to website files" msgstr "Ruta a los ficheros del sitio web" -#: ../../include/text.php:2584 +#: ../../include/text.php:2701 msgid "Select folder" msgstr "Seleccionar la carpeta" -#: ../../include/text.php:2585 +#: ../../include/text.php:2702 msgid "Export website..." msgstr "Exportar un sitio web..." -#: ../../include/text.php:2586 +#: ../../include/text.php:2703 msgid "Export to a zip file" msgstr "Exportar a un fichero comprimido .zip" -#: ../../include/text.php:2587 +#: ../../include/text.php:2704 msgid "website.zip" msgstr "sitio_web.zip" -#: ../../include/text.php:2588 +#: ../../include/text.php:2705 msgid "Enter a name for the zip file." msgstr "Escriba un nombre para el fichero zip." -#: ../../include/text.php:2589 +#: ../../include/text.php:2706 msgid "Export to cloud files" msgstr "Exportar a la nube de ficheros" -#: ../../include/text.php:2590 +#: ../../include/text.php:2707 msgid "/path/to/export/folder" msgstr "/ruta/para/exportar/carpeta" -#: ../../include/text.php:2591 +#: ../../include/text.php:2708 msgid "Enter a path to a cloud files destination." msgstr "Escriba una ruta de destino a la nube de ficheros." -#: ../../include/text.php:2592 +#: ../../include/text.php:2709 msgid "Specify folder" msgstr "Especificar una carpeta" -#: ../../include/text.php:2954 ../../Zotlabs/Storage/Browser.php:131 +#: ../../include/text.php:3082 ../../Zotlabs/Storage/Browser.php:131 msgid "Collection" msgstr "Colección" -#: ../../include/opengraph.php:58 +#: ../../include/opengraph.php:56 #, php-format msgid "This is the home page of %s." msgstr "Esta es la página personal de %s." -#: ../../include/event.php:32 ../../include/event.php:95 +#: ../../include/event.php:33 ../../include/event.php:110 msgid "l F d, Y \\@ g:i A" msgstr "l d de F, Y \\@ G:i" -#: ../../include/event.php:40 +#: ../../include/event.php:41 msgid "Starts:" msgstr "Comienza:" -#: ../../include/event.php:50 +#: ../../include/event.php:51 msgid "Finishes:" msgstr "Finaliza:" -#: ../../include/event.php:62 ../../include/event.php:112 -#: ../../include/channel.php:1521 ../../Zotlabs/Module/Directory.php:339 +#: ../../include/event.php:63 ../../include/event.php:134 +#: ../../include/channel.php:1618 ../../Zotlabs/Module/Directory.php:352 msgid "Location:" msgstr "Ubicación:" -#: ../../include/event.php:95 +#: ../../include/event.php:110 msgid "l F d, Y" msgstr "l F d, Y" -#: ../../include/event.php:99 +#: ../../include/event.php:114 msgid "Start:" msgstr "Iniciar: " -#: ../../include/event.php:103 +#: ../../include/event.php:118 msgid "End:" msgstr "Finalizar: " -#: ../../include/event.php:1064 +#: ../../include/event.php:1106 msgid "This event has been added to your calendar." msgstr "Este evento ha sido añadido a su calendario." -#: ../../include/event.php:1290 +#: ../../include/event.php:1337 msgid "Not specified" msgstr "Sin especificar" -#: ../../include/event.php:1291 +#: ../../include/event.php:1338 msgid "Needs Action" msgstr "Necesita de una intervención" -#: ../../include/event.php:1292 +#: ../../include/event.php:1339 msgid "Completed" msgstr "Completado/a" -#: ../../include/event.php:1293 +#: ../../include/event.php:1340 msgid "In Process" msgstr "En proceso" -#: ../../include/event.php:1294 +#: ../../include/event.php:1341 msgid "Cancelled" msgstr "Cancelado/a" -#: ../../include/event.php:1375 ../../include/connections.php:728 -#: ../../Zotlabs/Module/Cdav.php:1382 ../../Zotlabs/Module/Profiles.php:792 -#: ../../Zotlabs/Module/Connedit.php:932 +#: ../../include/event.php:1422 ../../include/connections.php:728 +#: ../../Zotlabs/Module/Cdav.php:1377 ../../Zotlabs/Module/Profiles.php:794 +#: ../../Zotlabs/Module/Connedit.php:933 msgid "Mobile" msgstr "Móvil" -#: ../../include/event.php:1376 ../../include/connections.php:729 -#: ../../Zotlabs/Module/Cdav.php:1383 ../../Zotlabs/Module/Profiles.php:793 -#: ../../Zotlabs/Module/Connedit.php:933 +#: ../../include/event.php:1423 ../../include/connections.php:729 +#: ../../Zotlabs/Module/Cdav.php:1378 ../../Zotlabs/Module/Profiles.php:795 +#: ../../Zotlabs/Module/Connedit.php:934 msgid "Home" msgstr "Inicio" -#: ../../include/event.php:1377 ../../include/connections.php:730 +#: ../../include/event.php:1424 ../../include/connections.php:730 msgid "Home, Voice" msgstr "Llamadas particulares" -#: ../../include/event.php:1378 ../../include/connections.php:731 +#: ../../include/event.php:1425 ../../include/connections.php:731 msgid "Home, Fax" msgstr "Fax particular" -#: ../../include/event.php:1379 ../../include/connections.php:732 -#: ../../Zotlabs/Module/Cdav.php:1384 ../../Zotlabs/Module/Profiles.php:794 -#: ../../Zotlabs/Module/Connedit.php:934 +#: ../../include/event.php:1426 ../../include/connections.php:732 +#: ../../Zotlabs/Module/Cdav.php:1379 ../../Zotlabs/Module/Profiles.php:796 +#: ../../Zotlabs/Module/Connedit.php:935 msgid "Work" msgstr "Trabajo" -#: ../../include/event.php:1380 ../../include/connections.php:733 +#: ../../include/event.php:1427 ../../include/connections.php:733 msgid "Work, Voice" msgstr "Llamadas de trabajo" -#: ../../include/event.php:1381 ../../include/connections.php:734 +#: ../../include/event.php:1428 ../../include/connections.php:734 msgid "Work, Fax" msgstr "Fax de trabajo" -#: ../../include/event.php:1382 ../../include/event.php:1389 +#: ../../include/event.php:1429 ../../include/event.php:1436 #: ../../include/selectors.php:60 ../../include/selectors.php:77 #: ../../include/selectors.php:115 ../../include/selectors.php:151 #: ../../include/connections.php:735 ../../include/connections.php:742 -#: ../../Zotlabs/Module/Cdav.php:1385 ../../Zotlabs/Module/Profiles.php:795 -#: ../../Zotlabs/Module/Connedit.php:935 -#: ../../Zotlabs/Access/PermissionRoles.php:306 +#: ../../Zotlabs/Module/Cdav.php:1380 ../../Zotlabs/Module/Profiles.php:797 +#: ../../Zotlabs/Module/Connedit.php:936 +#: ../../Zotlabs/Access/PermissionRoles.php:310 msgid "Other" msgstr "Otro" #: ../../include/features.php:55 ../../Zotlabs/Module/Admin/Features.php:55 #: ../../Zotlabs/Module/Admin/Features.php:56 -#: ../../Zotlabs/Module/Settings/Features.php:36 +#: ../../Zotlabs/Module/Settings/Features.php:38 msgid "Off" msgstr "Desactivado" #: ../../include/features.php:55 ../../Zotlabs/Module/Admin/Features.php:55 #: ../../Zotlabs/Module/Admin/Features.php:56 -#: ../../Zotlabs/Module/Settings/Features.php:36 +#: ../../Zotlabs/Module/Settings/Features.php:38 msgid "On" msgstr "Activado" -#: ../../include/features.php:82 ../../include/nav.php:465 -#: ../../include/nav.php:468 ../../Zotlabs/Lib/Apps.php:345 +#: ../../include/features.php:82 ../../include/nav.php:463 +#: ../../include/nav.php:466 ../../Zotlabs/Lib/Apps.php:346 #: ../../Zotlabs/Storage/Browser.php:140 msgid "Calendar" msgstr "Calendario" @@ -4740,7 +4663,7 @@ msgstr "Selección del huso horario del evento" msgid "Allow event creation in timezones other than your own." msgstr "Permitir la creación de eventos en husos horarios distintos del suyo." -#: ../../include/features.php:104 ../../Zotlabs/Lib/Apps.php:342 +#: ../../include/features.php:104 ../../Zotlabs/Lib/Apps.php:343 msgid "Channel Home" msgstr "Mi canal" @@ -4760,11 +4683,11 @@ msgstr "Nube de etiquetas" msgid "Provide a personal tag cloud on your channel page" msgstr "Proveer nube de etiquetas personal en su página de canal" -#: ../../include/features.php:124 ../../include/features.php:351 +#: ../../include/features.php:124 ../../include/features.php:359 msgid "Use blog/list mode" msgstr "Usar el modo blog/lista" -#: ../../include/features.php:125 ../../include/features.php:352 +#: ../../include/features.php:125 ../../include/features.php:360 msgid "Comments will be displayed separately" msgstr "Los comentarios se mostrarán por separado" @@ -4780,14 +4703,6 @@ msgstr "Filtrar publicaciones entrantes de conexiones por palabras clave o conte msgid "Conversation" msgstr "Conversación" -#: ../../include/features.php:150 -msgid "Community Tagging" -msgstr "Etiquetas de la comunidad" - -#: ../../include/features.php:151 -msgid "Ability to tag existing posts" -msgstr "Capacidad de etiquetar entradas" - #: ../../include/features.php:158 msgid "Emoji Reactions" msgstr "Emoticonos \"emoji\"" @@ -4820,7 +4735,7 @@ msgstr "Responder a los comentarios" msgid "Ability to reply on selected comment" msgstr "Posibilidad de responder a los comentarios seleccionados" -#: ../../include/features.php:192 ../../Zotlabs/Lib/Apps.php:346 +#: ../../include/features.php:192 ../../Zotlabs/Lib/Apps.php:347 msgid "Directory" msgstr "Directorio" @@ -4864,167 +4779,175 @@ msgid "" msgstr "Permitir cifrado adicional de contenido \"punto-a-punto\" con una clave secreta compartida." #: ../../include/features.php:235 -msgid "Enable Voting Tools" -msgstr "Permitir entradas con votación" - -#: ../../include/features.php:236 -msgid "Provide a class of post which others can vote on" -msgstr "Proveer una clase de publicación en la que otros puedan votar" - -#: ../../include/features.php:243 msgid "Disable Comments" msgstr "Deshabilitar comentarios" -#: ../../include/features.php:244 +#: ../../include/features.php:236 msgid "Provide the option to disable comments for a post" msgstr "Proporcionar la opción de desactivar los comentarios para una entrada" -#: ../../include/features.php:251 +#: ../../include/features.php:243 msgid "Delayed Posting" msgstr "Publicación aplazada" -#: ../../include/features.php:252 +#: ../../include/features.php:244 msgid "Allow posts to be published at a later date" msgstr "Permitir mensajes que se publicarán en una fecha posterior" -#: ../../include/features.php:259 +#: ../../include/features.php:251 msgid "Content Expiration" msgstr "Caducidad del contenido" -#: ../../include/features.php:260 +#: ../../include/features.php:252 msgid "Remove posts/comments and/or private messages at a future time" msgstr "Eliminar publicaciones/comentarios y/o mensajes privados más adelante" -#: ../../include/features.php:267 +#: ../../include/features.php:259 msgid "Suppress Duplicate Posts/Comments" msgstr "Prevenir entradas o comentarios duplicados" -#: ../../include/features.php:268 +#: ../../include/features.php:260 msgid "" "Prevent posts with identical content to be published with less than two " "minutes in between submissions." msgstr "Prevenir que entradas con contenido idéntico se publiquen con menos de dos minutos de intervalo." -#: ../../include/features.php:275 +#: ../../include/features.php:267 msgid "Auto-save drafts of posts and comments" msgstr "Guardar automáticamente borradores de entradas y comentarios" -#: ../../include/features.php:276 +#: ../../include/features.php:268 msgid "" "Automatically saves post and comment drafts in local browser storage to help" " prevent accidental loss of compositions" msgstr "Guarda automáticamente los borradores de comentarios y publicaciones en el almacenamiento del navegador local para ayudar a evitar la pérdida accidental de composiciones." -#: ../../include/features.php:285 +#: ../../include/features.php:277 msgid "Manage" msgstr "Gestionar" -#: ../../include/features.php:289 +#: ../../include/features.php:281 msgid "Navigation Channel Select" msgstr "Navegación por el selector de canales" -#: ../../include/features.php:290 +#: ../../include/features.php:282 msgid "Change channels directly from within the navigation dropdown menu" msgstr "Cambiar de canales directamente desde el menú de navegación desplegable" -#: ../../include/features.php:299 ../../Zotlabs/Module/Connections.php:310 +#: ../../include/features.php:291 ../../Zotlabs/Module/Connections.php:332 msgid "Network" msgstr "Red" -#: ../../include/features.php:303 ../../Zotlabs/Widget/Savedsearch.php:83 +#: ../../include/features.php:295 +msgid "Events Filter" +msgstr "Filtro de eventos" + +#: ../../include/features.php:296 +msgid "Ability to display only events" +msgstr "Capacidad para mostrar solo eventos" + +#: ../../include/features.php:303 +msgid "Polls Filter" +msgstr "Filtro de encuestas" + +#: ../../include/features.php:304 +msgid "Ability to display only polls" +msgstr "Capacidad para mostrar solo encuestas" + +#: ../../include/features.php:311 ../../Zotlabs/Widget/Savedsearch.php:83 msgid "Saved Searches" msgstr "Búsquedas guardadas" -#: ../../include/features.php:304 +#: ../../include/features.php:312 msgid "Save search terms for re-use" msgstr "Guardar términos de búsqueda para su reutilización" -#: ../../include/features.php:311 ../../include/contact_widgets.php:53 -#: ../../Zotlabs/Widget/Activity_filter.php:137 +#: ../../include/features.php:319 ../../include/contact_widgets.php:53 +#: ../../Zotlabs/Widget/Activity_filter.php:179 #: ../../Zotlabs/Widget/Filer.php:28 msgid "Saved Folders" msgstr "Carpetas guardadas" -#: ../../include/features.php:312 +#: ../../include/features.php:320 msgid "Ability to file posts under folders" msgstr "Capacidad de archivar entradas en carpetas" -#: ../../include/features.php:319 +#: ../../include/features.php:327 msgid "Alternate Stream Order" msgstr "Orden de stream alternativo" -#: ../../include/features.php:320 +#: ../../include/features.php:328 msgid "" "Ability to order the stream by last post date, last comment date or " "unthreaded activities" msgstr "Posibilidad de ordenar el stream por última fecha de publicación, última fecha de comentario o actividades sin hilo" -#: ../../include/features.php:327 +#: ../../include/features.php:335 msgid "Contact Filter" msgstr "Filtro de contactos" -#: ../../include/features.php:328 +#: ../../include/features.php:336 msgid "Ability to display only posts of a selected contact" msgstr "Posibilidad de mostrar sólo los mensajes de un contacto seleccionado" -#: ../../include/features.php:335 +#: ../../include/features.php:343 msgid "Forum Filter" msgstr "Filtro de foro" -#: ../../include/features.php:336 +#: ../../include/features.php:344 msgid "Ability to display only posts of a specific forum" msgstr "Posibilidad de mostrar sólo los mensajes de un foro específico" -#: ../../include/features.php:343 +#: ../../include/features.php:351 msgid "Personal Posts Filter" msgstr "Filtro de entradas personales" -#: ../../include/features.php:344 +#: ../../include/features.php:352 msgid "Ability to display only posts that you've interacted on" msgstr "Posibilidad de mostrar sólo los mensajes en los que usted haya interactuado" -#: ../../include/features.php:361 ../../include/nav.php:446 -#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:344 +#: ../../include/features.php:369 ../../include/nav.php:444 +#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:345 msgid "Photos" msgstr "Fotos" -#: ../../include/features.php:365 +#: ../../include/features.php:373 msgid "Photo Location" msgstr "Ubicación de las fotos" -#: ../../include/features.php:366 +#: ../../include/features.php:374 msgid "If location data is available on uploaded photos, link this to a map." msgstr "Si los datos de ubicación están disponibles en las fotos subidas, enlazar estas a un mapa." -#: ../../include/features.php:375 ../../Zotlabs/Lib/Apps.php:362 +#: ../../include/features.php:383 ../../Zotlabs/Lib/Apps.php:363 msgid "Profiles" msgstr "Perfiles" -#: ../../include/features.php:379 +#: ../../include/features.php:387 msgid "Advanced Profiles" msgstr "Perfiles avanzados" -#: ../../include/features.php:380 +#: ../../include/features.php:388 msgid "Additional profile sections and selections" msgstr "Secciones y selecciones de perfil adicionales" -#: ../../include/features.php:387 +#: ../../include/features.php:395 msgid "Profile Import/Export" msgstr "Importar/Exportar perfil" -#: ../../include/features.php:388 +#: ../../include/features.php:396 msgid "Save and load profile details across sites/channels" msgstr "Guardar y cargar detalles del perfil a través de sitios/canales" -#: ../../include/features.php:395 +#: ../../include/features.php:403 msgid "Multiple Profiles" msgstr "Múltiples perfiles" -#: ../../include/features.php:396 +#: ../../include/features.php:404 msgid "Ability to create multiple profiles" msgstr "Capacidad de crear múltiples perfiles" -#: ../../include/security.php:607 +#: ../../include/security.php:609 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." @@ -5034,12 +4957,12 @@ msgstr "El \"token\" de seguridad del formulario no es correcto. Esto ha ocurrid msgid "Delete this item?" msgstr "¿Borrar este elemento?" -#: ../../include/js_strings.php:6 ../../Zotlabs/Module/Photos.php:1095 -#: ../../Zotlabs/Module/Photos.php:1214 ../../Zotlabs/Lib/ThreadItem.php:795 +#: ../../include/js_strings.php:6 ../../Zotlabs/Module/Photos.php:1096 +#: ../../Zotlabs/Module/Photos.php:1214 ../../Zotlabs/Lib/ThreadItem.php:824 msgid "Comment" msgstr "Comentar" -#: ../../include/js_strings.php:7 ../../Zotlabs/Lib/ThreadItem.php:502 +#: ../../include/js_strings.php:7 ../../Zotlabs/Lib/ThreadItem.php:533 #, php-format msgid "%s show all" msgstr "%s mostrar todo" @@ -5096,7 +5019,7 @@ msgid "Rate This Channel (this is public)" msgstr "Valorar este canal (esto es público)" #: ../../include/js_strings.php:20 ../../Zotlabs/Module/Rate.php:155 -#: ../../Zotlabs/Module/Connedit.php:887 +#: ../../Zotlabs/Module/Connedit.php:888 msgid "Rating" msgstr "Valoración" @@ -5113,8 +5036,8 @@ msgid "Unsaved changes. Are you sure you wish to leave this page?" msgstr "Cambios no guardados. ¿Está seguro de que desea abandonar la página?" #: ../../include/js_strings.php:25 ../../Zotlabs/Module/Pubsites.php:52 -#: ../../Zotlabs/Module/Cdav.php:1038 ../../Zotlabs/Module/Events.php:483 -#: ../../Zotlabs/Module/Profiles.php:509 ../../Zotlabs/Module/Profiles.php:734 +#: ../../Zotlabs/Module/Cdav.php:1011 ../../Zotlabs/Module/Events.php:483 +#: ../../Zotlabs/Module/Profiles.php:511 ../../Zotlabs/Module/Profiles.php:736 #: ../../Zotlabs/Module/Locs.php:117 msgid "Location" msgstr "Ubicación" @@ -5165,192 +5088,205 @@ msgstr "nombre de canal" msgid "Back to reply" msgstr "Volver a la respuesta" -#: ../../include/js_strings.php:42 +#: ../../include/js_strings.php:37 +msgid "Pinned" +msgstr "Anclado/a" + +#: ../../include/js_strings.php:38 ../../Zotlabs/Lib/ThreadItem.php:471 +msgid "Pin to the top" +msgstr "Anclar en la parte superior" + +#: ../../include/js_strings.php:39 ../../Zotlabs/Widget/Pinned.php:157 +#: ../../Zotlabs/Lib/ThreadItem.php:471 +msgid "Unpin from the top" +msgstr "Desanclar de la parte superior" + +#: ../../include/js_strings.php:45 #, php-format msgid "%d minutes" msgid_plural "%d minutes" msgstr[0] "%d minutos" msgstr[1] "%d minutos" -#: ../../include/js_strings.php:43 +#: ../../include/js_strings.php:46 #, php-format msgid "about %d hours" msgid_plural "about %d hours" msgstr[0] "alrededor de %d horas" msgstr[1] "alrededor de %d horas" -#: ../../include/js_strings.php:44 +#: ../../include/js_strings.php:47 #, php-format msgid "%d days" msgid_plural "%d days" msgstr[0] "%d días" msgstr[1] "%d días" -#: ../../include/js_strings.php:45 +#: ../../include/js_strings.php:48 #, php-format msgid "%d months" msgid_plural "%d months" msgstr[0] "%d meses" msgstr[1] "%d meses" -#: ../../include/js_strings.php:46 +#: ../../include/js_strings.php:49 #, php-format msgid "%d years" msgid_plural "%d years" msgstr[0] "%d años" msgstr[1] "%d años" -#: ../../include/js_strings.php:51 +#: ../../include/js_strings.php:54 msgid "timeago.prefixAgo" msgstr "hace " -#: ../../include/js_strings.php:52 +#: ../../include/js_strings.php:55 msgid "timeago.prefixFromNow" msgstr "en " -#: ../../include/js_strings.php:53 +#: ../../include/js_strings.php:56 msgid "timeago.suffixAgo" msgstr "NONE" -#: ../../include/js_strings.php:54 +#: ../../include/js_strings.php:57 msgid "timeago.suffixFromNow" msgstr "NONE" -#: ../../include/js_strings.php:57 +#: ../../include/js_strings.php:60 msgid "less than a minute" msgstr "menos de un minuto" -#: ../../include/js_strings.php:58 +#: ../../include/js_strings.php:61 msgid "about a minute" msgstr "alrededor de un minuto" -#: ../../include/js_strings.php:60 +#: ../../include/js_strings.php:63 msgid "about an hour" msgstr "alrededor de una hora" -#: ../../include/js_strings.php:62 +#: ../../include/js_strings.php:65 msgid "a day" msgstr "un día" -#: ../../include/js_strings.php:64 +#: ../../include/js_strings.php:67 msgid "about a month" msgstr "alrededor de un mes" -#: ../../include/js_strings.php:66 +#: ../../include/js_strings.php:69 msgid "about a year" msgstr "alrededor de un año" -#: ../../include/js_strings.php:68 +#: ../../include/js_strings.php:71 msgid " " msgstr " " -#: ../../include/js_strings.php:69 +#: ../../include/js_strings.php:72 msgid "timeago.numbers" msgstr "timeago.numbers" -#: ../../include/js_strings.php:75 +#: ../../include/js_strings.php:78 msgctxt "long" msgid "May" msgstr "mayo" -#: ../../include/js_strings.php:83 +#: ../../include/js_strings.php:86 msgid "Jan" msgstr "ene" -#: ../../include/js_strings.php:84 +#: ../../include/js_strings.php:87 msgid "Feb" msgstr "feb" -#: ../../include/js_strings.php:85 +#: ../../include/js_strings.php:88 msgid "Mar" msgstr "mar" -#: ../../include/js_strings.php:86 +#: ../../include/js_strings.php:89 msgid "Apr" msgstr "abr" -#: ../../include/js_strings.php:87 +#: ../../include/js_strings.php:90 msgctxt "short" msgid "May" msgstr "may" -#: ../../include/js_strings.php:88 +#: ../../include/js_strings.php:91 msgid "Jun" msgstr "jun" -#: ../../include/js_strings.php:89 +#: ../../include/js_strings.php:92 msgid "Jul" msgstr "jul" -#: ../../include/js_strings.php:90 +#: ../../include/js_strings.php:93 msgid "Aug" msgstr "ago" -#: ../../include/js_strings.php:91 +#: ../../include/js_strings.php:94 msgid "Sep" msgstr "sep" -#: ../../include/js_strings.php:92 +#: ../../include/js_strings.php:95 msgid "Oct" msgstr "oct" -#: ../../include/js_strings.php:93 +#: ../../include/js_strings.php:96 msgid "Nov" msgstr "nov" -#: ../../include/js_strings.php:94 +#: ../../include/js_strings.php:97 msgid "Dec" msgstr "dic" -#: ../../include/js_strings.php:102 +#: ../../include/js_strings.php:105 msgid "Sun" msgstr "dom" -#: ../../include/js_strings.php:103 +#: ../../include/js_strings.php:106 msgid "Mon" msgstr "lun" -#: ../../include/js_strings.php:104 +#: ../../include/js_strings.php:107 msgid "Tue" msgstr "mar" -#: ../../include/js_strings.php:105 +#: ../../include/js_strings.php:108 msgid "Wed" msgstr "mié" -#: ../../include/js_strings.php:106 +#: ../../include/js_strings.php:109 msgid "Thu" msgstr "jue" -#: ../../include/js_strings.php:107 +#: ../../include/js_strings.php:110 msgid "Fri" msgstr "vie" -#: ../../include/js_strings.php:108 +#: ../../include/js_strings.php:111 msgid "Sat" msgstr "sáb" -#: ../../include/js_strings.php:109 +#: ../../include/js_strings.php:112 msgctxt "calendar" msgid "today" msgstr "hoy" -#: ../../include/js_strings.php:110 +#: ../../include/js_strings.php:113 msgctxt "calendar" msgid "month" msgstr "mes" -#: ../../include/js_strings.php:111 +#: ../../include/js_strings.php:114 msgctxt "calendar" msgid "week" msgstr "semana" -#: ../../include/js_strings.php:112 +#: ../../include/js_strings.php:115 msgctxt "calendar" msgid "day" msgstr "día" -#: ../../include/js_strings.php:113 +#: ../../include/js_strings.php:116 msgctxt "calendar" msgid "All day" msgstr "Todos los días" @@ -5360,8 +5296,8 @@ msgid "Help:" msgstr "Ayuda:" #: ../../include/help.php:117 ../../include/help.php:125 -#: ../../include/nav.php:172 ../../include/nav.php:322 -#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:347 +#: ../../include/nav.php:174 ../../include/nav.php:320 +#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:348 msgid "Help" msgstr "Ayuda" @@ -5369,6 +5305,14 @@ msgstr "Ayuda" msgid "Not Found" msgstr "No encontrado" +#: ../../include/help.php:132 ../../Zotlabs/Module/Display.php:140 +#: ../../Zotlabs/Module/Display.php:157 ../../Zotlabs/Module/Display.php:177 +#: ../../Zotlabs/Module/Display.php:183 ../../Zotlabs/Module/Page.php:136 +#: ../../Zotlabs/Module/Block.php:77 ../../Zotlabs/Lib/NativeWikiPage.php:521 +#: ../../Zotlabs/Web/Router.php:185 +msgid "Page not found." +msgstr "Página no encontrada." + #: ../../include/photos.php:151 #, php-format msgid "Image exceeds website size limit of %lu bytes" @@ -5378,8 +5322,8 @@ msgstr "La imagen excede el límite de %lu bytes del sitio" msgid "Image file is empty." msgstr "El fichero de imagen está vacío. " -#: ../../include/photos.php:196 ../../Zotlabs/Module/Profile_photo.php:259 -#: ../../Zotlabs/Module/Cover_photo.php:239 +#: ../../include/photos.php:196 ../../Zotlabs/Module/Profile_photo.php:261 +#: ../../Zotlabs/Module/Cover_photo.php:241 msgid "Unable to process image" msgstr "No ha sido posible procesar la imagen" @@ -5397,7 +5341,7 @@ msgctxt "photo_upload" msgid "%1$s posted %2$s to %3$s" msgstr "%1$s ha publicado %2$s en %3$s" -#: ../../include/photos.php:666 ../../include/nav.php:449 +#: ../../include/photos.php:666 ../../include/nav.php:447 msgid "Photo Albums" msgstr "Álbumes de fotos" @@ -5410,43 +5354,43 @@ msgstr "Fotos recientes" msgid "Upload New Photos" msgstr "Subir nuevas fotos" -#: ../../include/network.php:1726 ../../include/network.php:1727 +#: ../../include/network.php:1730 ../../include/network.php:1731 msgid "Friendica" msgstr "Friendica" -#: ../../include/network.php:1728 +#: ../../include/network.php:1732 msgid "OStatus" msgstr "OStatus" -#: ../../include/network.php:1729 +#: ../../include/network.php:1733 msgid "GNU-Social" msgstr "GNU Social" -#: ../../include/network.php:1730 +#: ../../include/network.php:1734 msgid "RSS/Atom" msgstr "RSS/Atom" -#: ../../include/network.php:1733 +#: ../../include/network.php:1737 msgid "Diaspora" msgstr "Diaspora" -#: ../../include/network.php:1734 +#: ../../include/network.php:1738 msgid "Facebook" msgstr "Facebook" -#: ../../include/network.php:1735 +#: ../../include/network.php:1739 msgid "Zot" msgstr "Zot" -#: ../../include/network.php:1736 +#: ../../include/network.php:1740 msgid "LinkedIn" msgstr "LinkedIn" -#: ../../include/network.php:1737 +#: ../../include/network.php:1741 msgid "XMPP/IM" msgstr "XMPP/IM" -#: ../../include/network.php:1738 +#: ../../include/network.php:1742 msgid "MySpace" msgstr "MySpace" @@ -5481,7 +5425,7 @@ msgstr[0] "%d invitación pendiente" msgstr[1] "%d invitaciones disponibles" #: ../../include/contact_widgets.php:16 -#: ../../Zotlabs/Module/Admin/Site.php:293 +#: ../../Zotlabs/Module/Admin/Site.php:291 msgid "Advanced" msgstr "Avanzado" @@ -5501,13 +5445,13 @@ msgstr "Conectar/Seguir" msgid "Examples: Robert Morgenstein, Fishing" msgstr "Ejemplos: José Fernández, Pesca" -#: ../../include/contact_widgets.php:23 ../../Zotlabs/Module/Directory.php:416 -#: ../../Zotlabs/Module/Directory.php:421 -#: ../../Zotlabs/Module/Connections.php:358 +#: ../../include/contact_widgets.php:23 ../../Zotlabs/Module/Directory.php:431 +#: ../../Zotlabs/Module/Directory.php:436 +#: ../../Zotlabs/Module/Connections.php:381 msgid "Find" msgstr "Encontrar" -#: ../../include/contact_widgets.php:24 ../../Zotlabs/Module/Directory.php:420 +#: ../../include/contact_widgets.php:24 ../../Zotlabs/Module/Directory.php:435 #: ../../Zotlabs/Module/Suggest.php:79 msgid "Channel Suggestions" msgstr "Sugerencias de canales" @@ -5534,7 +5478,7 @@ msgstr "Todo" #: ../../include/contact_widgets.php:184 ../../include/taxonomy.php:409 #: ../../include/taxonomy.php:491 ../../include/taxonomy.php:511 #: ../../include/taxonomy.php:532 ../../Zotlabs/Widget/Appcategories.php:43 -#: ../../Zotlabs/Module/Cdav.php:1093 +#: ../../Zotlabs/Module/Cdav.php:1066 msgid "Categories" msgstr "Temas" @@ -5547,249 +5491,249 @@ msgstr "Conexiones comunes" msgid "View all %d common connections" msgstr "Ver todas las %d conexiones comunes" -#: ../../include/language.php:436 +#: ../../include/language.php:437 msgid "Select an alternate language" msgstr "Seleccionar un idioma alternativo" -#: ../../include/import.php:28 +#: ../../include/import.php:29 msgid "Unable to import a removed channel." msgstr "No se puede importar un canal eliminado." -#: ../../include/import.php:54 +#: ../../include/import.php:55 msgid "" "Cannot create a duplicate channel identifier on this system. Import failed." msgstr "No se ha podido crear un canal con un identificador que ya existe en este sistema. La importación ha fallado." -#: ../../include/import.php:120 +#: ../../include/import.php:121 msgid "Cloned channel not found. Import failed." msgstr "No se ha podido importar el canal porque el canal clonado no se ha encontrado." -#: ../../include/nav.php:90 +#: ../../include/nav.php:92 msgid "Remote authentication" msgstr "Acceder desde su servidor" -#: ../../include/nav.php:90 +#: ../../include/nav.php:92 msgid "Click to authenticate to your home hub" msgstr "Pulsar para identificarse en su servidor de inicio" -#: ../../include/nav.php:96 ../../Zotlabs/Module/Manage.php:170 -#: ../../Zotlabs/Lib/Apps.php:336 +#: ../../include/nav.php:98 ../../Zotlabs/Module/Manage.php:170 +#: ../../Zotlabs/Lib/Apps.php:337 msgid "Channel Manager" msgstr "Administración de canales" -#: ../../include/nav.php:96 +#: ../../include/nav.php:98 msgid "Manage your channels" msgstr "Gestionar sus canales" -#: ../../include/nav.php:99 ../../include/group.php:320 -#: ../../Zotlabs/Widget/Activity_filter.php:41 -#: ../../Zotlabs/Module/Group.php:141 ../../Zotlabs/Module/Group.php:153 -#: ../../Zotlabs/Lib/Group.php:324 ../../Zotlabs/Lib/Apps.php:363 +#: ../../include/nav.php:101 ../../include/group.php:321 +#: ../../Zotlabs/Widget/Activity_filter.php:82 +#: ../../Zotlabs/Module/Group.php:142 ../../Zotlabs/Module/Group.php:154 +#: ../../Zotlabs/Lib/Group.php:324 ../../Zotlabs/Lib/Apps.php:364 msgid "Privacy Groups" msgstr "Grupos de canales" -#: ../../include/nav.php:99 +#: ../../include/nav.php:101 msgid "Manage your privacy groups" msgstr "Gestionar sus grupos de canales" -#: ../../include/nav.php:101 ../../Zotlabs/Widget/Settings_menu.php:61 +#: ../../include/nav.php:103 ../../Zotlabs/Widget/Settings_menu.php:61 #: ../../Zotlabs/Widget/Newmember.php:53 #: ../../Zotlabs/Module/Admin/Themes.php:125 -#: ../../Zotlabs/Module/Admin/Addons.php:345 ../../Zotlabs/Lib/Apps.php:338 +#: ../../Zotlabs/Module/Admin/Addons.php:345 ../../Zotlabs/Lib/Apps.php:339 msgid "Settings" msgstr "Ajustes" -#: ../../include/nav.php:101 +#: ../../include/nav.php:103 msgid "Account/Channel Settings" msgstr "Ajustes de cuenta/canales" -#: ../../include/nav.php:107 ../../include/nav.php:136 -#: ../../include/nav.php:155 ../../boot.php:1673 +#: ../../include/nav.php:109 ../../include/nav.php:138 +#: ../../include/nav.php:157 ../../boot.php:1697 msgid "Logout" msgstr "Finalizar sesión" -#: ../../include/nav.php:107 ../../include/nav.php:136 +#: ../../include/nav.php:109 ../../include/nav.php:138 msgid "End this session" msgstr "Finalizar esta sesión" -#: ../../include/nav.php:110 +#: ../../include/nav.php:112 msgid "Your profile page" msgstr "Su página del perfil" -#: ../../include/nav.php:113 ../../include/channel.php:1426 -#: ../../Zotlabs/Module/Profiles.php:830 +#: ../../include/nav.php:115 ../../include/channel.php:1523 +#: ../../Zotlabs/Module/Profiles.php:832 msgid "Edit Profiles" msgstr "Editar perfiles" -#: ../../include/nav.php:113 +#: ../../include/nav.php:115 msgid "Manage/Edit profiles" msgstr "Administrar/editar perfiles" -#: ../../include/nav.php:115 ../../Zotlabs/Widget/Newmember.php:35 +#: ../../include/nav.php:117 ../../Zotlabs/Widget/Newmember.php:35 msgid "Edit your profile" msgstr "Editar su perfil" -#: ../../include/nav.php:122 ../../include/nav.php:126 -#: ../../Zotlabs/Lib/Apps.php:335 ../../boot.php:1674 +#: ../../include/nav.php:124 ../../include/nav.php:128 +#: ../../Zotlabs/Lib/Apps.php:336 ../../boot.php:1698 msgid "Login" msgstr "Iniciar sesión" -#: ../../include/nav.php:122 ../../include/nav.php:126 +#: ../../include/nav.php:124 ../../include/nav.php:128 msgid "Sign in" msgstr "Acceder" -#: ../../include/nav.php:153 +#: ../../include/nav.php:155 msgid "Take me home" msgstr "Volver a la página principal" -#: ../../include/nav.php:155 +#: ../../include/nav.php:157 msgid "Log me out of this site" msgstr "Salir de este sitio" -#: ../../include/nav.php:160 ../../Zotlabs/Module/Register.php:293 -#: ../../boot.php:1654 +#: ../../include/nav.php:162 ../../Zotlabs/Module/Register.php:293 +#: ../../boot.php:1678 msgid "Register" msgstr "Registrarse" -#: ../../include/nav.php:160 +#: ../../include/nav.php:162 msgid "Create an account" msgstr "Crear una cuenta" -#: ../../include/nav.php:172 +#: ../../include/nav.php:174 msgid "Help and documentation" msgstr "Ayuda y documentación" -#: ../../include/nav.php:186 +#: ../../include/nav.php:188 msgid "Search site @name, !forum, #tag, ?docs, content" msgstr "Buscar en el sitio @nombre, !foro, #tag, ?docs, contenido" -#: ../../include/nav.php:192 ../../Zotlabs/Widget/Admin.php:55 +#: ../../include/nav.php:194 ../../Zotlabs/Widget/Admin.php:55 msgid "Admin" msgstr "Administrador" -#: ../../include/nav.php:192 +#: ../../include/nav.php:194 msgid "Site Setup and Configuration" msgstr "Ajustes y configuración del sitio" -#: ../../include/nav.php:326 ../../Zotlabs/Widget/Notifications.php:162 +#: ../../include/nav.php:324 ../../Zotlabs/Widget/Notifications.php:182 #: ../../Zotlabs/Module/New_channel.php:157 #: ../../Zotlabs/Module/New_channel.php:164 -#: ../../Zotlabs/Module/Defperms.php:256 ../../Zotlabs/Module/Connedit.php:869 +#: ../../Zotlabs/Module/Defperms.php:257 ../../Zotlabs/Module/Connedit.php:870 msgid "Loading" msgstr "Cargando" -#: ../../include/nav.php:332 +#: ../../include/nav.php:330 msgid "@name, !forum, #tag, ?doc, content" msgstr "@nombre, !foro, #tag, ?docs, contenido" -#: ../../include/nav.php:333 +#: ../../include/nav.php:331 msgid "Please wait..." msgstr "Espere por favor…" -#: ../../include/nav.php:339 +#: ../../include/nav.php:337 msgid "Add Apps" msgstr "Añadir aplicaciones" -#: ../../include/nav.php:340 +#: ../../include/nav.php:338 msgid "Arrange Apps" msgstr "Organizar aplicaciones" -#: ../../include/nav.php:341 +#: ../../include/nav.php:339 msgid "Toggle System Apps" msgstr "Alternar aplicaciones de sistema" -#: ../../include/nav.php:423 ../../Zotlabs/Module/Admin/Channels.php:154 +#: ../../include/nav.php:421 ../../Zotlabs/Module/Admin/Channels.php:154 msgid "Channel" msgstr "Canal" -#: ../../include/nav.php:426 +#: ../../include/nav.php:424 msgid "Status Messages and Posts" msgstr "Mensajes de estado y publicaciones" -#: ../../include/nav.php:436 ../../Zotlabs/Module/Help.php:80 +#: ../../include/nav.php:434 ../../Zotlabs/Module/Help.php:83 msgid "About" msgstr "Mi perfil" -#: ../../include/nav.php:439 +#: ../../include/nav.php:437 msgid "Profile Details" msgstr "Detalles del perfil" -#: ../../include/nav.php:454 ../../Zotlabs/Module/Fbrowser.php:85 -#: ../../Zotlabs/Lib/Apps.php:339 ../../Zotlabs/Storage/Browser.php:278 +#: ../../include/nav.php:452 ../../Zotlabs/Module/Fbrowser.php:85 +#: ../../Zotlabs/Lib/Apps.php:340 ../../Zotlabs/Storage/Browser.php:278 msgid "Files" msgstr "Ficheros" -#: ../../include/nav.php:457 +#: ../../include/nav.php:455 msgid "Files and Storage" msgstr "Ficheros y repositorio" -#: ../../include/nav.php:479 ../../include/nav.php:482 -#: ../../Zotlabs/Widget/Chatroom_list.php:16 ../../Zotlabs/Lib/Apps.php:329 +#: ../../include/nav.php:477 ../../include/nav.php:480 +#: ../../Zotlabs/Widget/Chatroom_list.php:16 ../../Zotlabs/Lib/Apps.php:330 msgid "Chatrooms" msgstr "Salas de chat" -#: ../../include/nav.php:492 ../../Zotlabs/Lib/Apps.php:328 +#: ../../include/nav.php:490 ../../Zotlabs/Lib/Apps.php:329 msgid "Bookmarks" msgstr "Marcadores" -#: ../../include/nav.php:495 +#: ../../include/nav.php:493 msgid "Saved Bookmarks" msgstr "Marcadores guardados" -#: ../../include/nav.php:503 ../../Zotlabs/Module/Cards.php:207 -#: ../../Zotlabs/Lib/Apps.php:325 +#: ../../include/nav.php:501 ../../Zotlabs/Module/Cards.php:207 +#: ../../Zotlabs/Lib/Apps.php:326 msgid "Cards" msgstr "Fichas" -#: ../../include/nav.php:506 +#: ../../include/nav.php:504 msgid "View Cards" msgstr "Ver las fichas" -#: ../../include/nav.php:514 ../../Zotlabs/Module/Articles.php:226 -#: ../../Zotlabs/Lib/Apps.php:324 +#: ../../include/nav.php:512 ../../Zotlabs/Module/Articles.php:226 +#: ../../Zotlabs/Lib/Apps.php:325 msgid "Articles" msgstr "Artículos" -#: ../../include/nav.php:517 +#: ../../include/nav.php:515 msgid "View Articles" msgstr "Ver los artículos" -#: ../../include/nav.php:526 ../../Zotlabs/Module/Webpages.php:252 -#: ../../Zotlabs/Lib/Apps.php:340 +#: ../../include/nav.php:524 ../../Zotlabs/Module/Webpages.php:252 +#: ../../Zotlabs/Lib/Apps.php:341 msgid "Webpages" msgstr "Páginas web" -#: ../../include/nav.php:529 +#: ../../include/nav.php:527 msgid "View Webpages" msgstr "Ver páginas web" -#: ../../include/nav.php:538 ../../Zotlabs/Widget/Wiki_list.php:15 +#: ../../include/nav.php:536 ../../Zotlabs/Widget/Wiki_list.php:15 #: ../../Zotlabs/Module/Wiki.php:206 msgid "Wikis" msgstr "Wikis" -#: ../../include/nav.php:541 ../../Zotlabs/Lib/Apps.php:341 +#: ../../include/nav.php:539 ../../Zotlabs/Lib/Apps.php:342 msgid "Wiki" msgstr "Wiki" -#: ../../include/auth.php:192 +#: ../../include/auth.php:194 msgid "Delegation session ended." msgstr "Finalizó la sesión de la delegación." -#: ../../include/auth.php:196 +#: ../../include/auth.php:198 msgid "Logged out." msgstr "Desconectado/a." -#: ../../include/auth.php:291 +#: ../../include/auth.php:294 msgid "Email validation is incomplete. Please check your email." msgstr "La validación del correo electrónico está incompleta. Por favor, compruebe su correo electrónico." -#: ../../include/auth.php:307 +#: ../../include/auth.php:310 msgid "Failed authentication" msgstr "Autenticación fallida." #: ../../include/datetime.php:58 ../../Zotlabs/Widget/Newmember.php:51 -#: ../../Zotlabs/Module/Profiles.php:736 +#: ../../Zotlabs/Module/Profiles.php:738 msgid "Miscellaneous" msgstr "Varios" @@ -5805,14 +5749,7 @@ msgstr "Edad:" msgid "YYYY-MM-DD or MM-DD" msgstr "AAAA-MM-DD o MM-DD" -#: ../../include/datetime.php:211 ../../Zotlabs/Module/Events.php:468 -#: ../../Zotlabs/Module/Events.php:473 ../../Zotlabs/Module/Appman.php:143 -#: ../../Zotlabs/Module/Appman.php:144 ../../Zotlabs/Module/Profiles.php:745 -#: ../../Zotlabs/Module/Profiles.php:749 -msgid "Required" -msgstr "Obligatorio" - -#: ../../include/datetime.php:238 ../../boot.php:2605 +#: ../../include/datetime.php:238 ../../boot.php:2702 msgid "never" msgstr "nunca" @@ -5885,11 +5822,36 @@ msgstr "Cumpleaños de %1$s" msgid "Happy Birthday %1$s" msgstr "Feliz cumpleaños %1$s" -#: ../../include/follow.php:37 +#: ../../include/cdav.php:157 +msgid "INVALID EVENT DISMISSED!" +msgstr "¡EVENTO NO VÁLIDO RECHAZADO!" + +#: ../../include/cdav.php:158 +msgid "Summary: " +msgstr "Resumen: " + +#: ../../include/cdav.php:159 +msgid "Date: " +msgstr "Fecha: " + +#: ../../include/cdav.php:160 ../../include/cdav.php:168 +msgid "Reason: " +msgstr "Razón: " + +#: ../../include/cdav.php:166 +msgid "INVALID CARD DISMISSED!" +msgstr "¡TARJETA NO VÁLIDA RECHAZADA!" + +#: ../../include/cdav.php:167 +msgid "Name: " +msgstr "Nombre: " + +#: ../../include/follow.php:37 ../../Zotlabs/Lib/Connect.php:46 +#: ../../Zotlabs/Lib/Connect.php:143 msgid "Channel is blocked on this site." msgstr "El canal está bloqueado en este sitio." -#: ../../include/follow.php:42 +#: ../../include/follow.php:42 ../../Zotlabs/Lib/Connect.php:51 msgid "Channel location missing." msgstr "Falta la dirección del canal." @@ -5905,334 +5867,373 @@ msgstr "Canal Premium - por favor visite:" msgid "Channel was deleted and no longer exists." msgstr "El canal ha sido eliminado y ya no existe." -#: ../../include/follow.php:166 +#: ../../include/follow.php:166 ../../Zotlabs/Lib/Connect.php:103 msgid "Remote channel or protocol unavailable." msgstr "Canal remoto o protocolo no disponible." -#: ../../include/follow.php:190 +#: ../../include/follow.php:190 ../../Zotlabs/Lib/Connect.php:137 msgid "Channel discovery failed." msgstr "El intento de acceder al canal ha fallado." -#: ../../include/follow.php:202 +#: ../../include/follow.php:202 ../../Zotlabs/Lib/Connect.php:155 msgid "Protocol disabled." msgstr "Protocolo deshabilitado." -#: ../../include/follow.php:213 +#: ../../include/follow.php:213 ../../Zotlabs/Lib/Connect.php:167 msgid "Cannot connect to yourself." msgstr "No puede conectarse consigo mismo." -#: ../../include/conversation.php:122 ../../Zotlabs/Module/Like.php:123 +#: ../../include/conversation.php:124 ../../Zotlabs/Module/Like.php:129 msgid "channel" msgstr "el canal" -#: ../../include/conversation.php:169 +#: ../../include/conversation.php:171 #, php-format msgid "likes %1$s's %2$s" msgstr "gusta de %2$s de %1$s" -#: ../../include/conversation.php:172 +#: ../../include/conversation.php:174 #, php-format msgid "doesn't like %1$s's %2$s" msgstr "no gusta de %2$s de %1$s" -#: ../../include/conversation.php:212 +#: ../../include/conversation.php:214 ../../include/conversation.php:216 #, php-format msgid "%1$s is now connected with %2$s" msgstr "%1$s ahora está conectado/a con %2$s" -#: ../../include/conversation.php:247 +#: ../../include/conversation.php:251 #, php-format msgid "%1$s poked %2$s" msgstr "%1$s ha dado un toque a %2$s" -#: ../../include/conversation.php:268 ../../Zotlabs/Module/Mood.php:76 +#: ../../include/conversation.php:274 ../../Zotlabs/Module/Mood.php:76 #, php-format msgctxt "mood" msgid "%1$s is %2$s" msgstr "%1$s está %2$s" -#: ../../include/conversation.php:483 ../../Zotlabs/Lib/ThreadItem.php:468 +#: ../../include/conversation.php:503 ../../Zotlabs/Lib/ThreadItem.php:500 msgid "This is an unsaved preview" msgstr "Esta es una previsualización sin guardar" -#: ../../include/conversation.php:619 ../../Zotlabs/Module/Photos.php:1112 +#: ../../include/conversation.php:639 ../../Zotlabs/Module/Photos.php:1112 msgctxt "title" msgid "Likes" msgstr "Me gusta" -#: ../../include/conversation.php:619 ../../Zotlabs/Module/Photos.php:1112 +#: ../../include/conversation.php:640 ../../Zotlabs/Module/Photos.php:1112 msgctxt "title" msgid "Dislikes" msgstr "No me gusta" -#: ../../include/conversation.php:620 ../../Zotlabs/Module/Photos.php:1113 +#: ../../include/conversation.php:641 ../../Zotlabs/Widget/Pinned.php:77 +#: ../../Zotlabs/Module/Photos.php:1113 msgctxt "title" msgid "Agree" msgstr "De acuerdo" -#: ../../include/conversation.php:620 ../../Zotlabs/Module/Photos.php:1113 +#: ../../include/conversation.php:642 ../../Zotlabs/Widget/Pinned.php:78 +#: ../../Zotlabs/Module/Photos.php:1113 msgctxt "title" msgid "Disagree" msgstr "En desacuerdo" -#: ../../include/conversation.php:620 ../../Zotlabs/Module/Photos.php:1113 +#: ../../include/conversation.php:643 ../../Zotlabs/Widget/Pinned.php:79 +#: ../../Zotlabs/Module/Photos.php:1113 msgctxt "title" msgid "Abstain" msgstr "Abstención" -#: ../../include/conversation.php:621 ../../Zotlabs/Module/Photos.php:1114 +#: ../../include/conversation.php:644 ../../Zotlabs/Widget/Pinned.php:66 +#: ../../Zotlabs/Module/Photos.php:1114 msgctxt "title" msgid "Attending" msgstr "Participaré" -#: ../../include/conversation.php:621 ../../Zotlabs/Module/Photos.php:1114 +#: ../../include/conversation.php:645 ../../Zotlabs/Widget/Pinned.php:67 +#: ../../Zotlabs/Module/Photos.php:1114 msgctxt "title" msgid "Not attending" msgstr "No participaré" -#: ../../include/conversation.php:621 ../../Zotlabs/Module/Photos.php:1114 +#: ../../include/conversation.php:646 ../../Zotlabs/Widget/Pinned.php:68 +#: ../../Zotlabs/Module/Photos.php:1114 msgctxt "title" msgid "Might attend" msgstr "Quizá participe" -#: ../../include/conversation.php:690 ../../Zotlabs/Lib/ThreadItem.php:178 +#: ../../include/conversation.php:716 ../../Zotlabs/Lib/ThreadItem.php:180 msgid "Select" msgstr "Seleccionar" -#: ../../include/conversation.php:691 ../../include/conversation.php:736 +#: ../../include/conversation.php:717 ../../include/conversation.php:762 #: ../../Zotlabs/Module/Article_edit.php:128 #: ../../Zotlabs/Module/Card_edit.php:129 ../../Zotlabs/Module/Oauth.php:174 -#: ../../Zotlabs/Module/Editwebpage.php:167 ../../Zotlabs/Module/Cdav.php:1079 -#: ../../Zotlabs/Module/Cdav.php:1390 ../../Zotlabs/Module/Webpages.php:257 +#: ../../Zotlabs/Module/Editwebpage.php:167 ../../Zotlabs/Module/Cdav.php:1052 +#: ../../Zotlabs/Module/Cdav.php:1385 ../../Zotlabs/Module/Webpages.php:257 #: ../../Zotlabs/Module/Admin/Accounts.php:175 #: ../../Zotlabs/Module/Admin/Channels.php:149 #: ../../Zotlabs/Module/Admin/Profs.php:176 #: ../../Zotlabs/Module/Blocks.php:162 ../../Zotlabs/Module/Editblock.php:139 #: ../../Zotlabs/Module/Editlayout.php:138 -#: ../../Zotlabs/Module/Connections.php:306 -#: ../../Zotlabs/Module/Photos.php:1178 ../../Zotlabs/Module/Profiles.php:800 -#: ../../Zotlabs/Module/Oauth2.php:195 ../../Zotlabs/Module/Thing.php:267 -#: ../../Zotlabs/Module/Connedit.php:668 ../../Zotlabs/Module/Connedit.php:940 -#: ../../Zotlabs/Lib/Apps.php:558 ../../Zotlabs/Lib/ThreadItem.php:168 +#: ../../Zotlabs/Module/Connections.php:328 +#: ../../Zotlabs/Module/Photos.php:1178 ../../Zotlabs/Module/Profiles.php:802 +#: ../../Zotlabs/Module/Oauth2.php:195 ../../Zotlabs/Module/Thing.php:269 +#: ../../Zotlabs/Module/Connedit.php:669 ../../Zotlabs/Module/Connedit.php:941 +#: ../../Zotlabs/Lib/Apps.php:558 ../../Zotlabs/Lib/ThreadItem.php:170 #: ../../Zotlabs/Storage/Browser.php:297 msgid "Delete" msgstr "Eliminar" -#: ../../include/conversation.php:695 ../../Zotlabs/Lib/ThreadItem.php:267 +#: ../../include/conversation.php:721 ../../Zotlabs/Lib/ThreadItem.php:273 msgid "Toggle Star Status" msgstr "Activar o desactivar el estado de entrada preferida" -#: ../../include/conversation.php:700 ../../Zotlabs/Lib/ThreadItem.php:103 +#: ../../include/conversation.php:726 ../../Zotlabs/Lib/ThreadItem.php:103 msgid "Private Message" msgstr "Mensaje Privado" -#: ../../include/conversation.php:707 ../../Zotlabs/Lib/ThreadItem.php:278 +#: ../../include/conversation.php:733 ../../Zotlabs/Widget/Pinned.php:88 +#: ../../Zotlabs/Lib/ThreadItem.php:284 msgid "Message signature validated" msgstr "Firma de mensaje validada" -#: ../../include/conversation.php:708 ../../Zotlabs/Lib/ThreadItem.php:279 +#: ../../include/conversation.php:734 ../../Zotlabs/Widget/Pinned.php:89 +#: ../../Zotlabs/Lib/ThreadItem.php:285 msgid "Message signature incorrect" msgstr "Firma de mensaje incorrecta" -#: ../../include/conversation.php:735 +#: ../../include/conversation.php:761 #: ../../Zotlabs/Module/Admin/Accounts.php:173 -#: ../../Zotlabs/Module/Connections.php:320 +#: ../../Zotlabs/Module/Connections.php:342 msgid "Approve" msgstr "Aprobar" -#: ../../include/conversation.php:739 +#: ../../include/conversation.php:766 #, php-format msgid "View %s's profile @ %s" msgstr "Ver el perfil @ %s de %s" -#: ../../include/conversation.php:759 +#: ../../include/conversation.php:786 msgid "Categories:" msgstr "Temas:" -#: ../../include/conversation.php:760 +#: ../../include/conversation.php:787 msgid "Filed under:" msgstr "Archivado bajo:" -#: ../../include/conversation.php:766 ../../Zotlabs/Lib/ThreadItem.php:401 +#: ../../include/conversation.php:793 ../../Zotlabs/Widget/Pinned.php:133 +#: ../../Zotlabs/Lib/ThreadItem.php:429 #, php-format msgid "from %s" msgstr "desde %s" -#: ../../include/conversation.php:769 ../../Zotlabs/Lib/ThreadItem.php:404 +#: ../../include/conversation.php:796 ../../Zotlabs/Widget/Pinned.php:136 +#: ../../Zotlabs/Lib/ThreadItem.php:432 #, php-format msgid "last edited: %s" msgstr "último cambio: %s" -#: ../../include/conversation.php:770 ../../Zotlabs/Lib/ThreadItem.php:405 +#: ../../include/conversation.php:797 ../../Zotlabs/Widget/Pinned.php:137 +#: ../../Zotlabs/Lib/ThreadItem.php:433 #, php-format msgid "Expires: %s" msgstr "Caduca: %s" -#: ../../include/conversation.php:785 +#: ../../include/conversation.php:812 msgid "View in context" msgstr "Mostrar en su contexto" -#: ../../include/conversation.php:787 ../../Zotlabs/Module/Photos.php:1076 -#: ../../Zotlabs/Lib/ThreadItem.php:469 +#: ../../include/conversation.php:814 ../../Zotlabs/Module/Photos.php:1078 +#: ../../Zotlabs/Lib/ThreadItem.php:501 msgid "Please wait" msgstr "Espere por favor" -#: ../../include/conversation.php:886 +#: ../../include/conversation.php:913 msgid "remove" msgstr "eliminar" -#: ../../include/conversation.php:890 +#: ../../include/conversation.php:917 msgid "Loading..." msgstr "Cargando..." -#: ../../include/conversation.php:891 ../../Zotlabs/Lib/ThreadItem.php:291 +#: ../../include/conversation.php:918 ../../Zotlabs/Lib/ThreadItem.php:301 msgid "Conversation Tools" msgstr "Herramientas de conversación" -#: ../../include/conversation.php:892 +#: ../../include/conversation.php:919 msgid "Delete Selected Items" msgstr "Eliminar elementos seleccionados" -#: ../../include/conversation.php:935 +#: ../../include/conversation.php:962 msgid "View Source" msgstr "Ver el código fuente de la entrada" -#: ../../include/conversation.php:945 +#: ../../include/conversation.php:972 msgid "Follow Thread" msgstr "Seguir este hilo" -#: ../../include/conversation.php:954 +#: ../../include/conversation.php:981 msgid "Unfollow Thread" msgstr "Dejar de seguir este hilo" -#: ../../include/conversation.php:1048 ../../Zotlabs/Module/Connedit.php:629 +#: ../../include/conversation.php:1075 ../../Zotlabs/Module/Connedit.php:630 msgid "Recent Activity" msgstr "Actividad reciente" -#: ../../include/conversation.php:1058 ../../include/connections.php:110 -#: ../../include/channel.php:1506 ../../Zotlabs/Widget/Suggestions.php:46 -#: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Module/Directory.php:353 -#: ../../Zotlabs/Module/Connections.php:326 +#: ../../include/conversation.php:1085 ../../include/connections.php:110 +#: ../../include/channel.php:1603 ../../Zotlabs/Widget/Suggestions.php:46 +#: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Module/Directory.php:368 +#: ../../Zotlabs/Module/Connections.php:349 #: ../../Zotlabs/Module/Suggest.php:71 msgid "Connect" msgstr "Conectar" -#: ../../include/conversation.php:1068 +#: ../../include/conversation.php:1095 msgid "Edit Connection" msgstr "Editar conexión" -#: ../../include/conversation.php:1078 +#: ../../include/conversation.php:1105 msgid "Message" msgstr "Mensaje" -#: ../../include/conversation.php:1088 ../../Zotlabs/Module/Pubsites.php:35 +#: ../../include/conversation.php:1115 ../../Zotlabs/Module/Pubsites.php:35 #: ../../Zotlabs/Module/Ratings.php:97 msgid "Ratings" msgstr "Valoraciones" -#: ../../include/conversation.php:1098 ../../Zotlabs/Module/Poke.php:199 -#: ../../Zotlabs/Lib/Apps.php:350 +#: ../../include/conversation.php:1125 ../../Zotlabs/Module/Poke.php:199 +#: ../../Zotlabs/Lib/Apps.php:351 msgid "Poke" msgstr "Toques y otras cosas" -#: ../../include/conversation.php:1212 +#: ../../include/conversation.php:1247 #, php-format msgid "%s likes this." msgstr "A %s le gusta esto." -#: ../../include/conversation.php:1212 +#: ../../include/conversation.php:1247 #, php-format msgid "%s doesn't like this." msgstr "A %s no le gusta esto." -#: ../../include/conversation.php:1216 +#: ../../include/conversation.php:1251 #, php-format msgid "<span %1$s>%2$d people</span> like this." msgid_plural "<span %1$s>%2$d people</span> like this." msgstr[0] "a <span %1$s>%2$d personas</span> le gusta esto." msgstr[1] "A <span %1$s>%2$d personas</span> les gusta esto." -#: ../../include/conversation.php:1218 +#: ../../include/conversation.php:1253 #, php-format msgid "<span %1$s>%2$d people</span> don't like this." msgid_plural "<span %1$s>%2$d people</span> don't like this." msgstr[0] "a <span %1$s>%2$d personas</span> no les gusta esto." msgstr[1] "A <span %1$s>%2$d personas</span> no les gusta esto." -#: ../../include/conversation.php:1224 +#: ../../include/conversation.php:1259 msgid "and" msgstr "y" -#: ../../include/conversation.php:1227 +#: ../../include/conversation.php:1262 #, php-format msgid ", and %d other people" msgid_plural ", and %d other people" msgstr[0] ", y %d persona más" msgstr[1] ", y %d personas más" -#: ../../include/conversation.php:1228 +#: ../../include/conversation.php:1263 #, php-format msgid "%s like this." msgstr "A %s le gusta esto." -#: ../../include/conversation.php:1228 +#: ../../include/conversation.php:1263 #, php-format msgid "%s don't like this." msgstr "A %s no le gusta esto." -#: ../../include/conversation.php:1702 ../../include/taxonomy.php:659 -#: ../../include/channel.php:1669 ../../Zotlabs/Module/Photos.php:1135 -#: ../../Zotlabs/Lib/ThreadItem.php:236 +#: ../../include/conversation.php:1447 +msgid "Toggle poll" +msgstr "Activar o desactivar encuestas" + +#: ../../include/conversation.php:1448 +msgid "Option" +msgstr "Opción" + +#: ../../include/conversation.php:1449 +msgid "Add option" +msgstr "Añadir una opción" + +#: ../../include/conversation.php:1450 +msgid "Minutes" +msgstr "Minutos " + +#: ../../include/conversation.php:1450 +msgid "Hours" +msgstr "Horas " + +#: ../../include/conversation.php:1450 +msgid "Days" +msgstr "Días " + +#: ../../include/conversation.php:1451 +msgid "Allow multiple answers" +msgstr "Permitir respuestas múltiples" + +#: ../../include/conversation.php:1734 ../../include/taxonomy.php:659 +#: ../../include/channel.php:1766 ../../Zotlabs/Module/Photos.php:1135 +#: ../../Zotlabs/Lib/ThreadItem.php:242 msgctxt "noun" msgid "Like" msgid_plural "Likes" msgstr[0] "Me gusta" msgstr[1] "Me gusta" -#: ../../include/conversation.php:1705 ../../Zotlabs/Module/Photos.php:1140 -#: ../../Zotlabs/Lib/ThreadItem.php:241 +#: ../../include/conversation.php:1737 ../../Zotlabs/Module/Photos.php:1140 +#: ../../Zotlabs/Lib/ThreadItem.php:247 msgctxt "noun" msgid "Dislike" msgid_plural "Dislikes" msgstr[0] "No me gusta" msgstr[1] "No me gusta" -#: ../../include/conversation.php:1708 +#: ../../include/conversation.php:1740 msgctxt "noun" msgid "Attending" msgid_plural "Attending" msgstr[0] "Participaré" msgstr[1] "Participaré" -#: ../../include/conversation.php:1711 +#: ../../include/conversation.php:1743 msgctxt "noun" msgid "Not Attending" msgid_plural "Not Attending" msgstr[0] "No participaré" msgstr[1] "No participaré" -#: ../../include/conversation.php:1714 +#: ../../include/conversation.php:1746 msgctxt "noun" msgid "Undecided" msgid_plural "Undecided" msgstr[0] "Indeciso/a" msgstr[1] "Indecisos/as" -#: ../../include/conversation.php:1717 +#: ../../include/conversation.php:1749 msgctxt "noun" msgid "Agree" msgid_plural "Agrees" msgstr[0] "De acuerdo" msgstr[1] "De acuerdo" -#: ../../include/conversation.php:1720 +#: ../../include/conversation.php:1752 msgctxt "noun" msgid "Disagree" msgid_plural "Disagrees" msgstr[0] "En desacuerdo" msgstr[1] "En desacuerdo" -#: ../../include/conversation.php:1723 +#: ../../include/conversation.php:1755 msgctxt "noun" msgid "Abstain" msgid_plural "Abstains" @@ -6299,11 +6300,11 @@ msgstr "Transexual" msgid "Hermaphrodite" msgstr "Hermafrodita" -#: ../../include/selectors.php:60 ../../include/channel.php:1614 +#: ../../include/selectors.php:60 ../../include/channel.php:1711 msgid "Neuter" msgstr "Neutral" -#: ../../include/selectors.php:60 ../../include/channel.php:1616 +#: ../../include/selectors.php:60 ../../include/channel.php:1713 msgid "Non-specific" msgstr "No especificado" @@ -6399,15 +6400,15 @@ msgstr "Infiel" msgid "Sex Addict" msgstr "Con adicción al sexo" -#: ../../include/selectors.php:134 ../../include/channel.php:493 -#: ../../include/channel.php:494 ../../include/channel.php:501 +#: ../../include/selectors.php:134 ../../include/channel.php:504 +#: ../../include/channel.php:505 ../../include/channel.php:512 #: ../../Zotlabs/Widget/Affinity.php:32 -#: ../../Zotlabs/Module/Settings/Channel.php:70 -#: ../../Zotlabs/Module/Settings/Channel.php:74 +#: ../../Zotlabs/Module/Settings/Channel.php:71 #: ../../Zotlabs/Module/Settings/Channel.php:75 -#: ../../Zotlabs/Module/Settings/Channel.php:78 -#: ../../Zotlabs/Module/Settings/Channel.php:89 -#: ../../Zotlabs/Module/Connedit.php:725 +#: ../../Zotlabs/Module/Settings/Channel.php:76 +#: ../../Zotlabs/Module/Settings/Channel.php:79 +#: ../../Zotlabs/Module/Settings/Channel.php:90 +#: ../../Zotlabs/Module/Connedit.php:726 msgid "Friends" msgstr "Amigos/as" @@ -6503,35 +6504,36 @@ msgstr "Nueva ventana" msgid "Open the selected location in a different window or browser tab" msgstr "Abrir la dirección seleccionada en una ventana o pestaña aparte" -#: ../../include/group.php:22 ../../Zotlabs/Lib/Group.php:28 +#: ../../include/group.php:23 ../../Zotlabs/Lib/Group.php:28 msgid "" "A deleted group with this name was revived. Existing item permissions " "<strong>may</strong> apply to this group and any future members. If this is " "not what you intended, please create another group with a different name." msgstr "Un grupo suprimido con este nombre ha sido restablecido. <strong>Es posible</strong> que los permisos que ya existen sean aplicados a este grupo y sus futuros miembros. Si no quiere esto, por favor cree otro grupo con un nombre diferente." -#: ../../include/group.php:264 ../../Zotlabs/Lib/Group.php:270 +#: ../../include/group.php:265 ../../Zotlabs/Lib/Group.php:270 msgid "Add new connections to this privacy group" msgstr "Añadir conexiones nuevas a este grupo de canales" -#: ../../include/group.php:298 ../../Zotlabs/Lib/Group.php:302 +#: ../../include/group.php:299 ../../Zotlabs/Lib/AccessList.php:311 +#: ../../Zotlabs/Lib/Group.php:302 msgid "edit" msgstr "editar" -#: ../../include/group.php:321 ../../Zotlabs/Lib/Group.php:325 +#: ../../include/group.php:322 ../../Zotlabs/Lib/Group.php:325 msgid "Edit group" msgstr "Editar grupo" -#: ../../include/group.php:322 ../../Zotlabs/Lib/Group.php:326 +#: ../../include/group.php:323 ../../Zotlabs/Lib/Group.php:326 msgid "Add privacy group" msgstr "Añadir un grupo de canales" -#: ../../include/group.php:323 ../../Zotlabs/Lib/Group.php:327 +#: ../../include/group.php:324 ../../Zotlabs/Lib/Group.php:327 msgid "Channels not in any privacy group" msgstr "Sin canales en ningún grupo" -#: ../../include/group.php:325 ../../Zotlabs/Widget/Savedsearch.php:84 -#: ../../Zotlabs/Lib/Group.php:329 +#: ../../include/group.php:326 ../../Zotlabs/Widget/Savedsearch.php:84 +#: ../../Zotlabs/Lib/AccessList.php:336 ../../Zotlabs/Lib/Group.php:329 msgid "add" msgstr "añadir" @@ -6564,7 +6566,7 @@ msgstr "quiero" msgid "wants" msgstr "quiere" -#: ../../include/taxonomy.php:573 ../../Zotlabs/Lib/ThreadItem.php:307 +#: ../../include/taxonomy.php:573 ../../Zotlabs/Lib/ThreadItem.php:317 msgid "like" msgstr "me gusta" @@ -6572,7 +6574,7 @@ msgstr "me gusta" msgid "likes" msgstr "gusta de" -#: ../../include/taxonomy.php:574 ../../Zotlabs/Lib/ThreadItem.php:308 +#: ../../include/taxonomy.php:574 ../../Zotlabs/Lib/ThreadItem.php:318 msgid "dislike" msgstr "no me gusta" @@ -6580,104 +6582,104 @@ msgstr "no me gusta" msgid "dislikes" msgstr "no gusta de" -#: ../../include/items.php:984 ../../include/items.php:1044 +#: ../../include/items.php:999 ../../include/items.php:1059 msgid "(Unknown)" msgstr "(Desconocido)" -#: ../../include/items.php:1232 +#: ../../include/items.php:1247 msgid "Visible to anybody on the internet." msgstr "Visible para cualquiera en internet." -#: ../../include/items.php:1234 +#: ../../include/items.php:1249 msgid "Visible to you only." msgstr "Visible sólo para usted." -#: ../../include/items.php:1236 +#: ../../include/items.php:1251 msgid "Visible to anybody in this network." msgstr "Visible para cualquiera en esta red." -#: ../../include/items.php:1238 +#: ../../include/items.php:1253 msgid "Visible to anybody authenticated." msgstr "Visible para cualquiera que esté autenticado." -#: ../../include/items.php:1240 +#: ../../include/items.php:1255 #, php-format msgid "Visible to anybody on %s." msgstr "Visible para cualquiera en %s." -#: ../../include/items.php:1242 +#: ../../include/items.php:1257 msgid "Visible to all connections." msgstr "Visible para todas las conexiones." -#: ../../include/items.php:1244 +#: ../../include/items.php:1259 msgid "Visible to approved connections." msgstr "Visible para las conexiones permitidas." -#: ../../include/items.php:1246 +#: ../../include/items.php:1261 msgid "Visible to specific connections." msgstr "Visible para conexiones específicas." -#: ../../include/items.php:4296 ../../Zotlabs/Module/Group.php:61 -#: ../../Zotlabs/Module/Group.php:213 +#: ../../include/items.php:4465 ../../Zotlabs/Module/Group.php:62 +#: ../../Zotlabs/Module/Group.php:214 msgid "Privacy group not found." msgstr "Grupo de canales no encontrado." -#: ../../include/items.php:4312 +#: ../../include/items.php:4481 msgid "Privacy group is empty." msgstr "El grupo de canales está vacío." -#: ../../include/items.php:4319 +#: ../../include/items.php:4488 #, php-format msgid "Privacy group: %s" msgstr "Grupo de canales: %s" -#: ../../include/items.php:4329 ../../Zotlabs/Module/Connedit.php:867 +#: ../../include/items.php:4498 ../../Zotlabs/Module/Connedit.php:868 #, php-format msgid "Connection: %s" msgstr "Conexión: %s" -#: ../../include/items.php:4331 +#: ../../include/items.php:4500 msgid "Connection not found." msgstr "Conexión no encontrada" -#: ../../include/items.php:4673 ../../Zotlabs/Module/Cover_photo.php:303 +#: ../../include/items.php:4834 ../../Zotlabs/Module/Cover_photo.php:297 msgid "female" msgstr "mujer" -#: ../../include/items.php:4674 ../../Zotlabs/Module/Cover_photo.php:304 +#: ../../include/items.php:4835 ../../Zotlabs/Module/Cover_photo.php:298 #, php-format msgid "%1$s updated her %2$s" msgstr "%1$s ha actualizado su %2$s" -#: ../../include/items.php:4675 ../../Zotlabs/Module/Cover_photo.php:305 +#: ../../include/items.php:4836 ../../Zotlabs/Module/Cover_photo.php:299 msgid "male" msgstr "hombre" -#: ../../include/items.php:4676 ../../Zotlabs/Module/Cover_photo.php:306 +#: ../../include/items.php:4837 ../../Zotlabs/Module/Cover_photo.php:300 #, php-format msgid "%1$s updated his %2$s" msgstr "%1$s ha actualizado su %2$s" -#: ../../include/items.php:4678 ../../Zotlabs/Module/Cover_photo.php:308 +#: ../../include/items.php:4839 ../../Zotlabs/Module/Cover_photo.php:302 #, php-format msgid "%1$s updated their %2$s" msgstr "%1$s ha actualizado su %2$s" -#: ../../include/items.php:4680 +#: ../../include/items.php:4841 msgid "profile photo" msgstr "foto del perfil" -#: ../../include/items.php:4872 +#: ../../include/items.php:5033 #, php-format msgid "[Edited %s]" msgstr "[se ha editado %s]" -#: ../../include/items.php:4872 +#: ../../include/items.php:5033 msgctxt "edit_activity" msgid "Post" msgstr "Publicar" -#: ../../include/items.php:4872 +#: ../../include/items.php:5033 msgctxt "edit_activity" msgid "Comment" msgstr "Comentar" @@ -6750,404 +6752,412 @@ msgstr "Esta acción supera los límites establecidos por su plan de suscripció msgid "This action is not available under your subscription plan." msgstr "Esta acción no está disponible en su plan de suscripción." -#: ../../include/photo/photo_driver.php:367 -#: ../../Zotlabs/Module/Profile_photo.php:145 -#: ../../Zotlabs/Module/Profile_photo.php:282 +#: ../../include/photo/photo_driver.php:413 +#: ../../Zotlabs/Module/Profile_photo.php:147 +#: ../../Zotlabs/Module/Profile_photo.php:284 msgid "Profile Photos" msgstr "Fotos del perfil" -#: ../../include/attach.php:267 ../../include/attach.php:375 +#: ../../include/attach.php:273 ../../include/attach.php:381 msgid "Item was not found." msgstr "Elemento no encontrado." -#: ../../include/attach.php:284 +#: ../../include/attach.php:290 msgid "Unknown error." msgstr "Error desconocido" -#: ../../include/attach.php:568 +#: ../../include/attach.php:574 msgid "No source file." msgstr "Ningún fichero de origen" -#: ../../include/attach.php:590 +#: ../../include/attach.php:596 msgid "Cannot locate file to replace" msgstr "No se puede localizar el fichero que va a ser sustituido." -#: ../../include/attach.php:609 +#: ../../include/attach.php:615 msgid "Cannot locate file to revise/update" msgstr "No se puede localizar el fichero para revisar/actualizar" -#: ../../include/attach.php:751 +#: ../../include/attach.php:759 #, php-format msgid "File exceeds size limit of %d" msgstr "El fichero supera el limite de tamaño de %d" -#: ../../include/attach.php:772 +#: ../../include/attach.php:780 #, php-format msgid "You have reached your limit of %1$.0f Mbytes attachment storage." msgstr "Ha alcanzado su límite de %1$.0f Mbytes de almacenamiento de adjuntos." -#: ../../include/attach.php:954 +#: ../../include/attach.php:968 msgid "File upload failed. Possible system limit or action terminated." msgstr "Error de carga, posiblemente por limite del sistema o porque la acción ha finalizado." -#: ../../include/attach.php:983 +#: ../../include/attach.php:997 msgid "Stored file could not be verified. Upload failed." msgstr "El fichero almacenado no ha podido ser verificado. El envío ha fallado." -#: ../../include/attach.php:1057 ../../include/attach.php:1073 +#: ../../include/attach.php:1069 ../../include/attach.php:1085 msgid "Path not available." msgstr "Ruta no disponible." -#: ../../include/attach.php:1122 ../../include/attach.php:1285 +#: ../../include/attach.php:1134 ../../include/attach.php:1297 msgid "Empty pathname" msgstr "Ruta vacía" -#: ../../include/attach.php:1148 +#: ../../include/attach.php:1160 msgid "duplicate filename or path" msgstr "Nombre duplicado de ruta o fichero" -#: ../../include/attach.php:1173 +#: ../../include/attach.php:1185 msgid "Path not found." msgstr "Ruta no encontrada" -#: ../../include/attach.php:1241 +#: ../../include/attach.php:1253 msgid "mkdir failed." msgstr "mkdir ha fallado." -#: ../../include/attach.php:1245 +#: ../../include/attach.php:1257 msgid "database storage failed." msgstr "el almacenamiento en la base de datos ha fallado." -#: ../../include/attach.php:1291 +#: ../../include/attach.php:1303 msgid "Empty path" msgstr "Ruta vacía" +#: ../../include/attach.php:2035 +#, php-format +msgid "%s shared a %s with you" +msgstr "%sha compartido un/una %scon usted" + #: ../../include/bookmarks.php:34 #, php-format msgid "%1$s's bookmarks" msgstr "Marcadores de %1$s" -#: ../../include/menu.php:118 ../../include/channel.php:1426 -#: ../../include/channel.php:1430 ../../Zotlabs/Widget/Cdav.php:138 +#: ../../include/menu.php:120 ../../include/channel.php:1523 +#: ../../include/channel.php:1527 ../../Zotlabs/Widget/Cdav.php:138 #: ../../Zotlabs/Widget/Cdav.php:175 ../../Zotlabs/Module/Article_edit.php:98 -#: ../../Zotlabs/Module/Group.php:252 ../../Zotlabs/Module/Card_edit.php:99 +#: ../../Zotlabs/Module/Group.php:253 ../../Zotlabs/Module/Card_edit.php:99 #: ../../Zotlabs/Module/Oauth.php:173 ../../Zotlabs/Module/Editwebpage.php:142 #: ../../Zotlabs/Module/Webpages.php:255 #: ../../Zotlabs/Module/Admin/Profs.php:175 #: ../../Zotlabs/Module/Blocks.php:160 ../../Zotlabs/Module/Editblock.php:114 #: ../../Zotlabs/Module/Editlayout.php:114 -#: ../../Zotlabs/Module/Connections.php:298 -#: ../../Zotlabs/Module/Connections.php:339 -#: ../../Zotlabs/Module/Connections.php:359 ../../Zotlabs/Module/Menu.php:176 -#: ../../Zotlabs/Module/Oauth2.php:194 ../../Zotlabs/Module/Thing.php:266 +#: ../../Zotlabs/Module/Connections.php:320 +#: ../../Zotlabs/Module/Connections.php:362 +#: ../../Zotlabs/Module/Connections.php:382 ../../Zotlabs/Module/Menu.php:176 +#: ../../Zotlabs/Module/Oauth2.php:194 ../../Zotlabs/Module/Thing.php:268 #: ../../Zotlabs/Module/Wiki.php:211 ../../Zotlabs/Module/Wiki.php:384 #: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Lib/Apps.php:557 #: ../../Zotlabs/Lib/ThreadItem.php:148 ../../Zotlabs/Storage/Browser.php:296 msgid "Edit" msgstr "Editar" -#: ../../include/bbcode.php:221 ../../include/bbcode.php:1232 -#: ../../include/bbcode.php:1235 ../../include/bbcode.php:1240 -#: ../../include/bbcode.php:1243 ../../include/bbcode.php:1246 -#: ../../include/bbcode.php:1249 ../../include/bbcode.php:1254 -#: ../../include/bbcode.php:1257 ../../include/bbcode.php:1262 -#: ../../include/bbcode.php:1265 ../../include/bbcode.php:1268 -#: ../../include/bbcode.php:1271 +#: ../../include/bbcode.php:221 ../../include/bbcode.php:896 +#: ../../include/bbcode.php:1486 ../../include/bbcode.php:1494 msgid "Image/photo" msgstr "Imagen/foto" -#: ../../include/bbcode.php:260 ../../include/bbcode.php:1282 +#: ../../include/bbcode.php:268 ../../include/bbcode.php:1511 msgid "Encrypted content" msgstr "Contenido cifrado" -#: ../../include/bbcode.php:292 +#: ../../include/bbcode.php:302 #, php-format msgid "Install %1$s element %2$s" msgstr "Instalar el elemento de%1$s%2$s" -#: ../../include/bbcode.php:296 +#: ../../include/bbcode.php:306 #, php-format msgid "" "This post contains an installable %s element, however you lack permissions " "to install it on this site." msgstr "Esta entrada contiene el elemento instalable %s, sin embargo le faltan permisos para instalarlo en este sitio." -#: ../../include/bbcode.php:306 ../../Zotlabs/Module/Impel.php:43 +#: ../../include/bbcode.php:316 ../../Zotlabs/Module/Impel.php:43 msgid "webpage" msgstr "página web" -#: ../../include/bbcode.php:309 ../../Zotlabs/Module/Impel.php:53 +#: ../../include/bbcode.php:319 ../../Zotlabs/Module/Impel.php:53 msgid "layout" msgstr "plantilla" -#: ../../include/bbcode.php:312 ../../Zotlabs/Module/Impel.php:48 +#: ../../include/bbcode.php:322 ../../Zotlabs/Module/Impel.php:48 msgid "block" msgstr "bloque" -#: ../../include/bbcode.php:315 ../../Zotlabs/Module/Impel.php:60 +#: ../../include/bbcode.php:325 ../../Zotlabs/Module/Impel.php:60 msgid "menu" msgstr "menú" -#: ../../include/bbcode.php:376 +#: ../../include/bbcode.php:519 msgid "card" msgstr "ficha" -#: ../../include/bbcode.php:378 +#: ../../include/bbcode.php:521 msgid "article" msgstr "el artículo" -#: ../../include/bbcode.php:380 ../../include/markdown.php:204 -#: ../../Zotlabs/Module/Tagger.php:77 +#: ../../include/bbcode.php:523 ../../include/markdown.php:204 +#: ../../Zotlabs/Module/Tagger.php:79 msgid "post" msgstr "la entrada" -#: ../../include/bbcode.php:384 ../../include/markdown.php:202 +#: ../../include/bbcode.php:527 ../../include/markdown.php:202 #, php-format msgid "%1$s wrote the following %2$s %3$s" msgstr "%1$s escribió %2$s siguiente %3$s" -#: ../../include/bbcode.php:461 ../../include/bbcode.php:469 +#: ../../include/bbcode.php:604 ../../include/bbcode.php:612 msgid "Click to open/close" msgstr "Pulsar para abrir/cerrar" -#: ../../include/bbcode.php:469 ../../include/markdown.php:251 +#: ../../include/bbcode.php:612 ../../include/markdown.php:251 msgid "spoiler" msgstr "spoiler" -#: ../../include/bbcode.php:482 +#: ../../include/bbcode.php:625 msgid "View article" msgstr "Ver el artículo" -#: ../../include/bbcode.php:482 +#: ../../include/bbcode.php:625 msgid "View summary" msgstr "Ver sumario" -#: ../../include/bbcode.php:772 ../../include/bbcode.php:942 -#: ../../Zotlabs/Lib/NativeWikiPage.php:603 +#: ../../include/bbcode.php:1018 ../../include/bbcode.php:1190 +#: ../../Zotlabs/Lib/NativeWikiPage.php:606 msgid "Different viewers will see this text differently" msgstr "Visitantes diferentes verán este texto de forma distinta" -#: ../../include/bbcode.php:1220 +#: ../../include/bbcode.php:1474 msgid "$1 wrote:" msgstr "$1 escribió:" -#: ../../include/channel.php:43 +#: ../../include/channel.php:46 msgid "Unable to obtain identity information from database" msgstr "No ha sido posible obtener información sobre la identidad desde la base de datos" -#: ../../include/channel.php:76 +#: ../../include/channel.php:79 msgid "Empty name" msgstr "Nombre vacío" -#: ../../include/channel.php:79 +#: ../../include/channel.php:82 msgid "Name too long" msgstr "Nombre demasiado largo" -#: ../../include/channel.php:196 +#: ../../include/channel.php:199 msgid "No account identifier" msgstr "Ningún identificador de la cuenta" -#: ../../include/channel.php:208 +#: ../../include/channel.php:211 msgid "Nickname is required." msgstr "Se requiere un sobrenombre (alias)." -#: ../../include/channel.php:222 ../../include/channel.php:655 +#: ../../include/channel.php:225 ../../include/channel.php:705 #: ../../Zotlabs/Module/Changeaddr.php:46 msgid "Reserved nickname. Please choose another." msgstr "Sobrenombre en uso. Por favor, elija otro." -#: ../../include/channel.php:227 ../../include/channel.php:660 +#: ../../include/channel.php:230 ../../include/channel.php:710 #: ../../Zotlabs/Module/Changeaddr.php:51 msgid "" "Nickname has unsupported characters or is already being used on this site." msgstr "El alias contiene caracteres no admitidos o está ya en uso por otros miembros de este sitio." -#: ../../include/channel.php:287 +#: ../../include/channel.php:294 msgid "Unable to retrieve created identity" msgstr "No ha sido posible recuperar la identidad creada" -#: ../../include/channel.php:429 +#: ../../include/channel.php:440 msgid "Default Profile" msgstr "Perfil principal" -#: ../../include/channel.php:588 ../../include/channel.php:677 +#: ../../include/channel.php:638 ../../include/channel.php:727 msgid "Unable to retrieve modified identity" msgstr "No se puede recuperar la identidad modficada" -#: ../../include/channel.php:1419 ../../Zotlabs/Module/Profiles.php:728 +#: ../../include/channel.php:1370 +msgid "Requested channel is not available." +msgstr "El canal solicitado no está disponible." + +#: ../../include/channel.php:1516 ../../Zotlabs/Module/Profiles.php:730 msgid "Change profile photo" msgstr "Cambiar la foto del perfil" -#: ../../include/channel.php:1427 +#: ../../include/channel.php:1524 msgid "Create New Profile" msgstr "Crear un nuevo perfil" -#: ../../include/channel.php:1445 ../../Zotlabs/Module/Profiles.php:820 +#: ../../include/channel.php:1542 ../../Zotlabs/Module/Profiles.php:822 msgid "Profile Image" msgstr "Imagen del perfil" -#: ../../include/channel.php:1448 +#: ../../include/channel.php:1545 msgid "Visible to everybody" msgstr "Visible para todos" -#: ../../include/channel.php:1449 ../../Zotlabs/Module/Profiles.php:725 -#: ../../Zotlabs/Module/Profiles.php:824 +#: ../../include/channel.php:1546 ../../Zotlabs/Module/Profiles.php:727 +#: ../../Zotlabs/Module/Profiles.php:826 msgid "Edit visibility" msgstr "Editar visibilidad" -#: ../../include/channel.php:1525 ../../include/channel.php:1653 +#: ../../include/channel.php:1622 ../../include/channel.php:1750 msgid "Gender:" msgstr "Género:" -#: ../../include/channel.php:1527 ../../include/channel.php:1721 +#: ../../include/channel.php:1623 ../../include/channel.php:1794 +msgid "Status:" +msgstr "Estado:" + +#: ../../include/channel.php:1624 ../../include/channel.php:1818 msgid "Homepage:" msgstr "Página personal:" -#: ../../include/channel.php:1528 +#: ../../include/channel.php:1625 msgid "Online Now" msgstr "Ahora en línea" -#: ../../include/channel.php:1581 +#: ../../include/channel.php:1678 msgid "Change your profile photo" msgstr "Cambiar su foto del perfil" -#: ../../include/channel.php:1612 +#: ../../include/channel.php:1709 msgid "Trans" msgstr "Trans" -#: ../../include/channel.php:1651 -#: ../../Zotlabs/Module/Settings/Channel.php:499 +#: ../../include/channel.php:1748 +#: ../../Zotlabs/Module/Settings/Channel.php:500 msgid "Full Name:" msgstr "Nombre completo:" -#: ../../include/channel.php:1658 +#: ../../include/channel.php:1755 msgid "Like this channel" msgstr "Me gusta este canal" -#: ../../include/channel.php:1682 +#: ../../include/channel.php:1779 msgid "j F, Y" msgstr "j F Y" -#: ../../include/channel.php:1683 +#: ../../include/channel.php:1780 msgid "j F" msgstr "j F" -#: ../../include/channel.php:1690 +#: ../../include/channel.php:1787 msgid "Birthday:" msgstr "Cumpleaños:" -#: ../../include/channel.php:1694 ../../Zotlabs/Module/Directory.php:334 +#: ../../include/channel.php:1791 ../../Zotlabs/Module/Directory.php:347 msgid "Age:" msgstr "Edad:" -#: ../../include/channel.php:1703 +#: ../../include/channel.php:1800 #, php-format msgid "for %1$d %2$s" msgstr "por %1$d %2$s" -#: ../../include/channel.php:1715 +#: ../../include/channel.php:1812 msgid "Tags:" msgstr "Etiquetas:" -#: ../../include/channel.php:1719 +#: ../../include/channel.php:1816 msgid "Sexual Preference:" msgstr "Orientación sexual:" -#: ../../include/channel.php:1723 ../../Zotlabs/Module/Directory.php:350 +#: ../../include/channel.php:1820 ../../Zotlabs/Module/Directory.php:365 msgid "Hometown:" msgstr "Lugar de nacimiento:" -#: ../../include/channel.php:1725 +#: ../../include/channel.php:1822 msgid "Political Views:" msgstr "Posición política:" -#: ../../include/channel.php:1727 +#: ../../include/channel.php:1824 msgid "Religion:" msgstr "Religión:" -#: ../../include/channel.php:1729 ../../Zotlabs/Module/Directory.php:352 +#: ../../include/channel.php:1826 ../../Zotlabs/Module/Directory.php:367 msgid "About:" msgstr "Sobre mí:" -#: ../../include/channel.php:1731 +#: ../../include/channel.php:1828 msgid "Hobbies/Interests:" msgstr "Aficciones o intereses:" -#: ../../include/channel.php:1733 +#: ../../include/channel.php:1830 msgid "Likes:" msgstr "Me gusta:" -#: ../../include/channel.php:1735 +#: ../../include/channel.php:1832 msgid "Dislikes:" msgstr "No me gusta:" -#: ../../include/channel.php:1737 +#: ../../include/channel.php:1834 msgid "Contact information and Social Networks:" msgstr "Información de contacto y redes sociales:" -#: ../../include/channel.php:1739 +#: ../../include/channel.php:1836 msgid "My other channels:" msgstr "Mis otros canales:" -#: ../../include/channel.php:1741 +#: ../../include/channel.php:1838 msgid "Musical interests:" msgstr "Preferencias musicales:" -#: ../../include/channel.php:1743 +#: ../../include/channel.php:1840 msgid "Books, literature:" msgstr "Libros, literatura:" -#: ../../include/channel.php:1745 +#: ../../include/channel.php:1842 msgid "Television:" msgstr "Televisión:" -#: ../../include/channel.php:1747 +#: ../../include/channel.php:1844 msgid "Film/dance/culture/entertainment:" msgstr "Cine, danza, cultura, entretenimiento:" -#: ../../include/channel.php:1749 +#: ../../include/channel.php:1846 msgid "Love/Romance:" msgstr "Vida sentimental o amorosa:" -#: ../../include/channel.php:1751 +#: ../../include/channel.php:1848 msgid "Work/employment:" msgstr "Trabajo:" -#: ../../include/channel.php:1753 +#: ../../include/channel.php:1850 msgid "School/education:" msgstr "Estudios:" -#: ../../include/channel.php:1774 ../../Zotlabs/Module/Profperm.php:113 -#: ../../Zotlabs/Lib/Apps.php:361 +#: ../../include/channel.php:1871 ../../Zotlabs/Module/Profperm.php:113 +#: ../../Zotlabs/Lib/Apps.php:362 msgid "Profile" msgstr "Perfil" -#: ../../include/channel.php:1776 +#: ../../include/channel.php:1873 msgid "Like this thing" msgstr "Me gusta esto" -#: ../../include/channel.php:1777 ../../Zotlabs/Module/Events.php:699 +#: ../../include/channel.php:1874 ../../Zotlabs/Module/Events.php:699 msgid "Export" msgstr "Exportar" -#: ../../include/channel.php:2215 ../../Zotlabs/Module/Cover_photo.php:310 +#: ../../include/channel.php:2312 ../../Zotlabs/Module/Cover_photo.php:304 msgid "cover photo" msgstr "Imagen de portada del perfil" -#: ../../include/channel.php:2483 ../../Zotlabs/Module/Rmagic.php:93 -#: ../../boot.php:1675 +#: ../../include/channel.php:2601 ../../Zotlabs/Module/Rmagic.php:93 +#: ../../boot.php:1699 msgid "Remote Authentication" msgstr "Acceso desde su servidor" -#: ../../include/channel.php:2484 ../../Zotlabs/Module/Rmagic.php:94 +#: ../../include/channel.php:2602 ../../Zotlabs/Module/Rmagic.php:94 msgid "Enter your channel address (e.g. channel@example.com)" msgstr "Introduzca la dirección del canal (p.ej. canal@ejemplo.com)" -#: ../../include/channel.php:2485 ../../Zotlabs/Module/Rmagic.php:95 +#: ../../include/channel.php:2603 ../../Zotlabs/Module/Rmagic.php:95 msgid "Authenticate" msgstr "Acceder" -#: ../../include/channel.php:2640 ../../Zotlabs/Module/Admin/Accounts.php:91 +#: ../../include/channel.php:2758 ../../Zotlabs/Module/Admin/Accounts.php:91 #, php-format msgid "Account '%s' deleted" msgstr "La cuenta '%s' ha sido eliminada" @@ -7186,7 +7196,7 @@ msgstr "Seleccione \"Mostrar\" para permitir la visualización. La opción \"No msgid "Show" msgstr "Mostrar" -#: ../../include/acl_selectors.php:117 +#: ../../include/acl_selectors.php:117 ../../Zotlabs/Widget/Pinned.php:158 msgid "Don't show" msgstr "No mostrar" @@ -7233,7 +7243,7 @@ msgstr "Solo foros públicos" msgid "This Website Only" msgstr "Solo este sitio web" -#: ../../include/zid.php:368 +#: ../../include/zid.php:370 #, php-format msgid "OpenWebAuth: %1$s welcomes %2$s" msgstr "OpenWebAuth: %1$s da la bienvenida a %2$s" @@ -7305,23 +7315,23 @@ msgid "Page name" msgstr "Nombre de la página" #: ../../Zotlabs/Widget/Album.php:78 ../../Zotlabs/Widget/Portfolio.php:87 -#: ../../Zotlabs/Module/Embedphotos.php:168 -#: ../../Zotlabs/Module/Photos.php:784 ../../Zotlabs/Module/Photos.php:1332 +#: ../../Zotlabs/Module/Embedphotos.php:170 +#: ../../Zotlabs/Module/Photos.php:786 ../../Zotlabs/Module/Photos.php:1332 msgid "View Photo" msgstr "Ver foto" #: ../../Zotlabs/Widget/Album.php:95 ../../Zotlabs/Widget/Portfolio.php:108 -#: ../../Zotlabs/Module/Embedphotos.php:184 -#: ../../Zotlabs/Module/Photos.php:815 +#: ../../Zotlabs/Module/Embedphotos.php:186 +#: ../../Zotlabs/Module/Photos.php:817 msgid "Edit Album" msgstr "Editar álbum" #: ../../Zotlabs/Widget/Album.php:97 ../../Zotlabs/Widget/Cdav.php:146 #: ../../Zotlabs/Widget/Cdav.php:182 ../../Zotlabs/Widget/Portfolio.php:110 -#: ../../Zotlabs/Module/Embedphotos.php:186 -#: ../../Zotlabs/Module/Profile_photo.php:498 -#: ../../Zotlabs/Module/Cover_photo.php:429 -#: ../../Zotlabs/Module/Photos.php:685 ../../Zotlabs/Storage/Browser.php:398 +#: ../../Zotlabs/Module/Embedphotos.php:188 +#: ../../Zotlabs/Module/Profile_photo.php:500 +#: ../../Zotlabs/Module/Cover_photo.php:423 +#: ../../Zotlabs/Module/Photos.php:687 ../../Zotlabs/Storage/Browser.php:398 msgid "Upload" msgstr "Subir" @@ -7357,6 +7367,59 @@ msgstr "Eliminar conversación" msgid "Chat Members" msgstr "Miembros del chat" +#: ../../Zotlabs/Widget/Pinned.php:70 ../../Zotlabs/Lib/ThreadItem.php:205 +msgid "I will attend" +msgstr "Participaré" + +#: ../../Zotlabs/Widget/Pinned.php:70 ../../Zotlabs/Lib/ThreadItem.php:205 +msgid "I will not attend" +msgstr "No participaré" + +#: ../../Zotlabs/Widget/Pinned.php:70 ../../Zotlabs/Lib/ThreadItem.php:205 +msgid "I might attend" +msgstr "Quizá participe" + +#: ../../Zotlabs/Widget/Pinned.php:81 ../../Zotlabs/Lib/ThreadItem.php:219 +msgid "I agree" +msgstr "Estoy de acuerdo" + +#: ../../Zotlabs/Widget/Pinned.php:81 ../../Zotlabs/Lib/ThreadItem.php:219 +msgid "I disagree" +msgstr "No estoy de acuerdo" + +#: ../../Zotlabs/Widget/Pinned.php:81 ../../Zotlabs/Lib/ThreadItem.php:219 +msgid "I abstain" +msgstr "Me abstengo" + +#: ../../Zotlabs/Widget/Pinned.php:99 ../../Zotlabs/Lib/ThreadItem.php:329 +msgid "Share This" +msgstr "Compartir esto" + +#: ../../Zotlabs/Widget/Pinned.php:99 ../../Zotlabs/Lib/ThreadItem.php:329 +msgid "share" +msgstr "compartir" + +#: ../../Zotlabs/Widget/Pinned.php:123 ../../Zotlabs/Widget/Pinned.php:124 +#, php-format +msgid "View %s's profile - %s" +msgstr "Ver el perfil de %s - %s" + +#: ../../Zotlabs/Widget/Pinned.php:128 ../../Zotlabs/Lib/ThreadItem.php:413 +msgid "via" +msgstr "mediante" + +#: ../../Zotlabs/Widget/Pinned.php:143 ../../Zotlabs/Lib/ThreadItem.php:443 +msgid "Attendance Options" +msgstr "Opciones de participación o asistencia" + +#: ../../Zotlabs/Widget/Pinned.php:144 ../../Zotlabs/Lib/ThreadItem.php:445 +msgid "Voting Options" +msgstr "Opciones de votación" + +#: ../../Zotlabs/Widget/Pinned.php:156 ../../Zotlabs/Lib/ThreadItem.php:469 +msgid "Pinned post" +msgstr "Entradas ancladas" + #: ../../Zotlabs/Widget/Activity.php:50 msgctxt "widget" msgid "Activity" @@ -7379,7 +7442,7 @@ msgid "Channel Calendar" msgstr "Calendario del canal" #: ../../Zotlabs/Widget/Cdav.php:129 ../../Zotlabs/Widget/Cdav.php:143 -#: ../../Zotlabs/Module/Cdav.php:1078 +#: ../../Zotlabs/Module/Cdav.php:1051 msgid "CalDAV Calendars" msgstr "Calendarios CalDAV" @@ -7400,12 +7463,12 @@ msgid "Create new CalDAV calendar" msgstr "Crear un nuevo calendario CalDAV" #: ../../Zotlabs/Widget/Cdav.php:140 ../../Zotlabs/Widget/Cdav.php:178 -#: ../../Zotlabs/Module/Cdav.php:1082 ../../Zotlabs/Module/Cdav.php:1388 +#: ../../Zotlabs/Module/Cdav.php:1055 ../../Zotlabs/Module/Cdav.php:1383 #: ../../Zotlabs/Module/Webpages.php:254 #: ../../Zotlabs/Module/New_channel.php:189 ../../Zotlabs/Module/Cards.php:113 -#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Profiles.php:798 +#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Profiles.php:800 #: ../../Zotlabs/Module/Articles.php:117 ../../Zotlabs/Module/Menu.php:182 -#: ../../Zotlabs/Module/Connedit.php:938 ../../Zotlabs/Module/Layouts.php:185 +#: ../../Zotlabs/Module/Connedit.php:939 ../../Zotlabs/Module/Layouts.php:185 #: ../../Zotlabs/Storage/Browser.php:282 ../../Zotlabs/Storage/Browser.php:396 msgid "Create" msgstr "Crear" @@ -7418,7 +7481,7 @@ msgstr "Nombre del calendario" msgid "Calendar Tools" msgstr "Gestión de calendarios" -#: ../../Zotlabs/Widget/Cdav.php:143 ../../Zotlabs/Module/Cdav.php:1078 +#: ../../Zotlabs/Widget/Cdav.php:143 ../../Zotlabs/Module/Cdav.php:1051 msgid "Channel Calendars" msgstr "Calendarios del canal" @@ -7499,9 +7562,9 @@ msgid "See more..." msgstr "Ver más..." #: ../../Zotlabs/Widget/Forums.php:100 -#: ../../Zotlabs/Widget/Activity_filter.php:73 -#: ../../Zotlabs/Widget/Notifications.php:119 -#: ../../Zotlabs/Widget/Notifications.php:120 +#: ../../Zotlabs/Widget/Activity_filter.php:115 +#: ../../Zotlabs/Widget/Notifications.php:139 +#: ../../Zotlabs/Widget/Notifications.php:140 msgid "Forums" msgstr "Foros" @@ -7510,23 +7573,23 @@ msgid "Bookmarked Chatrooms" msgstr "Salas de chat preferidas" #: ../../Zotlabs/Widget/Wiki_page_history.php:23 -#: ../../Zotlabs/Lib/NativeWikiPage.php:562 +#: ../../Zotlabs/Lib/NativeWikiPage.php:565 msgctxt "wiki_history" msgid "Message" msgstr "Mensaje" #: ../../Zotlabs/Widget/Wiki_page_history.php:24 -#: ../../Zotlabs/Lib/NativeWikiPage.php:563 +#: ../../Zotlabs/Lib/NativeWikiPage.php:566 msgid "Date" msgstr "Fecha" #: ../../Zotlabs/Widget/Wiki_page_history.php:25 -#: ../../Zotlabs/Module/Wiki.php:367 ../../Zotlabs/Lib/NativeWikiPage.php:564 +#: ../../Zotlabs/Module/Wiki.php:367 ../../Zotlabs/Lib/NativeWikiPage.php:567 msgid "Revert" msgstr "Revertir" #: ../../Zotlabs/Widget/Wiki_page_history.php:26 -#: ../../Zotlabs/Lib/NativeWikiPage.php:565 +#: ../../Zotlabs/Lib/NativeWikiPage.php:568 msgid "Compare" msgstr "Comparar" @@ -7562,7 +7625,7 @@ msgstr "Nuevo mensaje" msgid "photo/image" msgstr "foto/imagen" -#: ../../Zotlabs/Widget/Admin.php:22 ../../Zotlabs/Module/Admin/Site.php:288 +#: ../../Zotlabs/Widget/Admin.php:22 ../../Zotlabs/Module/Admin/Site.php:286 msgid "Site" msgstr "Sitio" @@ -7584,11 +7647,11 @@ msgid "Channels" msgstr "Canales" #: ../../Zotlabs/Widget/Admin.php:25 -#: ../../Zotlabs/Module/Admin/Security.php:93 +#: ../../Zotlabs/Module/Admin/Security.php:99 msgid "Security" msgstr "Seguridad" -#: ../../Zotlabs/Widget/Admin.php:26 ../../Zotlabs/Lib/Apps.php:357 +#: ../../Zotlabs/Widget/Admin.php:26 ../../Zotlabs/Lib/Apps.php:358 msgid "Features" msgstr "Funcionalidades" @@ -7623,61 +7686,85 @@ msgstr "Informes" msgid "Addon Features" msgstr "Características del addon" -#: ../../Zotlabs/Widget/Activity_filter.php:36 +#: ../../Zotlabs/Widget/Activity_filter.php:33 +msgid "Direct Messages" +msgstr "Mensajes directos" + +#: ../../Zotlabs/Widget/Activity_filter.php:37 +msgid "Show direct (private) messages" +msgstr "Mostrar mensajes (privados) directos" + +#: ../../Zotlabs/Widget/Activity_filter.php:42 +msgid "Events" +msgstr "Eventos" + +#: ../../Zotlabs/Widget/Activity_filter.php:46 +msgid "Show posts that include events" +msgstr "Mostrar entradas que incluyan eventos" + +#: ../../Zotlabs/Widget/Activity_filter.php:52 +msgid "Polls" +msgstr "Encuestas" + +#: ../../Zotlabs/Widget/Activity_filter.php:56 +msgid "Show posts that include polls" +msgstr "Mostrar entradas que incluyan encuestas" + +#: ../../Zotlabs/Widget/Activity_filter.php:77 #, php-format msgid "Show posts related to the %s privacy group" msgstr "Mostrar entradas relacionadas con el grupo %s" -#: ../../Zotlabs/Widget/Activity_filter.php:45 +#: ../../Zotlabs/Widget/Activity_filter.php:86 msgid "Show my privacy groups" msgstr "Mostrar mis grupos de canales" -#: ../../Zotlabs/Widget/Activity_filter.php:66 +#: ../../Zotlabs/Widget/Activity_filter.php:108 msgid "Show posts to this forum" msgstr "Mostrar las entradas en este foro" -#: ../../Zotlabs/Widget/Activity_filter.php:77 +#: ../../Zotlabs/Widget/Activity_filter.php:119 msgid "Show forums" msgstr "Mostrar los foros" -#: ../../Zotlabs/Widget/Activity_filter.php:91 +#: ../../Zotlabs/Widget/Activity_filter.php:133 msgid "Starred Posts" msgstr "Entradas preferidas" -#: ../../Zotlabs/Widget/Activity_filter.php:95 +#: ../../Zotlabs/Widget/Activity_filter.php:137 msgid "Show posts that I have starred" msgstr "Mostrar entradas que he señalado como preferidas" -#: ../../Zotlabs/Widget/Activity_filter.php:106 +#: ../../Zotlabs/Widget/Activity_filter.php:148 msgid "Personal Posts" msgstr "Entradas personales" -#: ../../Zotlabs/Widget/Activity_filter.php:110 +#: ../../Zotlabs/Widget/Activity_filter.php:152 msgid "Show posts that mention or involve me" msgstr "Mostrar entradas que me mencionen o involucren" -#: ../../Zotlabs/Widget/Activity_filter.php:131 +#: ../../Zotlabs/Widget/Activity_filter.php:173 #, php-format msgid "Show posts that I have filed to %s" msgstr "Mostrar las entradas que he enviado a %s" -#: ../../Zotlabs/Widget/Activity_filter.php:141 +#: ../../Zotlabs/Widget/Activity_filter.php:183 msgid "Show filed post categories" msgstr "Mostrar los temas de las entradas archivadas" -#: ../../Zotlabs/Widget/Activity_filter.php:155 +#: ../../Zotlabs/Widget/Activity_filter.php:197 msgid "Panel search" msgstr "Panel de búsqueda" -#: ../../Zotlabs/Widget/Activity_filter.php:165 +#: ../../Zotlabs/Widget/Activity_filter.php:207 msgid "Filter by name" msgstr "Filtrar por nombre" -#: ../../Zotlabs/Widget/Activity_filter.php:180 +#: ../../Zotlabs/Widget/Activity_filter.php:222 msgid "Remove active filter" msgstr "Eliminar el filtro activo" -#: ../../Zotlabs/Widget/Activity_filter.php:196 +#: ../../Zotlabs/Widget/Activity_filter.php:238 msgid "Stream Filters" msgstr "Filtros del stream" @@ -7799,26 +7886,26 @@ msgid "View public stream" msgstr "Ver el \"stream\" público" #: ../../Zotlabs/Widget/Newmember.php:75 -#: ../../Zotlabs/Module/Settings/Display.php:205 +#: ../../Zotlabs/Module/Settings/Display.php:206 msgid "New Member Links" msgstr "Enlaces para nuevos miembros" -#: ../../Zotlabs/Widget/Affinity.php:30 ../../Zotlabs/Module/Connedit.php:723 +#: ../../Zotlabs/Widget/Affinity.php:30 ../../Zotlabs/Module/Connedit.php:724 msgid "Me" msgstr "Yo" -#: ../../Zotlabs/Widget/Affinity.php:31 ../../Zotlabs/Module/Connedit.php:724 +#: ../../Zotlabs/Widget/Affinity.php:31 ../../Zotlabs/Module/Connedit.php:725 msgid "Family" msgstr "Familia" -#: ../../Zotlabs/Widget/Affinity.php:33 ../../Zotlabs/Module/Connedit.php:726 +#: ../../Zotlabs/Widget/Affinity.php:33 ../../Zotlabs/Module/Connedit.php:727 msgid "Acquaintances" msgstr "Conocidos/as" #: ../../Zotlabs/Widget/Affinity.php:34 #: ../../Zotlabs/Module/Connections.php:97 #: ../../Zotlabs/Module/Connections.php:111 -#: ../../Zotlabs/Module/Connedit.php:727 +#: ../../Zotlabs/Module/Connedit.php:728 msgid "All" msgstr "Todos/as" @@ -7839,127 +7926,142 @@ msgid "View your network activity" msgstr "Ver la actividad de su red" #: ../../Zotlabs/Widget/Notifications.php:23 +#: ../../Zotlabs/Widget/Notifications.php:62 msgid "Mark all notifications read" msgstr "Marcar todas las notificaciones como leídas" #: ../../Zotlabs/Widget/Notifications.php:26 -#: ../../Zotlabs/Widget/Notifications.php:45 -#: ../../Zotlabs/Widget/Notifications.php:152 +#: ../../Zotlabs/Widget/Notifications.php:46 +#: ../../Zotlabs/Widget/Notifications.php:65 +#: ../../Zotlabs/Widget/Notifications.php:172 msgid "Show new posts only" msgstr "Mostrar solo las entradas nuevas" #: ../../Zotlabs/Widget/Notifications.php:27 -#: ../../Zotlabs/Widget/Notifications.php:46 -#: ../../Zotlabs/Widget/Notifications.php:122 -#: ../../Zotlabs/Widget/Notifications.php:153 +#: ../../Zotlabs/Widget/Notifications.php:47 +#: ../../Zotlabs/Widget/Notifications.php:66 +#: ../../Zotlabs/Widget/Notifications.php:142 +#: ../../Zotlabs/Widget/Notifications.php:173 msgid "Filter by name or address" msgstr "Filtrar por nombre o dirección" -#: ../../Zotlabs/Widget/Notifications.php:35 +#: ../../Zotlabs/Widget/Notifications.php:36 msgid "New Home Activity" msgstr "Nueva actividad en su página principal" -#: ../../Zotlabs/Widget/Notifications.php:36 +#: ../../Zotlabs/Widget/Notifications.php:37 msgid "New Home Activity Notifications" msgstr "Avisos de nueva actividad en su página principal" -#: ../../Zotlabs/Widget/Notifications.php:39 +#: ../../Zotlabs/Widget/Notifications.php:40 msgid "View your home activity" msgstr "Ver la actividad de su página principal" -#: ../../Zotlabs/Widget/Notifications.php:42 -#: ../../Zotlabs/Widget/Notifications.php:149 +#: ../../Zotlabs/Widget/Notifications.php:43 +#: ../../Zotlabs/Widget/Notifications.php:169 msgid "Mark all notifications seen" msgstr "Marcar todas las notificaciones como vistas" -#: ../../Zotlabs/Widget/Notifications.php:54 +#: ../../Zotlabs/Widget/Notifications.php:55 +msgid "New Direct Messages" +msgstr "Nuevos mensajes directos" + +#: ../../Zotlabs/Widget/Notifications.php:56 +msgid "New Direct Messages Notifications" +msgstr "Nuevas notificaciones de mensajes directos" + +#: ../../Zotlabs/Widget/Notifications.php:59 +msgid "View your direct messages" +msgstr "Ver sus mensajes directos" + +#: ../../Zotlabs/Widget/Notifications.php:74 msgid "New Mails" msgstr "Nuevos mensajes de correo" -#: ../../Zotlabs/Widget/Notifications.php:55 +#: ../../Zotlabs/Widget/Notifications.php:75 msgid "New Mails Notifications" msgstr "Avisos de nuevos mensajes de correo" -#: ../../Zotlabs/Widget/Notifications.php:58 +#: ../../Zotlabs/Widget/Notifications.php:78 msgid "View your private mails" msgstr "Ver sus correos privados" -#: ../../Zotlabs/Widget/Notifications.php:61 +#: ../../Zotlabs/Widget/Notifications.php:81 msgid "Mark all messages seen" msgstr "Marcar todos los mensajes como vistos" -#: ../../Zotlabs/Widget/Notifications.php:69 +#: ../../Zotlabs/Widget/Notifications.php:89 msgid "New Events" msgstr "Eventos nuevos" -#: ../../Zotlabs/Widget/Notifications.php:70 +#: ../../Zotlabs/Widget/Notifications.php:90 msgid "New Events Notifications" msgstr "Avisos de nuevos eventos" -#: ../../Zotlabs/Widget/Notifications.php:73 +#: ../../Zotlabs/Widget/Notifications.php:93 msgid "View events" msgstr "Ver los eventos" -#: ../../Zotlabs/Widget/Notifications.php:76 +#: ../../Zotlabs/Widget/Notifications.php:96 msgid "Mark all events seen" msgstr "Marcar todos los eventos como leidos" -#: ../../Zotlabs/Widget/Notifications.php:84 +#: ../../Zotlabs/Widget/Notifications.php:104 #: ../../Zotlabs/Module/Connections.php:164 msgid "New Connections" msgstr "Nuevas conexiones" -#: ../../Zotlabs/Widget/Notifications.php:85 +#: ../../Zotlabs/Widget/Notifications.php:105 msgid "New Connections Notifications" msgstr "Avisos de nuevas conexiones" -#: ../../Zotlabs/Widget/Notifications.php:88 +#: ../../Zotlabs/Widget/Notifications.php:108 msgid "View all connections" msgstr "Ver todas las conexiones" -#: ../../Zotlabs/Widget/Notifications.php:96 +#: ../../Zotlabs/Widget/Notifications.php:116 msgid "New Files" msgstr "Ficheros nuevos" -#: ../../Zotlabs/Widget/Notifications.php:97 +#: ../../Zotlabs/Widget/Notifications.php:117 msgid "New Files Notifications" msgstr "Avisos de nuevos ficheros" -#: ../../Zotlabs/Widget/Notifications.php:104 -#: ../../Zotlabs/Widget/Notifications.php:105 +#: ../../Zotlabs/Widget/Notifications.php:124 +#: ../../Zotlabs/Widget/Notifications.php:125 msgid "Notices" msgstr "Avisos" -#: ../../Zotlabs/Widget/Notifications.php:108 +#: ../../Zotlabs/Widget/Notifications.php:128 msgid "View all notices" msgstr "Ver todos los avisos" -#: ../../Zotlabs/Widget/Notifications.php:111 +#: ../../Zotlabs/Widget/Notifications.php:131 msgid "Mark all notices seen" msgstr "Marcar como leídos todos los avisos" -#: ../../Zotlabs/Widget/Notifications.php:132 +#: ../../Zotlabs/Widget/Notifications.php:152 msgid "New Registrations" msgstr "Registros nuevos" -#: ../../Zotlabs/Widget/Notifications.php:133 +#: ../../Zotlabs/Widget/Notifications.php:153 msgid "New Registrations Notifications" msgstr "Notificaciones de nuevos registros" -#: ../../Zotlabs/Widget/Notifications.php:142 -#: ../../Zotlabs/Module/Pubstream.php:109 ../../Zotlabs/Lib/Apps.php:375 +#: ../../Zotlabs/Widget/Notifications.php:162 +#: ../../Zotlabs/Module/Pubstream.php:114 ../../Zotlabs/Lib/Apps.php:375 msgid "Public Stream" msgstr "\"Stream\" público" -#: ../../Zotlabs/Widget/Notifications.php:143 +#: ../../Zotlabs/Widget/Notifications.php:163 msgid "Public Stream Notifications" msgstr "Avisos del \"stream\" público" -#: ../../Zotlabs/Widget/Notifications.php:146 +#: ../../Zotlabs/Widget/Notifications.php:166 msgid "View the public stream" msgstr "Ver el \"stream\" público" -#: ../../Zotlabs/Widget/Notifications.php:161 +#: ../../Zotlabs/Widget/Notifications.php:181 msgid "Sorry, you have got no notifications at the moment" msgstr "Lo sentimos, por el momento no ha recibido ninguna notificación" @@ -8014,27 +8116,27 @@ msgstr "Contraseña de inicio de sesión" msgid "Expires (yyyy-mm-dd)" msgstr "Expira (aaaa-mm-dd)" -#: ../../Zotlabs/Module/Tokens.php:180 ../../Zotlabs/Module/Connedit.php:907 +#: ../../Zotlabs/Module/Tokens.php:180 ../../Zotlabs/Module/Connedit.php:908 msgid "Their Settings" msgstr "Sus ajustes" -#: ../../Zotlabs/Module/Tokens.php:181 ../../Zotlabs/Module/Permcats.php:121 -#: ../../Zotlabs/Module/Defperms.php:266 ../../Zotlabs/Module/Connedit.php:908 +#: ../../Zotlabs/Module/Tokens.php:181 ../../Zotlabs/Module/Permcats.php:122 +#: ../../Zotlabs/Module/Defperms.php:267 ../../Zotlabs/Module/Connedit.php:909 msgid "My Settings" msgstr "Mis ajustes" -#: ../../Zotlabs/Module/Tokens.php:183 ../../Zotlabs/Module/Permcats.php:123 -#: ../../Zotlabs/Module/Defperms.php:264 ../../Zotlabs/Module/Connedit.php:903 +#: ../../Zotlabs/Module/Tokens.php:183 ../../Zotlabs/Module/Permcats.php:124 +#: ../../Zotlabs/Module/Defperms.php:265 ../../Zotlabs/Module/Connedit.php:904 msgid "inherited" msgstr "heredado" -#: ../../Zotlabs/Module/Tokens.php:186 ../../Zotlabs/Module/Permcats.php:126 -#: ../../Zotlabs/Module/Defperms.php:269 ../../Zotlabs/Module/Connedit.php:910 +#: ../../Zotlabs/Module/Tokens.php:186 ../../Zotlabs/Module/Permcats.php:127 +#: ../../Zotlabs/Module/Defperms.php:270 ../../Zotlabs/Module/Connedit.php:911 msgid "Individual Permissions" msgstr "Permisos individuales" -#: ../../Zotlabs/Module/Tokens.php:187 ../../Zotlabs/Module/Permcats.php:127 -#: ../../Zotlabs/Module/Connedit.php:911 +#: ../../Zotlabs/Module/Tokens.php:187 ../../Zotlabs/Module/Permcats.php:128 +#: ../../Zotlabs/Module/Connedit.php:912 msgid "" "Some permissions may be inherited from your channel's <a " "href=\"settings\"><strong>privacy settings</strong></a>, which have higher " @@ -8054,7 +8156,7 @@ msgstr "Elemento no encontrado" #: ../../Zotlabs/Module/Article_edit.php:44 #: ../../Zotlabs/Module/Wall_upload.php:31 -#: ../../Zotlabs/Module/Card_edit.php:44 ../../Zotlabs/Module/Chanview.php:96 +#: ../../Zotlabs/Module/Card_edit.php:44 ../../Zotlabs/Module/Chanview.php:89 #: ../../Zotlabs/Module/Cal.php:31 ../../Zotlabs/Module/Page.php:75 #: ../../Zotlabs/Module/Block.php:41 msgid "Channel not found." @@ -8064,29 +8166,29 @@ msgstr "Canal no encontrado." msgid "Edit Article" msgstr "Editar el artículo" -#: ../../Zotlabs/Module/Network.php:109 +#: ../../Zotlabs/Module/Network.php:110 msgid "No such group" msgstr "No se encuentra el grupo" -#: ../../Zotlabs/Module/Network.php:158 +#: ../../Zotlabs/Module/Network.php:159 msgid "No such channel" msgstr "No se encuentra el canal" -#: ../../Zotlabs/Module/Network.php:173 ../../Zotlabs/Module/Channel.php:183 +#: ../../Zotlabs/Module/Network.php:174 ../../Zotlabs/Module/Channel.php:195 msgid "Search Results For:" msgstr "Buscar resultados para:" -#: ../../Zotlabs/Module/Network.php:203 ../../Zotlabs/Module/Channel.php:218 -#: ../../Zotlabs/Module/Hq.php:134 ../../Zotlabs/Module/Pubstream.php:94 +#: ../../Zotlabs/Module/Network.php:204 ../../Zotlabs/Module/Channel.php:230 +#: ../../Zotlabs/Module/Hq.php:134 ../../Zotlabs/Module/Pubstream.php:99 #: ../../Zotlabs/Module/Display.php:80 msgid "Reset form" msgstr "Reiniciar el formulario" -#: ../../Zotlabs/Module/Network.php:242 +#: ../../Zotlabs/Module/Network.php:243 msgid "Privacy group is empty" msgstr "El grupo de canales está vacío" -#: ../../Zotlabs/Module/Network.php:252 +#: ../../Zotlabs/Module/Network.php:253 msgid "Privacy group: " msgstr "Grupo de canales: " @@ -8123,55 +8225,55 @@ msgid "" msgstr "Utilice este formulario para importar entradas y contenido desde un archivo de exportación." #: ../../Zotlabs/Module/Import_items.php:127 -#: ../../Zotlabs/Module/Import.php:629 +#: ../../Zotlabs/Module/Import.php:632 msgid "File to Upload" msgstr "Fichero para subir" -#: ../../Zotlabs/Module/Import.php:157 +#: ../../Zotlabs/Module/Import.php:162 #, php-format msgid "Your service plan only allows %d channels." msgstr "Su paquete de servicios solo permite %d canales." -#: ../../Zotlabs/Module/Import.php:184 +#: ../../Zotlabs/Module/Import.php:189 msgid "No channel. Import failed." msgstr "No hay canal. La importación ha fallado" -#: ../../Zotlabs/Module/Import.php:622 +#: ../../Zotlabs/Module/Import.php:625 msgid "You must be logged in to use this feature." msgstr "Debe estar registrado para poder usar esta funcionalidad." -#: ../../Zotlabs/Module/Import.php:627 +#: ../../Zotlabs/Module/Import.php:630 msgid "Import Channel" msgstr "Importar canal" -#: ../../Zotlabs/Module/Import.php:628 +#: ../../Zotlabs/Module/Import.php:631 msgid "" "Use this form to import an existing channel from a different server/hub. You" " may retrieve the channel identity from the old server/hub via the network " "or provide an export file." msgstr "Emplee este formulario para importar un canal desde un servidor/hub diferente. Puede recuperar el canal desde el antiguo servidor/hub a través de la red o proporcionando un fichero de exportación." -#: ../../Zotlabs/Module/Import.php:630 +#: ../../Zotlabs/Module/Import.php:633 msgid "Or provide the old server/hub details" msgstr "O proporcione los detalles de su antiguo servidor/hub" -#: ../../Zotlabs/Module/Import.php:632 +#: ../../Zotlabs/Module/Import.php:635 msgid "Your old identity address (xyz@example.com)" msgstr "Su identidad en el antiguo servidor (canal@ejemplo.com)" -#: ../../Zotlabs/Module/Import.php:633 +#: ../../Zotlabs/Module/Import.php:636 msgid "Your old login email address" msgstr "Su antigua dirección de correo electrónico" -#: ../../Zotlabs/Module/Import.php:634 +#: ../../Zotlabs/Module/Import.php:637 msgid "Your old login password" msgstr "Su antigua contraseña" -#: ../../Zotlabs/Module/Import.php:635 +#: ../../Zotlabs/Module/Import.php:638 msgid "Import a few months of posts if possible (limited by available memory" msgstr "Importar unos meses de mensajes si es posible (limitado por la memoria disponible" -#: ../../Zotlabs/Module/Import.php:637 +#: ../../Zotlabs/Module/Import.php:640 msgid "" "For either option, please choose whether to make this hub your new primary " "address, or whether your old location should continue this role. You will be" @@ -8179,31 +8281,49 @@ msgid "" "primary location for files, photos, and media." msgstr "Para cualquiera de las opciones, elija si hacer de este servidor su nueva dirección primaria, o si su antigua dirección debe continuar con este papel. Usted podrá publicar desde cualquier ubicación, pero sólo una puede estar marcada como la ubicación principal para los ficheros, fotos y otras imágenes o vídeos." -#: ../../Zotlabs/Module/Import.php:639 +#: ../../Zotlabs/Module/Import.php:642 msgid "Make this hub my primary location" msgstr "Convertir este servidor en mi ubicación primaria" -#: ../../Zotlabs/Module/Import.php:640 +#: ../../Zotlabs/Module/Import.php:643 msgid "Move this channel (disable all previous locations)" msgstr "Mover este canal (desactivar todas las ubicaciones anteriores)" -#: ../../Zotlabs/Module/Import.php:641 +#: ../../Zotlabs/Module/Import.php:644 msgid "Use this channel nickname instead of the one provided" msgstr "Usa este alias de canal en lugar del que se proporciona" -#: ../../Zotlabs/Module/Import.php:641 +#: ../../Zotlabs/Module/Import.php:644 msgid "" "Leave blank to keep your existing channel nickname. You will be randomly " "assigned a similar nickname if either name is already allocated on this " "site." msgstr "Dejar en blanco para mantener su alias de canal . Se le asignará aleatoriamente uno similar si cualquiera de los dos nombres ya está asignado en este sitio." -#: ../../Zotlabs/Module/Import.php:643 +#: ../../Zotlabs/Module/Import.php:646 msgid "" "This process may take several minutes to complete. Please submit the form " "only once and leave this page open until finished." msgstr "Este proceso puede tardar varios minutos en completarse. Por favor envíe el formulario una sola vez y mantenga esta página abierta hasta que termine." +#: ../../Zotlabs/Module/Ochannel.php:32 ../../Zotlabs/Module/Channel.php:42 +#: ../../Zotlabs/Module/Chat.php:29 +msgid "You must be logged in to see this page." +msgstr "Debe haber iniciado sesión para poder ver esta página." + +#: ../../Zotlabs/Module/Z6trans.php:80 +msgid "Update to Hubzilla 5.0 setp 2" +msgstr "Actualizar a Hubzilla 5.0. Paso 2" + +#: ../../Zotlabs/Module/Z6trans.php:82 +msgid "To complete the update please run" +msgstr "Para completar la actualización, ejecutar " + +#: ../../Zotlabs/Module/Z6trans.php:88 +msgid "" +"INFO: this command can take a very long time depending on your DB size." +msgstr "INFO; este comando puede tardar en ejecutarse mucho tiempo dependiendo del tamaño de su base de datos." + #: ../../Zotlabs/Module/Register.php:52 msgid "Maximum daily site registrations exceeded. Please try again tomorrow." msgstr "Se ha superado el límite máximo de inscripciones diarias de este sitio. Por favor, pruebe de nuevo mañana." @@ -8309,7 +8429,7 @@ msgstr "Su alias se usará para crear una dirección de canal fácil de recordar #: ../../Zotlabs/Module/Register.php:264 #: ../../Zotlabs/Module/New_channel.php:178 -#: ../../Zotlabs/Module/Settings/Channel.php:535 +#: ../../Zotlabs/Module/Settings/Channel.php:536 msgid "Channel role and privacy" msgstr "Clase de canal y privacidad" @@ -8333,7 +8453,7 @@ msgid "yes" msgstr "sí" #: ../../Zotlabs/Module/Register.php:277 -#: ../../Zotlabs/Module/Admin/Site.php:290 +#: ../../Zotlabs/Module/Admin/Site.php:288 msgid "Registration" msgstr "Registro" @@ -8346,17 +8466,17 @@ msgstr "Este sitio requiere verificación por correo electrónico. Después de c #: ../../Zotlabs/Module/Search.php:17 #: ../../Zotlabs/Module/Viewconnections.php:23 #: ../../Zotlabs/Module/Ratings.php:83 ../../Zotlabs/Module/Display.php:29 -#: ../../Zotlabs/Module/Directory.php:67 ../../Zotlabs/Module/Directory.php:72 -#: ../../Zotlabs/Module/Photos.php:516 +#: ../../Zotlabs/Module/Directory.php:71 ../../Zotlabs/Module/Directory.php:76 +#: ../../Zotlabs/Module/Photos.php:518 msgid "Public access denied." msgstr "Acceso público denegado." -#: ../../Zotlabs/Module/Search.php:230 +#: ../../Zotlabs/Module/Search.php:231 #, php-format msgid "Items tagged with: %s" msgstr "elementos etiquetados con: %s" -#: ../../Zotlabs/Module/Search.php:232 +#: ../../Zotlabs/Module/Search.php:233 #, php-format msgid "Search results for: %s" msgstr "Resultados de la búsqueda para: %s" @@ -8398,9 +8518,9 @@ msgstr "Por favor, lea el fichero \"install/INSTALL.txt\"." msgid "System check" msgstr "Verificación del sistema" -#: ../../Zotlabs/Module/Setup.php:260 ../../Zotlabs/Module/Cdav.php:1059 +#: ../../Zotlabs/Module/Setup.php:260 ../../Zotlabs/Module/Cdav.php:1032 #: ../../Zotlabs/Module/Events.php:698 ../../Zotlabs/Module/Events.php:707 -#: ../../Zotlabs/Module/Cal.php:206 ../../Zotlabs/Module/Photos.php:953 +#: ../../Zotlabs/Module/Cal.php:206 ../../Zotlabs/Module/Photos.php:955 msgid "Next" msgstr "Siguiente" @@ -8812,12 +8932,12 @@ msgstr "IMPORTANTE: Debe crear [manualmente] una tarea programada para el \"poll msgid "No connections." msgstr "Sin conexiones." -#: ../../Zotlabs/Module/Viewconnections.php:83 +#: ../../Zotlabs/Module/Viewconnections.php:105 #, php-format msgid "Visit %s's profile [%s]" msgstr "Visitar el perfil de %s [%s]" -#: ../../Zotlabs/Module/Viewconnections.php:113 +#: ../../Zotlabs/Module/Viewconnections.php:135 msgid "View Connections" msgstr "Ver conexiones" @@ -8871,11 +8991,11 @@ msgstr "Publicaciones y comentarios" msgid "Only posts" msgstr "Solo publicaciones" -#: ../../Zotlabs/Module/Channel.php:166 +#: ../../Zotlabs/Module/Channel.php:178 msgid "Insufficient permissions. Request redirected to profile page." msgstr "Permisos insuficientes. Petición redirigida a la página del perfil." -#: ../../Zotlabs/Module/Channel.php:476 ../../Zotlabs/Module/Display.php:378 +#: ../../Zotlabs/Module/Channel.php:497 ../../Zotlabs/Module/Display.php:383 msgid "" "You must enable javascript for your browser to be able to view this content." msgstr "Debe habilitar javascript para poder ver este contenido en su navegador." @@ -8901,72 +9021,72 @@ msgstr "Visible para" msgid "All Connections" msgstr "Todas las conexiones" -#: ../../Zotlabs/Module/Group.php:45 +#: ../../Zotlabs/Module/Group.php:46 msgid "Privacy group created." msgstr "El grupo de canales ha sido creado." -#: ../../Zotlabs/Module/Group.php:48 +#: ../../Zotlabs/Module/Group.php:49 msgid "Could not create privacy group." msgstr "No se puede crear el grupo de canales" -#: ../../Zotlabs/Module/Group.php:80 +#: ../../Zotlabs/Module/Group.php:81 msgid "Privacy group updated." msgstr "Grupo de canales actualizado." -#: ../../Zotlabs/Module/Group.php:106 +#: ../../Zotlabs/Module/Group.php:107 msgid "Privacy Groups App" msgstr "App Grupos de canales" -#: ../../Zotlabs/Module/Group.php:107 +#: ../../Zotlabs/Module/Group.php:108 msgid "Management of privacy groups" msgstr "Gestión de grupos de canales" -#: ../../Zotlabs/Module/Group.php:142 +#: ../../Zotlabs/Module/Group.php:143 msgid "Add Group" msgstr "Agregar un grupo" -#: ../../Zotlabs/Module/Group.php:146 +#: ../../Zotlabs/Module/Group.php:147 msgid "Privacy group name" msgstr "Nombre del grupo" -#: ../../Zotlabs/Module/Group.php:147 ../../Zotlabs/Module/Group.php:256 +#: ../../Zotlabs/Module/Group.php:148 ../../Zotlabs/Module/Group.php:257 msgid "Members are visible to other channels" msgstr "Los miembros son visibles para otros canales" -#: ../../Zotlabs/Module/Group.php:155 ../../Zotlabs/Module/Help.php:81 +#: ../../Zotlabs/Module/Group.php:156 ../../Zotlabs/Module/Help.php:84 msgid "Members" msgstr "Miembros" -#: ../../Zotlabs/Module/Group.php:182 +#: ../../Zotlabs/Module/Group.php:183 msgid "Privacy group removed." msgstr "Grupo de canales eliminado." -#: ../../Zotlabs/Module/Group.php:185 +#: ../../Zotlabs/Module/Group.php:186 msgid "Unable to remove privacy group." msgstr "No se puede eliminar el grupo de canales." -#: ../../Zotlabs/Module/Group.php:251 +#: ../../Zotlabs/Module/Group.php:252 #, php-format msgid "Privacy Group: %s" msgstr "Grupo privado %s" -#: ../../Zotlabs/Module/Group.php:253 +#: ../../Zotlabs/Module/Group.php:254 msgid "Privacy group name: " msgstr "Nombre del grupo de canales:" -#: ../../Zotlabs/Module/Group.php:258 +#: ../../Zotlabs/Module/Group.php:259 msgid "Delete Group" msgstr "Eliminar grupo" -#: ../../Zotlabs/Module/Group.php:269 +#: ../../Zotlabs/Module/Group.php:270 msgid "Group members" msgstr "Miembros del grupo" -#: ../../Zotlabs/Module/Group.php:271 +#: ../../Zotlabs/Module/Group.php:272 msgid "Not in this group" msgstr "No en este grupo" -#: ../../Zotlabs/Module/Group.php:303 +#: ../../Zotlabs/Module/Group.php:304 msgid "Click a channel to toggle membership" msgstr "Haga clic en un canal para cambiar los miembros" @@ -9042,10 +9162,10 @@ msgid "Key and Secret are required" msgstr "\"Key\" y \"Secret\" son obligatorios" #: ../../Zotlabs/Module/Oauth.php:53 ../../Zotlabs/Module/Oauth.php:137 -#: ../../Zotlabs/Module/Cdav.php:1076 ../../Zotlabs/Module/Cdav.php:1389 +#: ../../Zotlabs/Module/Cdav.php:1049 ../../Zotlabs/Module/Cdav.php:1384 #: ../../Zotlabs/Module/Admin/Addons.php:457 -#: ../../Zotlabs/Module/Profiles.php:799 ../../Zotlabs/Module/Oauth2.php:58 -#: ../../Zotlabs/Module/Oauth2.php:144 ../../Zotlabs/Module/Connedit.php:939 +#: ../../Zotlabs/Module/Profiles.php:801 ../../Zotlabs/Module/Oauth2.php:58 +#: ../../Zotlabs/Module/Oauth2.php:144 ../../Zotlabs/Module/Connedit.php:940 #: ../../Zotlabs/Lib/Apps.php:536 msgid "Update" msgstr "Actualizar" @@ -9123,11 +9243,11 @@ msgstr "Enlace de la página" msgid "Edit Webpage" msgstr "Editar la página web" -#: ../../Zotlabs/Module/Dirsearch.php:25 ../../Zotlabs/Module/Regdir.php:49 +#: ../../Zotlabs/Module/Dirsearch.php:28 ../../Zotlabs/Module/Regdir.php:49 msgid "This site is not a directory server" msgstr "Este sitio no es un servidor de directorio" -#: ../../Zotlabs/Module/Dirsearch.php:33 +#: ../../Zotlabs/Module/Dirsearch.php:37 msgid "This directory server requires an access token" msgstr "El servidor de este directorio necesita un \"token\" de acceso" @@ -9139,172 +9259,176 @@ msgstr "¡Bienvenido a Hubzilla!" msgid "You have got no unseen posts..." msgstr "No tiene ningún mensaje sin leer..." -#: ../../Zotlabs/Module/Chat.php:102 +#: ../../Zotlabs/Module/Pin.php:35 ../../Zotlabs/Module/Item.php:348 +msgid "Unable to locate original post." +msgstr "No ha sido posible encontrar la entrada original." + +#: ../../Zotlabs/Module/Chat.php:100 msgid "Chatrooms App" msgstr "App Salas de chat" -#: ../../Zotlabs/Module/Chat.php:103 +#: ../../Zotlabs/Module/Chat.php:101 msgid "Access Controlled Chatrooms" msgstr "Salas de chat moderadas" -#: ../../Zotlabs/Module/Chat.php:196 +#: ../../Zotlabs/Module/Chat.php:194 msgid "Room not found" msgstr "Sala no encontrada" -#: ../../Zotlabs/Module/Chat.php:212 +#: ../../Zotlabs/Module/Chat.php:210 msgid "Leave Room" msgstr "Abandonar la sala" -#: ../../Zotlabs/Module/Chat.php:213 +#: ../../Zotlabs/Module/Chat.php:211 msgid "Delete Room" msgstr "Eliminar esta sala" -#: ../../Zotlabs/Module/Chat.php:214 +#: ../../Zotlabs/Module/Chat.php:212 msgid "I am away right now" msgstr "Estoy ausente momentáneamente" -#: ../../Zotlabs/Module/Chat.php:215 +#: ../../Zotlabs/Module/Chat.php:213 msgid "I am online" msgstr "Estoy conectado/a" -#: ../../Zotlabs/Module/Chat.php:217 +#: ../../Zotlabs/Module/Chat.php:215 msgid "Bookmark this room" msgstr "Añadir esta sala a Marcadores" -#: ../../Zotlabs/Module/Chat.php:240 +#: ../../Zotlabs/Module/Chat.php:238 msgid "New Chatroom" msgstr "Nueva sala de chat" -#: ../../Zotlabs/Module/Chat.php:241 +#: ../../Zotlabs/Module/Chat.php:239 msgid "Chatroom name" msgstr "Nombre de la sala de chat" -#: ../../Zotlabs/Module/Chat.php:242 +#: ../../Zotlabs/Module/Chat.php:240 msgid "Expiration of chats (minutes)" msgstr "Caducidad de los mensajes en los chats (en minutos)" -#: ../../Zotlabs/Module/Chat.php:258 +#: ../../Zotlabs/Module/Chat.php:256 #, php-format msgid "%1$s's Chatrooms" msgstr "Salas de chat de %1$s" -#: ../../Zotlabs/Module/Chat.php:263 +#: ../../Zotlabs/Module/Chat.php:261 msgid "No chatrooms available" msgstr "No hay salas de chat disponibles" -#: ../../Zotlabs/Module/Chat.php:264 ../../Zotlabs/Module/Manage.php:145 -#: ../../Zotlabs/Module/Profiles.php:831 ../../Zotlabs/Module/Wiki.php:214 +#: ../../Zotlabs/Module/Chat.php:262 ../../Zotlabs/Module/Manage.php:145 +#: ../../Zotlabs/Module/Profiles.php:833 ../../Zotlabs/Module/Wiki.php:214 msgid "Create New" msgstr "Crear" -#: ../../Zotlabs/Module/Chat.php:267 +#: ../../Zotlabs/Module/Chat.php:265 msgid "Expiration" msgstr "Caducidad" -#: ../../Zotlabs/Module/Chat.php:268 +#: ../../Zotlabs/Module/Chat.php:266 msgid "min" msgstr "min" -#: ../../Zotlabs/Module/Channel_calendar.php:51 +#: ../../Zotlabs/Module/Channel_calendar.php:57 #: ../../Zotlabs/Module/Events.php:113 msgid "Event can not end before it has started." msgstr "Un evento no puede terminar antes de que haya comenzado." -#: ../../Zotlabs/Module/Channel_calendar.php:53 -#: ../../Zotlabs/Module/Channel_calendar.php:61 -#: ../../Zotlabs/Module/Channel_calendar.php:78 +#: ../../Zotlabs/Module/Channel_calendar.php:59 +#: ../../Zotlabs/Module/Channel_calendar.php:67 +#: ../../Zotlabs/Module/Channel_calendar.php:84 #: ../../Zotlabs/Module/Events.php:115 ../../Zotlabs/Module/Events.php:124 #: ../../Zotlabs/Module/Events.php:146 msgid "Unable to generate preview." msgstr "No se puede crear la vista previa." -#: ../../Zotlabs/Module/Channel_calendar.php:59 +#: ../../Zotlabs/Module/Channel_calendar.php:65 #: ../../Zotlabs/Module/Events.php:122 msgid "Event title and start time are required." msgstr "Se requieren el título del evento y su hora de inicio." -#: ../../Zotlabs/Module/Channel_calendar.php:76 -#: ../../Zotlabs/Module/Channel_calendar.php:218 +#: ../../Zotlabs/Module/Channel_calendar.php:82 +#: ../../Zotlabs/Module/Channel_calendar.php:224 #: ../../Zotlabs/Module/Events.php:144 ../../Zotlabs/Module/Events.php:271 msgid "Event not found." msgstr "Evento no encontrado." -#: ../../Zotlabs/Module/Channel_calendar.php:370 +#: ../../Zotlabs/Module/Channel_calendar.php:371 #: ../../Zotlabs/Module/Events.php:641 msgid "Edit event" msgstr "Editar evento" -#: ../../Zotlabs/Module/Channel_calendar.php:372 +#: ../../Zotlabs/Module/Channel_calendar.php:373 #: ../../Zotlabs/Module/Events.php:643 msgid "Delete event" msgstr "Borrar evento" -#: ../../Zotlabs/Module/Channel_calendar.php:387 -#: ../../Zotlabs/Module/Cdav.php:966 ../../Zotlabs/Module/Cal.php:167 +#: ../../Zotlabs/Module/Channel_calendar.php:393 +#: ../../Zotlabs/Module/Cdav.php:939 ../../Zotlabs/Module/Cal.php:167 msgid "Link to source" msgstr "Enlace a la fuente" -#: ../../Zotlabs/Module/Channel_calendar.php:401 +#: ../../Zotlabs/Module/Channel_calendar.php:407 #: ../../Zotlabs/Module/Events.php:677 msgid "calendar" msgstr "calendario" -#: ../../Zotlabs/Module/Channel_calendar.php:488 +#: ../../Zotlabs/Module/Channel_calendar.php:494 #: ../../Zotlabs/Module/Events.php:742 msgid "Failed to remove event" msgstr "Error al eliminar el evento" -#: ../../Zotlabs/Module/Like.php:56 +#: ../../Zotlabs/Module/Like.php:57 msgid "Like/Dislike" msgstr "Me gusta/No me gusta" -#: ../../Zotlabs/Module/Like.php:61 +#: ../../Zotlabs/Module/Like.php:62 msgid "This action is restricted to members." msgstr "Esta acción está restringida solo para miembros." -#: ../../Zotlabs/Module/Like.php:62 +#: ../../Zotlabs/Module/Like.php:63 msgid "" "Please <a href=\"rmagic\">login with your $Projectname ID</a> or <a " "href=\"register\">register as a new $Projectname member</a> to continue." msgstr "Por favor, <a href=\"rmagic\">identifíquese con su $Projectname ID</a> o <a href=\"register\">rregístrese como un nuevo $Projectname member</a> para continuar." -#: ../../Zotlabs/Module/Like.php:111 ../../Zotlabs/Module/Like.php:137 -#: ../../Zotlabs/Module/Like.php:175 +#: ../../Zotlabs/Module/Like.php:117 ../../Zotlabs/Module/Like.php:143 +#: ../../Zotlabs/Module/Like.php:181 msgid "Invalid request." msgstr "Solicitud incorrecta." -#: ../../Zotlabs/Module/Like.php:152 +#: ../../Zotlabs/Module/Like.php:158 msgid "thing" msgstr "elemento" -#: ../../Zotlabs/Module/Like.php:198 +#: ../../Zotlabs/Module/Like.php:204 msgid "Channel unavailable." msgstr "Canal no disponible." -#: ../../Zotlabs/Module/Like.php:246 +#: ../../Zotlabs/Module/Like.php:240 msgid "Previous action reversed." msgstr "Acción anterior revocada." -#: ../../Zotlabs/Module/Like.php:451 +#: ../../Zotlabs/Module/Like.php:426 #, php-format msgid "%1$s agrees with %2$s's %3$s" msgstr "%3$s de %2$s: %1$s está de acuerdo" -#: ../../Zotlabs/Module/Like.php:453 +#: ../../Zotlabs/Module/Like.php:428 #, php-format msgid "%1$s doesn't agree with %2$s's %3$s" msgstr "%3$s de %2$s: %1$s no está de acuerdo" -#: ../../Zotlabs/Module/Like.php:455 +#: ../../Zotlabs/Module/Like.php:430 #, php-format msgid "%1$s abstains from a decision on %2$s's %3$s" msgstr "%3$s de %2$s: %1$s se abstiene" -#: ../../Zotlabs/Module/Like.php:572 +#: ../../Zotlabs/Module/Like.php:547 msgid "Action completed." msgstr "Acción completada." -#: ../../Zotlabs/Module/Like.php:573 +#: ../../Zotlabs/Module/Like.php:548 msgid "Thank you." msgstr "Gracias." @@ -9340,187 +9464,168 @@ msgstr "Elegir qué desea enviar al destinatario" msgid "Make this post private" msgstr "Convertir en privado este envío" -#: ../../Zotlabs/Module/Cdav.php:807 ../../Zotlabs/Module/Events.php:28 +#: ../../Zotlabs/Module/Cdav.php:814 ../../Zotlabs/Module/Events.php:28 msgid "Calendar entries imported." msgstr "Entradas de calendario importadas." -#: ../../Zotlabs/Module/Cdav.php:809 ../../Zotlabs/Module/Events.php:30 +#: ../../Zotlabs/Module/Cdav.php:816 ../../Zotlabs/Module/Events.php:30 msgid "No calendar entries found." msgstr "No se han encontrado entradas de calendario." -#: ../../Zotlabs/Module/Cdav.php:870 -msgid "INVALID EVENT DISMISSED!" -msgstr "¡EVENTO NO VÁLIDO RECHAZADO!" - -#: ../../Zotlabs/Module/Cdav.php:871 -msgid "Summary: " -msgstr "Resumen: " - #: ../../Zotlabs/Module/Cdav.php:872 -msgid "Date: " -msgstr "Fecha: " - -#: ../../Zotlabs/Module/Cdav.php:873 ../../Zotlabs/Module/Cdav.php:880 -msgid "Reason: " -msgstr "Razón: " - -#: ../../Zotlabs/Module/Cdav.php:878 -msgid "INVALID CARD DISMISSED!" -msgstr "¡TARJETA NO VÁLIDA RECHAZADA!" - -#: ../../Zotlabs/Module/Cdav.php:879 -msgid "Name: " -msgstr "Nombre: " - -#: ../../Zotlabs/Module/Cdav.php:899 msgid "CardDAV App" msgstr "App CarDav" -#: ../../Zotlabs/Module/Cdav.php:900 +#: ../../Zotlabs/Module/Cdav.php:873 msgid "CalDAV capable addressbook" msgstr "Libreta de direcciones compatible con CalDav" -#: ../../Zotlabs/Module/Cdav.php:1032 ../../Zotlabs/Module/Events.php:468 +#: ../../Zotlabs/Module/Cdav.php:1005 ../../Zotlabs/Module/Events.php:468 msgid "Event title" msgstr "Título del evento" -#: ../../Zotlabs/Module/Cdav.php:1033 ../../Zotlabs/Module/Events.php:474 +#: ../../Zotlabs/Module/Cdav.php:1006 ../../Zotlabs/Module/Events.php:474 msgid "Start date and time" msgstr "Fecha y hora de comienzo" -#: ../../Zotlabs/Module/Cdav.php:1034 +#: ../../Zotlabs/Module/Cdav.php:1007 msgid "End date and time" msgstr "Fecha y hora de finalización" -#: ../../Zotlabs/Module/Cdav.php:1035 ../../Zotlabs/Module/Events.php:497 +#: ../../Zotlabs/Module/Cdav.php:1008 ../../Zotlabs/Module/Events.php:497 msgid "Timezone:" msgstr "Zona horaria: " -#: ../../Zotlabs/Module/Cdav.php:1058 ../../Zotlabs/Module/Events.php:697 +#: ../../Zotlabs/Module/Cdav.php:1031 ../../Zotlabs/Module/Events.php:697 #: ../../Zotlabs/Module/Events.php:706 ../../Zotlabs/Module/Cal.php:205 -#: ../../Zotlabs/Module/Photos.php:944 +#: ../../Zotlabs/Module/Photos.php:946 msgid "Previous" msgstr "Anterior" -#: ../../Zotlabs/Module/Cdav.php:1060 ../../Zotlabs/Module/Events.php:708 +#: ../../Zotlabs/Module/Cdav.php:1033 ../../Zotlabs/Module/Events.php:708 #: ../../Zotlabs/Module/Cal.php:207 msgid "Today" msgstr "Hoy" -#: ../../Zotlabs/Module/Cdav.php:1061 ../../Zotlabs/Module/Events.php:703 +#: ../../Zotlabs/Module/Cdav.php:1034 ../../Zotlabs/Module/Events.php:703 msgid "Month" msgstr "Mes" -#: ../../Zotlabs/Module/Cdav.php:1062 ../../Zotlabs/Module/Events.php:704 +#: ../../Zotlabs/Module/Cdav.php:1035 ../../Zotlabs/Module/Events.php:704 msgid "Week" msgstr "Semana" -#: ../../Zotlabs/Module/Cdav.php:1063 ../../Zotlabs/Module/Events.php:705 +#: ../../Zotlabs/Module/Cdav.php:1036 ../../Zotlabs/Module/Events.php:705 msgid "Day" msgstr "Día" -#: ../../Zotlabs/Module/Cdav.php:1064 +#: ../../Zotlabs/Module/Cdav.php:1037 msgid "List month" msgstr "Lista mensual" -#: ../../Zotlabs/Module/Cdav.php:1065 +#: ../../Zotlabs/Module/Cdav.php:1038 msgid "List week" msgstr "Lista semanal" -#: ../../Zotlabs/Module/Cdav.php:1066 +#: ../../Zotlabs/Module/Cdav.php:1039 msgid "List day" msgstr "Lista diaria" -#: ../../Zotlabs/Module/Cdav.php:1074 +#: ../../Zotlabs/Module/Cdav.php:1047 msgid "More" msgstr "Más" -#: ../../Zotlabs/Module/Cdav.php:1075 +#: ../../Zotlabs/Module/Cdav.php:1048 msgid "Less" msgstr "Menos" -#: ../../Zotlabs/Module/Cdav.php:1077 +#: ../../Zotlabs/Module/Cdav.php:1050 msgid "Select calendar" msgstr "Seleccionar un calendario" -#: ../../Zotlabs/Module/Cdav.php:1080 +#: ../../Zotlabs/Module/Cdav.php:1053 msgid "Delete all" msgstr "Eliminar todos" -#: ../../Zotlabs/Module/Cdav.php:1083 +#: ../../Zotlabs/Module/Cdav.php:1056 msgid "Sorry! Editing of recurrent events is not yet implemented." msgstr "¡Disculpas! La edición de eventos recurrentes aún no se ha implementado." -#: ../../Zotlabs/Module/Cdav.php:1374 ../../Zotlabs/Module/Connedit.php:924 +#: ../../Zotlabs/Module/Cdav.php:1369 ../../Zotlabs/Module/Connedit.php:925 msgid "Organisation" msgstr "Organización" -#: ../../Zotlabs/Module/Cdav.php:1376 ../../Zotlabs/Module/Profiles.php:786 -#: ../../Zotlabs/Module/Connedit.php:926 +#: ../../Zotlabs/Module/Cdav.php:1371 ../../Zotlabs/Module/Profiles.php:788 +#: ../../Zotlabs/Module/Connedit.php:927 msgid "Phone" msgstr "Teléfono" -#: ../../Zotlabs/Module/Cdav.php:1378 ../../Zotlabs/Module/Profiles.php:788 -#: ../../Zotlabs/Module/Connedit.php:928 +#: ../../Zotlabs/Module/Cdav.php:1373 ../../Zotlabs/Module/Profiles.php:790 +#: ../../Zotlabs/Module/Connedit.php:929 msgid "Instant messenger" msgstr "Mensajería instantánea" -#: ../../Zotlabs/Module/Cdav.php:1379 ../../Zotlabs/Module/Profiles.php:789 -#: ../../Zotlabs/Module/Connedit.php:929 +#: ../../Zotlabs/Module/Cdav.php:1374 ../../Zotlabs/Module/Profiles.php:791 +#: ../../Zotlabs/Module/Connedit.php:930 msgid "Website" msgstr "Sitio web" -#: ../../Zotlabs/Module/Cdav.php:1380 +#: ../../Zotlabs/Module/Cdav.php:1375 #: ../../Zotlabs/Module/Admin/Channels.php:160 -#: ../../Zotlabs/Module/Profiles.php:502 ../../Zotlabs/Module/Profiles.php:790 -#: ../../Zotlabs/Module/Connedit.php:930 ../../Zotlabs/Module/Locs.php:118 +#: ../../Zotlabs/Module/Profiles.php:504 ../../Zotlabs/Module/Profiles.php:792 +#: ../../Zotlabs/Module/Connedit.php:931 ../../Zotlabs/Module/Locs.php:118 msgid "Address" msgstr "Dirección" -#: ../../Zotlabs/Module/Cdav.php:1381 ../../Zotlabs/Module/Profiles.php:791 -#: ../../Zotlabs/Module/Connedit.php:931 +#: ../../Zotlabs/Module/Cdav.php:1376 ../../Zotlabs/Module/Profiles.php:793 +#: ../../Zotlabs/Module/Connedit.php:932 msgid "Note" msgstr "Nota" -#: ../../Zotlabs/Module/Cdav.php:1387 ../../Zotlabs/Module/Profiles.php:797 +#: ../../Zotlabs/Module/Cdav.php:1381 ../../Zotlabs/Module/Profiles.php:798 #: ../../Zotlabs/Module/Connedit.php:937 +msgid "Add Contact" +msgstr "Añadir un contacto" + +#: ../../Zotlabs/Module/Cdav.php:1382 ../../Zotlabs/Module/Profiles.php:799 +#: ../../Zotlabs/Module/Connedit.php:938 msgid "Add Field" msgstr "Añadir un campo" -#: ../../Zotlabs/Module/Cdav.php:1392 ../../Zotlabs/Module/Connedit.php:942 +#: ../../Zotlabs/Module/Cdav.php:1387 ../../Zotlabs/Module/Connedit.php:943 msgid "P.O. Box" msgstr "Buzón de correos" -#: ../../Zotlabs/Module/Cdav.php:1393 ../../Zotlabs/Module/Connedit.php:943 +#: ../../Zotlabs/Module/Cdav.php:1388 ../../Zotlabs/Module/Connedit.php:944 msgid "Additional" msgstr "Adicional" -#: ../../Zotlabs/Module/Cdav.php:1394 ../../Zotlabs/Module/Connedit.php:944 +#: ../../Zotlabs/Module/Cdav.php:1389 ../../Zotlabs/Module/Connedit.php:945 msgid "Street" msgstr "Calle" -#: ../../Zotlabs/Module/Cdav.php:1395 ../../Zotlabs/Module/Connedit.php:945 +#: ../../Zotlabs/Module/Cdav.php:1390 ../../Zotlabs/Module/Connedit.php:946 msgid "Locality" msgstr "Localidad" -#: ../../Zotlabs/Module/Cdav.php:1396 ../../Zotlabs/Module/Connedit.php:946 +#: ../../Zotlabs/Module/Cdav.php:1391 ../../Zotlabs/Module/Connedit.php:947 msgid "Region" msgstr "Provincia, región o estado" -#: ../../Zotlabs/Module/Cdav.php:1397 ../../Zotlabs/Module/Connedit.php:947 +#: ../../Zotlabs/Module/Cdav.php:1392 ../../Zotlabs/Module/Connedit.php:948 msgid "ZIP Code" msgstr "Código postal" -#: ../../Zotlabs/Module/Cdav.php:1398 ../../Zotlabs/Module/Profiles.php:757 -#: ../../Zotlabs/Module/Connedit.php:948 +#: ../../Zotlabs/Module/Cdav.php:1393 ../../Zotlabs/Module/Profiles.php:759 +#: ../../Zotlabs/Module/Connedit.php:949 msgid "Country" msgstr "País" -#: ../../Zotlabs/Module/Cdav.php:1445 +#: ../../Zotlabs/Module/Cdav.php:1452 msgid "Default Calendar" msgstr "Calendario por defecto" -#: ../../Zotlabs/Module/Cdav.php:1456 +#: ../../Zotlabs/Module/Cdav.php:1463 msgid "Default Addressbook" msgstr "Agenda de direcciones por defecto" @@ -9532,36 +9637,32 @@ msgstr "La información privada remota no está disponible." msgid "Visible to:" msgstr "Visible para:" -#: ../../Zotlabs/Module/Item.php:382 -msgid "Unable to locate original post." -msgstr "No ha sido posible encontrar la entrada original." - -#: ../../Zotlabs/Module/Item.php:668 +#: ../../Zotlabs/Module/Item.php:634 msgid "Empty post discarded." msgstr "La entrada vacía ha sido desechada." -#: ../../Zotlabs/Module/Item.php:1077 +#: ../../Zotlabs/Module/Item.php:1086 msgid "Duplicate post suppressed." msgstr "Se ha suprimido la entrada duplicada." -#: ../../Zotlabs/Module/Item.php:1222 +#: ../../Zotlabs/Module/Item.php:1231 msgid "System error. Post not saved." msgstr "Error del sistema. La entrada no se ha podido salvar." -#: ../../Zotlabs/Module/Item.php:1252 +#: ../../Zotlabs/Module/Item.php:1265 msgid "Your comment is awaiting approval." msgstr "Su comentario está pendiente de aprobación." -#: ../../Zotlabs/Module/Item.php:1369 +#: ../../Zotlabs/Module/Item.php:1382 msgid "Unable to obtain post information from database." msgstr "No ha sido posible obtener información de la entrada en la base de datos." -#: ../../Zotlabs/Module/Item.php:1376 +#: ../../Zotlabs/Module/Item.php:1389 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "Ha alcanzado su límite de %1$.0f entradas en la página principal." -#: ../../Zotlabs/Module/Item.php:1383 +#: ../../Zotlabs/Module/Item.php:1396 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "Ha alcanzado su límite de %1$.0f páginas web." @@ -9592,7 +9693,7 @@ msgid "Menu Item Permissions" msgstr "Permisos del elemento del menú" #: ../../Zotlabs/Module/Mitem.php:168 ../../Zotlabs/Module/Mitem.php:247 -#: ../../Zotlabs/Module/Settings/Channel.php:526 +#: ../../Zotlabs/Module/Settings/Channel.php:527 msgid "(click to open/close)" msgstr "(pulsar para abrir o cerrar)" @@ -9696,24 +9797,24 @@ msgstr "Texto del enlace" msgid "vcard" msgstr "vcard" -#: ../../Zotlabs/Module/Sharedwithme.php:103 +#: ../../Zotlabs/Module/Sharedwithme.php:105 msgid "Files: shared with me" msgstr "Ficheros: compartidos conmigo" -#: ../../Zotlabs/Module/Sharedwithme.php:105 +#: ../../Zotlabs/Module/Sharedwithme.php:107 msgid "NEW" msgstr "NUEVO" -#: ../../Zotlabs/Module/Sharedwithme.php:107 +#: ../../Zotlabs/Module/Sharedwithme.php:109 #: ../../Zotlabs/Storage/Browser.php:294 msgid "Last Modified" msgstr "Última modificación" -#: ../../Zotlabs/Module/Sharedwithme.php:108 +#: ../../Zotlabs/Module/Sharedwithme.php:110 msgid "Remove all files" msgstr "Eliminar todos los ficheros" -#: ../../Zotlabs/Module/Sharedwithme.php:109 +#: ../../Zotlabs/Module/Sharedwithme.php:111 msgid "Remove this file" msgstr "Eliminar este fichero" @@ -9721,23 +9822,23 @@ msgstr "Eliminar este fichero" msgid "Documentation Search" msgstr "Búsqueda de Documentación" -#: ../../Zotlabs/Module/Help.php:82 +#: ../../Zotlabs/Module/Help.php:85 msgid "Administrators" msgstr "Administradores" -#: ../../Zotlabs/Module/Help.php:83 +#: ../../Zotlabs/Module/Help.php:86 msgid "Developers" msgstr "Desarrolladores" -#: ../../Zotlabs/Module/Help.php:84 +#: ../../Zotlabs/Module/Help.php:87 msgid "Tutorials" msgstr "Tutoriales" -#: ../../Zotlabs/Module/Help.php:95 +#: ../../Zotlabs/Module/Help.php:98 msgid "$Projectname Documentation" msgstr "Documentación de $Projectname" -#: ../../Zotlabs/Module/Help.php:96 +#: ../../Zotlabs/Module/Help.php:99 msgid "Contents" msgstr "Contenidos" @@ -9860,56 +9961,46 @@ msgstr "Eliminar etiqueta del elemento." msgid "Select a tag to remove: " msgstr "Seleccionar una etiqueta para eliminar:" -#: ../../Zotlabs/Module/Connect.php:73 ../../Zotlabs/Module/Connect.php:135 +#: ../../Zotlabs/Module/Connect.php:65 ../../Zotlabs/Module/Connect.php:118 msgid "Continue" msgstr "Continuar" -#: ../../Zotlabs/Module/Connect.php:104 -msgid "Premium Channel App" -msgstr "App Canal premium" - -#: ../../Zotlabs/Module/Connect.php:105 -msgid "" -"Allows you to set restrictions and terms on those that connect with your " -"channel" -msgstr "Le permite configurar restricciones y normas de uso a aquellos que conectan con su canal" - -#: ../../Zotlabs/Module/Connect.php:116 +#: ../../Zotlabs/Module/Connect.php:99 msgid "Premium Channel Setup" msgstr "Configuración del canal premium" -#: ../../Zotlabs/Module/Connect.php:118 +#: ../../Zotlabs/Module/Connect.php:101 msgid "Enable premium channel connection restrictions" msgstr "Habilitar restricciones de conexión del canal premium" -#: ../../Zotlabs/Module/Connect.php:119 +#: ../../Zotlabs/Module/Connect.php:102 msgid "" "Please enter your restrictions or conditions, such as paypal receipt, usage " "guidelines, etc." msgstr "Por favor introduzca sus restricciones o condiciones, como recibo de paypal, normas de uso, etc." -#: ../../Zotlabs/Module/Connect.php:121 ../../Zotlabs/Module/Connect.php:141 +#: ../../Zotlabs/Module/Connect.php:104 ../../Zotlabs/Module/Connect.php:124 msgid "" "This channel may require additional steps or acknowledgement of the " "following conditions prior to connecting:" msgstr "Este canal puede requerir antes de conectar unos pasos adicionales o el conocimiento de las siguientes condiciones:" -#: ../../Zotlabs/Module/Connect.php:122 +#: ../../Zotlabs/Module/Connect.php:105 msgid "" "Potential connections will then see the following text before proceeding:" msgstr "Las posibles conexiones verán, por tanto, el siguiente texto antes de proceder:" -#: ../../Zotlabs/Module/Connect.php:123 ../../Zotlabs/Module/Connect.php:144 +#: ../../Zotlabs/Module/Connect.php:106 ../../Zotlabs/Module/Connect.php:127 msgid "" "By continuing, I certify that I have complied with any instructions provided" " on this page." msgstr "Al continuar, certifico que he cumplido con todas las instrucciones proporcionadas en esta página." -#: ../../Zotlabs/Module/Connect.php:132 +#: ../../Zotlabs/Module/Connect.php:115 msgid "(No specific instructions have been provided by the channel owner.)" msgstr "(No ha sido proporcionada ninguna instrucción específica por el propietario del canal.)" -#: ../../Zotlabs/Module/Connect.php:140 +#: ../../Zotlabs/Module/Connect.php:123 msgid "Restricted or Premium Channel" msgstr "Canal premium o restringido" @@ -9925,16 +10016,16 @@ msgstr "Por favor, recargue la página" msgid "Unknown error" msgstr "Error desconocido" -#: ../../Zotlabs/Module/Share.php:103 ../../Zotlabs/Lib/Activity.php:1671 +#: ../../Zotlabs/Module/Share.php:104 ../../Zotlabs/Lib/Activity.php:2068 #, php-format msgid "🔁 Repeated %1$s's %2$s" msgstr "🔁 Repetidos %2$sde %1$s" -#: ../../Zotlabs/Module/Share.php:119 +#: ../../Zotlabs/Module/Share.php:120 msgid "Post repeated" msgstr "Entrada repetida" -#: ../../Zotlabs/Module/Acl.php:360 +#: ../../Zotlabs/Module/Acl.php:361 msgid "network" msgstr "red" @@ -9946,11 +10037,11 @@ msgstr "El elemento no es editable" msgid "Edit post" msgstr "Editar la entrada" -#: ../../Zotlabs/Module/Tagger.php:48 +#: ../../Zotlabs/Module/Tagger.php:50 msgid "Post not found." msgstr "Mensaje no encontrado." -#: ../../Zotlabs/Module/Tagger.php:119 +#: ../../Zotlabs/Module/Tagger.php:121 #, php-format msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "%1$s ha etiquetado %3$s de %2$s con %4$s" @@ -10029,9 +10120,9 @@ msgstr "Instantánea de pantalla" #: ../../Zotlabs/Module/Admin/Themes.php:122 #: ../../Zotlabs/Module/Admin/Themes.php:156 -#: ../../Zotlabs/Module/Admin/Security.php:92 +#: ../../Zotlabs/Module/Admin/Security.php:98 #: ../../Zotlabs/Module/Admin/Accounts.php:166 -#: ../../Zotlabs/Module/Admin/Site.php:287 +#: ../../Zotlabs/Module/Admin/Site.php:285 #: ../../Zotlabs/Module/Admin/Logs.php:82 #: ../../Zotlabs/Module/Admin/Channels.php:145 #: ../../Zotlabs/Module/Admin/Addons.php:342 @@ -10072,127 +10163,139 @@ msgstr "Bloquear la funcionalidad %s" msgid "Manage Additional Features" msgstr "Gestionar las funcionalidades" -#: ../../Zotlabs/Module/Admin/Security.php:83 +#: ../../Zotlabs/Module/Admin/Security.php:89 msgid "" "By default, unfiltered HTML is allowed in embedded media. This is inherently" " insecure." msgstr "De forma predeterminada, el HTML sin filtrar está permitido en el contenido multimedia incorporado en una publicación. Esto es siempre inseguro." -#: ../../Zotlabs/Module/Admin/Security.php:86 +#: ../../Zotlabs/Module/Admin/Security.php:92 msgid "" "The recommended setting is to only allow unfiltered HTML from the following " "sites:" msgstr "La configuración recomendada es que sólo se permita HTML sin filtrar desde los siguientes sitios: " -#: ../../Zotlabs/Module/Admin/Security.php:87 +#: ../../Zotlabs/Module/Admin/Security.php:93 msgid "" "https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/<br" " />https://vimeo.com/<br />https://soundcloud.com/<br />" msgstr "https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/<br />https://vimeo.com/<br />https://soundcloud.com/<br />" -#: ../../Zotlabs/Module/Admin/Security.php:88 +#: ../../Zotlabs/Module/Admin/Security.php:94 msgid "" "All other embedded content will be filtered, <strong>unless</strong> " "embedded content from that site is explicitly blocked." msgstr "El resto del contenido incrustado se filtrará, <strong>excepto</ strong> si el contenido incorporado desde ese sitio está bloqueado de forma explícita." -#: ../../Zotlabs/Module/Admin/Security.php:95 +#: ../../Zotlabs/Module/Admin/Security.php:101 msgid "Block public" msgstr "Bloquear páginas públicas" -#: ../../Zotlabs/Module/Admin/Security.php:95 +#: ../../Zotlabs/Module/Admin/Security.php:101 msgid "" "Check to block public access to all otherwise public personal pages on this " "site unless you are currently authenticated." msgstr "Habilitar para impedir ver las páginas personales de este sitio a quien no esté actualmente autenticado." -#: ../../Zotlabs/Module/Admin/Security.php:96 +#: ../../Zotlabs/Module/Admin/Security.php:102 msgid "Provide a cloud root directory" msgstr "Proporcionar un directorio raíz de la nube" -#: ../../Zotlabs/Module/Admin/Security.php:96 +#: ../../Zotlabs/Module/Admin/Security.php:102 msgid "" "The cloud root directory lists all channel names which provide public files" msgstr "El directorio raíz de la nube lista todos los nombres de canales que proporcionan archivos públicos" -#: ../../Zotlabs/Module/Admin/Security.php:97 +#: ../../Zotlabs/Module/Admin/Security.php:103 msgid "Show total disk space available to cloud uploads" msgstr "Mostrar el espacio total disponible en el disco para las cargas en la nube" -#: ../../Zotlabs/Module/Admin/Security.php:98 +#: ../../Zotlabs/Module/Admin/Security.php:104 msgid "Set \"Transport Security\" HTTP header" msgstr "Habilitar \"Seguridad de transporte\" (\"Transport Security\") en la cabecera HTTP" -#: ../../Zotlabs/Module/Admin/Security.php:99 +#: ../../Zotlabs/Module/Admin/Security.php:105 msgid "Set \"Content Security Policy\" HTTP header" msgstr "Habilitar la \"Política de seguridad del contenido\" (\"Content Security Policy\") en la cabecera HTTP" -#: ../../Zotlabs/Module/Admin/Security.php:100 +#: ../../Zotlabs/Module/Admin/Security.php:106 msgid "Allowed email domains" msgstr "Se aceptan dominios de correo electrónico" -#: ../../Zotlabs/Module/Admin/Security.php:100 +#: ../../Zotlabs/Module/Admin/Security.php:106 msgid "" "Comma separated list of domains which are allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains" msgstr "Lista separada por comas de los dominios de los que se acepta una dirección de correo electrónico para registros en este sitio. Se permiten comodines. Dejar en claro para aceptar cualquier dominio. " -#: ../../Zotlabs/Module/Admin/Security.php:101 +#: ../../Zotlabs/Module/Admin/Security.php:107 msgid "Not allowed email domains" msgstr "No se permiten dominios de correo electrónico" -#: ../../Zotlabs/Module/Admin/Security.php:101 +#: ../../Zotlabs/Module/Admin/Security.php:107 msgid "" "Comma separated list of domains which are not allowed in email addresses for" " registrations to this site. Wildcards are accepted. Empty to allow any " "domains, unless allowed domains have been defined." msgstr "Lista separada por comas de los dominios de los que no se acepta una dirección de correo electrónico para registros en este sitio. Se permiten comodines. Dejar en claro para no aceptar cualquier dominio, excepto los que se hayan autorizado." -#: ../../Zotlabs/Module/Admin/Security.php:102 +#: ../../Zotlabs/Module/Admin/Security.php:108 msgid "Allow communications only from these sites" msgstr "Permitir la comunicación solo desde estos sitios" -#: ../../Zotlabs/Module/Admin/Security.php:102 +#: ../../Zotlabs/Module/Admin/Security.php:108 msgid "" "One site per line. Leave empty to allow communication from anywhere by " "default" msgstr "Un sitio por línea. Dejar en blanco para permitir por defecto la comunicación desde cualquiera" -#: ../../Zotlabs/Module/Admin/Security.php:103 +#: ../../Zotlabs/Module/Admin/Security.php:109 msgid "Block communications from these sites" msgstr "Bloquear la comunicación desde estos sitios" -#: ../../Zotlabs/Module/Admin/Security.php:104 +#: ../../Zotlabs/Module/Admin/Security.php:110 msgid "Allow communications only from these channels" msgstr "Permitir la comunicación solo desde estos canales" -#: ../../Zotlabs/Module/Admin/Security.php:104 +#: ../../Zotlabs/Module/Admin/Security.php:110 msgid "" "One channel (hash) per line. Leave empty to allow from any channel by " "default" msgstr "Un canal (hash) por línea. Dejar en blanco para permitir por defecto la comunicación desde cualquiera" -#: ../../Zotlabs/Module/Admin/Security.php:105 +#: ../../Zotlabs/Module/Admin/Security.php:111 msgid "Block communications from these channels" msgstr "Bloquear la comunicación desde estos canales" -#: ../../Zotlabs/Module/Admin/Security.php:106 +#: ../../Zotlabs/Module/Admin/Security.php:112 msgid "Only allow embeds from secure (SSL) websites and links." msgstr "Sólo se permite contenido multimedia incorporado desde sitios y enlaces seguros (SSL)." -#: ../../Zotlabs/Module/Admin/Security.php:107 +#: ../../Zotlabs/Module/Admin/Security.php:113 msgid "Allow unfiltered embedded HTML content only from these domains" msgstr "Permitir contenido HTML sin filtrar sólo desde estos dominios " -#: ../../Zotlabs/Module/Admin/Security.php:107 +#: ../../Zotlabs/Module/Admin/Security.php:113 msgid "One site per line. By default embedded content is filtered." msgstr "Un sitio por línea. El contenido incorporado se filtra de forma predeterminada." -#: ../../Zotlabs/Module/Admin/Security.php:108 +#: ../../Zotlabs/Module/Admin/Security.php:114 msgid "Block embedded HTML from these domains" msgstr "Bloquear contenido con HTML incorporado desde estos dominios" +#: ../../Zotlabs/Module/Admin/Security.php:115 +msgid "Allow SVG thumbnails in file browser" +msgstr "Permitir miniaturas SVG en el navegador de archivos" + +#: ../../Zotlabs/Module/Admin/Security.php:115 +msgid "WARNING: SVG images may contain malicious code." +msgstr "ADVERTENCIA: Las imágenes SVG pueden contener código malicioso." + +#: ../../Zotlabs/Module/Admin/Security.php:116 +msgid "Allow embedded (inline) PDF files" +msgstr "Permitir ficheros PDF incrustados (en línea)" + #: ../../Zotlabs/Module/Admin/Accounts.php:37 #, php-format msgid "%s account blocked/unblocked" @@ -10239,12 +10342,12 @@ msgid "No registrations." msgstr "Sin registros." #: ../../Zotlabs/Module/Admin/Accounts.php:176 -#: ../../Zotlabs/Module/Connedit.php:636 +#: ../../Zotlabs/Module/Connedit.php:637 msgid "Block" msgstr "Bloquear" #: ../../Zotlabs/Module/Admin/Accounts.php:177 -#: ../../Zotlabs/Module/Connedit.php:636 +#: ../../Zotlabs/Module/Connedit.php:637 msgid "Unblock" msgstr "Desbloquear" @@ -10284,430 +10387,422 @@ msgid "" "this site will be permanently deleted!\\n\\nAre you sure?" msgstr "¡La cuenta {0} va a ser eliminada!\\n\\n¡Todo lo que esta cuenta ha publicado en este sitio será borrado de forma permanente!\\n\\n¿Está seguro de querer hacerlo?" -#: ../../Zotlabs/Module/Admin/Site.php:161 +#: ../../Zotlabs/Module/Admin/Site.php:159 msgid "Site settings updated." msgstr "Ajustes del sitio actualizados." -#: ../../Zotlabs/Module/Admin/Site.php:198 -#: ../../Zotlabs/Module/Settings/Display.php:119 +#: ../../Zotlabs/Module/Admin/Site.php:196 +#: ../../Zotlabs/Module/Settings/Display.php:120 #, php-format msgid "%s - (Incompatible)" msgstr "%s - (Incompatible)" -#: ../../Zotlabs/Module/Admin/Site.php:205 +#: ../../Zotlabs/Module/Admin/Site.php:203 msgid "mobile" msgstr "móvil" -#: ../../Zotlabs/Module/Admin/Site.php:207 +#: ../../Zotlabs/Module/Admin/Site.php:205 msgid "experimental" msgstr "experimental" -#: ../../Zotlabs/Module/Admin/Site.php:209 +#: ../../Zotlabs/Module/Admin/Site.php:207 msgid "unsupported" msgstr "no soportado" -#: ../../Zotlabs/Module/Admin/Site.php:256 +#: ../../Zotlabs/Module/Admin/Site.php:254 msgid "Yes - with approval" msgstr "Sí - con aprobación" -#: ../../Zotlabs/Module/Admin/Site.php:262 +#: ../../Zotlabs/Module/Admin/Site.php:260 msgid "My site is not a public server" msgstr "Mi sitio no es un servidor público" -#: ../../Zotlabs/Module/Admin/Site.php:263 +#: ../../Zotlabs/Module/Admin/Site.php:261 msgid "My site has paid access only" msgstr "Mi sitio es un servicio de pago" -#: ../../Zotlabs/Module/Admin/Site.php:264 +#: ../../Zotlabs/Module/Admin/Site.php:262 msgid "My site has free access only" msgstr "Mi sitio es un servicio gratuito" -#: ../../Zotlabs/Module/Admin/Site.php:265 +#: ../../Zotlabs/Module/Admin/Site.php:263 msgid "My site offers free accounts with optional paid upgrades" msgstr "Mi sitio ofrece cuentas gratuitas con opciones extra de pago" -#: ../../Zotlabs/Module/Admin/Site.php:279 +#: ../../Zotlabs/Module/Admin/Site.php:277 msgid "Default permission role for new accounts" msgstr "Permisos de rol por defecto para las nuevas cuentas" -#: ../../Zotlabs/Module/Admin/Site.php:279 +#: ../../Zotlabs/Module/Admin/Site.php:277 msgid "" "This role will be used for the first channel created after registration." msgstr "Este rol se utilizará para el primer canal creado después del registro." -#: ../../Zotlabs/Module/Admin/Site.php:291 +#: ../../Zotlabs/Module/Admin/Site.php:289 msgid "File upload" msgstr "Subir fichero" -#: ../../Zotlabs/Module/Admin/Site.php:292 +#: ../../Zotlabs/Module/Admin/Site.php:290 msgid "Policies" msgstr "Políticas" -#: ../../Zotlabs/Module/Admin/Site.php:299 +#: ../../Zotlabs/Module/Admin/Site.php:297 msgid "Banner/Logo" msgstr "Banner/Logo" -#: ../../Zotlabs/Module/Admin/Site.php:299 +#: ../../Zotlabs/Module/Admin/Site.php:297 msgid "Unfiltered HTML/CSS/JS is allowed" msgstr "Se permite HTML/CSS/JS sin filtrar" -#: ../../Zotlabs/Module/Admin/Site.php:300 +#: ../../Zotlabs/Module/Admin/Site.php:298 msgid "Administrator Information" msgstr "Información del Administrador" -#: ../../Zotlabs/Module/Admin/Site.php:300 +#: ../../Zotlabs/Module/Admin/Site.php:298 msgid "" "Contact information for site administrators. Displayed on siteinfo page. " "BBCode can be used here" msgstr "Información de contacto de los administradores del sitio. Visible en la página \"siteinfo\". Se puede usar BBCode" -#: ../../Zotlabs/Module/Admin/Site.php:301 +#: ../../Zotlabs/Module/Admin/Site.php:299 #: ../../Zotlabs/Module/Siteinfo.php:24 msgid "Site Information" msgstr "Información sobre el sitio" -#: ../../Zotlabs/Module/Admin/Site.php:301 +#: ../../Zotlabs/Module/Admin/Site.php:299 msgid "" "Publicly visible description of this site. Displayed on siteinfo page. " "BBCode can be used here" msgstr "Descripción pública de este sitio. Visible en la página \"siteinfo\". Se puede usar BBCode" -#: ../../Zotlabs/Module/Admin/Site.php:302 +#: ../../Zotlabs/Module/Admin/Site.php:300 msgid "System language" msgstr "Idioma del sistema" -#: ../../Zotlabs/Module/Admin/Site.php:303 +#: ../../Zotlabs/Module/Admin/Site.php:301 msgid "System theme" msgstr "Tema gráfico del sistema" -#: ../../Zotlabs/Module/Admin/Site.php:303 +#: ../../Zotlabs/Module/Admin/Site.php:301 msgid "" "Default system theme - may be over-ridden by user profiles - <a href='#' " "id='cnftheme'>change theme settings</a>" msgstr "Tema del sistema por defecto - se puede cambiar por cada perfil de usuario - <a href='#' id='cnftheme'>modificar los ajustes del tema</a>" -#: ../../Zotlabs/Module/Admin/Site.php:306 +#: ../../Zotlabs/Module/Admin/Site.php:304 msgid "Allow Feeds as Connections" msgstr "Permitir contenidos RSS como conexiones" -#: ../../Zotlabs/Module/Admin/Site.php:306 +#: ../../Zotlabs/Module/Admin/Site.php:304 msgid "(Heavy system resource usage)" msgstr "(Uso intenso de los recursos del sistema)" -#: ../../Zotlabs/Module/Admin/Site.php:307 +#: ../../Zotlabs/Module/Admin/Site.php:305 msgid "Maximum image size" msgstr "Tamaño máximo de la imagen" -#: ../../Zotlabs/Module/Admin/Site.php:307 +#: ../../Zotlabs/Module/Admin/Site.php:305 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "Tamaño máximo en bytes de la imagen subida. Por defecto, es 0, lo que significa que no hay límites." -#: ../../Zotlabs/Module/Admin/Site.php:308 +#: ../../Zotlabs/Module/Admin/Site.php:306 msgid "Does this site allow new member registration?" msgstr "¿Debe este sitio permitir el registro de nuevos miembros?" -#: ../../Zotlabs/Module/Admin/Site.php:309 +#: ../../Zotlabs/Module/Admin/Site.php:307 msgid "Invitation only" msgstr "Solo con una invitación" -#: ../../Zotlabs/Module/Admin/Site.php:309 +#: ../../Zotlabs/Module/Admin/Site.php:307 msgid "" "Only allow new member registrations with an invitation code. Above register " "policy must be set to Yes." msgstr "Solo se permiten inscripciones de nuevos miembros con un código de invitación. Además, deben aceptarse los términos del registro marcando \"Sí\"." -#: ../../Zotlabs/Module/Admin/Site.php:310 +#: ../../Zotlabs/Module/Admin/Site.php:308 msgid "Minimum age" msgstr "Edad mínima" -#: ../../Zotlabs/Module/Admin/Site.php:310 +#: ../../Zotlabs/Module/Admin/Site.php:308 msgid "Minimum age (in years) for who may register on this site." msgstr "Edad mínima (en años) para poder registrarse en este sitio." -#: ../../Zotlabs/Module/Admin/Site.php:311 +#: ../../Zotlabs/Module/Admin/Site.php:309 msgid "Which best describes the types of account offered by this hub?" msgstr "¿Cómo describiría el tipo de servicio ofrecido por este servidor?" -#: ../../Zotlabs/Module/Admin/Site.php:311 +#: ../../Zotlabs/Module/Admin/Site.php:309 msgid "This is displayed on the public server site list." msgstr "Esto se muestra en la lista de sitios de servidores públicos." -#: ../../Zotlabs/Module/Admin/Site.php:312 +#: ../../Zotlabs/Module/Admin/Site.php:310 msgid "Register text" msgstr "Texto del registro" -#: ../../Zotlabs/Module/Admin/Site.php:312 +#: ../../Zotlabs/Module/Admin/Site.php:310 msgid "Will be displayed prominently on the registration page." msgstr "Se mostrará de forma destacada en la página de registro." -#: ../../Zotlabs/Module/Admin/Site.php:314 +#: ../../Zotlabs/Module/Admin/Site.php:312 msgid "Site homepage to show visitors (default: login box)" msgstr "Página personal que se mostrará a los visitantes (por defecto: la página de identificación)" -#: ../../Zotlabs/Module/Admin/Site.php:314 +#: ../../Zotlabs/Module/Admin/Site.php:312 msgid "" "example: 'pubstream' to show public stream, 'page/sys/home' to show a system" " webpage called 'home' or 'include:home.html' to include a file." msgstr "ejemplo: 'pubstream' para mostrar el stream público, 'page/sys/home' para mostrar una página web del sistema llamada 'home' o 'include:home.html' para incluir un archivo." -#: ../../Zotlabs/Module/Admin/Site.php:315 +#: ../../Zotlabs/Module/Admin/Site.php:313 msgid "Preserve site homepage URL" msgstr "Preservar la dirección de la página personal" -#: ../../Zotlabs/Module/Admin/Site.php:315 +#: ../../Zotlabs/Module/Admin/Site.php:313 msgid "" "Present the site homepage in a frame at the original location instead of " "redirecting" msgstr "Presenta la página personal del sitio en un marco en la ubicación original, en vez de redirigirla." -#: ../../Zotlabs/Module/Admin/Site.php:316 +#: ../../Zotlabs/Module/Admin/Site.php:314 msgid "Accounts abandoned after x days" msgstr "Cuentas abandonadas después de x días" -#: ../../Zotlabs/Module/Admin/Site.php:316 +#: ../../Zotlabs/Module/Admin/Site.php:314 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "Para evitar consumir recursos del sistema intentando poner al día las cuentas abandonadas. Introduzca 0 para no tener límite de tiempo." -#: ../../Zotlabs/Module/Admin/Site.php:317 +#: ../../Zotlabs/Module/Admin/Site.php:315 msgid "Allowed friend domains" msgstr "Dominios amigos permitidos" -#: ../../Zotlabs/Module/Admin/Site.php:317 +#: ../../Zotlabs/Module/Admin/Site.php:315 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "Lista separada por comas de dominios a los que está permitido establecer relaciones de amistad con este sitio. Se permiten comodines. Dejar en claro para aceptar cualquier dominio." -#: ../../Zotlabs/Module/Admin/Site.php:318 +#: ../../Zotlabs/Module/Admin/Site.php:316 msgid "Verify Email Addresses" msgstr "Verificar las direcciones de correo electrónico" -#: ../../Zotlabs/Module/Admin/Site.php:318 +#: ../../Zotlabs/Module/Admin/Site.php:316 msgid "" "Check to verify email addresses used in account registration (recommended)." msgstr "Activar para la verificación de la dirección de correo electrónico en el registro de una cuenta (recomendado)." -#: ../../Zotlabs/Module/Admin/Site.php:319 +#: ../../Zotlabs/Module/Admin/Site.php:317 msgid "Force publish" msgstr "Forzar la publicación" -#: ../../Zotlabs/Module/Admin/Site.php:319 +#: ../../Zotlabs/Module/Admin/Site.php:317 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "Intentar forzar todos los perfiles para que sean listados en el directorio de este sitio." -#: ../../Zotlabs/Module/Admin/Site.php:320 +#: ../../Zotlabs/Module/Admin/Site.php:318 msgid "Import Public Streams" msgstr "Importar contenido público" -#: ../../Zotlabs/Module/Admin/Site.php:320 +#: ../../Zotlabs/Module/Admin/Site.php:318 msgid "" "Import and allow access to public content pulled from other sites. Warning: " "this content is unmoderated." msgstr "Importar y permitir acceso al contenido público sacado de otros sitios. Advertencia: este contenido no está moderado, por lo que podría encontrar cosas inapropiadas u ofensivas." -#: ../../Zotlabs/Module/Admin/Site.php:321 +#: ../../Zotlabs/Module/Admin/Site.php:319 msgid "Site only Public Streams" msgstr "Solo contenido público en este sitio" -#: ../../Zotlabs/Module/Admin/Site.php:321 +#: ../../Zotlabs/Module/Admin/Site.php:319 msgid "" "Allow access to public content originating only from this site if Imported " "Public Streams are disabled." msgstr "Permitir el acceso al contenido público originado sólo desde este sitio si los \"streams\" públicos Importados están deshabilitados." -#: ../../Zotlabs/Module/Admin/Site.php:322 +#: ../../Zotlabs/Module/Admin/Site.php:320 msgid "Allow anybody on the internet to access the Public streams" msgstr "Permitir que cualquiera en Internet pueda acceder a los \"streams\" públicos" -#: ../../Zotlabs/Module/Admin/Site.php:322 +#: ../../Zotlabs/Module/Admin/Site.php:320 msgid "" "Disable to require authentication before viewing. Warning: this content is " "unmoderated." msgstr "Desactivar para requerir autenticación antes de la visualización. Advertencia: este contenido no está moderado." -#: ../../Zotlabs/Module/Admin/Site.php:323 +#: ../../Zotlabs/Module/Admin/Site.php:321 msgid "Only import Public stream posts with this text" msgstr "Importar solo entradas del stream púlbico con este texto " -#: ../../Zotlabs/Module/Admin/Site.php:323 -#: ../../Zotlabs/Module/Admin/Site.php:324 -#: ../../Zotlabs/Module/Connedit.php:892 ../../Zotlabs/Module/Connedit.php:893 +#: ../../Zotlabs/Module/Admin/Site.php:321 +#: ../../Zotlabs/Module/Admin/Site.php:322 +#: ../../Zotlabs/Module/Connedit.php:893 ../../Zotlabs/Module/Connedit.php:894 msgid "" "words one per line or #tags or /patterns/ or lang=xx, leave blank to import " "all posts" msgstr "Una sola opción por línea: palabras, #etiquetas, /patrones/ o lang=xx. Dejar en blanco para importarlo todo" -#: ../../Zotlabs/Module/Admin/Site.php:324 +#: ../../Zotlabs/Module/Admin/Site.php:322 msgid "Do not import Public stream posts with this text" msgstr "No importar entradas del stream público con este texto " -#: ../../Zotlabs/Module/Admin/Site.php:327 +#: ../../Zotlabs/Module/Admin/Site.php:325 msgid "Login on Homepage" msgstr "Iniciar sesión en la página personal" -#: ../../Zotlabs/Module/Admin/Site.php:327 +#: ../../Zotlabs/Module/Admin/Site.php:325 msgid "" "Present a login box to visitors on the home page if no other content has " "been configured." msgstr "Presentar a los visitantes una casilla de identificación en la página de inicio, si no se ha configurado otro tipo de contenido." -#: ../../Zotlabs/Module/Admin/Site.php:328 +#: ../../Zotlabs/Module/Admin/Site.php:326 msgid "Enable context help" msgstr "Habilitar la ayuda contextual" -#: ../../Zotlabs/Module/Admin/Site.php:328 +#: ../../Zotlabs/Module/Admin/Site.php:326 msgid "" "Display contextual help for the current page when the help button is " "pressed." msgstr "Ver la ayuda contextual para la página actual cuando se pulse el botón de Ayuda." -#: ../../Zotlabs/Module/Admin/Site.php:330 +#: ../../Zotlabs/Module/Admin/Site.php:328 msgid "Reply-to email address for system generated email." msgstr "Dirección de respuesta para el correo electrónico generado por el sistema." -#: ../../Zotlabs/Module/Admin/Site.php:331 +#: ../../Zotlabs/Module/Admin/Site.php:329 msgid "Sender (From) email address for system generated email." msgstr "Dirección del remitente (From) para el correo electrónico generado por el sistema." -#: ../../Zotlabs/Module/Admin/Site.php:332 +#: ../../Zotlabs/Module/Admin/Site.php:330 msgid "Name of email sender for system generated email." msgstr "Nombre del remitente del correo electrónico generado por el sistema." -#: ../../Zotlabs/Module/Admin/Site.php:334 +#: ../../Zotlabs/Module/Admin/Site.php:332 msgid "Directory Server URL" msgstr "URL del servidor de directorio" -#: ../../Zotlabs/Module/Admin/Site.php:334 +#: ../../Zotlabs/Module/Admin/Site.php:332 msgid "Default directory server" msgstr "Servidor de directorio predeterminado" -#: ../../Zotlabs/Module/Admin/Site.php:336 +#: ../../Zotlabs/Module/Admin/Site.php:334 msgid "Proxy user" msgstr "Usuario del proxy" -#: ../../Zotlabs/Module/Admin/Site.php:337 +#: ../../Zotlabs/Module/Admin/Site.php:335 msgid "Proxy URL" msgstr "Dirección del proxy" -#: ../../Zotlabs/Module/Admin/Site.php:338 +#: ../../Zotlabs/Module/Admin/Site.php:336 msgid "Network timeout" msgstr "Tiempo de espera de la red" -#: ../../Zotlabs/Module/Admin/Site.php:338 +#: ../../Zotlabs/Module/Admin/Site.php:336 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "Valor en segundos. Poner a 0 para que no haya tiempo límite (no recomendado)" -#: ../../Zotlabs/Module/Admin/Site.php:339 +#: ../../Zotlabs/Module/Admin/Site.php:337 msgid "Delivery interval" msgstr "Intervalo de entrega" -#: ../../Zotlabs/Module/Admin/Site.php:339 +#: ../../Zotlabs/Module/Admin/Site.php:337 msgid "" "Delay background delivery processes by this many seconds to reduce system " "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " "for large dedicated servers." msgstr "Retrasar los procesos de transmisión en segundo plano por esta cantidad de segundos para reducir la carga del sistema. Recomendado: 4-5 para sitios compartidos, 2-3 para servidores virtuales privados, 0-1 para grandes servidores dedicados." -#: ../../Zotlabs/Module/Admin/Site.php:340 +#: ../../Zotlabs/Module/Admin/Site.php:338 msgid "Deliveries per process" msgstr "Intentos de envío por proceso" -#: ../../Zotlabs/Module/Admin/Site.php:340 +#: ../../Zotlabs/Module/Admin/Site.php:338 msgid "" "Number of deliveries to attempt in a single operating system process. Adjust" " if necessary to tune system performance. Recommend: 1-5." msgstr "Numero de envíos a intentar en un único proceso del sistema operativo. Ajustar si es necesario mejorar el rendimiento. Se recomienda: 1-5." -#: ../../Zotlabs/Module/Admin/Site.php:341 +#: ../../Zotlabs/Module/Admin/Site.php:339 msgid "Queue Threshold" msgstr "Umbral de la cola de espera" -#: ../../Zotlabs/Module/Admin/Site.php:341 +#: ../../Zotlabs/Module/Admin/Site.php:339 msgid "" "Always defer immediate delivery if queue contains more than this number of " "entries." msgstr "Aplazar siempre la entrega inmediata si la cola contiene más de este número de entradas." -#: ../../Zotlabs/Module/Admin/Site.php:342 +#: ../../Zotlabs/Module/Admin/Site.php:340 msgid "Poll interval" msgstr "Intervalo máximo de tiempo entre dos mensajes sucesivos" -#: ../../Zotlabs/Module/Admin/Site.php:342 +#: ../../Zotlabs/Module/Admin/Site.php:340 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "Retrasar el intervalo de envío en segundo plano, en esta cantidad de segundos, para reducir la carga del sistema. Si es 0, usar el intervalo de entrega." -#: ../../Zotlabs/Module/Admin/Site.php:343 +#: ../../Zotlabs/Module/Admin/Site.php:341 msgid "Path to ImageMagick convert program" msgstr "Ruta al programa de conversión de ImageMagick" -#: ../../Zotlabs/Module/Admin/Site.php:343 +#: ../../Zotlabs/Module/Admin/Site.php:341 msgid "" "If set, use this program to generate photo thumbnails for huge images ( > " "4000 pixels in either dimension), otherwise memory exhaustion may occur. " "Example: /usr/bin/convert" msgstr "Si está configurado, utilice este programa para generar miniaturas de fotos para imágenes de gran tamaño ( > 4000 píxeles en cualquiera de las dos dimensiones), de lo contrario se puede agotar la memoria. Ejemplo: /usr/bin/convert" -#: ../../Zotlabs/Module/Admin/Site.php:344 -msgid "Allow SVG thumbnails in file browser" -msgstr "Permitir miniaturas SVG en el navegador de archivos" - -#: ../../Zotlabs/Module/Admin/Site.php:344 -msgid "WARNING: SVG images may contain malicious code." -msgstr "ADVERTENCIA: Las imágenes SVG pueden contener código malicioso." - -#: ../../Zotlabs/Module/Admin/Site.php:345 +#: ../../Zotlabs/Module/Admin/Site.php:342 msgid "Maximum Load Average" msgstr "Carga media máxima" -#: ../../Zotlabs/Module/Admin/Site.php:345 +#: ../../Zotlabs/Module/Admin/Site.php:342 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "Carga máxima del sistema antes de que los procesos de entrega y envío se hayan retardado - por defecto, 50." -#: ../../Zotlabs/Module/Admin/Site.php:346 +#: ../../Zotlabs/Module/Admin/Site.php:343 msgid "Expiration period in days for imported (grid/network) content" msgstr "Caducidad del contenido importado de otros sitios (en días)" -#: ../../Zotlabs/Module/Admin/Site.php:346 +#: ../../Zotlabs/Module/Admin/Site.php:343 msgid "0 for no expiration of imported content" msgstr "0 para que no caduque el contenido importado" -#: ../../Zotlabs/Module/Admin/Site.php:347 +#: ../../Zotlabs/Module/Admin/Site.php:344 msgid "" "Do not expire any posts which have comments less than this many days ago" msgstr "No caduque ningún mensaje que tenga menos comentarios que este hace muchos días" -#: ../../Zotlabs/Module/Admin/Site.php:349 +#: ../../Zotlabs/Module/Admin/Site.php:346 msgid "" "Public servers: Optional landing (marketing) webpage for new registrants" msgstr "Servidores públicos: Página web de acogida (marketing) opcional para nuevos registros" -#: ../../Zotlabs/Module/Admin/Site.php:349 +#: ../../Zotlabs/Module/Admin/Site.php:346 #, php-format msgid "Create this page first. Default is %s/register" msgstr "Crear esta página primero. Por defecto es %s/register" -#: ../../Zotlabs/Module/Admin/Site.php:350 +#: ../../Zotlabs/Module/Admin/Site.php:347 msgid "Page to display after creating a new channel" msgstr "Página a mostrar después de la creación de un nuevo canal" -#: ../../Zotlabs/Module/Admin/Site.php:350 +#: ../../Zotlabs/Module/Admin/Site.php:347 msgid "Default: profiles" msgstr "Perfiles predeterminados" -#: ../../Zotlabs/Module/Admin/Site.php:352 +#: ../../Zotlabs/Module/Admin/Site.php:349 msgid "Optional: site location" msgstr "Opcional: ubicación del sitio" -#: ../../Zotlabs/Module/Admin/Site.php:352 +#: ../../Zotlabs/Module/Admin/Site.php:349 msgid "Region or country" msgstr "Región o país" @@ -10788,10 +10883,12 @@ msgid "Channel '%s' code disallowed" msgstr "Código no permitido al canal '%s'" #: ../../Zotlabs/Module/Admin/Channels.php:150 +#: ../../Zotlabs/Module/Directory.php:360 msgid "Censor" msgstr "Censurar" #: ../../Zotlabs/Module/Admin/Channels.php:151 +#: ../../Zotlabs/Module/Directory.php:360 msgid "Uncensor" msgstr "No censurar" @@ -11124,7 +11221,7 @@ msgid "" msgstr "Por defecto, solo la instancia del canal alojado en este servidor será eliminado de la red" #: ../../Zotlabs/Module/Removeme.php:64 -#: ../../Zotlabs/Module/Settings/Channel.php:594 +#: ../../Zotlabs/Module/Settings/Channel.php:595 msgid "Remove Channel" msgstr "Eliminar el canal" @@ -11238,7 +11335,7 @@ msgstr "%d nuevas solicitudes de conexión" msgid "Delegated Channel" msgstr "Canal delegado" -#: ../../Zotlabs/Module/Chanview.php:139 +#: ../../Zotlabs/Module/Chanview.php:128 msgid "toggle full screen mode" msgstr "cambiar al modo de pantalla completa" @@ -11258,33 +11355,33 @@ msgstr "Ausente" msgid "Online" msgstr "Conectado/a" -#: ../../Zotlabs/Module/Permcats.php:28 +#: ../../Zotlabs/Module/Permcats.php:29 msgid "Permission category name is required." msgstr "El nombre de la categoría de permiso es obligatorio." -#: ../../Zotlabs/Module/Permcats.php:47 +#: ../../Zotlabs/Module/Permcats.php:48 msgid "Permission category saved." msgstr "Se ha guardado la categoría del permiso." -#: ../../Zotlabs/Module/Permcats.php:62 +#: ../../Zotlabs/Module/Permcats.php:63 msgid "Permission Categories App" msgstr "App Categorías de permisos" -#: ../../Zotlabs/Module/Permcats.php:63 +#: ../../Zotlabs/Module/Permcats.php:64 msgid "Create custom connection permission limits" msgstr "Crear límites de permisos de conexión personalizados" -#: ../../Zotlabs/Module/Permcats.php:79 +#: ../../Zotlabs/Module/Permcats.php:80 msgid "" "Use this form to create permission rules for various classes of people or " "connections." msgstr "Utilice este formulario para crear reglas de permiso para varias clases de personas o conexiones." -#: ../../Zotlabs/Module/Permcats.php:112 ../../Zotlabs/Lib/Apps.php:373 +#: ../../Zotlabs/Module/Permcats.php:113 ../../Zotlabs/Lib/Apps.php:374 msgid "Permission Categories" msgstr "Tipos de permisos" -#: ../../Zotlabs/Module/Permcats.php:120 +#: ../../Zotlabs/Module/Permcats.php:121 msgid "Permission category name" msgstr "Nombre de categoría de permiso" @@ -11351,11 +11448,11 @@ msgstr "No se puede encontrar su servidor." msgid "Post successful." msgstr "Enviado con éxito." -#: ../../Zotlabs/Module/Moderate.php:65 +#: ../../Zotlabs/Module/Moderate.php:67 msgid "Comment approved" msgstr "El comentario ha sido aprobado" -#: ../../Zotlabs/Module/Moderate.php:69 +#: ../../Zotlabs/Module/Moderate.php:71 msgid "Comment deleted" msgstr "Se ha eliminado el comentario" @@ -11466,11 +11563,11 @@ msgid "" " please import or restore these in date order (oldest first)." msgstr "Estos ficheros pueden ser importados o restaurados visitando <a href=\"%1$s\">%2$s</a> o cualquier sitio que contenga su canal. Para obtener los mejores resultados, por favor, importar o restaurar estos ficheros en orden de fecha (la más antigua primero)." -#: ../../Zotlabs/Module/Display.php:396 +#: ../../Zotlabs/Module/Display.php:401 msgid "Article" msgstr "Artículo" -#: ../../Zotlabs/Module/Display.php:448 +#: ../../Zotlabs/Module/Display.php:453 msgid "Item has been removed." msgstr "Se ha eliminado el elemento." @@ -11548,42 +11645,51 @@ msgstr "Validar" msgid "Hub not found." msgstr "Servidor no encontrado" -#: ../../Zotlabs/Module/Ping.php:337 +#: ../../Zotlabs/Module/Ping.php:337 ../../Zotlabs/Lib/Enotify.php:948 msgid "sent you a private message" msgstr "le ha enviado un mensaje privado" -#: ../../Zotlabs/Module/Ping.php:393 +#: ../../Zotlabs/Module/Ping.php:393 ../../Zotlabs/Lib/Enotify.php:914 msgid "added your channel" msgstr "añadió este canal a sus conexiones" -#: ../../Zotlabs/Module/Ping.php:418 +#: ../../Zotlabs/Module/Ping.php:418 ../../Zotlabs/Lib/Enotify.php:986 msgid "requires approval" msgstr "requiere aprobación" -#: ../../Zotlabs/Module/Ping.php:428 +#: ../../Zotlabs/Module/Ping.php:428 ../../Zotlabs/Lib/Enotify.php:957 msgid "g A l F d" msgstr "g A l d F" -#: ../../Zotlabs/Module/Ping.php:446 +#: ../../Zotlabs/Module/Ping.php:446 ../../Zotlabs/Lib/Enotify.php:960 msgid "[today]" msgstr "[hoy]" -#: ../../Zotlabs/Module/Ping.php:456 +#: ../../Zotlabs/Module/Ping.php:456 ../../Zotlabs/Lib/Enotify.php:970 msgid "posted an event" msgstr "publicó un evento" -#: ../../Zotlabs/Module/Ping.php:490 +#: ../../Zotlabs/Module/Ping.php:490 ../../Zotlabs/Lib/Enotify.php:829 +#: ../../Zotlabs/Lib/Enotify.php:931 msgid "shared a file with you" msgstr "compartió un archivo con usted" -#: ../../Zotlabs/Module/Ping.php:672 +#: ../../Zotlabs/Module/Ping.php:672 ../../Zotlabs/Module/Sse_bs.php:510 msgid "Private forum" msgstr "Foro privado" -#: ../../Zotlabs/Module/Ping.php:672 +#: ../../Zotlabs/Module/Ping.php:672 ../../Zotlabs/Module/Sse_bs.php:510 msgid "Public forum" msgstr "Foro público" +#: ../../Zotlabs/Module/Dircensor.php:42 +msgid "Entry censored" +msgstr "Entrada censurada" + +#: ../../Zotlabs/Module/Dircensor.php:45 +msgid "Entry uncensored" +msgstr "Entrada sin censurar" + #: ../../Zotlabs/Module/Service_limits.php:23 msgid "No service class restrictions found." msgstr "No se han encontrado restricciones sobre esta clase de servicio." @@ -11596,7 +11702,7 @@ msgstr "App Estados de ánimo" msgid "Set your current mood and tell your friends" msgstr "Describir su estado de ánimo para comunicárselo a sus amigos" -#: ../../Zotlabs/Module/Mood.php:154 ../../Zotlabs/Lib/Apps.php:349 +#: ../../Zotlabs/Module/Mood.php:154 ../../Zotlabs/Lib/Apps.php:350 msgid "Mood" msgstr "Estado de ánimo" @@ -11758,90 +11864,90 @@ msgstr "Crear fichas de planificación personal" msgid "Add Card" msgstr "Añadir una ficha" -#: ../../Zotlabs/Module/Directory.php:116 +#: ../../Zotlabs/Module/Directory.php:120 msgid "No default suggestions were found." msgstr "No se encontraron sugerencias por defecto." -#: ../../Zotlabs/Module/Directory.php:270 +#: ../../Zotlabs/Module/Directory.php:280 #, php-format msgid "%d rating" msgid_plural "%d ratings" msgstr[0] "%d valoración" msgstr[1] "%d valoraciones" -#: ../../Zotlabs/Module/Directory.php:281 +#: ../../Zotlabs/Module/Directory.php:291 msgid "Gender: " msgstr "Género:" -#: ../../Zotlabs/Module/Directory.php:283 +#: ../../Zotlabs/Module/Directory.php:293 msgid "Status: " msgstr "Estado:" -#: ../../Zotlabs/Module/Directory.php:285 +#: ../../Zotlabs/Module/Directory.php:295 msgid "Homepage: " msgstr "Página personal:" -#: ../../Zotlabs/Module/Directory.php:345 +#: ../../Zotlabs/Module/Directory.php:358 msgid "Description:" msgstr "Descripción:" -#: ../../Zotlabs/Module/Directory.php:354 +#: ../../Zotlabs/Module/Directory.php:369 msgid "Public Forum:" msgstr "Foro público:" -#: ../../Zotlabs/Module/Directory.php:357 +#: ../../Zotlabs/Module/Directory.php:372 msgid "Keywords: " msgstr "Palabras clave:" -#: ../../Zotlabs/Module/Directory.php:360 +#: ../../Zotlabs/Module/Directory.php:375 msgid "Don't suggest" msgstr "No sugerir:" -#: ../../Zotlabs/Module/Directory.php:362 +#: ../../Zotlabs/Module/Directory.php:377 msgid "Common connections (estimated):" msgstr "Conexiones comunes (estimadas): " -#: ../../Zotlabs/Module/Directory.php:411 +#: ../../Zotlabs/Module/Directory.php:426 msgid "Global Directory" msgstr "Directorio global:" -#: ../../Zotlabs/Module/Directory.php:411 +#: ../../Zotlabs/Module/Directory.php:426 msgid "Local Directory" msgstr "Directorio local:" -#: ../../Zotlabs/Module/Directory.php:417 +#: ../../Zotlabs/Module/Directory.php:432 msgid "Finding:" msgstr "Encontrar:" -#: ../../Zotlabs/Module/Directory.php:422 +#: ../../Zotlabs/Module/Directory.php:437 msgid "next page" msgstr "siguiente página" -#: ../../Zotlabs/Module/Directory.php:422 +#: ../../Zotlabs/Module/Directory.php:437 msgid "previous page" msgstr "página anterior" -#: ../../Zotlabs/Module/Directory.php:423 +#: ../../Zotlabs/Module/Directory.php:438 msgid "Sort options" msgstr "Ordenar opciones" -#: ../../Zotlabs/Module/Directory.php:424 +#: ../../Zotlabs/Module/Directory.php:439 msgid "Alphabetic" msgstr "Alfabético" -#: ../../Zotlabs/Module/Directory.php:425 +#: ../../Zotlabs/Module/Directory.php:440 msgid "Reverse Alphabetic" msgstr "Alfabético inverso" -#: ../../Zotlabs/Module/Directory.php:426 +#: ../../Zotlabs/Module/Directory.php:441 msgid "Newest to Oldest" msgstr "De más nuevo a más antiguo" -#: ../../Zotlabs/Module/Directory.php:427 +#: ../../Zotlabs/Module/Directory.php:442 msgid "Oldest to Newest" msgstr "De más antiguo a más nuevo" -#: ../../Zotlabs/Module/Directory.php:444 +#: ../../Zotlabs/Module/Directory.php:459 msgid "No entries (some entries may be hidden)." msgstr "Sin entradas (algunas entradas pueden estar ocultas)." @@ -11900,96 +12006,108 @@ msgstr "Token de validación" msgid "Item not available." msgstr "Elemento no disponible" -#: ../../Zotlabs/Module/Profile_photo.php:91 -#: ../../Zotlabs/Module/Cover_photo.php:83 +#: ../../Zotlabs/Module/Vote.php:40 +msgid "Poll not found." +msgstr "Encuesta no encontrada." + +#: ../../Zotlabs/Module/Vote.php:71 +msgid "Invalid response." +msgstr "respuesta no válida." + +#: ../../Zotlabs/Module/Vote.php:132 +msgid "Response submitted. Updates may not appear instantly." +msgstr "Respuesta enviada. Las actualizaciones pueden no aparecer al instante." + +#: ../../Zotlabs/Module/Profile_photo.php:93 +#: ../../Zotlabs/Module/Cover_photo.php:85 msgid "Image uploaded but image cropping failed." msgstr "Imagen actualizada, pero el recorte de la imagen ha fallado. " -#: ../../Zotlabs/Module/Profile_photo.php:164 -#: ../../Zotlabs/Module/Cover_photo.php:210 +#: ../../Zotlabs/Module/Profile_photo.php:166 +#: ../../Zotlabs/Module/Cover_photo.php:212 msgid "Image resize failed." msgstr "El ajuste del tamaño de la imagen ha fallado." -#: ../../Zotlabs/Module/Profile_photo.php:294 -#: ../../Zotlabs/Module/Cover_photo.php:263 +#: ../../Zotlabs/Module/Profile_photo.php:296 +#: ../../Zotlabs/Module/Cover_photo.php:265 msgid "Image upload failed." msgstr "La carga de la imagen ha fallado." -#: ../../Zotlabs/Module/Profile_photo.php:313 -#: ../../Zotlabs/Module/Cover_photo.php:280 +#: ../../Zotlabs/Module/Profile_photo.php:315 +#: ../../Zotlabs/Module/Cover_photo.php:282 msgid "Unable to process image." msgstr "No ha sido posible procesar la imagen." -#: ../../Zotlabs/Module/Profile_photo.php:377 -#: ../../Zotlabs/Module/Profile_photo.php:429 -#: ../../Zotlabs/Module/Cover_photo.php:373 -#: ../../Zotlabs/Module/Cover_photo.php:388 +#: ../../Zotlabs/Module/Profile_photo.php:379 +#: ../../Zotlabs/Module/Profile_photo.php:431 +#: ../../Zotlabs/Module/Cover_photo.php:367 +#: ../../Zotlabs/Module/Cover_photo.php:382 msgid "Photo not available." msgstr "Foto no disponible." -#: ../../Zotlabs/Module/Profile_photo.php:493 +#: ../../Zotlabs/Module/Profile_photo.php:495 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 "Su foto de perfil predeterminada es visible para cualquiera en Internet. Las fotos de perfil para perfiles alternativos heredarán los permisos del predeterminado." -#: ../../Zotlabs/Module/Profile_photo.php:493 +#: ../../Zotlabs/Module/Profile_photo.php:495 msgid "" "Your profile photo is visible to anybody on the internet and may be " "distributed to other websites." msgstr "La foto de su perfil es visible para cualquiera en Internet y puede ser distribuida en otros sitios web." -#: ../../Zotlabs/Module/Profile_photo.php:495 -#: ../../Zotlabs/Module/Cover_photo.php:426 +#: ../../Zotlabs/Module/Profile_photo.php:497 +#: ../../Zotlabs/Module/Cover_photo.php:420 msgid "Upload File:" msgstr "Subir fichero:" -#: ../../Zotlabs/Module/Profile_photo.php:496 -#: ../../Zotlabs/Module/Cover_photo.php:427 +#: ../../Zotlabs/Module/Profile_photo.php:498 +#: ../../Zotlabs/Module/Cover_photo.php:421 msgid "Select a profile:" msgstr "Seleccionar un perfil:" -#: ../../Zotlabs/Module/Profile_photo.php:497 +#: ../../Zotlabs/Module/Profile_photo.php:499 msgid "Use Photo for Profile" msgstr "Usar la fotografía para el perfil" -#: ../../Zotlabs/Module/Profile_photo.php:497 +#: ../../Zotlabs/Module/Profile_photo.php:499 msgid "Change Profile Photo" msgstr "Cambiar la foto del perfil" -#: ../../Zotlabs/Module/Profile_photo.php:498 +#: ../../Zotlabs/Module/Profile_photo.php:500 msgid "Use" msgstr "Usar" -#: ../../Zotlabs/Module/Profile_photo.php:503 -#: ../../Zotlabs/Module/Profile_photo.php:504 -#: ../../Zotlabs/Module/Cover_photo.php:432 -#: ../../Zotlabs/Module/Cover_photo.php:433 +#: ../../Zotlabs/Module/Profile_photo.php:505 +#: ../../Zotlabs/Module/Profile_photo.php:506 +#: ../../Zotlabs/Module/Cover_photo.php:426 +#: ../../Zotlabs/Module/Cover_photo.php:427 msgid "Use a photo from your albums" msgstr "Usar una foto de sus álbumes" -#: ../../Zotlabs/Module/Profile_photo.php:509 -#: ../../Zotlabs/Module/Cover_photo.php:438 ../../Zotlabs/Module/Wiki.php:405 +#: ../../Zotlabs/Module/Profile_photo.php:511 +#: ../../Zotlabs/Module/Cover_photo.php:432 ../../Zotlabs/Module/Wiki.php:405 msgid "Choose a different album" msgstr "Elegir un álbum diferente..." -#: ../../Zotlabs/Module/Profile_photo.php:514 -#: ../../Zotlabs/Module/Cover_photo.php:444 +#: ../../Zotlabs/Module/Profile_photo.php:516 +#: ../../Zotlabs/Module/Cover_photo.php:438 msgid "Select existing photo" msgstr "Seleccionar una foto" -#: ../../Zotlabs/Module/Profile_photo.php:533 -#: ../../Zotlabs/Module/Cover_photo.php:461 +#: ../../Zotlabs/Module/Profile_photo.php:535 +#: ../../Zotlabs/Module/Cover_photo.php:455 msgid "Crop Image" msgstr "Recortar imagen" -#: ../../Zotlabs/Module/Profile_photo.php:534 -#: ../../Zotlabs/Module/Cover_photo.php:462 +#: ../../Zotlabs/Module/Profile_photo.php:536 +#: ../../Zotlabs/Module/Cover_photo.php:456 msgid "Please adjust the image cropping for optimum viewing." msgstr "Por favor ajuste el recorte de la imagen para una visión óptima." -#: ../../Zotlabs/Module/Profile_photo.php:536 -#: ../../Zotlabs/Module/Cover_photo.php:464 +#: ../../Zotlabs/Module/Profile_photo.php:538 +#: ../../Zotlabs/Module/Cover_photo.php:458 msgid "Done Editing" msgstr "Edición completada" @@ -12005,7 +12123,7 @@ msgstr "Escriba un nombre de carpeta" msgid "or select an existing folder (doubleclick)" msgstr "o seleccione una (con un doble click)" -#: ../../Zotlabs/Module/Filer.php:54 ../../Zotlabs/Lib/ThreadItem.php:182 +#: ../../Zotlabs/Module/Filer.php:54 ../../Zotlabs/Lib/ThreadItem.php:184 msgid "Save to Folder" msgstr "Guardar en carpeta" @@ -12102,218 +12220,218 @@ msgstr "Archivadas" msgid "Not connected at this location" msgstr "No está conectado/a en esta ubicación" -#: ../../Zotlabs/Module/Connections.php:296 +#: ../../Zotlabs/Module/Connections.php:318 #, php-format msgid "%1$s [%2$s]" msgstr "%1$s [%2$s]" -#: ../../Zotlabs/Module/Connections.php:297 +#: ../../Zotlabs/Module/Connections.php:319 msgid "Edit connection" msgstr "Editar conexión" -#: ../../Zotlabs/Module/Connections.php:299 +#: ../../Zotlabs/Module/Connections.php:321 msgid "Delete connection" msgstr "Eliminar conexión" -#: ../../Zotlabs/Module/Connections.php:308 +#: ../../Zotlabs/Module/Connections.php:330 msgid "Channel address" msgstr "Dirección del canal" -#: ../../Zotlabs/Module/Connections.php:313 +#: ../../Zotlabs/Module/Connections.php:335 msgid "Call" msgstr "Llamar" -#: ../../Zotlabs/Module/Connections.php:315 +#: ../../Zotlabs/Module/Connections.php:337 msgid "Status" msgstr "Estado" -#: ../../Zotlabs/Module/Connections.php:317 +#: ../../Zotlabs/Module/Connections.php:339 msgid "Connected" msgstr "Conectado/a" -#: ../../Zotlabs/Module/Connections.php:319 +#: ../../Zotlabs/Module/Connections.php:341 msgid "Approve connection" msgstr "Aprobar esta conexión" -#: ../../Zotlabs/Module/Connections.php:321 +#: ../../Zotlabs/Module/Connections.php:343 msgid "Ignore connection" msgstr "Ignorar esta conexión" -#: ../../Zotlabs/Module/Connections.php:322 -#: ../../Zotlabs/Module/Connedit.php:644 +#: ../../Zotlabs/Module/Connections.php:344 +#: ../../Zotlabs/Module/Connedit.php:645 msgid "Ignore" msgstr "Ignorar" -#: ../../Zotlabs/Module/Connections.php:323 +#: ../../Zotlabs/Module/Connections.php:345 msgid "Recent activity" msgstr "Actividad reciente" -#: ../../Zotlabs/Module/Connections.php:328 +#: ../../Zotlabs/Module/Connections.php:351 msgid "Connect at this location" msgstr "Conectar en esta ubicación " -#: ../../Zotlabs/Module/Connections.php:356 +#: ../../Zotlabs/Module/Connections.php:379 msgid "Search your connections" msgstr "Buscar sus conexiones" -#: ../../Zotlabs/Module/Connections.php:357 +#: ../../Zotlabs/Module/Connections.php:380 msgid "Connections search" msgstr "Buscar conexiones" -#: ../../Zotlabs/Module/Cover_photo.php:194 -#: ../../Zotlabs/Module/Cover_photo.php:252 +#: ../../Zotlabs/Module/Cover_photo.php:196 +#: ../../Zotlabs/Module/Cover_photo.php:254 msgid "Cover Photos" msgstr "Imágenes de portada del perfil" -#: ../../Zotlabs/Module/Cover_photo.php:424 +#: ../../Zotlabs/Module/Cover_photo.php:418 msgid "Your cover photo may be visible to anybody on the internet" msgstr "La foto de la portada puede ser visible para cualquiera en Internet" -#: ../../Zotlabs/Module/Cover_photo.php:428 +#: ../../Zotlabs/Module/Cover_photo.php:422 msgid "Change Cover Photo" msgstr "Cambiar la foto de portada del perfil" -#: ../../Zotlabs/Module/Photos.php:78 +#: ../../Zotlabs/Module/Photos.php:80 msgid "Page owner information could not be retrieved." msgstr "La información del propietario de la página no pudo ser recuperada." -#: ../../Zotlabs/Module/Photos.php:94 ../../Zotlabs/Module/Photos.php:113 +#: ../../Zotlabs/Module/Photos.php:96 ../../Zotlabs/Module/Photos.php:115 msgid "Album not found." msgstr "Álbum no encontrado." -#: ../../Zotlabs/Module/Photos.php:103 +#: ../../Zotlabs/Module/Photos.php:105 msgid "Delete Album" msgstr "Borrar álbum" -#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1056 +#: ../../Zotlabs/Module/Photos.php:176 ../../Zotlabs/Module/Photos.php:1058 msgid "Delete Photo" msgstr "Borrar foto" -#: ../../Zotlabs/Module/Photos.php:527 +#: ../../Zotlabs/Module/Photos.php:529 msgid "No photos selected" msgstr "No hay fotos seleccionadas" -#: ../../Zotlabs/Module/Photos.php:576 +#: ../../Zotlabs/Module/Photos.php:578 msgid "Access to this item is restricted." msgstr "El acceso a este elemento está restringido." -#: ../../Zotlabs/Module/Photos.php:619 +#: ../../Zotlabs/Module/Photos.php:621 #, php-format msgid "%1$.2f MB of %2$.2f MB photo storage used." msgstr "%1$.2f MB de %2$.2f MB de almacenamiento de fotos utilizado." -#: ../../Zotlabs/Module/Photos.php:622 +#: ../../Zotlabs/Module/Photos.php:624 #, php-format msgid "%1$.2f MB photo storage used." msgstr "%1$.2f MB de almacenamiento de fotos utilizado." -#: ../../Zotlabs/Module/Photos.php:664 +#: ../../Zotlabs/Module/Photos.php:666 msgid "Upload Photos" msgstr "Subir fotos" -#: ../../Zotlabs/Module/Photos.php:668 +#: ../../Zotlabs/Module/Photos.php:670 msgid "Enter an album name" msgstr "Introducir un nombre de álbum" -#: ../../Zotlabs/Module/Photos.php:669 +#: ../../Zotlabs/Module/Photos.php:671 msgid "or select an existing album (doubleclick)" msgstr "o seleccionar un álbum (con un doble click)" -#: ../../Zotlabs/Module/Photos.php:670 +#: ../../Zotlabs/Module/Photos.php:672 msgid "Create a status post for this upload" msgstr "Crear un mensaje de estado para esta subida" -#: ../../Zotlabs/Module/Photos.php:672 +#: ../../Zotlabs/Module/Photos.php:674 msgid "Description (optional)" msgstr "Descripción (opcional)" -#: ../../Zotlabs/Module/Photos.php:758 +#: ../../Zotlabs/Module/Photos.php:760 msgid "Show Newest First" msgstr "Mostrar lo más reciente primero" -#: ../../Zotlabs/Module/Photos.php:760 +#: ../../Zotlabs/Module/Photos.php:762 msgid "Show Oldest First" msgstr "Mostrar lo más antiguo primero" -#: ../../Zotlabs/Module/Photos.php:817 ../../Zotlabs/Module/Photos.php:1363 +#: ../../Zotlabs/Module/Photos.php:819 ../../Zotlabs/Module/Photos.php:1363 msgid "Add Photos" msgstr "Añadir fotos" -#: ../../Zotlabs/Module/Photos.php:865 +#: ../../Zotlabs/Module/Photos.php:867 msgid "Permission denied. Access to this item may be restricted." msgstr "Permiso denegado. El acceso a este elemento puede estar restringido." -#: ../../Zotlabs/Module/Photos.php:867 +#: ../../Zotlabs/Module/Photos.php:869 msgid "Photo not available" msgstr "Foto no disponible" -#: ../../Zotlabs/Module/Photos.php:925 +#: ../../Zotlabs/Module/Photos.php:927 msgid "Use as profile photo" msgstr "Usar como foto del perfil" -#: ../../Zotlabs/Module/Photos.php:926 +#: ../../Zotlabs/Module/Photos.php:928 msgid "Use as cover photo" msgstr "Usar como imagen de portada del perfil" -#: ../../Zotlabs/Module/Photos.php:933 +#: ../../Zotlabs/Module/Photos.php:935 msgid "Private Photo" msgstr "Foto privada" -#: ../../Zotlabs/Module/Photos.php:948 +#: ../../Zotlabs/Module/Photos.php:950 msgid "View Full Size" msgstr "Ver tamaño completo" -#: ../../Zotlabs/Module/Photos.php:1030 +#: ../../Zotlabs/Module/Photos.php:1032 msgid "Edit photo" msgstr "Editar foto" -#: ../../Zotlabs/Module/Photos.php:1032 +#: ../../Zotlabs/Module/Photos.php:1034 msgid "Rotate CW (right)" msgstr "Girar CW (a la derecha)" -#: ../../Zotlabs/Module/Photos.php:1033 +#: ../../Zotlabs/Module/Photos.php:1035 msgid "Rotate CCW (left)" msgstr "Girar CCW (a la izquierda)" -#: ../../Zotlabs/Module/Photos.php:1036 +#: ../../Zotlabs/Module/Photos.php:1038 msgid "Move photo to album" msgstr "Mover la foto a un álbum" -#: ../../Zotlabs/Module/Photos.php:1037 +#: ../../Zotlabs/Module/Photos.php:1039 msgid "Enter a new album name" msgstr "Introducir un nuevo nombre de álbum" -#: ../../Zotlabs/Module/Photos.php:1038 +#: ../../Zotlabs/Module/Photos.php:1040 msgid "or select an existing one (doubleclick)" msgstr "o seleccionar un álbum (con un doble click)" -#: ../../Zotlabs/Module/Photos.php:1043 +#: ../../Zotlabs/Module/Photos.php:1045 msgid "Add a Tag" msgstr "Añadir una etiqueta" -#: ../../Zotlabs/Module/Photos.php:1051 +#: ../../Zotlabs/Module/Photos.php:1053 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com" msgstr "Ejemplos: @eva, @Carmen_Osuna, @jaime@ejemplo.com" -#: ../../Zotlabs/Module/Photos.php:1054 +#: ../../Zotlabs/Module/Photos.php:1056 msgid "Flag as adult in album view" msgstr "Marcar como \"solo para adultos\" en el álbum" -#: ../../Zotlabs/Module/Photos.php:1073 ../../Zotlabs/Lib/ThreadItem.php:307 +#: ../../Zotlabs/Module/Photos.php:1075 ../../Zotlabs/Lib/ThreadItem.php:317 msgid "I like this (toggle)" msgstr "Me gusta (cambiar)" -#: ../../Zotlabs/Module/Photos.php:1074 ../../Zotlabs/Lib/ThreadItem.php:308 +#: ../../Zotlabs/Module/Photos.php:1076 ../../Zotlabs/Lib/ThreadItem.php:318 msgid "I don't like this (toggle)" msgstr "No me gusta esto (cambiar)" -#: ../../Zotlabs/Module/Photos.php:1093 ../../Zotlabs/Module/Photos.php:1212 -#: ../../Zotlabs/Lib/ThreadItem.php:793 +#: ../../Zotlabs/Module/Photos.php:1094 ../../Zotlabs/Module/Photos.php:1212 +#: ../../Zotlabs/Lib/ThreadItem.php:822 msgid "This is you" msgstr "Este es usted" #: ../../Zotlabs/Module/Photos.php:1131 ../../Zotlabs/Module/Photos.php:1143 -#: ../../Zotlabs/Lib/ThreadItem.php:232 ../../Zotlabs/Lib/ThreadItem.php:244 +#: ../../Zotlabs/Lib/ThreadItem.php:238 ../../Zotlabs/Lib/ThreadItem.php:250 msgid "View all" msgstr "Ver todo" @@ -12329,12 +12447,12 @@ msgstr "En esta foto:" msgid "Map" msgstr "Mapa" -#: ../../Zotlabs/Module/Photos.php:1268 ../../Zotlabs/Lib/ThreadItem.php:457 +#: ../../Zotlabs/Module/Photos.php:1268 ../../Zotlabs/Lib/ThreadItem.php:489 msgctxt "noun" msgid "Likes" msgstr "Me gusta" -#: ../../Zotlabs/Module/Photos.php:1269 ../../Zotlabs/Lib/ThreadItem.php:458 +#: ../../Zotlabs/Module/Photos.php:1269 ../../Zotlabs/Lib/ThreadItem.php:490 msgctxt "noun" msgid "Dislikes" msgstr "No me gusta" @@ -12363,7 +12481,7 @@ msgid "" "Password reset failed." msgstr "La solicitud no ha podido ser verificada. (Puede que la haya enviado con anterioridad) El restablecimiento de la contraseña ha fallado." -#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1683 +#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1707 msgid "Password Reset" msgstr "Restablecer la contraseña" @@ -12408,11 +12526,11 @@ msgstr "Introduzca y envíe su dirección de correo electrónico para el restabl msgid "Email Address" msgstr "Dirección de correo electrónico" -#: ../../Zotlabs/Module/Lostpass.php:133 ../../Zotlabs/Module/Pdledit.php:77 +#: ../../Zotlabs/Module/Lostpass.php:133 ../../Zotlabs/Module/Pdledit.php:78 msgid "Reset" msgstr "Reiniciar" -#: ../../Zotlabs/Module/Follow.php:36 +#: ../../Zotlabs/Module/Follow.php:93 msgid "Connection added." msgstr "Se ha incorporado una conexión." @@ -12430,248 +12548,248 @@ msgid "" "non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." msgstr "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." -#: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:184 -#: ../../Zotlabs/Module/Profiles.php:241 ../../Zotlabs/Module/Profiles.php:659 +#: ../../Zotlabs/Module/Profiles.php:26 ../../Zotlabs/Module/Profiles.php:186 +#: ../../Zotlabs/Module/Profiles.php:243 ../../Zotlabs/Module/Profiles.php:661 msgid "Profile not found." msgstr "Perfil no encontrado." -#: ../../Zotlabs/Module/Profiles.php:44 +#: ../../Zotlabs/Module/Profiles.php:46 msgid "Profile deleted." msgstr "Perfil eliminado." -#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:105 +#: ../../Zotlabs/Module/Profiles.php:70 ../../Zotlabs/Module/Profiles.php:107 msgid "Profile-" msgstr "Perfil-" -#: ../../Zotlabs/Module/Profiles.php:90 ../../Zotlabs/Module/Profiles.php:127 +#: ../../Zotlabs/Module/Profiles.php:92 ../../Zotlabs/Module/Profiles.php:129 msgid "New profile created." msgstr "El nuevo perfil ha sido creado." -#: ../../Zotlabs/Module/Profiles.php:111 +#: ../../Zotlabs/Module/Profiles.php:113 msgid "Profile unavailable to clone." msgstr "Perfil no disponible para clonar." -#: ../../Zotlabs/Module/Profiles.php:146 +#: ../../Zotlabs/Module/Profiles.php:148 msgid "Profile unavailable to export." msgstr "Perfil no disponible para exportar." -#: ../../Zotlabs/Module/Profiles.php:252 +#: ../../Zotlabs/Module/Profiles.php:254 msgid "Profile Name is required." msgstr "Se necesita el nombre del perfil." -#: ../../Zotlabs/Module/Profiles.php:459 +#: ../../Zotlabs/Module/Profiles.php:461 msgid "Marital Status" msgstr "Estado civil" -#: ../../Zotlabs/Module/Profiles.php:463 +#: ../../Zotlabs/Module/Profiles.php:465 msgid "Romantic Partner" msgstr "Pareja sentimental" -#: ../../Zotlabs/Module/Profiles.php:467 ../../Zotlabs/Module/Profiles.php:772 +#: ../../Zotlabs/Module/Profiles.php:469 ../../Zotlabs/Module/Profiles.php:774 msgid "Likes" msgstr "Me gusta" -#: ../../Zotlabs/Module/Profiles.php:471 ../../Zotlabs/Module/Profiles.php:773 +#: ../../Zotlabs/Module/Profiles.php:473 ../../Zotlabs/Module/Profiles.php:775 msgid "Dislikes" msgstr "No me gusta" -#: ../../Zotlabs/Module/Profiles.php:475 ../../Zotlabs/Module/Profiles.php:780 +#: ../../Zotlabs/Module/Profiles.php:477 ../../Zotlabs/Module/Profiles.php:782 msgid "Work/Employment" msgstr "Trabajo:" -#: ../../Zotlabs/Module/Profiles.php:478 +#: ../../Zotlabs/Module/Profiles.php:480 msgid "Religion" msgstr "Religión" -#: ../../Zotlabs/Module/Profiles.php:482 +#: ../../Zotlabs/Module/Profiles.php:484 msgid "Political Views" msgstr "Ideas políticas" -#: ../../Zotlabs/Module/Profiles.php:490 +#: ../../Zotlabs/Module/Profiles.php:492 msgid "Sexual Preference" msgstr "Preferencia sexual" -#: ../../Zotlabs/Module/Profiles.php:494 +#: ../../Zotlabs/Module/Profiles.php:496 msgid "Homepage" msgstr "Página personal" -#: ../../Zotlabs/Module/Profiles.php:498 +#: ../../Zotlabs/Module/Profiles.php:500 msgid "Interests" msgstr "Intereses" -#: ../../Zotlabs/Module/Profiles.php:594 +#: ../../Zotlabs/Module/Profiles.php:596 msgid "Profile updated." msgstr "Perfil actualizado." -#: ../../Zotlabs/Module/Profiles.php:678 +#: ../../Zotlabs/Module/Profiles.php:680 msgid "Hide your connections list from viewers of this profile" msgstr "Ocultar la lista de conexiones a los visitantes del perfil" -#: ../../Zotlabs/Module/Profiles.php:722 +#: ../../Zotlabs/Module/Profiles.php:724 msgid "Edit Profile Details" msgstr "Modificar los detalles de este perfil" -#: ../../Zotlabs/Module/Profiles.php:724 +#: ../../Zotlabs/Module/Profiles.php:726 msgid "View this profile" msgstr "Ver este perfil" -#: ../../Zotlabs/Module/Profiles.php:726 +#: ../../Zotlabs/Module/Profiles.php:728 msgid "Profile Tools" msgstr "Gestión del perfil" -#: ../../Zotlabs/Module/Profiles.php:727 +#: ../../Zotlabs/Module/Profiles.php:729 msgid "Change cover photo" msgstr "Cambiar la imagen de portada del perfil" -#: ../../Zotlabs/Module/Profiles.php:729 +#: ../../Zotlabs/Module/Profiles.php:731 msgid "Create a new profile using these settings" msgstr "Crear un nuevo perfil usando estos ajustes" -#: ../../Zotlabs/Module/Profiles.php:730 +#: ../../Zotlabs/Module/Profiles.php:732 msgid "Clone this profile" msgstr "Clonar este perfil" -#: ../../Zotlabs/Module/Profiles.php:731 +#: ../../Zotlabs/Module/Profiles.php:733 msgid "Delete this profile" msgstr "Eliminar este perfil" -#: ../../Zotlabs/Module/Profiles.php:732 +#: ../../Zotlabs/Module/Profiles.php:734 msgid "Add profile things" msgstr "Añadir cosas al perfil" -#: ../../Zotlabs/Module/Profiles.php:733 +#: ../../Zotlabs/Module/Profiles.php:735 msgid "Personal" msgstr "Personales" -#: ../../Zotlabs/Module/Profiles.php:735 +#: ../../Zotlabs/Module/Profiles.php:737 msgid "Relationship" msgstr "Relación" -#: ../../Zotlabs/Module/Profiles.php:738 +#: ../../Zotlabs/Module/Profiles.php:740 msgid "Import profile from file" msgstr "Importar perfil desde un fichero" -#: ../../Zotlabs/Module/Profiles.php:739 +#: ../../Zotlabs/Module/Profiles.php:741 msgid "Export profile to file" msgstr "Exportar perfil a un fichero" -#: ../../Zotlabs/Module/Profiles.php:740 +#: ../../Zotlabs/Module/Profiles.php:742 msgid "Your gender" msgstr "Género" -#: ../../Zotlabs/Module/Profiles.php:741 +#: ../../Zotlabs/Module/Profiles.php:743 msgid "Marital status" msgstr "Estado civil" -#: ../../Zotlabs/Module/Profiles.php:742 +#: ../../Zotlabs/Module/Profiles.php:744 msgid "Sexual preference" msgstr "Preferencia sexual" -#: ../../Zotlabs/Module/Profiles.php:745 +#: ../../Zotlabs/Module/Profiles.php:747 msgid "Profile name" msgstr "Nombre del perfil" -#: ../../Zotlabs/Module/Profiles.php:747 +#: ../../Zotlabs/Module/Profiles.php:749 msgid "This is your default profile." msgstr "Este es su perfil principal." -#: ../../Zotlabs/Module/Profiles.php:749 +#: ../../Zotlabs/Module/Profiles.php:751 msgid "Your full name" msgstr "Nombre completo" -#: ../../Zotlabs/Module/Profiles.php:750 +#: ../../Zotlabs/Module/Profiles.php:752 msgid "Title/Description" msgstr "Título o descripción" -#: ../../Zotlabs/Module/Profiles.php:753 +#: ../../Zotlabs/Module/Profiles.php:755 msgid "Street address" msgstr "Dirección" -#: ../../Zotlabs/Module/Profiles.php:754 +#: ../../Zotlabs/Module/Profiles.php:756 msgid "Locality/City" msgstr "Ciudad" -#: ../../Zotlabs/Module/Profiles.php:755 +#: ../../Zotlabs/Module/Profiles.php:757 msgid "Region/State" msgstr "Región o Estado" -#: ../../Zotlabs/Module/Profiles.php:756 +#: ../../Zotlabs/Module/Profiles.php:758 msgid "Postal/Zip code" msgstr "Código postal" -#: ../../Zotlabs/Module/Profiles.php:762 +#: ../../Zotlabs/Module/Profiles.php:764 msgid "Who (if applicable)" msgstr "Quién (si es pertinente)" -#: ../../Zotlabs/Module/Profiles.php:762 +#: ../../Zotlabs/Module/Profiles.php:764 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "Por ejemplo: ana123, María González, sara@ejemplo.com" -#: ../../Zotlabs/Module/Profiles.php:763 +#: ../../Zotlabs/Module/Profiles.php:765 msgid "Since (date)" msgstr "Desde (fecha)" -#: ../../Zotlabs/Module/Profiles.php:766 +#: ../../Zotlabs/Module/Profiles.php:768 msgid "Tell us about yourself" msgstr "Háblenos de usted" -#: ../../Zotlabs/Module/Profiles.php:768 +#: ../../Zotlabs/Module/Profiles.php:770 msgid "Hometown" msgstr "Lugar de nacimiento" -#: ../../Zotlabs/Module/Profiles.php:769 +#: ../../Zotlabs/Module/Profiles.php:771 msgid "Political views" msgstr "Ideas políticas" -#: ../../Zotlabs/Module/Profiles.php:770 +#: ../../Zotlabs/Module/Profiles.php:772 msgid "Religious views" msgstr "Creencias religiosas" -#: ../../Zotlabs/Module/Profiles.php:771 +#: ../../Zotlabs/Module/Profiles.php:773 msgid "Keywords used in directory listings" msgstr "Palabras clave utilizadas en los listados de directorios" -#: ../../Zotlabs/Module/Profiles.php:771 +#: ../../Zotlabs/Module/Profiles.php:773 msgid "Example: fishing photography software" msgstr "Por ejemplo: software de fotografía submarina" -#: ../../Zotlabs/Module/Profiles.php:774 +#: ../../Zotlabs/Module/Profiles.php:776 msgid "Musical interests" msgstr "Preferencias musicales" -#: ../../Zotlabs/Module/Profiles.php:775 +#: ../../Zotlabs/Module/Profiles.php:777 msgid "Books, literature" msgstr "Libros, literatura" -#: ../../Zotlabs/Module/Profiles.php:776 +#: ../../Zotlabs/Module/Profiles.php:778 msgid "Television" msgstr "Televisión" -#: ../../Zotlabs/Module/Profiles.php:777 +#: ../../Zotlabs/Module/Profiles.php:779 msgid "Film/Dance/Culture/Entertainment" msgstr "Cine, danza, cultura, entretenimiento" -#: ../../Zotlabs/Module/Profiles.php:778 +#: ../../Zotlabs/Module/Profiles.php:780 msgid "Hobbies/Interests" msgstr "Aficiones o intereses" -#: ../../Zotlabs/Module/Profiles.php:779 +#: ../../Zotlabs/Module/Profiles.php:781 msgid "Love/Romance" msgstr "Vida sentimental o amorosa" -#: ../../Zotlabs/Module/Profiles.php:781 +#: ../../Zotlabs/Module/Profiles.php:783 msgid "School/Education" msgstr "Estudios" -#: ../../Zotlabs/Module/Profiles.php:782 +#: ../../Zotlabs/Module/Profiles.php:784 msgid "Contact information and social networks" msgstr "Información de contacto y redes sociales" -#: ../../Zotlabs/Module/Profiles.php:783 +#: ../../Zotlabs/Module/Profiles.php:785 msgid "My other channels" msgstr "Mis otros canales" -#: ../../Zotlabs/Module/Profiles.php:785 +#: ../../Zotlabs/Module/Profiles.php:787 msgid "Communications" msgstr "Comunicaciones" @@ -12791,10 +12909,6 @@ msgstr "Enviar invitaciones" msgid "Enter email addresses, one per line:" msgstr "Introduzca las direcciones de correo electrónico, una por línea:" -#: ../../Zotlabs/Module/Invite.php:157 ../../Zotlabs/Module/Mail.php:289 -msgid "Your message:" -msgstr "Su mensaje:" - #: ../../Zotlabs/Module/Invite.php:158 msgid "Please join my community on $Projectname." msgstr "Por favor, únase a mi comunidad en $Projectname." @@ -12820,11 +12934,11 @@ msgstr "o visitar" msgid "3. Click [Connect]" msgstr "3. Pulse [conectar]" -#: ../../Zotlabs/Module/Notes.php:56 +#: ../../Zotlabs/Module/Notes.php:57 msgid "Notes App" msgstr "App Notas" -#: ../../Zotlabs/Module/Notes.php:57 +#: ../../Zotlabs/Module/Notes.php:58 msgid "A simple notes app with a widget (note: notes are not encrypted)" msgstr "Una simple aplicación de notas con un widget (aviso: las notas no están encriptadas)" @@ -12836,101 +12950,6 @@ msgstr "Búsqueda de canales" msgid "Lookup xchan beginning with (or webbie): " msgstr "Buscar un canal (o un \"webbie\") que comience por:" -#: ../../Zotlabs/Module/Mail.php:77 -msgid "Unable to lookup recipient." -msgstr "No se puede asociar a un destinatario." - -#: ../../Zotlabs/Module/Mail.php:84 -msgid "Unable to communicate with requested channel." -msgstr "No se puede establecer la comunicación con el canal solicitado." - -#: ../../Zotlabs/Module/Mail.php:91 -msgid "Cannot verify requested channel." -msgstr "No se puede verificar el canal solicitado." - -#: ../../Zotlabs/Module/Mail.php:109 -msgid "Selected channel has private message restrictions. Send failed." -msgstr "El canal seleccionado tiene restricciones sobre los mensajes privados. El envío falló." - -#: ../../Zotlabs/Module/Mail.php:164 -msgid "Messages" -msgstr "Mensajes" - -#: ../../Zotlabs/Module/Mail.php:177 -msgid "message" -msgstr "mensaje" - -#: ../../Zotlabs/Module/Mail.php:218 -msgid "Message recalled." -msgstr "Mensaje revocado." - -#: ../../Zotlabs/Module/Mail.php:231 -msgid "Conversation removed." -msgstr "Conversación eliminada." - -#: ../../Zotlabs/Module/Mail.php:246 ../../Zotlabs/Module/Mail.php:367 -msgid "Expires YYYY-MM-DD HH:MM" -msgstr "Caduca YYYY-MM-DD HH:MM" - -#: ../../Zotlabs/Module/Mail.php:274 -msgid "Requested channel is not in this network" -msgstr "El canal solicitado no existe en esta red" - -#: ../../Zotlabs/Module/Mail.php:282 -msgid "Send Private Message" -msgstr "Enviar un mensaje privado" - -#: ../../Zotlabs/Module/Mail.php:283 ../../Zotlabs/Module/Mail.php:426 -msgid "To:" -msgstr "Para:" - -#: ../../Zotlabs/Module/Mail.php:286 ../../Zotlabs/Module/Mail.php:428 -msgid "Subject:" -msgstr "Asunto:" - -#: ../../Zotlabs/Module/Mail.php:291 ../../Zotlabs/Module/Mail.php:434 -msgid "Attach file" -msgstr "Adjuntar fichero" - -#: ../../Zotlabs/Module/Mail.php:293 -msgid "Send" -msgstr "Enviar" - -#: ../../Zotlabs/Module/Mail.php:397 -msgid "Delete message" -msgstr "Borrar mensaje" - -#: ../../Zotlabs/Module/Mail.php:398 -msgid "Delivery report" -msgstr "Informe de transmisión" - -#: ../../Zotlabs/Module/Mail.php:399 -msgid "Recall message" -msgstr "Revocar el mensaje" - -#: ../../Zotlabs/Module/Mail.php:401 -msgid "Message has been recalled." -msgstr "El mensaje ha sido revocado." - -#: ../../Zotlabs/Module/Mail.php:419 -msgid "Delete Conversation" -msgstr "Eliminar conversación" - -#: ../../Zotlabs/Module/Mail.php:421 -msgid "" -"No secure communications available. You <strong>may</strong> be able to " -"respond from the sender's profile page." -msgstr "Comunicación segura no disponible. Pero <strong>puede</strong> responder desde la página del perfil del remitente." - -#: ../../Zotlabs/Module/Mail.php:425 -msgid "Send Reply" -msgstr "Responder" - -#: ../../Zotlabs/Module/Mail.php:430 -#, php-format -msgid "Your message for %s (%s):" -msgstr "Su mensaje para %s (%s):" - #: ../../Zotlabs/Module/Affinity.php:35 msgid "Affinity Tool settings updated." msgstr "Actualización de los ajustes de Affinity Tool." @@ -13000,404 +13019,411 @@ msgstr "Valoración (esta información es pública)" msgid "Optionally explain your rating (this information is public)" msgstr "Opcionalmente puede explicar su valoración (esta información es pública)" -#: ../../Zotlabs/Module/Settings/Network.php:41 -#: ../../Zotlabs/Module/Settings/Channel_home.php:44 +#: ../../Zotlabs/Module/Settings/Network.php:42 +#: ../../Zotlabs/Module/Settings/Channel_home.php:46 msgid "Max height of content (in pixels)" msgstr "Altura máxima del contenido (en píxeles)" -#: ../../Zotlabs/Module/Settings/Network.php:43 -#: ../../Zotlabs/Module/Settings/Channel_home.php:46 +#: ../../Zotlabs/Module/Settings/Network.php:44 +#: ../../Zotlabs/Module/Settings/Channel_home.php:48 msgid "Click to expand content exceeding this height" msgstr "Haga clic para expandir el contenido que exceda esta altura" -#: ../../Zotlabs/Module/Settings/Network.php:58 +#: ../../Zotlabs/Module/Settings/Network.php:59 msgid "Stream Settings" msgstr "Ajustes del stream" -#: ../../Zotlabs/Module/Settings/Features.php:43 +#: ../../Zotlabs/Module/Settings/Features.php:45 msgid "Additional Features" msgstr "Funcionalidades" -#: ../../Zotlabs/Module/Settings/Channel.php:327 +#: ../../Zotlabs/Module/Settings/Channel.php:328 msgid "Nobody except yourself" msgstr "Nadie excepto usted" -#: ../../Zotlabs/Module/Settings/Channel.php:328 +#: ../../Zotlabs/Module/Settings/Channel.php:329 msgid "Only those you specifically allow" msgstr "Solo aquellos a los que usted permita explícitamente" -#: ../../Zotlabs/Module/Settings/Channel.php:329 +#: ../../Zotlabs/Module/Settings/Channel.php:330 msgid "Approved connections" msgstr "Conexiones aprobadas" -#: ../../Zotlabs/Module/Settings/Channel.php:330 +#: ../../Zotlabs/Module/Settings/Channel.php:331 msgid "Any connections" msgstr "Cualquier conexión" -#: ../../Zotlabs/Module/Settings/Channel.php:331 +#: ../../Zotlabs/Module/Settings/Channel.php:332 msgid "Anybody on this website" msgstr "Cualquiera en este sitio web" -#: ../../Zotlabs/Module/Settings/Channel.php:332 +#: ../../Zotlabs/Module/Settings/Channel.php:333 msgid "Anybody in this network" msgstr "Cualquiera en esta red" -#: ../../Zotlabs/Module/Settings/Channel.php:333 +#: ../../Zotlabs/Module/Settings/Channel.php:334 msgid "Anybody authenticated" msgstr "Cualquiera que esté autenticado" -#: ../../Zotlabs/Module/Settings/Channel.php:334 +#: ../../Zotlabs/Module/Settings/Channel.php:335 msgid "Anybody on the internet" msgstr "Cualquiera en internet" -#: ../../Zotlabs/Module/Settings/Channel.php:409 +#: ../../Zotlabs/Module/Settings/Channel.php:410 msgid "Publish your default profile in the network directory" msgstr "Publicar su perfil principal en el directorio de la red" -#: ../../Zotlabs/Module/Settings/Channel.php:414 +#: ../../Zotlabs/Module/Settings/Channel.php:415 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "¿Nos permite sugerirle como amigo potencial a los nuevos miembros?" -#: ../../Zotlabs/Module/Settings/Channel.php:418 +#: ../../Zotlabs/Module/Settings/Channel.php:419 msgid "or" msgstr "o" -#: ../../Zotlabs/Module/Settings/Channel.php:427 +#: ../../Zotlabs/Module/Settings/Channel.php:428 msgid "Your channel address is" msgstr "Su dirección de canal es" -#: ../../Zotlabs/Module/Settings/Channel.php:430 +#: ../../Zotlabs/Module/Settings/Channel.php:431 msgid "Your files/photos are accessible via WebDAV at" msgstr "Sus archivos y fotos son accesibles a través de WebDAV en " -#: ../../Zotlabs/Module/Settings/Channel.php:470 +#: ../../Zotlabs/Module/Settings/Channel.php:471 msgid "Automatic membership approval" msgstr "Aprobación automática de nuevos miembros" -#: ../../Zotlabs/Module/Settings/Channel.php:470 -#: ../../Zotlabs/Module/Defperms.php:255 +#: ../../Zotlabs/Module/Settings/Channel.php:471 +#: ../../Zotlabs/Module/Defperms.php:256 msgid "" "If enabled, connection requests will be approved without your interaction" msgstr "Si está habilitado, las solicitudes de conexión serán aprobadas sin su intervención." -#: ../../Zotlabs/Module/Settings/Channel.php:491 +#: ../../Zotlabs/Module/Settings/Channel.php:492 msgid "Channel Settings" msgstr "Ajustes del canal" -#: ../../Zotlabs/Module/Settings/Channel.php:498 +#: ../../Zotlabs/Module/Settings/Channel.php:499 msgid "Basic Settings" msgstr "Configuración básica" -#: ../../Zotlabs/Module/Settings/Channel.php:500 +#: ../../Zotlabs/Module/Settings/Channel.php:501 #: ../../Zotlabs/Module/Settings/Account.php:104 msgid "Email Address:" msgstr "Dirección de correo electrónico:" -#: ../../Zotlabs/Module/Settings/Channel.php:501 +#: ../../Zotlabs/Module/Settings/Channel.php:502 msgid "Your Timezone:" msgstr "Su huso horario:" -#: ../../Zotlabs/Module/Settings/Channel.php:502 +#: ../../Zotlabs/Module/Settings/Channel.php:503 msgid "Default Post Location:" msgstr "Localización geográfica predeterminada para sus publicaciones:" -#: ../../Zotlabs/Module/Settings/Channel.php:502 +#: ../../Zotlabs/Module/Settings/Channel.php:503 msgid "Geographical location to display on your posts" msgstr "Localización geográfica que debe mostrarse en sus publicaciones" -#: ../../Zotlabs/Module/Settings/Channel.php:503 +#: ../../Zotlabs/Module/Settings/Channel.php:504 msgid "Use Browser Location:" msgstr "Usar la localización geográfica del navegador:" -#: ../../Zotlabs/Module/Settings/Channel.php:505 +#: ../../Zotlabs/Module/Settings/Channel.php:506 msgid "Adult Content" msgstr "Contenido solo para adultos" -#: ../../Zotlabs/Module/Settings/Channel.php:505 +#: ../../Zotlabs/Module/Settings/Channel.php:506 msgid "" "This channel frequently or regularly publishes adult content. (Please tag " "any adult material and/or nudity with #NSFW)" msgstr "Este canal publica contenido solo para adultos con frecuencia o regularmente. (Por favor etiquete cualquier material para adultos con la etiqueta #NSFW)" -#: ../../Zotlabs/Module/Settings/Channel.php:507 +#: ../../Zotlabs/Module/Settings/Channel.php:508 msgid "Security and Privacy Settings" msgstr "Configuración de seguridad y privacidad" -#: ../../Zotlabs/Module/Settings/Channel.php:509 +#: ../../Zotlabs/Module/Settings/Channel.php:510 msgid "Your permissions are already configured. Click to view/adjust" msgstr "Sus permisos ya están configurados. Pulse para ver/ajustar" -#: ../../Zotlabs/Module/Settings/Channel.php:511 +#: ../../Zotlabs/Module/Settings/Channel.php:512 msgid "Hide my online presence" msgstr "Ocultar mi presencia en línea" -#: ../../Zotlabs/Module/Settings/Channel.php:511 +#: ../../Zotlabs/Module/Settings/Channel.php:512 msgid "Prevents displaying in your profile that you are online" msgstr "Evitar mostrar en su perfil que está en línea" -#: ../../Zotlabs/Module/Settings/Channel.php:513 +#: ../../Zotlabs/Module/Settings/Channel.php:514 msgid "Simple Privacy Settings:" msgstr "Configuración de privacidad sencilla:" -#: ../../Zotlabs/Module/Settings/Channel.php:514 +#: ../../Zotlabs/Module/Settings/Channel.php:515 msgid "" "Very Public - <em>extremely permissive (should be used with caution)</em>" msgstr "Muy Público - <em>extremadamente permisivo (debería ser usado con precaución)</em>" -#: ../../Zotlabs/Module/Settings/Channel.php:515 +#: ../../Zotlabs/Module/Settings/Channel.php:516 msgid "" "Typical - <em>default public, privacy when desired (similar to social " "network permissions but with improved privacy)</em>" msgstr "Típico - <em>por defecto público, privado cuando se desee (similar a los permisos de una red social pero con privacidad mejorada)</em>" -#: ../../Zotlabs/Module/Settings/Channel.php:516 +#: ../../Zotlabs/Module/Settings/Channel.php:517 msgid "Private - <em>default private, never open or public</em>" msgstr "Privado - <em>por defecto, privado, nunca abierto o público</em>" -#: ../../Zotlabs/Module/Settings/Channel.php:517 +#: ../../Zotlabs/Module/Settings/Channel.php:518 msgid "Blocked - <em>default blocked to/from everybody</em>" msgstr "Bloqueado - <em>por defecto, bloqueado/a para cualquiera</em>" -#: ../../Zotlabs/Module/Settings/Channel.php:519 +#: ../../Zotlabs/Module/Settings/Channel.php:520 msgid "Allow others to tag your posts" msgstr "Permitir a otros etiquetar sus publicaciones" -#: ../../Zotlabs/Module/Settings/Channel.php:519 +#: ../../Zotlabs/Module/Settings/Channel.php:520 msgid "" "Often used by the community to retro-actively flag inappropriate content" msgstr "A menudo usado por la comunidad para marcar contenido inapropiado de forma retroactiva." -#: ../../Zotlabs/Module/Settings/Channel.php:521 +#: ../../Zotlabs/Module/Settings/Channel.php:522 msgid "Channel Permission Limits" msgstr "Límites de los permisos del canal" -#: ../../Zotlabs/Module/Settings/Channel.php:523 +#: ../../Zotlabs/Module/Settings/Channel.php:524 msgid "Expire other channel content after this many days" msgstr "Caducar contenido de otros canales después de este número de días" -#: ../../Zotlabs/Module/Settings/Channel.php:523 +#: ../../Zotlabs/Module/Settings/Channel.php:524 msgid "0 or blank to use the website limit." msgstr "0 o en blanco para usar el límite del sitio web." -#: ../../Zotlabs/Module/Settings/Channel.php:523 +#: ../../Zotlabs/Module/Settings/Channel.php:524 #, php-format msgid "This website expires after %d days." msgstr "Este sitio web caduca después de %d días." -#: ../../Zotlabs/Module/Settings/Channel.php:523 +#: ../../Zotlabs/Module/Settings/Channel.php:524 msgid "This website does not expire imported content." msgstr "Este sitio web no caduca el contenido importado." -#: ../../Zotlabs/Module/Settings/Channel.php:523 +#: ../../Zotlabs/Module/Settings/Channel.php:524 msgid "The website limit takes precedence if lower than your limit." msgstr "El límite del sitio web tiene prioridad si es inferior a su propio límite." -#: ../../Zotlabs/Module/Settings/Channel.php:524 +#: ../../Zotlabs/Module/Settings/Channel.php:525 msgid "Maximum Friend Requests/Day:" msgstr "Máximo de solicitudes de amistad por día:" -#: ../../Zotlabs/Module/Settings/Channel.php:524 +#: ../../Zotlabs/Module/Settings/Channel.php:525 msgid "May reduce spam activity" msgstr "Podría reducir la actividad de spam" -#: ../../Zotlabs/Module/Settings/Channel.php:525 +#: ../../Zotlabs/Module/Settings/Channel.php:526 msgid "Default Privacy Group" msgstr "Grupo de canales predeterminado" -#: ../../Zotlabs/Module/Settings/Channel.php:527 +#: ../../Zotlabs/Module/Settings/Channel.php:528 msgid "Use my default audience setting for the type of object published" msgstr "Usar los ajustes de mi audiencia predeterminada para el tipo de publicación" -#: ../../Zotlabs/Module/Settings/Channel.php:536 +#: ../../Zotlabs/Module/Settings/Channel.php:537 msgid "Default permissions category" msgstr "Categoría de permisos por defecto" -#: ../../Zotlabs/Module/Settings/Channel.php:542 +#: ../../Zotlabs/Module/Settings/Channel.php:543 msgid "Maximum private messages per day from unknown people:" msgstr "Máximo de mensajes privados por día de gente desconocida:" -#: ../../Zotlabs/Module/Settings/Channel.php:542 +#: ../../Zotlabs/Module/Settings/Channel.php:543 msgid "Useful to reduce spamming" msgstr "Útil para reducir el envío de correo no deseado" -#: ../../Zotlabs/Module/Settings/Channel.php:545 +#: ../../Zotlabs/Module/Settings/Channel.php:546 #: ../../Zotlabs/Lib/Enotify.php:68 msgid "Notification Settings" msgstr "Configuración de las notificaciones" -#: ../../Zotlabs/Module/Settings/Channel.php:546 +#: ../../Zotlabs/Module/Settings/Channel.php:547 msgid "By default post a status message when:" msgstr "Por defecto, enviar un mensaje de estado cuando:" -#: ../../Zotlabs/Module/Settings/Channel.php:547 +#: ../../Zotlabs/Module/Settings/Channel.php:548 msgid "accepting a friend request" msgstr "Acepte una solicitud de amistad" -#: ../../Zotlabs/Module/Settings/Channel.php:548 +#: ../../Zotlabs/Module/Settings/Channel.php:549 msgid "joining a forum/community" msgstr "al unirse a un foro o comunidad" -#: ../../Zotlabs/Module/Settings/Channel.php:549 +#: ../../Zotlabs/Module/Settings/Channel.php:550 msgid "making an <em>interesting</em> profile change" msgstr "Realice un cambio <em>interesante</em> en su perfil" -#: ../../Zotlabs/Module/Settings/Channel.php:550 +#: ../../Zotlabs/Module/Settings/Channel.php:551 msgid "Send a notification email when:" msgstr "Enviar una notificación por correo electrónico cuando:" -#: ../../Zotlabs/Module/Settings/Channel.php:551 +#: ../../Zotlabs/Module/Settings/Channel.php:552 msgid "You receive a connection request" msgstr "Reciba una solicitud de conexión" -#: ../../Zotlabs/Module/Settings/Channel.php:552 +#: ../../Zotlabs/Module/Settings/Channel.php:553 msgid "Your connections are confirmed" msgstr "Sus conexiones hayan sido confirmadas" -#: ../../Zotlabs/Module/Settings/Channel.php:553 +#: ../../Zotlabs/Module/Settings/Channel.php:554 msgid "Someone writes on your profile wall" msgstr "Alguien escriba en la página de su perfil (\"muro\")" -#: ../../Zotlabs/Module/Settings/Channel.php:554 +#: ../../Zotlabs/Module/Settings/Channel.php:555 msgid "Someone writes a followup comment" msgstr "Alguien escriba un comentario sobre sus publicaciones" -#: ../../Zotlabs/Module/Settings/Channel.php:555 +#: ../../Zotlabs/Module/Settings/Channel.php:556 msgid "You receive a private message" msgstr "Reciba un mensaje privado" -#: ../../Zotlabs/Module/Settings/Channel.php:556 +#: ../../Zotlabs/Module/Settings/Channel.php:557 msgid "You receive a friend suggestion" msgstr "Reciba una sugerencia de amistad" -#: ../../Zotlabs/Module/Settings/Channel.php:557 +#: ../../Zotlabs/Module/Settings/Channel.php:558 msgid "You are tagged in a post" msgstr "Usted sea etiquetado en una publicación" -#: ../../Zotlabs/Module/Settings/Channel.php:558 +#: ../../Zotlabs/Module/Settings/Channel.php:559 msgid "You are poked/prodded/etc. in a post" msgstr "Reciba un toque o incitación en una publicación" -#: ../../Zotlabs/Module/Settings/Channel.php:560 +#: ../../Zotlabs/Module/Settings/Channel.php:561 msgid "Someone likes your post/comment" msgstr "Alguien muestre agrado por su entrada o comentario" -#: ../../Zotlabs/Module/Settings/Channel.php:563 +#: ../../Zotlabs/Module/Settings/Channel.php:564 msgid "Show visual notifications including:" msgstr "Mostrar notificaciones visuales que incluyan:" -#: ../../Zotlabs/Module/Settings/Channel.php:565 +#: ../../Zotlabs/Module/Settings/Channel.php:566 msgid "Unseen stream activity" msgstr "Actividad del stream no vista" -#: ../../Zotlabs/Module/Settings/Channel.php:566 +#: ../../Zotlabs/Module/Settings/Channel.php:567 msgid "Unseen channel activity" msgstr "Actividad no vista en el canal" -#: ../../Zotlabs/Module/Settings/Channel.php:567 +#: ../../Zotlabs/Module/Settings/Channel.php:568 msgid "Unseen private messages" msgstr "Mensajes privados no leídos" #: ../../Zotlabs/Module/Settings/Channel.php:568 +#: ../../Zotlabs/Module/Settings/Channel.php:573 +#: ../../Zotlabs/Module/Settings/Channel.php:574 +#: ../../Zotlabs/Module/Settings/Channel.php:575 +msgid "Recommended" +msgstr "Recomendado" + +#: ../../Zotlabs/Module/Settings/Channel.php:569 msgid "Upcoming events" msgstr "Próximos eventos" -#: ../../Zotlabs/Module/Settings/Channel.php:569 +#: ../../Zotlabs/Module/Settings/Channel.php:570 msgid "Events today" msgstr "Eventos de hoy" -#: ../../Zotlabs/Module/Settings/Channel.php:570 +#: ../../Zotlabs/Module/Settings/Channel.php:571 msgid "Upcoming birthdays" msgstr "Próximos cumpleaños" -#: ../../Zotlabs/Module/Settings/Channel.php:570 +#: ../../Zotlabs/Module/Settings/Channel.php:571 msgid "Not available in all themes" msgstr "No disponible en todos los temas" -#: ../../Zotlabs/Module/Settings/Channel.php:571 +#: ../../Zotlabs/Module/Settings/Channel.php:572 msgid "System (personal) notifications" msgstr "Notificaciones del sistema (personales)" -#: ../../Zotlabs/Module/Settings/Channel.php:572 +#: ../../Zotlabs/Module/Settings/Channel.php:573 msgid "System info messages" msgstr "Mensajes de información del sistema" -#: ../../Zotlabs/Module/Settings/Channel.php:573 +#: ../../Zotlabs/Module/Settings/Channel.php:574 msgid "System critical alerts" msgstr "Alertas críticas del sistema" -#: ../../Zotlabs/Module/Settings/Channel.php:574 +#: ../../Zotlabs/Module/Settings/Channel.php:575 msgid "New connections" msgstr "Nuevas conexiones" -#: ../../Zotlabs/Module/Settings/Channel.php:575 +#: ../../Zotlabs/Module/Settings/Channel.php:576 msgid "System Registrations" msgstr "Registros del sistema" -#: ../../Zotlabs/Module/Settings/Channel.php:576 +#: ../../Zotlabs/Module/Settings/Channel.php:577 msgid "Unseen shared files" msgstr "Ficheros compartidos no vistos" -#: ../../Zotlabs/Module/Settings/Channel.php:577 +#: ../../Zotlabs/Module/Settings/Channel.php:578 msgid "Unseen public stream activity" msgstr "Actividad del stream público no vista" -#: ../../Zotlabs/Module/Settings/Channel.php:578 +#: ../../Zotlabs/Module/Settings/Channel.php:579 msgid "Unseen likes and dislikes" msgstr "Los \"me gusta\" y \"no me gusta\" no vistos" -#: ../../Zotlabs/Module/Settings/Channel.php:579 +#: ../../Zotlabs/Module/Settings/Channel.php:580 msgid "Unseen forum posts" msgstr "Entradas no vistas en el foro" -#: ../../Zotlabs/Module/Settings/Channel.php:580 +#: ../../Zotlabs/Module/Settings/Channel.php:581 msgid "Email notification hub (hostname)" msgstr "Email de notificación del hub (nombre del host)" -#: ../../Zotlabs/Module/Settings/Channel.php:580 +#: ../../Zotlabs/Module/Settings/Channel.php:581 #, 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 "Si su canal está replicado en múltiples hubs, colóquelo en su ubicación preferida. Esto evitará la duplicación de notificaciones por correo electrónico. Ejemplo: %s" -#: ../../Zotlabs/Module/Settings/Channel.php:581 +#: ../../Zotlabs/Module/Settings/Channel.php:582 msgid "Show new wall posts, private messages and connections under Notices" msgstr "Mostrar nuevos mensajes en el muro, mensajes privados y conexiones en Avisos" -#: ../../Zotlabs/Module/Settings/Channel.php:583 +#: ../../Zotlabs/Module/Settings/Channel.php:584 msgid "Notify me of events this many days in advance" msgstr "Avisarme de los eventos con algunos días de antelación" -#: ../../Zotlabs/Module/Settings/Channel.php:583 +#: ../../Zotlabs/Module/Settings/Channel.php:584 msgid "Must be greater than 0" msgstr "Debe ser mayor que 0" -#: ../../Zotlabs/Module/Settings/Channel.php:588 +#: ../../Zotlabs/Module/Settings/Channel.php:589 msgid "Advanced Account/Page Type Settings" msgstr "Ajustes avanzados de la cuenta y de los tipos de página" -#: ../../Zotlabs/Module/Settings/Channel.php:589 +#: ../../Zotlabs/Module/Settings/Channel.php:590 msgid "Change the behaviour of this account for special situations" msgstr "Cambiar el comportamiento de esta cuenta en situaciones especiales" -#: ../../Zotlabs/Module/Settings/Channel.php:591 +#: ../../Zotlabs/Module/Settings/Channel.php:592 msgid "Miscellaneous Settings" msgstr "Ajustes diversos" -#: ../../Zotlabs/Module/Settings/Channel.php:592 +#: ../../Zotlabs/Module/Settings/Channel.php:593 msgid "Default photo upload folder" msgstr "Carpeta por defecto de las fotos subidas" -#: ../../Zotlabs/Module/Settings/Channel.php:592 #: ../../Zotlabs/Module/Settings/Channel.php:593 +#: ../../Zotlabs/Module/Settings/Channel.php:594 msgid "%Y - current year, %m - current month" msgstr "%Y - año en curso, %m - mes actual" -#: ../../Zotlabs/Module/Settings/Channel.php:593 +#: ../../Zotlabs/Module/Settings/Channel.php:594 msgid "Default file upload folder" msgstr "Carpeta por defecto de los ficheros subidos" -#: ../../Zotlabs/Module/Settings/Channel.php:595 +#: ../../Zotlabs/Module/Settings/Channel.php:596 msgid "Remove this channel." msgstr "Eliminar este canal." @@ -13457,154 +13483,154 @@ msgstr "Dejar en blanco la contraseña a menos que desee cambiarla." msgid "Remove this account including all its channels" msgstr "Eliminar esta cuenta incluyendo todos sus canales" -#: ../../Zotlabs/Module/Settings/Featured.php:24 +#: ../../Zotlabs/Module/Settings/Featured.php:25 msgid "No feature settings configured" msgstr "No se ha establecido la configuración de los complementos" -#: ../../Zotlabs/Module/Settings/Featured.php:33 +#: ../../Zotlabs/Module/Settings/Featured.php:34 msgid "Addon Settings" msgstr "Ajustes de los complementos" -#: ../../Zotlabs/Module/Settings/Featured.php:34 +#: ../../Zotlabs/Module/Settings/Featured.php:35 msgid "Please save/submit changes to any panel before opening another." msgstr "Guarde o envíe los cambios a cualquier panel antes de abrir otro." -#: ../../Zotlabs/Module/Settings/Events.php:39 +#: ../../Zotlabs/Module/Settings/Events.php:40 msgid "Events Settings" msgstr "Gestión de eventos" -#: ../../Zotlabs/Module/Settings/Manage.php:39 +#: ../../Zotlabs/Module/Settings/Manage.php:41 msgid "Channel Manager Settings" msgstr "Ajustes del administrador de canales" -#: ../../Zotlabs/Module/Settings/Channel_home.php:59 +#: ../../Zotlabs/Module/Settings/Channel_home.php:61 msgid "Personal menu to display in your channel pages" msgstr "Menú personal que debe mostrarse en las páginas de su canal" -#: ../../Zotlabs/Module/Settings/Channel_home.php:86 +#: ../../Zotlabs/Module/Settings/Channel_home.php:88 msgid "Channel Home Settings" msgstr "Ajustes del canal" -#: ../../Zotlabs/Module/Settings/Calendar.php:39 +#: ../../Zotlabs/Module/Settings/Calendar.php:40 msgid "Calendar Settings" msgstr "Ajustes del calendario" -#: ../../Zotlabs/Module/Settings/Display.php:128 +#: ../../Zotlabs/Module/Settings/Display.php:129 #, php-format msgid "%s - (Experimental)" msgstr "%s - (Experimental)" -#: ../../Zotlabs/Module/Settings/Display.php:184 +#: ../../Zotlabs/Module/Settings/Display.php:185 msgid "Display Settings" msgstr "Ajustes de visualización" -#: ../../Zotlabs/Module/Settings/Display.php:185 +#: ../../Zotlabs/Module/Settings/Display.php:186 msgid "Theme Settings" msgstr "Ajustes del tema" -#: ../../Zotlabs/Module/Settings/Display.php:186 +#: ../../Zotlabs/Module/Settings/Display.php:187 msgid "Custom Theme Settings" msgstr "Ajustes personalizados del tema" -#: ../../Zotlabs/Module/Settings/Display.php:187 +#: ../../Zotlabs/Module/Settings/Display.php:188 msgid "Content Settings" msgstr "Ajustes del contenido" -#: ../../Zotlabs/Module/Settings/Display.php:193 +#: ../../Zotlabs/Module/Settings/Display.php:194 msgid "Display Theme:" msgstr "Tema gráfico del perfil:" -#: ../../Zotlabs/Module/Settings/Display.php:194 +#: ../../Zotlabs/Module/Settings/Display.php:195 msgid "Select scheme" msgstr "Elegir un esquema" -#: ../../Zotlabs/Module/Settings/Display.php:196 +#: ../../Zotlabs/Module/Settings/Display.php:197 msgid "Preload images before rendering the page" msgstr "Carga previa de las imágenes antes de generar la página" -#: ../../Zotlabs/Module/Settings/Display.php:196 +#: ../../Zotlabs/Module/Settings/Display.php:197 msgid "" "The subjective page load time will be longer but the page will be ready when" " displayed" msgstr "El tiempo subjetivo de carga de la página será más largo, pero la página estará lista cuando se muestre." -#: ../../Zotlabs/Module/Settings/Display.php:197 +#: ../../Zotlabs/Module/Settings/Display.php:198 msgid "Enable user zoom on mobile devices" msgstr "Habilitar zoom de usuario en dispositivos móviles" -#: ../../Zotlabs/Module/Settings/Display.php:198 +#: ../../Zotlabs/Module/Settings/Display.php:199 msgid "Update browser every xx seconds" msgstr "Actualizar navegador cada xx segundos" -#: ../../Zotlabs/Module/Settings/Display.php:198 +#: ../../Zotlabs/Module/Settings/Display.php:199 msgid "Minimum of 10 seconds, no maximum" msgstr "Mínimo de 10 segundos, sin máximo" -#: ../../Zotlabs/Module/Settings/Display.php:199 +#: ../../Zotlabs/Module/Settings/Display.php:200 msgid "Maximum number of conversations to load at any time:" msgstr "Máximo número de conversaciones a cargar en cualquier momento:" -#: ../../Zotlabs/Module/Settings/Display.php:199 -msgid "Maximum of 100 items" -msgstr "Máximo de 100 elementos" - #: ../../Zotlabs/Module/Settings/Display.php:200 +msgid "Maximum of 30 items" +msgstr "Máximo de 30 elementos" + +#: ../../Zotlabs/Module/Settings/Display.php:201 msgid "Show emoticons (smilies) as images" msgstr "Mostrar emoticonos (smilies) como imágenes" -#: ../../Zotlabs/Module/Settings/Display.php:201 +#: ../../Zotlabs/Module/Settings/Display.php:202 msgid "Provide channel menu in navigation bar" msgstr "Proporcionar un menú de canales en la barra de navegación" -#: ../../Zotlabs/Module/Settings/Display.php:201 +#: ../../Zotlabs/Module/Settings/Display.php:202 msgid "Default: channel menu located in app menu" msgstr "Predeterminado: menú de canales ubicado en el menú de aplicaciones" -#: ../../Zotlabs/Module/Settings/Display.php:202 +#: ../../Zotlabs/Module/Settings/Display.php:203 msgid "Manual conversation updates" msgstr "Actualizaciones manuales de la conversación" -#: ../../Zotlabs/Module/Settings/Display.php:202 +#: ../../Zotlabs/Module/Settings/Display.php:203 msgid "Default is on, turning this off may increase screen jumping" msgstr "El valor predeterminado está activado, al desactivarlo puede aumentar el salto de pantalla" -#: ../../Zotlabs/Module/Settings/Display.php:203 +#: ../../Zotlabs/Module/Settings/Display.php:204 msgid "Link post titles to source" msgstr "Enlazar título de la publicación a la fuente original" -#: ../../Zotlabs/Module/Settings/Display.php:205 +#: ../../Zotlabs/Module/Settings/Display.php:206 msgid "Display new member quick links menu" msgstr "Mostrar el menú de enlaces rápidos para nuevos miembros" -#: ../../Zotlabs/Module/Settings/Directory.php:39 +#: ../../Zotlabs/Module/Settings/Directory.php:40 msgid "Directory Settings" msgstr "Configuración del directorio" -#: ../../Zotlabs/Module/Settings/Editor.php:39 +#: ../../Zotlabs/Module/Settings/Editor.php:40 msgid "Editor Settings" msgstr "Ajustes del editor" -#: ../../Zotlabs/Module/Settings/Connections.php:39 +#: ../../Zotlabs/Module/Settings/Connections.php:40 msgid "Connections Settings" msgstr "Gestión de las conexiones" -#: ../../Zotlabs/Module/Settings/Photos.php:39 +#: ../../Zotlabs/Module/Settings/Photos.php:40 msgid "Photos Settings" msgstr "Gestión de las fotos" -#: ../../Zotlabs/Module/Settings/Profiles.php:47 +#: ../../Zotlabs/Module/Settings/Profiles.php:49 msgid "Profiles Settings" msgstr "Gestión de los perfiles" -#: ../../Zotlabs/Module/Settings/Conversation.php:22 +#: ../../Zotlabs/Module/Settings/Conversation.php:23 msgid "Settings saved." msgstr "Configuración guardada." -#: ../../Zotlabs/Module/Settings/Conversation.php:24 +#: ../../Zotlabs/Module/Settings/Conversation.php:25 msgid "Settings saved. Reload page please." msgstr "Ajustes guardados. Recargue la página, por favor." -#: ../../Zotlabs/Module/Settings/Conversation.php:46 +#: ../../Zotlabs/Module/Settings/Conversation.php:47 msgid "Conversation Settings" msgstr "Ajustes de conversación" @@ -13696,45 +13722,45 @@ msgstr "El título del menú tal como será visto por los demás" msgid "Allow bookmarks" msgstr "Permitir marcadores" -#: ../../Zotlabs/Module/Defperms.php:67 ../../Zotlabs/Module/Connedit.php:81 +#: ../../Zotlabs/Module/Defperms.php:68 ../../Zotlabs/Module/Connedit.php:82 msgid "Could not access contact record." msgstr "No se ha podido acceder al registro de contacto." -#: ../../Zotlabs/Module/Defperms.php:189 +#: ../../Zotlabs/Module/Defperms.php:190 msgid "Default Permissions App" msgstr "App Permisos por defecto" -#: ../../Zotlabs/Module/Defperms.php:190 +#: ../../Zotlabs/Module/Defperms.php:191 msgid "Set custom default permissions for new connections" msgstr "Establecer permisos predeterminados personalizados para nuevas conexiones" -#: ../../Zotlabs/Module/Defperms.php:254 ../../Zotlabs/Module/Connedit.php:867 +#: ../../Zotlabs/Module/Defperms.php:255 ../../Zotlabs/Module/Connedit.php:868 msgid "Connection Default Permissions" msgstr "Permisos predeterminados de conexión" -#: ../../Zotlabs/Module/Defperms.php:255 ../../Zotlabs/Module/Connedit.php:868 +#: ../../Zotlabs/Module/Defperms.php:256 ../../Zotlabs/Module/Connedit.php:869 msgid "Apply these permissions automatically" msgstr "Aplicar estos permisos automaticamente" -#: ../../Zotlabs/Module/Defperms.php:256 ../../Zotlabs/Module/Connedit.php:869 +#: ../../Zotlabs/Module/Defperms.php:257 ../../Zotlabs/Module/Connedit.php:870 msgid "Permission role" msgstr "Permisos de rol" -#: ../../Zotlabs/Module/Defperms.php:257 ../../Zotlabs/Module/Connedit.php:870 +#: ../../Zotlabs/Module/Defperms.php:258 ../../Zotlabs/Module/Connedit.php:871 msgid "Add permission role" msgstr "Añadir permisos de rol" -#: ../../Zotlabs/Module/Defperms.php:261 ../../Zotlabs/Module/Connedit.php:883 +#: ../../Zotlabs/Module/Defperms.php:262 ../../Zotlabs/Module/Connedit.php:884 msgid "" "The permissions indicated on this page will be applied to all new " "connections." msgstr "Los permisos indicados en esta página serán aplicados en todas las nuevas conexiones." -#: ../../Zotlabs/Module/Defperms.php:262 +#: ../../Zotlabs/Module/Defperms.php:263 msgid "Automatic approval settings" msgstr "Opciones de autorización automática" -#: ../../Zotlabs/Module/Defperms.php:270 +#: ../../Zotlabs/Module/Defperms.php:271 msgid "" "Some individual permissions may have been preset or locked based on your " "channel type and privacy settings." @@ -13864,60 +13890,60 @@ msgstr "Informe de entrega para %1$s" msgid "Redeliver" msgstr "Volver a enviar" -#: ../../Zotlabs/Module/Thing.php:120 +#: ../../Zotlabs/Module/Thing.php:122 msgid "Thing updated" msgstr "Elemento actualizado." -#: ../../Zotlabs/Module/Thing.php:172 +#: ../../Zotlabs/Module/Thing.php:174 msgid "Object store: failed" msgstr "Guardar objeto: ha fallado" -#: ../../Zotlabs/Module/Thing.php:176 +#: ../../Zotlabs/Module/Thing.php:178 msgid "Thing added" msgstr "Elemento añadido" -#: ../../Zotlabs/Module/Thing.php:202 +#: ../../Zotlabs/Module/Thing.php:204 #, php-format msgid "OBJ: %1$s %2$s %3$s" msgstr "OBJ: %1$s %2$s %3$s" -#: ../../Zotlabs/Module/Thing.php:265 +#: ../../Zotlabs/Module/Thing.php:267 msgid "Show Thing" msgstr "Mostrar elemento" -#: ../../Zotlabs/Module/Thing.php:272 +#: ../../Zotlabs/Module/Thing.php:274 msgid "item not found." msgstr "elemento no encontrado." -#: ../../Zotlabs/Module/Thing.php:305 +#: ../../Zotlabs/Module/Thing.php:307 msgid "Edit Thing" msgstr "Editar elemento" -#: ../../Zotlabs/Module/Thing.php:307 ../../Zotlabs/Module/Thing.php:364 +#: ../../Zotlabs/Module/Thing.php:309 ../../Zotlabs/Module/Thing.php:366 msgid "Select a profile" msgstr "Seleccionar un perfil" -#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:367 +#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:369 msgid "Post an activity" msgstr "Publicar una actividad" -#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:367 +#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:369 msgid "Only sends to viewers of the applicable profile" msgstr "Sólo enviar a espectadores del perfil pertinente." -#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:369 +#: ../../Zotlabs/Module/Thing.php:315 ../../Zotlabs/Module/Thing.php:371 msgid "Name of thing e.g. something" msgstr "Nombre del elemento, p. ej.:. \"algo\"" -#: ../../Zotlabs/Module/Thing.php:315 ../../Zotlabs/Module/Thing.php:370 +#: ../../Zotlabs/Module/Thing.php:317 ../../Zotlabs/Module/Thing.php:372 msgid "URL of thing (optional)" msgstr "Dirección del elemento (opcional)" -#: ../../Zotlabs/Module/Thing.php:317 ../../Zotlabs/Module/Thing.php:371 +#: ../../Zotlabs/Module/Thing.php:319 ../../Zotlabs/Module/Thing.php:373 msgid "URL for photo of thing (optional)" msgstr "Dirección para la foto o elemento (opcional)" -#: ../../Zotlabs/Module/Thing.php:362 +#: ../../Zotlabs/Module/Thing.php:364 msgid "Add Thing to your Profile" msgstr "Añadir alguna cosa a su perfil" @@ -13925,43 +13951,43 @@ msgstr "Añadir alguna cosa a su perfil" msgid "Authentication failed." msgstr "Falló la autenticación." -#: ../../Zotlabs/Module/Pdledit.php:26 +#: ../../Zotlabs/Module/Pdledit.php:27 msgid "Layout updated." msgstr "Plantilla actualizada." -#: ../../Zotlabs/Module/Pdledit.php:42 +#: ../../Zotlabs/Module/Pdledit.php:43 msgid "PDL Editor App" msgstr "App Editor PDL" -#: ../../Zotlabs/Module/Pdledit.php:43 +#: ../../Zotlabs/Module/Pdledit.php:44 msgid "Provides the ability to edit system page layouts" msgstr "Proporciona la capacidad de editar los diseños de página del sistema" -#: ../../Zotlabs/Module/Pdledit.php:56 ../../Zotlabs/Module/Pdledit.php:99 +#: ../../Zotlabs/Module/Pdledit.php:57 ../../Zotlabs/Module/Pdledit.php:100 msgid "Edit System Page Description" msgstr "Editor del Sistema de Descripción de Páginas" -#: ../../Zotlabs/Module/Pdledit.php:77 +#: ../../Zotlabs/Module/Pdledit.php:78 msgid "(modified)" msgstr "(modificado)" -#: ../../Zotlabs/Module/Pdledit.php:94 +#: ../../Zotlabs/Module/Pdledit.php:95 msgid "Layout not found." msgstr "Plantilla no encontrada" -#: ../../Zotlabs/Module/Pdledit.php:100 +#: ../../Zotlabs/Module/Pdledit.php:101 msgid "Module Name:" msgstr "Nombre del módulo:" -#: ../../Zotlabs/Module/Pdledit.php:101 +#: ../../Zotlabs/Module/Pdledit.php:102 msgid "Layout Help" msgstr "Ayuda para el diseño de plantillas de página" -#: ../../Zotlabs/Module/Pdledit.php:102 +#: ../../Zotlabs/Module/Pdledit.php:103 msgid "Edit another layout" msgstr "Editar otro diseño" -#: ../../Zotlabs/Module/Pdledit.php:103 +#: ../../Zotlabs/Module/Pdledit.php:104 msgid "System layout" msgstr "Diseño del sistema" @@ -14041,10 +14067,6 @@ msgstr "Comparación de revisiones" msgid "Short description of your changes (optional)" msgstr "Breve descripción de sus cambios (opcional)" -#: ../../Zotlabs/Module/Wiki.php:384 -msgid "Source" -msgstr "Fuente" - #: ../../Zotlabs/Module/Wiki.php:394 msgid "New page name" msgstr "Nombre de la nueva página" @@ -14130,244 +14152,244 @@ msgid "" "hours." msgstr "No hay sugerencias disponibles. Si es un sitio nuevo, espere 24 horas y pruebe de nuevo." -#: ../../Zotlabs/Module/Connedit.php:112 +#: ../../Zotlabs/Module/Connedit.php:113 msgid "Could not locate selected profile." msgstr "No se ha podido localizar el perfil seleccionado." -#: ../../Zotlabs/Module/Connedit.php:256 +#: ../../Zotlabs/Module/Connedit.php:257 msgid "Connection updated." msgstr "Conexión actualizada." -#: ../../Zotlabs/Module/Connedit.php:258 +#: ../../Zotlabs/Module/Connedit.php:259 msgid "Failed to update connection record." msgstr "Error al actualizar el registro de la conexión." -#: ../../Zotlabs/Module/Connedit.php:312 +#: ../../Zotlabs/Module/Connedit.php:313 msgid "is now connected to" msgstr "ahora está conectado/a" -#: ../../Zotlabs/Module/Connedit.php:437 +#: ../../Zotlabs/Module/Connedit.php:438 msgid "Could not access address book record." msgstr "No se pudo acceder al registro en su libreta de direcciones." -#: ../../Zotlabs/Module/Connedit.php:485 ../../Zotlabs/Module/Connedit.php:489 +#: ../../Zotlabs/Module/Connedit.php:486 ../../Zotlabs/Module/Connedit.php:490 msgid "Refresh failed - channel is currently unavailable." msgstr "Recarga fallida - no se puede encontrar el canal en este momento." -#: ../../Zotlabs/Module/Connedit.php:504 ../../Zotlabs/Module/Connedit.php:513 -#: ../../Zotlabs/Module/Connedit.php:522 ../../Zotlabs/Module/Connedit.php:531 -#: ../../Zotlabs/Module/Connedit.php:544 +#: ../../Zotlabs/Module/Connedit.php:505 ../../Zotlabs/Module/Connedit.php:514 +#: ../../Zotlabs/Module/Connedit.php:523 ../../Zotlabs/Module/Connedit.php:532 +#: ../../Zotlabs/Module/Connedit.php:545 msgid "Unable to set address book parameters." msgstr "No ha sido posible establecer los parámetros de la libreta de direcciones." -#: ../../Zotlabs/Module/Connedit.php:568 +#: ../../Zotlabs/Module/Connedit.php:569 msgid "Connection has been removed." msgstr "La conexión ha sido eliminada." -#: ../../Zotlabs/Module/Connedit.php:611 +#: ../../Zotlabs/Module/Connedit.php:612 #, php-format msgid "View %s's profile" msgstr "Ver el perfil de %s" -#: ../../Zotlabs/Module/Connedit.php:615 +#: ../../Zotlabs/Module/Connedit.php:616 msgid "Refresh Permissions" msgstr "Recargar los permisos" -#: ../../Zotlabs/Module/Connedit.php:618 +#: ../../Zotlabs/Module/Connedit.php:619 msgid "Fetch updated permissions" msgstr "Obtener los permisos actualizados" -#: ../../Zotlabs/Module/Connedit.php:622 +#: ../../Zotlabs/Module/Connedit.php:623 msgid "Refresh Photo" msgstr "Actualizar la foto" -#: ../../Zotlabs/Module/Connedit.php:625 +#: ../../Zotlabs/Module/Connedit.php:626 msgid "Fetch updated photo" msgstr "Obtener una foto actualizada" -#: ../../Zotlabs/Module/Connedit.php:632 +#: ../../Zotlabs/Module/Connedit.php:633 msgid "View recent posts and comments" msgstr "Ver publicaciones y comentarios recientes" -#: ../../Zotlabs/Module/Connedit.php:639 +#: ../../Zotlabs/Module/Connedit.php:640 msgid "Block (or Unblock) all communications with this connection" msgstr "Bloquear (o desbloquear) todas las comunicaciones con esta conexión" -#: ../../Zotlabs/Module/Connedit.php:640 +#: ../../Zotlabs/Module/Connedit.php:641 msgid "This connection is blocked!" msgstr "¡Esta conexión está bloqueada!" -#: ../../Zotlabs/Module/Connedit.php:644 +#: ../../Zotlabs/Module/Connedit.php:645 msgid "Unignore" msgstr "Dejar de ignorar" -#: ../../Zotlabs/Module/Connedit.php:647 +#: ../../Zotlabs/Module/Connedit.php:648 msgid "Ignore (or Unignore) all inbound communications from this connection" msgstr "Ignorar (o dejar de ignorar) todas las comunicaciones entrantes de esta conexión" -#: ../../Zotlabs/Module/Connedit.php:648 +#: ../../Zotlabs/Module/Connedit.php:649 msgid "This connection is ignored!" msgstr "¡Esta conexión es ignorada!" -#: ../../Zotlabs/Module/Connedit.php:652 +#: ../../Zotlabs/Module/Connedit.php:653 msgid "Unarchive" msgstr "Desarchivar" -#: ../../Zotlabs/Module/Connedit.php:652 +#: ../../Zotlabs/Module/Connedit.php:653 msgid "Archive" msgstr "Archivar" -#: ../../Zotlabs/Module/Connedit.php:655 +#: ../../Zotlabs/Module/Connedit.php:656 msgid "" "Archive (or Unarchive) this connection - mark channel dead but keep content" msgstr "Archiva (o desarchiva) esta conexión - marca el canal como muerto aunque mantiene sus contenidos" -#: ../../Zotlabs/Module/Connedit.php:656 +#: ../../Zotlabs/Module/Connedit.php:657 msgid "This connection is archived!" msgstr "¡Esta conexión esta archivada!" -#: ../../Zotlabs/Module/Connedit.php:660 +#: ../../Zotlabs/Module/Connedit.php:661 msgid "Unhide" msgstr "Mostrar" -#: ../../Zotlabs/Module/Connedit.php:660 +#: ../../Zotlabs/Module/Connedit.php:661 msgid "Hide" msgstr "Ocultar" -#: ../../Zotlabs/Module/Connedit.php:663 +#: ../../Zotlabs/Module/Connedit.php:664 msgid "Hide or Unhide this connection from your other connections" msgstr "Ocultar o mostrar esta conexión a sus otras conexiones" -#: ../../Zotlabs/Module/Connedit.php:664 +#: ../../Zotlabs/Module/Connedit.php:665 msgid "This connection is hidden!" msgstr "¡Esta conexión está oculta!" -#: ../../Zotlabs/Module/Connedit.php:671 +#: ../../Zotlabs/Module/Connedit.php:672 msgid "Delete this connection" msgstr "Eliminar esta conexión" -#: ../../Zotlabs/Module/Connedit.php:679 +#: ../../Zotlabs/Module/Connedit.php:680 msgid "Fetch Vcard" msgstr "Obtener una vcard" -#: ../../Zotlabs/Module/Connedit.php:682 +#: ../../Zotlabs/Module/Connedit.php:683 msgid "Fetch electronic calling card for this connection" msgstr "Obtener una tarjeta de llamada electrónica para esta conexión" -#: ../../Zotlabs/Module/Connedit.php:693 +#: ../../Zotlabs/Module/Connedit.php:694 msgid "Open Individual Permissions section by default" msgstr "Abrir la sección de permisos individuales por defecto" -#: ../../Zotlabs/Module/Connedit.php:716 +#: ../../Zotlabs/Module/Connedit.php:717 msgid "Affinity" msgstr "Afinidad" -#: ../../Zotlabs/Module/Connedit.php:719 +#: ../../Zotlabs/Module/Connedit.php:720 msgid "Open Set Affinity section by default" msgstr "Abrir por defecto la sección para definir la afinidad" -#: ../../Zotlabs/Module/Connedit.php:756 +#: ../../Zotlabs/Module/Connedit.php:757 msgid "Filter" msgstr "Filtrar" -#: ../../Zotlabs/Module/Connedit.php:759 +#: ../../Zotlabs/Module/Connedit.php:760 msgid "Open Custom Filter section by default" msgstr "Abrir por defecto la sección de personalización de filtros" -#: ../../Zotlabs/Module/Connedit.php:796 +#: ../../Zotlabs/Module/Connedit.php:797 msgid "Approve this connection" msgstr "Aprobar esta conexión" -#: ../../Zotlabs/Module/Connedit.php:796 +#: ../../Zotlabs/Module/Connedit.php:797 msgid "Accept connection to allow communication" msgstr "Aceptar la conexión para permitir la comunicación" -#: ../../Zotlabs/Module/Connedit.php:801 +#: ../../Zotlabs/Module/Connedit.php:802 msgid "Set Affinity" msgstr "Ajustar la afinidad" -#: ../../Zotlabs/Module/Connedit.php:804 +#: ../../Zotlabs/Module/Connedit.php:805 msgid "Set Profile" msgstr "Ajustar el perfil" -#: ../../Zotlabs/Module/Connedit.php:807 +#: ../../Zotlabs/Module/Connedit.php:808 msgid "Set Affinity & Profile" msgstr "Ajustar la afinidad y el perfil" -#: ../../Zotlabs/Module/Connedit.php:855 +#: ../../Zotlabs/Module/Connedit.php:856 msgid "This connection is unreachable from this location." msgstr "No se puede acceder a la conexión desde este sitio." -#: ../../Zotlabs/Module/Connedit.php:856 +#: ../../Zotlabs/Module/Connedit.php:857 msgid "This connection may be unreachable from other channel locations." msgstr "Esta conexión puede ser inaccesible desde otras ubicaciones del canal." -#: ../../Zotlabs/Module/Connedit.php:858 +#: ../../Zotlabs/Module/Connedit.php:859 msgid "Location independence is not supported by their network." msgstr "La independencia de ubicación no es compatible con su red." -#: ../../Zotlabs/Module/Connedit.php:864 +#: ../../Zotlabs/Module/Connedit.php:865 msgid "" "This connection is unreachable from this location. Location independence is " "not supported by their network." msgstr "Esta conexión no es accesible desde este sitio. La independencia de ubicación no es compatible con su red." -#: ../../Zotlabs/Module/Connedit.php:868 +#: ../../Zotlabs/Module/Connedit.php:869 msgid "Connection requests will be approved without your interaction" msgstr "Las solicitudes de conexión serán aprobadas sin su intervención" -#: ../../Zotlabs/Module/Connedit.php:877 +#: ../../Zotlabs/Module/Connedit.php:878 msgid "This connection's primary address is" msgstr "La dirección primaria de esta conexión es" -#: ../../Zotlabs/Module/Connedit.php:878 +#: ../../Zotlabs/Module/Connedit.php:879 msgid "Available locations:" msgstr "Ubicaciones disponibles:" -#: ../../Zotlabs/Module/Connedit.php:884 +#: ../../Zotlabs/Module/Connedit.php:885 msgid "Connection Tools" msgstr "Gestión de las conexiones" -#: ../../Zotlabs/Module/Connedit.php:886 +#: ../../Zotlabs/Module/Connedit.php:887 msgid "Slide to adjust your degree of friendship" msgstr "Deslizar para ajustar el grado de amistad" -#: ../../Zotlabs/Module/Connedit.php:888 +#: ../../Zotlabs/Module/Connedit.php:889 msgid "Slide to adjust your rating" msgstr "Deslizar para ajustar su valoración" -#: ../../Zotlabs/Module/Connedit.php:889 ../../Zotlabs/Module/Connedit.php:894 +#: ../../Zotlabs/Module/Connedit.php:890 ../../Zotlabs/Module/Connedit.php:895 msgid "Optionally explain your rating" msgstr "Opcionalmente, puede explicar su valoración" -#: ../../Zotlabs/Module/Connedit.php:891 +#: ../../Zotlabs/Module/Connedit.php:892 msgid "Custom Filter" msgstr "Filtro personalizado" -#: ../../Zotlabs/Module/Connedit.php:892 +#: ../../Zotlabs/Module/Connedit.php:893 msgid "Only import posts with this text" msgstr "Importar solo entradas que contengan este texto" -#: ../../Zotlabs/Module/Connedit.php:893 +#: ../../Zotlabs/Module/Connedit.php:894 msgid "Do not import posts with this text" msgstr "No importar entradas que contengan este texto" -#: ../../Zotlabs/Module/Connedit.php:895 +#: ../../Zotlabs/Module/Connedit.php:896 msgid "This information is public!" msgstr "¡Esta información es pública!" -#: ../../Zotlabs/Module/Connedit.php:900 +#: ../../Zotlabs/Module/Connedit.php:901 msgid "Connection Pending Approval" msgstr "Conexión pendiente de aprobación" -#: ../../Zotlabs/Module/Connedit.php:905 +#: ../../Zotlabs/Module/Connedit.php:906 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "Por favor, escoja el perfil que quiere mostrar a %s cuando esté viendo su perfil de forma segura." -#: ../../Zotlabs/Module/Connedit.php:912 +#: ../../Zotlabs/Module/Connedit.php:913 msgid "" "Some permissions may be inherited from your channel's <a " "href=\"settings\"><strong>privacy settings</strong></a>, which have higher " @@ -14375,11 +14397,11 @@ msgid "" "they wont have any impact unless the inherited setting changes." msgstr "Algunos permisos pueden ser heredados de los <a href=\"settings\"><strong>ajustes de privacidad</strong></a> de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. Puede cambiar estos ajustes aquí, pero no tendrán ningún consecuencia hasta que cambie los ajustes heredados." -#: ../../Zotlabs/Module/Connedit.php:913 +#: ../../Zotlabs/Module/Connedit.php:914 msgid "Last update:" msgstr "Última actualización:" -#: ../../Zotlabs/Module/Connedit.php:921 +#: ../../Zotlabs/Module/Connedit.php:922 msgid "Details" msgstr "Detalles" @@ -14394,7 +14416,7 @@ msgid "System Notifications" msgstr "Notificaciones del sistema" #: ../../Zotlabs/Module/Notifications.php:60 -#: ../../Zotlabs/Lib/ThreadItem.php:450 +#: ../../Zotlabs/Lib/ThreadItem.php:482 msgid "Mark all seen" msgstr "Marcar todo como visto" @@ -14478,7 +14500,7 @@ msgstr "Importar automáticamente contenido de otros canales o \"feeds\"" msgid "*" msgstr "*" -#: ../../Zotlabs/Module/Sources.php:107 ../../Zotlabs/Lib/Apps.php:367 +#: ../../Zotlabs/Module/Sources.php:107 ../../Zotlabs/Lib/Apps.php:368 msgid "Channel Sources" msgstr "Orígenes de los contenidos del canal" @@ -14564,6 +14586,33 @@ msgid "" " logout and retry." msgstr "La autenticación desde su servidor está bloqueada. Ha iniciado sesión localmente. Por favor, salga de la sesión y vuelva a intentarlo." +#: ../../Zotlabs/Lib/AccessList.php:28 +msgid "" +"A deleted list with this name was revived. Existing item permissions " +"<strong>may</strong> apply to this list and any future members. If this is " +"not what you intended, please create another list with a different name." +msgstr "Una lista eliminada con este nombre ha sido reactivada. Los permisos <strong>de los elementos existentes pueden </strong>aplicarse a esta lista y a cualquier miembro futuro. Si esto no es lo que pretendía, por favor, cree otra lista con un nombre diferente." + +#: ../../Zotlabs/Lib/AccessList.php:286 +msgid "Add new connections to this access list" +msgstr "Añadir nuevas conexiones a esta lista de acceso" + +#: ../../Zotlabs/Lib/AccessList.php:331 +msgid "Lists" +msgstr "Listas" + +#: ../../Zotlabs/Lib/AccessList.php:332 +msgid "Edit list" +msgstr "Editar lista" + +#: ../../Zotlabs/Lib/AccessList.php:333 +msgid "Create new list" +msgstr "Crear una nueva lista" + +#: ../../Zotlabs/Lib/AccessList.php:334 +msgid "Channels not in any access list" +msgstr "No hay canales en ninguna lista de acceso" + #: ../../Zotlabs/Lib/Permcat.php:82 msgctxt "permcat" msgid "default" @@ -14584,30 +14633,35 @@ msgctxt "permcat" msgid "publisher" msgstr "editor" -#: ../../Zotlabs/Lib/Activity.php:1656 +#: ../../Zotlabs/Lib/Activity.php:2045 #, php-format msgid "Likes %1$s's %2$s" msgstr "Gusta de %2$sde %1$s" -#: ../../Zotlabs/Lib/Activity.php:1659 +#: ../../Zotlabs/Lib/Activity.php:2048 #, php-format msgid "Doesn't like %1$s's %2$s" msgstr "No le gusta %2$sde %1$s" -#: ../../Zotlabs/Lib/Activity.php:1662 +#: ../../Zotlabs/Lib/Activity.php:2054 +#, php-format +msgid "Will attend %s's event" +msgstr "Asistirá al evento de %s" + +#: ../../Zotlabs/Lib/Activity.php:2057 #, php-format -msgid "Will attend %1$s's %2$s" -msgstr "Asistirá %2$sde %1$s" +msgid "Will not attend %s's event" +msgstr "No asistirá al evento de %s" -#: ../../Zotlabs/Lib/Activity.php:1665 +#: ../../Zotlabs/Lib/Activity.php:2060 #, php-format -msgid "Will not attend %1$s's %2$s" -msgstr "No asistirá %2$sde %1$s" +msgid "May attend %s's event" +msgstr "Puede asistir al evento de %s" -#: ../../Zotlabs/Lib/Activity.php:1668 +#: ../../Zotlabs/Lib/Activity.php:2063 #, php-format -msgid "May attend %1$s's %2$s" -msgstr "Puede asistir %2$sde %1$s" +msgid "May not attend %s's event" +msgstr "Puede no asistir al evento de %s" #: ../../Zotlabs/Lib/Enotify.php:60 msgid "$Projectname Notification" @@ -14667,327 +14721,340 @@ msgstr "Por favor visite %s para ver y/o responder a su mensaje privado." msgid "commented on" msgstr "ha comentado sobre " -#: ../../Zotlabs/Lib/Enotify.php:155 +#: ../../Zotlabs/Lib/Enotify.php:157 msgid "liked" msgstr "ha gustado de " -#: ../../Zotlabs/Lib/Enotify.php:158 +#: ../../Zotlabs/Lib/Enotify.php:160 msgid "disliked" msgstr "no ha gustado de " -#: ../../Zotlabs/Lib/Enotify.php:201 +#: ../../Zotlabs/Lib/Enotify.php:165 +msgid "voted on" +msgstr "votado en " + +#: ../../Zotlabs/Lib/Enotify.php:208 #, php-format msgid "%1$s %2$s [zrl=%3$s]a %4$s[/zrl]" msgstr "%1$s%2$s [zrl=%3$s ]un %4$s[/zrl]" -#: ../../Zotlabs/Lib/Enotify.php:209 +#: ../../Zotlabs/Lib/Enotify.php:216 #, php-format msgid "%1$s %2$s [zrl=%3$s]%4$s's %5$s[/zrl]" msgstr "%1$s %2$s[zrl=%3$s]%5$s de %4$s[/zrl]" -#: ../../Zotlabs/Lib/Enotify.php:218 +#: ../../Zotlabs/Lib/Enotify.php:225 #, php-format msgid "%1$s %2$s [zrl=%3$s]your %4$s[/zrl]" msgstr "%1$s %2$s [zrl=%3$s]su %4$s[/zrl]" -#: ../../Zotlabs/Lib/Enotify.php:230 +#: ../../Zotlabs/Lib/Enotify.php:237 #, php-format msgid "[$Projectname:Notify] Moderated Comment to conversation #%1$d by %2$s" msgstr "[$Projectname:Aviso] Comentario moderado en la conversación #%1$d por %2$s" -#: ../../Zotlabs/Lib/Enotify.php:232 +#: ../../Zotlabs/Lib/Enotify.php:239 #, php-format msgid "[$Projectname:Notify] Comment to conversation #%1$d by %2$s" msgstr "[$Projectname:Aviso] Nuevo comentario de %2$s en la conversación #%1$d" -#: ../../Zotlabs/Lib/Enotify.php:233 +#: ../../Zotlabs/Lib/Enotify.php:240 #, php-format msgid "%1$s commented on an item/conversation you have been following." msgstr "%1$sha comentado un elemento/conversación que ha estado siguiendo." -#: ../../Zotlabs/Lib/Enotify.php:236 ../../Zotlabs/Lib/Enotify.php:317 -#: ../../Zotlabs/Lib/Enotify.php:333 ../../Zotlabs/Lib/Enotify.php:358 -#: ../../Zotlabs/Lib/Enotify.php:375 ../../Zotlabs/Lib/Enotify.php:388 +#: ../../Zotlabs/Lib/Enotify.php:243 ../../Zotlabs/Lib/Enotify.php:324 +#: ../../Zotlabs/Lib/Enotify.php:340 ../../Zotlabs/Lib/Enotify.php:365 +#: ../../Zotlabs/Lib/Enotify.php:382 ../../Zotlabs/Lib/Enotify.php:395 #, php-format msgid "Please visit %s to view and/or reply to the conversation." msgstr "Para ver o comentar la conversación, visite %s" -#: ../../Zotlabs/Lib/Enotify.php:240 ../../Zotlabs/Lib/Enotify.php:241 +#: ../../Zotlabs/Lib/Enotify.php:247 ../../Zotlabs/Lib/Enotify.php:248 #, php-format msgid "Please visit %s to approve or reject this comment." msgstr "Por favor, visite %s para aprobar o rechazar este comentario." -#: ../../Zotlabs/Lib/Enotify.php:299 +#: ../../Zotlabs/Lib/Enotify.php:306 #, php-format msgid "%1$s liked [zrl=%2$s]your %3$s[/zrl]" msgstr "A %1$sle ha gustado [zrl=%2$s]su %3$s [/zrl]" -#: ../../Zotlabs/Lib/Enotify.php:313 +#: ../../Zotlabs/Lib/Enotify.php:320 #, php-format msgid "[$Projectname:Notify] Like received to conversation #%1$d by %2$s" msgstr "[$Projectname:Aviso] \"Me gusta\" de %2$s en la conversación #%1$d" -#: ../../Zotlabs/Lib/Enotify.php:314 +#: ../../Zotlabs/Lib/Enotify.php:321 #, php-format msgid "%1$s liked an item/conversation you created." msgstr "A %1$s le ha gustado un elemento o conversación que ha creado usted." -#: ../../Zotlabs/Lib/Enotify.php:325 +#: ../../Zotlabs/Lib/Enotify.php:332 #, php-format msgid "[$Projectname:Notify] %s posted to your profile wall" msgstr "[$Projectname:Aviso] %s ha publicado una entrada en su página de inicio del perfil (\"muro\")" -#: ../../Zotlabs/Lib/Enotify.php:327 +#: ../../Zotlabs/Lib/Enotify.php:334 #, php-format msgid "%1$s posted to your profile wall at %2$s" msgstr "%1$s ha publicado en su muro en %2$s" -#: ../../Zotlabs/Lib/Enotify.php:329 +#: ../../Zotlabs/Lib/Enotify.php:336 #, php-format msgid "%1$s posted to [zrl=%2$s]your wall[/zrl]" msgstr "%1$sha publicado en [zrl=%2$s]su muro[/zrl]" -#: ../../Zotlabs/Lib/Enotify.php:352 +#: ../../Zotlabs/Lib/Enotify.php:359 #, php-format msgid "[$Projectname:Notify] %s tagged you" msgstr "[$Projectname:Aviso] %s le ha etiquetado" -#: ../../Zotlabs/Lib/Enotify.php:353 +#: ../../Zotlabs/Lib/Enotify.php:360 #, php-format msgid "%1$s tagged you at %2$s" msgstr "%1$sle ha etiquetado en %2$s" -#: ../../Zotlabs/Lib/Enotify.php:354 +#: ../../Zotlabs/Lib/Enotify.php:361 #, php-format msgid "%1$s [zrl=%2$s]tagged you[/zrl]." msgstr "%1$s [zrl=%2$s]le ha etiquetado[/zrl]." -#: ../../Zotlabs/Lib/Enotify.php:365 +#: ../../Zotlabs/Lib/Enotify.php:372 #, php-format msgid "[$Projectname:Notify] %1$s poked you" msgstr "[$Projectname:Aviso] %1$s le ha dado un toque" -#: ../../Zotlabs/Lib/Enotify.php:366 +#: ../../Zotlabs/Lib/Enotify.php:373 #, php-format msgid "%1$s poked you at %2$s" msgstr "%1$sle ha dado un toque en %2$s" -#: ../../Zotlabs/Lib/Enotify.php:367 +#: ../../Zotlabs/Lib/Enotify.php:374 #, php-format msgid "%1$s [zrl=%2$s]poked you[/zrl]." msgstr "%1$s [zrl=%2$s] le ha dado un toque[/zrl]." -#: ../../Zotlabs/Lib/Enotify.php:382 +#: ../../Zotlabs/Lib/Enotify.php:389 #, php-format msgid "[$Projectname:Notify] %s tagged your post" msgstr "[$Projectname:Aviso] %s ha etiquetado su entrada" -#: ../../Zotlabs/Lib/Enotify.php:383 +#: ../../Zotlabs/Lib/Enotify.php:390 #, php-format msgid "%1$s tagged your post at %2$s" msgstr "%1$sha etiquetado su entrada en %2$s" -#: ../../Zotlabs/Lib/Enotify.php:384 +#: ../../Zotlabs/Lib/Enotify.php:391 #, php-format msgid "%1$s tagged [zrl=%2$s]your post[/zrl]" msgstr "%1$s ha etiquetado [zrl=%2$s]su entrada[/zrl]" -#: ../../Zotlabs/Lib/Enotify.php:395 +#: ../../Zotlabs/Lib/Enotify.php:402 msgid "[$Projectname:Notify] Introduction received" msgstr "[$Projectname:Aviso] Ha recibido una solicitud de conexión" -#: ../../Zotlabs/Lib/Enotify.php:396 +#: ../../Zotlabs/Lib/Enotify.php:403 #, php-format msgid "You've received an new connection request from '%1$s' at %2$s" msgstr "Ha recibido una nueva solicitud de conexión de '%1$s' en %2$s" -#: ../../Zotlabs/Lib/Enotify.php:397 +#: ../../Zotlabs/Lib/Enotify.php:404 #, php-format msgid "You've received [zrl=%1$s]a new connection request[/zrl] from %2$s." msgstr "Ha recibido [zrl=%1$s]una nueva solicitud de conexión[/zrl] de %2$s." -#: ../../Zotlabs/Lib/Enotify.php:400 ../../Zotlabs/Lib/Enotify.php:418 +#: ../../Zotlabs/Lib/Enotify.php:407 ../../Zotlabs/Lib/Enotify.php:425 #, php-format msgid "You may visit their profile at %s" msgstr "Puede visitar su perfil en %s" -#: ../../Zotlabs/Lib/Enotify.php:402 +#: ../../Zotlabs/Lib/Enotify.php:409 #, php-format msgid "Please visit %s to approve or reject the connection request." msgstr "Por favor, visite %s para permitir o rechazar la solicitad de conexión." -#: ../../Zotlabs/Lib/Enotify.php:409 +#: ../../Zotlabs/Lib/Enotify.php:416 msgid "[$Projectname:Notify] Friend suggestion received" msgstr "[$Projectname:Aviso] Ha recibido una sugerencia de conexión" -#: ../../Zotlabs/Lib/Enotify.php:410 +#: ../../Zotlabs/Lib/Enotify.php:417 #, php-format msgid "You've received a friend suggestion from '%1$s' at %2$s" msgstr "Ha recibido una sugerencia de amistad de '%1$s' en %2$s" -#: ../../Zotlabs/Lib/Enotify.php:411 +#: ../../Zotlabs/Lib/Enotify.php:418 #, php-format msgid "" "You've received [zrl=%1$s]a friend suggestion[/zrl] for %2$s from %3$s." msgstr "Ha recibido [zrl=%1$s]una sugerencia de amistad[/zrl] para %2$s de %3$s." -#: ../../Zotlabs/Lib/Enotify.php:416 +#: ../../Zotlabs/Lib/Enotify.php:423 msgid "Name:" msgstr "Nombre:" -#: ../../Zotlabs/Lib/Enotify.php:417 +#: ../../Zotlabs/Lib/Enotify.php:424 msgid "Photo:" msgstr "Foto:" -#: ../../Zotlabs/Lib/Enotify.php:420 +#: ../../Zotlabs/Lib/Enotify.php:427 #, php-format msgid "Please visit %s to approve or reject the suggestion." msgstr "Por favor, visite %s para aprobar o rechazar la sugerencia." -#: ../../Zotlabs/Lib/Enotify.php:640 +#: ../../Zotlabs/Lib/Enotify.php:652 msgid "[$Projectname:Notify]" msgstr "[$Projectname:Aviso]" -#: ../../Zotlabs/Lib/Enotify.php:808 +#: ../../Zotlabs/Lib/Enotify.php:820 +msgid "created a new poll" +msgstr "se ha creado una nueva encuesta" + +#: ../../Zotlabs/Lib/Enotify.php:820 msgid "created a new post" msgstr "ha creado una nueva entrada" -#: ../../Zotlabs/Lib/Enotify.php:809 +#: ../../Zotlabs/Lib/Enotify.php:821 +#, php-format +msgid "voted on %s's poll" +msgstr "votado en la encuesta de %s" + +#: ../../Zotlabs/Lib/Enotify.php:821 #, php-format msgid "commented on %s's post" msgstr "ha comentado la entrada de %s" -#: ../../Zotlabs/Lib/Enotify.php:812 +#: ../../Zotlabs/Lib/Enotify.php:825 #, php-format msgid "repeated %s's post" msgstr "repetida la entrada de %s" -#: ../../Zotlabs/Lib/Enotify.php:821 +#: ../../Zotlabs/Lib/Enotify.php:837 #, php-format msgid "edited a post dated %s" msgstr "ha editado una entrada %s" -#: ../../Zotlabs/Lib/Enotify.php:825 +#: ../../Zotlabs/Lib/Enotify.php:841 #, php-format msgid "edited a comment dated %s" msgstr "ha editado un comentario %s" -#: ../../Zotlabs/Lib/Chatroom.php:23 +#: ../../Zotlabs/Lib/Connect.php:275 +msgid "error saving data" +msgstr "error guardando los datos" + +#: ../../Zotlabs/Lib/Chatroom.php:25 msgid "Missing room name" msgstr "Sala de chat sin nombre" -#: ../../Zotlabs/Lib/Chatroom.php:32 +#: ../../Zotlabs/Lib/Chatroom.php:34 msgid "Duplicate room name" msgstr "Nombre de sala duplicado." -#: ../../Zotlabs/Lib/Chatroom.php:82 ../../Zotlabs/Lib/Chatroom.php:90 +#: ../../Zotlabs/Lib/Chatroom.php:84 ../../Zotlabs/Lib/Chatroom.php:92 msgid "Invalid room specifier." msgstr "Especificador de sala no válido." -#: ../../Zotlabs/Lib/Chatroom.php:122 +#: ../../Zotlabs/Lib/Chatroom.php:124 msgid "Room not found." msgstr "Sala no encontrada." -#: ../../Zotlabs/Lib/Chatroom.php:143 +#: ../../Zotlabs/Lib/Chatroom.php:145 msgid "Room is full" msgstr "La sala está llena." -#: ../../Zotlabs/Lib/NativeWiki.php:143 +#: ../../Zotlabs/Lib/NativeWiki.php:145 msgid "Wiki updated successfully" msgstr "El wiki se ha actualizado con éxito" -#: ../../Zotlabs/Lib/NativeWiki.php:197 +#: ../../Zotlabs/Lib/NativeWiki.php:199 msgid "Wiki files deleted successfully" msgstr "Se han borrado con éxito los ficheros del wiki" -#: ../../Zotlabs/Lib/Apps.php:322 +#: ../../Zotlabs/Lib/Apps.php:323 msgid "Apps" msgstr "Aplicaciones (apps)" -#: ../../Zotlabs/Lib/Apps.php:323 +#: ../../Zotlabs/Lib/Apps.php:324 msgid "Affinity Tool" msgstr "Herramienta de afinidad" -#: ../../Zotlabs/Lib/Apps.php:326 +#: ../../Zotlabs/Lib/Apps.php:327 msgid "Site Admin" msgstr "Administrador del sitio" -#: ../../Zotlabs/Lib/Apps.php:330 +#: ../../Zotlabs/Lib/Apps.php:331 msgid "Content Filter" msgstr "Filtro de contenido" -#: ../../Zotlabs/Lib/Apps.php:333 +#: ../../Zotlabs/Lib/Apps.php:334 msgid "Remote Diagnostics" msgstr "Diagnóstico remoto" -#: ../../Zotlabs/Lib/Apps.php:334 +#: ../../Zotlabs/Lib/Apps.php:335 msgid "Suggest Channels" msgstr "Sugerir canales" -#: ../../Zotlabs/Lib/Apps.php:337 +#: ../../Zotlabs/Lib/Apps.php:338 msgid "Stream" msgstr "Stream" -#: ../../Zotlabs/Lib/Apps.php:348 +#: ../../Zotlabs/Lib/Apps.php:349 msgid "Mail" msgstr "Correo" -#: ../../Zotlabs/Lib/Apps.php:351 +#: ../../Zotlabs/Lib/Apps.php:352 msgid "Chat" msgstr "Chat" -#: ../../Zotlabs/Lib/Apps.php:353 +#: ../../Zotlabs/Lib/Apps.php:354 msgid "Probe" msgstr "Probar" -#: ../../Zotlabs/Lib/Apps.php:354 +#: ../../Zotlabs/Lib/Apps.php:355 msgid "Suggest" msgstr "Sugerir" -#: ../../Zotlabs/Lib/Apps.php:355 +#: ../../Zotlabs/Lib/Apps.php:356 msgid "Random Channel" msgstr "Canal aleatorio" -#: ../../Zotlabs/Lib/Apps.php:356 +#: ../../Zotlabs/Lib/Apps.php:357 msgid "Invite" msgstr "Invitar" -#: ../../Zotlabs/Lib/Apps.php:359 +#: ../../Zotlabs/Lib/Apps.php:360 msgid "Post" msgstr "Publicación" -#: ../../Zotlabs/Lib/Apps.php:364 +#: ../../Zotlabs/Lib/Apps.php:365 msgid "Notifications" msgstr "Notificaciones" -#: ../../Zotlabs/Lib/Apps.php:365 +#: ../../Zotlabs/Lib/Apps.php:366 msgid "Order Apps" msgstr "Ordenar las apps" -#: ../../Zotlabs/Lib/Apps.php:366 +#: ../../Zotlabs/Lib/Apps.php:367 msgid "CardDAV" msgstr "CardDAV" -#: ../../Zotlabs/Lib/Apps.php:368 +#: ../../Zotlabs/Lib/Apps.php:369 msgid "Guest Access" msgstr "Acceso para invitados" -#: ../../Zotlabs/Lib/Apps.php:370 +#: ../../Zotlabs/Lib/Apps.php:371 msgid "OAuth Apps Manager" msgstr "Administrador de apps OAuth" -#: ../../Zotlabs/Lib/Apps.php:371 +#: ../../Zotlabs/Lib/Apps.php:372 msgid "OAuth2 Apps Manager" msgstr "Administrador de apps OAuth2" -#: ../../Zotlabs/Lib/Apps.php:372 +#: ../../Zotlabs/Lib/Apps.php:373 msgid "PDL Editor" msgstr "Editor PDL" -#: ../../Zotlabs/Lib/Apps.php:374 -msgid "Premium Channel" -msgstr "Canal premium" - #: ../../Zotlabs/Lib/Apps.php:376 msgid "My Chatrooms" msgstr "Mis salas de chat" @@ -15004,19 +15071,19 @@ msgstr "Comprar" msgid "Undelete" msgstr "Recuperar" -#: ../../Zotlabs/Lib/Apps.php:568 +#: ../../Zotlabs/Lib/Apps.php:569 msgid "Add to app-tray" msgstr "Añadir a la bandeja de aplicaciones" -#: ../../Zotlabs/Lib/Apps.php:569 +#: ../../Zotlabs/Lib/Apps.php:570 msgid "Remove from app-tray" msgstr "Quitar de la bandeja de aplicaciones" -#: ../../Zotlabs/Lib/Apps.php:570 +#: ../../Zotlabs/Lib/Apps.php:571 msgid "Pin to navbar" msgstr "Fijar en la barra de navegación" -#: ../../Zotlabs/Lib/Apps.php:571 +#: ../../Zotlabs/Lib/Apps.php:572 msgid "Unpin from navbar" msgstr "Quitar de la barra de navegación" @@ -15105,135 +15172,83 @@ msgstr "Se necesita Wiki resource_id para el git commit" msgid "Privacy conflict. Discretion advised." msgstr "Conflicto de privacidad. Se aconseja discreción." -#: ../../Zotlabs/Lib/ThreadItem.php:172 ../../Zotlabs/Storage/Browser.php:286 +#: ../../Zotlabs/Lib/ThreadItem.php:174 ../../Zotlabs/Storage/Browser.php:286 msgid "Admin Delete" msgstr "Eliminar admin" -#: ../../Zotlabs/Lib/ThreadItem.php:203 -msgid "I will attend" -msgstr "Participaré" - -#: ../../Zotlabs/Lib/ThreadItem.php:203 -msgid "I will not attend" -msgstr "No participaré" - -#: ../../Zotlabs/Lib/ThreadItem.php:203 -msgid "I might attend" -msgstr "Quizá participe" - -#: ../../Zotlabs/Lib/ThreadItem.php:213 -msgid "I agree" -msgstr "Estoy de acuerdo" - -#: ../../Zotlabs/Lib/ThreadItem.php:213 -msgid "I disagree" -msgstr "No estoy de acuerdo" - -#: ../../Zotlabs/Lib/ThreadItem.php:213 -msgid "I abstain" -msgstr "Me abstengo" - -#: ../../Zotlabs/Lib/ThreadItem.php:287 -msgid "Add Tag" -msgstr "Añadir etiqueta" - -#: ../../Zotlabs/Lib/ThreadItem.php:309 +#: ../../Zotlabs/Lib/ThreadItem.php:319 msgid "Reply on this comment" msgstr "Responder a este comentario" -#: ../../Zotlabs/Lib/ThreadItem.php:309 +#: ../../Zotlabs/Lib/ThreadItem.php:319 msgid "reply" msgstr "responder" -#: ../../Zotlabs/Lib/ThreadItem.php:309 +#: ../../Zotlabs/Lib/ThreadItem.php:319 msgid "Reply to" msgstr "Responder a " -#: ../../Zotlabs/Lib/ThreadItem.php:319 -msgid "Share This" -msgstr "Compartir esto" - -#: ../../Zotlabs/Lib/ThreadItem.php:319 -msgid "share" -msgstr "compartir" - -#: ../../Zotlabs/Lib/ThreadItem.php:329 +#: ../../Zotlabs/Lib/ThreadItem.php:339 msgid "Delivery Report" msgstr "Informe de transmisión" -#: ../../Zotlabs/Lib/ThreadItem.php:348 +#: ../../Zotlabs/Lib/ThreadItem.php:358 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "%d comentario" msgstr[1] "%d comentarios" -#: ../../Zotlabs/Lib/ThreadItem.php:380 ../../Zotlabs/Lib/ThreadItem.php:381 +#: ../../Zotlabs/Lib/ThreadItem.php:359 #, php-format -msgid "View %s's profile - %s" -msgstr "Ver el perfil de %s - %s" +msgid "%d unseen" +msgstr "%dno visto/a vistos/as" -#: ../../Zotlabs/Lib/ThreadItem.php:384 +#: ../../Zotlabs/Lib/ThreadItem.php:412 msgid "to" msgstr "a" -#: ../../Zotlabs/Lib/ThreadItem.php:385 -msgid "via" -msgstr "mediante" - -#: ../../Zotlabs/Lib/ThreadItem.php:386 +#: ../../Zotlabs/Lib/ThreadItem.php:414 msgid "Wall-to-Wall" msgstr "De página del perfil a página del perfil (de \"muro\" a \"muro\")" -#: ../../Zotlabs/Lib/ThreadItem.php:387 +#: ../../Zotlabs/Lib/ThreadItem.php:415 msgid "via Wall-To-Wall:" msgstr "Mediante el procedimiento página del perfil a página del perfil (de \"muro\" a \"muro\")" -#: ../../Zotlabs/Lib/ThreadItem.php:413 +#: ../../Zotlabs/Lib/ThreadItem.php:442 msgid "Attend" msgstr "Participar o asistir" -#: ../../Zotlabs/Lib/ThreadItem.php:414 -msgid "Attendance Options" -msgstr "Opciones de participación o asistencia" - -#: ../../Zotlabs/Lib/ThreadItem.php:415 -msgid "Vote" -msgstr "Votar" - -#: ../../Zotlabs/Lib/ThreadItem.php:416 -msgid "Voting Options" -msgstr "Opciones de votación" - -#: ../../Zotlabs/Lib/ThreadItem.php:431 +#: ../../Zotlabs/Lib/ThreadItem.php:460 msgid "Go to previous comment" msgstr "Ir al comentario anterior" -#: ../../Zotlabs/Lib/ThreadItem.php:441 +#: ../../Zotlabs/Lib/ThreadItem.php:473 msgid "Add to Calendar" msgstr "Añadir al calendario" -#: ../../Zotlabs/Lib/ThreadItem.php:802 +#: ../../Zotlabs/Lib/ThreadItem.php:831 msgid "Image" msgstr "Imagen" -#: ../../Zotlabs/Lib/ThreadItem.php:804 +#: ../../Zotlabs/Lib/ThreadItem.php:833 msgid "Insert Link" msgstr "Insertar enlace" -#: ../../Zotlabs/Lib/ThreadItem.php:805 +#: ../../Zotlabs/Lib/ThreadItem.php:834 msgid "Video" msgstr "Vídeo" -#: ../../Zotlabs/Lib/ThreadItem.php:815 +#: ../../Zotlabs/Lib/ThreadItem.php:844 msgid "Your full name (required)" msgstr "Su nombre completo (requerido)" -#: ../../Zotlabs/Lib/ThreadItem.php:816 +#: ../../Zotlabs/Lib/ThreadItem.php:845 msgid "Your email address (required)" msgstr "Su dirección de correo electrónico (requerido)" -#: ../../Zotlabs/Lib/ThreadItem.php:817 +#: ../../Zotlabs/Lib/ThreadItem.php:846 msgid "Your website URL (optional)" msgstr "La URL de su sitio web (opcional)" @@ -15304,67 +15319,67 @@ msgstr "Este es su ajuste predeterminado para establecer quién puede ver su rep msgid "This is your default setting for the audience of your webpages" msgstr "Este es el ajuste predeterminado para establecer la audiencia de sus páginas web" -#: ../../Zotlabs/Access/PermissionRoles.php:283 +#: ../../Zotlabs/Access/PermissionRoles.php:287 msgid "Social Networking" msgstr "Redes sociales" -#: ../../Zotlabs/Access/PermissionRoles.php:284 +#: ../../Zotlabs/Access/PermissionRoles.php:288 msgid "Social - Federation" msgstr "Social - Federación" -#: ../../Zotlabs/Access/PermissionRoles.php:285 +#: ../../Zotlabs/Access/PermissionRoles.php:289 msgid "Social - Mostly Public" msgstr "Social - Público en su mayor parte" -#: ../../Zotlabs/Access/PermissionRoles.php:286 +#: ../../Zotlabs/Access/PermissionRoles.php:290 msgid "Social - Restricted" msgstr "Social - Restringido" -#: ../../Zotlabs/Access/PermissionRoles.php:287 +#: ../../Zotlabs/Access/PermissionRoles.php:291 msgid "Social - Private" msgstr "Social - Privado" -#: ../../Zotlabs/Access/PermissionRoles.php:290 +#: ../../Zotlabs/Access/PermissionRoles.php:294 msgid "Community Forum" msgstr "Foro de discusión" -#: ../../Zotlabs/Access/PermissionRoles.php:291 +#: ../../Zotlabs/Access/PermissionRoles.php:295 msgid "Forum - Mostly Public" msgstr "Foro - Público en su mayor parte" -#: ../../Zotlabs/Access/PermissionRoles.php:292 +#: ../../Zotlabs/Access/PermissionRoles.php:296 msgid "Forum - Restricted" msgstr "Foro - Restringido" -#: ../../Zotlabs/Access/PermissionRoles.php:293 +#: ../../Zotlabs/Access/PermissionRoles.php:297 msgid "Forum - Private" msgstr "Foro - Privado" -#: ../../Zotlabs/Access/PermissionRoles.php:296 +#: ../../Zotlabs/Access/PermissionRoles.php:300 msgid "Feed Republish" msgstr "Republicar un \"feed\"" -#: ../../Zotlabs/Access/PermissionRoles.php:297 +#: ../../Zotlabs/Access/PermissionRoles.php:301 msgid "Feed - Mostly Public" msgstr "Feed - Público en su mayor parte" -#: ../../Zotlabs/Access/PermissionRoles.php:298 +#: ../../Zotlabs/Access/PermissionRoles.php:302 msgid "Feed - Restricted" msgstr "Feed - Restringido" -#: ../../Zotlabs/Access/PermissionRoles.php:301 +#: ../../Zotlabs/Access/PermissionRoles.php:305 msgid "Special Purpose" msgstr "Propósito especial" -#: ../../Zotlabs/Access/PermissionRoles.php:302 +#: ../../Zotlabs/Access/PermissionRoles.php:306 msgid "Special - Celebrity/Soapbox" msgstr "Especial - Celebridad / Tribuna improvisada" -#: ../../Zotlabs/Access/PermissionRoles.php:303 +#: ../../Zotlabs/Access/PermissionRoles.php:307 msgid "Special - Group Repository" msgstr "Especial - Repositorio de grupo" -#: ../../Zotlabs/Access/PermissionRoles.php:307 +#: ../../Zotlabs/Access/PermissionRoles.php:311 msgid "Custom/Expert Mode" msgstr "Modo personalizado/experto" @@ -15498,40 +15513,40 @@ msgstr "Subir fichero" msgid "Drop files here to immediately upload" msgstr "Arrastre los ficheros aquí para subirlos de forma inmediata" -#: ../../boot.php:1653 +#: ../../boot.php:1677 msgid "Create an account to access services and applications" msgstr "Crear una cuenta para acceder a los servicios y aplicaciones" -#: ../../boot.php:1677 +#: ../../boot.php:1701 msgid "Login/Email" msgstr "Inicio de sesión / Correo electrónico" -#: ../../boot.php:1678 +#: ../../boot.php:1702 msgid "Password" msgstr "Contraseña" -#: ../../boot.php:1679 +#: ../../boot.php:1703 msgid "Remember me" msgstr "Recordarme" -#: ../../boot.php:1682 +#: ../../boot.php:1706 msgid "Forgot your password?" msgstr "¿Olvidó su contraseña?" -#: ../../boot.php:2478 +#: ../../boot.php:2575 #, php-format msgid "[$Projectname] Website SSL error for %s" msgstr "[$Projectname] Error SSL del sitio web en %s" -#: ../../boot.php:2483 +#: ../../boot.php:2580 msgid "Website SSL certificate is not valid. Please correct." msgstr "El certificado SSL del sitio web no es válido. Por favor, solucione el problema." -#: ../../boot.php:2599 +#: ../../boot.php:2696 #, php-format msgid "[$Projectname] Cron tasks not running on %s" msgstr "[$Projectname] Las tareas de Cron no están funcionando en %s" -#: ../../boot.php:2604 +#: ../../boot.php:2701 msgid "Cron/Scheduled tasks not running." msgstr "Las tareas del Planificador/Cron no están funcionando." diff --git a/view/es-es/hstrings.php b/view/es-es/hstrings.php index 1ce5cd3aa..2eb593936 100644 --- a/view/es-es/hstrings.php +++ b/view/es-es/hstrings.php @@ -101,41 +101,6 @@ App::$strings["Assume workers dead after ___ seconds"] = "Asumir que el proceso App::$strings["Pause before starting next task: (microseconds. Minimum 100 = .0001 seconds)"] = "Haga una pausa antes de comenzar la siguiente tarea: (microsegundos. Mínimo 100 =.0001 segundos)"; App::$strings["Queueworker Settings"] = "Configuración del gestor de procesos de trabajo en cola"; App::$strings["Save"] = "Guardar"; -App::$strings["Edit your profile and change settings."] = "Editar su perfil y cambiar los ajustes."; -App::$strings["Click here to see activity from your connections."] = "Pulsar aquí para ver la actividad de sus conexiones."; -App::$strings["Click here to see your channel home."] = "Pulsar aquí para ver la página de inicio de su canal."; -App::$strings["You can access your private messages from here."] = "Puede acceder a sus mensajes privados desde aquí."; -App::$strings["Create new events here."] = "Crear nuevos eventos aquí."; -App::$strings["You can accept new connections and change permissions for existing ones here. You can also e.g. create groups of contacts."] = "Puede aceptar nuevas conexiones y cambiar permisos para las que ya existen aquí. También puede, por ejemplo, crear grupos de contactos."; -App::$strings["System notifications will arrive here"] = "Las notificaciones del sistema llegarán aquí"; -App::$strings["Search for content and users"] = "Buscar contenido y usuarios"; -App::$strings["Browse for new contacts"] = "Buscar nuevos contactos"; -App::$strings["Launch installed apps"] = "Iniciar aplicaciones instaladas"; -App::$strings["Looking for help? Click here."] = "¿Busca ayuda? Pulse aquí."; -App::$strings["New events have occurred in your network. Click here to see what has happened!"] = "Se han producido nuevos eventos en su red. ¡Haga clic aquí para ver lo que ha sucedido!"; -App::$strings["You have received a new private message. Click here to see from who!"] = "Ha recibido un nuevo mensaje privado. Haga clic aquí para ver de quién!"; -App::$strings["There are events this week. Click here too see which!"] = "Hay eventos esta semana. Haga clic aquí para ver cuáles!"; -App::$strings["You have received a new introduction. Click here to see who!"] = "Ha recibido una nueva solicitud de conexión. ¡Pulse aquí para ver de quién!"; -App::$strings["There is a new system notification. Click here to see what has happened!"] = "Hay una nueva notificación del sistema. ¡Haga clic aquí para ver lo que ha sucedido!"; -App::$strings["Click here to share text, images, videos and sound."] = "Haga clic aquí para compartir texto, imágenes, vídeos y sonido."; -App::$strings["You can write an optional title for your update (good for long posts)."] = "Puede escribir un título opcional para su actualización (bueno para los mensajes largos)."; -App::$strings["Entering some categories here makes it easier to find your post later."] = "Al ingresar algunos temas aquí, es más fácil encontrar su publicación más tarde."; -App::$strings["Share photos, links, location, etc."] = "Compartir fotos, enlaces, ubicación, etc."; -App::$strings["Only want to share content for a while? Make it expire at a certain date."] = "¿Solo quieres compartir contenido durante un tiempo? Haga que expire en una fecha determinada."; -App::$strings["You can password protect content."] = "Puede proteger contenido con una contraseña."; -App::$strings["Choose who you share with."] = "Elegir con quién compartir."; -App::$strings["Click here when you are done."] = "Haga clic aquí cuando haya terminado."; -App::$strings["Adjust from which channels posts should be displayed."] = "Ajustar de qué canales se deben mostrar las publicaciones."; -App::$strings["Only show posts from channels in the specified privacy group."] = "Mostrar solo las entradas de los canales de un grupo específico de canales."; -App::$strings["Easily find posts containing tags (keywords preceded by the \"#\" symbol)."] = "Encuentre fácilmente entradas que contengan etiquetas (palabras clave precedidas del símbolo \"#\")."; -App::$strings["Easily find posts in given category."] = "Encuentre fácilmente las publicaciones en una categoría dada."; -App::$strings["Easily find posts by date."] = "Encuentre fácilmente entradas por fechas."; -App::$strings["Suggested users who have volounteered to be shown as suggestions, and who we think you might find interesting."] = "Se sugiere a los usuarios que se han ofrecido voluntariamente que se muestren como sugerencias, y que creemos que podrían resultar interesantes."; -App::$strings["Here you see channels you have connected to."] = "Aquí puede ver los canales a los que está conectado."; -App::$strings["Save your search so you can repeat it at a later date."] = "Guarde su búsqueda para poder repetirla en una fecha posterior."; -App::$strings["If you see this icon you can be sure that the sender is who it say it is. It is normal that it is not always possible to verify the sender, so the icon will be missing sometimes. There is usually no need to worry about that."] = "Si ve este icono puede estar seguro de que el remitente es quien dice ser. Es normal que no siempre sea posible verificar el remitente, por lo que el icono faltará en ocasiones. Por lo general, no hay necesidad de preocuparse por eso."; -App::$strings["Danger! It seems someone tried to forge a message! This message is not necessarily from who it says it is from!"] = "¡Peligro! ¡Parece que alguien intentó falsificar un mensaje! ¡Este mensaje no es necesariamente de quien dice que es!"; -App::$strings["Welcome to Hubzilla! Would you like to see a tour of the UI?</p> <p>You can pause it at any time and continue where you left off by reloading the page, or navigting to another page.</p><p>You can also advance by pressing the return key"] = "¡Bienvenido/a a Hubzilla! ¿Quiere hacer un recorrido por la interfaz de usuario?</p> <p> Puede detenerlo en cualquier momento y continuar donde lo dejó recargando la página o navegando a otra.</p> <p> También puede avanzar pulsando la tecla de retorno"; App::$strings["Add some colour to tag clouds"] = "Añadir color a las nubes de etiquetas"; App::$strings["Rainbow Tag App"] = "App Etiqueta Arcoiris"; App::$strings["Rainbow Tag"] = "Etiqueta Arcoiris"; @@ -272,11 +237,6 @@ App::$strings["API URL"] = "URL de la API"; App::$strings["Consumer Secret"] = "Consumer Secret"; App::$strings["Consumer Key"] = "Consumer Key"; App::$strings["Application name"] = "Nombre de la aplicación"; -App::$strings["Friendica Photo Album Import"] = "Importar un álbum de fotos de Friendica"; -App::$strings["This will import all your Friendica photo albums to this Red channel."] = "Esto importará todos sus álbumes de fotos de Friendica a este canal de Hubzilla."; -App::$strings["Friendica Server base URL"] = "URL base del servidor de Friendica"; -App::$strings["Friendica Login Username"] = "Nombre de inicio de sesión en Friendica"; -App::$strings["Friendica Login Password"] = "Contraseña de inicio de sesión en Friendica"; App::$strings["Friendica Crosspost Connector Settings saved."] = "Se han guardado los ajustes del conector de publicación cruzada con Friendica."; App::$strings["Friendica Crosspost Connector App"] = "App Friendica Crosspost Connector"; App::$strings["Relay public postings to a connected Friendica account"] = "Retransmisión de entradas públicas a una cuenta Friendica conectada"; @@ -287,6 +247,7 @@ App::$strings["Friendica password"] = "Contraseña de Friendica"; App::$strings["Friendica Crosspost Connector"] = "Friendica Crosspost Connector"; App::$strings["Post to Friendica"] = "Publicar en Friendica"; App::$strings["Post to WordPress"] = "Publicar en WordPress"; +App::$strings["Source"] = "Fuente"; App::$strings["Wordpress Settings saved."] = "Se han guardado los ajustes de WordPress."; App::$strings["Wordpress Post App"] = "App Publicar en Wordpress"; App::$strings["Post to WordPress or anything else which uses the wordpress XMLRPC API"] = "Publicar en WordPress o cualquier otra cosa que utilice la API XMLRPC de wordpress"; @@ -298,6 +259,8 @@ App::$strings["WordPress blogid"] = "Blog de WordPress"; App::$strings["For multi-user sites such as wordpress.com, otherwise leave blank"] = "Para sitios multiusuario como wordpress.com, de lo contrario, dejar en blanco"; App::$strings["Post to WordPress by default"] = "Publicar en WordPress por defecto"; App::$strings["Forward comments (requires hubzilla_wp plugin)"] = "Reenviar comentarios (requerido por el plugin hubzilla_wp)"; +App::$strings["Add link to original post"] = "Añadir enlace a la entrada original"; +App::$strings["Link description (default:"] = "Descripción del enlace (por defecto: "; App::$strings["Wordpress Post"] = "Publicar en Wordpress"; App::$strings["No server specified"] = "No se ha especificado ningún servidor"; App::$strings["Posts imported"] = "Entradas importadas"; @@ -392,7 +355,7 @@ App::$strings["An account has been created for you."] = "Se ha creado una cuenta App::$strings["Authentication successful but rejected: account creation is disabled."] = "Autenticación correcta pero rechazada: la creación de cuentas está deshabilitada."; App::$strings["Dreamwidth Crosspost Connector Settings saved."] = "Se han guardado los ajustes del conector de publicación cruzada Dreamwidth."; App::$strings["Dreamwidth Crosspost Connector App"] = "App Dreamwidth Crosspost Connector"; -App::$strings["Relay public postings to Dreamwidth"] = "Retransmisión de entradas públicas a Dreamwidth"; +App::$strings["Relay public posts to Dreamwidth"] = "Reenviar las entradas públicas a Dreamwidth"; App::$strings["Dreamwidth username"] = "Nombre de usuario en Dreamwidth"; App::$strings["Dreamwidth password"] = "Contraseña en Dreamwidth"; App::$strings["Post to Dreamwidth by default"] = "Publicar en Dreamwidth de forma predeterminada"; @@ -471,6 +434,30 @@ App::$strings["Set a preferred page to load on login from home page"] = "Estable App::$strings["Page to load after login"] = "Página para cargar tras el inicio de sesión"; App::$strings["Examples: "apps", "network?f=&gid=37" (privacy collection), "channel" or "notifications/system" (leave blank for default network page (grid)."] = "Ejemplos: "aplicaciones", "mi red?f=&gid=37" (grupo de canales), "mi canal" or "notificaciones del sistema" (dejar en blanco para la página de mi red por defecto (grid)."; App::$strings["Startpage"] = "Startpage"; +App::$strings["Messages"] = "Mensajes"; +App::$strings["message"] = "mensaje"; +App::$strings["Message recalled."] = "Mensaje revocado."; +App::$strings["Conversation removed."] = "Conversación eliminada."; +App::$strings["Expires YYYY-MM-DD HH:MM"] = "Caduca YYYY-MM-DD HH:MM"; +App::$strings["Requested channel is not in this network"] = "El canal solicitado no existe en esta red"; +App::$strings["Send Private Message"] = "Enviar un mensaje privado"; +App::$strings["To:"] = "Para:"; +App::$strings["Subject:"] = "Asunto:"; +App::$strings["Your message:"] = "Su mensaje:"; +App::$strings["Attach file"] = "Adjuntar fichero"; +App::$strings["Send"] = "Enviar"; +App::$strings["Delete message"] = "Borrar mensaje"; +App::$strings["Delivery report"] = "Informe de transmisión"; +App::$strings["Recall message"] = "Revocar el mensaje"; +App::$strings["Message has been recalled."] = "El mensaje ha sido revocado."; +App::$strings["Delete Conversation"] = "Eliminar conversación"; +App::$strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Comunicación segura no disponible. Pero <strong>puede</strong> responder desde la página del perfil del remitente."; +App::$strings["Send Reply"] = "Responder"; +App::$strings["Your message for %s (%s):"] = "Su mensaje para %s (%s):"; +App::$strings["Unable to lookup recipient."] = "No se puede asociar a un destinatario."; +App::$strings["Unable to communicate with requested channel."] = "No se puede establecer la comunicación con el canal solicitado."; +App::$strings["Cannot verify requested channel."] = "No se puede verificar el canal solicitado."; +App::$strings["Selected channel has private message restrictions. Send failed."] = "El canal seleccionado tiene restricciones sobre los mensajes privados. El envío falló."; App::$strings["Flag Adult Photos"] = "Indicador (\"flag\") de fotos de adultos"; App::$strings["Provide photo edit option to hide inappropriate photos from default album view"] = "Proporcionar una opción de edición de fotos para ocultar las fotos inapropiadas de la vista de álbum predeterminada"; App::$strings["Your channel has been upgraded to \$Projectname version"] = "Su canal ha sido actualizado a la versión \$Projectname"; @@ -560,6 +547,10 @@ App::$strings["Photo URL"] = "URL de la foto"; App::$strings["Add buyer to privacy group"] = "Agregar comprador al grupo de canales"; App::$strings["Add buyer as connection"] = "Añadir comprador como conexión"; App::$strings["Set Service Class"] = "Establecer clase de servicio"; +App::$strings["Enable Order/Item Options"] = "Habilitar las opciones de pedido/artículo"; +App::$strings["Label"] = "Etiqueta"; +App::$strings["Required"] = "Obligatorio"; +App::$strings["Instructions"] = "Instrucciones"; App::$strings["Enable Paypal Button Module"] = "Habilitar el módulo del botón de Paypal"; App::$strings["Use Production Key"] = "Utilizar clave en entorno de producción"; App::$strings["Paypal Sandbox Client Key"] = "Clave de cliente en el entorno de pruebas de Paypal"; @@ -568,6 +559,7 @@ App::$strings["Paypal Production Client Key"] = "Clave de cliente en el entorno App::$strings["Paypal Production Secret Key"] = "Clave secreta en el entorno de producción de Paypal"; App::$strings["Paypal button payments are not enabled."] = "Los pagos con el botón de Paypal no están habilitados."; App::$strings["Paypal button payments are not properly configured. Please choose another payment option."] = "Los pagos con el botón de Paypal no están configurados correctamente. Por favor, elija otra opción de pago."; +App::$strings["Enable Paypal Button Module (API-v2)"] = "Habilitar el módulo de botones de Paypal (API-v2)"; App::$strings["Enable Manual Cart Module"] = "Habilitar el módulo de carro manual"; App::$strings["Access Denied."] = "Acceso denegado"; App::$strings["Order Not Found"] = "No se ha encontrado el pedido"; @@ -587,6 +579,8 @@ App::$strings["You must be logged into the Grid to shop."] = "Debe iniciar sesi App::$strings["Access denied."] = "Acceso denegado"; App::$strings["No Order Found"] = "No se ha encontrado ningún pedido"; App::$strings["An unknown error has occurred Please start again."] = "Se ha producido un error desconocido Vuelva a empezar."; +App::$strings["Requirements not met."] = "No se cumplen los requisitos."; +App::$strings["Review your order and complete any needed requirements."] = "Revise su pedido y complete los requisitos necesarios."; App::$strings["Invalid Payment Type. Please start again."] = "Tipo de pago no válido. Por favor, empiece de nuevo."; App::$strings["Order not found"] = "El pedido no se ha encontrado"; App::$strings["nofed Settings saved."] = "Se han guardado los ajustes de nofed."; @@ -602,6 +596,10 @@ App::$strings["Smileybutton Settings"] = "Ajustes de Smileybutton"; App::$strings["file"] = "fichero"; App::$strings["Redmatrix File Storage Import"] = "Importar repositorio de ficheros de Redmatrix"; App::$strings["This will import all your Redmatrix cloud files to this channel."] = "Esto importará todos sus ficheros de la nube de Redmatrix a este canal."; +App::$strings["Please install the statistics addon to be able to configure a diaspora relay"] = "Por favor, instale el complemento de estadísticas para poder configurar el reenvío de diaspora"; +App::$strings["Diaspora Relay Handle"] = "Gestionar el reenvío de Diaspora"; +App::$strings["Address of a diaspora relay. Example: relay@diasporarelay.tld"] = "La dirección de una transmisión de diaspora. Ejemplo: relay@diasporarelay.tld"; +App::$strings["Diaspora relay could not be imported"] = "El reenvío de Diaspora no ha podido ser importado"; App::$strings["\$projectname"] = "\$projectname"; App::$strings["No username found in import file."] = "No se ha encontrado el nombre de usuario en el fichero de importación."; App::$strings["Unable to create a unique channel address. Import failed."] = "No se ha podido crear una dirección de canal única. Ha fallado la importación."; @@ -631,6 +629,7 @@ App::$strings["Workflow user."] = "Usuario de Workflow."; App::$strings["This channel"] = "Este canal"; App::$strings["Primary"] = "Primario"; App::$strings["Workflow"] = "Workflow"; +App::$strings["No Workflows Available"] = "No hay flujos de trabajo disponibles"; App::$strings["Add item to which workflow"] = "A qué Workflow añadir un elemento"; App::$strings["Create Workflow Item"] = "Crear elemento de Workflow"; App::$strings["Link"] = "Enlazar"; @@ -660,15 +659,6 @@ App::$strings["Fontsize (px):"] = "Tamaño de fuente (px): "; App::$strings["Link:"] = "Enlace: "; App::$strings["Like us on Hubzilla"] = "Múestrenos su agrado en Hubzilla"; App::$strings["Embed:"] = "Incorporado: "; -App::$strings["Quick Reference"] = "Referencia rápida"; -App::$strings["This is a fairly comprehensive and complete guitar chord dictionary which will list most of the available ways to play a certain chord, starting from the base of the fingerboard up to a few frets beyond the twelfth fret (beyond which everything repeats). A couple of non-standard tunings are provided for the benefit of slide players, etc."] = "Se trata de un diccionario bastante amplio y completo de acordes de guitarra que enumerará la mayor parte de las formas disponibles para tocar un acorde determinado, partiendo de la base del diapasón hasta unos pocos trastes más allá del traste doce (más allá del cual todo se repite). Se proporcionan un par de afinaciones no convencionales para provecho de los guitarristas con \"slides\" ( barras de acero), etc."; -App::$strings["Chord names start with a root note (A-G) and may include sharps (#) and flats (b). This software will parse most of the standard naming conventions such as maj, min, dim, sus(2 or 4), aug, with optional repeating elements."] = "Los nombres de acordes comienzan con una nota fundamental (La-Sol) y pueden incluir sostenidos (#) y bemoles (b). Este software analizará la mayor parte de las convenciones de nomenclatura estándar como maj, min, tenue, SUS (2 ó 4), aug, con la repetición de elementos opcionales."; -App::$strings["Valid examples include A, A7, Am7, Amaj7, Amaj9, Ammaj7, Aadd4, Asus2Add4, E7b13b11 ..."] = "Ejemplos válidos son A, A7, Am7, Amaj7, Amaj9, Ammaj7, Aadd4, Asus2Add4, E7b13b11 ..."; -App::$strings["Guitar Chords"] = "Acordes de guitarra"; -App::$strings["The complete online chord dictionary"] = "El diccionario completo de acordes en línea"; -App::$strings["Tuning"] = "Afinación"; -App::$strings["Chord name: example: Em7"] = "Nombre del acorde, por ejemplo: Em7"; -App::$strings["Show for left handed stringing"] = "Mostrar para tocadores zurdos"; App::$strings["__ctx:opensearch__ Search %1\$s (%2\$s)"] = "Buscar %1\$s (%2\$s)"; App::$strings["__ctx:opensearch__ \$Projectname"] = "\$Projectname"; App::$strings["\$Projectname"] = "\$Projectname"; @@ -679,22 +669,6 @@ App::$strings["Blur your precise location if your channel uses browser location App::$strings["Minimum offset in meters"] = "Offset mínimo en metros"; App::$strings["Maximum offset in meters"] = "Offset máximo en metros"; App::$strings["Fuzzy Location"] = "Fuzzy Location"; -App::$strings["Flattr this!"] = "¡Apoyar esto en Flattr!"; -App::$strings["Flattr widget settings updated."] = "Los ajustes del widget Flattr han sido actualizados."; -App::$strings["Flattr Widget App"] = "App Flattr Widget"; -App::$strings["Add a Flattr button to your channel page"] = "Proporcionar un botón Flattr a la página de su canal"; -App::$strings["Flattr user"] = "Usuario en Flattr"; -App::$strings["URL of the Thing to flattr"] = "URL de la Cosa para apoyar en flattr"; -App::$strings["If empty channel URL is used"] = "Si está vacío, se usa la URL del canal"; -App::$strings["Title of the Thing to flattr"] = "Título de la Cosa para apoyar en flattr"; -App::$strings["If empty \"channel name on The Hubzilla\" will be used"] = "Si está vacío, se usará \"nombre del canal en Hubzilla\""; -App::$strings["Static or dynamic flattr button"] = "Botón de flattr estático o dinámico"; -App::$strings["static"] = "estático"; -App::$strings["dynamic"] = "dinámico"; -App::$strings["Alignment of the widget"] = "Alineamiento del widget"; -App::$strings["left"] = "izquierda"; -App::$strings["right"] = "derecha"; -App::$strings["Flattr Widget"] = "Flattr Widget"; App::$strings["Send email to all members"] = "Enviar un correo electrónico a todos los miembros"; App::$strings["%s Administrator"] = "%s Administrador"; App::$strings["No recipients found."] = "No se han encontrado destinatarios."; @@ -748,11 +722,31 @@ App::$strings["Logfile size in bytes before rotating"] = "Tamaño del fichero de App::$strings["Number of logfiles to retain"] = "Número de ficheros de informe que se deben retener"; App::$strings["Your account on %s will expire in a few days."] = "Su cuenta en %s caducará en unos pocos días."; App::$strings["Your $Productname test account is about to expire."] = "Su cuenta de prueba de $Productname está a punto de caducar."; +App::$strings["Hide Aside App"] = "App de ocultamiento del panel lateral"; +App::$strings["Fade out aside areas after a while when using endless scroll"] = "Se desvanecen las áreas laterales cuando se usa un scroll sin fin"; App::$strings["Skeleton App"] = "App Skeleton"; App::$strings["A skeleton for addons, you can copy/paste"] = "Skeleton para los addons, puede copiar/pegar"; App::$strings["Some setting"] = "Algunos ajustes"; App::$strings["A setting"] = "Un ajuste"; App::$strings["Skeleton Settings"] = "Ajustes de Skeleton"; +App::$strings["Network error"] = "Error de red"; +App::$strings["API error"] = "Error de API"; +App::$strings["Unknown issue"] = "Problema desconocido"; +App::$strings["Unable to login using email address "] = "Imposible iniciar sesión usando la dirección de correo electrónico"; +App::$strings["Sign in to Hubzilla using a social account"] = "Iniciar sesión en Hubzilla usando una cuenta social"; +App::$strings["Social Authentication using your social media account"] = "Autenticación usando su cuenta de medios sociales"; +App::$strings["This app enables one or more social provider sign-in buttons on the login page."] = "Esta aplicación habilita uno o más botones de inicio de sesión de proveedores sociales en la página de inicio de sesión."; +App::$strings["Add an identity provider"] = "Añadir un proveedor de identidad"; +App::$strings["Enable "] = "Habilitar"; +App::$strings["Key"] = "Clave"; +App::$strings["Word"] = "Palabra"; +App::$strings["Secret"] = "Secret"; +App::$strings["Add a custom provider"] = "Añadir un proveedor personalizado"; +App::$strings["Remove an identity provider"] = "Eliminar un proveedor de identidad"; +App::$strings["Social authentication"] = "Autenticación social"; +App::$strings["Error while saving provider settings"] = "Se ha producido un error mientras se guardaban los ajustes"; +App::$strings["Custom provider already exists"] = "Ya existe un proveedor personalizado"; +App::$strings["Social authentication settings saved."] = "Se han guardado los ajustes de la autenticación social."; App::$strings["Possible adult content"] = "Posible contenido para adultos"; App::$strings["%s - view"] = "ver - %s"; App::$strings["NSFW Settings saved."] = "Se han guardado los ajustes de NSFW."; @@ -796,38 +790,11 @@ App::$strings["Send wall-to-wall posts to Livejournal"] = "Enviar entradas de Mu App::$strings["Livejournal Crosspost Connector"] = "Livejournal Crosspost Connector"; App::$strings["Post to Livejournal"] = "Publicar en Livejournal"; App::$strings["Posted by"] = "Publicado por "; -App::$strings["Invalid game."] = "Juego no válido."; -App::$strings["You are not a player in this game."] = "Usted no participa en este juego."; -App::$strings["You must be a local channel to create a game."] = "Debe ser un canal local para crear un juego"; -App::$strings["You must select one opponent that is not yourself."] = "Debe seleccionar un oponente que no sea usted mismo."; -App::$strings["Random color chosen."] = "Elegido un color aleatorio."; -App::$strings["Error creating new game."] = "Error al crear un nuevo juego."; -App::$strings["Requested channel is not available."] = "El canal solicitado no está disponible."; -App::$strings["Chess not installed."] = "Chess no está instalado."; -App::$strings["You must select a local channel /chess/channelname"] = "Debe seleccionar un canal local /chess/nombredelcanal"; -App::$strings["You must be logged in to see this page."] = "Debe haber iniciado sesión para poder ver esta página."; -App::$strings["Page not found."] = "Página no encontrada."; -App::$strings["Enable notifications"] = "Habilitar notificaciones"; App::$strings["Markdown"] = "Markdown"; App::$strings["Use markdown for editing posts"] = "Usar markdown para editar las entradas"; App::$strings["Hubzilla File Storage Import"] = "Importar del depósito de ficheros de Hubzilla"; App::$strings["This will import all your cloud files from another server."] = "Esto importará todos sus ficheros en la nube desde otro servidor."; App::$strings["Hubzilla Server base URL"] = "URL base del servidor Hubzilla"; -App::$strings["Jappixmini App"] = "App Jappixmini"; -App::$strings["Provides a Facebook-like chat using Jappix Mini"] = "Proporciona un chat similar al de Facebook utilizando Jappix Mini"; -App::$strings["Status:"] = "Estado:"; -App::$strings["Hide Jappixmini Chat-Widget from the webinterface"] = "Ocultar el widget de chat Jappixmini en la interfaz web"; -App::$strings["Jabber username"] = "Nombre de usuario en Jabber"; -App::$strings["Jabber server"] = "Servidor de Jabber"; -App::$strings["Jabber BOSH host URL"] = "URL del host BOSH de Jabber"; -App::$strings["Jabber password"] = "Contraseña en Jabber"; -App::$strings["Encrypt Jabber password with Hubzilla password"] = "Cifrar la contraseña de Jabber con la contraseña de Hubzilla"; -App::$strings["Recommended"] = "Recomendado"; -App::$strings["Approve subscription requests from Hubzilla contacts automatically"] = "Aprobar automáticamente las solicitudes de suscripción de los contactos de Hubzilla"; -App::$strings["Purge internal list of jabber addresses of contacts"] = "Purgar la lista interna de las direcciones de contactos de jabber"; -App::$strings["Configuration Help"] = "Ayuda para los ajustes"; -App::$strings["Add Contact"] = "Añadir un contacto"; -App::$strings["Jappixmini Settings"] = "Ajustes de Jappixmini"; App::$strings["Allow magic authentication only to websites of your immediate connections"] = "Permitir la autenticación mágica sólo a los sitios web de sus conexiones próximas"; App::$strings["Authchoose App"] = "App Authchoose"; App::$strings["Authchoose"] = "Autoseleccionar"; @@ -863,6 +830,11 @@ App::$strings["older"] = "más antiguas"; App::$strings["newer"] = "más recientes"; App::$strings["No connections"] = "Sin conexiones"; App::$strings["Connections"] = "Conexiones"; +App::$strings["Accepts"] = "Se acepta"; +App::$strings["Comments"] = "Comentarios"; +App::$strings["Stream items"] = "Elementos del stream"; +App::$strings["Wall posts"] = "Entradas del Muro"; +App::$strings["Nothing"] = "Nada"; App::$strings["View all %s connections"] = "Ver todas las %s conexiones"; App::$strings["Network: %s"] = "Red %s"; App::$strings["Search"] = "Buscar"; @@ -924,6 +896,9 @@ App::$strings["unknown"] = "desconocido"; App::$strings["remove category"] = "eliminar el tema"; App::$strings["remove from file"] = "eliminar del fichero"; App::$strings["Download binary/encrypted content"] = "Descargar contenido binario o cifrado"; +App::$strings["Poll has ended."] = "La encuesta ha terminado"; +App::$strings["Poll ends: %s"] = "Finales de la encuesta: %s"; +App::$strings["Vote"] = "Votar"; App::$strings["Link to Source"] = "Enlazar con la entrada en su ubicación original"; App::$strings["default"] = "por defecto"; App::$strings["Page layout"] = "Plantilla de la página"; @@ -937,6 +912,7 @@ App::$strings["Page content type"] = "Tipo de contenido de la página"; App::$strings["event"] = "el/su evento"; App::$strings["comment"] = "el comentario"; App::$strings["activity"] = "la/su actividad"; +App::$strings["poll"] = "encuesta"; App::$strings["a-z, 0-9, -, and _ only"] = "a-z, 0-9, -, and _ only"; App::$strings["Design Tools"] = "Herramientas de diseño web"; App::$strings["Blocks"] = "Bloques"; @@ -999,8 +975,6 @@ App::$strings["Comments will be displayed separately"] = "Los comentarios se mos App::$strings["Connection Filtering"] = "Filtrado de conexiones"; App::$strings["Filter incoming posts from connections based on keywords/content"] = "Filtrar publicaciones entrantes de conexiones por palabras clave o contenido"; App::$strings["Conversation"] = "Conversación"; -App::$strings["Community Tagging"] = "Etiquetas de la comunidad"; -App::$strings["Ability to tag existing posts"] = "Capacidad de etiquetar entradas"; App::$strings["Emoji Reactions"] = "Emoticonos \"emoji\""; App::$strings["Add emoji reaction ability to posts"] = "Activar la capacidad de añadir un emoticono \"emoji\" a las entradas"; App::$strings["Dislike Posts"] = "Desagrado de publicaciones"; @@ -1019,8 +993,6 @@ App::$strings["Large Photos"] = "Fotos de gran tamaño"; App::$strings["Include large (1024px) photo thumbnails in posts. If not enabled, use small (640px) photo thumbnails"] = "Incluir miniaturas de fotos grandes (1024px) en publicaciones. Si no está habilitado, usar miniaturas pequeñas (640px)"; App::$strings["Even More Encryption"] = "Más cifrado todavía"; App::$strings["Allow optional encryption of content end-to-end with a shared secret key"] = "Permitir cifrado adicional de contenido \"punto-a-punto\" con una clave secreta compartida."; -App::$strings["Enable Voting Tools"] = "Permitir entradas con votación"; -App::$strings["Provide a class of post which others can vote on"] = "Proveer una clase de publicación en la que otros puedan votar"; App::$strings["Disable Comments"] = "Deshabilitar comentarios"; App::$strings["Provide the option to disable comments for a post"] = "Proporcionar la opción de desactivar los comentarios para una entrada"; App::$strings["Delayed Posting"] = "Publicación aplazada"; @@ -1035,6 +1007,10 @@ App::$strings["Manage"] = "Gestionar"; App::$strings["Navigation Channel Select"] = "Navegación por el selector de canales"; App::$strings["Change channels directly from within the navigation dropdown menu"] = "Cambiar de canales directamente desde el menú de navegación desplegable"; App::$strings["Network"] = "Red"; +App::$strings["Events Filter"] = "Filtro de eventos"; +App::$strings["Ability to display only events"] = "Capacidad para mostrar solo eventos"; +App::$strings["Polls Filter"] = "Filtro de encuestas"; +App::$strings["Ability to display only polls"] = "Capacidad para mostrar solo encuestas"; App::$strings["Saved Searches"] = "Búsquedas guardadas"; App::$strings["Save search terms for re-use"] = "Guardar términos de búsqueda para su reutilización"; App::$strings["Saved Folders"] = "Carpetas guardadas"; @@ -1089,6 +1065,9 @@ App::$strings["A channel name is required."] = "Se requiere un nombre de canal"; App::$strings["This is a "] = "Esto es un "; App::$strings[" channel name"] = "nombre de canal"; App::$strings["Back to reply"] = "Volver a la respuesta"; +App::$strings["Pinned"] = "Anclado/a"; +App::$strings["Pin to the top"] = "Anclar en la parte superior"; +App::$strings["Unpin from the top"] = "Desanclar de la parte superior"; App::$strings["%d minutes"] = array( 0 => "%d minutos", 1 => "%d minutos", @@ -1149,6 +1128,7 @@ App::$strings["__ctx:calendar__ All day"] = "Todos los días"; App::$strings["Help:"] = "Ayuda:"; App::$strings["Help"] = "Ayuda"; App::$strings["Not Found"] = "No encontrado"; +App::$strings["Page not found."] = "Página no encontrada."; App::$strings["Image exceeds website size limit of %lu bytes"] = "La imagen excede el límite de %lu bytes del sitio"; App::$strings["Image file is empty."] = "El fichero de imagen está vacío. "; App::$strings["Unable to process image"] = "No ha sido posible procesar la imagen"; @@ -1250,7 +1230,6 @@ App::$strings["Miscellaneous"] = "Varios"; App::$strings["Birthday"] = "Cumpleaños"; App::$strings["Age: "] = "Edad:"; App::$strings["YYYY-MM-DD or MM-DD"] = "AAAA-MM-DD o MM-DD"; -App::$strings["Required"] = "Obligatorio"; App::$strings["never"] = "nunca"; App::$strings["less than a second ago"] = "hace un instante"; App::$strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "hace %1\$d %2\$s"; @@ -1284,6 +1263,12 @@ App::$strings["__ctx:relative_date__ second"] = array( ); App::$strings["%1\$s's birthday"] = "Cumpleaños de %1\$s"; App::$strings["Happy Birthday %1\$s"] = "Feliz cumpleaños %1\$s"; +App::$strings["INVALID EVENT DISMISSED!"] = "¡EVENTO NO VÁLIDO RECHAZADO!"; +App::$strings["Summary: "] = "Resumen: "; +App::$strings["Date: "] = "Fecha: "; +App::$strings["Reason: "] = "Razón: "; +App::$strings["INVALID CARD DISMISSED!"] = "¡TARJETA NO VÁLIDA RECHAZADA!"; +App::$strings["Name: "] = "Nombre: "; App::$strings["Channel is blocked on this site."] = "El canal está bloqueado en este sitio."; App::$strings["Channel location missing."] = "Falta la dirección del canal."; App::$strings["Response from remote channel was incomplete."] = "Respuesta incompleta del canal."; @@ -1353,6 +1338,13 @@ App::$strings[", and %d other people"] = array( ); App::$strings["%s like this."] = "A %s le gusta esto."; App::$strings["%s don't like this."] = "A %s no le gusta esto."; +App::$strings["Toggle poll"] = "Activar o desactivar encuestas"; +App::$strings["Option"] = "Opción"; +App::$strings["Add option"] = "Añadir una opción"; +App::$strings["Minutes"] = "Minutos "; +App::$strings["Hours"] = "Horas "; +App::$strings["Days"] = "Días "; +App::$strings["Allow multiple answers"] = "Permitir respuestas múltiples"; App::$strings["__ctx:noun__ Like"] = array( 0 => "Me gusta", 1 => "Me gusta", @@ -1523,6 +1515,7 @@ App::$strings["Path not found."] = "Ruta no encontrada"; App::$strings["mkdir failed."] = "mkdir ha fallado."; App::$strings["database storage failed."] = "el almacenamiento en la base de datos ha fallado."; App::$strings["Empty path"] = "Ruta vacía"; +App::$strings["%s shared a %s with you"] = "%sha compartido un/una %scon usted"; App::$strings["%1\$s's bookmarks"] = "Marcadores de %1\$s"; App::$strings["Edit"] = "Editar"; App::$strings["Image/photo"] = "Imagen/foto"; @@ -1553,12 +1546,14 @@ App::$strings["Nickname has unsupported characters or is already being used on t App::$strings["Unable to retrieve created identity"] = "No ha sido posible recuperar la identidad creada"; App::$strings["Default Profile"] = "Perfil principal"; App::$strings["Unable to retrieve modified identity"] = "No se puede recuperar la identidad modficada"; +App::$strings["Requested channel is not available."] = "El canal solicitado no está disponible."; App::$strings["Change profile photo"] = "Cambiar la foto del perfil"; App::$strings["Create New Profile"] = "Crear un nuevo perfil"; App::$strings["Profile Image"] = "Imagen del perfil"; App::$strings["Visible to everybody"] = "Visible para todos"; App::$strings["Edit visibility"] = "Editar visibilidad"; App::$strings["Gender:"] = "Género:"; +App::$strings["Status:"] = "Estado:"; App::$strings["Homepage:"] = "Página personal:"; App::$strings["Online Now"] = "Ahora en línea"; App::$strings["Change your profile photo"] = "Cambiar su foto del perfil"; @@ -1642,6 +1637,19 @@ App::$strings["Conversations"] = "Conversaciones"; App::$strings["No messages."] = "Sin mensajes."; App::$strings["Delete conversation"] = "Eliminar conversación"; App::$strings["Chat Members"] = "Miembros del chat"; +App::$strings["I will attend"] = "Participaré"; +App::$strings["I will not attend"] = "No participaré"; +App::$strings["I might attend"] = "Quizá participe"; +App::$strings["I agree"] = "Estoy de acuerdo"; +App::$strings["I disagree"] = "No estoy de acuerdo"; +App::$strings["I abstain"] = "Me abstengo"; +App::$strings["Share This"] = "Compartir esto"; +App::$strings["share"] = "compartir"; +App::$strings["View %s's profile - %s"] = "Ver el perfil de %s - %s"; +App::$strings["via"] = "mediante"; +App::$strings["Attendance Options"] = "Opciones de participación o asistencia"; +App::$strings["Voting Options"] = "Opciones de votación"; +App::$strings["Pinned post"] = "Entradas ancladas"; App::$strings["__ctx:widget__ Activity"] = "Actividad"; App::$strings["Select Channel"] = "Seleccionar un canal"; App::$strings["Read-write"] = "Lectura y escritura"; @@ -1702,6 +1710,12 @@ App::$strings["Profile Fields"] = "Campos del perfil"; App::$strings["DB updates"] = "Actualizaciones de la base de datos"; App::$strings["Logs"] = "Informes"; App::$strings["Addon Features"] = "Características del addon"; +App::$strings["Direct Messages"] = "Mensajes directos"; +App::$strings["Show direct (private) messages"] = "Mostrar mensajes (privados) directos"; +App::$strings["Events"] = "Eventos"; +App::$strings["Show posts that include events"] = "Mostrar entradas que incluyan eventos"; +App::$strings["Polls"] = "Encuestas"; +App::$strings["Show posts that include polls"] = "Mostrar entradas que incluyan encuestas"; App::$strings["Show posts related to the %s privacy group"] = "Mostrar entradas relacionadas con el grupo %s"; App::$strings["Show my privacy groups"] = "Mostrar mis grupos de canales"; App::$strings["Show posts to this forum"] = "Mostrar las entradas en este foro"; @@ -1761,6 +1775,9 @@ App::$strings["New Home Activity"] = "Nueva actividad en su página principal"; App::$strings["New Home Activity Notifications"] = "Avisos de nueva actividad en su página principal"; App::$strings["View your home activity"] = "Ver la actividad de su página principal"; App::$strings["Mark all notifications seen"] = "Marcar todas las notificaciones como vistas"; +App::$strings["New Direct Messages"] = "Nuevos mensajes directos"; +App::$strings["New Direct Messages Notifications"] = "Nuevas notificaciones de mensajes directos"; +App::$strings["View your direct messages"] = "Ver sus mensajes directos"; App::$strings["New Mails"] = "Nuevos mensajes de correo"; App::$strings["New Mails Notifications"] = "Avisos de nuevos mensajes de correo"; App::$strings["View your private mails"] = "Ver sus correos privados"; @@ -1832,6 +1849,10 @@ App::$strings["Move this channel (disable all previous locations)"] = "Mover est App::$strings["Use this channel nickname instead of the one provided"] = "Usa este alias de canal en lugar del que se proporciona"; App::$strings["Leave blank to keep your existing channel nickname. You will be randomly assigned a similar nickname if either name is already allocated on this site."] = "Dejar en blanco para mantener su alias de canal . Se le asignará aleatoriamente uno similar si cualquiera de los dos nombres ya está asignado en este sitio."; App::$strings["This process may take several minutes to complete. Please submit the form only once and leave this page open until finished."] = "Este proceso puede tardar varios minutos en completarse. Por favor envíe el formulario una sola vez y mantenga esta página abierta hasta que termine."; +App::$strings["You must be logged in to see this page."] = "Debe haber iniciado sesión para poder ver esta página."; +App::$strings["Update to Hubzilla 5.0 setp 2"] = "Actualizar a Hubzilla 5.0. Paso 2"; +App::$strings["To complete the update please run"] = "Para completar la actualización, ejecutar "; +App::$strings["INFO: this command can take a very long time depending on your DB size."] = "INFO; este comando puede tardar en ejecutarse mucho tiempo dependiendo del tamaño de su base de datos."; App::$strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Se ha superado el límite máximo de inscripciones diarias de este sitio. Por favor, pruebe de nuevo mañana."; App::$strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Por favor, confirme que acepta los Términos del servicio. El registro ha fallado."; App::$strings["Passwords do not match."] = "Las contraseñas no coinciden."; @@ -2031,6 +2052,7 @@ App::$strings["This site is not a directory server"] = "Este sitio no es un serv App::$strings["This directory server requires an access token"] = "El servidor de este directorio necesita un \"token\" de acceso"; App::$strings["Welcome to Hubzilla!"] = "¡Bienvenido a Hubzilla!"; App::$strings["You have got no unseen posts..."] = "No tiene ningún mensaje sin leer..."; +App::$strings["Unable to locate original post."] = "No ha sido posible encontrar la entrada original."; App::$strings["Chatrooms App"] = "App Salas de chat"; App::$strings["Access Controlled Chatrooms"] = "Salas de chat moderadas"; App::$strings["Room not found"] = "Sala no encontrada"; @@ -2078,12 +2100,6 @@ App::$strings["Choose what you wish to do to recipient"] = "Elegir qué desea en App::$strings["Make this post private"] = "Convertir en privado este envío"; App::$strings["Calendar entries imported."] = "Entradas de calendario importadas."; App::$strings["No calendar entries found."] = "No se han encontrado entradas de calendario."; -App::$strings["INVALID EVENT DISMISSED!"] = "¡EVENTO NO VÁLIDO RECHAZADO!"; -App::$strings["Summary: "] = "Resumen: "; -App::$strings["Date: "] = "Fecha: "; -App::$strings["Reason: "] = "Razón: "; -App::$strings["INVALID CARD DISMISSED!"] = "¡TARJETA NO VÁLIDA RECHAZADA!"; -App::$strings["Name: "] = "Nombre: "; App::$strings["CardDAV App"] = "App CarDav"; App::$strings["CalDAV capable addressbook"] = "Libreta de direcciones compatible con CalDav"; App::$strings["Event title"] = "Título del evento"; @@ -2109,6 +2125,7 @@ App::$strings["Instant messenger"] = "Mensajería instantánea"; App::$strings["Website"] = "Sitio web"; App::$strings["Address"] = "Dirección"; App::$strings["Note"] = "Nota"; +App::$strings["Add Contact"] = "Añadir un contacto"; App::$strings["Add Field"] = "Añadir un campo"; App::$strings["P.O. Box"] = "Buzón de correos"; App::$strings["Additional"] = "Adicional"; @@ -2121,7 +2138,6 @@ App::$strings["Default Calendar"] = "Calendario por defecto"; App::$strings["Default Addressbook"] = "Agenda de direcciones por defecto"; App::$strings["Remote privacy information not available."] = "La información privada remota no está disponible."; App::$strings["Visible to:"] = "Visible para:"; -App::$strings["Unable to locate original post."] = "No ha sido posible encontrar la entrada original."; App::$strings["Empty post discarded."] = "La entrada vacía ha sido desechada."; App::$strings["Duplicate post suppressed."] = "Se ha suprimido la entrada duplicada."; App::$strings["System error. Post not saved."] = "Error del sistema. La entrada no se ha podido salvar."; @@ -2202,8 +2218,6 @@ App::$strings["Tag removed"] = "Etiqueta eliminada."; App::$strings["Remove Item Tag"] = "Eliminar etiqueta del elemento."; App::$strings["Select a tag to remove: "] = "Seleccionar una etiqueta para eliminar:"; App::$strings["Continue"] = "Continuar"; -App::$strings["Premium Channel App"] = "App Canal premium"; -App::$strings["Allows you to set restrictions and terms on those that connect with your channel"] = "Le permite configurar restricciones y normas de uso a aquellos que conectan con su canal"; App::$strings["Premium Channel Setup"] = "Configuración del canal premium"; App::$strings["Enable premium channel connection restrictions"] = "Habilitar restricciones de conexión del canal premium"; App::$strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = "Por favor introduzca sus restricciones o condiciones, como recibo de paypal, normas de uso, etc."; @@ -2272,6 +2286,9 @@ App::$strings["Only allow embeds from secure (SSL) websites and links."] = "Sól App::$strings["Allow unfiltered embedded HTML content only from these domains"] = "Permitir contenido HTML sin filtrar sólo desde estos dominios "; App::$strings["One site per line. By default embedded content is filtered."] = "Un sitio por línea. El contenido incorporado se filtra de forma predeterminada."; App::$strings["Block embedded HTML from these domains"] = "Bloquear contenido con HTML incorporado desde estos dominios"; +App::$strings["Allow SVG thumbnails in file browser"] = "Permitir miniaturas SVG en el navegador de archivos"; +App::$strings["WARNING: SVG images may contain malicious code."] = "ADVERTENCIA: Las imágenes SVG pueden contener código malicioso."; +App::$strings["Allow embedded (inline) PDF files"] = "Permitir ficheros PDF incrustados (en línea)"; App::$strings["%s account blocked/unblocked"] = array( 0 => "%s cuenta bloqueada/desbloqueada", 1 => "%s cuenta bloqueada/desbloqueada", @@ -2377,8 +2394,6 @@ App::$strings["Poll interval"] = "Intervalo máximo de tiempo entre dos mensajes App::$strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "Retrasar el intervalo de envío en segundo plano, en esta cantidad de segundos, para reducir la carga del sistema. Si es 0, usar el intervalo de entrega."; App::$strings["Path to ImageMagick convert program"] = "Ruta al programa de conversión de ImageMagick"; App::$strings["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"] = "Si está configurado, utilice este programa para generar miniaturas de fotos para imágenes de gran tamaño ( > 4000 píxeles en cualquiera de las dos dimensiones), de lo contrario se puede agotar la memoria. Ejemplo: /usr/bin/convert"; -App::$strings["Allow SVG thumbnails in file browser"] = "Permitir miniaturas SVG en el navegador de archivos"; -App::$strings["WARNING: SVG images may contain malicious code."] = "ADVERTENCIA: Las imágenes SVG pueden contener código malicioso."; App::$strings["Maximum Load Average"] = "Carga media máxima"; App::$strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Carga máxima del sistema antes de que los procesos de entrega y envío se hayan retardado - por defecto, 50."; App::$strings["Expiration period in days for imported (grid/network) content"] = "Caducidad del contenido importado de otros sitios (en días)"; @@ -2591,6 +2606,8 @@ App::$strings["posted an event"] = "publicó un evento"; App::$strings["shared a file with you"] = "compartió un archivo con usted"; App::$strings["Private forum"] = "Foro privado"; App::$strings["Public forum"] = "Foro público"; +App::$strings["Entry censored"] = "Entrada censurada"; +App::$strings["Entry uncensored"] = "Entrada sin censurar"; App::$strings["No service class restrictions found."] = "No se han encontrado restricciones sobre esta clase de servicio."; App::$strings["Mood App"] = "App Estados de ánimo"; App::$strings["Set your current mood and tell your friends"] = "Describir su estado de ánimo para comunicárselo a sus amigos"; @@ -2670,6 +2687,9 @@ App::$strings["A verification token was sent to your email address [%s]. Enter t App::$strings["Resend Email"] = "Reenvío de correo electrónico"; App::$strings["Validation token"] = "Token de validación"; App::$strings["Item not available."] = "Elemento no disponible"; +App::$strings["Poll not found."] = "Encuesta no encontrada."; +App::$strings["Invalid response."] = "respuesta no válida."; +App::$strings["Response submitted. Updates may not appear instantly."] = "Respuesta enviada. Las actualizaciones pueden no aparecer al instante."; App::$strings["Image uploaded but image cropping failed."] = "Imagen actualizada, pero el recorte de la imagen ha fallado. "; App::$strings["Image resize failed."] = "El ajuste del tamaño de la imagen ha fallado."; App::$strings["Image upload failed."] = "La carga de la imagen ha fallado."; @@ -2879,7 +2899,6 @@ App::$strings["Send email invitations to join this network"] = "Enviar invitacio App::$strings["You have no more invitations available"] = "No tiene más invitaciones disponibles"; App::$strings["Send invitations"] = "Enviar invitaciones"; App::$strings["Enter email addresses, one per line:"] = "Introduzca las direcciones de correo electrónico, una por línea:"; -App::$strings["Your message:"] = "Su mensaje:"; App::$strings["Please join my community on \$Projectname."] = "Por favor, únase a mi comunidad en \$Projectname."; App::$strings["You will need to supply this invitation code:"] = "Tendrá que suministrar este código de invitación:"; App::$strings["1. Register at any \$Projectname location (they are all inter-connected)"] = "1. Regístrese en cualquier sitio de \$Projectname (están todos interconectados)"; @@ -2890,29 +2909,6 @@ App::$strings["Notes App"] = "App Notas"; App::$strings["A simple notes app with a widget (note: notes are not encrypted)"] = "Una simple aplicación de notas con un widget (aviso: las notas no están encriptadas)"; App::$strings["Xchan Lookup"] = "Búsqueda de canales"; App::$strings["Lookup xchan beginning with (or webbie): "] = "Buscar un canal (o un \"webbie\") que comience por:"; -App::$strings["Unable to lookup recipient."] = "No se puede asociar a un destinatario."; -App::$strings["Unable to communicate with requested channel."] = "No se puede establecer la comunicación con el canal solicitado."; -App::$strings["Cannot verify requested channel."] = "No se puede verificar el canal solicitado."; -App::$strings["Selected channel has private message restrictions. Send failed."] = "El canal seleccionado tiene restricciones sobre los mensajes privados. El envío falló."; -App::$strings["Messages"] = "Mensajes"; -App::$strings["message"] = "mensaje"; -App::$strings["Message recalled."] = "Mensaje revocado."; -App::$strings["Conversation removed."] = "Conversación eliminada."; -App::$strings["Expires YYYY-MM-DD HH:MM"] = "Caduca YYYY-MM-DD HH:MM"; -App::$strings["Requested channel is not in this network"] = "El canal solicitado no existe en esta red"; -App::$strings["Send Private Message"] = "Enviar un mensaje privado"; -App::$strings["To:"] = "Para:"; -App::$strings["Subject:"] = "Asunto:"; -App::$strings["Attach file"] = "Adjuntar fichero"; -App::$strings["Send"] = "Enviar"; -App::$strings["Delete message"] = "Borrar mensaje"; -App::$strings["Delivery report"] = "Informe de transmisión"; -App::$strings["Recall message"] = "Revocar el mensaje"; -App::$strings["Message has been recalled."] = "El mensaje ha sido revocado."; -App::$strings["Delete Conversation"] = "Eliminar conversación"; -App::$strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Comunicación segura no disponible. Pero <strong>puede</strong> responder desde la página del perfil del remitente."; -App::$strings["Send Reply"] = "Responder"; -App::$strings["Your message for %s (%s):"] = "Su mensaje para %s (%s):"; App::$strings["Affinity Tool settings updated."] = "Actualización de los ajustes de Affinity Tool."; App::$strings["This app presents a slider control in your connection editor and also on your network page. The slider represents your degree of friendship (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."] = "Esta aplicación presenta un control deslizante en su editor de conexión y también en su página de red. El control deslizante representa su grado de amistad (afinidad) con cada conexión. Le permite acercar o alejar y mostrar conversaciones sólo de sus amigos más cercanos o de todo el mundo en su stream."; App::$strings["Affinity Tool App"] = "App Affinity Tool "; @@ -2999,6 +2995,7 @@ App::$strings["Show visual notifications including:"] = "Mostrar notificaciones App::$strings["Unseen stream activity"] = "Actividad del stream no vista"; App::$strings["Unseen channel activity"] = "Actividad no vista en el canal"; App::$strings["Unseen private messages"] = "Mensajes privados no leídos"; +App::$strings["Recommended"] = "Recomendado"; App::$strings["Upcoming events"] = "Próximos eventos"; App::$strings["Events today"] = "Eventos de hoy"; App::$strings["Upcoming birthdays"] = "Próximos cumpleaños"; @@ -3059,7 +3056,7 @@ App::$strings["Enable user zoom on mobile devices"] = "Habilitar zoom de usuario App::$strings["Update browser every xx seconds"] = "Actualizar navegador cada xx segundos"; App::$strings["Minimum of 10 seconds, no maximum"] = "Mínimo de 10 segundos, sin máximo"; App::$strings["Maximum number of conversations to load at any time:"] = "Máximo número de conversaciones a cargar en cualquier momento:"; -App::$strings["Maximum of 100 items"] = "Máximo de 100 elementos"; +App::$strings["Maximum of 30 items"] = "Máximo de 30 elementos"; App::$strings["Show emoticons (smilies) as images"] = "Mostrar emoticonos (smilies) como imágenes"; App::$strings["Provide channel menu in navigation bar"] = "Proporcionar un menú de canales en la barra de navegación"; App::$strings["Default: channel menu located in app menu"] = "Predeterminado: menú de canales ubicado en el menú de aplicaciones"; @@ -3181,7 +3178,6 @@ App::$strings["Error retrieving page content"] = "Error al recuperar el contenid App::$strings["New page"] = "Nueva página"; App::$strings["Revision Comparison"] = "Comparación de revisiones"; App::$strings["Short description of your changes (optional)"] = "Breve descripción de sus cambios (opcional)"; -App::$strings["Source"] = "Fuente"; App::$strings["New page name"] = "Nombre de la nueva página"; App::$strings["Embed image from photo albums"] = "Incluir una imagen de los álbumes de fotos"; App::$strings["History"] = "Historial"; @@ -3304,15 +3300,22 @@ App::$strings["Save Bookmark"] = "Guardar marcador"; App::$strings["URL of bookmark"] = "Dirección del marcador"; App::$strings["Or enter new bookmark folder name"] = "O introduzca un nuevo nombre para la carpeta de marcadores"; App::$strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "La autenticación desde su servidor está bloqueada. Ha iniciado sesión localmente. Por favor, salga de la sesión y vuelva a intentarlo."; +App::$strings["A deleted list with this name was revived. Existing item permissions <strong>may</strong> apply to this list and any future members. If this is not what you intended, please create another list with a different name."] = "Una lista eliminada con este nombre ha sido reactivada. Los permisos <strong>de los elementos existentes pueden </strong>aplicarse a esta lista y a cualquier miembro futuro. Si esto no es lo que pretendía, por favor, cree otra lista con un nombre diferente."; +App::$strings["Add new connections to this access list"] = "Añadir nuevas conexiones a esta lista de acceso"; +App::$strings["Lists"] = "Listas"; +App::$strings["Edit list"] = "Editar lista"; +App::$strings["Create new list"] = "Crear una nueva lista"; +App::$strings["Channels not in any access list"] = "No hay canales en ninguna lista de acceso"; App::$strings["__ctx:permcat__ default"] = "por defecto"; App::$strings["__ctx:permcat__ follower"] = "seguidor"; App::$strings["__ctx:permcat__ contributor"] = "contribuidor"; App::$strings["__ctx:permcat__ publisher"] = "editor"; App::$strings["Likes %1\$s's %2\$s"] = "Gusta de %2\$sde %1\$s"; App::$strings["Doesn't like %1\$s's %2\$s"] = "No le gusta %2\$sde %1\$s"; -App::$strings["Will attend %1\$s's %2\$s"] = "Asistirá %2\$sde %1\$s"; -App::$strings["Will not attend %1\$s's %2\$s"] = "No asistirá %2\$sde %1\$s"; -App::$strings["May attend %1\$s's %2\$s"] = "Puede asistir %2\$sde %1\$s"; +App::$strings["Will attend %s's event"] = "Asistirá al evento de %s"; +App::$strings["Will not attend %s's event"] = "No asistirá al evento de %s"; +App::$strings["May attend %s's event"] = "Puede asistir al evento de %s"; +App::$strings["May not attend %s's event"] = "Puede no asistir al evento de %s"; App::$strings["\$Projectname Notification"] = "Notificación de \$Projectname"; App::$strings["Thank You,"] = "Gracias,"; App::$strings["This email was sent by %1\$s at %2\$s."] = "Este email ha sido enviado por %1\$s a %2\$s."; @@ -3327,6 +3330,7 @@ App::$strings["Please visit %s to view and/or reply to your private messages."] App::$strings["commented on"] = "ha comentado sobre "; App::$strings["liked"] = "ha gustado de "; App::$strings["disliked"] = "no ha gustado de "; +App::$strings["voted on"] = "votado en "; App::$strings["%1\$s %2\$s [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s%2\$s [zrl=%3\$s ]un %4\$s[/zrl]"; App::$strings["%1\$s %2\$s [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s %2\$s[zrl=%3\$s]%5\$s de %4\$s[/zrl]"; App::$strings["%1\$s %2\$s [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s %2\$s [zrl=%3\$s]su %4\$s[/zrl]"; @@ -3362,11 +3366,14 @@ App::$strings["Name:"] = "Nombre:"; App::$strings["Photo:"] = "Foto:"; App::$strings["Please visit %s to approve or reject the suggestion."] = "Por favor, visite %s para aprobar o rechazar la sugerencia."; App::$strings["[\$Projectname:Notify]"] = "[\$Projectname:Aviso]"; +App::$strings["created a new poll"] = "se ha creado una nueva encuesta"; App::$strings["created a new post"] = "ha creado una nueva entrada"; +App::$strings["voted on %s's poll"] = "votado en la encuesta de %s"; App::$strings["commented on %s's post"] = "ha comentado la entrada de %s"; App::$strings["repeated %s's post"] = "repetida la entrada de %s"; App::$strings["edited a post dated %s"] = "ha editado una entrada %s"; App::$strings["edited a comment dated %s"] = "ha editado un comentario %s"; +App::$strings["error saving data"] = "error guardando los datos"; App::$strings["Missing room name"] = "Sala de chat sin nombre"; App::$strings["Duplicate room name"] = "Nombre de sala duplicado."; App::$strings["Invalid room specifier."] = "Especificador de sala no válido."; @@ -3395,7 +3402,6 @@ App::$strings["Guest Access"] = "Acceso para invitados"; App::$strings["OAuth Apps Manager"] = "Administrador de apps OAuth"; App::$strings["OAuth2 Apps Manager"] = "Administrador de apps OAuth2"; App::$strings["PDL Editor"] = "Editor PDL"; -App::$strings["Premium Channel"] = "Canal premium"; App::$strings["My Chatrooms"] = "Mis salas de chat"; App::$strings["Channel Export"] = "Exportar canal"; App::$strings["Purchase"] = "Comprar"; @@ -3425,32 +3431,19 @@ App::$strings["Untitled"] = "Sin título"; App::$strings["Wiki resource_id required for git commit"] = "Se necesita Wiki resource_id para el git commit"; App::$strings["Privacy conflict. Discretion advised."] = "Conflicto de privacidad. Se aconseja discreción."; App::$strings["Admin Delete"] = "Eliminar admin"; -App::$strings["I will attend"] = "Participaré"; -App::$strings["I will not attend"] = "No participaré"; -App::$strings["I might attend"] = "Quizá participe"; -App::$strings["I agree"] = "Estoy de acuerdo"; -App::$strings["I disagree"] = "No estoy de acuerdo"; -App::$strings["I abstain"] = "Me abstengo"; -App::$strings["Add Tag"] = "Añadir etiqueta"; App::$strings["Reply on this comment"] = "Responder a este comentario"; App::$strings["reply"] = "responder"; App::$strings["Reply to"] = "Responder a "; -App::$strings["Share This"] = "Compartir esto"; -App::$strings["share"] = "compartir"; App::$strings["Delivery Report"] = "Informe de transmisión"; App::$strings["%d comment"] = array( 0 => "%d comentario", 1 => "%d comentarios", ); -App::$strings["View %s's profile - %s"] = "Ver el perfil de %s - %s"; +App::$strings["%d unseen"] = "%dno visto/a vistos/as"; App::$strings["to"] = "a"; -App::$strings["via"] = "mediante"; App::$strings["Wall-to-Wall"] = "De página del perfil a página del perfil (de \"muro\" a \"muro\")"; App::$strings["via Wall-To-Wall:"] = "Mediante el procedimiento página del perfil a página del perfil (de \"muro\" a \"muro\")"; App::$strings["Attend"] = "Participar o asistir"; -App::$strings["Attendance Options"] = "Opciones de participación o asistencia"; -App::$strings["Vote"] = "Votar"; -App::$strings["Voting Options"] = "Opciones de votación"; App::$strings["Go to previous comment"] = "Ir al comentario anterior"; App::$strings["Add to Calendar"] = "Añadir al calendario"; App::$strings["Image"] = "Imagen"; diff --git a/view/es-es/lostpass_eml.tpl b/view/es-es/lostpass_eml.tpl index 1e92ee758..39ce5e67b 100644 --- a/view/es-es/lostpass_eml.tpl +++ b/view/es-es/lostpass_eml.tpl @@ -20,8 +20,8 @@ Puede cambiar esta contraseña desde su cuenta después de iniciar sesión. Los detalles del inicio de sesión son los siguientes: -Localización del sitio:⇥{{$siteurl}} -Nombre de usuario:⇥{{$email}} +Localización del sitio: {{$siteurl}} +Nombre de usuario: {{$email}} diff --git a/view/js/acl.js b/view/js/acl.js index 9415113dd..4597184ea 100644 --- a/view/js/acl.js +++ b/view/js/acl.js @@ -12,8 +12,13 @@ function ACL(backend_url) { that.deny_cid = []; that.deny_gid = []; - that.group_uids = []; - that.group_ids = []; + that.group_uids = {}; + that.group_ids = {}; + that.contact_uids = {}; + that.contact_ids = {}; + + that.bang = ''; + that.selected_id = ''; that.info = $("#acl-info"); @@ -78,6 +83,8 @@ ACL.prototype.get_form_data = function(event) { that.deny_cid = (that.form_id.data('deny_cid') || []); that.deny_gid = (that.form_id.data('deny_gid') || []); + that.bang = (that.form_id.data('bang') || ''); + that.update_view(); that.on_submit(); @@ -147,15 +154,31 @@ ACL.prototype.on_showall = function(event) { }; ACL.prototype.on_showgroup = function(event) { - var xid = that.acl_select.children(":selected").val(); + + var xid = that.acl_select.val(); + var cid = ''; + + if(xid.length && xid.substr(0,1) == '^') { + cid = xid.slice(1); + xid = ''; + } // preventDefault() isn't called here as we want state changes from update_view() to be applied to the radiobutton event.stopPropagation(); - that.allow_cid = []; - that.allow_gid = [xid]; - that.deny_cid = []; - that.deny_gid = []; + if (xid.length) { + that.allow_cid = []; + that.allow_gid = [xid]; + that.deny_cid = []; + that.deny_gid = []; + + } + else { + that.allow_cid = [cid]; + that.allow_gid = []; + that.deny_cid = []; + that.deny_gid = []; + } that.update_view(); that.on_submit(); @@ -307,8 +330,26 @@ ACL.prototype.update_view = function(value) { $('#dbtn-jotnets').hide(); $('.profile-jot-net input').attr('disabled', 'disabled'); } + else if (that.allow_gid.length === 0 && that.allow_cid.length === 1 && that.deny_gid.length === 0 && that.deny_cid.length === 0 && value !== 'custom') { + + if(that.bang && that.bang !== that.allow_cid[0]) { + that.update_view('custom'); + return; + } + + that.list.hide(); //hide acl-list + that.info.hide(); //show acl-info + that.selected_id = that.contact_ids[that.allow_cid[0]]; + that.update_select('\\^' + that.selected_id); + + /* jot acl */ + $('#jot-perms-icon, #dialog-perms-icon, #' + that.form_id[0].id + ' .jot-perms-icon').removeClass('fa-unlock').addClass('fa-lock'); + $('#dbtn-jotnets').hide(); + $('.profile-jot-net input').attr('disabled', 'disabled'); + } else { + that.list.show(); //show acl-list datasrc2src('#acl-list-content .list-group-item img[data-src]'); that.info.hide(); //hide acl-info @@ -382,6 +423,21 @@ ACL.prototype.update_view = function(value) { bthide.removeClass("btn-outline-danger").addClass("btn-danger"); $(this).removeClass("groupshow"); } + $(that.contact_uids[id]).each(function(i, v) { + if(uclass == "grouphide") + // we need attr selection here because the id can include an @ (diaspora/friendica xchans) + $('[id="g' + v + '"]').removeClass("groupshow"); + if(uclass !== "") { + var cls = $('[id="g' + v + '"]').attr('class'); + if( cls === undefined) + return true; + var hiding = cls.indexOf('grouphide'); + if(hiding == -1) + $('[id="g' + v + '"]').addClass(uclass); + } + }); + break; + } }); } @@ -415,9 +471,13 @@ ACL.prototype.populate = function(data) { that.group_uids[this.xid] = this.uids; that.group_ids[this.xid] = this.id; } + else { + that.contact_ids[this.xid] = this.id; + } if (this.self === 'abook-self') { that.self[0] = this.xid; } + that.list_content.append(html); }); }; diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index 660b5f190..27011b4d4 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -40,7 +40,7 @@ function contact_format(item) { var desc = ((item.label) ? item.nick + ' ' + item.label : item.nick); if(typeof desc === 'undefined') desc = ''; if(desc) desc = ' ('+desc+')'; - return "<div class='{0} dropdown-item dropdown-notification clearfix' title='{4}'><img class='menu-img-2' src='{1}'><span class='contactname'>{2}</span><span class='dropdown-sub-text'>{4}</span></div>".format(item.taggable, item.photo, item.name, desc, typeof(item.link) !== 'undefined' ? item.link : desc.replace('(','').replace(')','')); + return "<div class='{0} dropdown-item dropdown-notification clearfix' title='{4}'><img class='menu-img-2' src='{1}' loading='lazy'><span class='font-weight-bold contactname'>{2}</span><span class='dropdown-sub-text'>{4}</span></div>".format(item.taggable, item.photo, item.name, desc, typeof(item.link) !== 'undefined' ? item.link : desc.replace('(','').replace(')','')); } else return "<div>" + item.text + "</div>"; diff --git a/view/js/main.js b/view/js/main.js index 0e143bc99..fb7bcb52f 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -30,6 +30,7 @@ var sse_bs_active = false; var sse_offset = 0; var sse_type; var sse_partial_result = false; +var sse_rmids = []; var page_cache = {}; @@ -176,8 +177,7 @@ $(document).ready(function() { $('.notification-content').on('scroll', function() { if(this.scrollTop > this.scrollHeight - this.clientHeight - (this.scrollHeight/7)) { - if(!sse_bs_active) - sse_bs_notifications(sse_type, false, true); + sse_bs_notifications(sse_type, false, true); } }); @@ -535,6 +535,8 @@ function closeMenu(theID) { function markRead(notifType) { $.get('ping?f=&markRead='+notifType); $('.' + notifType + '-button').fadeOut(function() { + $("." + notifType + "-update").html('0'); + $('#nav-' + notifType + '-menu').html(''); $('#nav-' + notifType + '-sub').removeClass('show'); sessionStorage.removeItem('notification_open'); sse_setNotificationsStatus(); @@ -543,7 +545,7 @@ function markRead(notifType) { function markItemRead(itemId) { $.get('ping?f=&markItemRead='+itemId); - $('.unseen-wall-indicator-'+itemId).hide(); + $('.unseen-wall-indicator-'+itemId).remove(); } function contextualHelp() { @@ -708,6 +710,9 @@ function updateConvItems(mode,data) { var nmids = $(this).data('b64mids'); nmids.forEach(function(nmid, index) { + + sse_rmids.push(nmid); + if($('.notification[data-b64mid=\'' + nmid + '\']').length) { $('.notification[data-b64mid=\'' + nmid + '\']').each(function() { var n = this.parentElement.id.split('-'); @@ -741,12 +746,6 @@ function updateConvItems(mode,data) { }); - // We are actually dealing with counts in sse_updateNotifications() - // for notifications which are already visible. For the case where - // unseen items were loaded but their notifications are not yet visible - // we need to bootstrap counts here to stay in sync with the DB after - // the first page load. - if(followUpPageLoad) sse_bs_counts(); else @@ -1764,14 +1763,31 @@ function sse_bs_init() { } function sse_bs_counts() { - $.get('/sse_bs',function(obj) { + + + if(sse_bs_active) + return; + + sse_bs_active = true; + + $.ajax({ + type: 'post', + url: '/sse_bs', + data: { sse_rmids } + }).done( function(obj) { console.log(obj); + sse_bs_active = false; + sse_rmids = []; sse_handleNotifications(obj, true, false); }); } function sse_bs_notifications(e, replace, followup) { - sse_bs_active = true; + + if(sse_bs_active) + return; + + var manual = false; if(typeof replace === 'undefined') @@ -1803,17 +1819,23 @@ function sse_bs_notifications(e, replace, followup) { var cn_val = (($('#cn-' + sse_type + '-input').length && sse_partial_result) ? $('#cn-' + sse_type + '-input').val().toString().toLowerCase() : ''); - $.get('/sse_bs/' + sse_type + '/' + sse_offset + '?nquery=' + encodeURIComponent(cn_val), function(obj) { + $("#nav-" + sse_type + "-loading").show(); + + sse_bs_active = true; + + $.ajax({ + type: 'post', + url: '/sse_bs/' + sse_type + '/' + sse_offset, + nquery: encodeURIComponent(cn_val), + data: { sse_rmids } + }).done(function(obj) { console.log('sse: bootstraping ' + sse_type); console.log(obj); - sse_bs_active = false; + sse_rmids = []; + $("#nav-" + sse_type + "-loading").hide(); sse_offset = obj[sse_type].offset; - if(sse_offset < 0) - $("#nav-" + sse_type + "-loading").hide(); - sse_handleNotifications(obj, replace, followup); - }); } else @@ -1834,14 +1856,21 @@ function sse_handleNotifications(obj, replace, followup) { var all_notifications = primary_notifications.concat(secondary_notifications); all_notifications.forEach(function(type, index) { - if(obj[type] && obj[type].count) { + if(typeof obj[type] === typeof undefined) + return true; + + if(obj[type].count) { $('.' + type + '-button').fadeIn(); if(replace || followup) $('.' + type + '-update').html(Number(obj[type].count)); else $('.' + type + '-update').html(Number(obj[type].count) + Number($('.' + type + '-update').html())); } - if(obj[type] && obj[type].notifications.length) + else { + $('.' + type + '-update').html('0'); + $('.' + type + '-button').fadeOut(); + } + if(obj[type].notifications.length) sse_handleNotificationsItems(type, obj[type].notifications, replace, followup); }); @@ -1862,10 +1891,18 @@ function sse_handleNotifications(obj, replace, followup) { }); } + // load more notifications if visible notifications count becomes low + if(sse_type && sse_offset != -1 && $('#nav-' + sse_type + '-menu').children().length <= 20) { + sse_offset = 0; + sse_bs_notifications(sse_type, false, true); + } + + } function sse_handleNotificationsItems(notifyType, data, replace, followup) { - var notifications_tpl = ((notifyType == 'forums') ? decodeURIComponent($("#nav-notifications-forums-template[rel=template]").html()) : decodeURIComponent($("#nav-notifications-template[rel=template]").html())); + + var notifications_tpl = ((notifyType == 'forums') ? decodeURIComponent($("#nav-notifications-forums-template[rel=template]").html().replace('data-src', 'src')) : decodeURIComponent($("#nav-notifications-template[rel=template]").html().replace('data-src', 'src'))); var notify_menu = $("#nav-" + notifyType + "-menu"); var notify_loading = $("#nav-" + notifyType + "-loading"); var notify_count = $("." + notifyType + "-update"); @@ -1876,6 +1913,11 @@ function sse_handleNotificationsItems(notifyType, data, replace, followup) { } $(data).each(function() { + + // do not add a notification if it is already present + if($('#nav-' + notifyType + '-menu .notification[data-b64mid=\'' + this.b64mid + '\']').length) + return true; + html = notifications_tpl.format(this.notify_link,this.photo,this.name,this.addr,this.message,this.when,this.hclass,this.b64mid,this.notify_id,this.thread_top,this.unseen,this.private_forum, encodeURIComponent(this.mids), this.body); notify_menu.append(html); }); @@ -1918,7 +1960,7 @@ function sse_updateNotifications(type, mid) { if(type === 'notify' && (mid !== bParam_mid || sse_type !== 'notify')) return true; - +/* var count = Number($('.' + type + '-update').html()); count--; @@ -1932,6 +1974,7 @@ function sse_updateNotifications(type, mid) { else { $('.' + type + '-update').html(count); } +*/ $('#nav-' + type + '-menu .notification[data-b64mid=\'' + mid + '\']').fadeOut(function() { this.remove(); @@ -1975,4 +2018,5 @@ function sse_setNotificationsStatus() { $('#no_notifications').show(); $('#notifications').hide(); } + } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 08a6e9d19..545e610b5 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -799,8 +799,6 @@ div.jGrowl div.jGrowl-notification { } .contactname { - font-weight: bold; - color: $font_colour; display: block; overflow: hidden; text-overflow: ellipsis; diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl index 3d05cb455..c58a345e5 100755 --- a/view/tpl/acl_selector.tpl +++ b/view/tpl/acl_selector.tpl @@ -15,12 +15,14 @@ {{if $aclModalDesc}} <div id="acl-dialog-description" class="section-content-info-wrapper">{{$aclModalDesc}}</div> {{/if}} - <label for="acl-select">{{$select_label}}</label> + <label for="acl-select">{{if $aclModalDesc}}<i class="fa fa-send-o"></i> {{/if}}{{$select_label}}</label> <select id="acl-select" name="optionsRadios" class="form-control form-group"> <option id="acl-showall" value="public" {{$public_selected}}>{{$showall}}</option> - {{$groups}} <option id="acl-onlyme" value="onlyme" {{$justme_selected}}>{{$onlyme}}</option> - <option id="acl-custom" value="custom" {{$custom_selected}}>{{$custom}}</option> + {{$groups}} + <optgroup label = "{{$custom_label}}">; + <option id="acl-custom" value="custom" {{$custom_selected}}>{{$custom}}</option> + </optgroup>; </select> {{if $showallOrigin}} @@ -39,8 +41,8 @@ <div class="list-group-item acl-list-item" rel="acl-template" style="display:none"> <div class="acl-item-header clearfix"> - <img class="menu-img-3" data-src="{0}"> - <span class="contactname">{1}</span> + <img class="menu-img-3" data-src="{0}" loading="lazy" /> + <span class="font-weight-bold contactname">{1}</span> <span class="dropdown-sub-text">{6}</span> </div> <button class="acl-button-hide btn btn-sm btn-outline-danger"><i class="fa fa-times"></i> {{$hide}}</button> diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl index f9b46b41e..86a230c7f 100755 --- a/view/tpl/connection_template.tpl +++ b/view/tpl/connection_template.tpl @@ -22,7 +22,7 @@ <div class="section-content-tools-wrapper"> <div class="contact-photo-wrapper" > <a href="{{$contact.url}}" title="{{$contact.img_hover}}" > - <img class="directory-photo-img {{if $contact.classes}}{{$contact.classes}}{{/if}}" src="{{$contact.thumb}}" alt="{{$contact.name}}" /> + <img class="directory-photo-img {{if $contact.classes}}{{$contact.classes}}{{/if}}" src="{{$contact.thumb}}" alt="{{$contact.name}}" loading="lazy" /> </a> {{include "connstatus.tpl" perminfo=$contact.perminfo}} </div> diff --git a/view/tpl/contact_template.tpl b/view/tpl/contact_template.tpl index 73fa5adde..7c8c02ea2 100755 --- a/view/tpl/contact_template.tpl +++ b/view/tpl/contact_template.tpl @@ -1,6 +1,6 @@ <div class="contact-entry-wrapper" id="contact-entry-wrapper-{{$contact.id}}" > <div class="contact-entry-photo-wrapper" > - <a href="{{$contact.link}}" title="{{$contact.img_hover}}" ><img class="contact-block-img" src="{{$contact.thumb}}" alt="{{$contact.name}}" /></a> + <a href="{{$contact.link}}" title="{{$contact.img_hover}}" ><img class="contact-block-img" src="{{$contact.thumb}}" alt="{{$contact.name}}" loading="lazy" /></a> {{if $contact.perminfo}}{{include "connstatus.tpl" perminfo=$contact.perminfo}}{{/if}} </div> <div class="contact-entry-photo-end" ></div> diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index f48e88006..d7eaefe7e 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -35,7 +35,7 @@ {{/if}} <div class="wall-item-info" id="wall-item-info-{{$item.id}}" > <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}} h-card p-author" id="wall-item-photo-wrapper-{{$item.id}}"> - <img src="{{$item.thumb}}" class="fakelink wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" data-toggle="dropdown" /> + <img src="{{$item.thumb}}" class="fakelink wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" loading="lazy" data-toggle="dropdown" /> {{if $item.thread_author_menu}} <i class="fa fa-caret-down wall-item-photo-caret cursor-pointer" data-toggle="dropdown"></i> <div class="dropdown-menu"> diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index 21c38829a..113cf2324 100755 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -29,7 +29,7 @@ <div class="p-2 clearfix wall-item-head{{if !$item.title && !$item.event && !$item.photo}} rounded-top{{/if}}{{if $item.is_new && !$item.event && !$item.is_comment}} wall-item-head-new{{/if}}"> <div class="wall-item-info" id="wall-item-info-{{$item.id}}" > <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}} h-card p-author" id="wall-item-photo-wrapper-{{$item.id}}"> - <img src="{{$item.thumb}}" class="fakelink wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" data-toggle="dropdown" /></a> + <img src="{{$item.thumb}}" class="fakelink wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" data-toggle="dropdown" loading="lazy" /></a> {{if $item.thread_author_menu}} <i class="fa fa-caret-down wall-item-photo-caret cursor-pointer" data-toggle="dropdown"></i> <div class="dropdown-menu"> diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl index 175d813c5..015f1102d 100755 --- a/view/tpl/direntry.tpl +++ b/view/tpl/direntry.tpl @@ -23,7 +23,7 @@ <div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$entry.hash}}" > <div class="contact-photo" id="directory-photo-{{$entry.hash}}" > <a href="{{$entry.profile_link}}" class="directory-profile-link" id="directory-profile-link-{{$entry.hash}}" > - <img class="directory-photo-img" src="{{$entry.photo}}" alt="{{$entry.alttext}}" title="{{$entry.alttext}}" /> + <img class="directory-photo-img" src="{{$entry.photo}}" alt="{{$entry.alttext}}" title="{{$entry.alttext}}" loading="lazy"/> </a> </div> </div> diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl index 1810e1ee1..4c8b62f36 100755 --- a/view/tpl/field_acheckbox.tpl +++ b/view/tpl/field_acheckbox.tpl @@ -5,8 +5,8 @@ </td> {{if $notself}} <td class="abook-them"> - {{if $field.2 === 1}}<i class="fa fa-check-square-o"></i>{{/if}} - {{if $field.2 === 0}}<i class="fa fa-square-o"></i>{{/if}} + {{if $field.2 == 1}}<i class="fa fa-check-square-o"></i>{{/if}} + {{if $field.2 == 0}}<i class="fa fa-square-o"></i>{{/if}} </td> {{/if}} <td class="abook-me"> diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 4e496b511..36543ccfa 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -1,6 +1,6 @@ <input id="invisible-wall-file-upload" type="file" name="files" style="visibility:hidden;position:absolute;top:-50;left:-50;width:0;height:0;" multiple> <input id="invisible-comment-upload" type="file" name="files" style="visibility:hidden;position:absolute;top:-50;left:-50;width:0;height:0;" multiple> -<form id="profile-jot-form" action="{{$action}}" method="post" class="acl-form" data-form_id="profile-jot-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'> +<form id="profile-jot-form" action="{{$action}}" method="post" class="acl-form" data-form_id="profile-jot-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}' data-bang='{{$bang}}'> {{$mimeselect}} {{$layoutselect}} {{if $id_select}} diff --git a/view/tpl/micropro_img.tpl b/view/tpl/micropro_img.tpl index 98f33d119..5bfca615f 100755 --- a/view/tpl/micropro_img.tpl +++ b/view/tpl/micropro_img.tpl @@ -1 +1 @@ -<div class="contact-block-div{{if $class}} {{$class}}{{/if}}"><a class="contact-block-link{{if $class}} {{$class}}{{/if}}{{if $click}} fakelink{{/if}}" href="{{if $click}}#{{else}}{{$url}}{{/if}}" {{if $click}}onclick="{{$click}}"{{/if}}><img class="contact-block-img{{if $class}} {{$class}}{{/if}}" src="{{$photo}}" title="{{$title}}" alt="" />{{if $perminfo}}{{include "connstatus.tpl"}}{{/if}}</a></div> +<div class="contact-block-div{{if $class}} {{$class}}{{/if}}"><a class="contact-block-link{{if $class}} {{$class}}{{/if}}{{if $click}} fakelink{{/if}}" href="{{if $click}}#{{else}}{{$url}}{{/if}}" {{if $click}}onclick="{{$click}}"{{/if}}><img class="contact-block-img{{if $class}} {{$class}}{{/if}}" src="{{$photo}}" title="{{$title}}" alt="" loading="lazy" />{{if $perminfo}}{{include "connstatus.tpl"}}{{/if}}</a></div> diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl index abfc922f2..1a24ca7c4 100644 --- a/view/tpl/notifications_widget.tpl +++ b/view/tpl/notifications_widget.tpl @@ -142,17 +142,17 @@ {{$no_notifications}}<span class="jumping-dots"><span class="dot-1">.</span><span class="dot-2">.</span><span class="dot-3">.</span></span> </div> <div id="nav-notifications-template" rel="template"> - <a class="list-group-item clearfix notification {6}" href="{0}" title="{13}" data-b64mid="{7}" data-notify_id="{8}" data-thread_top="{9}" data-contact_name="{2}" data-contact_addr="{3}" data-when="{5}"> - <img class="menu-img-3" src="{1}"> - <span class="contactname">{2} <span class="font-weight-normal text-muted">{3}</span></span> - <span class="dropdown-sub-text">{4}</span><br> - <span class="dropdown-sub-text notifications-autotime" title="{5}">{5}</span> + <a class="list-group-item text-decoration-none text-darkclearfix notification {6}" href="{0}" title="{13}" data-b64mid="{7}" data-notify_id="{8}" data-thread_top="{9}" data-contact_name="{2}" data-contact_addr="{3}" data-when="{5}"> + <img class="menu-img-3" data-src="{1}" loading="lazy"> + <div class="contactname"><span class="text-dark font-weight-bold">{2}</span> <span class="text-muted">{3}</span></div> + <span class="text-muted">{4}</span><br> + <span class="text-muted notifications-autotime" title="{5}">{5}</span> </a> </div> <div id="nav-notifications-forums-template" rel="template"> - <a class="list-group-item clearfix notification notification-forum" href="{0}" title="{4} - {3}" data-b64mid="{7}" data-notify_id="{8}" data-thread_top="{9}" data-contact_name="{2}" data-contact_addr="{3}" data-b64mids='{12}'> + <a class="list-group-item text-decoration-none clearfix notification notification-forum" href="{0}" title="{4} - {3}" data-b64mid="{7}" data-notify_id="{8}" data-thread_top="{9}" data-contact_name="{2}" data-contact_addr="{3}" data-b64mids='{12}'> <span class="float-right badge badge-secondary">{10}</span> - <img class="menu-img-1" src="{1}"> + <img class="menu-img-1" data-src="{1}" loading="lazy"> <span class="">{2}</span> <i class="fa fa-{11} text-muted"></i> </a> @@ -160,13 +160,13 @@ <div id="notifications" class="border border-bottom-0 rounded navbar-nav collapse"> {{foreach $notifications as $notification}} <div class="rounded list-group list-group-flush collapse {{$notification.type}}-button"> - <a id="notification-link-{{$notification.type}}" class="collapsed list-group-item notification-link" href="#" title="{{$notification.title}}" data-target="#nav-{{$notification.type}}-sub" data-toggle="collapse" data-sse_type="{{$notification.type}}"> + <a id="notification-link-{{$notification.type}}" class="collapsed list-group-item text-decoration-none notification-link" href="#" title="{{$notification.title}}" data-target="#nav-{{$notification.type}}-sub" data-toggle="collapse" data-sse_type="{{$notification.type}}"> <i class="fa fa-fw fa-{{$notification.icon}}"></i> {{$notification.label}} <span class="float-right badge badge-{{$notification.severity}} {{$notification.type}}-update"></span> </a> <div id="nav-{{$notification.type}}-sub" class="list-group list-group-flush border border-left-0 border-top-0 border-right-0 collapse notification-content" data-parent="#notifications" data-sse_type="{{$notification.type}}"> {{if $notification.viewall}} - <a class="list-group-item text-dark" id="nav-{{$notification.type}}-see-all" href="{{$notification.viewall.url}}"> + <a class="list-group-item text-decoration-none text-dark" id="nav-{{$notification.type}}-see-all" href="{{$notification.viewall.url}}"> <i class="fa fa-fw fa-external-link"></i> {{$notification.viewall.label}} </a> {{/if}} diff --git a/view/tpl/photo_top.tpl b/view/tpl/photo_top.tpl index a86aa7f80..16862a8d6 100755 --- a/view/tpl/photo_top.tpl +++ b/view/tpl/photo_top.tpl @@ -1,4 +1,4 @@ <a href="{{$photo.link}}" id="photo-top-photo-link-{{$photo.id}}" title="{{$photo.title}}"> - <img src="{{$photo.src}}" alt="{{if $photo.album.name}}{{$photo.album.name}}{{elseif $photo.desc}}{{$photo.desc}}{{elseif $photo.alt}}{{$photo.alt}}{{else}}{{$photo.unknown}}{{/if}}" title="{{$photo.title}}" id="photo-top-photo-{{$photo.id}}" /> + <img src="{{$photo.src}}" alt="{{if $photo.album.name}}{{$photo.album.name}}{{elseif $photo.desc}}{{$photo.desc}}{{elseif $photo.alt}}{{$photo.alt}}{{else}}{{$photo.unknown}}{{/if}}" title="{{$photo.title}}" id="photo-top-photo-{{$photo.id}}" loading="lazy" /> </a> diff --git a/view/tpl/removeaccount.tpl b/view/tpl/removeaccount.tpl index ce6c8ac22..6cd554082 100644 --- a/view/tpl/removeaccount.tpl +++ b/view/tpl/removeaccount.tpl @@ -12,7 +12,9 @@ <label id="remove-account-pass-label" for="remove-account-pass">{{$passwd}}</label> <input class="form-control" type="password" id="remove-account-pass" autocomplete="off" name="qxz_password" value=" " /> </div> + {{if $global}} {{include file="field_checkbox.tpl" field=$global}} + {{/if}} <button type="submit" name="submit" class="btn btn-danger">{{$submit}}</button> </form> </div> diff --git a/view/tpl/removeme.tpl b/view/tpl/removeme.tpl index 40b9546d2..814701fff 100755 --- a/view/tpl/removeme.tpl +++ b/view/tpl/removeme.tpl @@ -12,7 +12,9 @@ <label id="remove-account-pass-label" for="remove-account-pass">{{$passwd}}</label> <input class="form-control" type="password" id="remove-account-pass" autocomplete="off" name="qxz_password" value=" " /> </div> + {{if $global}} {{include file="field_checkbox.tpl" field=$global}} + {{/if}} <button type="submit" name="submit" class="btn btn-danger">{{$submit}}</button> </form> </div> diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index 40341a840..3e986ea21 100755 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -23,7 +23,7 @@ <div class="p-2 clearfix wall-item-head{{if !$item.title && !$item.event && !$item.photo}} rounded-top{{/if}}{{if $item.is_new && !$item.event && !$item.is_comment}} wall-item-head-new{{/if}}" > <div class="wall-item-info" id="wall-item-info-{{$item.id}}" > <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}"> - <img src="{{$item.thumb}}" class="fakelink wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" data-toggle="dropdown" /> + <img src="{{$item.thumb}}" class="fakelink wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" data-toggle="dropdown" loading="lazy" /> {{if $item.thread_author_menu}} <i class="fa fa-caret-down wall-item-photo-caret cursor-pointer" data-toggle="dropdown"></i> <div class="dropdown-menu"> |
