diff options
52 files changed, 3765 insertions, 3300 deletions
diff --git a/Zotlabs/Module/Admin.php b/Zotlabs/Module/Admin.php index 1d37b41bc..e1eaa6e0e 100644 --- a/Zotlabs/Module/Admin.php +++ b/Zotlabs/Module/Admin.php @@ -221,7 +221,7 @@ class Admin extends \Zotlabs\Web\Controller { '$pending' => array( t('Pending registrations'), $pending), '$channels' => array( t('Registered channels'), $channels), '$plugins' => array( t('Active plugins'), $plugins ), - '$version' => array( t('Version'), RED_VERSION), + '$version' => array( t('Version'), STD_VERSION), '$build' => get_config('system', 'db_version') )); } @@ -568,27 +568,33 @@ class Admin extends \Zotlabs\Web\Controller { $block_public = ((x($_POST,'block_public')) ? True : False); set_config('system','block_public',$block_public); - $ws = trim_array_elems(explode("\n",$_POST['whitelisted_sites'])); + $ws = $this->trim_array_elems(explode("\n",$_POST['whitelisted_sites'])); set_config('system','whitelisted_sites',$ws); - $bs = trim_array_elems(explode("\n",$_POST['blacklisted_sites'])); + $bs = $this->trim_array_elems(explode("\n",$_POST['blacklisted_sites'])); set_config('system','blacklisted_sites',$bs); - $wc = trim_array_elems(explode("\n",$_POST['whitelisted_channels'])); + $wc = $this->trim_array_elems(explode("\n",$_POST['whitelisted_channels'])); set_config('system','whitelisted_channels',$wc); - $bc = trim_array_elems(explode("\n",$_POST['blacklisted_channels'])); + $bc = $this->trim_array_elems(explode("\n",$_POST['blacklisted_channels'])); set_config('system','blacklisted_channels',$bc); - $embed_coop = ((x($_POST,'embed_coop')) ? True : False); - set_config('system','embed_coop',$embed_coop); + $embed_sslonly = ((x($_POST,'embed_sslonly')) ? True : False); + set_config('system','embed_sslonly',$embed_sslonly); - $we = trim_array_elems(explode("\n",$_POST['embed_allow'])); + $we = $this->trim_array_elems(explode("\n",$_POST['embed_allow'])); set_config('system','embed_allow',$we); - $be = trim_array_elems(explode("\n",$_POST['embed_deny'])); + $be = $this->trim_array_elems(explode("\n",$_POST['embed_deny'])); set_config('system','embed_deny',$be); + $ts = ((x($_POST,'transport_security')) ? True : False); + set_config('system','transport_security_header',$ts); + + $cs = ((x($_POST,'content_security')) ? True : False); + set_config('system','content_security_policy',$cs); + goaway(z_root() . '/admin/security'); } @@ -708,9 +714,13 @@ class Admin extends \Zotlabs\Web\Controller { $embed_coop = intval(get_config('system','embed_coop')); - // wait to implement this until we have a co-op in place. - // if((! $whiteembeds) && (! $blackembeds) && (! $embed_coop)) - // $whiteembeds_str = "youtube.com\nyoutu.be\ntwitter.com\nvimeo.com\nsoundcloud.com\nwikipedia.com"; + if((! $whiteembeds) && (! $blackembeds)) { + $embedhelp1 = t("By default, unfiltered HTML is allowed in embedded media. This is inherently insecure."); + } + + $embedhelp2 = t("The recommended setting is to only allow unfiltered HTML from the following sites:"); + $embedhelp3 = t("https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/<br />https://vimeo.com/<br />https://soundcloud.com/<br />"); + $embedhelp4 = t("All other embedded content will be filtered, <strong>unless</strong> embedded content from that site is explicitly blocked."); $t = get_markup_template('admin_security.tpl'); return replace_macros($t, array( @@ -718,14 +728,18 @@ class Admin extends \Zotlabs\Web\Controller { '$page' => t('Security'), '$form_security_token' => get_form_security_token('admin_security'), '$block_public' => array('block_public', t("Block public"), get_config('system','block_public'), t("Check to block public access to all otherwise public personal pages on this site unless you are currently authenticated.")), + '$transport_security' => array('transport_security', t('Set "Transport Security" HTTP header'),intval(get_config('system','transport_security_header')),''), + '$content_security' => array('content_security', t('Set "Content Security Policy" HTTP header'),intval(get_config('system','content_security_policy')),''), '$whitelisted_sites' => array('whitelisted_sites', t('Allow communications only from these sites'), $whitesites_str, t('One site per line. Leave empty to allow communication from anywhere by default')), '$blacklisted_sites' => array('blacklisted_sites', t('Block communications from these sites'), $blacksites_str, ''), '$whitelisted_channels' => array('whitelisted_channels', t('Allow communications only from these channels'), $whitechannels_str, t('One channel (hash) per line. Leave empty to allow from any channel by default')), '$blacklisted_channels' => array('blacklisted_channels', t('Block communications from these channels'), $blackchannels_str, ''), - '$embed_allow' => array('embed_allow', t('Allow embedded HTML content only from these domains'), $whiteembeds_str, t('One site per line. Leave empty to allow from any site by default')), + '$embed_sslonly' => array('embed_sslonly',t('Only allow embeds from secure (SSL) websites and links.'), intval(get_config('system','embed_sslonly')),''), + '$embed_allow' => array('embed_allow', t('Allow unfiltered embedded HTML content only from these domains'), $whiteembeds_str, t('One site per line. By default embedded content is filtered.')), '$embed_deny' => array('embed_deny', t('Block embedded HTML from these domains'), $blackembeds_str, ''), // '$embed_coop' => array('embed_coop', t('Cooperative embed security'), $embed_coop, t('Enable to share embed security with other compatible sites/hubs')), + '$submit' => t('Submit') )); } @@ -1327,6 +1341,8 @@ class Admin extends \Zotlabs\Web\Controller { } } + usort($plugins,'self::plugin_sort'); + $t = get_markup_template('admin_plugins.tpl'); return replace_macros($t, array( '$title' => t('Administration'), @@ -1340,6 +1356,11 @@ class Admin extends \Zotlabs\Web\Controller { )); } + static public function plugin_sort($a,$b) { + return(strcmp(strtolower($a[2]['name']),strtolower($b[2]['name']))); + } + + /** * @param array $themes * @param string $th diff --git a/Zotlabs/Module/Editlayout.php b/Zotlabs/Module/Editlayout.php index cec55f5cc..c5b50235a 100644 --- a/Zotlabs/Module/Editlayout.php +++ b/Zotlabs/Module/Editlayout.php @@ -3,45 +3,45 @@ namespace Zotlabs\Module; require_once('include/identity.php'); require_once('include/acl_selectors.php'); - +require_once('include/conversation.php'); class Editlayout extends \Zotlabs\Web\Controller { function init() { - + if(argc() > 1 && argv(1) === 'sys' && is_site_admin()) { $sys = get_sys_channel(); if($sys && intval($sys['channel_id'])) { \App::$is_sys = true; } } - + if(argc() > 1) $which = argv(1); else return; - + profile_load($a,$which); - + } - - function get() { - + + function get() { + if(! \App::$profile) { notice( t('Requested profile is not available.') . EOL ); \App::$error = 404; return; } - + $which = argv(1); - + $uid = local_channel(); $owner = 0; $channel = null; $observer = \App::get_observer(); - + $channel = \App::get_channel(); - + if(\App::$is_sys && is_site_admin()) { $sys = get_sys_channel(); if($sys && intval($sys['channel_id'])) { @@ -50,7 +50,7 @@ class Editlayout extends \Zotlabs\Web\Controller { $observer = $sys; } } - + if(! $owner) { // Figure out who the page owner is. $r = q("select channel_id from channel where channel_address = '%s'", @@ -60,136 +60,86 @@ class Editlayout extends \Zotlabs\Web\Controller { $owner = intval($r[0]['channel_id']); } } - + $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); - + if(! perm_is_allowed($owner,$ob_hash,'write_pages')) { notice( t('Permission denied.') . EOL); return; } - + $is_owner = (($uid && $uid == $owner) ? true : false); - + $o = ''; - + // Figure out which post we're editing $post_id = ((argc() > 2) ? intval(argv(2)) : 0); - - + if(! $post_id) { notice( t('Item not found') . EOL); return; } - + // Now we've got a post and an owner, let's find out if we're allowed to edit it - + $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); - + $perms = get_all_perms($owner,$ob_hash); - + if(! $perms['write_pages']) { notice( t('Permission denied.') . EOL); return; } - - + $itm = q("SELECT * FROM `item` WHERE `id` = %d and uid = %s LIMIT 1", intval($post_id), intval($owner) ); - + $item_id = q("select * from item_id where service = 'PDL' and iid = %d limit 1", intval($itm[0]['id']) ); if($item_id) $layout_title = $item_id[0]['sid']; - - $plaintext = true; - - \App::$page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array( - '$baseurl' => z_root(), - '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), - '$pretext' => '', - '$ispublic' => ' ', // t('Visible to <strong>everybody</strong>'), - '$geotag' => $geotag, - '$nickname' => $channel['channel_address'], - '$confirmdelete' => t('Delete layout?'), - '$bbco_autocomplete'=> 'comanche' - )); - - - $tpl = get_markup_template("jot.tpl"); - - $jotplugins = ''; - $jotnets = ''; - - call_hooks('jot_tool', $jotplugins); - call_hooks('jot_networks', $jotnets); - - - // FIXME A return path with $_SESSION doesn't always work for observer - it may WSoD - // instead of loading a sensible page. So, send folk to the webpage list. - + $rp = 'layouts/' . $which; - - $editor = replace_macros($tpl,array( - '$return_path' => $rp, - '$action' => 'item', - '$webpage' => ITEM_TYPE_PDL, - '$share' => t('Edit'), - '$bold' => t('Bold'), - '$italic' => t('Italic'), - '$underline' => t('Underline'), - '$quote' => t('Quote'), - '$code' => t('Code'), - '$upload' => t('Upload photo'), - '$attach' => t('Attach file'), - '$weblink' => t('Insert web link'), - '$youtube' => t('Insert YouTube video'), - '$video' => t('Insert Vorbis [.ogg] video'), - '$audio' => t('Insert Vorbis [.ogg] audio'), - '$setloc' => t('Set your location'), - '$noloc' => t('Clear browser location'), - '$wait' => t('Please wait'), - '$permset' => t('Permission settings'), - '$ptyp' => $itm[0]['type'], - '$content' => undo_post_tagging($itm[0]['body']), - '$post_id' => $post_id, - '$baseurl' => z_root(), - '$defloc' => $channel['channel_location'], - '$visitor' => false, - '$public' => t('Public post'), - '$jotnets' => $jotnets, - '$title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'), - '$placeholdertitle' => t('Layout Description (Optional)'), - '$pagetitle' => $layout_title, - '$placeholdpagetitle' => t('Layout Name'), - '$category' => '', - '$placeholdercategory' => t('Categories (optional, comma-separated list)'), - '$emtitle' => t('Example: bob@example.com, mary@example.com'), - '$lockstate' => $lockstate, - '$acl' => '', - '$bang' => '', - '$profile_uid' => (intval($owner)), - '$jotplugins' => $jotplugins, - '$sourceapp' => t(\App::$sourcename), - '$defexpire' => '', - '$feature_expire' => false, - '$expires' => t('Set expiration date'), - )); - - + + $x = array( + 'webpage' => ITEM_TYPE_PDL, + 'nickname' => $channel['channel_address'], + 'editor_autocomplete'=> true, + 'bbco_autocomplete'=> 'comanche', + 'return_path' => $rp, + 'button' => t('Edit'), + 'hide_voting' => true, + 'hide_future' => true, + 'hide_expire' => true, + 'hide_location' => true, + 'hide_weblink' => true, + 'hide_attach' => true, + 'hide_preview' => true, + 'ptyp' => $itm[0]['obj_type'], + 'body' => undo_post_tagging($itm[0]['body']), + 'post_id' => $post_id, + 'title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'), + 'pagetitle' => $layout_title, + 'ptlabel' => t('Layout Name'), + 'placeholdertitle' => t('Layout Description (Optional)'), + 'showacl' => false, + 'profile_uid' => intval($owner), + ); + + $editor = status_editor($a, $x); + $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( '$title' => t('Edit Layout'), '$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false), '$id' => $itm[0]['id'], '$editor' => $editor )); - + return $o; - + } - - - + } diff --git a/Zotlabs/Module/Editpost.php b/Zotlabs/Module/Editpost.php index 1c2c2a30b..25ba1a39a 100644 --- a/Zotlabs/Module/Editpost.php +++ b/Zotlabs/Module/Editpost.php @@ -10,44 +10,38 @@ require_once('include/conversation.php'); class Editpost extends \Zotlabs\Web\Controller { function get() { - + $o = ''; - + if(! local_channel()) { notice( t('Permission denied.') . EOL); return; } - + $post_id = ((argc() > 1) ? intval(argv(1)) : 0); - + if(! $post_id) { notice( t('Item not found') . EOL); return; } - + $itm = q("SELECT * FROM `item` WHERE `id` = %d AND ( owner_xchan = '%s' OR author_xchan = '%s' ) LIMIT 1", intval($post_id), dbesc(get_observer_hash()), dbesc(get_observer_hash()) ); - + if(! count($itm)) { notice( t('Item is not editable') . EOL); return; } - + if($itm[0]['resource_type'] === 'event' && $itm[0]['resource_id']) { goaway(z_root() . '/events/' . $itm[0]['resource_id'] . '?expandform=1'); } - - + $owner_uid = $itm[0]['uid']; - - - $plaintext = true; - // if(feature_enabled(local_channel(),'richtext')) - // $plaintext = false; - + $channel = \App::get_channel(); if(intval($itm[0]['item_obscured'])) { @@ -57,10 +51,10 @@ class Editpost extends \Zotlabs\Web\Controller { if($itm[0]['body']) $itm[0]['body'] = crypto_unencapsulate(json_decode_plus($itm[0]['body']),$key); } - + $category = ''; $catsenabled = ((feature_enabled($owner_uid,'categories')) ? 'categories' : ''); - + if ($catsenabled){ $itm = fetch_post_tags($itm); @@ -72,7 +66,7 @@ class Editpost extends \Zotlabs\Web\Controller { $category .= $cat['term']; } } - + if($itm[0]['attach']) { $j = json_decode($itm[0]['attach'],true); if($j) { @@ -106,16 +100,14 @@ class Editpost extends \Zotlabs\Web\Controller { ); $editor = status_editor($a, $x); - + $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( '$title' => t('Edit post'), '$editor' => $editor )); - + return $o; - + } - - - + } diff --git a/Zotlabs/Module/Layouts.php b/Zotlabs/Module/Layouts.php index 50cb401bc..8a7207fc2 100644 --- a/Zotlabs/Module/Layouts.php +++ b/Zotlabs/Module/Layouts.php @@ -5,47 +5,45 @@ require_once('include/identity.php'); require_once('include/conversation.php'); require_once('include/acl_selectors.php'); - class Layouts extends \Zotlabs\Web\Controller { function init() { - + if(argc() > 1 && argv(1) === 'sys' && is_site_admin()) { $sys = get_sys_channel(); if($sys && intval($sys['channel_id'])) { \App::$is_sys = true; } } - + if(argc() > 1) $which = argv(1); else return; - + profile_load($a,$which); - + } - - - function get() { - + + function get() { + if(! \App::$profile) { notice( t('Requested profile is not available.') . EOL ); \App::$error = 404; return; } - + $which = argv(1); - + $_SESSION['return_url'] = \App::$query_string; - + $uid = local_channel(); $owner = 0; $channel = null; $observer = \App::get_observer(); - + $channel = \App::get_channel(); - + if(\App::$is_sys && is_site_admin()) { $sys = get_sys_channel(); if($sys && intval($sys['channel_id'])) { @@ -54,7 +52,7 @@ class Layouts extends \Zotlabs\Web\Controller { $observer = $sys; } } - + if(! $owner) { // Figure out who the page owner is. $r = q("select channel_id from channel where channel_address = '%s'", @@ -64,34 +62,34 @@ class Layouts extends \Zotlabs\Web\Controller { $owner = intval($r[0]['channel_id']); } } - + $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); - + $perms = get_all_perms($owner,$ob_hash); - + if(! $perms['write_pages']) { notice( t('Permission denied.') . EOL); return; } - + // Block design features from visitors - + if((! $uid) || ($uid != $owner)) { notice( t('Permission denied.') . EOL); return; } - + // Get the observer, check their permissions - + $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); - + $perms = get_all_perms($owner,$ob_hash); - + if(! $perms['write_pages']) { notice( t('Permission denied.') . EOL); return; } - + //This feature is not exposed in redbasic ui since it is not clear why one would want to //download a json encoded pdl file - we dont have a possibility to import it. //Use the buildin share/install feature instead. @@ -109,19 +107,23 @@ class Layouts extends \Zotlabs\Web\Controller { killme(); } } - + // Create a status editor (for now - we'll need a WYSIWYG eventually) to create pages // Nickname is set to the observers xchan, and profile_uid to the owners. // This lets you post pages at other people's channels. - + $x = array( 'webpage' => ITEM_TYPE_PDL, 'is_owner' => true, 'nickname' => \App::$profile['channel_address'], - 'bang' => '', 'showacl' => false, - 'visitor' => false, - 'nopreview' => 1, + 'hide_voting' => true, + 'hide_future' => true, + 'hide_expire' => true, + 'hide_location' => true, + 'hide_weblink' => true, + 'hide_attach' => true, + 'hide_preview' => true, 'ptlabel' => t('Layout Name'), 'profile_uid' => intval($owner), 'expanded' => true, @@ -129,24 +131,24 @@ class Layouts extends \Zotlabs\Web\Controller { 'novoting' => true, 'bbco_autocomplete' => 'comanche' ); - + if($_REQUEST['title']) $x['title'] = $_REQUEST['title']; if($_REQUEST['body']) $x['body'] = $_REQUEST['body']; if($_REQUEST['pagetitle']) $x['pagetitle'] = $_REQUEST['pagetitle']; - + $editor = status_editor($a,$x); - + $r = q("select iid, sid, mid, title, body, mimetype, created, edited, item_type from item_id left join item on item_id.iid = item.id where item_id.uid = %d and service = 'PDL' and item_type = %d order by item.created desc", intval($owner), intval(ITEM_TYPE_PDL) ); - + $pages = null; - + if($r) { $pages = array(); foreach($r as $rr) { @@ -171,10 +173,10 @@ class Layouts extends \Zotlabs\Web\Controller { ); } } - + //Build the base URL for edit links $url = z_root() . '/editlayout/' . $which; - + $o .= replace_macros(get_markup_template('layoutlist.tpl'), array( '$title' => t('Layouts'), '$create' => t('Create'), @@ -192,8 +194,9 @@ class Layouts extends \Zotlabs\Web\Controller { '$channel' => $which, '$view' => t('View'), )); - + return $o; + } - + } diff --git a/Zotlabs/Module/Oep.php b/Zotlabs/Module/Oep.php index f36a452e8..638ea7e2d 100644 --- a/Zotlabs/Module/Oep.php +++ b/Zotlabs/Module/Oep.php @@ -220,7 +220,7 @@ class Oep extends \Zotlabs\Web\Controller { $ret['width'] = intval($width); $ret['height'] = intval($height); - $ret['html'] = get_zcard($c,get_observer_hash(),array('width' => $width, 'height' => $height)); + $ret['html'] = get_zcard_embed($c,get_observer_hash(),array('width' => $width, 'height' => $height)); return $ret; diff --git a/Zotlabs/Module/Sources.php b/Zotlabs/Module/Sources.php index cca9e5ebf..a180d9b6e 100644 --- a/Zotlabs/Module/Sources.php +++ b/Zotlabs/Module/Sources.php @@ -7,7 +7,7 @@ class Sources extends \Zotlabs\Web\Controller { function post() { if(! local_channel()) return; - + if(! feature_enabled(local_channel(),'channel_sources')) return ''; @@ -17,6 +17,7 @@ class Sources extends \Zotlabs\Web\Controller { $words = $_REQUEST['words']; $frequency = $_REQUEST['frequency']; $name = $_REQUEST['name']; + $tags = $_REQUEST['tags']; $channel = \App::get_channel(); @@ -36,14 +37,15 @@ class Sources extends \Zotlabs\Web\Controller { notice ( t('Failed to create source. No channel selected.') . EOL); return; } - + if(! $source) { - $r = q("insert into source ( src_channel_id, src_channel_xchan, src_xchan, src_patt ) - values ( %d, '%s', '%s', '%s' ) ", + $r = q("insert into source ( src_channel_id, src_channel_xchan, src_xchan, src_patt, src_tag ) + values ( %d, '%s', '%s', '%s', '%s' ) ", intval(local_channel()), dbesc($channel['channel_hash']), dbesc($xchan), - dbesc($words) + dbesc($words), + dbesc($tags) ); if($r) { info( t('Source created.') . EOL); @@ -51,9 +53,10 @@ class Sources extends \Zotlabs\Web\Controller { goaway(z_root() . '/sources'); } else { - $r = q("update source set src_xchan = '%s', src_patt = '%s' where src_channel_id = %d and src_id = %d", + $r = q("update source set src_xchan = '%s', src_patt = '%s', src_tag = '%s' where src_channel_id = %d and src_id = %d", dbesc($xchan), dbesc($words), + dbesc($tags), intval(local_channel()), intval($source) ); @@ -62,6 +65,7 @@ class Sources extends \Zotlabs\Web\Controller { } } + } @@ -105,6 +109,8 @@ class Sources extends \Zotlabs\Web\Controller { '$desc' => t('Import all or selected content from the following channel into this channel and distribute it according to your channel settings.'), '$words' => array( 'words', t('Only import content with these words (one per line)'),'',t('Leave blank to import all public content')), '$name' => array( 'name', t('Channel Name'), '', ''), + '$tags' => array('tags', t('Add the following categories to posts imported from this source (comma separated)'),'',t('Optional')), + '$submit' => t('Submit') )); return $o; @@ -138,6 +144,7 @@ class Sources extends \Zotlabs\Web\Controller { '$words' => array( 'words', t('Only import content with these words (one per line)'),$r[0]['src_patt'],t('Leave blank to import all public content')), '$xchan' => $r[0]['src_xchan'], '$abook' => $x[0]['abook_id'], + '$tags' => array('tags', t('Add the following categories to posts imported from this source (comma separated)'),$r[0]['src_tag'],t('Optional')), '$name' => array( 'name', t('Channel Name'), $r[0]['xchan_name'], ''), '$submit' => t('Submit') )); diff --git a/Zotlabs/Project/System.php b/Zotlabs/Project/System.php index a67742db5..f61313da0 100644 --- a/Zotlabs/Project/System.php +++ b/Zotlabs/Project/System.php @@ -4,56 +4,51 @@ namespace Zotlabs\Project; class System { - function get_platform_name() { + static public function get_platform_name() { if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['platform_name']) return \App::$config['system']['platform_name']; return PLATFORM_NAME; } - function get_site_name() { + static public function get_site_name() { if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['sitename']) return \App::$config['system']['sitename']; return ''; } - function get_project_version() { + static public function get_project_version() { if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['hide_version']) return ''; - return RED_VERSION; + return self::get_std_version(); } - function get_update_version() { + static public function get_update_version() { if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['hide_version']) return ''; return DB_UPDATE_VERSION; } - function get_notify_icon() { + static public function get_notify_icon() { if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['email_notify_icon_url']) return \App::$config['system']['email_notify_icon_url']; return z_root() . '/images/hz-white-32.png'; } - function get_site_icon() { + static public function get_site_icon() { if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['site_icon_url']) return \App::$config['system']['site_icon_url']; return z_root() . '/images/hz-32.png'; } - function get_server_role() { + static public function get_server_role() { if(UNO) return 'basic'; return 'advanced'; } - // return the standardised version. Since we can't easily compare - // before the STD_VERSION definition was applied, we have to treat - // all prior release versions the same. You can dig through them - // with other means (such as RED_VERSION) if necessary. - - function get_std_version() { + static public function get_std_version() { if(defined('STD_VERSION')) return STD_VERSION; return '0.0.0'; @@ -46,11 +46,10 @@ require_once('include/account.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'RED_VERSION', trim(file_get_contents('version.inc'))); define ( 'STD_VERSION', '1.4.4' ); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1166 ); +define ( 'DB_UPDATE_VERSION', 1167 ); /** diff --git a/doc/bbcode.html b/doc/bbcode.html index 3e9bda1d9..5a51135ea 100644 --- a/doc/bbcode.html +++ b/doc/bbcode.html @@ -27,12 +27,31 @@ <li>[list=a]<br /> <li>[list=A] <br /> <li>[ul]<br /> -<li>[ol] +<li>[ol]<br /> +<li>[dl]<br /> +<li>[dl terms="biumlh"] — where style of the terms can be any combination of: + <dl class="bb-dl dl-horizontal"> + <dt>b</dt><dd>bold</dd> + <dt>i</dt><dd>italic</dd> + <dt>u</dt><dd>underline</dd> + <dt>m</dt><dd>monospace</dd> + <dt>l</dt><dd>large</dd> + <dt>h</dt><dd>horizontal — like <em>this</em> defintion list</dd> + </dl> +</li> </ul>For example:<br />[ul]<br />[*] First list element<br />[*] Second list element<br />[/ul]<br /><br />Will render something like: <br /> <ul class="listbullet" style="list-style-type: circle;"> <li> First list element<br /> -<li> Second list element</ul><br /> +<li> Second list element</ul> + +or<br /><br />[dl terms="b"]<br />[*= First element term] First element description<br />[*= Second element term] Second element description<br />[/dl]<br /><br />Will render something like: <br /><br /> +<dl class="bb-dl dl-terms-bold"> +<dt> First element term </dt><dd>First element description</dd> +<dt> Second element term </dt><dd>Second element description</dd> +</dl><br /> + + <br />There's also:<br /> <ul class="listloweralpha" style="list-style-type: lower-alpha;"> <li>[hr]<br /> diff --git a/doc/context/es/admin/logs/help.html b/doc/context/es/admin/logs/help.html new file mode 100644 index 000000000..2324492bf --- /dev/null +++ b/doc/context/es/admin/logs/help.html @@ -0,0 +1,36 @@ +<html> + <head> + <meta content="text/html; charset=windows-1252" http-equiv="content-type"> + </head> + <body> + <dl class="dl-horizontal"> + <dt>General</dt> + <dd><span id="result_box" class="" lang="es"><span>Esta pgina</span> <span>le + permite ajustar</span> <span>los parmetros de los informes del + sistema (logs)</span> <span>y para</span> <span>ver uno</span> <span>existente</span><span + class="">.</span></span></dd> + <dt>Ajustes de los informes (logs)</dt> + <dd><span id="result_box" class="" lang="es"><span>Cuando se habilita la</span> + <span>opcin de depuracin</span><span>,</span> el <span>sistema de</span> + <span>informacin</span> <span class="">comenzar</span> a <span>aadir + </span>los informes (logs) <span>en el archivo especificado</span> <span>en + el cuadro</span> <span>"</span><span>Fichero de informes</span><span>"</span> + <span>(la </span><span class="">ruta es relativa</span> <span class="">al + directorio raz del servidor</span><span>,</span> <span>por + ejemplo,</span> <span>/</span><span>var</span> <span>/</span><span>www</span><span + class="">)</span><span>.</span> <span>Tenga en cuenta que</span> <span + class="">este archivo</span> <span class="">tiene que</span> <span + class="">ser modificable por el</span> <span>servidor web</span><span>.</span></span></dd> + <dt>Nivel de depuracin</dt> + <dd><span id="result_box" class="" lang="es"><span>La opcin de</span> <span>nivel + de depuracin</span> <span>le permite establecer</span> <span>la + cantidad de informacin</span> <span>que se</span> <span>anexa al + fichero de informes (logs)</span><span>.</span> <span>Advertencia</span><span>:</span> + <span>El aumento de</span> <span>este nivel</span> <span>puede + aumentar</span> <span>rpidamente el tamao</span> <span>de este + fichero hasta en ms de</span><span></span> <span>100 MB</span><span>, + especialmente</span> <span>en</span> <span>los hubs</span> <span>con</span> + <span>ms que unos pocos</span> <span>miembros</span><span class="">.</span></span></dd> + </dl> + </body> +</html> diff --git a/doc/context/es/admin/queue/help.html b/doc/context/es/admin/queue/help.html new file mode 100644 index 000000000..a4085c5c6 --- /dev/null +++ b/doc/context/es/admin/queue/help.html @@ -0,0 +1,17 @@ +<html> + <head> + <meta content="text/html; charset=windows-1252" http-equiv="content-type"> + </head> + <body> + <dl class="dl-horizontal"> + <dt>General</dt> + <dd><span id="result_box" class="" lang="es"><span>Las estadsticas</span> + <span>de la cola muestran</span> <span>cuntos</span> <span>mensajes</span> + <span>estn en</span> <span>la cola</span> <span>para su entrega a</span> + <span>otros hubs</span><span>.</span> <span class="">La prioridad</span> + <span>est relacionada con</span> <span>la cantidad de veces</span> + que <span>la entrega</span> <span>se ha intentado</span><span>, sin + xito</span><span>.</span></span></dd> + </dl> + </body> +</html> diff --git a/doc/context/es/admin/security/help.html b/doc/context/es/admin/security/help.html new file mode 100644 index 000000000..8817636ed --- /dev/null +++ b/doc/context/es/admin/security/help.html @@ -0,0 +1,17 @@ +<html> + <head> + <meta content="text/html; charset=windows-1252" http-equiv="content-type"> + </head> + <body> + <dl class="dl-horizontal"> + <dt>General</dt> + <dd><span id="result_box" class="" lang="es"><span>Esta pgina</span> <span>contiene</span> + <span class="">varios ajustes</span> </span><span id="result_box" class="" + lang="es"><span>para el administrador</span> </span><span id="result_box" + class="" lang="es"><span class="">relacionados con la seguridad</span>. + <span>Para</span> <span class="">guardar los cambios que</span> <span + class="">realice en</span> <span>estos ajustes</span><span>, debe + pulsar</span> <span class="">el botn Enviar.</span></span></dd> + </dl> + </body> +</html> diff --git a/doc/context/es/channel/help.html b/doc/context/es/channel/help.html new file mode 100644 index 000000000..3d925241d --- /dev/null +++ b/doc/context/es/channel/help.html @@ -0,0 +1,35 @@ +<html> + <head> + <meta content="text/html; charset=windows-1252" http-equiv="content-type"> + </head> + <body> + <dl class="dl-horizontal"> + <dt>General</dt> + <dd><span id="result_box" class="" lang="es"><span>Esta</span> <span>es + la</span> <span>pgina principal de un</span> <span>canal.</span> + <span>Es similar</span> <span>al "muro" del perfil </span><span></span><span></span><span></span> + <span>de una persona</span> <span>en un contexto</span> de <span>red + social</span><span>.</span> <span>Las entradas</span> <span>creadas + por</span> <span>el canal</span> <span>se</span> <span>muestran + de acuerdo con</span> <span>los permisos de visualizacin</span> <span + class="">del observador</span><span>.</span></span></dd> + <dt>Crear una entrada</dt> + <dd><span id="result_box" class="" lang="es"><span>Si tiene permiso</span> + <span>para crear</span> <span>entradas en</span> <span>la pgina del + canal</span><span>,</span> <span>a continuacin,</span> <span>podr + ver el</span> <span>editor de entradas</span> <span>en la parte + superior</span><span class="">.</span></span></dd> + <dt><a href="#" onclick='contextualHelpFocus("#tabs-collapse-1", 0); return false;' + title="Pulsar sobre el elemento resaltado...">Pestaas de los + contenidos del canal</a></dt> + <dd><span id="result_box" class="" lang="es"><span>Las</span> <span>pestaas</span> + <span>de los contenidos</span> <span>del canal</span> <span>son</span> + <span>enlaces a otros contenidos</span> <span>publicados por el</span> + <span>canal.</span> La pestaa "<span style="font-weight: bold;">Mi + perfil</span>" enlaza con el perfil del canal. La pestaa "<span style="font-weight: bold;">Fotos</span>" + enlaza con las galeras de fotos. La pestaa "<span style="font-weight: bold;">Ficheros</span>" + enlaza con los ficheros de cualquier tipo compartidos por el canal.<span + class=""></span></span></dd> + </dl> + </body> +</html> diff --git a/doc/context/es/chat/help.html b/doc/context/es/chat/help.html new file mode 100644 index 000000000..805f7b87a --- /dev/null +++ b/doc/context/es/chat/help.html @@ -0,0 +1,30 @@ +<html> + <head> + <meta content="text/html; charset=windows-1252" http-equiv="content-type"> + </head> + <body> + <dl class="dl-horizontal"> + <dt>General</dt> + <dd><span id="result_box" class="" lang="es"><span>Creacin y uso de</span> + <span>salas de chat para</span> <span>comunicarse en tiempo</span> <span>real, + utilizando</span> <span class="">el sistema de</span> <span>permisos</span> + <span>Hubzilla</span> <span>estndar para el</span> <span>control de + acceso a</span> <span class="">la sala de chat</span><span>.</span></span></dd> + <dt>Create una nueva sala de chat</dt> + <dd><span id="result_box" class="" lang="es"><span>Utilice</span> <span>el + botn</span> <span>"</span><span class="">Crear" para</span> <span>crear + una nueva</span> <span class="">sala de chat</span><span>.</span> <span + class="">Introduzca un nombre y</span> <span class="">cunto tiempo + se deben conservar los mensajes.</span><span class=""></span></span></dd> + <dt>Chatear</dt> + <dd><span id="result_box" class="" lang="es"><span>Introduzca su mensaje + en</span> <span>el cuadro de mensaje</span> <span>y pulse</span> <span>"Enviar".</span> + <span>Se puede establecer un</span> <span>estado</span> <span>seleccionando + el</span> <span>botn de men</span> <span>sala de chat</span> <span>junto + al botn</span> <span>Enviar.</span> <span>Si hay otras personas</span> + <span>"en la sala</span><span>",</span> <span>sern visibles en</span> + <span>el panel lateral</span>, <span>en</span><span></span> <span>"</span><span + class="">Miembros del chat</span><span>"</span><span class="">.</span></span></dd> + </dl> + </body> +</html> diff --git a/doc/context/es/cloud/help.html b/doc/context/es/cloud/help.html new file mode 100644 index 000000000..474918e81 --- /dev/null +++ b/doc/context/es/cloud/help.html @@ -0,0 +1,30 @@ +<html> + <head> + <meta content="text/html; charset=windows-1252" http-equiv="content-type"> + </head> + <body> + <dl class="dl-horizontal"> + <dt>General</dt> + <dd><span id="result_box" class="" lang="es"><span>Esta pgina</span> <span>muestra + los ficheros en la</span> <span>"nube"</span> <span>de un canal</span><span>.</span> + <span>Los</span> <span>archivos visibles</span> <span>para el + observador</span> <span>dependen de</span> <span>los permisos de + archivo</span> <span>individuales</span> <span>establecidas por</span> + <span>el propietario del canal</span><span>.</span> <span>Si tiene + permiso</span> <span>para crear</span> <span>o</span> <span>cargar + ficheros,</span> <span>ver</span> <span>botones de control</span> + <span>por encima de la</span> <span class="">lista de ficheros.</span></span></dd> + <dt><a href="#" onclick='contextualHelpFocus("#tabs-collapse-1", 0); return false;' + title="Pulsar en el elemento resaltado...">Pestaas de los contenidos + del canal<br> + </a></dt> + <dd><span id="result_box" class="" lang="es"><span>Las</span> <span>pestaas</span> + <span>de los contenidos</span> <span>del canal</span> <span>son</span> + <span>enlaces a otros contenidos</span> <span>publicados por el</span> + <span>canal.</span> La pestaa "<span style="font-weight: bold;">Mi + perfil</span>" enlaza con el perfil del canal. La pestaa "<span style="font-weight: bold;">Fotos</span>" + enlaza con las galeras de fotos. La pestaa "Ficheros" enlaza con los + ficheros de cualquier tipo compartidos por el canal.</span></dd> + </dl> + </body> +</html> diff --git a/doc/context/es/connections/help.html b/doc/context/es/connections/help.html new file mode 100644 index 000000000..0f95fde63 --- /dev/null +++ b/doc/context/es/connections/help.html @@ -0,0 +1,8 @@ +<dl class="dl-horizontal"> + <dt>General</dt> + <dd>This page displays a list of all this channel's connections. The list can be <a href='#' onclick='contextualHelpFocus(".section-title-wrapper", 0); return false;' title="Click to highlight element...">sorted and filtered using the menu button beside the search button</a>. </dd> + <dt>Connection Details</dt> + <dd>Each list entry shows the details of a specific connection. A translucent avatar image indicates an archived connection.</dd> + <dt>Connection Status</dt> + <dd>A connection can be in different states: <ul><li>Archived</li><li>Ignored</li><li>Blocked</li><li>Hidden</li></ul></dd> +</dl>
\ No newline at end of file diff --git a/doc/context/es/connections/ifpending/help.html b/doc/context/es/connections/ifpending/help.html new file mode 100644 index 000000000..5fb0f3a0a --- /dev/null +++ b/doc/context/es/connections/ifpending/help.html @@ -0,0 +1,31 @@ +<html> + <head> + <meta content="text/html; charset=windows-1252" http-equiv="content-type"> + </head> + <body> + <dl class="dl-horizontal"> + <dt>General</dt> + <dd><span id="result_box" class="" lang="es"><span>Esta pgina</span> <span>muestra + una lista de</span> <span>todas</span> <span>las conexiones</span> + <span class="">de este canal</span><span class="">.</span> <span class="">La</span> + <span class="">lista se puede </span></span><a href="#" onclick='contextualHelpFocus(".section-title-wrapper", 0); return false;' + title="Pulsar sobre el elemento resaltado...">ordenar y filtrar usando + el botn de men al lado del botn de bsqueda</a>. </dd> + <dt>Detalles de la conexin</dt> + <dd><span id="result_box" class="" lang="es"><span>Cada</span> <span>entrada + de la lista</span> <span>muestra los</span> <span>detalles de una + conexin</span> <span>especfica</span><span>.</span> <span>Una</span> + <span>imagen de avatar</span> <span>translcida</span> <span>indica + una conexin</span> <span class="">archivada.</span></span></dd> + <dt>Estado de la conexin</dt> + <dd>Una conexin puede estar en diferentes estados: + <ul> + <li>Archivada</li> + <li>Ignorada</li> + <li>Bloqueada</li> + <li>Oculta</li> + </ul> + </dd> + </dl> + </body> +</html> diff --git a/doc/context/es/events/help.html b/doc/context/es/events/help.html new file mode 100644 index 000000000..681f72e89 --- /dev/null +++ b/doc/context/es/events/help.html @@ -0,0 +1,23 @@ +<html> + <head> + <meta content="text/html; charset=windows-1252" http-equiv="content-type"> + </head> + <body> + <dl class="dl-horizontal"> + <dt>General</dt> + <dd><span id="result_box" class="" lang="es"><span>Esta pgina</span> <span>muestra + un calendario</span> <span>de eventos tanto</span> <span>de su + propiedad como</span> <span class="">compartido con usted</span> <span + class="">desde otros canales.</span></span></dd> + <dt><a href="#" onclick='contextualHelpFocus("#title", 0); return false;' + title="Pulsar en el elemento resaltado...">Vistas del calendario</a></dt> + <dd><span id="result_box" class="" lang="es"><span>El calendario</span> <span>se + puede mostrar en</span> <span>modo mensual</span><span>, semanal o</span> + diario<span> usando</span> <span>las opciones del</span> <span class="">panel + lateral</span><span class="">.</span></span></dd> + <dt>Exportar/Importar</dt> + <dd>Exportar o importar eventos del calendario usando el formato estndar + de los ficheros de iCalendar (.ics).</dd> + </dl> + </body> +</html> diff --git a/doc/context/es/mail/help.html b/doc/context/es/mail/help.html new file mode 100644 index 000000000..e51f7225c --- /dev/null +++ b/doc/context/es/mail/help.html @@ -0,0 +1,38 @@ +<html> + <head> + <meta content="text/html; charset=windows-1252" http-equiv="content-type"> + </head> + <body> + <dl class="dl-horizontal"> + <dt>General</dt> + <dd><span id="result_box" class="" lang="es"><span>Los mensajes que + aparecen</span> <span>en</span> <span>el correo privado</span> <span>son</span> + <span>visibles slo para</span> <span>usted y un</span> <span class="">nico + destinatario.</span></span></dd> + <dt>Vista combinada</dt> + <dd><span id="result_box" class="" lang="es"><span>Las conversaciones</span> + <span>completas</span> <span>se pueden ver en</span> <span>un hilo + continuo</span> <span>seleccionando</span><span></span> "<span><span + style="font-weight: bold;">Vista combinada</span>"</span><span>.</span> + <span>Las conversaciones</span> <span>disponibles se muestran</span> + <span>debajo del men</span> <span>en el</span> <span class="">panel + lateral</span><span class="">.</span></span></dd> + <dt>Bandeja de entrada/Bandeja de salida</dt> + <dd>Los mensajes individuales enviados son visibles seleccionando la <span + style="font-weight: bold;">Bandeja de salida</span> y los mensajes + recibidos se pueden ver usando el filtro de la <span style="font-weight: bold;">Bandeja + de entrada</span>.<br> + </dd> + <dt>Mensaje nuevo</dt> + <dd><span id="result_box" class="" lang="es"><span>Los mensajes + individuales</span> <span>tienen</span> <span>informes de entrega</span> + <span>que se pueden ver</span> <span>usando</span> <span>el men</span> + <span>desplegable.</span> <span>Los mensajes tambin</span> <span>se + pueden revocar</span> <span>desde el mismo men</span><span>, lo + que puede</span> <span>evitar que el destinatario</span> <span>vea + el mensaje</span><span>, <span style="font-style: italic;">si</span></span><span + style="font-style: italic;"> <span>an no lo ha</span> </span><span + class=""><span style="font-style: italic;">ledo</span>.</span></span></dd> + </dl> + </body> +</html> diff --git a/doc/context/es/network/help.html b/doc/context/es/network/help.html new file mode 100644 index 000000000..00b25428c --- /dev/null +++ b/doc/context/es/network/help.html @@ -0,0 +1,71 @@ +<html> + <head> + <meta content="text/html; charset=windows-1252" http-equiv="content-type"> + </head> + <body> + <dl class="dl-horizontal"> + <dt>General</dt> + <dd><span id="result_box" class="" lang="es"><span>La</span> <span>pgina + de</span> <span>Mi red muestra</span> <span>un flujo</span> <span>de</span> + <span>entradas</span> <span>y conversaciones</span><span>,</span> <span>normalmente</span> + <span>ordenadas segn la</span> <span>actualizacin ms reciente</span><span>.</span> + <span>Esta pgina</span> <span>es</span> <span>altamente + personalizable</span><span class="">.</span></span></dd> + <dt><a href="#" onclick='contextualHelpFocus("#profile-jot-wrapper", 0); return false;' + title="Pulsar sobre el elemento resaltado...">Crear una entrada<br> + </a></dt> + <dd><span id="result_box" class="" lang="es"><span>En la parte superior</span> + <span>de la</span> <span>pgina hay un</span> <span>cuadro de texto + que</span> <span>dice</span> <span>"</span><span style="font-weight: bold;">Compartir</span><span>"</span><span>.</span> + <span>Al hacer clic en</span> <span>esta casilla</span> <span>se + abre</span> <span>un nuevo</span> <span>editor de entradas</span><span>.</span> + <span>El</span> <span>editor de entradas</span> <span>es + personalizable</span><span>,</span> <span>pero el</span> <span>editor + bsico</span> <span>proporciona</span> <span>campos para</span> <span>el + cuerpo de la publicacin y un</span><span></span> <span>ttulo</span> + <span>opcional.</span> <span>Los botones que hay debajo de la</span> + <span>zona de</span> <span>texto, a la izquierda,</span> <span>proporcionan</span> + <span>accesos directos para el</span> <span><span style="font-weight: bold;">Formato</span> + de texto</span> <span>y para insertar</span> <span>enlaces</span><span>, + imgenes y</span> <span>otros</span> <span>datos en</span> <span>la + entrada</span><span>.</span> <span>Los</span> <span>botones a la + derecha</span> <span>proporcionan una</span> <span class="">vista + previa del</span> <span class="">mensaje</span><span class="">,</span> + <span>los ajustes</span><span> de permisos</span> <span>de la entrada</span><span>,</span> + <span>y</span> <span>un botn <span style="font-weight: bold;">Enviar</span></span> + <span>para publicarla</span><span></span><span>.</span></span></dd> + <dt><a href="#" onclick='contextualHelpFocus("#group-sidebar", 1); return false;' + title="Pulsar sobre el elemento resaltado...">Grupos de canales<br> + </a></dt> + <dd><span id="result_box" class="" lang="es"><span>Los</span> <span>grupos + de canales</span> <span>que ha creado</span> <span>se muestran en + el</span> <span>panel lateral</span><span>.</span> <span class="">Seleccionndolos, + se</span><span class=""> filtran</span> <span class="">las entradas</span> + <span></span><span>creadas por</span> <span>los canales incluidos en + el</span> <span>grupo elegido</span><span class="">.</span></span></dd> + <dt><a href="#" onclick='$("#dbtn-acl").click(); return false;' title="Pulsar sobre el elemento resaltado...">Permisos + de una entrada<br> + </a></dt> + <dd><span id="result_box" class="" lang="es"><span>La lista</span> <span>de + control de acceso</span> <span>(</span><span>ACL) es</span> <span>lo + que se utiliza</span> <span>para establecer</span> <span>quin + puede ver su</span> <span>nueva entrada</span><span>.</span> <span>Al + pulsar el</span> <span>botn ACL</span>, <span>al lado del</span> + <span>botn Enviar,</span> <span>se mostrar</span> <span>un cuadro + de dilogo</span> <span>en</span> <span>el que puede seleccionar</span> + <span>qu canales</span> <span>y /</span> <span>o</span> <span>grupos + de canales</span> <span>pueden ver el</span> <span>mensaje</span><span>.</span> + <span>Tambin puede seleccionar</span> <span>a quin se le niega</span> + <span>el acceso explcitamente</span><span>.</span> <span>Por ejemplo</span><span>, + digamos que usted</span> <span>est planeando</span> <span>una + fiesta sorpresa para</span> <span>un amigo</span><span>.</span> <span>Puede + enviar un</span> <span>mensaje</span> <span>de invitacin</span> <span>a</span> + <span>todos los miembros de</span> <span>su grupo de</span> <span style="font-weight: bold;">Amigos</span><span>, + excepto el</span> <span>amigo al que quiere sorprender</span><span + class="">.</span> <span class="">En este caso,</span> <span>"se + mostrar" </span> <span>al grupo de</span> <span>amigos, pero</span> + <span>"</span><span>no se mostrar</span><span>"</span> <span>a esa + nica</span><span class=""> persona.</span></span></dd> + </dl> + </body> +</html> diff --git a/doc/context/es/photos/help.html b/doc/context/es/photos/help.html new file mode 100644 index 000000000..44d0bed15 --- /dev/null +++ b/doc/context/es/photos/help.html @@ -0,0 +1,27 @@ +<html> + <head> + <meta content="text/html; charset=windows-1252" http-equiv="content-type"> + </head> + <body> + <dl class="dl-horizontal"> + <dt>General</dt> + <dd><span id="result_box" class="" lang="es"><span>Esta pgina</span> <span>muestra</span> + <span class="">los lbumes de fotos</span> <span class="">de un canal</span><span>.</span> + <span>Las</span> <span>imgenes visibles</span> <span class="">para + el observador</span> <span class="">dependen de</span> <span class="">los + permisos</span> <span class="">individuales de cada imagen</span><span + class="">.</span></span></dd> + <dt><a href="#" onclick='contextualHelpFocus("#tabs-collapse-1", 0); return false;' + title="Pulsar sobre el elemento resaltado...">Pestaas de los + contenidos del canal<br> + </a></dt> + <dd><span id="result_box" class="" lang="es"><span>Las</span> <span>pestaas</span> + <span>de los contenidos</span> <span>del canal</span> <span>son</span> + <span>enlaces a otros contenidos</span> <span>publicados por el</span> + <span>canal.</span> La pestaa "<span style="font-weight: bold;">Mi + perfil</span>" enlaza con el perfil del canal. La pestaa "<span style="font-weight: bold;">Fotos</span>" + enlaza con las galeras de fotos. La pestaa "<span style="font-weight: bold;">Ficheros</span>" + enlaza con los ficheros de cualquier tipo compartidos por el canal.</span></dd> + </dl> + </body> +</html> diff --git a/doc/context/es/profile/help.html b/doc/context/es/profile/help.html new file mode 100644 index 000000000..314552f9b --- /dev/null +++ b/doc/context/es/profile/help.html @@ -0,0 +1,32 @@ +<html> + <head> + <meta content="text/html; charset=windows-1252" http-equiv="content-type"> + </head> + <body> + <dl class="dl-horizontal"> + <dt>General</dt> + <dd><span id="result_box" class="" lang="es"><span>Esta</span> <span>es + la pgina de</span> <span>perfil</span> <span>de un canal</span><span>.</span> + <span>Por lo general</span> <span>muestra</span> la <span>informacin + que describe el</span> <span>canal.</span> <span>Si el canal</span> + <span>representa a una persona</span> <span>en una red social</span><span>, + por ejemplo</span><span>, el perfil</span> <span>podra + proporcionar</span> <span>informacin de contacto y</span> <span>otros</span> + <span>datos personales</span><span></span><span>.</span> <span>Los + canales pueden</span> <span>tener varios perfiles</span><span>,</span> + <span>en cuyo caso el</span> <span>perfil que se muestra</span> <span + class="">depende del observador</span><span>.</span></span></dd> + <dt><a href="#" onclick='contextualHelpFocus("#tabs-collapse-1", 0); return false;' + title="Pulsar sobre el elemento resaltado...">Pestaas de los + contenidos del canal<br> + </a></dt> + <dd><span id="result_box" class="" lang="es"><span>Las</span> <span>pestaas</span> + <span>de los contenidos</span> <span>del canal</span> <span>son</span> + <span>enlaces a otros contenidos</span> <span>publicados por el</span> + <span>canal.</span> La pestaa "<span style="font-weight: bold;">Mi + perfil</span>" enlaza con el perfil del canal. La pestaa "<span style="font-weight: bold;">Fotos</span>" + enlaza con las galeras de fotos. La pestaa "<span style="font-weight: bold;">Ficheros</span>" + enlaza con los ficheros de cualquier tipo compartidos por el canal.</span></dd> + </dl> + </body> +</html> diff --git a/doc/hidden_configs.bb b/doc/hidden_configs.bb index 5bb7454ec..6e093dbfc 100644 --- a/doc/hidden_configs.bb +++ b/doc/hidden_configs.bb @@ -1,10 +1,7 @@ -[b]Advanced Configurations for Administrators[/b] - +[h1]Advanced Configurations for Administrators[/h1] $Projectname contains many configuration options hidden from the main admin panel. -These are generally options considered too niche, confusing, or advanced for -the average member. These settings can be activated from the the top level web -directory with the syntax +These are generally options considered too niche, confusing, or advanced for the average member. These settings can be activated from the the top level web directory with the syntax [code]util/config cat key value[/code] for a site configuration, or @@ -13,221 +10,96 @@ for a site configuration, or for a member configuration. This document assumes you're an administrator. +[h2]pconfig[/h2][dl terms="mb"] + [*= system.always_my_theme ] Always use your own theme when viewing channels on the same hub. This will break in some quite imaginative ways when viewing channels with theme dependent Comanche. + [*= system.blocked ] An array of xchans blocked by this channel. Technically, this is a hidden config and does belong here, however, addons (notably superblock) have made this available in the UI. + [*= system.default_cipher ] Set the default cipher used for E2EE items. + [*= system.display_friend_count ] Set the number of connections to display in the connections profile widget. + [*= system.do_not_track ] As the browser header. This will break many identity based features. You should really just set permissions that make sense. + [*= system.forcepublicuploads ] Force uploaded photos to be public when uploaded as wall items. It makes far more sense to just set your permissions properly in the first place. Do that instead. + [*= system.network_page_default ] Set default params when viewing the network page. This should contain the same querystring as manual filtering. + [*= system.paranoia ] Sets the security level of IP checking. If the IP address of a logged-in session changes apply this level to determine if the account should be logged out as a security breach. +Options are: + 0 — no IP checking + 1 — check 3 octets + 2 — check 2 octets + 3 — check for any difference at all -[b]pconfig[/b] - [b]system.user_scalable[/b] - Determine if the app is scalable on touch screens. Defaults to on, to - disable, set to zero - real zero, not just false. - [b]system.always_my_theme[/b] - Always use your own theme when viewing channels on the same hub. This - will break in some quite imaginative ways when viewing channels with - theme dependent Comanche. - [b]system.paranoia[/b] - Sets the security level of IP checking. If the IP address of a logged-in session changes - apply this level to determine if the account should be logged out as a security breach. - Options are: - 0 - no IP checking - 1 - check 3 octets - 2 - check 2 octets - 3 - check for any difference at all - [b]system.prevent_tag_hijacking[/b] - Prevent foreign networks hijacking hashtags in your posts and directing them at its own resources. - [b]system.blocked[/b] - An array of xchans blocked by this channel. Technically, this is a - hidden config and does belong here, however, addons (notably - superblock) have made this available in the UI. - [b]system.default_cipher[/b] - Set the default cipher used for E2EE items. - [b]system.network_page_default[/b] - Set default params when viewing the network page. This should contain - the same querystring as manual filtering. - [b]system.display_friend_count[/b] - Set the number of connections to display in the connections profile - widget. - [b]system.taganyone[/b] - Requires the config of the same name to be enabled. Allow the @mention tagging - of anyone, whether you are connected or not. This doesn't scale. - [b]system.startpage[/b] - Another of those technically hidden configs made available by addons. - Sets the default page to view when logging in. This is exposed to the - UI by the startpage addon. - [b]system.forcepublicuploads[/b] - Force uploaded photos to be public when uploaded as wall items. It - makes far more sense to just set your permissions properly in the first - place. Do that instead. - [b]system.do_not_track[/b] - As the browser header. This will break many identity based features. - You should really just set permissions that make sense. - -[b]Site config[/b] - [b]system.taganyone[/b] - Allow the @mention tagging of anyone whether you are connected or not. - [b]system.directorytags[/b] - Set the number of keyword tags displayed on the directory page. Default is 50 unless set to a - positive integer. - [b]system.disable_directory_keywords[/b] - If '1', do not show directory keywords. If the hub is a directory server, prevent returning - tags to any directory clients. Please do not set this for directory servers in the RED_GLOBAL realm. - [b]system.disable_dreport[/b] - If '1', don't store or link to delivery reports - [b]system.startpage[/b] - Set the default page to be taken to after a login for all channels at - this website. Can be overwritten by user settings. - [b]system.projecthome[/b] - Set the project homepage as the homepage of your hub. (Obsolete) - [b]system.auto_channel_create[/b] - Add the necessary form elements to create the first channel on the account registration page, and create it - (possibly following email validation or administrator approval). This precludes the ability to import a channel - from another site as the first channel created on this site for a new account. - Use with system.default_permissions_role to streamline registration. - [b]system.default_permissions_role[/b] - If set to a valid permissions role name, use that role for - the first channel created by a new account and don't ask for the "Channel Type" on - the channel creation form. Examples of valid names are: 'social', 'social_restricted', 'social_private', - 'forum', 'forum_restricted' and 'forum_private'. - Read more about permissions roles [zrl=[baseurl]/help/roles]here[/zrl]. - [b]system.default_photo_profile[/b] - Set the profile photo that new channels start with. This should contain the name of a directory located - under [font=courier]images/default_profile_photos/[/font], or be left unset. If not set then 'rainbow_man' is assumed. - [b]system.workflow_channel_next[/b] - The page to direct new members to immediately after creating a channel. - [b]system.workflow_register_next[/b] - The page to direct members to immediately after creating an account (only when auto_channel_create or UNO is enabled). - [b]system.max_daily_registrations[/b] - Set the maximum number of new registrations allowed on any day. - Useful to prevent oversubscription after a bout of publicity - for the project. - [b]system.tos_url[/b] - Set an alternative link for the ToS location. - [b]system.block_public_search[/b] - Similar to block_public, except only blocks public access to - search features. Useful for sites that want to be public, but - keep getting hammered by search engines. - [b]system.proc_run_use_exec[/b] - If 1, use the exec system call in proc_run to run background tasks. By default - we use proc_open and proc_close. On some (currently rare) systems this does not work well. - [b]system.paranoia[/b] - As the pconfig, but on a site-wide basis. Can be overwritten - by member settings. - [b]system.transport_security_header[/b] - if non-zero and SSL is being used, include a strict-transport-security header on webpages - [b]system.poke_basic[/b] - Reduce the number of poke verbs to exactly 1 ("poke"). Disable other verbs. - [b]system.openssl_conf_file[/b] - Specify a file containing OpenSSL configuration. Needed in some Windows installations to - locate the openssl configuration file on the system. - Read the code first. If you can't read the code, don't play with it. - [b]system.optimize_items[/b] - Runs optimise_table during some tasks to keep your database nice and - defragmented. This comes at a performance cost while the operations - are running, but also keeps things a bit faster while it's not. - There also exist CLI utilities for performing this operation, which you - may prefer, especially if you're a large site. - [b]system.expire_limit[/b] - Don't expire any more than this number of posts per channel per - expiration run to keep from exhausting memory. Default 5000. - [b]system.dlogfile[/b] - Logfile to use for logging development errors. Exactly the same as - logger otherwise. This isn't magic, and requires your own logging - statements. Developer tool. - [b]system.authlog[/b] - Logfile to use for logging auth errors. Used to plug in to server - side software such as fail2ban. Auth failures are still logged to - the main logs as well. - [b]system.hide_in_statistics[/b] - Tell the red statistics servers to completely hide this hub in hub lists. - [b]system.reserved_channels[/b] - Don't allow members to register channels with this comma separated - list of names (no spaces) - [b]system.auto_follow[/b] - Make the first channel of an account auto-follow channels listed here - comma separated list of webbies (member@hub addresses). - [b]system.admin_email[/b] - Specifies the administrator's email for this site. This is initially set during install. - [b]system.cron_hour[/b] - Specify an hour in which to run cron_daily. By default with no config, this will run at midnight UTC. - [b]system.minimum_feedcheck_minutes[/b] - The minimum interval between polling RSS feeds. If this is lower than the cron interval, feeds - will be polled with each cronjob. Defaults to 60 if not set. The site setting can also be over-ridden - on a channel by channel basis by a service class setting aptly named 'minimum_feedcheck_minutes'. - [b]system.blacklisted_sites[/b] - An array of specific hubs to block from this hub completely. - [b]system.ignore_imagick[/b] - Ignore imagick and use GD, even if imagick is installed on the server. Prevents some issues with PNG files in older versions of imagick. - [b]system.no_age_restriction[/b] - Do not restrict registration to people over the age of 13. This carries legal responsibilities in - many countries to require that age be provided and to block all personal information from minors, - so please check your local laws before changing. - [b]system.override_poll_lockfile[/b] - Ignore the lock file in the poller process to allow more than one process to run at a time. - [b]system.projecthome[/b] - Display the project page on your home page for logged out viewers. - [b]system.sellpage[/b] - A URL shown in the public sites list to sell your hub - display service classes, etc. - [b]randprofile.check[/b] - When requesting a random profile, check that it actually exists first - [b]randprofile.retry[/b] - Number of times to retry getting a random profile - [b]system.photo_cache_time[/b] - How long to cache photos, in seconds. Default is 86400 (1 day). - Longer time increases performance, but it also means it takes longer for changed permissions to apply. - [b]system.poco_rating_enable[/b] - Distributed reputation reporting and data collection may be disabled. If your site does not participate - in distributed reputation you will also not be able to make use of the data from your connections on - other sites. By default and in the absence of any setting it is enabled. Individual members can opt out - by restricting who can see their connections or by not providing any reputation information for their - connections. - [b]system.register_link[/b] - path to direct to from the "register" link on the login form. On closed sites this will direct to - 'pubsites'. For open sites it will normally redirect to 'register' but you may change this to a - custom site page offering subscriptions or whatever. - [b]system.max_import_size[/b] - If configured, the maximum length of an imported text message. This is normally left at 200Kbytes - or more to accomodate Friendica private photos, which are embedded. - [b]system.tempdir[/b] - Place to store temporary files (currently unused), default is defined in the PHP configuration - [b]system.uploaddir[/b] - Location to upload files (default is system.tempdir, currently used only by js_upload plugin) - [b]system.disable_discover_tab[/b] - This allows you to completely disable the ability to discover public content from external sites. - [b]system.sys_expire_days[/b] - How many days to keep discovered public content from other sites - [b]system.openssl_encrypt[/b] - Use openssl encryption engine, default is false (uses mcrypt for AES encryption) - [b]system.max_tagged_forums[/b] - Spam prevention. Limits the number of tagged forums which are recognised in any post. - Default is 2. Only the first 'n' tags will be delivered as forums, the others will not cause any delivery. - [b]system.hide_help[/b] - Don't display help documentation link in nav bar - [b]system.expire_delivery_reports[/b] - Expiration in days for delivery reports - default 10 - [b]system.platform_name[/b] * - What to report as the platform name in webpages and statistics. (*) Must be set in .htconfig.php - [b]system.hide_version[/b] * - If true, do not report the software version on webpages and tools. (*) Must be set in .htconfig.php - [b]system.hidden_version_siteinfo[/b] - If true, do not report the software version on siteinfo pages (system.hide_version also hides - the version on these pages, this setting *only* hides the version on siteinfo pages). - [b]system.email_notify_icon_url[/b] - URL of image (32x32) to display in email notifications (HTML bodies). - -[b]Directory config[/b] -[b]Directory search defaults[/b] - [b]directory.safemode[/b] - 0 or 1. - [b]directory.globaldir[/b] - 0 or 1. Default 0. If you visit the directory on a site you'll just see the members of that site by default. You have to go through an extra step to see the people in the rest of the network; and by doing so there's a clear delineation that these people *aren't* members of that site but of a larger network. - [b]directory.pubforums[/b] - 0 or 1. Public forums *should* be default 0. -[b]Directory server configuration (see [zrl=[baseurl]/help/directories]help/directories[/zrl])[/b] - [b]system.directory_server[/b] - [b]system.directory_primary[/b] - [b]system.directory_realm[/b] - [b]system.realm_token[/b] - [b]system.directory_mode[/b] - - + [*= system.prevent_tag_hijacking ] Prevent foreign networks hijacking hashtags in your posts and directing them at its own resources. + [*= system.startpage ] Another of those technically hidden configs made available by addons. Sets the default page to view when logging in. This is exposed to the UI by the startpage addon. + [*= system.taganyone ] Requires the config of the same name to be enabled. Allow the @mention tagging of anyone, whether you are connected or not. This doesn't scale. + [*= system.user_scalable ] Determine if the app is scalable on touch screens. Defaults to on, to disable, set to zero - real zero, not just false. +[/dl] +[h2]Site config[/h2][dl terms="mb"] + [*= randprofile.check ] When requesting a random profile, check that it actually exists first + [*= randprofile.retry ] Number of times to retry getting a random profile + [*= system.admin_email ] Specifies the administrator's email for this site. This is initially set during install. + [*= system.authlog ] Logfile to use for logging auth errors. Used to plug in to server side software such as fail2ban. Auth failures are still logged to the main logs as well. + [*= system.auto_channel_create ] Add the necessary form elements to create the first channel on the account registration page, and create it (possibly following email validation or administrator approval). This precludes the ability to import a channel from another site as the first channel created on this site for a new account. Use with system.default_permissions_role to streamline registration. + [*= system.auto_follow ] Make the first channel of an account auto-follow channels listed here - comma separated list of webbies (member@hub addresses). + [*= system.blacklisted_sites ] An array of specific hubs to block from this hub completely. + [*= system.block_public_search ] Similar to block_public, except only blocks public access to search features. Useful for sites that want to be public, but keep getting hammered by search engines. + [*= system.cron_hour ] Specify an hour in which to run cron_daily. By default with no config, this will run at midnight UTC. + [*= system.default_permissions_role ] If set to a valid permissions role name, use that role for the first channel created by a new account and don't ask for the "Channel Type" on the channel creation form. Examples of valid names are: 'social', 'social_restricted', 'social_private', 'forum', 'forum_restricted' and 'forum_private'. Read more about permissions roles [zrl=[baseurl]/help/roles]here[/zrl]. + [*= system.default_photo_profile ] Set the profile photo that new channels start with. This should contain the name of a directory located under [font=courier]images/default_profile_photos/[/font], or be left unset. If not set then 'rainbow_man' is assumed. + [*= system.directorytags ] Set the number of keyword tags displayed on the directory page. Default is 50 unless set to a positive integer. + [*= system.disable_directory_keywords ] If '1', do not show directory keywords. If the hub is a directory server, prevent returning tags to any directory clients. Please do not set this for directory servers in the RED_GLOBAL realm. + [*= system.disable_discover_tab ] This allows you to completely disable the ability to discover public content from external sites. + [*= system.disable_dreport ] If '1', don't store or link to delivery reports + [*= system.dlogfile ] Logfile to use for logging development errors. Exactly the same as logger otherwise. This isn't magic, and requires your own logging statements. Developer tool. + [*= system.email_notify_icon_url ] URL of image (32x32) to display in email notifications (HTML bodies). + [*= system.expire_delivery_reports ] Expiration in days for delivery reports - default 10 + [*= system.expire_limit ] Don't expire any more than this number of posts per channel per expiration run to keep from exhausting memory. Default 5000. + [*= system.hidden_version_siteinfo ] If true, do not report the software version on siteinfo pages (system.hide_version also hides the version on these pages, this setting *only* hides the version on siteinfo pages). + [*= system.hide_help ] Don't display help documentation link in nav bar + [*= system.hide_in_statistics ] Tell the red statistics servers to completely hide this hub in hub lists. + [*= system.hide_version ] If true, do not report the software version on webpages and tools. (*) Must be set in .htconfig.php + [*= system.ignore_imagick ] Ignore imagick and use GD, even if imagick is installed on the server. Prevents some issues with PNG files in older versions of imagick. + [*= system.max_daily_registrations ] Set the maximum number of new registrations allowed on any day. Useful to prevent oversubscription after a bout of publicity for the project. + [*= system.max_import_size ] If configured, the maximum length of an imported text message. This is normally left at 200Kbytes or more to accomodate Friendica private photos, which are embedded. + [*= system.max_tagged_forums ] Spam prevention. Limits the number of tagged forums which are recognised in any post. Default is 2. Only the first 'n' tags will be delivered as forums, the others will not cause any delivery. + [*= system.minimum_feedcheck_minutes ] The minimum interval between polling RSS feeds. If this is lower than the cron interval, feeds will be polled with each cronjob. Defaults to 60 if not set. The site setting can also be over-ridden on a channel by channel basis by a service class setting aptly named 'minimum_feedcheck_minutes'. + [*= system.no_age_restriction ] Do not restrict registration to people over the age of 13. This carries legal responsibilities in many countries to require that age be provided and to block all personal information from minors, so please check your local laws before changing. + [*= system.openssl_conf_file ] Specify a file containing OpenSSL configuration. Needed in some Windows installations to locate the openssl configuration file on the system. Read the code first. If you can't read the code, don't play with it. + [*= system.openssl_encrypt ] Use openssl encryption engine, default is false (uses mcrypt for AES encryption) + [*= system.optimize_items ] Runs optimise_table during some tasks to keep your database nice and defragmented. This comes at a performance cost while the operations are running, but also keeps things a bit faster while it's not. There also exist CLI utilities for performing this operation, which you may prefer, especially if you're a large site. + [*= system.override_poll_lockfile ] Ignore the lock file in the poller process to allow more than one process to run at a time. + [*= system.paranoia ] As the pconfig, but on a site-wide basis. Can be overwritten by member settings. + [*= system.photo_cache_time ] How long to cache photos, in seconds. Default is 86400 (1 day). Longer time increases performance, but it also means it takes longer for changed permissions to apply. + [*= system.platform_name ] What to report as the platform name in webpages and statistics. (*) Must be set in .htconfig.php + [*= system.poco_rating_enable ] Distributed reputation reporting and data collection may be disabled. If your site does not participate in distributed reputation you will also not be able to make use of the data from your connections on other sites. By default and in the absence of any setting it is enabled. Individual members can opt out by restricting who can see their connections or by not providing any reputation information for their connections. + [*= system.poke_basic ] Reduce the number of poke verbs to exactly 1 ("poke"). Disable other verbs. + [*= system.proc_run_use_exec ] If 1, use the exec system call in proc_run to run background tasks. By default we use proc_open and proc_close. On some (currently rare) systems this does not work well. + [*= system.projecthome ] Display the project page on your home page for logged out viewers. + [*= system.projecthome ] Set the project homepage as the homepage of your hub. (Obsolete) + [*= system.register_link ] path to direct to from the "register" link on the login form. On closed sites this will direct to 'pubsites'. For open sites it will normally redirect to 'register' but you may change this to a custom site page offering subscriptions or whatever. + [*= system.reserved_channels ] Don't allow members to register channels with this comma separated list of names (no spaces) + [*= system.sellpage ] A URL shown in the public sites list to sell your hub - display service classes, etc. + [*= system.startpage ] Set the default page to be taken to after a login for all channels at this website. Can be overwritten by user settings. + [*= system.sys_expire_days ] How many days to keep discovered public content from other sites + [*= system.taganyone ] Allow the @mention tagging of anyone whether you are connected or not. + [*= system.tempdir ] Place to store temporary files (currently unused), default is defined in the PHP configuration + [*= system.tos_url ] Set an alternative link for the ToS location. + [*= system.transport_security_header ] if non-zero and SSL is being used, include a strict-transport-security header on webpages + [*= system.uploaddir ] Location to upload files (default is system.tempdir, currently used only by js_upload plugin) + [*= system.workflow_channel_next ] The page to direct new members to immediately after creating a channel. + [*= system.workflow_register_next ] The page to direct members to immediately after creating an account (only when auto_channel_create or UNO is enabled). +[/dl] +[h2]Directory config[/h2] +[h3]Directory search defaults[/h3][dl terms="mb"] + [*= directory.globaldir ] 0 or 1. Default 0. If you visit the directory on a site you'll just see the members of that site by default. You have to go through an extra step to see the people in the rest of the network; and by doing so there's a clear delineation that these people *aren't* members of that site but of a larger network. + [*= directory.pubforums ] 0 or 1. Public forums [i]should[/i] be default 0. + [*= directory.safemode ] 0 or 1. +[/dl] +[h3]Directory server configuration[/h3][i](see [zrl=[baseurl]/help/directories]help/directories[/zrl])[/i] +[dl terms="mb"] + [*= system.directory_mode ] + [*= system.directory_primary ] + [*= system.directory_realm ] + [*= system.directory_server ] + [*= system.realm_token ] +[/dl] - #include doc/macros/main_footer.bb; diff --git a/doc/hooklist.bb b/doc/hooklist.bb index 994d0dbb2..9331873b4 100644 --- a/doc/hooklist.bb +++ b/doc/hooklist.bb @@ -356,6 +356,9 @@ Hooks allow plugins/addons to "hook into" the code at many points and alter the [zrl=[baseurl]/help/hook/obj_verbs]obj_verbs[/zrl] Called when creating the list of verbs available for profile "things". +[zrl=[baseurl]/help/hook/oembed_action]oembed_action[/zrl] + Called when deciding if an oembed url is to be filter, blocked, or approved + [zrl=[baseurl]/help/hook/oembed_probe]oembed_probe[/zrl] Called when performing an oembed content lookup diff --git a/doc/permissions.bb b/doc/permissions.bb index bcf3c43e0..ceb3fec17 100644 --- a/doc/permissions.bb +++ b/doc/permissions.bb @@ -1,7 +1,7 @@ -[b]Permissions[/b]
-
+[h1]Permissions[/h1]
Permissions in the $Projectname are more complete than you may be used to. This allows us to define more fine graded relationships than the black and white "this person is my friend, so they can do everything" or "this person is not my friend, so they can't do anything" permissions you may find elsewhere.
+
[b]Default Permissions[/b]
On your settings page, you will find a list of default permissions. These permissions are automatically applied to everybody unless you specify otherwise. The scope of these permissions varies from "Only me" to "Everybody" - though some scopes may not be available for some permissions. For example, you can't allow "anybody on the internet" to send you private messages, because we'd have no way to identify the sender, therefore no way to reply to them.
@@ -13,89 +13,57 @@ Be aware that altering the scope of who can see your "public" items is a more or A more useful privacy setup is to leave "public" items visible to anybody on the internet; but force everything you create to be restricted. This can be done on your Channel Settings page by selecting the role "Social - restricted". This ensures a Default Privacy Group for all new contacts, and sets your Default Post Permissions to restrict all your posts to that group. We use the Default Post Permissions for everything you create - posts, photos, events, webpages, and everything else. However you can then edit the permissions when you create any individual thing and remove your default privacy group to make just that item visible to anybody.
+[dl terms="l"]
+[*= The scopes of permissions are:]
+[dl terms="i"]
+ [*= Nobody Except Yourself ] This is self explanatory. Only you will be allowed access.
+
+ [*= Only those you specifically allow ] By default, people you are not connected to, and all new contacts will have this permission denied. You will be able to make exceptions for individual channels on their contact edit screen.
+
+ [*= Anybody in your address book ] Anybody you do not know will have this permission denied, but anybody you accept as a contact will have this permission approved. This is the way most legacy platforms handle permissions.
+
+ [*= Anybody On This Hub ] Anybody using the same hub as you will have permission approved. Anybody who registered at a different hub will have this permission denied.
+
+ [*= Anybody in this network ] Anybody in the $Projectname will have this permission approved. Even complete strangers. However, anybody not logged in/authenticated will have this permission denied.
+
+ [*= Anybody authenticated ] This is similar to "anybody in this network" except that it can include anybody who can authenticate by any means - and therefore may include visitors from other networks.
+
+ [*= Anybody on the internet ] Completely public. This permission will be approved for anybody at all.
+[/dl]
+[*= The individual permissions are:]
+[dl terms="i"]
+ [*= Can view my "public" stream and posts. ] This permision determines who can view your channel "stream" that is, the non-private posts that appear on the "home" tab when you're logged in.
-The scopes of permissions are:
-
-[li]Nobody Except Yourself. This is self explanatory. Only you will be allowed access.[/li]
-
-[li]Only those you specifically allow. By default, people you are not connected to, and all new contacts will have this permission denied. You will be able to make exceptions for individual channels on their contact edit screen.[/li]
-
-[li]Anybody in your address book. Anybody you do not know will have this permission denied, but anybody you accept as a contact will have this permission approved. This is the way most legacy platforms handle permissions.[/li]
-
-[li]Anybody On This Hub. Anybody using the same hub as you will have permission approved. Anybody who registered at a different hub will have this permission denied.[/li]
-
-[li]Anybody in this network. Anybody in the $Projectname will have this permission approved. Even complete strangers. However, anybody not logged in/authenticated will have this permission denied.[/li]
-
-[li]Anybody authenticated. This is similar to "anybody in this network" except that it can include anybody who can authenticate by any means - and therefore may include visitors from other networks.[/li]
-
-[li]Anybody on the internet. Completely public. This permission will be approved for anybody at all.[/li]
-
-The individual permissions are:
-
-[i]Can view my "public" stream and posts.[/i]
-
-This permision determines who can view your channel "stream" that is, the non-private posts that appear on the "home" tab when you're logged in.
-
-[i]Can view my "public" channel profile.[/i]
-
-This permission determines who can view your channel's profile. This refers to the "about" tab
-
-[i]Can view my "public" photo albums.[/i]
-
- This permission determines who can view your photo albums. Individual photographs may still be posted to a more private audience.
-
-[i]Can view my "public" address book.[/i]
-
-This permission determines who can view your contacts. These are the connections displayed in the "View connections" section.
-
-[i]Can view my "public" file storage.[/i]
-
-This permission determines who can view your public files stored in your cloud.
-
-[i]Can view my "public" pages.[/i]
-
-This permission determines who can view your public web pages.
-
-[i]Can send me their channel stream and posts.[/i]
-
-This permission determines whose posts you will view. If your channel is a personal channel (ie, you as a person), you would probably want to set this to "anyone in my address book" at a minimum. A personal notes channel would probably want to choose "nobody except myself". Setting this to "Anybody in the network" will show you posts from complete strangers, which is a good form of discovery.
-
-[i]Can post on my channel page ("wall").[/i]
-
-This permission determines who can write to your wall when clicking through to your channel.
-
-[i]Can comment on my posts.[/i]
-
-This permission determines who can comment on posts you create. Normally, you would want this to match your "can view my public stream and posts" permission
-
-[i]Can send me private mail messages.[/i]
+ [*= Can view my "public" channel profile. ] This permission determines who can view your channel's profile. This refers to the "about" tab
-This determines who can send you private messages (zotmail).
+ [*= Can view my "public" photo albums. ] This permission determines who can view your photo albums. Individual photographs may still be posted to a more private audience.
-[i]Can post photos to my photo albums.[/i]
+ [*= Can view my "public" address book. ] This permission determines who can view your contacts. These are the connections displayed in the "View connections" section.
-This determines who can post photographs in your albums. This is very useful for forum-like channels where connections may not be connected to each other.
+ [*= Can view my "public" file storage. ] This permission determines who can view your public files stored in your cloud.
-[i]Can forward to all my channel contacts via post tags.[/i]
+ [*= Can view my "public" pages. ] This permission determines who can view your public web pages.
-Using @- mentions will reproduce a copy of your post on the profile specified, as though you posted on the channel wall. This determines if people can post to your channel in this way.
+ [*= Can send me their channel stream and posts. ] This permission determines whose posts you will view. If your channel is a personal channel (ie, you as a person), you would probably want to set this to "anyone in my address book" at a minimum. A personal notes channel would probably want to choose "nobody except myself". Setting this to "Anybody in the network" will show you posts from complete strangers, which is a good form of discovery.
-[i]Can chat with me (when available).[/i]
+ [*= Can post on my channel page ("wall"). ] This permission determines who can write to your wall when clicking through to your channel.
-This determines who can join the public chat rooms created by your channel.
+ [*= Can comment on my posts. ] This permission determines who can comment on posts you create. Normally, you would want this to match your "can view my public stream and posts" permission
-[i]Can write to my "public" file storage.[/i]
+ [*= Can send me private mail messages. ] This determines who can send you private messages (zotmail).
-This determines who can upload files to your public file storage, or 'cloud'.
+ [*= Can post photos to my photo albums. ] This determines who can post photographs in your albums. This is very useful for forum-like channels where connections may not be connected to each other.
-[i]Can edit my "public" pages.[/i]
+ [*= Can forward to all my channel contacts via post tags. ] Using @- mentions will reproduce a copy of your post on the profile specified, as though you posted on the channel wall. This determines if people can post to your channel in this way.
-This determines who can edit your webpages. This is useful for wikis or sites with multiple editors.
+ [*= Can chat with me (when available). ] This determines who can join the public chat rooms created by your channel.
-[i]Can administer my channel resources.[/i]
+ [*= Can write to my "public" file storage. ] This determines who can upload files to your public file storage, or 'cloud'.
-This determines who can have full control of your channel. This should normally be set to "nobody except myself".
+ [*= Can edit my "public" pages. ] This determines who can edit your webpages. This is useful for wikis or sites with multiple editors.
+ [*= Can administer my channel resources. ] This determines who can have full control of your channel. This should normally be set to "nobody except myself".
+[/dl][/dl]
[i]Note:[/i]
Plugins/addons may provide special permission settings, so you may be offered additional permission settings beyond what is described here.
diff --git a/include/api.php b/include/api.php index e64c86695..3b2c71923 100644 --- a/include/api.php +++ b/include/api.php @@ -2108,7 +2108,7 @@ require_once('include/api_auth.php'); 'shorturllength' => '30', 'hubzilla' => array( 'PLATFORM_NAME' => Zotlabs\Project\System::get_platform_name(), - 'RED_VERSION' => Zotlabs\Project\System::get_project_version(), + 'STD_VERSION' => Zotlabs\Project\System::get_project_version(), 'ZOT_REVISION' => ZOT_REVISION, 'DB_UPDATE_VERSION' => Zotlabs\Project\System::get_update_version() ) diff --git a/include/bbcode.php b/include/bbcode.php index b8cd23f59..7a7ea8ce6 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -345,6 +345,48 @@ function bb_spoilertag($match) { return '<div onclick="openClose(\'opendiv-' . $rnd . '\'); return false;" class="fakelink">' . $openclose . '</div><blockquote id="opendiv-' . $rnd . '" style="display: none;">' . $text . '</blockquote>'; } +function bb_definitionList($match) { + // $match[1] is the markup styles for the "terms" in the definition list. + // $match[2] is the content between the [dl]...[/dl] tags + + $classes = ''; + if (stripos($match[1], "b") !== false) $classes .= 'dl-terms-bold '; + if (stripos($match[1], "i") !== false) $classes .= 'dl-terms-italic '; + if (stripos($match[1], "u") !== false) $classes .= 'dl-terms-underline '; + if (stripos($match[1], "l") !== false) $classes .= 'dl-terms-large '; + if (stripos($match[1], "m") !== false) $classes .= 'dl-terms-monospace '; + if (stripos($match[1], "h") !== false) $classes .= 'dl-horizontal '; // dl-horizontal is already provided by bootstrap + if (strlen($classes) === 0) $classes = "dl-terms-plain"; + + // The bbcode transformation will be: + // [*=term-text] description-text => </dd> <dt>term-text<dt><dd> description-text + // then after all replacements have been made, the extra </dd> at the start of the + // first line can be removed. HTML5 allows the tag to be missing from the end of the last line. + // Using '(?<!\\\)' to allow backslash-escaped closing braces to appear in the term-text. + $closeDescriptionTag = "</dd>\n"; + $eatLeadingSpaces = '(?: |[ \t])*'; // prevent spaces infront of [*= from adding another line to the previous element + $listElements = preg_replace('/^(\n|<br \/>)/', '', $match[2]); // ltrim the first newline + $listElements = preg_replace( + '/' . $eatLeadingSpaces . '\[\*=([[:print:]]*?)(?<!\\\)\]/ism', + $closeDescriptionTag . '<dt>$1</dt><dd>', + $listElements + ); + // Unescape any \] inside the <dt> tags + $listElements = preg_replace_callback('/<dt>(.*?)<\/dt>/ism', 'bb_definitionList_unescapeBraces', $listElements); + + // Remove the extra </dd> at the start of the string, if there is one. + $firstOpenTag = strpos($listElements, '<dd>'); + $firstCloseTag = strpos($listElements, $closeDescriptionTag); + if ($firstCloseTag !== false && ($firstOpenTag === false || ($firstCloseTag < $firstOpenTag))) { + $listElements = preg_replace( '/<\/dd>/ism', '', $listElements, 1); + } + + return '<dl class="bb-dl ' . rtrim($classes) . '">' . $listElements . '</dl>';; +} +function bb_definitionList_unescapeBraces($match) { + return '<dt>' . str_replace('\]', ']', $match[1]) . '</dt>'; +} + /** * @brief Sanitize style properties from BBCode to HTML. * @@ -587,7 +629,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false) } if($tryoembed) { if (strpos($Text,'[/url]') !== false) { - $Text = preg_replace_callback("/\[url\]([$URLSearchString]*)\[\/url\]/ism", 'tryoembed', $Text); + $Text = preg_replace_callback("/[^\^]\[url\]([$URLSearchString]*)\[\/url\]/ism", 'tryoembed', $Text); } } if (strpos($Text,'[/url]') !== false) { @@ -713,6 +755,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false) while ((((strpos($Text, "[/list]") !== false) && (strpos($Text, "[list") !== false)) || ((strpos($Text, "[/ol]") !== false) && (strpos($Text, "[ol]") !== false)) || ((strpos($Text, "[/ul]") !== false) && (strpos($Text, "[ul]") !== false)) || + ((strpos($Text, "[/dl]") !== false) && (strpos($Text, "[dl") !== false)) || ((strpos($Text, "[/li]") !== false) && (strpos($Text, "[li]") !== false))) && (++$endlessloop < 20)) { $Text = preg_replace("/\[list\](.*?)\[\/list\]/ism", '<ul class="listbullet" style="list-style-type: circle;">$1</ul>', $Text); $Text = preg_replace("/\[list=\](.*?)\[\/list\]/ism", '<ul class="listnone" style="list-style-type: none;">$1</ul>', $Text); @@ -724,6 +767,13 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false) $Text = preg_replace("/\[ul\](.*?)\[\/ul\]/ism", '<ul class="listbullet" style="list-style-type: circle;">$1</ul>', $Text); $Text = preg_replace("/\[ol\](.*?)\[\/ol\]/ism", '<ul class="listdecimal" style="list-style-type: decimal;">$1</ul>', $Text); $Text = preg_replace("/\[li\](.*?)\[\/li\]/ism", '<li>$1</li>', $Text); + + // [dl] tags have an optional [dl terms="bi"] form where bold/italic/underline/mono/large + // etc. style may be specified for the "terms" in the definition list. The quotation marks + // are also optional. The regex looks intimidating, but breaks down as: + // "[dl" <optional-whitespace> <optional-termStyles> "]" <matchGroup2> "[/dl]" + // where optional-termStyles are: "terms=" <optional-quote> <matchGroup1> <optional-quote> + $Text = preg_replace_callback('/\[dl[[:space:]]*(?:terms=(?:"|")?([a-zA-Z]+)(?:"|")?)?\](.*?)\[\/dl\]/ism', 'bb_definitionList', $Text); } if (strpos($Text,'[th]') !== false) { $Text = preg_replace("/\[th\](.*?)\[\/th\]/sm", '<th>$1</th>', $Text); diff --git a/include/conversation.php b/include/conversation.php index 94f1e7da7..ea5be221f 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1138,6 +1138,14 @@ function status_editor($a, $x, $popup = false) { if(x($x, 'hide_location')) $geotag = $setloc = $clearloc = ''; + $weblink = t('Insert web link'); + if(x($x, 'hide_weblink')) + $weblink = ''; + + $writefiles = perm_is_allowed($x['profile_uid'], get_observer_hash(), 'write_storage'); + if(x($x, 'hide_attach')) + $writefiles = false; + $mimeselect = ''; if(array_key_exists('mimetype', $x) && $x['mimetype']) { if($x['mimetype'] != 'text/bbcode') @@ -1187,7 +1195,7 @@ function status_editor($a, $x, $popup = false) { $jotplugins = ''; $preview = t('Preview'); - if(x($x, 'nopreview')) + if(x($x, 'hide_preview')) $preview = ''; $defexpire = ((($z = get_pconfig($x['profile_uid'], 'system', 'default_post_expire')) && (! $webpage)) ? $z : ''); @@ -1213,14 +1221,14 @@ function status_editor($a, $x, $popup = false) { '$pagetitle' => (x($x,'pagetitle') ? $x['pagetitle'] : ''), '$id_select' => $id_select, '$id_seltext' => t('Post as'), - '$writefiles' => perm_is_allowed($x['profile_uid'], get_observer_hash(), 'write_storage'), + '$writefiles' => $writefiles, '$bold' => t('Bold'), '$italic' => t('Italic'), '$underline' => t('Underline'), '$quote' => t('Quote'), '$code' => t('Code'), '$attach' => t('Attach file'), - '$weblink' => t('Insert web link'), + '$weblink' => $weblink, '$setloc' => $setloc, '$voting' => t('Toggle voting'), '$feature_voting' => $feature_voting, diff --git a/include/identity.php b/include/identity.php index 1c899048a..c60c846c0 100644 --- a/include/identity.php +++ b/include/identity.php @@ -491,7 +491,7 @@ function identity_basic_export($channel_id, $items = false) { // use constants here as otherwise we will have no idea if we can import from a site // with a non-standard platform and version. - $ret['compatibility'] = array('project' => PLATFORM_NAME, 'version' => RED_VERSION, 'database' => DB_UPDATE_VERSION, 'server_role' => Zotlabs\Project\System::get_server_role()); + $ret['compatibility'] = array('project' => PLATFORM_NAME, 'version' => STD_VERSION, 'database' => DB_UPDATE_VERSION, 'server_role' => Zotlabs\Project\System::get_server_role()); $r = q("select * from channel where channel_id = %d limit 1", intval($channel_id) @@ -1878,3 +1878,65 @@ function get_zcard($channel,$observer_hash = '',$args = array()) { return $o; } + + +function get_zcard_embed($channel,$observer_hash = '',$args = array()) { + + logger('get_zcard_embed'); + + $maxwidth = (($args['width']) ? intval($args['width']) : 0); + $maxheight = (($args['height']) ? intval($args['height']) : 0); + + + if(($maxwidth > 1200) || ($maxwidth < 1)) + $maxwidth = 1200; + + if($maxwidth <= 425) { + $width = 425; + $size = 'hz_small'; + $cover_size = PHOTO_RES_COVER_425; + $pphoto = array('type' => $channel['xchan_photo_mimetype'], 'width' => 80 , 'height' => 80, 'href' => $channel['xchan_photo_m']); + } + elseif($maxwidth <= 900) { + $width = 900; + $size = 'hz_medium'; + $cover_size = PHOTO_RES_COVER_850; + $pphoto = array('type' => $channel['xchan_photo_mimetype'], 'width' => 160 , 'height' => 160, 'href' => $channel['xchan_photo_l']); + } + elseif($maxwidth <= 1200) { + $width = 1200; + $size = 'hz_large'; + $cover_size = PHOTO_RES_COVER_1200; + $pphoto = array('type' => $channel['xchan_photo_mimetype'], 'width' => 300 , 'height' => 300, 'href' => $channel['xchan_photo_l']); + } + + $channel['channel_addr'] = $channel['channel_address'] . '@' . App::get_hostname(); + $zcard = array('chan' => $channel); + + $r = q("select height, width, resource_id, scale, type from photo where uid = %d and scale = %d and photo_usage = %d", + intval($channel['channel_id']), + intval($cover_size), + intval(PHOTO_COVER) + ); + + if($r) { + $cover = $r[0]; + $cover['href'] = z_root() . '/photo/' . $r[0]['resource_id'] . '-' . $r[0]['scale']; + } + else { + $cover = $pphoto; + } + + $o .= replace_macros(get_markup_template('zcard_embed.tpl'),array( + '$maxwidth' => $maxwidth, + '$scale' => $scale, + '$translate' => $translate, + '$size' => $size, + '$cover' => $cover, + '$pphoto' => $pphoto, + '$zcard' => $zcard + )); + + return $o; + +} diff --git a/include/items.php b/include/items.php index 2720dd841..b3c9403e0 100755 --- a/include/items.php +++ b/include/items.php @@ -3400,6 +3400,37 @@ function tgroup_check($uid,$item) { */ function start_delivery_chain($channel, $item, $item_id, $parent) { + $sourced = check_item_source($channel['channel_id'],$item); + + if($sourced) { + $r = q("select * from source where src_channel_id = %d and ( src_xchan = '%s' or src_xchan = '*' ) limit 1", + intval($channel['channel_id']), + dbesc(($item['source_xchan']) ? $item['source_xchan'] : $item['owner_xchan']) + ); + if($r) { + $t = trim($r[0]['src_tag']); + if($t) { + $tags = explode(',',$t); + if($tags) { + foreach($tags as $tt) { + $tt = trim($tt); + if($tt) { + q("insert into term (uid,oid,otype,type,term,url) + values(%d,%d,%d,%d,'%s','%s') ", + intval($channel['channel_id']), + intval($item_id), + intval(TERM_OBJ_POST), + intval(TERM_CATEGORY), + dbesc($tt), + dbesc(z_root() . '/channel/' . $channel['channel_address'] . '?f=&cat=' . urlencode($tt)) + ); + } + } + } + } + } + } + // Change this copy of the post to a forum head message and deliver to all the tgroup members // also reset all the privacy bits to the forum default permissions @@ -3459,6 +3490,9 @@ function start_delivery_chain($channel, $item, $item_id, $parent) { intval($item_id) ); + + + if($r) proc_run('php','include/notifier.php','tgroup',$item_id); else { diff --git a/include/oembed.php b/include/oembed.php index 3994af0fb..1e5c51172 100755 --- a/include/oembed.php +++ b/include/oembed.php @@ -1,69 +1,106 @@ <?php /** @file */ + + function oembed_replacecb($matches){ $embedurl=$matches[1]; + $result = oembed_action($embedurl); + if($result['action'] === 'block') { + return '<a href="' . $result['url'] . '">' . $result['url'] . '</a>'; + } + + $j = oembed_fetch_url($result['url']); + $s = oembed_format_object($j); + return $s; +} + + +function oembed_action($embedurl) { + + $host = ''; + $action = 'filter'; + + $embedurl = trim(str_replace('&','&', $embedurl)); + + logger('oembed_action: ' . $embedurl, LOGGER_DEBUG, LOG_INFO); + + // These media files should now be caught in bbcode.php + // left here as a fallback in case this is called from another source + + $noexts = array("mp3","mp4","ogg","ogv","oga","ogm","webm","opus"); + $ext = pathinfo(strtolower($embedurl),PATHINFO_EXTENSION); + + if(strpos($embedurl,'http://') === 0) { + if(intval(get_config('system','embed_sslonly'))) { + $action = 'block'; + } + } // site white/black list if(($x = get_config('system','embed_deny'))) { - $l = explode("\n",$x); - if($l) { - foreach($l as $ll) { - if(trim($ll) && strpos($embedurl,trim($ll)) !== false) - return '<a href="' . $embedurl . '">' . $embedurl . '</a>'; + if(($x) && (! is_array($x))) + $x = explode("\n",$x); + if($x) { + foreach($x as $ll) { + $t = trim($ll); + if(($t) && (strpos($embedurl,$t) !== false)) { + $action = 'block'; + break; + } } } } + + $found = false; + if(($x = get_config('system','embed_allow'))) { - $found = false; - $l = explode("\n",$x); - if($l) { - foreach($l as $ll) { - if(trim($ll) && strpos($embedurl,trim($ll)) !== false) { + if(($x) && (! is_array($x))) + $x = explode("\n",$x); + if($x) { + foreach($x as $ll) { + $t = trim($ll); + if(($t) && (strpos($embedurl,$t) !== false) && ($action !== 'block')) { $found = true; + $action = 'allow'; break; } } } - if(! $found) { - return '<a href="' . $embedurl . '">' . $embedurl . '</a>'; + if((! $found) && ($action !== 'block')) { + $action = 'filter'; } } - // implements a personal embed white/black list for logged in members + // allow individual members to block something that wasn't blocked already. + // They cannot over-ride the site to allow or change the filtering on an + // embed that is not allowed by the site admin. + if(local_channel()) { if(($x = get_pconfig(local_channel(),'system','embed_deny'))) { - $l = explode("\n",$x); - if($l) { - foreach($l as $ll) { - if(trim($ll) && strpos($embedurl,trim($ll)) !== false) - return '<a href="' . $embedurl . '">' . $embedurl . '</a>'; - } - } - } - if(($x = get_pconfig(local_channel(),'system','embed_allow'))) { - $found = false; - $l = explode("\n",$x); - if($l) { - foreach($l as $ll) { - if(trim($ll) && strpos($embedurl,trim($ll)) !== false) { - $found = true; + if(($x) && (! is_array($x))) + $x = explode("\n",$x); + if($x) { + foreach($x as $ll) { + $t = trim($ll); + if(($t) && (strpos($embedurl,$t) !== false)) { + $action = 'block'; break; } } } - if(! $found) { - return '<a href="' . $embedurl . '">' . $embedurl . '</a>'; - } } } - $j = oembed_fetch_url($embedurl); - $s = oembed_format_object($j); - return $s; -} + $arr = array('url' => $embedurl, 'action' => $action); + call_hooks('oembed_action',$arr); + + logger('action: ' . $arr['action'] . ' url: ' . $arr['url'], LOGGER_DEBUG,LOG_DEBUG); + + return $arr; +} // if the url is embeddable with oembed, return the bbcode link. @@ -79,42 +116,49 @@ function oembed_process($url) { function oembed_fetch_url($embedurl){ - $a = get_app(); + // These media files should now be caught in bbcode.php + // left here as a fallback in case this is called from another source - $embedurl = str_replace('&','&', $embedurl); + $noexts = array("mp3","mp4","ogg","ogv","oga","ogm","webm","opus"); + $ext = pathinfo(strtolower($embedurl),PATHINFO_EXTENSION); -// logger('fetch: ' . $embedurl); + $result = oembed_action($embedurl); - $txt = Cache::get(App::$videowidth . $embedurl); + $embedurl = $result['url']; + $action = $result['action']; - if(strstr($txt,'youtu') && strstr(z_root(),'https:')) { - $txt = str_replace('http:','https:',$txt); - } + $txt = null; - // These media files should now be caught in bbcode.php - // left here as a fallback in case this is called from another source + if($action !== 'block') { + $txt = Cache::get(App::$videowidth . $embedurl); - $noexts = array("mp3","mp4","ogg","ogv","oga","ogm","webm","opus"); - $ext = pathinfo(strtolower($embedurl),PATHINFO_EXTENSION); - - - if(is_null($txt)){ - $txt = ""; + if(strstr($txt,'youtu') && strstr(z_root(),'https:')) { + $txt = str_replace('http:','https:',$txt); + } + } - if (in_array($ext, $noexts)) { + if(is_null($txt)) { + + $txt = ""; + $furl = $embedurl; + $zrl = false; + + if(local_channel()) { require_once('include/hubloc.php'); - $zrl = is_matrix_url($embedurl); + $zrl = is_matrix_url($furl); if($zrl) - $embedurl = zid($embedurl); + $furl = zid($furl); } - else { + + + if (! in_array($ext, $noexts) && $action !== 'block') { // try oembed autodiscovery $redirects = 0; - $result = z_fetch_url($embedurl, false, $redirects, array('timeout' => 15, 'accept_content' => "text/*", 'novalidate' => true )); + $result = z_fetch_url($furl, false, $redirects, array('timeout' => 15, 'accept_content' => "text/*", 'novalidate' => true )); if($result['success']) $html_text = $result['body']; - if($html_text){ + if($html_text) { $dom = @DOMDocument::loadHTML($html_text); if ($dom){ $xpath = new DOMXPath($dom); @@ -149,6 +193,7 @@ function oembed_fetch_url($embedurl){ } $txt=trim($txt); + if ($txt[0]!="{") $txt='{"type":"error"}'; //save in cache @@ -160,6 +205,18 @@ function oembed_fetch_url($embedurl){ $j = json_decode($txt); + + if($action === 'filter') { + if($j->html) { + $orig = $j->html; + $allow_position = (($zrl) ? true : false); + $j->html = purify_html($j->html,$allow_position); + if($j->html != $orig) { + logger('oembed html was purified. original: ' . $orig . ' purified: ' . $j->html, LOGGER_DEBUG, LOG_INFO); + } + } + } + $j->embedurl = $embedurl; // logger('fetch return: ' . print_r($j,true)); diff --git a/include/text.php b/include/text.php index d7c91e430..66a49d4b5 100644 --- a/include/text.php +++ b/include/text.php @@ -122,7 +122,7 @@ function z_input_filter($channel_id,$s,$type = 'text/bbcode') { -function purify_html($s) { +function purify_html($s, $allow_position = false) { require_once('library/HTMLPurifier.auto.php'); require_once('include/html2bbcode.php'); @@ -202,6 +202,35 @@ function purify_html($s) { $def->addElement('header', 'Block', 'Flow', 'Common'); $def->addElement('footer', 'Block', 'Flow', 'Common'); + + if($allow_position) { + $cssDefinition = $config->getCSSDefinition(); + + $cssDefinition->info['position'] = new HTMLPurifier_AttrDef_Enum(array('absolute', 'fixed', 'relative', 'static', 'inherit'), false); + + $cssDefinition->info['left'] = new HTMLPurifier_AttrDef_CSS_Composite(array( + new HTMLPurifier_AttrDef_CSS_Length(), + new HTMLPurifier_AttrDef_CSS_Percentage() + )); + + $cssDefinition->info['right'] = new HTMLPurifier_AttrDef_CSS_Composite(array( + new HTMLPurifier_AttrDef_CSS_Length(), + new HTMLPurifier_AttrDef_CSS_Percentage() + )); + + $cssDefinition->info['top'] = new HTMLPurifier_AttrDef_CSS_Composite(array( + new HTMLPurifier_AttrDef_CSS_Length(), + new HTMLPurifier_AttrDef_CSS_Percentage() + )); + + $cssDefinition->info['bottom'] = new HTMLPurifier_AttrDef_CSS_Composite(array( + new HTMLPurifier_AttrDef_CSS_Length(), + new HTMLPurifier_AttrDef_CSS_Percentage() + )); + + } + + $purifier = new HTMLPurifier($config); return $purifier->purify($s); @@ -1826,7 +1855,9 @@ function lang_selector() { function engr_units_to_bytes ($size_str) { - switch (substr ($size_str, -1)) { + if(! $size_str) + return $size_str; + switch (substr(trim($size_str), -1)) { case 'M': case 'm': return (int)$size_str * 1048576; case 'K': case 'k': return (int)$size_str * 1024; case 'G': case 'g': return (int)$size_str * 1073741824; diff --git a/include/zot.php b/include/zot.php index 1ca1b862b..157354afa 100644 --- a/include/zot.php +++ b/include/zot.php @@ -3914,7 +3914,7 @@ function zotinfo($arr) { $ret['site']['channels'] = channel_total(); - $ret['site']['version'] = Zotlabs\Project\System::get_platform_name() . ' ' . RED_VERSION . '[' . DB_UPDATE_VERSION . ']'; + $ret['site']['version'] = Zotlabs\Project\System::get_platform_name() . ' ' . STD_VERSION . '[' . DB_UPDATE_VERSION . ']'; $ret['site']['admin'] = get_config('system','admin_email'); diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql index c36bfaa57..2305d4a0b 100644 --- a/install/schema_mysql.sql +++ b/install/schema_mysql.sql @@ -1181,6 +1181,7 @@ CREATE TABLE IF NOT EXISTS `source` ( `src_channel_xchan` char(255) NOT NULL DEFAULT '', `src_xchan` char(255) NOT NULL DEFAULT '', `src_patt` mediumtext NOT NULL, + `src_tag` mediumtext NOT NULL, PRIMARY KEY (`src_id`), KEY `src_channel_id` (`src_channel_id`), KEY `src_channel_xchan` (`src_channel_xchan`), diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql index d4bb54b1e..2c0847cbf 100644 --- a/install/schema_postgres.sql +++ b/install/schema_postgres.sql @@ -1166,7 +1166,8 @@ CREATE TABLE "source" ( "src_channel_id" bigint NOT NULL DEFAULT '0', "src_channel_xchan" text NOT NULL DEFAULT '', "src_xchan" text NOT NULL DEFAULT '', - "src_patt" text NOT NULL, + "src_patt" text NOT NULL DEFAULT '', + "src_tag" text NOT NULL DEFAULT '', PRIMARY KEY ("src_id") ); create index "src_channel_id" on "source" ("src_channel_id"); diff --git a/install/update.php b/install/update.php index 2dc4a6db3..b8e20786c 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ <?php -define( 'UPDATE_VERSION' , 1166 ); +define( 'UPDATE_VERSION' , 1167 ); /** * @@ -2071,3 +2071,12 @@ function update_r1165() { return UPDATE_FAILED; } +function update_r1166() { + + $r = q("alter table source add src_tag text not null default '' "); + if($r) + return UPDATE_SUCCESS; + return UPDATE_FAILED; +} + + diff --git a/util/hmessages.po b/util/hmessages.po index bb89cb11e..79a56d5c3 100644 --- a/util/hmessages.po +++ b/util/hmessages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2016-04-22.1374H\n" +"Project-Id-Version: 2016-04-29.1381H\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-04-22 00:01-0700\n" +"POT-Creation-Date: 2016-04-29 00:01-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -21,7 +21,7 @@ msgstr "" msgid "parent" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2633 +#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2606 msgid "Collection" msgstr "" @@ -46,7 +46,7 @@ msgid "Schedule Outbox" msgstr "" #: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Module/Photos.php:797 -#: ../../Zotlabs/Module/Photos.php:1241 ../../include/apps.php:360 +#: ../../Zotlabs/Module/Photos.php:1242 ../../include/apps.php:360 #: ../../include/apps.php:415 ../../include/conversation.php:1037 #: ../../include/widgets.php:1457 msgid "Unknown" @@ -75,7 +75,7 @@ msgstr "" #: ../../Zotlabs/Storage/Browser.php:231 ../../Zotlabs/Storage/Browser.php:305 #: ../../Zotlabs/Module/Cover_photo.php:357 -#: ../../Zotlabs/Module/Photos.php:824 ../../Zotlabs/Module/Photos.php:1365 +#: ../../Zotlabs/Module/Photos.php:824 ../../Zotlabs/Module/Photos.php:1366 #: ../../Zotlabs/Module/Profile_photo.php:368 ../../include/widgets.php:1470 msgid "Upload" msgstr "" @@ -123,9 +123,9 @@ msgstr "" #: ../../Zotlabs/Module/Blocks.php:161 #: ../../Zotlabs/Module/Connections.php:263 #: ../../Zotlabs/Module/Connedit.php:573 -#: ../../Zotlabs/Module/Editblock.php:187 +#: ../../Zotlabs/Module/Editblock.php:180 #: ../../Zotlabs/Module/Editlayout.php:184 -#: ../../Zotlabs/Module/Editwebpage.php:228 ../../Zotlabs/Module/Group.php:177 +#: ../../Zotlabs/Module/Editwebpage.php:221 ../../Zotlabs/Module/Group.php:177 #: ../../Zotlabs/Module/Photos.php:1172 ../../Zotlabs/Module/Settings.php:651 #: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Module/Webpages.php:191 #: ../../include/ItemObject.php:120 ../../include/apps.php:260 @@ -372,7 +372,7 @@ msgstr "" #: ../../Zotlabs/Module/Settings.php:579 ../../include/dir_fns.php:141 #: ../../include/dir_fns.php:142 ../../include/dir_fns.php:143 #: ../../view/theme/redbasic/php/config.php:105 -#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1606 +#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1619 msgid "No" msgstr "" @@ -392,7 +392,7 @@ msgstr "" #: ../../Zotlabs/Module/Settings.php:579 ../../include/dir_fns.php:141 #: ../../include/dir_fns.php:142 ../../include/dir_fns.php:143 #: ../../view/theme/redbasic/php/config.php:105 -#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1606 +#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1619 msgid "Yes" msgstr "" @@ -423,7 +423,7 @@ msgstr "" #: ../../Zotlabs/Module/Admin.php:1778 ../../Zotlabs/Module/Appman.php:103 #: ../../Zotlabs/Module/Cal.php:341 ../../Zotlabs/Module/Chat.php:194 #: ../../Zotlabs/Module/Chat.php:236 ../../Zotlabs/Module/Connect.php:97 -#: ../../Zotlabs/Module/Connedit.php:733 ../../Zotlabs/Module/Events.php:472 +#: ../../Zotlabs/Module/Connedit.php:734 ../../Zotlabs/Module/Events.php:472 #: ../../Zotlabs/Module/Events.php:669 #: ../../Zotlabs/Module/Filestorage.php:160 #: ../../Zotlabs/Module/Fsuggest.php:112 ../../Zotlabs/Module/Group.php:85 @@ -827,14 +827,6 @@ msgstr "" msgid "Block embedded HTML from these domains" msgstr "" -#: ../../Zotlabs/Module/Admin.php:728 -msgid "Cooperative embed security" -msgstr "" - -#: ../../Zotlabs/Module/Admin.php:728 -msgid "Enable to share embed security with other compatible sites/hubs" -msgstr "" - #: ../../Zotlabs/Module/Admin.php:743 msgid "Update has been marked successful" msgstr "" @@ -954,7 +946,7 @@ msgstr "" #: ../../Zotlabs/Module/Admin.php:997 ../../Zotlabs/Module/Admin.php:1006 #: ../../Zotlabs/Module/Id.php:17 ../../Zotlabs/Module/Id.php:18 -#: ../../include/contact_selectors.php:81 ../../boot.php:1604 +#: ../../include/contact_selectors.php:81 ../../boot.php:1617 msgid "Email" msgstr "" @@ -1134,7 +1126,7 @@ msgstr "" #: ../../Zotlabs/Module/Admin.php:1274 ../../Zotlabs/Module/Admin.php:1496 #: ../../include/apps.php:134 ../../include/widgets.php:589 -#: ../../include/nav.php:211 +#: ../../include/nav.php:208 msgid "Settings" msgstr "" @@ -1251,8 +1243,8 @@ msgstr "" #: ../../Zotlabs/Module/Admin.php:1695 ../../Zotlabs/Module/Admin.php:1715 #: ../../Zotlabs/Module/Filer.php:53 ../../Zotlabs/Module/Rbmark.php:32 -#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/widgets.php:201 -#: ../../include/text.php:905 ../../include/text.php:917 +#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/text.php:905 +#: ../../include/text.php:917 ../../include/widgets.php:201 msgid "Save" msgstr "" @@ -1336,7 +1328,7 @@ msgstr "" #: ../../Zotlabs/Module/Appman.php:95 ../../Zotlabs/Module/Appman.php:96 #: ../../Zotlabs/Module/Events.php:448 ../../Zotlabs/Module/Events.php:453 -#: ../../Zotlabs/Module/Profiles.php:712 ../../Zotlabs/Module/Profiles.php:716 +#: ../../Zotlabs/Module/Profiles.php:713 ../../Zotlabs/Module/Profiles.php:717 #: ../../include/datetime.php:246 msgid "Required" msgstr "" @@ -1371,7 +1363,7 @@ msgid "Location (URL) to purchase app" msgstr "" #: ../../Zotlabs/Module/Apps.php:40 ../../include/widgets.php:102 -#: ../../include/nav.php:165 +#: ../../include/nav.php:163 msgid "Apps" msgstr "" @@ -1392,7 +1384,7 @@ msgstr "" msgid "Block Name" msgstr "" -#: ../../Zotlabs/Module/Blocks.php:153 ../../include/text.php:2278 +#: ../../Zotlabs/Module/Blocks.php:153 ../../include/text.php:2251 msgid "Blocks" msgstr "" @@ -1450,7 +1442,7 @@ msgid "l, F j" msgstr "" #: ../../Zotlabs/Module/Cal.php:311 ../../Zotlabs/Module/Events.php:634 -#: ../../include/text.php:1743 +#: ../../include/text.php:1714 msgid "Link to Source" msgstr "" @@ -1544,10 +1536,10 @@ msgstr "" msgid "Encrypt text" msgstr "" -#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Editblock.php:149 +#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Editblock.php:148 #: ../../Zotlabs/Module/Editlayout.php:147 #: ../../Zotlabs/Module/Editpost.php:126 -#: ../../Zotlabs/Module/Editwebpage.php:189 ../../Zotlabs/Module/Mail.php:253 +#: ../../Zotlabs/Module/Editwebpage.php:188 ../../Zotlabs/Module/Mail.php:253 #: ../../Zotlabs/Module/Mail.php:383 ../../include/conversation.php:1225 msgid "Insert web link" msgstr "" @@ -1585,7 +1577,7 @@ msgid "No chatrooms available" msgstr "" #: ../../Zotlabs/Module/Chat.php:250 ../../Zotlabs/Module/Manage.php:141 -#: ../../Zotlabs/Module/Profiles.php:781 +#: ../../Zotlabs/Module/Profiles.php:782 msgid "Create New" msgstr "" @@ -1777,13 +1769,13 @@ msgid "Recent activity" msgstr "" #: ../../Zotlabs/Module/Connections.php:302 ../../include/text.php:834 -#: ../../include/nav.php:189 +#: ../../include/nav.php:186 msgid "Connections" msgstr "" #: ../../Zotlabs/Module/Connections.php:306 ../../Zotlabs/Module/Search.php:44 -#: ../../include/apps.php:147 ../../include/text.php:904 -#: ../../include/text.php:916 ../../include/nav.php:167 +#: ../../include/text.php:904 ../../include/text.php:916 +#: ../../include/apps.php:147 ../../include/nav.php:165 msgid "Search" msgstr "" @@ -1998,80 +1990,84 @@ msgid "" "connections." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:715 +#: ../../Zotlabs/Module/Connedit.php:714 +msgid "Connection Tools" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:716 msgid "Slide to adjust your degree of friendship" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:716 ../../Zotlabs/Module/Rate.php:161 +#: ../../Zotlabs/Module/Connedit.php:717 ../../Zotlabs/Module/Rate.php:161 #: ../../include/js_strings.php:20 msgid "Rating" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:717 +#: ../../Zotlabs/Module/Connedit.php:718 msgid "Slide to adjust your rating" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:718 ../../Zotlabs/Module/Connedit.php:723 +#: ../../Zotlabs/Module/Connedit.php:719 ../../Zotlabs/Module/Connedit.php:724 msgid "Optionally explain your rating" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:720 +#: ../../Zotlabs/Module/Connedit.php:721 msgid "Custom Filter" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:721 +#: ../../Zotlabs/Module/Connedit.php:722 msgid "Only import posts with this text" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:721 ../../Zotlabs/Module/Connedit.php:722 +#: ../../Zotlabs/Module/Connedit.php:722 ../../Zotlabs/Module/Connedit.php:723 msgid "" "words one per line or #tags or /patterns/ or lang=xx, leave blank to import " "all posts" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:722 +#: ../../Zotlabs/Module/Connedit.php:723 msgid "Do not import posts with this text" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:724 +#: ../../Zotlabs/Module/Connedit.php:725 msgid "This information is public!" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:729 +#: ../../Zotlabs/Module/Connedit.php:730 msgid "Connection Pending Approval" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:732 +#: ../../Zotlabs/Module/Connedit.php:733 msgid "inherited" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:734 +#: ../../Zotlabs/Module/Connedit.php:735 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:736 +#: ../../Zotlabs/Module/Connedit.php:737 msgid "Their Settings" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:737 +#: ../../Zotlabs/Module/Connedit.php:738 msgid "My Settings" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:739 +#: ../../Zotlabs/Module/Connedit.php:740 msgid "Individual Permissions" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:740 +#: ../../Zotlabs/Module/Connedit.php:741 msgid "" "Some permissions may be inherited from your channel's <a href=\"settings" "\"><strong>privacy settings</strong></a>, which have higher priority than " "individual settings. You can <strong>not</strong> change those settings here." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:741 +#: ../../Zotlabs/Module/Connedit.php:742 msgid "" "Some permissions may be inherited from your channel's <a href=\"settings" "\"><strong>privacy settings</strong></a>, which have higher priority than " @@ -2079,7 +2075,7 @@ msgid "" "any impact unless the inherited setting changes." msgstr "" -#: ../../Zotlabs/Module/Connedit.php:742 +#: ../../Zotlabs/Module/Connedit.php:743 msgid "Last update:" msgstr "" @@ -2227,8 +2223,8 @@ msgid "Age:" msgstr "" #: ../../Zotlabs/Module/Directory.php:311 ../../include/identity.php:1022 -#: ../../include/bb2diaspora.php:509 ../../include/event.php:52 -#: ../../include/text.php:1452 +#: ../../include/text.php:1452 ../../include/bb2diaspora.php:509 +#: ../../include/event.php:52 msgid "Location:" msgstr "" @@ -2440,124 +2436,62 @@ msgid "Code" msgstr "" #: ../../Zotlabs/Module/Editblock.php:147 -#: ../../Zotlabs/Module/Editlayout.php:145 -#: ../../Zotlabs/Module/Editpost.php:124 -#: ../../Zotlabs/Module/Editwebpage.php:187 -#: ../../include/conversation.php:1221 -msgid "Upload photo" -msgstr "" - -#: ../../Zotlabs/Module/Editblock.php:148 #: ../../Zotlabs/Module/Editlayout.php:146 #: ../../Zotlabs/Module/Editpost.php:125 -#: ../../Zotlabs/Module/Editwebpage.php:188 ../../Zotlabs/Module/Mail.php:252 +#: ../../Zotlabs/Module/Editwebpage.php:187 ../../Zotlabs/Module/Mail.php:252 #: ../../Zotlabs/Module/Mail.php:382 ../../include/conversation.php:1223 msgid "Attach file" msgstr "" -#: ../../Zotlabs/Module/Editblock.php:150 -#: ../../Zotlabs/Module/Editlayout.php:148 -#: ../../Zotlabs/Module/Editpost.php:127 -#: ../../Zotlabs/Module/Editwebpage.php:190 -msgid "Insert YouTube video" -msgstr "" - #: ../../Zotlabs/Module/Editblock.php:151 -#: ../../Zotlabs/Module/Editlayout.php:149 -#: ../../Zotlabs/Module/Editpost.php:128 -#: ../../Zotlabs/Module/Editwebpage.php:191 -msgid "Insert Vorbis [.ogg] video" -msgstr "" - -#: ../../Zotlabs/Module/Editblock.php:152 -#: ../../Zotlabs/Module/Editlayout.php:150 -#: ../../Zotlabs/Module/Editpost.php:129 -#: ../../Zotlabs/Module/Editwebpage.php:192 -msgid "Insert Vorbis [.ogg] audio" -msgstr "" - -#: ../../Zotlabs/Module/Editblock.php:153 -#: ../../Zotlabs/Module/Editlayout.php:151 -#: ../../Zotlabs/Module/Editpost.php:130 -#: ../../Zotlabs/Module/Editwebpage.php:193 -#: ../../include/conversation.php:1231 -msgid "Set your location" -msgstr "" - -#: ../../Zotlabs/Module/Editblock.php:154 -#: ../../Zotlabs/Module/Editlayout.php:152 -#: ../../Zotlabs/Module/Editpost.php:131 -#: ../../Zotlabs/Module/Editwebpage.php:194 -#: ../../include/conversation.php:1236 -msgid "Clear browser location" -msgstr "" - -#: ../../Zotlabs/Module/Editblock.php:155 -#: ../../Zotlabs/Module/Editlayout.php:153 -#: ../../Zotlabs/Module/Editpost.php:135 -#: ../../Zotlabs/Module/Editwebpage.php:195 -#: ../../Zotlabs/Module/Photos.php:1072 ../../include/ItemObject.php:389 -#: ../../include/conversation.php:740 ../../include/conversation.php:1244 -msgid "Please wait" -msgstr "" - -#: ../../Zotlabs/Module/Editblock.php:156 #: ../../Zotlabs/Module/Editlayout.php:154 #: ../../Zotlabs/Module/Editpost.php:136 -#: ../../Zotlabs/Module/Editwebpage.php:196 +#: ../../Zotlabs/Module/Editwebpage.php:191 #: ../../Zotlabs/Module/Events.php:470 ../../include/conversation.php:1245 msgid "Permission settings" msgstr "" -#: ../../Zotlabs/Module/Editblock.php:164 +#: ../../Zotlabs/Module/Editblock.php:159 #: ../../Zotlabs/Module/Editlayout.php:161 #: ../../Zotlabs/Module/Editpost.php:144 -#: ../../Zotlabs/Module/Editwebpage.php:205 +#: ../../Zotlabs/Module/Editwebpage.php:200 #: ../../include/conversation.php:1254 msgid "Public post" msgstr "" -#: ../../Zotlabs/Module/Editblock.php:167 +#: ../../Zotlabs/Module/Editblock.php:162 #: ../../Zotlabs/Module/Editpost.php:147 -#: ../../Zotlabs/Module/Editwebpage.php:210 +#: ../../Zotlabs/Module/Editwebpage.php:205 #: ../../include/conversation.php:1239 msgid "Title (optional)" msgstr "" -#: ../../Zotlabs/Module/Editblock.php:170 +#: ../../Zotlabs/Module/Editblock.php:165 #: ../../Zotlabs/Module/Editlayout.php:168 #: ../../Zotlabs/Module/Editpost.php:149 -#: ../../Zotlabs/Module/Editwebpage.php:212 +#: ../../Zotlabs/Module/Editwebpage.php:207 #: ../../include/conversation.php:1243 msgid "Categories (optional, comma-separated list)" msgstr "" -#: ../../Zotlabs/Module/Editblock.php:171 +#: ../../Zotlabs/Module/Editblock.php:166 #: ../../Zotlabs/Module/Editlayout.php:169 #: ../../Zotlabs/Module/Editpost.php:150 -#: ../../Zotlabs/Module/Editwebpage.php:213 +#: ../../Zotlabs/Module/Editwebpage.php:208 #: ../../include/conversation.php:1256 msgid "Example: bob@example.com, mary@example.com" msgstr "" -#: ../../Zotlabs/Module/Editblock.php:176 +#: ../../Zotlabs/Module/Editblock.php:171 #: ../../Zotlabs/Module/Editpost.php:155 -#: ../../Zotlabs/Module/Editwebpage.php:217 +#: ../../Zotlabs/Module/Editwebpage.php:212 #: ../../Zotlabs/Module/Events.php:469 ../../Zotlabs/Module/Photos.php:1092 #: ../../Zotlabs/Module/Webpages.php:196 ../../include/ItemObject.php:712 #: ../../include/conversation.php:1186 ../../include/page_widgets.php:40 msgid "Preview" msgstr "" -#: ../../Zotlabs/Module/Editblock.php:181 -#: ../../Zotlabs/Module/Editlayout.php:178 -#: ../../Zotlabs/Module/Editpost.php:161 -#: ../../Zotlabs/Module/Editwebpage.php:222 ../../Zotlabs/Module/Mail.php:257 -#: ../../Zotlabs/Module/Mail.php:387 ../../include/conversation.php:1269 -msgid "Set expiration date" -msgstr "" - -#: ../../Zotlabs/Module/Editblock.php:186 +#: ../../Zotlabs/Module/Editblock.php:179 msgid "Edit Block" msgstr "" @@ -2565,6 +2499,43 @@ msgstr "" msgid "Delete layout?" msgstr "" +#: ../../Zotlabs/Module/Editlayout.php:145 +#: ../../Zotlabs/Module/Editpost.php:124 ../../include/conversation.php:1221 +msgid "Upload photo" +msgstr "" + +#: ../../Zotlabs/Module/Editlayout.php:148 +#: ../../Zotlabs/Module/Editpost.php:127 +msgid "Insert YouTube video" +msgstr "" + +#: ../../Zotlabs/Module/Editlayout.php:149 +#: ../../Zotlabs/Module/Editpost.php:128 +msgid "Insert Vorbis [.ogg] video" +msgstr "" + +#: ../../Zotlabs/Module/Editlayout.php:150 +#: ../../Zotlabs/Module/Editpost.php:129 +msgid "Insert Vorbis [.ogg] audio" +msgstr "" + +#: ../../Zotlabs/Module/Editlayout.php:151 +#: ../../Zotlabs/Module/Editpost.php:130 ../../include/conversation.php:1231 +msgid "Set your location" +msgstr "" + +#: ../../Zotlabs/Module/Editlayout.php:152 +#: ../../Zotlabs/Module/Editpost.php:131 ../../include/conversation.php:1236 +msgid "Clear browser location" +msgstr "" + +#: ../../Zotlabs/Module/Editlayout.php:153 +#: ../../Zotlabs/Module/Editpost.php:135 ../../Zotlabs/Module/Photos.php:1072 +#: ../../include/ItemObject.php:389 ../../include/conversation.php:740 +#: ../../include/conversation.php:1244 +msgid "Please wait" +msgstr "" + #: ../../Zotlabs/Module/Editlayout.php:164 #: ../../Zotlabs/Module/Layouts.php:128 msgid "Layout Description (Optional)" @@ -2575,6 +2546,12 @@ msgstr "" msgid "Layout Name" msgstr "" +#: ../../Zotlabs/Module/Editlayout.php:178 +#: ../../Zotlabs/Module/Editpost.php:161 ../../Zotlabs/Module/Mail.php:257 +#: ../../Zotlabs/Module/Mail.php:387 ../../include/conversation.php:1269 +msgid "Set expiration date" +msgstr "" + #: ../../Zotlabs/Module/Editlayout.php:183 msgid "Edit Layout" msgstr "" @@ -2619,7 +2596,7 @@ msgstr "" msgid "Page link title" msgstr "" -#: ../../Zotlabs/Module/Editwebpage.php:227 +#: ../../Zotlabs/Module/Editwebpage.php:220 msgid "Edit Webpage" msgstr "" @@ -2649,8 +2626,8 @@ msgid "Event not found." msgstr "" #: ../../Zotlabs/Module/Events.php:253 ../../Zotlabs/Module/Like.php:373 -#: ../../Zotlabs/Module/Tagger.php:51 ../../include/conversation.php:123 -#: ../../include/event.php:915 ../../include/text.php:1970 +#: ../../Zotlabs/Module/Tagger.php:51 ../../include/text.php:1943 +#: ../../include/conversation.php:123 ../../include/event.php:915 msgid "event" msgstr "" @@ -2713,7 +2690,7 @@ msgid "Edit Location" msgstr "" #: ../../Zotlabs/Module/Events.php:463 ../../Zotlabs/Module/Locs.php:117 -#: ../../Zotlabs/Module/Profiles.php:476 ../../Zotlabs/Module/Profiles.php:701 +#: ../../Zotlabs/Module/Profiles.php:476 ../../Zotlabs/Module/Profiles.php:702 #: ../../Zotlabs/Module/Pubsites.php:40 ../../include/js_strings.php:25 msgid "Location" msgstr "" @@ -2896,7 +2873,7 @@ msgstr "" #: ../../Zotlabs/Module/Help.php:85 ../../Zotlabs/Module/Help.php:90 #: ../../Zotlabs/Module/Layouts.php:181 ../../include/apps.php:142 -#: ../../include/nav.php:161 +#: ../../include/nav.php:159 msgid "Help" msgstr "" @@ -2963,7 +2940,7 @@ msgstr "" msgid "Timezone" msgstr "" -#: ../../Zotlabs/Module/Id.php:29 ../../Zotlabs/Module/Profiles.php:734 +#: ../../Zotlabs/Module/Id.php:29 ../../Zotlabs/Module/Profiles.php:735 msgid "Homepage URL" msgstr "" @@ -3238,7 +3215,7 @@ msgstr "" msgid "You have reached your limit of %1$.0f webpages." msgstr "" -#: ../../Zotlabs/Module/Layouts.php:179 ../../include/text.php:2280 +#: ../../Zotlabs/Module/Layouts.php:179 ../../include/text.php:2253 msgid "Layouts" msgstr "" @@ -3290,13 +3267,13 @@ msgid "Previous action reversed." msgstr "" #: ../../Zotlabs/Module/Like.php:371 ../../Zotlabs/Module/Subthread.php:87 -#: ../../Zotlabs/Module/Tagger.php:47 ../../include/conversation.php:120 -#: ../../include/text.php:1967 +#: ../../Zotlabs/Module/Tagger.php:47 ../../include/text.php:1940 +#: ../../include/conversation.php:120 msgid "photo" msgstr "" #: ../../Zotlabs/Module/Like.php:371 ../../Zotlabs/Module/Subthread.php:87 -#: ../../include/conversation.php:148 ../../include/text.php:1973 +#: ../../include/text.php:1946 ../../include/conversation.php:148 msgid "status" msgstr "" @@ -3432,7 +3409,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../Zotlabs/Module/Lostpass.php:90 ../../boot.php:1610 +#: ../../Zotlabs/Module/Lostpass.php:90 ../../boot.php:1623 msgid "Password Reset" msgstr "" @@ -3579,7 +3556,7 @@ msgid "Create a new channel" msgstr "" #: ../../Zotlabs/Module/Manage.php:162 ../../include/apps.php:132 -#: ../../include/nav.php:209 +#: ../../include/nav.php:206 msgid "Channel Manager" msgstr "" @@ -3665,7 +3642,7 @@ msgstr "" msgid "Submit and proceed" msgstr "" -#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2279 +#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2252 msgid "Menus" msgstr "" @@ -3959,7 +3936,7 @@ msgstr "" msgid "System Notifications" msgstr "" -#: ../../Zotlabs/Module/Notifications.php:103 ../../include/nav.php:194 +#: ../../Zotlabs/Module/Notifications.php:103 ../../include/nav.php:191 msgid "Mark all system notifications seen" msgstr "" @@ -4101,8 +4078,8 @@ msgstr "" msgid "Album name could not be decoded" msgstr "" -#: ../../Zotlabs/Module/Photos.php:742 ../../Zotlabs/Module/Photos.php:1282 -#: ../../Zotlabs/Module/Photos.php:1299 +#: ../../Zotlabs/Module/Photos.php:742 ../../Zotlabs/Module/Photos.php:1283 +#: ../../Zotlabs/Module/Photos.php:1300 msgid "Contact Photos" msgstr "" @@ -4114,7 +4091,7 @@ msgstr "" msgid "Show Oldest First" msgstr "" -#: ../../Zotlabs/Module/Photos.php:791 ../../Zotlabs/Module/Photos.php:1332 +#: ../../Zotlabs/Module/Photos.php:791 ../../Zotlabs/Module/Photos.php:1333 #: ../../include/widgets.php:1451 msgid "View Photo" msgstr "" @@ -4268,35 +4245,39 @@ msgid_plural "Dislikes" msgstr[0] "" msgstr[1] "" -#: ../../Zotlabs/Module/Photos.php:1242 +#: ../../Zotlabs/Module/Photos.php:1234 +msgid "Photo Tools" +msgstr "" + +#: ../../Zotlabs/Module/Photos.php:1243 msgid "In This Photo:" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1247 +#: ../../Zotlabs/Module/Photos.php:1248 msgid "Map" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1255 ../../include/ItemObject.php:378 +#: ../../Zotlabs/Module/Photos.php:1256 ../../include/ItemObject.php:378 msgctxt "noun" msgid "Likes" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1256 ../../include/ItemObject.php:379 +#: ../../Zotlabs/Module/Photos.php:1257 ../../include/ItemObject.php:379 msgctxt "noun" msgid "Dislikes" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1261 ../../include/ItemObject.php:384 +#: ../../Zotlabs/Module/Photos.php:1262 ../../include/ItemObject.php:384 #: ../../include/acl_selectors.php:252 msgid "Close" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1338 +#: ../../Zotlabs/Module/Photos.php:1339 msgid "View Album" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1349 ../../Zotlabs/Module/Photos.php:1362 -#: ../../Zotlabs/Module/Photos.php:1363 +#: ../../Zotlabs/Module/Photos.php:1350 ../../Zotlabs/Module/Photos.php:1363 +#: ../../Zotlabs/Module/Photos.php:1364 msgid "Recent Photos" msgstr "" @@ -4403,15 +4384,15 @@ msgstr "" msgid "Romantic Partner" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:434 ../../Zotlabs/Module/Profiles.php:739 +#: ../../Zotlabs/Module/Profiles.php:434 ../../Zotlabs/Module/Profiles.php:740 msgid "Likes" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:438 ../../Zotlabs/Module/Profiles.php:740 +#: ../../Zotlabs/Module/Profiles.php:438 ../../Zotlabs/Module/Profiles.php:741 msgid "Dislikes" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:442 ../../Zotlabs/Module/Profiles.php:747 +#: ../../Zotlabs/Module/Profiles.php:442 ../../Zotlabs/Module/Profiles.php:748 msgid "Work/Employment" msgstr "" @@ -4451,181 +4432,185 @@ msgstr "" msgid "View this profile" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:693 ../../Zotlabs/Module/Profiles.php:774 +#: ../../Zotlabs/Module/Profiles.php:693 ../../Zotlabs/Module/Profiles.php:775 #: ../../include/identity.php:952 msgid "Edit visibility" msgstr "" #: ../../Zotlabs/Module/Profiles.php:694 +msgid "Profile Tools" +msgstr "" + +#: ../../Zotlabs/Module/Profiles.php:695 msgid "Change cover photo" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:695 ../../include/identity.php:923 +#: ../../Zotlabs/Module/Profiles.php:696 ../../include/identity.php:923 msgid "Change profile photo" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:696 +#: ../../Zotlabs/Module/Profiles.php:697 msgid "Create a new profile using these settings" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:697 +#: ../../Zotlabs/Module/Profiles.php:698 msgid "Clone this profile" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:698 +#: ../../Zotlabs/Module/Profiles.php:699 msgid "Delete this profile" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:699 +#: ../../Zotlabs/Module/Profiles.php:700 msgid "Add profile things" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:700 ../../include/conversation.php:1544 +#: ../../Zotlabs/Module/Profiles.php:701 ../../include/conversation.php:1544 #: ../../include/widgets.php:105 msgid "Personal" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:702 +#: ../../Zotlabs/Module/Profiles.php:703 msgid "Relation" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:703 ../../include/datetime.php:48 +#: ../../Zotlabs/Module/Profiles.php:704 ../../include/datetime.php:48 msgid "Miscellaneous" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:705 +#: ../../Zotlabs/Module/Profiles.php:706 msgid "Import profile from file" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:706 +#: ../../Zotlabs/Module/Profiles.php:707 msgid "Export profile to file" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:707 +#: ../../Zotlabs/Module/Profiles.php:708 msgid "Your gender" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:708 +#: ../../Zotlabs/Module/Profiles.php:709 msgid "Marital status" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:709 +#: ../../Zotlabs/Module/Profiles.php:710 msgid "Sexual preference" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:712 +#: ../../Zotlabs/Module/Profiles.php:713 msgid "Profile name" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:714 +#: ../../Zotlabs/Module/Profiles.php:715 msgid "This is your default profile." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:716 +#: ../../Zotlabs/Module/Profiles.php:717 msgid "Your full name" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:717 +#: ../../Zotlabs/Module/Profiles.php:718 msgid "Title/Description" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:720 +#: ../../Zotlabs/Module/Profiles.php:721 msgid "Street address" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:721 +#: ../../Zotlabs/Module/Profiles.php:722 msgid "Locality/City" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:722 +#: ../../Zotlabs/Module/Profiles.php:723 msgid "Region/State" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:723 +#: ../../Zotlabs/Module/Profiles.php:724 msgid "Postal/Zip code" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:724 +#: ../../Zotlabs/Module/Profiles.php:725 msgid "Country" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:729 +#: ../../Zotlabs/Module/Profiles.php:730 msgid "Who (if applicable)" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:729 +#: ../../Zotlabs/Module/Profiles.php:730 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:730 +#: ../../Zotlabs/Module/Profiles.php:731 msgid "Since (date)" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:733 +#: ../../Zotlabs/Module/Profiles.php:734 msgid "Tell us about yourself" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:735 +#: ../../Zotlabs/Module/Profiles.php:736 msgid "Hometown" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:736 +#: ../../Zotlabs/Module/Profiles.php:737 msgid "Political views" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:737 +#: ../../Zotlabs/Module/Profiles.php:738 msgid "Religious views" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:738 +#: ../../Zotlabs/Module/Profiles.php:739 msgid "Keywords used in directory listings" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:738 +#: ../../Zotlabs/Module/Profiles.php:739 msgid "Example: fishing photography software" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:741 +#: ../../Zotlabs/Module/Profiles.php:742 msgid "Musical interests" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:742 +#: ../../Zotlabs/Module/Profiles.php:743 msgid "Books, literature" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:743 +#: ../../Zotlabs/Module/Profiles.php:744 msgid "Television" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:744 +#: ../../Zotlabs/Module/Profiles.php:745 msgid "Film/Dance/Culture/Entertainment" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:745 +#: ../../Zotlabs/Module/Profiles.php:746 msgid "Hobbies/Interests" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:746 +#: ../../Zotlabs/Module/Profiles.php:747 msgid "Love/Romance" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:748 +#: ../../Zotlabs/Module/Profiles.php:749 msgid "School/Education" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:749 +#: ../../Zotlabs/Module/Profiles.php:750 msgid "Contact information and social networks" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:750 +#: ../../Zotlabs/Module/Profiles.php:751 msgid "My other channels" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:770 ../../include/identity.php:948 +#: ../../Zotlabs/Module/Profiles.php:771 ../../include/identity.php:948 msgid "Profile Image" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:780 ../../include/identity.php:930 +#: ../../Zotlabs/Module/Profiles.php:781 ../../include/identity.php:930 #: ../../include/nav.php:88 msgid "Edit Profiles" msgstr "" @@ -4820,8 +4805,8 @@ msgstr "" msgid "Membership on this site is by invitation only." msgstr "" -#: ../../Zotlabs/Module/Register.php:262 ../../include/nav.php:148 -#: ../../boot.php:1584 +#: ../../Zotlabs/Module/Register.php:262 ../../include/nav.php:147 +#: ../../boot.php:1597 msgid "Register" msgstr "" @@ -6124,8 +6109,8 @@ msgstr "" msgid "post" msgstr "" -#: ../../Zotlabs/Module/Tagger.php:57 ../../include/conversation.php:150 -#: ../../include/text.php:1975 +#: ../../Zotlabs/Module/Tagger.php:57 ../../include/text.php:1948 +#: ../../include/conversation.php:150 msgid "comment" msgstr "" @@ -6727,15 +6712,15 @@ msgstr "" msgid "Account verified. Please login." msgstr "" -#: ../../include/account.php:719 ../../include/account.php:721 +#: ../../include/account.php:722 ../../include/account.php:724 msgid "Click here to upgrade." msgstr "" -#: ../../include/account.php:727 +#: ../../include/account.php:730 msgid "This action exceeds the limits set by your subscription plan." msgstr "" -#: ../../include/account.php:732 +#: ../../include/account.php:735 msgid "This action is not available under your subscription plan." msgstr "" @@ -7011,8 +6996,326 @@ msgstr "" msgid "%1$s has an updated %2$s, changing %3$s." msgstr "" -#: ../../include/api.php:1338 -msgid "Public Timeline" +#: ../../include/text.php:394 +msgid "prev" +msgstr "" + +#: ../../include/text.php:396 +msgid "first" +msgstr "" + +#: ../../include/text.php:425 +msgid "last" +msgstr "" + +#: ../../include/text.php:428 +msgid "next" +msgstr "" + +#: ../../include/text.php:438 +msgid "older" +msgstr "" + +#: ../../include/text.php:440 +msgid "newer" +msgstr "" + +#: ../../include/text.php:822 +msgid "No connections" +msgstr "" + +#: ../../include/text.php:847 +#, php-format +msgid "View all %s connections" +msgstr "" + +#: ../../include/text.php:992 ../../include/text.php:997 +msgid "poke" +msgstr "" + +#: ../../include/text.php:992 ../../include/text.php:997 +#: ../../include/conversation.php:243 +msgid "poked" +msgstr "" + +#: ../../include/text.php:998 +msgid "ping" +msgstr "" + +#: ../../include/text.php:998 +msgid "pinged" +msgstr "" + +#: ../../include/text.php:999 +msgid "prod" +msgstr "" + +#: ../../include/text.php:999 +msgid "prodded" +msgstr "" + +#: ../../include/text.php:1000 +msgid "slap" +msgstr "" + +#: ../../include/text.php:1000 +msgid "slapped" +msgstr "" + +#: ../../include/text.php:1001 +msgid "finger" +msgstr "" + +#: ../../include/text.php:1001 +msgid "fingered" +msgstr "" + +#: ../../include/text.php:1002 +msgid "rebuff" +msgstr "" + +#: ../../include/text.php:1002 +msgid "rebuffed" +msgstr "" + +#: ../../include/text.php:1014 +msgid "happy" +msgstr "" + +#: ../../include/text.php:1015 +msgid "sad" +msgstr "" + +#: ../../include/text.php:1016 +msgid "mellow" +msgstr "" + +#: ../../include/text.php:1017 +msgid "tired" +msgstr "" + +#: ../../include/text.php:1018 +msgid "perky" +msgstr "" + +#: ../../include/text.php:1019 +msgid "angry" +msgstr "" + +#: ../../include/text.php:1020 +msgid "stupefied" +msgstr "" + +#: ../../include/text.php:1021 +msgid "puzzled" +msgstr "" + +#: ../../include/text.php:1022 +msgid "interested" +msgstr "" + +#: ../../include/text.php:1023 +msgid "bitter" +msgstr "" + +#: ../../include/text.php:1024 +msgid "cheerful" +msgstr "" + +#: ../../include/text.php:1025 +msgid "alive" +msgstr "" + +#: ../../include/text.php:1026 +msgid "annoyed" +msgstr "" + +#: ../../include/text.php:1027 +msgid "anxious" +msgstr "" + +#: ../../include/text.php:1028 +msgid "cranky" +msgstr "" + +#: ../../include/text.php:1029 +msgid "disturbed" +msgstr "" + +#: ../../include/text.php:1030 +msgid "frustrated" +msgstr "" + +#: ../../include/text.php:1031 +msgid "depressed" +msgstr "" + +#: ../../include/text.php:1032 +msgid "motivated" +msgstr "" + +#: ../../include/text.php:1033 +msgid "relaxed" +msgstr "" + +#: ../../include/text.php:1034 +msgid "surprised" +msgstr "" + +#: ../../include/text.php:1206 ../../include/js_strings.php:70 +msgid "Monday" +msgstr "" + +#: ../../include/text.php:1206 ../../include/js_strings.php:71 +msgid "Tuesday" +msgstr "" + +#: ../../include/text.php:1206 ../../include/js_strings.php:72 +msgid "Wednesday" +msgstr "" + +#: ../../include/text.php:1206 ../../include/js_strings.php:73 +msgid "Thursday" +msgstr "" + +#: ../../include/text.php:1206 ../../include/js_strings.php:74 +msgid "Friday" +msgstr "" + +#: ../../include/text.php:1206 ../../include/js_strings.php:75 +msgid "Saturday" +msgstr "" + +#: ../../include/text.php:1206 ../../include/js_strings.php:69 +msgid "Sunday" +msgstr "" + +#: ../../include/text.php:1210 ../../include/js_strings.php:45 +msgid "January" +msgstr "" + +#: ../../include/text.php:1210 ../../include/js_strings.php:46 +msgid "February" +msgstr "" + +#: ../../include/text.php:1210 ../../include/js_strings.php:47 +msgid "March" +msgstr "" + +#: ../../include/text.php:1210 ../../include/js_strings.php:48 +msgid "April" +msgstr "" + +#: ../../include/text.php:1210 +msgid "May" +msgstr "" + +#: ../../include/text.php:1210 ../../include/js_strings.php:50 +msgid "June" +msgstr "" + +#: ../../include/text.php:1210 ../../include/js_strings.php:51 +msgid "July" +msgstr "" + +#: ../../include/text.php:1210 ../../include/js_strings.php:52 +msgid "August" +msgstr "" + +#: ../../include/text.php:1210 ../../include/js_strings.php:53 +msgid "September" +msgstr "" + +#: ../../include/text.php:1210 ../../include/js_strings.php:54 +msgid "October" +msgstr "" + +#: ../../include/text.php:1210 ../../include/js_strings.php:55 +msgid "November" +msgstr "" + +#: ../../include/text.php:1210 ../../include/js_strings.php:56 +msgid "December" +msgstr "" + +#: ../../include/text.php:1287 ../../include/text.php:1291 +msgid "Unknown Attachment" +msgstr "" + +#: ../../include/text.php:1293 +msgid "unknown" +msgstr "" + +#: ../../include/text.php:1329 +msgid "remove category" +msgstr "" + +#: ../../include/text.php:1406 +msgid "remove from file" +msgstr "" + +#: ../../include/text.php:1437 ../../include/bb2diaspora.php:487 +#: ../../include/event.php:22 +msgid "l F d, Y \\@ g:i A" +msgstr "" + +#: ../../include/text.php:1441 ../../include/bb2diaspora.php:493 +#: ../../include/event.php:30 +msgid "Starts:" +msgstr "" + +#: ../../include/text.php:1445 ../../include/bb2diaspora.php:501 +#: ../../include/event.php:40 +msgid "Finishes:" +msgstr "" + +#: ../../include/text.php:1735 ../../include/text.php:1807 +msgid "default" +msgstr "" + +#: ../../include/text.php:1743 +msgid "Page layout" +msgstr "" + +#: ../../include/text.php:1743 +msgid "You can create your own with the layouts tool" +msgstr "" + +#: ../../include/text.php:1785 +msgid "Page content type" +msgstr "" + +#: ../../include/text.php:1819 +msgid "Select an alternate language" +msgstr "" + +#: ../../include/text.php:1953 +msgid "activity" +msgstr "" + +#: ../../include/text.php:2248 +msgid "Design Tools" +msgstr "" + +#: ../../include/text.php:2254 +msgid "Pages" +msgstr "" + +#: ../../include/zot.php:680 +msgid "Invalid data packet" +msgstr "" + +#: ../../include/zot.php:696 +msgid "Unable to verify channel signature" +msgstr "" + +#: ../../include/zot.php:2332 +#, php-format +msgid "Unable to verify site signature for %s" +msgstr "" + +#: ../../include/zot.php:3670 +msgid "invalid target signature" msgstr "" #: ../../include/apps.php:128 @@ -7028,28 +7331,28 @@ msgstr "" msgid "Address Book" msgstr "" -#: ../../include/apps.php:131 ../../include/nav.php:110 ../../boot.php:1602 +#: ../../include/apps.php:131 ../../include/nav.php:110 ../../boot.php:1615 msgid "Login" msgstr "" -#: ../../include/apps.php:133 ../../include/nav.php:182 +#: ../../include/apps.php:133 ../../include/nav.php:179 msgid "Grid" msgstr "" -#: ../../include/apps.php:137 ../../include/nav.php:185 +#: ../../include/apps.php:137 ../../include/nav.php:182 msgid "Channel Home" msgstr "" #: ../../include/apps.php:140 ../../include/conversation.php:1667 -#: ../../include/conversation.php:1670 ../../include/nav.php:204 +#: ../../include/conversation.php:1670 ../../include/nav.php:201 msgid "Events" msgstr "" -#: ../../include/apps.php:141 ../../include/nav.php:170 +#: ../../include/apps.php:141 ../../include/nav.php:167 msgid "Directory" msgstr "" -#: ../../include/apps.php:143 ../../include/nav.php:196 +#: ../../include/apps.php:143 ../../include/nav.php:193 msgid "Mail" msgstr "" @@ -7089,97 +7392,23 @@ msgstr "" msgid "Purchase" msgstr "" -#: ../../include/network.php:659 -msgid "view full size" -msgstr "" - -#: ../../include/network.php:1827 ../../include/enotify.php:57 -msgid "$Projectname Notification" -msgstr "" - -#: ../../include/network.php:1828 ../../include/enotify.php:58 -msgid "$projectname" -msgstr "" - -#: ../../include/network.php:1830 ../../include/enotify.php:60 -msgid "Thank You," -msgstr "" - -#: ../../include/network.php:1832 ../../include/enotify.php:62 -#, php-format -msgid "%s Administrator" +#: ../../include/import.php:23 +msgid "" +"Cannot create a duplicate channel identifier on this system. Import failed." msgstr "" -#: ../../include/network.php:1889 -msgid "No Subject" +#: ../../include/import.php:70 +msgid "Channel clone failed. Import failed." msgstr "" #: ../../include/bb2diaspora.php:398 msgid "Attachments:" msgstr "" -#: ../../include/bb2diaspora.php:487 ../../include/event.php:22 -#: ../../include/text.php:1437 -msgid "l F d, Y \\@ g:i A" -msgstr "" - #: ../../include/bb2diaspora.php:489 msgid "$Projectname event notification:" msgstr "" -#: ../../include/bb2diaspora.php:493 ../../include/event.php:30 -#: ../../include/text.php:1441 -msgid "Starts:" -msgstr "" - -#: ../../include/bb2diaspora.php:501 ../../include/event.php:40 -#: ../../include/text.php:1445 -msgid "Finishes:" -msgstr "" - -#: ../../include/bbcode.php:123 ../../include/bbcode.php:801 -#: ../../include/bbcode.php:804 ../../include/bbcode.php:809 -#: ../../include/bbcode.php:812 ../../include/bbcode.php:815 -#: ../../include/bbcode.php:818 ../../include/bbcode.php:823 -#: ../../include/bbcode.php:826 ../../include/bbcode.php:831 -#: ../../include/bbcode.php:834 ../../include/bbcode.php:837 -#: ../../include/bbcode.php:840 -msgid "Image/photo" -msgstr "" - -#: ../../include/bbcode.php:162 ../../include/bbcode.php:851 -msgid "Encrypted content" -msgstr "" - -#: ../../include/bbcode.php:179 -#, php-format -msgid "Install %s element: " -msgstr "" - -#: ../../include/bbcode.php:183 -#, php-format -msgid "" -"This post contains an installable %s element, however you lack permissions " -"to install it on this site." -msgstr "" - -#: ../../include/bbcode.php:255 -#, php-format -msgid "%1$s wrote the following %2$s %3$s" -msgstr "" - -#: ../../include/bbcode.php:545 -msgid "Different viewers will see this text differently" -msgstr "" - -#: ../../include/bbcode.php:762 -msgid "$1 spoiler" -msgstr "" - -#: ../../include/bbcode.php:789 -msgid "$1 wrote:" -msgstr "" - #: ../../include/conversation.php:204 #, php-format msgid "%1$s is now connected with %2$s" @@ -7190,11 +7419,6 @@ msgstr "" msgid "%1$s poked %2$s" msgstr "" -#: ../../include/conversation.php:243 ../../include/text.php:992 -#: ../../include/text.php:997 -msgid "poked" -msgstr "" - #: ../../include/conversation.php:691 #, php-format msgid "View %s's profile @ %s" @@ -7216,7 +7440,7 @@ msgstr "" msgid "remove" msgstr "" -#: ../../include/conversation.php:854 ../../include/nav.php:256 +#: ../../include/conversation.php:854 ../../include/nav.php:247 msgid "Loading..." msgstr "" @@ -7540,6 +7764,10 @@ msgid "" "form has been opened for too long (>3 hours) before submitting it." msgstr "" +#: ../../include/api.php:1338 +msgid "Public Timeline" +msgstr "" + #: ../../include/contact_selectors.php:56 msgid "Frequently" msgstr "" @@ -7740,7 +7968,7 @@ msgstr "" msgid "YYYY-MM-DD or MM-DD" msgstr "" -#: ../../include/datetime.php:273 ../../boot.php:2432 +#: ../../include/datetime.php:273 ../../boot.php:2445 msgid "never" msgstr "" @@ -7829,6 +8057,23 @@ msgstr "" msgid "This Website Only" msgstr "" +#: ../../include/enotify.php:57 ../../include/network.php:1827 +msgid "$Projectname Notification" +msgstr "" + +#: ../../include/enotify.php:58 ../../include/network.php:1828 +msgid "$projectname" +msgstr "" + +#: ../../include/enotify.php:60 ../../include/network.php:1830 +msgid "Thank You," +msgstr "" + +#: ../../include/enotify.php:62 ../../include/network.php:1832 +#, php-format +msgid "%s Administrator" +msgstr "" + #: ../../include/enotify.php:96 #, php-format msgid "%s <!item_type!>" @@ -8373,6 +8618,53 @@ msgstr "" msgid "add" msgstr "" +#: ../../include/bbcode.php:123 ../../include/bbcode.php:813 +#: ../../include/bbcode.php:816 ../../include/bbcode.php:821 +#: ../../include/bbcode.php:824 ../../include/bbcode.php:827 +#: ../../include/bbcode.php:830 ../../include/bbcode.php:835 +#: ../../include/bbcode.php:838 ../../include/bbcode.php:843 +#: ../../include/bbcode.php:846 ../../include/bbcode.php:849 +#: ../../include/bbcode.php:852 +msgid "Image/photo" +msgstr "" + +#: ../../include/bbcode.php:162 ../../include/bbcode.php:863 +msgid "Encrypted content" +msgstr "" + +#: ../../include/bbcode.php:179 +#, php-format +msgid "Install %s element: " +msgstr "" + +#: ../../include/bbcode.php:183 +#, php-format +msgid "" +"This post contains an installable %s element, however you lack permissions " +"to install it on this site." +msgstr "" + +#: ../../include/bbcode.php:255 +#, php-format +msgid "%1$s wrote the following %2$s %3$s" +msgstr "" + +#: ../../include/bbcode.php:333 ../../include/bbcode.php:341 +msgid "Click to open/close" +msgstr "" + +#: ../../include/bbcode.php:341 +msgid "spoiler" +msgstr "" + +#: ../../include/bbcode.php:556 +msgid "Different viewers will see this text differently" +msgstr "" + +#: ../../include/bbcode.php:801 +msgid "$1 wrote:" +msgstr "" + #: ../../include/items.php:1138 ../../include/items.php:1183 msgid "(Unknown)" msgstr "" @@ -8427,31 +8719,12 @@ msgstr "" msgid "profile photo" msgstr "" -#: ../../include/photos.php:112 -#, php-format -msgid "Image exceeds website size limit of %lu bytes" -msgstr "" - -#: ../../include/photos.php:119 -msgid "Image file is empty." -msgstr "" - -#: ../../include/photos.php:257 -msgid "Photo storage failed." -msgstr "" - -#: ../../include/photos.php:297 -msgid "a new photo" -msgstr "" - -#: ../../include/photos.php:301 -#, php-format -msgctxt "photo_upload" -msgid "%1$s posted %2$s to %3$s" +#: ../../include/network.php:659 +msgid "view full size" msgstr "" -#: ../../include/photos.php:510 -msgid "Upload New Photos" +#: ../../include/network.php:1889 +msgid "No Subject" msgstr "" #: ../../include/widgets.php:103 @@ -8551,15 +8824,15 @@ msgstr "" msgid "Combined View" msgstr "" -#: ../../include/widgets.php:609 ../../include/nav.php:199 +#: ../../include/widgets.php:609 ../../include/nav.php:196 msgid "Inbox" msgstr "" -#: ../../include/widgets.php:614 ../../include/nav.php:200 +#: ../../include/widgets.php:614 ../../include/nav.php:197 msgid "Outbox" msgstr "" -#: ../../include/widgets.php:619 ../../include/nav.php:201 +#: ../../include/widgets.php:619 ../../include/nav.php:198 msgid "New Message" msgstr "" @@ -8691,7 +8964,7 @@ msgstr "" msgid "DB updates" msgstr "" -#: ../../include/widgets.php:1368 ../../include/nav.php:219 +#: ../../include/widgets.php:1368 ../../include/nav.php:216 msgid "Admin" msgstr "" @@ -8864,55 +9137,11 @@ msgstr "" msgid "timeago.numbers" msgstr "" -#: ../../include/js_strings.php:45 ../../include/text.php:1210 -msgid "January" -msgstr "" - -#: ../../include/js_strings.php:46 ../../include/text.php:1210 -msgid "February" -msgstr "" - -#: ../../include/js_strings.php:47 ../../include/text.php:1210 -msgid "March" -msgstr "" - -#: ../../include/js_strings.php:48 ../../include/text.php:1210 -msgid "April" -msgstr "" - #: ../../include/js_strings.php:49 msgctxt "long" msgid "May" msgstr "" -#: ../../include/js_strings.php:50 ../../include/text.php:1210 -msgid "June" -msgstr "" - -#: ../../include/js_strings.php:51 ../../include/text.php:1210 -msgid "July" -msgstr "" - -#: ../../include/js_strings.php:52 ../../include/text.php:1210 -msgid "August" -msgstr "" - -#: ../../include/js_strings.php:53 ../../include/text.php:1210 -msgid "September" -msgstr "" - -#: ../../include/js_strings.php:54 ../../include/text.php:1210 -msgid "October" -msgstr "" - -#: ../../include/js_strings.php:55 ../../include/text.php:1210 -msgid "November" -msgstr "" - -#: ../../include/js_strings.php:56 ../../include/text.php:1210 -msgid "December" -msgstr "" - #: ../../include/js_strings.php:57 msgid "Jan" msgstr "" @@ -8962,34 +9191,6 @@ msgstr "" msgid "Dec" msgstr "" -#: ../../include/js_strings.php:69 ../../include/text.php:1206 -msgid "Sunday" -msgstr "" - -#: ../../include/js_strings.php:70 ../../include/text.php:1206 -msgid "Monday" -msgstr "" - -#: ../../include/js_strings.php:71 ../../include/text.php:1206 -msgid "Tuesday" -msgstr "" - -#: ../../include/js_strings.php:72 ../../include/text.php:1206 -msgid "Wednesday" -msgstr "" - -#: ../../include/js_strings.php:73 ../../include/text.php:1206 -msgid "Thursday" -msgstr "" - -#: ../../include/js_strings.php:74 ../../include/text.php:1206 -msgid "Friday" -msgstr "" - -#: ../../include/js_strings.php:75 ../../include/text.php:1206 -msgid "Saturday" -msgstr "" - #: ../../include/js_strings.php:76 msgid "Sun" msgstr "" @@ -9059,13 +9260,165 @@ msgstr "" msgid "Stored post could not be verified." msgstr "" -#: ../../include/import.php:23 -msgid "" -"Cannot create a duplicate channel identifier on this system. Import failed." +#: ../../include/nav.php:82 ../../include/nav.php:113 ../../boot.php:1614 +msgid "Logout" msgstr "" -#: ../../include/import.php:70 -msgid "Channel clone failed. Import failed." +#: ../../include/nav.php:82 ../../include/nav.php:113 +msgid "End this session" +msgstr "" + +#: ../../include/nav.php:85 ../../include/nav.php:144 +msgid "Home" +msgstr "" + +#: ../../include/nav.php:85 +msgid "Your posts and conversations" +msgstr "" + +#: ../../include/nav.php:86 +msgid "Your profile page" +msgstr "" + +#: ../../include/nav.php:88 +msgid "Manage/Edit profiles" +msgstr "" + +#: ../../include/nav.php:90 +msgid "Edit your profile" +msgstr "" + +#: ../../include/nav.php:92 +msgid "Your photos" +msgstr "" + +#: ../../include/nav.php:93 +msgid "Your files" +msgstr "" + +#: ../../include/nav.php:96 +msgid "Your chatrooms" +msgstr "" + +#: ../../include/nav.php:102 +msgid "Your bookmarks" +msgstr "" + +#: ../../include/nav.php:106 +msgid "Your webpages" +msgstr "" + +#: ../../include/nav.php:110 +msgid "Sign in" +msgstr "" + +#: ../../include/nav.php:127 +#, php-format +msgid "%s - click to logout" +msgstr "" + +#: ../../include/nav.php:130 +msgid "Remote authentication" +msgstr "" + +#: ../../include/nav.php:130 +msgid "Click to authenticate to your home hub" +msgstr "" + +#: ../../include/nav.php:144 +msgid "Home Page" +msgstr "" + +#: ../../include/nav.php:147 +msgid "Create an account" +msgstr "" + +#: ../../include/nav.php:159 +msgid "Help and documentation" +msgstr "" + +#: ../../include/nav.php:163 +msgid "Applications, utilities, links, games" +msgstr "" + +#: ../../include/nav.php:165 +msgid "Search site @name, #tag, ?docs, content" +msgstr "" + +#: ../../include/nav.php:167 +msgid "Channel Directory" +msgstr "" + +#: ../../include/nav.php:179 +msgid "Your grid" +msgstr "" + +#: ../../include/nav.php:180 +msgid "Mark all grid notifications seen" +msgstr "" + +#: ../../include/nav.php:182 +msgid "Channel home" +msgstr "" + +#: ../../include/nav.php:183 +msgid "Mark all channel notifications seen" +msgstr "" + +#: ../../include/nav.php:189 +msgid "Notices" +msgstr "" + +#: ../../include/nav.php:189 +msgid "Notifications" +msgstr "" + +#: ../../include/nav.php:190 +msgid "See all notifications" +msgstr "" + +#: ../../include/nav.php:193 +msgid "Private mail" +msgstr "" + +#: ../../include/nav.php:194 +msgid "See all private messages" +msgstr "" + +#: ../../include/nav.php:195 +msgid "Mark all private messages seen" +msgstr "" + +#: ../../include/nav.php:201 +msgid "Event Calendar" +msgstr "" + +#: ../../include/nav.php:202 +msgid "See all events" +msgstr "" + +#: ../../include/nav.php:203 +msgid "Mark all events seen" +msgstr "" + +#: ../../include/nav.php:206 +msgid "Manage Your Channels" +msgstr "" + +#: ../../include/nav.php:208 +msgid "Account/Channel Settings" +msgstr "" + +#: ../../include/nav.php:216 +msgid "Site Setup and Configuration" +msgstr "" + +#: ../../include/nav.php:252 +msgid "@name, #tag, ?doc, content" +msgstr "" + +#: ../../include/nav.php:253 +msgid "Please wait..." msgstr "" #: ../../include/oembed.php:267 @@ -9224,399 +9577,31 @@ msgstr "" msgid "Custom/Expert Mode" msgstr "" -#: ../../include/text.php:394 -msgid "prev" -msgstr "" - -#: ../../include/text.php:396 -msgid "first" -msgstr "" - -#: ../../include/text.php:425 -msgid "last" -msgstr "" - -#: ../../include/text.php:428 -msgid "next" -msgstr "" - -#: ../../include/text.php:438 -msgid "older" -msgstr "" - -#: ../../include/text.php:440 -msgid "newer" -msgstr "" - -#: ../../include/text.php:822 -msgid "No connections" -msgstr "" - -#: ../../include/text.php:847 -#, php-format -msgid "View all %s connections" -msgstr "" - -#: ../../include/text.php:992 ../../include/text.php:997 -msgid "poke" -msgstr "" - -#: ../../include/text.php:998 -msgid "ping" -msgstr "" - -#: ../../include/text.php:998 -msgid "pinged" -msgstr "" - -#: ../../include/text.php:999 -msgid "prod" -msgstr "" - -#: ../../include/text.php:999 -msgid "prodded" -msgstr "" - -#: ../../include/text.php:1000 -msgid "slap" -msgstr "" - -#: ../../include/text.php:1000 -msgid "slapped" -msgstr "" - -#: ../../include/text.php:1001 -msgid "finger" -msgstr "" - -#: ../../include/text.php:1001 -msgid "fingered" -msgstr "" - -#: ../../include/text.php:1002 -msgid "rebuff" -msgstr "" - -#: ../../include/text.php:1002 -msgid "rebuffed" -msgstr "" - -#: ../../include/text.php:1014 -msgid "happy" -msgstr "" - -#: ../../include/text.php:1015 -msgid "sad" -msgstr "" - -#: ../../include/text.php:1016 -msgid "mellow" -msgstr "" - -#: ../../include/text.php:1017 -msgid "tired" -msgstr "" - -#: ../../include/text.php:1018 -msgid "perky" -msgstr "" - -#: ../../include/text.php:1019 -msgid "angry" -msgstr "" - -#: ../../include/text.php:1020 -msgid "stupefied" -msgstr "" - -#: ../../include/text.php:1021 -msgid "puzzled" -msgstr "" - -#: ../../include/text.php:1022 -msgid "interested" -msgstr "" - -#: ../../include/text.php:1023 -msgid "bitter" -msgstr "" - -#: ../../include/text.php:1024 -msgid "cheerful" -msgstr "" - -#: ../../include/text.php:1025 -msgid "alive" -msgstr "" - -#: ../../include/text.php:1026 -msgid "annoyed" -msgstr "" - -#: ../../include/text.php:1027 -msgid "anxious" -msgstr "" - -#: ../../include/text.php:1028 -msgid "cranky" -msgstr "" - -#: ../../include/text.php:1029 -msgid "disturbed" -msgstr "" - -#: ../../include/text.php:1030 -msgid "frustrated" -msgstr "" - -#: ../../include/text.php:1031 -msgid "depressed" -msgstr "" - -#: ../../include/text.php:1032 -msgid "motivated" -msgstr "" - -#: ../../include/text.php:1033 -msgid "relaxed" -msgstr "" - -#: ../../include/text.php:1034 -msgid "surprised" -msgstr "" - -#: ../../include/text.php:1210 -msgid "May" -msgstr "" - -#: ../../include/text.php:1287 ../../include/text.php:1291 -msgid "Unknown Attachment" -msgstr "" - -#: ../../include/text.php:1293 -msgid "unknown" -msgstr "" - -#: ../../include/text.php:1329 -msgid "remove category" -msgstr "" - -#: ../../include/text.php:1406 -msgid "remove from file" -msgstr "" - -#: ../../include/text.php:1548 ../../include/text.php:1559 -msgid "Click to open/close" -msgstr "" - -#: ../../include/text.php:1764 ../../include/text.php:1836 -msgid "default" -msgstr "" - -#: ../../include/text.php:1772 -msgid "Page layout" -msgstr "" - -#: ../../include/text.php:1772 -msgid "You can create your own with the layouts tool" -msgstr "" - -#: ../../include/text.php:1814 -msgid "Page content type" -msgstr "" - -#: ../../include/text.php:1848 -msgid "Select an alternate language" -msgstr "" - -#: ../../include/text.php:1980 -msgid "activity" -msgstr "" - -#: ../../include/text.php:2275 -msgid "Design Tools" -msgstr "" - -#: ../../include/text.php:2281 -msgid "Pages" -msgstr "" - -#: ../../include/nav.php:82 ../../include/nav.php:113 ../../boot.php:1601 -msgid "Logout" -msgstr "" - -#: ../../include/nav.php:82 ../../include/nav.php:113 -msgid "End this session" -msgstr "" - -#: ../../include/nav.php:85 ../../include/nav.php:144 -msgid "Home" -msgstr "" - -#: ../../include/nav.php:85 -msgid "Your posts and conversations" -msgstr "" - -#: ../../include/nav.php:86 -msgid "Your profile page" -msgstr "" - -#: ../../include/nav.php:88 -msgid "Manage/Edit profiles" -msgstr "" - -#: ../../include/nav.php:90 -msgid "Edit your profile" -msgstr "" - -#: ../../include/nav.php:92 -msgid "Your photos" -msgstr "" - -#: ../../include/nav.php:93 -msgid "Your files" -msgstr "" - -#: ../../include/nav.php:96 -msgid "Your chatrooms" -msgstr "" - -#: ../../include/nav.php:102 -msgid "Your bookmarks" -msgstr "" - -#: ../../include/nav.php:106 -msgid "Your webpages" -msgstr "" - -#: ../../include/nav.php:110 -msgid "Sign in" -msgstr "" - -#: ../../include/nav.php:127 +#: ../../include/photos.php:112 #, php-format -msgid "%s - click to logout" -msgstr "" - -#: ../../include/nav.php:130 -msgid "Remote authentication" -msgstr "" - -#: ../../include/nav.php:130 -msgid "Click to authenticate to your home hub" -msgstr "" - -#: ../../include/nav.php:144 -msgid "Home Page" -msgstr "" - -#: ../../include/nav.php:148 -msgid "Create an account" -msgstr "" - -#: ../../include/nav.php:161 -msgid "Help and documentation" -msgstr "" - -#: ../../include/nav.php:165 -msgid "Applications, utilities, links, games" -msgstr "" - -#: ../../include/nav.php:167 -msgid "Search site @name, #tag, ?docs, content" -msgstr "" - -#: ../../include/nav.php:170 -msgid "Channel Directory" -msgstr "" - -#: ../../include/nav.php:182 -msgid "Your grid" -msgstr "" - -#: ../../include/nav.php:183 -msgid "Mark all grid notifications seen" -msgstr "" - -#: ../../include/nav.php:185 -msgid "Channel home" -msgstr "" - -#: ../../include/nav.php:186 -msgid "Mark all channel notifications seen" -msgstr "" - -#: ../../include/nav.php:192 -msgid "Notices" -msgstr "" - -#: ../../include/nav.php:192 -msgid "Notifications" -msgstr "" - -#: ../../include/nav.php:193 -msgid "See all notifications" -msgstr "" - -#: ../../include/nav.php:196 -msgid "Private mail" -msgstr "" - -#: ../../include/nav.php:197 -msgid "See all private messages" -msgstr "" - -#: ../../include/nav.php:198 -msgid "Mark all private messages seen" -msgstr "" - -#: ../../include/nav.php:204 -msgid "Event Calendar" -msgstr "" - -#: ../../include/nav.php:205 -msgid "See all events" -msgstr "" - -#: ../../include/nav.php:206 -msgid "Mark all events seen" -msgstr "" - -#: ../../include/nav.php:209 -msgid "Manage Your Channels" -msgstr "" - -#: ../../include/nav.php:211 -msgid "Account/Channel Settings" -msgstr "" - -#: ../../include/nav.php:219 -msgid "Site Setup and Configuration" -msgstr "" - -#: ../../include/nav.php:261 -msgid "@name, #tag, ?doc, content" +msgid "Image exceeds website size limit of %lu bytes" msgstr "" -#: ../../include/nav.php:262 -msgid "Please wait..." +#: ../../include/photos.php:119 +msgid "Image file is empty." msgstr "" -#: ../../include/zot.php:680 -msgid "Invalid data packet" +#: ../../include/photos.php:257 +msgid "Photo storage failed." msgstr "" -#: ../../include/zot.php:696 -msgid "Unable to verify channel signature" +#: ../../include/photos.php:297 +msgid "a new photo" msgstr "" -#: ../../include/zot.php:2332 +#: ../../include/photos.php:301 #, php-format -msgid "Unable to verify site signature for %s" +msgctxt "photo_upload" +msgid "%1$s posted %2$s to %3$s" msgstr "" -#: ../../include/zot.php:3670 -msgid "invalid target signature" +#: ../../include/photos.php:510 +msgid "Upload New Photos" msgstr "" #: ../../view/theme/redbasic/php/config.php:82 @@ -9776,41 +9761,41 @@ msgstr "" msgid "Update Error at %s" msgstr "" -#: ../../boot.php:1583 +#: ../../boot.php:1596 msgid "" "Create an account to access services and applications within the Hubzilla" msgstr "" -#: ../../boot.php:1605 +#: ../../boot.php:1618 msgid "Password" msgstr "" -#: ../../boot.php:1606 +#: ../../boot.php:1619 msgid "Remember me" msgstr "" -#: ../../boot.php:1609 +#: ../../boot.php:1622 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:2238 +#: ../../boot.php:2251 msgid "toggle mobile" msgstr "" -#: ../../boot.php:2391 +#: ../../boot.php:2404 msgid "Website SSL certificate is not valid. Please correct." msgstr "" -#: ../../boot.php:2394 +#: ../../boot.php:2407 #, php-format msgid "[hubzilla] Website SSL error for %s" msgstr "" -#: ../../boot.php:2431 +#: ../../boot.php:2444 msgid "Cron/Scheduled tasks not running." msgstr "" -#: ../../boot.php:2435 +#: ../../boot.php:2448 #, php-format msgid "[hubzilla] Cron tasks not running on %s" msgstr "" diff --git a/version.inc b/version.inc deleted file mode 100644 index f116462c5..000000000 --- a/version.inc +++ /dev/null @@ -1 +0,0 @@ -2016-04-28.1380H diff --git a/view/css/mod_profile.css b/view/css/mod_profile.css index e1ceae7f7..35016d10b 100644 --- a/view/css/mod_profile.css +++ b/view/css/mod_profile.css @@ -1,16 +1,7 @@ -.aprofile dt { - font-weight: bold; -} - .profile-thing-list { list-style-type: none; } -.profile-thing-list img { - margin-bottom: 5px; +.profile-thing-img { + margin: 7px 0px; } - -.profile-thing-list > li { - margin-bottom: 15px; -} - diff --git a/view/es-es/hmessages.po b/view/es-es/hmessages.po index 0242dbc1a..a77386393 100644 --- a/view/es-es/hmessages.po +++ b/view/es-es/hmessages.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: Redmatrix\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-04-22 00:01-0700\n" -"PO-Revision-Date: 2016-04-22 10:40+0000\n" +"POT-Creation-Date: 2016-04-29 00:01-0700\n" +"PO-Revision-Date: 2016-04-30 09:57+0000\n" "Last-Translator: Manuel Jiménez Friaza <mjfriaza@openmailbox.org>\n" "Language-Team: Spanish (Spain) (http://www.transifex.com/Friendica/red-matrix/language/es_ES/)\n" "MIME-Version: 1.0\n" @@ -27,7 +27,7 @@ msgstr "" msgid "parent" msgstr "padre" -#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2633 +#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2606 msgid "Collection" msgstr "Colección" @@ -52,7 +52,7 @@ msgid "Schedule Outbox" msgstr "Programar bandeja de salida" #: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Module/Photos.php:797 -#: ../../Zotlabs/Module/Photos.php:1241 ../../include/apps.php:360 +#: ../../Zotlabs/Module/Photos.php:1242 ../../include/apps.php:360 #: ../../include/apps.php:415 ../../include/conversation.php:1037 #: ../../include/widgets.php:1457 msgid "Unknown" @@ -81,7 +81,7 @@ msgstr "Crear" #: ../../Zotlabs/Storage/Browser.php:231 ../../Zotlabs/Storage/Browser.php:305 #: ../../Zotlabs/Module/Cover_photo.php:357 -#: ../../Zotlabs/Module/Photos.php:824 ../../Zotlabs/Module/Photos.php:1365 +#: ../../Zotlabs/Module/Photos.php:824 ../../Zotlabs/Module/Photos.php:1366 #: ../../Zotlabs/Module/Profile_photo.php:368 ../../include/widgets.php:1470 msgid "Upload" msgstr "Subir" @@ -129,9 +129,9 @@ msgstr "Editar" #: ../../Zotlabs/Module/Blocks.php:161 #: ../../Zotlabs/Module/Connections.php:263 #: ../../Zotlabs/Module/Connedit.php:573 -#: ../../Zotlabs/Module/Editblock.php:187 +#: ../../Zotlabs/Module/Editblock.php:180 #: ../../Zotlabs/Module/Editlayout.php:184 -#: ../../Zotlabs/Module/Editwebpage.php:228 ../../Zotlabs/Module/Group.php:177 +#: ../../Zotlabs/Module/Editwebpage.php:221 ../../Zotlabs/Module/Group.php:177 #: ../../Zotlabs/Module/Photos.php:1172 ../../Zotlabs/Module/Settings.php:651 #: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Module/Webpages.php:191 #: ../../include/ItemObject.php:120 ../../include/apps.php:260 @@ -378,7 +378,7 @@ msgstr "no soportado" #: ../../Zotlabs/Module/Settings.php:579 ../../include/dir_fns.php:141 #: ../../include/dir_fns.php:142 ../../include/dir_fns.php:143 #: ../../view/theme/redbasic/php/config.php:105 -#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1606 +#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1619 msgid "No" msgstr "No" @@ -398,7 +398,7 @@ msgstr "Sí - con aprobación" #: ../../Zotlabs/Module/Settings.php:579 ../../include/dir_fns.php:141 #: ../../include/dir_fns.php:142 ../../include/dir_fns.php:143 #: ../../view/theme/redbasic/php/config.php:105 -#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1606 +#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1619 msgid "Yes" msgstr "Sí" @@ -429,7 +429,7 @@ msgstr "Sitio" #: ../../Zotlabs/Module/Admin.php:1778 ../../Zotlabs/Module/Appman.php:103 #: ../../Zotlabs/Module/Cal.php:341 ../../Zotlabs/Module/Chat.php:194 #: ../../Zotlabs/Module/Chat.php:236 ../../Zotlabs/Module/Connect.php:97 -#: ../../Zotlabs/Module/Connedit.php:733 ../../Zotlabs/Module/Events.php:472 +#: ../../Zotlabs/Module/Connedit.php:734 ../../Zotlabs/Module/Events.php:472 #: ../../Zotlabs/Module/Events.php:669 #: ../../Zotlabs/Module/Filestorage.php:160 #: ../../Zotlabs/Module/Fsuggest.php:112 ../../Zotlabs/Module/Group.php:85 @@ -835,14 +835,6 @@ msgstr "Un sitio por línea. Dejar en blanco para permitirlo por defecto desde c msgid "Block embedded HTML from these domains" msgstr "Bloquear contenido con HTML incorporado desde estos dominios" -#: ../../Zotlabs/Module/Admin.php:728 -msgid "Cooperative embed security" -msgstr "Seguridad cooperativa incorporada" - -#: ../../Zotlabs/Module/Admin.php:728 -msgid "Enable to share embed security with other compatible sites/hubs" -msgstr "Habilitar la compartición de seguridad incorporada con otros sitios compatibles" - #: ../../Zotlabs/Module/Admin.php:743 msgid "Update has been marked successful" msgstr "La actualización ha sido marcada como exitosa" @@ -962,7 +954,7 @@ msgstr "Fecha de solicitud" #: ../../Zotlabs/Module/Admin.php:997 ../../Zotlabs/Module/Admin.php:1006 #: ../../Zotlabs/Module/Id.php:17 ../../Zotlabs/Module/Id.php:18 -#: ../../include/contact_selectors.php:81 ../../boot.php:1604 +#: ../../include/contact_selectors.php:81 ../../boot.php:1617 msgid "Email" msgstr "Correo electrónico" @@ -1142,7 +1134,7 @@ msgstr "Cambiar" #: ../../Zotlabs/Module/Admin.php:1274 ../../Zotlabs/Module/Admin.php:1496 #: ../../include/apps.php:134 ../../include/widgets.php:589 -#: ../../include/nav.php:211 +#: ../../include/nav.php:208 msgid "Settings" msgstr "Ajustes" @@ -1259,8 +1251,8 @@ msgstr "Información adicional (opcional)" #: ../../Zotlabs/Module/Admin.php:1695 ../../Zotlabs/Module/Admin.php:1715 #: ../../Zotlabs/Module/Filer.php:53 ../../Zotlabs/Module/Rbmark.php:32 -#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/widgets.php:201 -#: ../../include/text.php:905 ../../include/text.php:917 +#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/text.php:905 +#: ../../include/text.php:917 ../../include/widgets.php:201 msgid "Save" msgstr "Guardar" @@ -1344,7 +1336,7 @@ msgstr "Nombre de la aplicación" #: ../../Zotlabs/Module/Appman.php:95 ../../Zotlabs/Module/Appman.php:96 #: ../../Zotlabs/Module/Events.php:448 ../../Zotlabs/Module/Events.php:453 -#: ../../Zotlabs/Module/Profiles.php:712 ../../Zotlabs/Module/Profiles.php:716 +#: ../../Zotlabs/Module/Profiles.php:713 ../../Zotlabs/Module/Profiles.php:717 #: ../../include/datetime.php:246 msgid "Required" msgstr "Obligatorio" @@ -1379,7 +1371,7 @@ msgid "Location (URL) to purchase app" msgstr "Dirección (URL) donde adquirir la aplicación" #: ../../Zotlabs/Module/Apps.php:40 ../../include/widgets.php:102 -#: ../../include/nav.php:165 +#: ../../include/nav.php:163 msgid "Apps" msgstr "Aplicaciones" @@ -1400,7 +1392,7 @@ msgstr "Canal no encontrado." msgid "Block Name" msgstr "Nombre del bloque" -#: ../../Zotlabs/Module/Blocks.php:153 ../../include/text.php:2278 +#: ../../Zotlabs/Module/Blocks.php:153 ../../include/text.php:2251 msgid "Blocks" msgstr "Bloques" @@ -1458,7 +1450,7 @@ msgid "l, F j" msgstr "l j F" #: ../../Zotlabs/Module/Cal.php:311 ../../Zotlabs/Module/Events.php:634 -#: ../../include/text.php:1743 +#: ../../include/text.php:1714 msgid "Link to Source" msgstr "Enlazar con la entrada en su ubicación original" @@ -1552,10 +1544,10 @@ msgstr "Por favor, introduzca la dirección del enlace:" msgid "Encrypt text" msgstr "Cifrar texto" -#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Editblock.php:149 +#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Editblock.php:148 #: ../../Zotlabs/Module/Editlayout.php:147 #: ../../Zotlabs/Module/Editpost.php:126 -#: ../../Zotlabs/Module/Editwebpage.php:189 ../../Zotlabs/Module/Mail.php:253 +#: ../../Zotlabs/Module/Editwebpage.php:188 ../../Zotlabs/Module/Mail.php:253 #: ../../Zotlabs/Module/Mail.php:383 ../../include/conversation.php:1225 msgid "Insert web link" msgstr "Insertar enlace web" @@ -1593,7 +1585,7 @@ msgid "No chatrooms available" msgstr "No hay salas de chat disponibles" #: ../../Zotlabs/Module/Chat.php:250 ../../Zotlabs/Module/Manage.php:141 -#: ../../Zotlabs/Module/Profiles.php:781 +#: ../../Zotlabs/Module/Profiles.php:782 msgid "Create New" msgstr "Crear" @@ -1785,13 +1777,13 @@ msgid "Recent activity" msgstr "Actividad reciente" #: ../../Zotlabs/Module/Connections.php:302 ../../include/text.php:834 -#: ../../include/nav.php:189 +#: ../../include/nav.php:186 msgid "Connections" msgstr "Conexiones" #: ../../Zotlabs/Module/Connections.php:306 ../../Zotlabs/Module/Search.php:44 -#: ../../include/apps.php:147 ../../include/text.php:904 -#: ../../include/text.php:916 ../../include/nav.php:167 +#: ../../include/text.php:904 ../../include/text.php:916 +#: ../../include/apps.php:147 ../../include/nav.php:165 msgid "Search" msgstr "Buscar" @@ -2006,73 +1998,77 @@ msgid "" "connections." msgstr "Los permisos indicados en esta página serán aplicados en todas las nuevas conexiones." -#: ../../Zotlabs/Module/Connedit.php:715 +#: ../../Zotlabs/Module/Connedit.php:714 +msgid "Connection Tools" +msgstr "Gestión de las conexiones" + +#: ../../Zotlabs/Module/Connedit.php:716 msgid "Slide to adjust your degree of friendship" msgstr "Deslizar para ajustar el grado de amistad" -#: ../../Zotlabs/Module/Connedit.php:716 ../../Zotlabs/Module/Rate.php:161 +#: ../../Zotlabs/Module/Connedit.php:717 ../../Zotlabs/Module/Rate.php:161 #: ../../include/js_strings.php:20 msgid "Rating" msgstr "Valoración" -#: ../../Zotlabs/Module/Connedit.php:717 +#: ../../Zotlabs/Module/Connedit.php:718 msgid "Slide to adjust your rating" msgstr "Deslizar para ajustar su valoración" -#: ../../Zotlabs/Module/Connedit.php:718 ../../Zotlabs/Module/Connedit.php:723 +#: ../../Zotlabs/Module/Connedit.php:719 ../../Zotlabs/Module/Connedit.php:724 msgid "Optionally explain your rating" msgstr "Opcionalmente, puede explicar su valoración" -#: ../../Zotlabs/Module/Connedit.php:720 +#: ../../Zotlabs/Module/Connedit.php:721 msgid "Custom Filter" msgstr "Filtro personalizado" -#: ../../Zotlabs/Module/Connedit.php:721 +#: ../../Zotlabs/Module/Connedit.php:722 msgid "Only import posts with this text" msgstr "Importar solo entradas que contengan este texto" -#: ../../Zotlabs/Module/Connedit.php:721 ../../Zotlabs/Module/Connedit.php:722 +#: ../../Zotlabs/Module/Connedit.php:722 ../../Zotlabs/Module/Connedit.php:723 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/Connedit.php:722 +#: ../../Zotlabs/Module/Connedit.php:723 msgid "Do not import posts with this text" msgstr "No importar entradas que contengan este texto" -#: ../../Zotlabs/Module/Connedit.php:724 +#: ../../Zotlabs/Module/Connedit.php:725 msgid "This information is public!" msgstr "¡Esta información es pública!" -#: ../../Zotlabs/Module/Connedit.php:729 +#: ../../Zotlabs/Module/Connedit.php:730 msgid "Connection Pending Approval" msgstr "Conexión pendiente de aprobación" -#: ../../Zotlabs/Module/Connedit.php:732 +#: ../../Zotlabs/Module/Connedit.php:733 msgid "inherited" msgstr "heredado" -#: ../../Zotlabs/Module/Connedit.php:734 +#: ../../Zotlabs/Module/Connedit.php:735 #, 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:736 +#: ../../Zotlabs/Module/Connedit.php:737 msgid "Their Settings" msgstr "Sus ajustes" -#: ../../Zotlabs/Module/Connedit.php:737 +#: ../../Zotlabs/Module/Connedit.php:738 msgid "My Settings" msgstr "Mis ajustes" -#: ../../Zotlabs/Module/Connedit.php:739 +#: ../../Zotlabs/Module/Connedit.php:740 msgid "Individual Permissions" msgstr "Permisos individuales" -#: ../../Zotlabs/Module/Connedit.php:740 +#: ../../Zotlabs/Module/Connedit.php:741 msgid "" "Some permissions may be inherited from your channel's <a " "href=\"settings\"><strong>privacy settings</strong></a>, which have higher " @@ -2080,7 +2076,7 @@ msgid "" " settings here." 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. <strong>No</strong> puede cambiar estos ajustes aquí." -#: ../../Zotlabs/Module/Connedit.php:741 +#: ../../Zotlabs/Module/Connedit.php:742 msgid "" "Some permissions may be inherited from your channel's <a " "href=\"settings\"><strong>privacy settings</strong></a>, which have higher " @@ -2088,7 +2084,7 @@ 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:742 +#: ../../Zotlabs/Module/Connedit.php:743 msgid "Last update:" msgstr "Última actualización:" @@ -2236,8 +2232,8 @@ msgid "Age:" msgstr "Edad:" #: ../../Zotlabs/Module/Directory.php:311 ../../include/identity.php:1022 -#: ../../include/bb2diaspora.php:509 ../../include/event.php:52 -#: ../../include/text.php:1452 +#: ../../include/text.php:1452 ../../include/bb2diaspora.php:509 +#: ../../include/event.php:52 msgid "Location:" msgstr "Ubicación:" @@ -2449,124 +2445,62 @@ msgid "Code" msgstr "Código" #: ../../Zotlabs/Module/Editblock.php:147 -#: ../../Zotlabs/Module/Editlayout.php:145 -#: ../../Zotlabs/Module/Editpost.php:124 -#: ../../Zotlabs/Module/Editwebpage.php:187 -#: ../../include/conversation.php:1221 -msgid "Upload photo" -msgstr "Subir foto" - -#: ../../Zotlabs/Module/Editblock.php:148 #: ../../Zotlabs/Module/Editlayout.php:146 #: ../../Zotlabs/Module/Editpost.php:125 -#: ../../Zotlabs/Module/Editwebpage.php:188 ../../Zotlabs/Module/Mail.php:252 +#: ../../Zotlabs/Module/Editwebpage.php:187 ../../Zotlabs/Module/Mail.php:252 #: ../../Zotlabs/Module/Mail.php:382 ../../include/conversation.php:1223 msgid "Attach file" msgstr "Adjuntar fichero" -#: ../../Zotlabs/Module/Editblock.php:150 -#: ../../Zotlabs/Module/Editlayout.php:148 -#: ../../Zotlabs/Module/Editpost.php:127 -#: ../../Zotlabs/Module/Editwebpage.php:190 -msgid "Insert YouTube video" -msgstr "Insertar vídeo de YouTube" - #: ../../Zotlabs/Module/Editblock.php:151 -#: ../../Zotlabs/Module/Editlayout.php:149 -#: ../../Zotlabs/Module/Editpost.php:128 -#: ../../Zotlabs/Module/Editwebpage.php:191 -msgid "Insert Vorbis [.ogg] video" -msgstr "Insertar vídeo Vorbis [.ogg]" - -#: ../../Zotlabs/Module/Editblock.php:152 -#: ../../Zotlabs/Module/Editlayout.php:150 -#: ../../Zotlabs/Module/Editpost.php:129 -#: ../../Zotlabs/Module/Editwebpage.php:192 -msgid "Insert Vorbis [.ogg] audio" -msgstr "Insertar audio Vorbis [.ogg]" - -#: ../../Zotlabs/Module/Editblock.php:153 -#: ../../Zotlabs/Module/Editlayout.php:151 -#: ../../Zotlabs/Module/Editpost.php:130 -#: ../../Zotlabs/Module/Editwebpage.php:193 -#: ../../include/conversation.php:1231 -msgid "Set your location" -msgstr "Establecer su ubicación" - -#: ../../Zotlabs/Module/Editblock.php:154 -#: ../../Zotlabs/Module/Editlayout.php:152 -#: ../../Zotlabs/Module/Editpost.php:131 -#: ../../Zotlabs/Module/Editwebpage.php:194 -#: ../../include/conversation.php:1236 -msgid "Clear browser location" -msgstr "Eliminar los datos de localización geográfica del navegador" - -#: ../../Zotlabs/Module/Editblock.php:155 -#: ../../Zotlabs/Module/Editlayout.php:153 -#: ../../Zotlabs/Module/Editpost.php:135 -#: ../../Zotlabs/Module/Editwebpage.php:195 -#: ../../Zotlabs/Module/Photos.php:1072 ../../include/ItemObject.php:389 -#: ../../include/conversation.php:740 ../../include/conversation.php:1244 -msgid "Please wait" -msgstr "Espere por favor" - -#: ../../Zotlabs/Module/Editblock.php:156 #: ../../Zotlabs/Module/Editlayout.php:154 #: ../../Zotlabs/Module/Editpost.php:136 -#: ../../Zotlabs/Module/Editwebpage.php:196 +#: ../../Zotlabs/Module/Editwebpage.php:191 #: ../../Zotlabs/Module/Events.php:470 ../../include/conversation.php:1245 msgid "Permission settings" msgstr "Configuración de permisos" -#: ../../Zotlabs/Module/Editblock.php:164 +#: ../../Zotlabs/Module/Editblock.php:159 #: ../../Zotlabs/Module/Editlayout.php:161 #: ../../Zotlabs/Module/Editpost.php:144 -#: ../../Zotlabs/Module/Editwebpage.php:205 +#: ../../Zotlabs/Module/Editwebpage.php:200 #: ../../include/conversation.php:1254 msgid "Public post" msgstr "Entrada pública" -#: ../../Zotlabs/Module/Editblock.php:167 +#: ../../Zotlabs/Module/Editblock.php:162 #: ../../Zotlabs/Module/Editpost.php:147 -#: ../../Zotlabs/Module/Editwebpage.php:210 +#: ../../Zotlabs/Module/Editwebpage.php:205 #: ../../include/conversation.php:1239 msgid "Title (optional)" msgstr "Título (opcional)" -#: ../../Zotlabs/Module/Editblock.php:170 +#: ../../Zotlabs/Module/Editblock.php:165 #: ../../Zotlabs/Module/Editlayout.php:168 #: ../../Zotlabs/Module/Editpost.php:149 -#: ../../Zotlabs/Module/Editwebpage.php:212 +#: ../../Zotlabs/Module/Editwebpage.php:207 #: ../../include/conversation.php:1243 msgid "Categories (optional, comma-separated list)" msgstr "Categorías (opcional, lista separada por comas)" -#: ../../Zotlabs/Module/Editblock.php:171 +#: ../../Zotlabs/Module/Editblock.php:166 #: ../../Zotlabs/Module/Editlayout.php:169 #: ../../Zotlabs/Module/Editpost.php:150 -#: ../../Zotlabs/Module/Editwebpage.php:213 +#: ../../Zotlabs/Module/Editwebpage.php:208 #: ../../include/conversation.php:1256 msgid "Example: bob@example.com, mary@example.com" msgstr "Ejemplo: roberto@ejemplo.com, maría@ejemplo.com" -#: ../../Zotlabs/Module/Editblock.php:176 +#: ../../Zotlabs/Module/Editblock.php:171 #: ../../Zotlabs/Module/Editpost.php:155 -#: ../../Zotlabs/Module/Editwebpage.php:217 +#: ../../Zotlabs/Module/Editwebpage.php:212 #: ../../Zotlabs/Module/Events.php:469 ../../Zotlabs/Module/Photos.php:1092 #: ../../Zotlabs/Module/Webpages.php:196 ../../include/ItemObject.php:712 #: ../../include/conversation.php:1186 ../../include/page_widgets.php:40 msgid "Preview" msgstr "Previsualizar" -#: ../../Zotlabs/Module/Editblock.php:181 -#: ../../Zotlabs/Module/Editlayout.php:178 -#: ../../Zotlabs/Module/Editpost.php:161 -#: ../../Zotlabs/Module/Editwebpage.php:222 ../../Zotlabs/Module/Mail.php:257 -#: ../../Zotlabs/Module/Mail.php:387 ../../include/conversation.php:1269 -msgid "Set expiration date" -msgstr "Configurar fecha de caducidad" - -#: ../../Zotlabs/Module/Editblock.php:186 +#: ../../Zotlabs/Module/Editblock.php:179 msgid "Edit Block" msgstr "Modificar este bloque" @@ -2574,6 +2508,43 @@ msgstr "Modificar este bloque" msgid "Delete layout?" msgstr "¿Borrar la plantilla?" +#: ../../Zotlabs/Module/Editlayout.php:145 +#: ../../Zotlabs/Module/Editpost.php:124 ../../include/conversation.php:1221 +msgid "Upload photo" +msgstr "Subir foto" + +#: ../../Zotlabs/Module/Editlayout.php:148 +#: ../../Zotlabs/Module/Editpost.php:127 +msgid "Insert YouTube video" +msgstr "Insertar vídeo de YouTube" + +#: ../../Zotlabs/Module/Editlayout.php:149 +#: ../../Zotlabs/Module/Editpost.php:128 +msgid "Insert Vorbis [.ogg] video" +msgstr "Insertar vídeo Vorbis [.ogg]" + +#: ../../Zotlabs/Module/Editlayout.php:150 +#: ../../Zotlabs/Module/Editpost.php:129 +msgid "Insert Vorbis [.ogg] audio" +msgstr "Insertar audio Vorbis [.ogg]" + +#: ../../Zotlabs/Module/Editlayout.php:151 +#: ../../Zotlabs/Module/Editpost.php:130 ../../include/conversation.php:1231 +msgid "Set your location" +msgstr "Establecer su ubicación" + +#: ../../Zotlabs/Module/Editlayout.php:152 +#: ../../Zotlabs/Module/Editpost.php:131 ../../include/conversation.php:1236 +msgid "Clear browser location" +msgstr "Eliminar los datos de localización geográfica del navegador" + +#: ../../Zotlabs/Module/Editlayout.php:153 +#: ../../Zotlabs/Module/Editpost.php:135 ../../Zotlabs/Module/Photos.php:1072 +#: ../../include/ItemObject.php:389 ../../include/conversation.php:740 +#: ../../include/conversation.php:1244 +msgid "Please wait" +msgstr "Espere por favor" + #: ../../Zotlabs/Module/Editlayout.php:164 #: ../../Zotlabs/Module/Layouts.php:128 msgid "Layout Description (Optional)" @@ -2584,6 +2555,12 @@ msgstr "Descripción de la plantilla (opcional)" msgid "Layout Name" msgstr "Nombre de la plantilla" +#: ../../Zotlabs/Module/Editlayout.php:178 +#: ../../Zotlabs/Module/Editpost.php:161 ../../Zotlabs/Module/Mail.php:257 +#: ../../Zotlabs/Module/Mail.php:387 ../../include/conversation.php:1269 +msgid "Set expiration date" +msgstr "Configurar fecha de caducidad" + #: ../../Zotlabs/Module/Editlayout.php:183 msgid "Edit Layout" msgstr "Modificar la plantilla" @@ -2628,7 +2605,7 @@ msgstr "¿Eliminar la página web?" msgid "Page link title" msgstr "Título del enlace de la página" -#: ../../Zotlabs/Module/Editwebpage.php:227 +#: ../../Zotlabs/Module/Editwebpage.php:220 msgid "Edit Webpage" msgstr "Editar la página web" @@ -2658,8 +2635,8 @@ msgid "Event not found." msgstr "Evento no encontrado." #: ../../Zotlabs/Module/Events.php:253 ../../Zotlabs/Module/Like.php:373 -#: ../../Zotlabs/Module/Tagger.php:51 ../../include/conversation.php:123 -#: ../../include/event.php:915 ../../include/text.php:1970 +#: ../../Zotlabs/Module/Tagger.php:51 ../../include/text.php:1943 +#: ../../include/conversation.php:123 ../../include/event.php:915 msgid "event" msgstr "evento" @@ -2722,7 +2699,7 @@ msgid "Edit Location" msgstr "Modificar la dirección" #: ../../Zotlabs/Module/Events.php:463 ../../Zotlabs/Module/Locs.php:117 -#: ../../Zotlabs/Module/Profiles.php:476 ../../Zotlabs/Module/Profiles.php:701 +#: ../../Zotlabs/Module/Profiles.php:476 ../../Zotlabs/Module/Profiles.php:702 #: ../../Zotlabs/Module/Pubsites.php:40 ../../include/js_strings.php:25 msgid "Location" msgstr "Ubicación" @@ -2905,7 +2882,7 @@ msgstr "Ayuda:" #: ../../Zotlabs/Module/Help.php:85 ../../Zotlabs/Module/Help.php:90 #: ../../Zotlabs/Module/Layouts.php:181 ../../include/apps.php:142 -#: ../../include/nav.php:161 +#: ../../include/nav.php:159 msgid "Help" msgstr "Ayuda" @@ -2972,7 +2949,7 @@ msgstr "Foto del perfil 128px" msgid "Timezone" msgstr "Huso horario" -#: ../../Zotlabs/Module/Id.php:29 ../../Zotlabs/Module/Profiles.php:734 +#: ../../Zotlabs/Module/Id.php:29 ../../Zotlabs/Module/Profiles.php:735 msgid "Homepage URL" msgstr "Dirección de la página personal" @@ -3250,7 +3227,7 @@ msgstr "Ha alcanzado su límite de %1$.0f entradas en la página principal." msgid "You have reached your limit of %1$.0f webpages." msgstr "Ha alcanzado su límite de %1$.0f páginas web." -#: ../../Zotlabs/Module/Layouts.php:179 ../../include/text.php:2280 +#: ../../Zotlabs/Module/Layouts.php:179 ../../include/text.php:2253 msgid "Layouts" msgstr "Plantillas" @@ -3302,13 +3279,13 @@ msgid "Previous action reversed." msgstr "Acción anterior revocada." #: ../../Zotlabs/Module/Like.php:371 ../../Zotlabs/Module/Subthread.php:87 -#: ../../Zotlabs/Module/Tagger.php:47 ../../include/conversation.php:120 -#: ../../include/text.php:1967 +#: ../../Zotlabs/Module/Tagger.php:47 ../../include/text.php:1940 +#: ../../include/conversation.php:120 msgid "photo" msgstr "foto" #: ../../Zotlabs/Module/Like.php:371 ../../Zotlabs/Module/Subthread.php:87 -#: ../../include/conversation.php:148 ../../include/text.php:1973 +#: ../../include/text.php:1946 ../../include/conversation.php:148 msgid "status" msgstr "el mensaje de estado" @@ -3444,7 +3421,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:90 ../../boot.php:1610 +#: ../../Zotlabs/Module/Lostpass.php:90 ../../boot.php:1623 msgid "Password Reset" msgstr "Restablecer la contraseña" @@ -3591,7 +3568,7 @@ msgid "Create a new channel" msgstr "Crear un nuevo canal" #: ../../Zotlabs/Module/Manage.php:162 ../../include/apps.php:132 -#: ../../include/nav.php:209 +#: ../../include/nav.php:206 msgid "Channel Manager" msgstr "Administración de canales" @@ -3677,7 +3654,7 @@ msgstr "El menú se puede usar para guardar marcadores" msgid "Submit and proceed" msgstr "Enviar y proceder" -#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2279 +#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2252 msgid "Menus" msgstr "Menús" @@ -3969,7 +3946,7 @@ msgstr "No hay más notificaciones del sistema" msgid "System Notifications" msgstr "Notificaciones del sistema" -#: ../../Zotlabs/Module/Notifications.php:103 ../../include/nav.php:194 +#: ../../Zotlabs/Module/Notifications.php:103 ../../include/nav.php:191 msgid "Mark all system notifications seen" msgstr "Marcar todas las notificaciones de sistema como leídas" @@ -4111,8 +4088,8 @@ msgstr "Descripción (opcional):" msgid "Album name could not be decoded" msgstr "El nombre del álbum no ha podido ser descifrado" -#: ../../Zotlabs/Module/Photos.php:742 ../../Zotlabs/Module/Photos.php:1282 -#: ../../Zotlabs/Module/Photos.php:1299 +#: ../../Zotlabs/Module/Photos.php:742 ../../Zotlabs/Module/Photos.php:1283 +#: ../../Zotlabs/Module/Photos.php:1300 msgid "Contact Photos" msgstr "Fotos de contacto" @@ -4124,7 +4101,7 @@ msgstr "Mostrar lo más reciente primero" msgid "Show Oldest First" msgstr "Mostrar lo más antiguo primero" -#: ../../Zotlabs/Module/Photos.php:791 ../../Zotlabs/Module/Photos.php:1332 +#: ../../Zotlabs/Module/Photos.php:791 ../../Zotlabs/Module/Photos.php:1333 #: ../../include/widgets.php:1451 msgid "View Photo" msgstr "Ver foto" @@ -4278,35 +4255,39 @@ msgid_plural "Dislikes" msgstr[0] "No me gusta" msgstr[1] "No me gusta" -#: ../../Zotlabs/Module/Photos.php:1242 +#: ../../Zotlabs/Module/Photos.php:1234 +msgid "Photo Tools" +msgstr "Gestión de las fotos" + +#: ../../Zotlabs/Module/Photos.php:1243 msgid "In This Photo:" msgstr "En esta foto:" -#: ../../Zotlabs/Module/Photos.php:1247 +#: ../../Zotlabs/Module/Photos.php:1248 msgid "Map" msgstr "Mapa" -#: ../../Zotlabs/Module/Photos.php:1255 ../../include/ItemObject.php:378 +#: ../../Zotlabs/Module/Photos.php:1256 ../../include/ItemObject.php:378 msgctxt "noun" msgid "Likes" msgstr "Me gusta" -#: ../../Zotlabs/Module/Photos.php:1256 ../../include/ItemObject.php:379 +#: ../../Zotlabs/Module/Photos.php:1257 ../../include/ItemObject.php:379 msgctxt "noun" msgid "Dislikes" msgstr "No me gusta" -#: ../../Zotlabs/Module/Photos.php:1261 ../../include/ItemObject.php:384 +#: ../../Zotlabs/Module/Photos.php:1262 ../../include/ItemObject.php:384 #: ../../include/acl_selectors.php:252 msgid "Close" msgstr "Cerrar" -#: ../../Zotlabs/Module/Photos.php:1338 +#: ../../Zotlabs/Module/Photos.php:1339 msgid "View Album" msgstr "Ver álbum" -#: ../../Zotlabs/Module/Photos.php:1349 ../../Zotlabs/Module/Photos.php:1362 -#: ../../Zotlabs/Module/Photos.php:1363 +#: ../../Zotlabs/Module/Photos.php:1350 ../../Zotlabs/Module/Photos.php:1363 +#: ../../Zotlabs/Module/Photos.php:1364 msgid "Recent Photos" msgstr "Fotos recientes" @@ -4413,15 +4394,15 @@ msgstr "Estado civil" msgid "Romantic Partner" msgstr "Pareja sentimental" -#: ../../Zotlabs/Module/Profiles.php:434 ../../Zotlabs/Module/Profiles.php:739 +#: ../../Zotlabs/Module/Profiles.php:434 ../../Zotlabs/Module/Profiles.php:740 msgid "Likes" msgstr "Me gusta" -#: ../../Zotlabs/Module/Profiles.php:438 ../../Zotlabs/Module/Profiles.php:740 +#: ../../Zotlabs/Module/Profiles.php:438 ../../Zotlabs/Module/Profiles.php:741 msgid "Dislikes" msgstr "No me gusta" -#: ../../Zotlabs/Module/Profiles.php:442 ../../Zotlabs/Module/Profiles.php:747 +#: ../../Zotlabs/Module/Profiles.php:442 ../../Zotlabs/Module/Profiles.php:748 msgid "Work/Employment" msgstr "Trabajo:" @@ -4461,181 +4442,185 @@ msgstr "Modificar los detalles de este perfil" msgid "View this profile" msgstr "Ver este perfil" -#: ../../Zotlabs/Module/Profiles.php:693 ../../Zotlabs/Module/Profiles.php:774 +#: ../../Zotlabs/Module/Profiles.php:693 ../../Zotlabs/Module/Profiles.php:775 #: ../../include/identity.php:952 msgid "Edit visibility" msgstr "Editar visibilidad" #: ../../Zotlabs/Module/Profiles.php:694 +msgid "Profile Tools" +msgstr "Gestión del perfil" + +#: ../../Zotlabs/Module/Profiles.php:695 msgid "Change cover photo" msgstr "Cambiar la imagen de portada del perfil" -#: ../../Zotlabs/Module/Profiles.php:695 ../../include/identity.php:923 +#: ../../Zotlabs/Module/Profiles.php:696 ../../include/identity.php:923 msgid "Change profile photo" msgstr "Cambiar la foto del perfil" -#: ../../Zotlabs/Module/Profiles.php:696 +#: ../../Zotlabs/Module/Profiles.php:697 msgid "Create a new profile using these settings" msgstr "Crear un nuevo perfil usando estos ajustes" -#: ../../Zotlabs/Module/Profiles.php:697 +#: ../../Zotlabs/Module/Profiles.php:698 msgid "Clone this profile" msgstr "Clonar este perfil" -#: ../../Zotlabs/Module/Profiles.php:698 +#: ../../Zotlabs/Module/Profiles.php:699 msgid "Delete this profile" msgstr "Eliminar este perfil" -#: ../../Zotlabs/Module/Profiles.php:699 +#: ../../Zotlabs/Module/Profiles.php:700 msgid "Add profile things" msgstr "Añadir cosas al perfil" -#: ../../Zotlabs/Module/Profiles.php:700 ../../include/conversation.php:1544 +#: ../../Zotlabs/Module/Profiles.php:701 ../../include/conversation.php:1544 #: ../../include/widgets.php:105 msgid "Personal" msgstr "Personales" -#: ../../Zotlabs/Module/Profiles.php:702 +#: ../../Zotlabs/Module/Profiles.php:703 msgid "Relation" msgstr "Relación" -#: ../../Zotlabs/Module/Profiles.php:703 ../../include/datetime.php:48 +#: ../../Zotlabs/Module/Profiles.php:704 ../../include/datetime.php:48 msgid "Miscellaneous" msgstr "Varios" -#: ../../Zotlabs/Module/Profiles.php:705 +#: ../../Zotlabs/Module/Profiles.php:706 msgid "Import profile from file" msgstr "Importar perfil desde un fichero" -#: ../../Zotlabs/Module/Profiles.php:706 +#: ../../Zotlabs/Module/Profiles.php:707 msgid "Export profile to file" msgstr "Exportar perfil a un fichero" -#: ../../Zotlabs/Module/Profiles.php:707 +#: ../../Zotlabs/Module/Profiles.php:708 msgid "Your gender" msgstr "Género" -#: ../../Zotlabs/Module/Profiles.php:708 +#: ../../Zotlabs/Module/Profiles.php:709 msgid "Marital status" msgstr "Estado civil" -#: ../../Zotlabs/Module/Profiles.php:709 +#: ../../Zotlabs/Module/Profiles.php:710 msgid "Sexual preference" msgstr "Preferencia sexual" -#: ../../Zotlabs/Module/Profiles.php:712 +#: ../../Zotlabs/Module/Profiles.php:713 msgid "Profile name" msgstr "Nombre del perfil" -#: ../../Zotlabs/Module/Profiles.php:714 +#: ../../Zotlabs/Module/Profiles.php:715 msgid "This is your default profile." msgstr "Este es su perfil principal." -#: ../../Zotlabs/Module/Profiles.php:716 +#: ../../Zotlabs/Module/Profiles.php:717 msgid "Your full name" msgstr "Nombre completo" -#: ../../Zotlabs/Module/Profiles.php:717 +#: ../../Zotlabs/Module/Profiles.php:718 msgid "Title/Description" msgstr "Título o descripción" -#: ../../Zotlabs/Module/Profiles.php:720 +#: ../../Zotlabs/Module/Profiles.php:721 msgid "Street address" msgstr "Dirección" -#: ../../Zotlabs/Module/Profiles.php:721 +#: ../../Zotlabs/Module/Profiles.php:722 msgid "Locality/City" msgstr "Ciudad" -#: ../../Zotlabs/Module/Profiles.php:722 +#: ../../Zotlabs/Module/Profiles.php:723 msgid "Region/State" msgstr "Región o Estado" -#: ../../Zotlabs/Module/Profiles.php:723 +#: ../../Zotlabs/Module/Profiles.php:724 msgid "Postal/Zip code" msgstr "Código postal" -#: ../../Zotlabs/Module/Profiles.php:724 +#: ../../Zotlabs/Module/Profiles.php:725 msgid "Country" msgstr "País" -#: ../../Zotlabs/Module/Profiles.php:729 +#: ../../Zotlabs/Module/Profiles.php:730 msgid "Who (if applicable)" msgstr "Quién (si es pertinente)" -#: ../../Zotlabs/Module/Profiles.php:729 +#: ../../Zotlabs/Module/Profiles.php:730 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "Por ejemplo: ana123, María González, sara@ejemplo.com" -#: ../../Zotlabs/Module/Profiles.php:730 +#: ../../Zotlabs/Module/Profiles.php:731 msgid "Since (date)" msgstr "Desde (fecha)" -#: ../../Zotlabs/Module/Profiles.php:733 +#: ../../Zotlabs/Module/Profiles.php:734 msgid "Tell us about yourself" msgstr "Háblenos de usted" -#: ../../Zotlabs/Module/Profiles.php:735 +#: ../../Zotlabs/Module/Profiles.php:736 msgid "Hometown" msgstr "Lugar de nacimiento" -#: ../../Zotlabs/Module/Profiles.php:736 +#: ../../Zotlabs/Module/Profiles.php:737 msgid "Political views" msgstr "Ideas políticas" -#: ../../Zotlabs/Module/Profiles.php:737 +#: ../../Zotlabs/Module/Profiles.php:738 msgid "Religious views" msgstr "Creencias religiosas" -#: ../../Zotlabs/Module/Profiles.php:738 +#: ../../Zotlabs/Module/Profiles.php:739 msgid "Keywords used in directory listings" msgstr "Palabras clave utilizadas en los listados de directorios" -#: ../../Zotlabs/Module/Profiles.php:738 +#: ../../Zotlabs/Module/Profiles.php:739 msgid "Example: fishing photography software" msgstr "Por ejemplo: software de fotografía submarina" -#: ../../Zotlabs/Module/Profiles.php:741 +#: ../../Zotlabs/Module/Profiles.php:742 msgid "Musical interests" msgstr "Preferencias musicales" -#: ../../Zotlabs/Module/Profiles.php:742 +#: ../../Zotlabs/Module/Profiles.php:743 msgid "Books, literature" msgstr "Libros, literatura" -#: ../../Zotlabs/Module/Profiles.php:743 +#: ../../Zotlabs/Module/Profiles.php:744 msgid "Television" msgstr "Televisión" -#: ../../Zotlabs/Module/Profiles.php:744 +#: ../../Zotlabs/Module/Profiles.php:745 msgid "Film/Dance/Culture/Entertainment" msgstr "Cine, danza, cultura, entretenimiento" -#: ../../Zotlabs/Module/Profiles.php:745 +#: ../../Zotlabs/Module/Profiles.php:746 msgid "Hobbies/Interests" msgstr "Aficiones o intereses" -#: ../../Zotlabs/Module/Profiles.php:746 +#: ../../Zotlabs/Module/Profiles.php:747 msgid "Love/Romance" msgstr "Vida sentimental o amorosa" -#: ../../Zotlabs/Module/Profiles.php:748 +#: ../../Zotlabs/Module/Profiles.php:749 msgid "School/Education" msgstr "Estudios" -#: ../../Zotlabs/Module/Profiles.php:749 +#: ../../Zotlabs/Module/Profiles.php:750 msgid "Contact information and social networks" msgstr "Información de contacto y redes sociales" -#: ../../Zotlabs/Module/Profiles.php:750 +#: ../../Zotlabs/Module/Profiles.php:751 msgid "My other channels" msgstr "Mis otros canales" -#: ../../Zotlabs/Module/Profiles.php:770 ../../include/identity.php:948 +#: ../../Zotlabs/Module/Profiles.php:771 ../../include/identity.php:948 msgid "Profile Image" msgstr "Imagen del perfil" -#: ../../Zotlabs/Module/Profiles.php:780 ../../include/identity.php:930 +#: ../../Zotlabs/Module/Profiles.php:781 ../../include/identity.php:930 #: ../../include/nav.php:88 msgid "Edit Profiles" msgstr "Editar perfiles" @@ -4831,8 +4816,8 @@ msgstr "sí" msgid "Membership on this site is by invitation only." msgstr "Para registrarse en este sitio es necesaria una invitación." -#: ../../Zotlabs/Module/Register.php:262 ../../include/nav.php:148 -#: ../../boot.php:1584 +#: ../../Zotlabs/Module/Register.php:262 ../../include/nav.php:147 +#: ../../boot.php:1597 msgid "Register" msgstr "Registrarse" @@ -6140,8 +6125,8 @@ msgstr "Ignorar/Ocultar" msgid "post" msgstr "la entrada" -#: ../../Zotlabs/Module/Tagger.php:57 ../../include/conversation.php:150 -#: ../../include/text.php:1975 +#: ../../Zotlabs/Module/Tagger.php:57 ../../include/text.php:1948 +#: ../../include/conversation.php:150 msgid "comment" msgstr "el comentario" @@ -6743,15 +6728,15 @@ msgstr "Registro revocado para %s" msgid "Account verified. Please login." msgstr "Cuenta verificada. Por favor, inicie sesión." -#: ../../include/account.php:719 ../../include/account.php:721 +#: ../../include/account.php:722 ../../include/account.php:724 msgid "Click here to upgrade." msgstr "Pulse aquí para actualizar" -#: ../../include/account.php:727 +#: ../../include/account.php:730 msgid "This action exceeds the limits set by your subscription plan." msgstr "Esta acción supera los límites establecidos por su plan de suscripción " -#: ../../include/account.php:732 +#: ../../include/account.php:735 msgid "This action is not available under your subscription plan." msgstr "Esta acción no está disponible en su plan de suscripción." @@ -7027,9 +7012,327 @@ msgstr "Visitar %2$s de %1$s" msgid "%1$s has an updated %2$s, changing %3$s." msgstr "%1$s ha actualizado %2$s, cambiando %3$s." -#: ../../include/api.php:1338 -msgid "Public Timeline" -msgstr "Cronología pública" +#: ../../include/text.php:394 +msgid "prev" +msgstr "anterior" + +#: ../../include/text.php:396 +msgid "first" +msgstr "primera" + +#: ../../include/text.php:425 +msgid "last" +msgstr "última" + +#: ../../include/text.php:428 +msgid "next" +msgstr "próxima" + +#: ../../include/text.php:438 +msgid "older" +msgstr "más antiguas" + +#: ../../include/text.php:440 +msgid "newer" +msgstr "más recientes" + +#: ../../include/text.php:822 +msgid "No connections" +msgstr "Sin conexiones" + +#: ../../include/text.php:847 +#, php-format +msgid "View all %s connections" +msgstr "Ver todas las %s conexiones" + +#: ../../include/text.php:992 ../../include/text.php:997 +msgid "poke" +msgstr "un toque" + +#: ../../include/text.php:992 ../../include/text.php:997 +#: ../../include/conversation.php:243 +msgid "poked" +msgstr "ha dado un toque a" + +#: ../../include/text.php:998 +msgid "ping" +msgstr "un \"ping\"" + +#: ../../include/text.php:998 +msgid "pinged" +msgstr "ha enviado un \"ping\" a" + +#: ../../include/text.php:999 +msgid "prod" +msgstr "una incitación " + +#: ../../include/text.php:999 +msgid "prodded" +msgstr "ha incitado a " + +#: ../../include/text.php:1000 +msgid "slap" +msgstr "una bofetada " + +#: ../../include/text.php:1000 +msgid "slapped" +msgstr "ha abofeteado a " + +#: ../../include/text.php:1001 +msgid "finger" +msgstr "un \"finger\" " + +#: ../../include/text.php:1001 +msgid "fingered" +msgstr "envió un \"finger\" a" + +#: ../../include/text.php:1002 +msgid "rebuff" +msgstr "un reproche" + +#: ../../include/text.php:1002 +msgid "rebuffed" +msgstr "ha hecho un reproche a " + +#: ../../include/text.php:1014 +msgid "happy" +msgstr "feliz " + +#: ../../include/text.php:1015 +msgid "sad" +msgstr "triste " + +#: ../../include/text.php:1016 +msgid "mellow" +msgstr "tranquilo/a" + +#: ../../include/text.php:1017 +msgid "tired" +msgstr "cansado/a " + +#: ../../include/text.php:1018 +msgid "perky" +msgstr "vivaz" + +#: ../../include/text.php:1019 +msgid "angry" +msgstr "enfadado/a" + +#: ../../include/text.php:1020 +msgid "stupefied" +msgstr "asombrado/a" + +#: ../../include/text.php:1021 +msgid "puzzled" +msgstr "perplejo/a" + +#: ../../include/text.php:1022 +msgid "interested" +msgstr "interesado/a" + +#: ../../include/text.php:1023 +msgid "bitter" +msgstr "amargado/a" + +#: ../../include/text.php:1024 +msgid "cheerful" +msgstr "alegre" + +#: ../../include/text.php:1025 +msgid "alive" +msgstr "animado/a" + +#: ../../include/text.php:1026 +msgid "annoyed" +msgstr "molesto/a" + +#: ../../include/text.php:1027 +msgid "anxious" +msgstr "ansioso/a" + +#: ../../include/text.php:1028 +msgid "cranky" +msgstr "de mal humor" + +#: ../../include/text.php:1029 +msgid "disturbed" +msgstr "perturbado/a" + +#: ../../include/text.php:1030 +msgid "frustrated" +msgstr "frustrado/a" + +#: ../../include/text.php:1031 +msgid "depressed" +msgstr "deprimido/a" + +#: ../../include/text.php:1032 +msgid "motivated" +msgstr "motivado/a" + +#: ../../include/text.php:1033 +msgid "relaxed" +msgstr "relajado/a" + +#: ../../include/text.php:1034 +msgid "surprised" +msgstr "sorprendido/a" + +#: ../../include/text.php:1206 ../../include/js_strings.php:70 +msgid "Monday" +msgstr "lunes" + +#: ../../include/text.php:1206 ../../include/js_strings.php:71 +msgid "Tuesday" +msgstr "martes" + +#: ../../include/text.php:1206 ../../include/js_strings.php:72 +msgid "Wednesday" +msgstr "miércoles" + +#: ../../include/text.php:1206 ../../include/js_strings.php:73 +msgid "Thursday" +msgstr "jueves" + +#: ../../include/text.php:1206 ../../include/js_strings.php:74 +msgid "Friday" +msgstr "viernes" + +#: ../../include/text.php:1206 ../../include/js_strings.php:75 +msgid "Saturday" +msgstr "sábado" + +#: ../../include/text.php:1206 ../../include/js_strings.php:69 +msgid "Sunday" +msgstr "domingo" + +#: ../../include/text.php:1210 ../../include/js_strings.php:45 +msgid "January" +msgstr "enero" + +#: ../../include/text.php:1210 ../../include/js_strings.php:46 +msgid "February" +msgstr "febrero" + +#: ../../include/text.php:1210 ../../include/js_strings.php:47 +msgid "March" +msgstr "marzo" + +#: ../../include/text.php:1210 ../../include/js_strings.php:48 +msgid "April" +msgstr "abril" + +#: ../../include/text.php:1210 +msgid "May" +msgstr "mayo" + +#: ../../include/text.php:1210 ../../include/js_strings.php:50 +msgid "June" +msgstr "junio" + +#: ../../include/text.php:1210 ../../include/js_strings.php:51 +msgid "July" +msgstr "julio" + +#: ../../include/text.php:1210 ../../include/js_strings.php:52 +msgid "August" +msgstr "agosto" + +#: ../../include/text.php:1210 ../../include/js_strings.php:53 +msgid "September" +msgstr "septiembre" + +#: ../../include/text.php:1210 ../../include/js_strings.php:54 +msgid "October" +msgstr "octubre" + +#: ../../include/text.php:1210 ../../include/js_strings.php:55 +msgid "November" +msgstr "noviembre" + +#: ../../include/text.php:1210 ../../include/js_strings.php:56 +msgid "December" +msgstr "diciembre" + +#: ../../include/text.php:1287 ../../include/text.php:1291 +msgid "Unknown Attachment" +msgstr "Adjunto no reconocido" + +#: ../../include/text.php:1293 +msgid "unknown" +msgstr "desconocido" + +#: ../../include/text.php:1329 +msgid "remove category" +msgstr "eliminar categoría" + +#: ../../include/text.php:1406 +msgid "remove from file" +msgstr "eliminar del fichero" + +#: ../../include/text.php:1437 ../../include/bb2diaspora.php:487 +#: ../../include/event.php:22 +msgid "l F d, Y \\@ g:i A" +msgstr "l d de F, Y \\@ G:i" + +#: ../../include/text.php:1441 ../../include/bb2diaspora.php:493 +#: ../../include/event.php:30 +msgid "Starts:" +msgstr "Comienza:" + +#: ../../include/text.php:1445 ../../include/bb2diaspora.php:501 +#: ../../include/event.php:40 +msgid "Finishes:" +msgstr "Finaliza:" + +#: ../../include/text.php:1735 ../../include/text.php:1807 +msgid "default" +msgstr "por defecto" + +#: ../../include/text.php:1743 +msgid "Page layout" +msgstr "Plantilla de la página" + +#: ../../include/text.php:1743 +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:1785 +msgid "Page content type" +msgstr "Tipo de contenido de la página" + +#: ../../include/text.php:1819 +msgid "Select an alternate language" +msgstr "Seleccionar un idioma alternativo" + +#: ../../include/text.php:1953 +msgid "activity" +msgstr "la actividad" + +#: ../../include/text.php:2248 +msgid "Design Tools" +msgstr "Herramientas de diseño web" + +#: ../../include/text.php:2254 +msgid "Pages" +msgstr "Páginas" + +#: ../../include/zot.php:680 +msgid "Invalid data packet" +msgstr "Paquete de datos no válido" + +#: ../../include/zot.php:696 +msgid "Unable to verify channel signature" +msgstr "No ha sido posible de verificar la firma del canal" + +#: ../../include/zot.php:2332 +#, 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:3670 +msgid "invalid target signature" +msgstr "La firma recibida no es válida" #: ../../include/apps.php:128 msgid "Site Admin" @@ -7044,28 +7347,28 @@ msgstr "Marcadores" msgid "Address Book" msgstr "Libreta de direcciones" -#: ../../include/apps.php:131 ../../include/nav.php:110 ../../boot.php:1602 +#: ../../include/apps.php:131 ../../include/nav.php:110 ../../boot.php:1615 msgid "Login" msgstr "Iniciar sesión" -#: ../../include/apps.php:133 ../../include/nav.php:182 +#: ../../include/apps.php:133 ../../include/nav.php:179 msgid "Grid" msgstr "Red" -#: ../../include/apps.php:137 ../../include/nav.php:185 +#: ../../include/apps.php:137 ../../include/nav.php:182 msgid "Channel Home" msgstr "Mi canal" #: ../../include/apps.php:140 ../../include/conversation.php:1667 -#: ../../include/conversation.php:1670 ../../include/nav.php:204 +#: ../../include/conversation.php:1670 ../../include/nav.php:201 msgid "Events" msgstr "Eventos" -#: ../../include/apps.php:141 ../../include/nav.php:170 +#: ../../include/apps.php:141 ../../include/nav.php:167 msgid "Directory" msgstr "Directorio" -#: ../../include/apps.php:143 ../../include/nav.php:196 +#: ../../include/apps.php:143 ../../include/nav.php:193 msgid "Mail" msgstr "Correo" @@ -7105,97 +7408,23 @@ msgstr "Instalar" msgid "Purchase" msgstr "Comprar" -#: ../../include/network.php:659 -msgid "view full size" -msgstr "Ver en el tamaño original" - -#: ../../include/network.php:1827 ../../include/enotify.php:57 -msgid "$Projectname Notification" -msgstr "Notificación de $Projectname" - -#: ../../include/network.php:1828 ../../include/enotify.php:58 -msgid "$projectname" -msgstr "$projectname" - -#: ../../include/network.php:1830 ../../include/enotify.php:60 -msgid "Thank You," -msgstr "Gracias," - -#: ../../include/network.php:1832 ../../include/enotify.php:62 -#, php-format -msgid "%s Administrator" -msgstr "%s Administrador" +#: ../../include/import.php:23 +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/network.php:1889 -msgid "No Subject" -msgstr "Sin asunto" +#: ../../include/import.php:70 +msgid "Channel clone failed. Import failed." +msgstr "La clonación del canal no ha salido bien. La importación ha fallado." #: ../../include/bb2diaspora.php:398 msgid "Attachments:" msgstr "Ficheros adjuntos:" -#: ../../include/bb2diaspora.php:487 ../../include/event.php:22 -#: ../../include/text.php:1437 -msgid "l F d, Y \\@ g:i A" -msgstr "l d de F, Y \\@ G:i" - #: ../../include/bb2diaspora.php:489 msgid "$Projectname event notification:" msgstr "Notificación de eventos de $Projectname:" -#: ../../include/bb2diaspora.php:493 ../../include/event.php:30 -#: ../../include/text.php:1441 -msgid "Starts:" -msgstr "Comienza:" - -#: ../../include/bb2diaspora.php:501 ../../include/event.php:40 -#: ../../include/text.php:1445 -msgid "Finishes:" -msgstr "Finaliza:" - -#: ../../include/bbcode.php:123 ../../include/bbcode.php:801 -#: ../../include/bbcode.php:804 ../../include/bbcode.php:809 -#: ../../include/bbcode.php:812 ../../include/bbcode.php:815 -#: ../../include/bbcode.php:818 ../../include/bbcode.php:823 -#: ../../include/bbcode.php:826 ../../include/bbcode.php:831 -#: ../../include/bbcode.php:834 ../../include/bbcode.php:837 -#: ../../include/bbcode.php:840 -msgid "Image/photo" -msgstr "Imagen/foto" - -#: ../../include/bbcode.php:162 ../../include/bbcode.php:851 -msgid "Encrypted content" -msgstr "Contenido cifrado" - -#: ../../include/bbcode.php:179 -#, php-format -msgid "Install %s element: " -msgstr "Instalar el elemento %s:" - -#: ../../include/bbcode.php:183 -#, 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:255 -#, php-format -msgid "%1$s wrote the following %2$s %3$s" -msgstr "%1$s escribió %2$s siguiente %3$s" - -#: ../../include/bbcode.php:545 -msgid "Different viewers will see this text differently" -msgstr "Visitantes diferentes verán este texto de forma distinta" - -#: ../../include/bbcode.php:762 -msgid "$1 spoiler" -msgstr "$1 spoiler" - -#: ../../include/bbcode.php:789 -msgid "$1 wrote:" -msgstr "$1 escribió:" - #: ../../include/conversation.php:204 #, php-format msgid "%1$s is now connected with %2$s" @@ -7206,11 +7435,6 @@ msgstr "%1$s ahora está conectado/a con %2$s" msgid "%1$s poked %2$s" msgstr "%1$s ha dado un toque a %2$s" -#: ../../include/conversation.php:243 ../../include/text.php:992 -#: ../../include/text.php:997 -msgid "poked" -msgstr "ha dado un toque a" - #: ../../include/conversation.php:691 #, php-format msgid "View %s's profile @ %s" @@ -7232,7 +7456,7 @@ msgstr "Mostrar en su contexto" msgid "remove" msgstr "eliminar" -#: ../../include/conversation.php:854 ../../include/nav.php:256 +#: ../../include/conversation.php:854 ../../include/nav.php:247 msgid "Loading..." msgstr "Cargando..." @@ -7556,6 +7780,10 @@ msgid "" "form has been opened for too long (>3 hours) before submitting it." msgstr "El \"token\" de seguridad del formulario no es correcto. Esto ha ocurrido probablemente porque el formulario ha estado abierto demasiado tiempo (>3 horas) antes de ser enviado" +#: ../../include/api.php:1338 +msgid "Public Timeline" +msgstr "Cronología pública" + #: ../../include/contact_selectors.php:56 msgid "Frequently" msgstr "Frecuentemente" @@ -7756,7 +7984,7 @@ msgstr "Edad:" msgid "YYYY-MM-DD or MM-DD" msgstr "AAAA-MM-DD o MM-DD" -#: ../../include/datetime.php:273 ../../boot.php:2432 +#: ../../include/datetime.php:273 ../../boot.php:2445 msgid "never" msgstr "nunca" @@ -7845,6 +8073,23 @@ msgstr "Solo foros públicos" msgid "This Website Only" msgstr "Solo este sitio web" +#: ../../include/enotify.php:57 ../../include/network.php:1827 +msgid "$Projectname Notification" +msgstr "Notificación de $Projectname" + +#: ../../include/enotify.php:58 ../../include/network.php:1828 +msgid "$projectname" +msgstr "$projectname" + +#: ../../include/enotify.php:60 ../../include/network.php:1830 +msgid "Thank You," +msgstr "Gracias," + +#: ../../include/enotify.php:62 ../../include/network.php:1832 +#, php-format +msgid "%s Administrator" +msgstr "%s Administrador" + #: ../../include/enotify.php:96 #, php-format msgid "%s <!item_type!>" @@ -8390,6 +8635,53 @@ msgstr "Sin canales en ningún grupo" msgid "add" msgstr "añadir" +#: ../../include/bbcode.php:123 ../../include/bbcode.php:813 +#: ../../include/bbcode.php:816 ../../include/bbcode.php:821 +#: ../../include/bbcode.php:824 ../../include/bbcode.php:827 +#: ../../include/bbcode.php:830 ../../include/bbcode.php:835 +#: ../../include/bbcode.php:838 ../../include/bbcode.php:843 +#: ../../include/bbcode.php:846 ../../include/bbcode.php:849 +#: ../../include/bbcode.php:852 +msgid "Image/photo" +msgstr "Imagen/foto" + +#: ../../include/bbcode.php:162 ../../include/bbcode.php:863 +msgid "Encrypted content" +msgstr "Contenido cifrado" + +#: ../../include/bbcode.php:179 +#, php-format +msgid "Install %s element: " +msgstr "Instalar el elemento %s:" + +#: ../../include/bbcode.php:183 +#, 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:255 +#, php-format +msgid "%1$s wrote the following %2$s %3$s" +msgstr "%1$s escribió %2$s siguiente %3$s" + +#: ../../include/bbcode.php:333 ../../include/bbcode.php:341 +msgid "Click to open/close" +msgstr "Pulsar para abrir/cerrar" + +#: ../../include/bbcode.php:341 +msgid "spoiler" +msgstr "spoiler" + +#: ../../include/bbcode.php:556 +msgid "Different viewers will see this text differently" +msgstr "Visitantes diferentes verán este texto de forma distinta" + +#: ../../include/bbcode.php:801 +msgid "$1 wrote:" +msgstr "$1 escribió:" + #: ../../include/items.php:1138 ../../include/items.php:1183 msgid "(Unknown)" msgstr "(Desconocido)" @@ -8444,32 +8736,13 @@ msgstr "Conexión no encontrada" msgid "profile photo" msgstr "foto del perfil" -#: ../../include/photos.php:112 -#, php-format -msgid "Image exceeds website size limit of %lu bytes" -msgstr "La imagen excede el límite de %lu bytes del sitio" - -#: ../../include/photos.php:119 -msgid "Image file is empty." -msgstr "El fichero de imagen está vacío. " - -#: ../../include/photos.php:257 -msgid "Photo storage failed." -msgstr "La foto no ha podido ser guardada." - -#: ../../include/photos.php:297 -msgid "a new photo" -msgstr "una nueva foto" - -#: ../../include/photos.php:301 -#, php-format -msgctxt "photo_upload" -msgid "%1$s posted %2$s to %3$s" -msgstr "%1$s ha publicado %2$s en %3$s" +#: ../../include/network.php:659 +msgid "view full size" +msgstr "Ver en el tamaño original" -#: ../../include/photos.php:510 -msgid "Upload New Photos" -msgstr "Subir nuevas fotos" +#: ../../include/network.php:1889 +msgid "No Subject" +msgstr "Sin asunto" #: ../../include/widgets.php:103 msgid "System" @@ -8568,15 +8841,15 @@ msgstr "Menú de correo privado" msgid "Combined View" msgstr "Vista combinada" -#: ../../include/widgets.php:609 ../../include/nav.php:199 +#: ../../include/widgets.php:609 ../../include/nav.php:196 msgid "Inbox" msgstr "Bandeja de entrada" -#: ../../include/widgets.php:614 ../../include/nav.php:200 +#: ../../include/widgets.php:614 ../../include/nav.php:197 msgid "Outbox" msgstr "Bandeja de salida" -#: ../../include/widgets.php:619 ../../include/nav.php:201 +#: ../../include/widgets.php:619 ../../include/nav.php:198 msgid "New Message" msgstr "Nuevo mensaje" @@ -8708,7 +8981,7 @@ msgstr "Examinar la cola" msgid "DB updates" msgstr "Actualizaciones de la base de datos" -#: ../../include/widgets.php:1368 ../../include/nav.php:219 +#: ../../include/widgets.php:1368 ../../include/nav.php:216 msgid "Admin" msgstr "Administrador" @@ -8881,55 +9154,11 @@ msgstr " " msgid "timeago.numbers" msgstr "timeago.numbers" -#: ../../include/js_strings.php:45 ../../include/text.php:1210 -msgid "January" -msgstr "enero" - -#: ../../include/js_strings.php:46 ../../include/text.php:1210 -msgid "February" -msgstr "febrero" - -#: ../../include/js_strings.php:47 ../../include/text.php:1210 -msgid "March" -msgstr "marzo" - -#: ../../include/js_strings.php:48 ../../include/text.php:1210 -msgid "April" -msgstr "abril" - #: ../../include/js_strings.php:49 msgctxt "long" msgid "May" msgstr "mayo" -#: ../../include/js_strings.php:50 ../../include/text.php:1210 -msgid "June" -msgstr "junio" - -#: ../../include/js_strings.php:51 ../../include/text.php:1210 -msgid "July" -msgstr "julio" - -#: ../../include/js_strings.php:52 ../../include/text.php:1210 -msgid "August" -msgstr "agosto" - -#: ../../include/js_strings.php:53 ../../include/text.php:1210 -msgid "September" -msgstr "septiembre" - -#: ../../include/js_strings.php:54 ../../include/text.php:1210 -msgid "October" -msgstr "octubre" - -#: ../../include/js_strings.php:55 ../../include/text.php:1210 -msgid "November" -msgstr "noviembre" - -#: ../../include/js_strings.php:56 ../../include/text.php:1210 -msgid "December" -msgstr "diciembre" - #: ../../include/js_strings.php:57 msgid "Jan" msgstr "ene" @@ -8979,34 +9208,6 @@ msgstr "nov" msgid "Dec" msgstr "dic" -#: ../../include/js_strings.php:69 ../../include/text.php:1206 -msgid "Sunday" -msgstr "domingo" - -#: ../../include/js_strings.php:70 ../../include/text.php:1206 -msgid "Monday" -msgstr "lunes" - -#: ../../include/js_strings.php:71 ../../include/text.php:1206 -msgid "Tuesday" -msgstr "martes" - -#: ../../include/js_strings.php:72 ../../include/text.php:1206 -msgid "Wednesday" -msgstr "miércoles" - -#: ../../include/js_strings.php:73 ../../include/text.php:1206 -msgid "Thursday" -msgstr "jueves" - -#: ../../include/js_strings.php:74 ../../include/text.php:1206 -msgid "Friday" -msgstr "viernes" - -#: ../../include/js_strings.php:75 ../../include/text.php:1206 -msgid "Saturday" -msgstr "sábado" - #: ../../include/js_strings.php:76 msgid "Sun" msgstr "dom" @@ -9076,14 +9277,166 @@ msgstr "No ha sido posible determinar el remitente. " msgid "Stored post could not be verified." msgstr "No se han podido verificar las publicaciones guardadas." -#: ../../include/import.php:23 -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/nav.php:82 ../../include/nav.php:113 ../../boot.php:1614 +msgid "Logout" +msgstr "Finalizar sesión" -#: ../../include/import.php:70 -msgid "Channel clone failed. Import failed." -msgstr "La clonación del canal no ha salido bien. La importación ha fallado." +#: ../../include/nav.php:82 ../../include/nav.php:113 +msgid "End this session" +msgstr "Finalizar esta sesión" + +#: ../../include/nav.php:85 ../../include/nav.php:144 +msgid "Home" +msgstr "Inicio" + +#: ../../include/nav.php:85 +msgid "Your posts and conversations" +msgstr "Sus publicaciones y conversaciones" + +#: ../../include/nav.php:86 +msgid "Your profile page" +msgstr "Su página del perfil" + +#: ../../include/nav.php:88 +msgid "Manage/Edit profiles" +msgstr "Administrar/editar perfiles" + +#: ../../include/nav.php:90 +msgid "Edit your profile" +msgstr "Editar su perfil" + +#: ../../include/nav.php:92 +msgid "Your photos" +msgstr "Sus fotos" + +#: ../../include/nav.php:93 +msgid "Your files" +msgstr "Sus ficheros" + +#: ../../include/nav.php:96 +msgid "Your chatrooms" +msgstr "Sus salas de chat" + +#: ../../include/nav.php:102 +msgid "Your bookmarks" +msgstr "Sus marcadores" + +#: ../../include/nav.php:106 +msgid "Your webpages" +msgstr "Sus páginas web" + +#: ../../include/nav.php:110 +msgid "Sign in" +msgstr "Acceder" + +#: ../../include/nav.php:127 +#, php-format +msgid "%s - click to logout" +msgstr "%s - pulsar para finalizar sesión" + +#: ../../include/nav.php:130 +msgid "Remote authentication" +msgstr "Acceder desde su servidor" + +#: ../../include/nav.php:130 +msgid "Click to authenticate to your home hub" +msgstr "Pulsar para identificarse en su servidor de inicio" + +#: ../../include/nav.php:144 +msgid "Home Page" +msgstr "Página de inicio" + +#: ../../include/nav.php:147 +msgid "Create an account" +msgstr "Crear una cuenta" + +#: ../../include/nav.php:159 +msgid "Help and documentation" +msgstr "Ayuda y documentación" + +#: ../../include/nav.php:163 +msgid "Applications, utilities, links, games" +msgstr "Aplicaciones, utilidades, enlaces, juegos" + +#: ../../include/nav.php:165 +msgid "Search site @name, #tag, ?docs, content" +msgstr "Buscar en el sitio por @nombre, #etiqueta, ?ayuda o contenido" + +#: ../../include/nav.php:167 +msgid "Channel Directory" +msgstr "Directorio de canales" + +#: ../../include/nav.php:179 +msgid "Your grid" +msgstr "Mi red" + +#: ../../include/nav.php:180 +msgid "Mark all grid notifications seen" +msgstr "Marcar todas las notificaciones de la red como vistas" + +#: ../../include/nav.php:182 +msgid "Channel home" +msgstr "Mi canal" + +#: ../../include/nav.php:183 +msgid "Mark all channel notifications seen" +msgstr "Marcar todas las notificaciones del canal como leídas" + +#: ../../include/nav.php:189 +msgid "Notices" +msgstr "Avisos" + +#: ../../include/nav.php:189 +msgid "Notifications" +msgstr "Notificaciones" + +#: ../../include/nav.php:190 +msgid "See all notifications" +msgstr "Ver todas las notificaciones" + +#: ../../include/nav.php:193 +msgid "Private mail" +msgstr "Correo privado" + +#: ../../include/nav.php:194 +msgid "See all private messages" +msgstr "Ver todas los mensajes privados" + +#: ../../include/nav.php:195 +msgid "Mark all private messages seen" +msgstr "Marcar todos los mensajes privados como leídos" + +#: ../../include/nav.php:201 +msgid "Event Calendar" +msgstr "Calendario de eventos" + +#: ../../include/nav.php:202 +msgid "See all events" +msgstr "Ver todos los eventos" + +#: ../../include/nav.php:203 +msgid "Mark all events seen" +msgstr "Marcar todos los eventos como leidos" + +#: ../../include/nav.php:206 +msgid "Manage Your Channels" +msgstr "Gestionar sus canales" + +#: ../../include/nav.php:208 +msgid "Account/Channel Settings" +msgstr "Ajustes de cuenta/canales" + +#: ../../include/nav.php:216 +msgid "Site Setup and Configuration" +msgstr "Ajustes y configuración del sitio" + +#: ../../include/nav.php:252 +msgid "@name, #tag, ?doc, content" +msgstr "@nombre, #etiqueta, ?ayuda, contenido" + +#: ../../include/nav.php:253 +msgid "Please wait..." +msgstr "Espere por favor…" #: ../../include/oembed.php:267 msgid "Embedded content" @@ -9242,400 +9595,32 @@ msgstr "Especial - Repositorio de grupo" msgid "Custom/Expert Mode" msgstr "Modo personalizado/experto" -#: ../../include/text.php:394 -msgid "prev" -msgstr "anterior" - -#: ../../include/text.php:396 -msgid "first" -msgstr "primera" - -#: ../../include/text.php:425 -msgid "last" -msgstr "última" - -#: ../../include/text.php:428 -msgid "next" -msgstr "próxima" - -#: ../../include/text.php:438 -msgid "older" -msgstr "más antiguas" - -#: ../../include/text.php:440 -msgid "newer" -msgstr "más recientes" - -#: ../../include/text.php:822 -msgid "No connections" -msgstr "Sin conexiones" - -#: ../../include/text.php:847 -#, php-format -msgid "View all %s connections" -msgstr "Ver todas las %s conexiones" - -#: ../../include/text.php:992 ../../include/text.php:997 -msgid "poke" -msgstr "un toque" - -#: ../../include/text.php:998 -msgid "ping" -msgstr "un \"ping\"" - -#: ../../include/text.php:998 -msgid "pinged" -msgstr "ha enviado un \"ping\" a" - -#: ../../include/text.php:999 -msgid "prod" -msgstr "una incitación " - -#: ../../include/text.php:999 -msgid "prodded" -msgstr "ha incitado a " - -#: ../../include/text.php:1000 -msgid "slap" -msgstr "una bofetada " - -#: ../../include/text.php:1000 -msgid "slapped" -msgstr "ha abofeteado a " - -#: ../../include/text.php:1001 -msgid "finger" -msgstr "un \"finger\" " - -#: ../../include/text.php:1001 -msgid "fingered" -msgstr "envió un \"finger\" a" - -#: ../../include/text.php:1002 -msgid "rebuff" -msgstr "un reproche" - -#: ../../include/text.php:1002 -msgid "rebuffed" -msgstr "ha hecho un reproche a " - -#: ../../include/text.php:1014 -msgid "happy" -msgstr "feliz " - -#: ../../include/text.php:1015 -msgid "sad" -msgstr "triste " - -#: ../../include/text.php:1016 -msgid "mellow" -msgstr "tranquilo/a" - -#: ../../include/text.php:1017 -msgid "tired" -msgstr "cansado/a " - -#: ../../include/text.php:1018 -msgid "perky" -msgstr "vivaz" - -#: ../../include/text.php:1019 -msgid "angry" -msgstr "enfadado/a" - -#: ../../include/text.php:1020 -msgid "stupefied" -msgstr "asombrado/a" - -#: ../../include/text.php:1021 -msgid "puzzled" -msgstr "perplejo/a" - -#: ../../include/text.php:1022 -msgid "interested" -msgstr "interesado/a" - -#: ../../include/text.php:1023 -msgid "bitter" -msgstr "amargado/a" - -#: ../../include/text.php:1024 -msgid "cheerful" -msgstr "alegre" - -#: ../../include/text.php:1025 -msgid "alive" -msgstr "animado/a" - -#: ../../include/text.php:1026 -msgid "annoyed" -msgstr "molesto/a" - -#: ../../include/text.php:1027 -msgid "anxious" -msgstr "ansioso/a" - -#: ../../include/text.php:1028 -msgid "cranky" -msgstr "de mal humor" - -#: ../../include/text.php:1029 -msgid "disturbed" -msgstr "perturbado/a" - -#: ../../include/text.php:1030 -msgid "frustrated" -msgstr "frustrado/a" - -#: ../../include/text.php:1031 -msgid "depressed" -msgstr "deprimido/a" - -#: ../../include/text.php:1032 -msgid "motivated" -msgstr "motivado/a" - -#: ../../include/text.php:1033 -msgid "relaxed" -msgstr "relajado/a" - -#: ../../include/text.php:1034 -msgid "surprised" -msgstr "sorprendido/a" - -#: ../../include/text.php:1210 -msgid "May" -msgstr "mayo" - -#: ../../include/text.php:1287 ../../include/text.php:1291 -msgid "Unknown Attachment" -msgstr "Adjunto no reconocido" - -#: ../../include/text.php:1293 -msgid "unknown" -msgstr "desconocido" - -#: ../../include/text.php:1329 -msgid "remove category" -msgstr "eliminar categoría" - -#: ../../include/text.php:1406 -msgid "remove from file" -msgstr "eliminar del fichero" - -#: ../../include/text.php:1548 ../../include/text.php:1559 -msgid "Click to open/close" -msgstr "Pulsar para abrir/cerrar" - -#: ../../include/text.php:1764 ../../include/text.php:1836 -msgid "default" -msgstr "por defecto" - -#: ../../include/text.php:1772 -msgid "Page layout" -msgstr "Plantilla de la página" - -#: ../../include/text.php:1772 -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:1814 -msgid "Page content type" -msgstr "Tipo de contenido de la página" - -#: ../../include/text.php:1848 -msgid "Select an alternate language" -msgstr "Seleccionar un idioma alternativo" - -#: ../../include/text.php:1980 -msgid "activity" -msgstr "la actividad" - -#: ../../include/text.php:2275 -msgid "Design Tools" -msgstr "Herramientas de diseño web" - -#: ../../include/text.php:2281 -msgid "Pages" -msgstr "Páginas" - -#: ../../include/nav.php:82 ../../include/nav.php:113 ../../boot.php:1601 -msgid "Logout" -msgstr "Finalizar sesión" - -#: ../../include/nav.php:82 ../../include/nav.php:113 -msgid "End this session" -msgstr "Finalizar esta sesión" - -#: ../../include/nav.php:85 ../../include/nav.php:144 -msgid "Home" -msgstr "Inicio" - -#: ../../include/nav.php:85 -msgid "Your posts and conversations" -msgstr "Sus publicaciones y conversaciones" - -#: ../../include/nav.php:86 -msgid "Your profile page" -msgstr "Su página del perfil" - -#: ../../include/nav.php:88 -msgid "Manage/Edit profiles" -msgstr "Administrar/editar perfiles" - -#: ../../include/nav.php:90 -msgid "Edit your profile" -msgstr "Editar su perfil" - -#: ../../include/nav.php:92 -msgid "Your photos" -msgstr "Sus fotos" - -#: ../../include/nav.php:93 -msgid "Your files" -msgstr "Sus ficheros" - -#: ../../include/nav.php:96 -msgid "Your chatrooms" -msgstr "Sus salas de chat" - -#: ../../include/nav.php:102 -msgid "Your bookmarks" -msgstr "Sus marcadores" - -#: ../../include/nav.php:106 -msgid "Your webpages" -msgstr "Sus páginas web" - -#: ../../include/nav.php:110 -msgid "Sign in" -msgstr "Acceder" - -#: ../../include/nav.php:127 +#: ../../include/photos.php:112 #, php-format -msgid "%s - click to logout" -msgstr "%s - pulsar para finalizar sesión" - -#: ../../include/nav.php:130 -msgid "Remote authentication" -msgstr "Acceder desde su servidor" - -#: ../../include/nav.php:130 -msgid "Click to authenticate to your home hub" -msgstr "Pulsar para identificarse en su servidor de inicio" - -#: ../../include/nav.php:144 -msgid "Home Page" -msgstr "Página de inicio" - -#: ../../include/nav.php:148 -msgid "Create an account" -msgstr "Crear una cuenta" - -#: ../../include/nav.php:161 -msgid "Help and documentation" -msgstr "Ayuda y documentación" - -#: ../../include/nav.php:165 -msgid "Applications, utilities, links, games" -msgstr "Aplicaciones, utilidades, enlaces, juegos" - -#: ../../include/nav.php:167 -msgid "Search site @name, #tag, ?docs, content" -msgstr "Buscar en el sitio por @nombre, #etiqueta, ?ayuda o contenido" - -#: ../../include/nav.php:170 -msgid "Channel Directory" -msgstr "Directorio de canales" - -#: ../../include/nav.php:182 -msgid "Your grid" -msgstr "Mi red" - -#: ../../include/nav.php:183 -msgid "Mark all grid notifications seen" -msgstr "Marcar todas las notificaciones de la red como vistas" - -#: ../../include/nav.php:185 -msgid "Channel home" -msgstr "Mi canal" - -#: ../../include/nav.php:186 -msgid "Mark all channel notifications seen" -msgstr "Marcar todas las notificaciones del canal como leídas" - -#: ../../include/nav.php:192 -msgid "Notices" -msgstr "Avisos" - -#: ../../include/nav.php:192 -msgid "Notifications" -msgstr "Notificaciones" - -#: ../../include/nav.php:193 -msgid "See all notifications" -msgstr "Ver todas las notificaciones" - -#: ../../include/nav.php:196 -msgid "Private mail" -msgstr "Correo privado" - -#: ../../include/nav.php:197 -msgid "See all private messages" -msgstr "Ver todas los mensajes privados" - -#: ../../include/nav.php:198 -msgid "Mark all private messages seen" -msgstr "Marcar todos los mensajes privados como leídos" - -#: ../../include/nav.php:204 -msgid "Event Calendar" -msgstr "Calendario de eventos" - -#: ../../include/nav.php:205 -msgid "See all events" -msgstr "Ver todos los eventos" - -#: ../../include/nav.php:206 -msgid "Mark all events seen" -msgstr "Marcar todos los eventos como leidos" - -#: ../../include/nav.php:209 -msgid "Manage Your Channels" -msgstr "Gestionar sus canales" - -#: ../../include/nav.php:211 -msgid "Account/Channel Settings" -msgstr "Ajustes de cuenta/canales" - -#: ../../include/nav.php:219 -msgid "Site Setup and Configuration" -msgstr "Ajustes y configuración del sitio" - -#: ../../include/nav.php:261 -msgid "@name, #tag, ?doc, content" -msgstr "@nombre, #etiqueta, ?ayuda, contenido" +msgid "Image exceeds website size limit of %lu bytes" +msgstr "La imagen excede el límite de %lu bytes del sitio" -#: ../../include/nav.php:262 -msgid "Please wait..." -msgstr "Espere por favor…" +#: ../../include/photos.php:119 +msgid "Image file is empty." +msgstr "El fichero de imagen está vacío. " -#: ../../include/zot.php:680 -msgid "Invalid data packet" -msgstr "Paquete de datos no válido" +#: ../../include/photos.php:257 +msgid "Photo storage failed." +msgstr "La foto no ha podido ser guardada." -#: ../../include/zot.php:696 -msgid "Unable to verify channel signature" -msgstr "No ha sido posible de verificar la firma del canal" +#: ../../include/photos.php:297 +msgid "a new photo" +msgstr "una nueva foto" -#: ../../include/zot.php:2332 +#: ../../include/photos.php:301 #, php-format -msgid "Unable to verify site signature for %s" -msgstr "No ha sido posible de verificar la firma del sitio para %s" +msgctxt "photo_upload" +msgid "%1$s posted %2$s to %3$s" +msgstr "%1$s ha publicado %2$s en %3$s" -#: ../../include/zot.php:3670 -msgid "invalid target signature" -msgstr "La firma recibida no es válida" +#: ../../include/photos.php:510 +msgid "Upload New Photos" +msgstr "Subir nuevas fotos" #: ../../view/theme/redbasic/php/config.php:82 msgid "Focus (Hubzilla default)" @@ -9794,41 +9779,41 @@ msgstr "La actualización %s ha fallado. Mire el informe de errores." msgid "Update Error at %s" msgstr "Error de actualización en %s" -#: ../../boot.php:1583 +#: ../../boot.php:1596 msgid "" "Create an account to access services and applications within the Hubzilla" msgstr "Crear una cuenta para acceder a los servicios y aplicaciones dentro de Hubzilla" -#: ../../boot.php:1605 +#: ../../boot.php:1618 msgid "Password" msgstr "Contraseña" -#: ../../boot.php:1606 +#: ../../boot.php:1619 msgid "Remember me" msgstr "Recordarme" -#: ../../boot.php:1609 +#: ../../boot.php:1622 msgid "Forgot your password?" msgstr "¿Olvidó su contraseña?" -#: ../../boot.php:2238 +#: ../../boot.php:2251 msgid "toggle mobile" msgstr "cambiar a modo móvil" -#: ../../boot.php:2391 +#: ../../boot.php:2404 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:2394 +#: ../../boot.php:2407 #, php-format msgid "[hubzilla] Website SSL error for %s" msgstr "[hubzilla] Error SSL del sitio web en %s" -#: ../../boot.php:2431 +#: ../../boot.php:2444 msgid "Cron/Scheduled tasks not running." msgstr "Las tareas del Planificador/Cron no están funcionando." -#: ../../boot.php:2435 +#: ../../boot.php:2448 #, php-format msgid "[hubzilla] Cron tasks not running on %s" msgstr "[hubzilla] Las tareas de Cron no están funcionando en %s" diff --git a/view/es-es/hstrings.php b/view/es-es/hstrings.php index f4512d058..b995ee27b 100644 --- a/view/es-es/hstrings.php +++ b/view/es-es/hstrings.php @@ -152,8 +152,6 @@ App::$strings["Block communications from these channels"] = "Bloquear la comunic App::$strings["Allow embedded HTML content only from these domains"] = "Permitir contenido con HTML incorporado solo desde estos dominios"; App::$strings["One site per line. Leave empty to allow from any site by default"] = "Un sitio por línea. Dejar en blanco para permitirlo por defecto desde cualquier sitio"; App::$strings["Block embedded HTML from these domains"] = "Bloquear contenido con HTML incorporado desde estos dominios"; -App::$strings["Cooperative embed security"] = "Seguridad cooperativa incorporada"; -App::$strings["Enable to share embed security with other compatible sites/hubs"] = "Habilitar la compartición de seguridad incorporada con otros sitios compatibles"; App::$strings["Update has been marked successful"] = "La actualización ha sido marcada como exitosa"; App::$strings["Executing %s failed. Check system logs."] = "La ejecución de %s ha fallado. Mirar en los informes del sistema."; App::$strings["Update %s was successfully applied."] = "La actualización de %s se ha realizado exitosamente."; @@ -428,6 +426,7 @@ App::$strings["Connection requests will be approved without your interaction"] = App::$strings["This connection's primary address is"] = "La dirección primaria de esta conexión es"; App::$strings["Available locations:"] = "Ubicaciones disponibles:"; App::$strings["The permissions indicated on this page will be applied to all new connections."] = "Los permisos indicados en esta página serán aplicados en todas las nuevas conexiones."; +App::$strings["Connection Tools"] = "Gestión de las conexiones"; App::$strings["Slide to adjust your degree of friendship"] = "Deslizar para ajustar el grado de amistad"; App::$strings["Rating"] = "Valoración"; App::$strings["Slide to adjust your rating"] = "Deslizar para ajustar su valoración"; @@ -523,25 +522,25 @@ App::$strings["Italic"] = "Itálico "; App::$strings["Underline"] = "Subrayar"; App::$strings["Quote"] = "Citar"; App::$strings["Code"] = "Código"; -App::$strings["Upload photo"] = "Subir foto"; App::$strings["Attach file"] = "Adjuntar fichero"; -App::$strings["Insert YouTube video"] = "Insertar vídeo de YouTube"; -App::$strings["Insert Vorbis [.ogg] video"] = "Insertar vídeo Vorbis [.ogg]"; -App::$strings["Insert Vorbis [.ogg] audio"] = "Insertar audio Vorbis [.ogg]"; -App::$strings["Set your location"] = "Establecer su ubicación"; -App::$strings["Clear browser location"] = "Eliminar los datos de localización geográfica del navegador"; -App::$strings["Please wait"] = "Espere por favor"; App::$strings["Permission settings"] = "Configuración de permisos"; App::$strings["Public post"] = "Entrada pública"; App::$strings["Title (optional)"] = "Título (opcional)"; App::$strings["Categories (optional, comma-separated list)"] = "Categorías (opcional, lista separada por comas)"; App::$strings["Example: bob@example.com, mary@example.com"] = "Ejemplo: roberto@ejemplo.com, maría@ejemplo.com"; App::$strings["Preview"] = "Previsualizar"; -App::$strings["Set expiration date"] = "Configurar fecha de caducidad"; App::$strings["Edit Block"] = "Modificar este bloque"; App::$strings["Delete layout?"] = "¿Borrar la plantilla?"; +App::$strings["Upload photo"] = "Subir foto"; +App::$strings["Insert YouTube video"] = "Insertar vídeo de YouTube"; +App::$strings["Insert Vorbis [.ogg] video"] = "Insertar vídeo Vorbis [.ogg]"; +App::$strings["Insert Vorbis [.ogg] audio"] = "Insertar audio Vorbis [.ogg]"; +App::$strings["Set your location"] = "Establecer su ubicación"; +App::$strings["Clear browser location"] = "Eliminar los datos de localización geográfica del navegador"; +App::$strings["Please wait"] = "Espere por favor"; App::$strings["Layout Description (Optional)"] = "Descripción de la plantilla (opcional)"; App::$strings["Layout Name"] = "Nombre de la plantilla"; +App::$strings["Set expiration date"] = "Configurar fecha de caducidad"; App::$strings["Edit Layout"] = "Modificar la plantilla"; App::$strings["Item is not editable"] = "El elemento no es editable"; App::$strings["Expires YYYY-MM-DD HH:MM"] = "Caduca YYYY-MM-DD HH:MM"; @@ -938,6 +937,7 @@ App::$strings["__ctx:noun__ Dislike"] = array( 0 => "No me gusta", 1 => "No me gusta", ); +App::$strings["Photo Tools"] = "Gestión de las fotos"; App::$strings["In This Photo:"] = "En esta foto:"; App::$strings["Map"] = "Mapa"; App::$strings["__ctx:noun__ Likes"] = "Me gusta"; @@ -982,6 +982,7 @@ App::$strings["Hide your connections list from viewers of this profile"] = "Ocul App::$strings["Edit Profile Details"] = "Modificar los detalles de este perfil"; App::$strings["View this profile"] = "Ver este perfil"; App::$strings["Edit visibility"] = "Editar visibilidad"; +App::$strings["Profile Tools"] = "Gestión del perfil"; App::$strings["Change cover photo"] = "Cambiar la imagen de portada del perfil"; App::$strings["Change profile photo"] = "Cambiar la foto del perfil"; App::$strings["Create a new profile using these settings"] = "Crear un nuevo perfil usando estos ajustes"; @@ -1573,7 +1574,85 @@ App::$strings["public profile"] = "el perfil público"; App::$strings["%1\$s changed %2\$s to “%3\$s”"] = "%1\$s ha cambiado %2\$s a “%3\$s”"; App::$strings["Visit %1\$s's %2\$s"] = "Visitar %2\$s de %1\$s"; App::$strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s ha actualizado %2\$s, cambiando %3\$s."; -App::$strings["Public Timeline"] = "Cronología pública"; +App::$strings["prev"] = "anterior"; +App::$strings["first"] = "primera"; +App::$strings["last"] = "última"; +App::$strings["next"] = "próxima"; +App::$strings["older"] = "más antiguas"; +App::$strings["newer"] = "más recientes"; +App::$strings["No connections"] = "Sin conexiones"; +App::$strings["View all %s connections"] = "Ver todas las %s conexiones"; +App::$strings["poke"] = "un toque"; +App::$strings["poked"] = "ha dado un toque a"; +App::$strings["ping"] = "un \"ping\""; +App::$strings["pinged"] = "ha enviado un \"ping\" a"; +App::$strings["prod"] = "una incitación "; +App::$strings["prodded"] = "ha incitado a "; +App::$strings["slap"] = "una bofetada "; +App::$strings["slapped"] = "ha abofeteado a "; +App::$strings["finger"] = "un \"finger\" "; +App::$strings["fingered"] = "envió un \"finger\" a"; +App::$strings["rebuff"] = "un reproche"; +App::$strings["rebuffed"] = "ha hecho un reproche a "; +App::$strings["happy"] = "feliz "; +App::$strings["sad"] = "triste "; +App::$strings["mellow"] = "tranquilo/a"; +App::$strings["tired"] = "cansado/a "; +App::$strings["perky"] = "vivaz"; +App::$strings["angry"] = "enfadado/a"; +App::$strings["stupefied"] = "asombrado/a"; +App::$strings["puzzled"] = "perplejo/a"; +App::$strings["interested"] = "interesado/a"; +App::$strings["bitter"] = "amargado/a"; +App::$strings["cheerful"] = "alegre"; +App::$strings["alive"] = "animado/a"; +App::$strings["annoyed"] = "molesto/a"; +App::$strings["anxious"] = "ansioso/a"; +App::$strings["cranky"] = "de mal humor"; +App::$strings["disturbed"] = "perturbado/a"; +App::$strings["frustrated"] = "frustrado/a"; +App::$strings["depressed"] = "deprimido/a"; +App::$strings["motivated"] = "motivado/a"; +App::$strings["relaxed"] = "relajado/a"; +App::$strings["surprised"] = "sorprendido/a"; +App::$strings["Monday"] = "lunes"; +App::$strings["Tuesday"] = "martes"; +App::$strings["Wednesday"] = "miércoles"; +App::$strings["Thursday"] = "jueves"; +App::$strings["Friday"] = "viernes"; +App::$strings["Saturday"] = "sábado"; +App::$strings["Sunday"] = "domingo"; +App::$strings["January"] = "enero"; +App::$strings["February"] = "febrero"; +App::$strings["March"] = "marzo"; +App::$strings["April"] = "abril"; +App::$strings["May"] = "mayo"; +App::$strings["June"] = "junio"; +App::$strings["July"] = "julio"; +App::$strings["August"] = "agosto"; +App::$strings["September"] = "septiembre"; +App::$strings["October"] = "octubre"; +App::$strings["November"] = "noviembre"; +App::$strings["December"] = "diciembre"; +App::$strings["Unknown Attachment"] = "Adjunto no reconocido"; +App::$strings["unknown"] = "desconocido"; +App::$strings["remove category"] = "eliminar categoría"; +App::$strings["remove from file"] = "eliminar del fichero"; +App::$strings["l F d, Y \\@ g:i A"] = "l d de F, Y \\@ G:i"; +App::$strings["Starts:"] = "Comienza:"; +App::$strings["Finishes:"] = "Finaliza:"; +App::$strings["default"] = "por defecto"; +App::$strings["Page layout"] = "Plantilla de la página"; +App::$strings["You can create your own with the layouts tool"] = "Puede crear su propia disposición gráfica con la herramienta de plantillas"; +App::$strings["Page content type"] = "Tipo de contenido de la página"; +App::$strings["Select an alternate language"] = "Seleccionar un idioma alternativo"; +App::$strings["activity"] = "la actividad"; +App::$strings["Design Tools"] = "Herramientas de diseño web"; +App::$strings["Pages"] = "Páginas"; +App::$strings["Invalid data packet"] = "Paquete de datos no válido"; +App::$strings["Unable to verify channel signature"] = "No ha sido posible de verificar la firma del canal"; +App::$strings["Unable to verify site signature for %s"] = "No ha sido posible de verificar la firma del sitio para %s"; +App::$strings["invalid target signature"] = "La firma recibida no es válida"; App::$strings["Site Admin"] = "Administrador del sitio"; App::$strings["Bookmarks"] = "Marcadores"; App::$strings["Address Book"] = "Libreta de direcciones"; @@ -1592,28 +1671,12 @@ App::$strings["Features"] = "Funcionalidades"; App::$strings["Post"] = "Publicación"; App::$strings["Install"] = "Instalar"; App::$strings["Purchase"] = "Comprar"; -App::$strings["view full size"] = "Ver en el tamaño original"; -App::$strings["\$Projectname Notification"] = "Notificación de \$Projectname"; -App::$strings["\$projectname"] = "\$projectname"; -App::$strings["Thank You,"] = "Gracias,"; -App::$strings["%s Administrator"] = "%s Administrador"; -App::$strings["No Subject"] = "Sin asunto"; +App::$strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "No se ha podido crear un canal con un identificador que ya existe en este sistema. La importación ha fallado."; +App::$strings["Channel clone failed. Import failed."] = "La clonación del canal no ha salido bien. La importación ha fallado."; App::$strings["Attachments:"] = "Ficheros adjuntos:"; -App::$strings["l F d, Y \\@ g:i A"] = "l d de F, Y \\@ G:i"; App::$strings["\$Projectname event notification:"] = "Notificación de eventos de \$Projectname:"; -App::$strings["Starts:"] = "Comienza:"; -App::$strings["Finishes:"] = "Finaliza:"; -App::$strings["Image/photo"] = "Imagen/foto"; -App::$strings["Encrypted content"] = "Contenido cifrado"; -App::$strings["Install %s element: "] = "Instalar el elemento %s:"; -App::$strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Esta entrada contiene el elemento instalable %s, sin embargo le faltan permisos para instalarlo en este sitio."; -App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s escribió %2\$s siguiente %3\$s"; -App::$strings["Different viewers will see this text differently"] = "Visitantes diferentes verán este texto de forma distinta"; -App::$strings["$1 spoiler"] = "$1 spoiler"; -App::$strings["$1 wrote:"] = "$1 escribió:"; App::$strings["%1\$s is now connected with %2\$s"] = "%1\$s ahora está conectado/a con %2\$s"; App::$strings["%1\$s poked %2\$s"] = "%1\$s ha dado un toque a %2\$s"; -App::$strings["poked"] = "ha dado un toque a"; App::$strings["View %s's profile @ %s"] = "Ver el perfil @ %s de %s"; App::$strings["Categories:"] = "Categorías:"; App::$strings["Filed under:"] = "Archivado bajo:"; @@ -1718,6 +1781,7 @@ App::$strings["User '%s' deleted"] = "El usuario '%s' ha sido eliminado"; App::$strings["Logged out."] = "Desconectado/a."; App::$strings["Failed authentication"] = "Autenticación fallida."; App::$strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "El \"token\" de seguridad del formulario no es correcto. Esto ha ocurrido probablemente porque el formulario ha estado abierto demasiado tiempo (>3 horas) antes de ser enviado"; +App::$strings["Public Timeline"] = "Cronología pública"; App::$strings["Frequently"] = "Frecuentemente"; App::$strings["Hourly"] = "Cada hora"; App::$strings["Twice daily"] = "Dos veces al día"; @@ -1808,6 +1872,10 @@ App::$strings["Directory Options"] = "Opciones del directorio"; App::$strings["Safe Mode"] = "Modo seguro"; App::$strings["Public Forums Only"] = "Solo foros públicos"; App::$strings["This Website Only"] = "Solo este sitio web"; +App::$strings["\$Projectname Notification"] = "Notificación de \$Projectname"; +App::$strings["\$projectname"] = "\$projectname"; +App::$strings["Thank You,"] = "Gracias,"; +App::$strings["%s Administrator"] = "%s Administrador"; App::$strings["%s <!item_type!>"] = "%s <!item_type!>"; App::$strings["[Hubzilla:Notify] New mail received at %s"] = "[Hubzilla:Aviso] Nuevo mensaje en %s"; App::$strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s le ha enviado un nuevo mensaje privado en %3\$s."; @@ -1932,6 +2000,15 @@ App::$strings["Edit group"] = "Editar grupo"; App::$strings["Add privacy group"] = "Añadir un grupo de canales"; App::$strings["Channels not in any privacy group"] = "Sin canales en ningún grupo"; App::$strings["add"] = "añadir"; +App::$strings["Image/photo"] = "Imagen/foto"; +App::$strings["Encrypted content"] = "Contenido cifrado"; +App::$strings["Install %s element: "] = "Instalar el elemento %s:"; +App::$strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Esta entrada contiene el elemento instalable %s, sin embargo le faltan permisos para instalarlo en este sitio."; +App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s escribió %2\$s siguiente %3\$s"; +App::$strings["Click to open/close"] = "Pulsar para abrir/cerrar"; +App::$strings["spoiler"] = "spoiler"; +App::$strings["Different viewers will see this text differently"] = "Visitantes diferentes verán este texto de forma distinta"; +App::$strings["$1 wrote:"] = "$1 escribió:"; App::$strings["(Unknown)"] = "(Desconocido)"; App::$strings["Visible to anybody on the internet."] = "Visible para cualquiera en internet."; App::$strings["Visible to you only."] = "Visible sólo para usted."; @@ -1945,12 +2022,8 @@ App::$strings["Privacy group is empty."] = "El grupo de canales está vacío."; App::$strings["Privacy group: %s"] = "Grupo de canales: %s"; App::$strings["Connection not found."] = "Conexión no encontrada"; App::$strings["profile photo"] = "foto del perfil"; -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["Photo storage failed."] = "La foto no ha podido ser guardada."; -App::$strings["a new photo"] = "una nueva foto"; -App::$strings["__ctx:photo_upload__ %1\$s posted %2\$s to %3\$s"] = "%1\$s ha publicado %2\$s en %3\$s"; -App::$strings["Upload New Photos"] = "Subir nuevas fotos"; +App::$strings["view full size"] = "Ver en el tamaño original"; +App::$strings["No Subject"] = "Sin asunto"; App::$strings["System"] = "Sistema"; App::$strings["Create Personal App"] = "Crear una aplicación personal"; App::$strings["Edit Personal App"] = "Editar una aplicación personal"; @@ -2052,18 +2125,7 @@ App::$strings["about a year"] = "alrededor de un año"; App::$strings["%d years"] = "%d años"; App::$strings[" "] = " "; App::$strings["timeago.numbers"] = "timeago.numbers"; -App::$strings["January"] = "enero"; -App::$strings["February"] = "febrero"; -App::$strings["March"] = "marzo"; -App::$strings["April"] = "abril"; App::$strings["__ctx:long__ May"] = "mayo"; -App::$strings["June"] = "junio"; -App::$strings["July"] = "julio"; -App::$strings["August"] = "agosto"; -App::$strings["September"] = "septiembre"; -App::$strings["October"] = "octubre"; -App::$strings["November"] = "noviembre"; -App::$strings["December"] = "diciembre"; App::$strings["Jan"] = "ene"; App::$strings["Feb"] = "feb"; App::$strings["Mar"] = "mar"; @@ -2076,13 +2138,6 @@ App::$strings["Sep"] = "sep"; App::$strings["Oct"] = "oct"; App::$strings["Nov"] = "nov"; App::$strings["Dec"] = "dic"; -App::$strings["Sunday"] = "domingo"; -App::$strings["Monday"] = "lunes"; -App::$strings["Tuesday"] = "martes"; -App::$strings["Wednesday"] = "miércoles"; -App::$strings["Thursday"] = "jueves"; -App::$strings["Friday"] = "viernes"; -App::$strings["Saturday"] = "sábado"; App::$strings["Sun"] = "dom"; App::$strings["Mon"] = "lun"; App::$strings["Tue"] = "mar"; @@ -2099,101 +2154,6 @@ App::$strings["No recipient provided."] = "No se ha especificado ningún destina App::$strings["[no subject]"] = "[sin asunto]"; App::$strings["Unable to determine sender."] = "No ha sido posible determinar el remitente. "; App::$strings["Stored post could not be verified."] = "No se han podido verificar las publicaciones guardadas."; -App::$strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "No se ha podido crear un canal con un identificador que ya existe en este sistema. La importación ha fallado."; -App::$strings["Channel clone failed. Import failed."] = "La clonación del canal no ha salido bien. La importación ha fallado."; -App::$strings["Embedded content"] = "Contenido incorporado"; -App::$strings["Embedding disabled"] = "Incrustación deshabilitada"; -App::$strings["New Page"] = "Nueva página"; -App::$strings["Title"] = "Título"; -App::$strings["Can view my normal stream and posts"] = "Pueden verse mi actividad y publicaciones normales"; -App::$strings["Can view my default channel profile"] = "Puede verse mi perfil de canal predeterminado."; -App::$strings["Can view my connections"] = "Pueden verse mis conexiones"; -App::$strings["Can view my file storage and photos"] = "Pueden verse mi repositorio de ficheros y mis fotos"; -App::$strings["Can view my webpages"] = "Pueden verse mis páginas web"; -App::$strings["Can send me their channel stream and posts"] = "Me pueden enviar sus entradas y contenidos del canal"; -App::$strings["Can post on my channel page (\"wall\")"] = "Pueden crearse entradas en mi página de inicio del canal (“muro”)"; -App::$strings["Can comment on or like my posts"] = "Pueden publicarse comentarios en mis publicaciones o marcar mis entradas con 'me gusta'."; -App::$strings["Can send me private mail messages"] = "Se me pueden enviar mensajes privados"; -App::$strings["Can like/dislike stuff"] = "Puede marcarse contenido como me gusta/no me gusta"; -App::$strings["Profiles and things other than posts/comments"] = "Perfiles y otras cosas aparte de publicaciones/comentarios"; -App::$strings["Can forward to all my channel contacts via post @mentions"] = "Puede enviarse una entrada a todos mis contactos del canal mediante una @mención"; -App::$strings["Advanced - useful for creating group forum channels"] = "Avanzado - útil para crear canales de foros de discusión o grupos"; -App::$strings["Can chat with me (when available)"] = "Se puede charlar conmigo (cuando esté disponible)"; -App::$strings["Can write to my file storage and photos"] = "Puede escribirse en mi repositorio de ficheros y fotos"; -App::$strings["Can edit my webpages"] = "Pueden editarse mis páginas web"; -App::$strings["Can source my public posts in derived channels"] = "Pueden utilizarse mis publicaciones públicas como origen de contenidos en canales derivados"; -App::$strings["Somewhat advanced - very useful in open communities"] = "Algo avanzado - muy útil en comunidades abiertas"; -App::$strings["Can administer my channel resources"] = "Pueden administrarse mis recursos del canal"; -App::$strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Muy avanzado. Déjelo a no ser que sepa bien lo que está haciendo."; -App::$strings["Social Networking"] = "Redes sociales"; -App::$strings["Social - Mostly Public"] = "Social - Público en su mayor parte"; -App::$strings["Social - Restricted"] = "Social - Restringido"; -App::$strings["Social - Private"] = "Social - Privado"; -App::$strings["Community Forum"] = "Foro de discusión"; -App::$strings["Forum - Mostly Public"] = "Foro - Público en su mayor parte"; -App::$strings["Forum - Restricted"] = "Foro - Restringido"; -App::$strings["Forum - Private"] = "Foro - Privado"; -App::$strings["Feed Republish"] = "Republicar un \"feed\""; -App::$strings["Feed - Mostly Public"] = "Feed - Público en su mayor parte"; -App::$strings["Feed - Restricted"] = "Feed - Restringido"; -App::$strings["Special Purpose"] = "Propósito especial"; -App::$strings["Special - Celebrity/Soapbox"] = "Especial - Celebridad / Tribuna improvisada"; -App::$strings["Special - Group Repository"] = "Especial - Repositorio de grupo"; -App::$strings["Custom/Expert Mode"] = "Modo personalizado/experto"; -App::$strings["prev"] = "anterior"; -App::$strings["first"] = "primera"; -App::$strings["last"] = "última"; -App::$strings["next"] = "próxima"; -App::$strings["older"] = "más antiguas"; -App::$strings["newer"] = "más recientes"; -App::$strings["No connections"] = "Sin conexiones"; -App::$strings["View all %s connections"] = "Ver todas las %s conexiones"; -App::$strings["poke"] = "un toque"; -App::$strings["ping"] = "un \"ping\""; -App::$strings["pinged"] = "ha enviado un \"ping\" a"; -App::$strings["prod"] = "una incitación "; -App::$strings["prodded"] = "ha incitado a "; -App::$strings["slap"] = "una bofetada "; -App::$strings["slapped"] = "ha abofeteado a "; -App::$strings["finger"] = "un \"finger\" "; -App::$strings["fingered"] = "envió un \"finger\" a"; -App::$strings["rebuff"] = "un reproche"; -App::$strings["rebuffed"] = "ha hecho un reproche a "; -App::$strings["happy"] = "feliz "; -App::$strings["sad"] = "triste "; -App::$strings["mellow"] = "tranquilo/a"; -App::$strings["tired"] = "cansado/a "; -App::$strings["perky"] = "vivaz"; -App::$strings["angry"] = "enfadado/a"; -App::$strings["stupefied"] = "asombrado/a"; -App::$strings["puzzled"] = "perplejo/a"; -App::$strings["interested"] = "interesado/a"; -App::$strings["bitter"] = "amargado/a"; -App::$strings["cheerful"] = "alegre"; -App::$strings["alive"] = "animado/a"; -App::$strings["annoyed"] = "molesto/a"; -App::$strings["anxious"] = "ansioso/a"; -App::$strings["cranky"] = "de mal humor"; -App::$strings["disturbed"] = "perturbado/a"; -App::$strings["frustrated"] = "frustrado/a"; -App::$strings["depressed"] = "deprimido/a"; -App::$strings["motivated"] = "motivado/a"; -App::$strings["relaxed"] = "relajado/a"; -App::$strings["surprised"] = "sorprendido/a"; -App::$strings["May"] = "mayo"; -App::$strings["Unknown Attachment"] = "Adjunto no reconocido"; -App::$strings["unknown"] = "desconocido"; -App::$strings["remove category"] = "eliminar categoría"; -App::$strings["remove from file"] = "eliminar del fichero"; -App::$strings["Click to open/close"] = "Pulsar para abrir/cerrar"; -App::$strings["default"] = "por defecto"; -App::$strings["Page layout"] = "Plantilla de la página"; -App::$strings["You can create your own with the layouts tool"] = "Puede crear su propia disposición gráfica con la herramienta de plantillas"; -App::$strings["Page content type"] = "Tipo de contenido de la página"; -App::$strings["Select an alternate language"] = "Seleccionar un idioma alternativo"; -App::$strings["activity"] = "la actividad"; -App::$strings["Design Tools"] = "Herramientas de diseño web"; -App::$strings["Pages"] = "Páginas"; App::$strings["Logout"] = "Finalizar sesión"; App::$strings["End this session"] = "Finalizar esta sesión"; App::$strings["Home"] = "Inicio"; @@ -2234,10 +2194,51 @@ App::$strings["Account/Channel Settings"] = "Ajustes de cuenta/canales"; App::$strings["Site Setup and Configuration"] = "Ajustes y configuración del sitio"; App::$strings["@name, #tag, ?doc, content"] = "@nombre, #etiqueta, ?ayuda, contenido"; App::$strings["Please wait..."] = "Espere por favor…"; -App::$strings["Invalid data packet"] = "Paquete de datos no válido"; -App::$strings["Unable to verify channel signature"] = "No ha sido posible de verificar la firma del canal"; -App::$strings["Unable to verify site signature for %s"] = "No ha sido posible de verificar la firma del sitio para %s"; -App::$strings["invalid target signature"] = "La firma recibida no es válida"; +App::$strings["Embedded content"] = "Contenido incorporado"; +App::$strings["Embedding disabled"] = "Incrustación deshabilitada"; +App::$strings["New Page"] = "Nueva página"; +App::$strings["Title"] = "Título"; +App::$strings["Can view my normal stream and posts"] = "Pueden verse mi actividad y publicaciones normales"; +App::$strings["Can view my default channel profile"] = "Puede verse mi perfil de canal predeterminado."; +App::$strings["Can view my connections"] = "Pueden verse mis conexiones"; +App::$strings["Can view my file storage and photos"] = "Pueden verse mi repositorio de ficheros y mis fotos"; +App::$strings["Can view my webpages"] = "Pueden verse mis páginas web"; +App::$strings["Can send me their channel stream and posts"] = "Me pueden enviar sus entradas y contenidos del canal"; +App::$strings["Can post on my channel page (\"wall\")"] = "Pueden crearse entradas en mi página de inicio del canal (“muro”)"; +App::$strings["Can comment on or like my posts"] = "Pueden publicarse comentarios en mis publicaciones o marcar mis entradas con 'me gusta'."; +App::$strings["Can send me private mail messages"] = "Se me pueden enviar mensajes privados"; +App::$strings["Can like/dislike stuff"] = "Puede marcarse contenido como me gusta/no me gusta"; +App::$strings["Profiles and things other than posts/comments"] = "Perfiles y otras cosas aparte de publicaciones/comentarios"; +App::$strings["Can forward to all my channel contacts via post @mentions"] = "Puede enviarse una entrada a todos mis contactos del canal mediante una @mención"; +App::$strings["Advanced - useful for creating group forum channels"] = "Avanzado - útil para crear canales de foros de discusión o grupos"; +App::$strings["Can chat with me (when available)"] = "Se puede charlar conmigo (cuando esté disponible)"; +App::$strings["Can write to my file storage and photos"] = "Puede escribirse en mi repositorio de ficheros y fotos"; +App::$strings["Can edit my webpages"] = "Pueden editarse mis páginas web"; +App::$strings["Can source my public posts in derived channels"] = "Pueden utilizarse mis publicaciones públicas como origen de contenidos en canales derivados"; +App::$strings["Somewhat advanced - very useful in open communities"] = "Algo avanzado - muy útil en comunidades abiertas"; +App::$strings["Can administer my channel resources"] = "Pueden administrarse mis recursos del canal"; +App::$strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Muy avanzado. Déjelo a no ser que sepa bien lo que está haciendo."; +App::$strings["Social Networking"] = "Redes sociales"; +App::$strings["Social - Mostly Public"] = "Social - Público en su mayor parte"; +App::$strings["Social - Restricted"] = "Social - Restringido"; +App::$strings["Social - Private"] = "Social - Privado"; +App::$strings["Community Forum"] = "Foro de discusión"; +App::$strings["Forum - Mostly Public"] = "Foro - Público en su mayor parte"; +App::$strings["Forum - Restricted"] = "Foro - Restringido"; +App::$strings["Forum - Private"] = "Foro - Privado"; +App::$strings["Feed Republish"] = "Republicar un \"feed\""; +App::$strings["Feed - Mostly Public"] = "Feed - Público en su mayor parte"; +App::$strings["Feed - Restricted"] = "Feed - Restringido"; +App::$strings["Special Purpose"] = "Propósito especial"; +App::$strings["Special - Celebrity/Soapbox"] = "Especial - Celebridad / Tribuna improvisada"; +App::$strings["Special - Group Repository"] = "Especial - Repositorio de grupo"; +App::$strings["Custom/Expert Mode"] = "Modo personalizado/experto"; +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["Photo storage failed."] = "La foto no ha podido ser guardada."; +App::$strings["a new photo"] = "una nueva foto"; +App::$strings["__ctx:photo_upload__ %1\$s posted %2\$s to %3\$s"] = "%1\$s ha publicado %2\$s en %3\$s"; +App::$strings["Upload New Photos"] = "Subir nuevas fotos"; App::$strings["Focus (Hubzilla default)"] = "Focus (predefinido)"; App::$strings["Theme settings"] = "Ajustes del tema"; App::$strings["Select scheme"] = "Elegir un esquema"; diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index 21ce2d150..33d825b55 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -103,7 +103,7 @@ function submit_form(e) { function getWord(text, caretPos) { var index = text.indexOf(caretPos); var postText = text.substring(caretPos, caretPos+8); - if ((postText.indexOf("[/list]") > 0) || postText.indexOf("[/ul]") > 0 || postText.indexOf("[/ol]") > 0) { + if ((postText.indexOf('[/list]') > 0) || postText.indexOf('[/ul]') > 0 || postText.indexOf('[/ol]') > 0 || postText.indexOf('[/dl]') > 0) { return postText; } } @@ -143,8 +143,11 @@ function listNewLineAutocomplete(id) { if (word != null) { var textBefore = text.value.substring(0, caretPos); var textAfter = text.value.substring(caretPos, text.length); - $('#' + id).val(textBefore + '\r\n[*] ' + textAfter); - setCaretPosition(text, caretPos + 5); + var textInsert = (word.indexOf('[/dl]') > 0) ? '\r\n[*=] ' : '\r\n[*] '; + var caretPositionDiff = (word.indexOf('[/dl]') > 0) ? 3 : 1; + + $('#' + id).val(textBefore + textInsert + textAfter); + setCaretPosition(text, caretPos + (textInsert.length - caretPositionDiff)); return true; } else { @@ -265,7 +268,7 @@ function string2bb(element) { $.fn.bbco_autocomplete = function(type) { if(type=='bbcode') { - var open_close_elements = ['bold', 'italic', 'underline', 'overline', 'strike', 'superscript', 'subscript', 'quote', 'code', 'open', 'spoiler', 'map', 'nobb', 'list', 'ul', 'ol', 'li', 'table', 'tr', 'th', 'td', 'center', 'color', 'font', 'size', 'zrl', 'zmg', 'rpost', 'qr', 'observer']; + var open_close_elements = ['bold', 'italic', 'underline', 'overline', 'strike', 'superscript', 'subscript', 'quote', 'code', 'open', 'spoiler', 'map', 'nobb', 'list', 'ul', 'ol', 'dl', 'li', 'table', 'tr', 'th', 'td', 'center', 'color', 'font', 'size', 'zrl', 'zmg', 'rpost', 'qr', 'observer']; var open_elements = ['observer.baseurl', 'observer.address', 'observer.photo', 'observer.name', 'observer.webname', 'observer.url', '*', 'hr', ]; var elements = open_close_elements.concat(open_elements); @@ -297,9 +300,10 @@ function string2bb(element) { element = string2bb(element); if(open_elements.indexOf(element) < 0) { if(element === 'list' || element === 'ol' || element === 'ul') { - return ['\[' + element + '\]' + '\n\[*\] ', '\n\[/' + element + '\]']; - } - else if(element === 'table') { + return ['\[' + element + '\]' + '\n\[*\] ', '\n\[/' + element + '\]']; + } else if (element === 'dl') { + return ['\[' + element + '\]' + '\n\[*=Item name\] ', '\n\[/' + element + '\]']; + } else if(element === 'table') { return ['\[' + element + '\]' + '\n\[tr\]', '\[/tr\]\n\[/' + element + '\]']; } else { diff --git a/view/nl/hmessages.po b/view/nl/hmessages.po index 85b3676f1..10ca94afc 100644 --- a/view/nl/hmessages.po +++ b/view/nl/hmessages.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Redmatrix\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-04-22 00:01-0700\n" -"PO-Revision-Date: 2016-04-25 13:03+0000\n" +"POT-Creation-Date: 2016-04-29 00:01-0700\n" +"PO-Revision-Date: 2016-04-30 11:56+0000\n" "Last-Translator: jeroenpraat <jeroenpraat@xs4all.nl>\n" "Language-Team: Dutch (http://www.transifex.com/Friendica/red-matrix/language/nl/)\n" "MIME-Version: 1.0\n" @@ -22,7 +22,7 @@ msgstr "" msgid "parent" msgstr "omhoog" -#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2633 +#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2606 msgid "Collection" msgstr "map" @@ -47,7 +47,7 @@ msgid "Schedule Outbox" msgstr "Planning-postvak UIT" #: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Module/Photos.php:797 -#: ../../Zotlabs/Module/Photos.php:1241 ../../include/apps.php:360 +#: ../../Zotlabs/Module/Photos.php:1242 ../../include/apps.php:360 #: ../../include/apps.php:415 ../../include/conversation.php:1037 #: ../../include/widgets.php:1457 msgid "Unknown" @@ -76,7 +76,7 @@ msgstr "Aanmaken" #: ../../Zotlabs/Storage/Browser.php:231 ../../Zotlabs/Storage/Browser.php:305 #: ../../Zotlabs/Module/Cover_photo.php:357 -#: ../../Zotlabs/Module/Photos.php:824 ../../Zotlabs/Module/Photos.php:1365 +#: ../../Zotlabs/Module/Photos.php:824 ../../Zotlabs/Module/Photos.php:1366 #: ../../Zotlabs/Module/Profile_photo.php:368 ../../include/widgets.php:1470 msgid "Upload" msgstr "Uploaden" @@ -124,9 +124,9 @@ msgstr "Bewerken" #: ../../Zotlabs/Module/Blocks.php:161 #: ../../Zotlabs/Module/Connections.php:263 #: ../../Zotlabs/Module/Connedit.php:573 -#: ../../Zotlabs/Module/Editblock.php:187 +#: ../../Zotlabs/Module/Editblock.php:180 #: ../../Zotlabs/Module/Editlayout.php:184 -#: ../../Zotlabs/Module/Editwebpage.php:228 ../../Zotlabs/Module/Group.php:177 +#: ../../Zotlabs/Module/Editwebpage.php:221 ../../Zotlabs/Module/Group.php:177 #: ../../Zotlabs/Module/Photos.php:1172 ../../Zotlabs/Module/Settings.php:651 #: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Module/Webpages.php:191 #: ../../include/ItemObject.php:120 ../../include/apps.php:260 @@ -373,7 +373,7 @@ msgstr "Niet ondersteund" #: ../../Zotlabs/Module/Settings.php:579 ../../include/dir_fns.php:141 #: ../../include/dir_fns.php:142 ../../include/dir_fns.php:143 #: ../../view/theme/redbasic/php/config.php:105 -#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1606 +#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1619 msgid "No" msgstr "Nee" @@ -393,7 +393,7 @@ msgstr "Ja - met goedkeuring" #: ../../Zotlabs/Module/Settings.php:579 ../../include/dir_fns.php:141 #: ../../include/dir_fns.php:142 ../../include/dir_fns.php:143 #: ../../view/theme/redbasic/php/config.php:105 -#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1606 +#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1619 msgid "Yes" msgstr "Ja" @@ -424,7 +424,7 @@ msgstr "Hub-instellingen" #: ../../Zotlabs/Module/Admin.php:1778 ../../Zotlabs/Module/Appman.php:103 #: ../../Zotlabs/Module/Cal.php:341 ../../Zotlabs/Module/Chat.php:194 #: ../../Zotlabs/Module/Chat.php:236 ../../Zotlabs/Module/Connect.php:97 -#: ../../Zotlabs/Module/Connedit.php:733 ../../Zotlabs/Module/Events.php:472 +#: ../../Zotlabs/Module/Connedit.php:734 ../../Zotlabs/Module/Events.php:472 #: ../../Zotlabs/Module/Events.php:669 #: ../../Zotlabs/Module/Filestorage.php:160 #: ../../Zotlabs/Module/Fsuggest.php:112 ../../Zotlabs/Module/Group.php:85 @@ -830,14 +830,6 @@ msgstr "Eén per regel. Laat leeg om standaard vanaf elk domein toe te staan" msgid "Block embedded HTML from these domains" msgstr "Ingesloten (embedded) HTML vanaf deze domeinen blokkeren" -#: ../../Zotlabs/Module/Admin.php:728 -msgid "Cooperative embed security" -msgstr "Met elkaar ingesloten (embedded) HTML beveiligen" - -#: ../../Zotlabs/Module/Admin.php:728 -msgid "Enable to share embed security with other compatible sites/hubs" -msgstr "Beveiliging omtrent ingesloten (embedded) HTML met andere compatibele hubs delen." - #: ../../Zotlabs/Module/Admin.php:743 msgid "Update has been marked successful" msgstr "Update is als succesvol gemarkeerd" @@ -957,7 +949,7 @@ msgstr "Tijd/datum verzoek" #: ../../Zotlabs/Module/Admin.php:997 ../../Zotlabs/Module/Admin.php:1006 #: ../../Zotlabs/Module/Id.php:17 ../../Zotlabs/Module/Id.php:18 -#: ../../include/contact_selectors.php:81 ../../boot.php:1604 +#: ../../include/contact_selectors.php:81 ../../boot.php:1617 msgid "Email" msgstr "E-mail" @@ -1137,7 +1129,7 @@ msgstr "Omschakelen" #: ../../Zotlabs/Module/Admin.php:1274 ../../Zotlabs/Module/Admin.php:1496 #: ../../include/apps.php:134 ../../include/widgets.php:589 -#: ../../include/nav.php:211 +#: ../../include/nav.php:208 msgid "Settings" msgstr "Instellingen" @@ -1254,8 +1246,8 @@ msgstr "Extra informatie (optioneel)" #: ../../Zotlabs/Module/Admin.php:1695 ../../Zotlabs/Module/Admin.php:1715 #: ../../Zotlabs/Module/Filer.php:53 ../../Zotlabs/Module/Rbmark.php:32 -#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/widgets.php:201 -#: ../../include/text.php:905 ../../include/text.php:917 +#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/text.php:905 +#: ../../include/text.php:917 ../../include/widgets.php:201 msgid "Save" msgstr "Opslaan" @@ -1339,7 +1331,7 @@ msgstr "Naam van app" #: ../../Zotlabs/Module/Appman.php:95 ../../Zotlabs/Module/Appman.php:96 #: ../../Zotlabs/Module/Events.php:448 ../../Zotlabs/Module/Events.php:453 -#: ../../Zotlabs/Module/Profiles.php:712 ../../Zotlabs/Module/Profiles.php:716 +#: ../../Zotlabs/Module/Profiles.php:713 ../../Zotlabs/Module/Profiles.php:717 #: ../../include/datetime.php:246 msgid "Required" msgstr "Vereist" @@ -1374,7 +1366,7 @@ msgid "Location (URL) to purchase app" msgstr "Locatie (URL) om de app aan te schaffen" #: ../../Zotlabs/Module/Apps.php:40 ../../include/widgets.php:102 -#: ../../include/nav.php:165 +#: ../../include/nav.php:163 msgid "Apps" msgstr "Apps" @@ -1395,7 +1387,7 @@ msgstr "Kanaal niet gevonden." msgid "Block Name" msgstr "Bloknaam" -#: ../../Zotlabs/Module/Blocks.php:153 ../../include/text.php:2278 +#: ../../Zotlabs/Module/Blocks.php:153 ../../include/text.php:2251 msgid "Blocks" msgstr "Blokken" @@ -1453,7 +1445,7 @@ msgid "l, F j" msgstr "l j F" #: ../../Zotlabs/Module/Cal.php:311 ../../Zotlabs/Module/Events.php:634 -#: ../../include/text.php:1743 +#: ../../include/text.php:1714 msgid "Link to Source" msgstr "Originele locatie" @@ -1547,10 +1539,10 @@ msgstr "Vul een URL in:" msgid "Encrypt text" msgstr "Tekst versleutelen" -#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Editblock.php:149 +#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Editblock.php:148 #: ../../Zotlabs/Module/Editlayout.php:147 #: ../../Zotlabs/Module/Editpost.php:126 -#: ../../Zotlabs/Module/Editwebpage.php:189 ../../Zotlabs/Module/Mail.php:253 +#: ../../Zotlabs/Module/Editwebpage.php:188 ../../Zotlabs/Module/Mail.php:253 #: ../../Zotlabs/Module/Mail.php:383 ../../include/conversation.php:1225 msgid "Insert web link" msgstr "Weblink invoegen" @@ -1588,7 +1580,7 @@ msgid "No chatrooms available" msgstr "Geen chatkanalen beschikbaar" #: ../../Zotlabs/Module/Chat.php:250 ../../Zotlabs/Module/Manage.php:141 -#: ../../Zotlabs/Module/Profiles.php:781 +#: ../../Zotlabs/Module/Profiles.php:782 msgid "Create New" msgstr "Nieuwe aanmaken" @@ -1780,13 +1772,13 @@ msgid "Recent activity" msgstr "Recente activiteit" #: ../../Zotlabs/Module/Connections.php:302 ../../include/text.php:834 -#: ../../include/nav.php:189 +#: ../../include/nav.php:186 msgid "Connections" msgstr "Connecties" #: ../../Zotlabs/Module/Connections.php:306 ../../Zotlabs/Module/Search.php:44 -#: ../../include/apps.php:147 ../../include/text.php:904 -#: ../../include/text.php:916 ../../include/nav.php:167 +#: ../../include/text.php:904 ../../include/text.php:916 +#: ../../include/apps.php:147 ../../include/nav.php:165 msgid "Search" msgstr "Zoeken" @@ -2001,73 +1993,77 @@ msgid "" "connections." msgstr "Permissies die op deze pagina staan vermeld worden op alle nieuwe connecties toegepast." -#: ../../Zotlabs/Module/Connedit.php:715 +#: ../../Zotlabs/Module/Connedit.php:714 +msgid "Connection Tools" +msgstr "Hulpmiddelen" + +#: ../../Zotlabs/Module/Connedit.php:716 msgid "Slide to adjust your degree of friendship" msgstr "Schuif om te bepalen hoe goed je iemand kent en/of mag" -#: ../../Zotlabs/Module/Connedit.php:716 ../../Zotlabs/Module/Rate.php:161 +#: ../../Zotlabs/Module/Connedit.php:717 ../../Zotlabs/Module/Rate.php:161 #: ../../include/js_strings.php:20 msgid "Rating" msgstr "Beoordeling" -#: ../../Zotlabs/Module/Connedit.php:717 +#: ../../Zotlabs/Module/Connedit.php:718 msgid "Slide to adjust your rating" msgstr "Gebruik de schuif om je beoordeling te geven" -#: ../../Zotlabs/Module/Connedit.php:718 ../../Zotlabs/Module/Connedit.php:723 +#: ../../Zotlabs/Module/Connedit.php:719 ../../Zotlabs/Module/Connedit.php:724 msgid "Optionally explain your rating" msgstr "Verklaar jouw beoordeling (niet verplicht)" -#: ../../Zotlabs/Module/Connedit.php:720 +#: ../../Zotlabs/Module/Connedit.php:721 msgid "Custom Filter" msgstr "Berichtenfilter" -#: ../../Zotlabs/Module/Connedit.php:721 +#: ../../Zotlabs/Module/Connedit.php:722 msgid "Only import posts with this text" msgstr "Importeer alleen berichten met deze tekst" -#: ../../Zotlabs/Module/Connedit.php:721 ../../Zotlabs/Module/Connedit.php:722 +#: ../../Zotlabs/Module/Connedit.php:722 ../../Zotlabs/Module/Connedit.php:723 msgid "" "words one per line or #tags or /patterns/ or lang=xx, leave blank to import " "all posts" msgstr "woorden (één per regel), #tags, /regex/ of talen (lang=iso639-1) - laat leeg om alle berichten te importeren" -#: ../../Zotlabs/Module/Connedit.php:722 +#: ../../Zotlabs/Module/Connedit.php:723 msgid "Do not import posts with this text" msgstr "Importeer geen berichten met deze tekst" -#: ../../Zotlabs/Module/Connedit.php:724 +#: ../../Zotlabs/Module/Connedit.php:725 msgid "This information is public!" msgstr "Deze informatie is openbaar!" -#: ../../Zotlabs/Module/Connedit.php:729 +#: ../../Zotlabs/Module/Connedit.php:730 msgid "Connection Pending Approval" msgstr "Connectie moet nog geaccepteerd worden" -#: ../../Zotlabs/Module/Connedit.php:732 +#: ../../Zotlabs/Module/Connedit.php:733 msgid "inherited" msgstr "geërfd" -#: ../../Zotlabs/Module/Connedit.php:734 +#: ../../Zotlabs/Module/Connedit.php:735 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "Kies het profiel dat je aan %s wil tonen wanneer hij/zij ingelogd jouw profiel wil bekijken." -#: ../../Zotlabs/Module/Connedit.php:736 +#: ../../Zotlabs/Module/Connedit.php:737 msgid "Their Settings" msgstr "Hun instellingen" -#: ../../Zotlabs/Module/Connedit.php:737 +#: ../../Zotlabs/Module/Connedit.php:738 msgid "My Settings" msgstr "Mijn instellingen" -#: ../../Zotlabs/Module/Connedit.php:739 +#: ../../Zotlabs/Module/Connedit.php:740 msgid "Individual Permissions" msgstr "Individuele permissies" -#: ../../Zotlabs/Module/Connedit.php:740 +#: ../../Zotlabs/Module/Connedit.php:741 msgid "" "Some permissions may be inherited from your channel's <a " "href=\"settings\"><strong>privacy settings</strong></a>, which have higher " @@ -2075,7 +2071,7 @@ msgid "" " settings here." msgstr "Sommige permissies worden mogelijk overgeërfd van de <a href=\"settings\">privacy-instellingen</a> van jouw kanaal, die een hogere prioriteit hebben dan deze individuele instellingen. Je kan je deze overgeërfde permissies hier <strong>niet</strong> veranderen." -#: ../../Zotlabs/Module/Connedit.php:741 +#: ../../Zotlabs/Module/Connedit.php:742 msgid "" "Some permissions may be inherited from your channel's <a " "href=\"settings\"><strong>privacy settings</strong></a>, which have higher " @@ -2083,7 +2079,7 @@ msgid "" "they wont have any impact unless the inherited setting changes." msgstr "Sommige permissies worden mogelijk overgeërfd van de <a href=\"settings\">privacy-instellingen</a> van jouw kanaal, die een hogere prioriteit hebben dan deze individuele permissies. Je kan de permissies hier veranderen, maar die hebben geen effect, tenzij de overgeërfde permissies worden veranderd. " -#: ../../Zotlabs/Module/Connedit.php:742 +#: ../../Zotlabs/Module/Connedit.php:743 msgid "Last update:" msgstr "Laatste wijziging:" @@ -2231,8 +2227,8 @@ msgid "Age:" msgstr "Leeftijd:" #: ../../Zotlabs/Module/Directory.php:311 ../../include/identity.php:1022 -#: ../../include/bb2diaspora.php:509 ../../include/event.php:52 -#: ../../include/text.php:1452 +#: ../../include/text.php:1452 ../../include/bb2diaspora.php:509 +#: ../../include/event.php:52 msgid "Location:" msgstr "Plaats:" @@ -2444,124 +2440,62 @@ msgid "Code" msgstr "Broncode" #: ../../Zotlabs/Module/Editblock.php:147 -#: ../../Zotlabs/Module/Editlayout.php:145 -#: ../../Zotlabs/Module/Editpost.php:124 -#: ../../Zotlabs/Module/Editwebpage.php:187 -#: ../../include/conversation.php:1221 -msgid "Upload photo" -msgstr "Foto uploaden" - -#: ../../Zotlabs/Module/Editblock.php:148 #: ../../Zotlabs/Module/Editlayout.php:146 #: ../../Zotlabs/Module/Editpost.php:125 -#: ../../Zotlabs/Module/Editwebpage.php:188 ../../Zotlabs/Module/Mail.php:252 +#: ../../Zotlabs/Module/Editwebpage.php:187 ../../Zotlabs/Module/Mail.php:252 #: ../../Zotlabs/Module/Mail.php:382 ../../include/conversation.php:1223 msgid "Attach file" msgstr "Bestand toevoegen" -#: ../../Zotlabs/Module/Editblock.php:150 -#: ../../Zotlabs/Module/Editlayout.php:148 -#: ../../Zotlabs/Module/Editpost.php:127 -#: ../../Zotlabs/Module/Editwebpage.php:190 -msgid "Insert YouTube video" -msgstr "YouTube-video invoegen" - #: ../../Zotlabs/Module/Editblock.php:151 -#: ../../Zotlabs/Module/Editlayout.php:149 -#: ../../Zotlabs/Module/Editpost.php:128 -#: ../../Zotlabs/Module/Editwebpage.php:191 -msgid "Insert Vorbis [.ogg] video" -msgstr "Vorbis-video [.ogg] invoegen" - -#: ../../Zotlabs/Module/Editblock.php:152 -#: ../../Zotlabs/Module/Editlayout.php:150 -#: ../../Zotlabs/Module/Editpost.php:129 -#: ../../Zotlabs/Module/Editwebpage.php:192 -msgid "Insert Vorbis [.ogg] audio" -msgstr "Vorbis-audio [.ogg] invoegen" - -#: ../../Zotlabs/Module/Editblock.php:153 -#: ../../Zotlabs/Module/Editlayout.php:151 -#: ../../Zotlabs/Module/Editpost.php:130 -#: ../../Zotlabs/Module/Editwebpage.php:193 -#: ../../include/conversation.php:1231 -msgid "Set your location" -msgstr "Locatie instellen" - -#: ../../Zotlabs/Module/Editblock.php:154 -#: ../../Zotlabs/Module/Editlayout.php:152 -#: ../../Zotlabs/Module/Editpost.php:131 -#: ../../Zotlabs/Module/Editwebpage.php:194 -#: ../../include/conversation.php:1236 -msgid "Clear browser location" -msgstr "Locatie van webbrowser wissen" - -#: ../../Zotlabs/Module/Editblock.php:155 -#: ../../Zotlabs/Module/Editlayout.php:153 -#: ../../Zotlabs/Module/Editpost.php:135 -#: ../../Zotlabs/Module/Editwebpage.php:195 -#: ../../Zotlabs/Module/Photos.php:1072 ../../include/ItemObject.php:389 -#: ../../include/conversation.php:740 ../../include/conversation.php:1244 -msgid "Please wait" -msgstr "Even wachten" - -#: ../../Zotlabs/Module/Editblock.php:156 #: ../../Zotlabs/Module/Editlayout.php:154 #: ../../Zotlabs/Module/Editpost.php:136 -#: ../../Zotlabs/Module/Editwebpage.php:196 +#: ../../Zotlabs/Module/Editwebpage.php:191 #: ../../Zotlabs/Module/Events.php:470 ../../include/conversation.php:1245 msgid "Permission settings" msgstr "Permissies" -#: ../../Zotlabs/Module/Editblock.php:164 +#: ../../Zotlabs/Module/Editblock.php:159 #: ../../Zotlabs/Module/Editlayout.php:161 #: ../../Zotlabs/Module/Editpost.php:144 -#: ../../Zotlabs/Module/Editwebpage.php:205 +#: ../../Zotlabs/Module/Editwebpage.php:200 #: ../../include/conversation.php:1254 msgid "Public post" msgstr "Openbaar bericht" -#: ../../Zotlabs/Module/Editblock.php:167 +#: ../../Zotlabs/Module/Editblock.php:162 #: ../../Zotlabs/Module/Editpost.php:147 -#: ../../Zotlabs/Module/Editwebpage.php:210 +#: ../../Zotlabs/Module/Editwebpage.php:205 #: ../../include/conversation.php:1239 msgid "Title (optional)" msgstr "Titel (optioneel)" -#: ../../Zotlabs/Module/Editblock.php:170 +#: ../../Zotlabs/Module/Editblock.php:165 #: ../../Zotlabs/Module/Editlayout.php:168 #: ../../Zotlabs/Module/Editpost.php:149 -#: ../../Zotlabs/Module/Editwebpage.php:212 +#: ../../Zotlabs/Module/Editwebpage.php:207 #: ../../include/conversation.php:1243 msgid "Categories (optional, comma-separated list)" msgstr "Categorieën (optioneel, door komma's gescheiden lijst)" -#: ../../Zotlabs/Module/Editblock.php:171 +#: ../../Zotlabs/Module/Editblock.php:166 #: ../../Zotlabs/Module/Editlayout.php:169 #: ../../Zotlabs/Module/Editpost.php:150 -#: ../../Zotlabs/Module/Editwebpage.php:213 +#: ../../Zotlabs/Module/Editwebpage.php:208 #: ../../include/conversation.php:1256 msgid "Example: bob@example.com, mary@example.com" msgstr "Voorbeeld: bob@voorbeeld.nl, mary@voorbeeld.be" -#: ../../Zotlabs/Module/Editblock.php:176 +#: ../../Zotlabs/Module/Editblock.php:171 #: ../../Zotlabs/Module/Editpost.php:155 -#: ../../Zotlabs/Module/Editwebpage.php:217 +#: ../../Zotlabs/Module/Editwebpage.php:212 #: ../../Zotlabs/Module/Events.php:469 ../../Zotlabs/Module/Photos.php:1092 #: ../../Zotlabs/Module/Webpages.php:196 ../../include/ItemObject.php:712 #: ../../include/conversation.php:1186 ../../include/page_widgets.php:40 msgid "Preview" msgstr "Voorvertoning" -#: ../../Zotlabs/Module/Editblock.php:181 -#: ../../Zotlabs/Module/Editlayout.php:178 -#: ../../Zotlabs/Module/Editpost.php:161 -#: ../../Zotlabs/Module/Editwebpage.php:222 ../../Zotlabs/Module/Mail.php:257 -#: ../../Zotlabs/Module/Mail.php:387 ../../include/conversation.php:1269 -msgid "Set expiration date" -msgstr "Verloopdatum instellen" - -#: ../../Zotlabs/Module/Editblock.php:186 +#: ../../Zotlabs/Module/Editblock.php:179 msgid "Edit Block" msgstr "Blok bewerken" @@ -2569,6 +2503,43 @@ msgstr "Blok bewerken" msgid "Delete layout?" msgstr "Lay-out verwijderen?" +#: ../../Zotlabs/Module/Editlayout.php:145 +#: ../../Zotlabs/Module/Editpost.php:124 ../../include/conversation.php:1221 +msgid "Upload photo" +msgstr "Foto uploaden" + +#: ../../Zotlabs/Module/Editlayout.php:148 +#: ../../Zotlabs/Module/Editpost.php:127 +msgid "Insert YouTube video" +msgstr "YouTube-video invoegen" + +#: ../../Zotlabs/Module/Editlayout.php:149 +#: ../../Zotlabs/Module/Editpost.php:128 +msgid "Insert Vorbis [.ogg] video" +msgstr "Vorbis-video [.ogg] invoegen" + +#: ../../Zotlabs/Module/Editlayout.php:150 +#: ../../Zotlabs/Module/Editpost.php:129 +msgid "Insert Vorbis [.ogg] audio" +msgstr "Vorbis-audio [.ogg] invoegen" + +#: ../../Zotlabs/Module/Editlayout.php:151 +#: ../../Zotlabs/Module/Editpost.php:130 ../../include/conversation.php:1231 +msgid "Set your location" +msgstr "Locatie instellen" + +#: ../../Zotlabs/Module/Editlayout.php:152 +#: ../../Zotlabs/Module/Editpost.php:131 ../../include/conversation.php:1236 +msgid "Clear browser location" +msgstr "Locatie van webbrowser wissen" + +#: ../../Zotlabs/Module/Editlayout.php:153 +#: ../../Zotlabs/Module/Editpost.php:135 ../../Zotlabs/Module/Photos.php:1072 +#: ../../include/ItemObject.php:389 ../../include/conversation.php:740 +#: ../../include/conversation.php:1244 +msgid "Please wait" +msgstr "Even wachten" + #: ../../Zotlabs/Module/Editlayout.php:164 #: ../../Zotlabs/Module/Layouts.php:128 msgid "Layout Description (Optional)" @@ -2579,6 +2550,12 @@ msgstr "Lay-out-omschrijving (optioneel)" msgid "Layout Name" msgstr "Naam lay-out" +#: ../../Zotlabs/Module/Editlayout.php:178 +#: ../../Zotlabs/Module/Editpost.php:161 ../../Zotlabs/Module/Mail.php:257 +#: ../../Zotlabs/Module/Mail.php:387 ../../include/conversation.php:1269 +msgid "Set expiration date" +msgstr "Verloopdatum instellen" + #: ../../Zotlabs/Module/Editlayout.php:183 msgid "Edit Layout" msgstr "Lay-out bewerken" @@ -2623,7 +2600,7 @@ msgstr "Webpagina verwijderen?" msgid "Page link title" msgstr "Titel van paginalink" -#: ../../Zotlabs/Module/Editwebpage.php:227 +#: ../../Zotlabs/Module/Editwebpage.php:220 msgid "Edit Webpage" msgstr "Webpagina bewerken" @@ -2653,8 +2630,8 @@ msgid "Event not found." msgstr "Gebeurtenis niet gevonden" #: ../../Zotlabs/Module/Events.php:253 ../../Zotlabs/Module/Like.php:373 -#: ../../Zotlabs/Module/Tagger.php:51 ../../include/conversation.php:123 -#: ../../include/event.php:915 ../../include/text.php:1970 +#: ../../Zotlabs/Module/Tagger.php:51 ../../include/text.php:1943 +#: ../../include/conversation.php:123 ../../include/event.php:915 msgid "event" msgstr "gebeurtenis" @@ -2717,7 +2694,7 @@ msgid "Edit Location" msgstr "Locatie bewerken" #: ../../Zotlabs/Module/Events.php:463 ../../Zotlabs/Module/Locs.php:117 -#: ../../Zotlabs/Module/Profiles.php:476 ../../Zotlabs/Module/Profiles.php:701 +#: ../../Zotlabs/Module/Profiles.php:476 ../../Zotlabs/Module/Profiles.php:702 #: ../../Zotlabs/Module/Pubsites.php:40 ../../include/js_strings.php:25 msgid "Location" msgstr "Locatie" @@ -2900,7 +2877,7 @@ msgstr "Hulp:" #: ../../Zotlabs/Module/Help.php:85 ../../Zotlabs/Module/Help.php:90 #: ../../Zotlabs/Module/Layouts.php:181 ../../include/apps.php:142 -#: ../../include/nav.php:161 +#: ../../include/nav.php:159 msgid "Help" msgstr "Hulp" @@ -2967,7 +2944,7 @@ msgstr "Profielfoto 128px" msgid "Timezone" msgstr "Tijdzone" -#: ../../Zotlabs/Module/Id.php:29 ../../Zotlabs/Module/Profiles.php:734 +#: ../../Zotlabs/Module/Id.php:29 ../../Zotlabs/Module/Profiles.php:735 msgid "Homepage URL" msgstr "URL homepagina" @@ -3245,7 +3222,7 @@ msgstr "Je hebt jouw limiet van %1$.0f berichten bereikt." msgid "You have reached your limit of %1$.0f webpages." msgstr "Je hebt jouw limiet van %1$.0f webpagina's bereikt." -#: ../../Zotlabs/Module/Layouts.php:179 ../../include/text.php:2280 +#: ../../Zotlabs/Module/Layouts.php:179 ../../include/text.php:2253 msgid "Layouts" msgstr "Lay-outs" @@ -3297,13 +3274,13 @@ msgid "Previous action reversed." msgstr "Vorige actie omgedraaid" #: ../../Zotlabs/Module/Like.php:371 ../../Zotlabs/Module/Subthread.php:87 -#: ../../Zotlabs/Module/Tagger.php:47 ../../include/conversation.php:120 -#: ../../include/text.php:1967 +#: ../../Zotlabs/Module/Tagger.php:47 ../../include/text.php:1940 +#: ../../include/conversation.php:120 msgid "photo" msgstr "foto" #: ../../Zotlabs/Module/Like.php:371 ../../Zotlabs/Module/Subthread.php:87 -#: ../../include/conversation.php:148 ../../include/text.php:1973 +#: ../../include/text.php:1946 ../../include/conversation.php:148 msgid "status" msgstr "bericht" @@ -3439,7 +3416,7 @@ msgid "" "Password reset failed." msgstr "Het verzoek kon niet worden geverifieerd. (Mogelijk heb je al eerder een verzoek ingediend.) Opnieuw instellen van wachtwoord is mislukt." -#: ../../Zotlabs/Module/Lostpass.php:90 ../../boot.php:1610 +#: ../../Zotlabs/Module/Lostpass.php:90 ../../boot.php:1623 msgid "Password Reset" msgstr "Wachtwoord vergeten?" @@ -3586,7 +3563,7 @@ msgid "Create a new channel" msgstr "Nieuw kanaal aanmaken" #: ../../Zotlabs/Module/Manage.php:162 ../../include/apps.php:132 -#: ../../include/nav.php:209 +#: ../../include/nav.php:206 msgid "Channel Manager" msgstr "Kanaalbeheer" @@ -3672,7 +3649,7 @@ msgstr "Menu kan gebruikt worden om bladwijzers in op te slaan" msgid "Submit and proceed" msgstr "Opslaan en doorgaan" -#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2279 +#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2252 msgid "Menus" msgstr "Menu's" @@ -3964,7 +3941,7 @@ msgstr "Geen systeemnotificaties meer." msgid "System Notifications" msgstr "Systeemnotificaties" -#: ../../Zotlabs/Module/Notifications.php:103 ../../include/nav.php:194 +#: ../../Zotlabs/Module/Notifications.php:103 ../../include/nav.php:191 msgid "Mark all system notifications seen" msgstr "Markeer alle systeemnotificaties als bekeken" @@ -4106,8 +4083,8 @@ msgstr "Omschrijving (optioneel):" msgid "Album name could not be decoded" msgstr "Albumnaam kon niet gedecodeerd worden" -#: ../../Zotlabs/Module/Photos.php:742 ../../Zotlabs/Module/Photos.php:1282 -#: ../../Zotlabs/Module/Photos.php:1299 +#: ../../Zotlabs/Module/Photos.php:742 ../../Zotlabs/Module/Photos.php:1283 +#: ../../Zotlabs/Module/Photos.php:1300 msgid "Contact Photos" msgstr "Connectiefoto's" @@ -4119,7 +4096,7 @@ msgstr "Nieuwste eerst weergeven" msgid "Show Oldest First" msgstr "Oudste eerst weergeven" -#: ../../Zotlabs/Module/Photos.php:791 ../../Zotlabs/Module/Photos.php:1332 +#: ../../Zotlabs/Module/Photos.php:791 ../../Zotlabs/Module/Photos.php:1333 #: ../../include/widgets.php:1451 msgid "View Photo" msgstr "Foto weergeven" @@ -4273,35 +4250,39 @@ msgid_plural "Dislikes" msgstr[0] "vindt dit niet leuk" msgstr[1] "vinden dit niet leuk" -#: ../../Zotlabs/Module/Photos.php:1242 +#: ../../Zotlabs/Module/Photos.php:1234 +msgid "Photo Tools" +msgstr "Hulpmiddelen" + +#: ../../Zotlabs/Module/Photos.php:1243 msgid "In This Photo:" msgstr "Op deze foto:" -#: ../../Zotlabs/Module/Photos.php:1247 +#: ../../Zotlabs/Module/Photos.php:1248 msgid "Map" msgstr "Kaart" -#: ../../Zotlabs/Module/Photos.php:1255 ../../include/ItemObject.php:378 +#: ../../Zotlabs/Module/Photos.php:1256 ../../include/ItemObject.php:378 msgctxt "noun" msgid "Likes" msgstr "vinden dit leuk" -#: ../../Zotlabs/Module/Photos.php:1256 ../../include/ItemObject.php:379 +#: ../../Zotlabs/Module/Photos.php:1257 ../../include/ItemObject.php:379 msgctxt "noun" msgid "Dislikes" msgstr "vinden dit niet leuk" -#: ../../Zotlabs/Module/Photos.php:1261 ../../include/ItemObject.php:384 +#: ../../Zotlabs/Module/Photos.php:1262 ../../include/ItemObject.php:384 #: ../../include/acl_selectors.php:252 msgid "Close" msgstr "Sluiten" -#: ../../Zotlabs/Module/Photos.php:1338 +#: ../../Zotlabs/Module/Photos.php:1339 msgid "View Album" msgstr "Album weergeven" -#: ../../Zotlabs/Module/Photos.php:1349 ../../Zotlabs/Module/Photos.php:1362 -#: ../../Zotlabs/Module/Photos.php:1363 +#: ../../Zotlabs/Module/Photos.php:1350 ../../Zotlabs/Module/Photos.php:1363 +#: ../../Zotlabs/Module/Photos.php:1364 msgid "Recent Photos" msgstr "Recente foto's" @@ -4408,15 +4389,15 @@ msgstr "Huwelijke status" msgid "Romantic Partner" msgstr "Romantische partner" -#: ../../Zotlabs/Module/Profiles.php:434 ../../Zotlabs/Module/Profiles.php:739 +#: ../../Zotlabs/Module/Profiles.php:434 ../../Zotlabs/Module/Profiles.php:740 msgid "Likes" msgstr "Houdt van" -#: ../../Zotlabs/Module/Profiles.php:438 ../../Zotlabs/Module/Profiles.php:740 +#: ../../Zotlabs/Module/Profiles.php:438 ../../Zotlabs/Module/Profiles.php:741 msgid "Dislikes" msgstr "Houdt niet van" -#: ../../Zotlabs/Module/Profiles.php:442 ../../Zotlabs/Module/Profiles.php:747 +#: ../../Zotlabs/Module/Profiles.php:442 ../../Zotlabs/Module/Profiles.php:748 msgid "Work/Employment" msgstr "Werk/arbeid" @@ -4456,181 +4437,185 @@ msgstr "Profiel bewerken" msgid "View this profile" msgstr "Profiel weergeven" -#: ../../Zotlabs/Module/Profiles.php:693 ../../Zotlabs/Module/Profiles.php:774 +#: ../../Zotlabs/Module/Profiles.php:693 ../../Zotlabs/Module/Profiles.php:775 #: ../../include/identity.php:952 msgid "Edit visibility" msgstr "Zichtbaarheid bewerken" #: ../../Zotlabs/Module/Profiles.php:694 +msgid "Profile Tools" +msgstr "Hulpmiddelen" + +#: ../../Zotlabs/Module/Profiles.php:695 msgid "Change cover photo" msgstr "Omslagfoto wijzigen" -#: ../../Zotlabs/Module/Profiles.php:695 ../../include/identity.php:923 +#: ../../Zotlabs/Module/Profiles.php:696 ../../include/identity.php:923 msgid "Change profile photo" msgstr "Profielfoto veranderen" -#: ../../Zotlabs/Module/Profiles.php:696 +#: ../../Zotlabs/Module/Profiles.php:697 msgid "Create a new profile using these settings" msgstr "Een nieuw profiel aanmaken met dit profiel als basis" -#: ../../Zotlabs/Module/Profiles.php:697 +#: ../../Zotlabs/Module/Profiles.php:698 msgid "Clone this profile" msgstr "Dit profiel klonen" -#: ../../Zotlabs/Module/Profiles.php:698 +#: ../../Zotlabs/Module/Profiles.php:699 msgid "Delete this profile" msgstr "Dit profiel verwijderen" -#: ../../Zotlabs/Module/Profiles.php:699 +#: ../../Zotlabs/Module/Profiles.php:700 msgid "Add profile things" msgstr "Dingen aan je profiel toevoegen" -#: ../../Zotlabs/Module/Profiles.php:700 ../../include/conversation.php:1544 +#: ../../Zotlabs/Module/Profiles.php:701 ../../include/conversation.php:1544 #: ../../include/widgets.php:105 msgid "Personal" msgstr "Persoonlijk" -#: ../../Zotlabs/Module/Profiles.php:702 +#: ../../Zotlabs/Module/Profiles.php:703 msgid "Relation" msgstr "Relatie" -#: ../../Zotlabs/Module/Profiles.php:703 ../../include/datetime.php:48 +#: ../../Zotlabs/Module/Profiles.php:704 ../../include/datetime.php:48 msgid "Miscellaneous" msgstr "Diversen" -#: ../../Zotlabs/Module/Profiles.php:705 +#: ../../Zotlabs/Module/Profiles.php:706 msgid "Import profile from file" msgstr "Profiel vanuit bestand importeren" -#: ../../Zotlabs/Module/Profiles.php:706 +#: ../../Zotlabs/Module/Profiles.php:707 msgid "Export profile to file" msgstr "Profiel naar bestand exporteren" -#: ../../Zotlabs/Module/Profiles.php:707 +#: ../../Zotlabs/Module/Profiles.php:708 msgid "Your gender" msgstr "Jouw geslacht" -#: ../../Zotlabs/Module/Profiles.php:708 +#: ../../Zotlabs/Module/Profiles.php:709 msgid "Marital status" msgstr "Burgerlijke staat" -#: ../../Zotlabs/Module/Profiles.php:709 +#: ../../Zotlabs/Module/Profiles.php:710 msgid "Sexual preference" msgstr "Seksuele voorkeur" -#: ../../Zotlabs/Module/Profiles.php:712 +#: ../../Zotlabs/Module/Profiles.php:713 msgid "Profile name" msgstr "Profielnaam" -#: ../../Zotlabs/Module/Profiles.php:714 +#: ../../Zotlabs/Module/Profiles.php:715 msgid "This is your default profile." msgstr "Dit is jouw standaardprofiel" -#: ../../Zotlabs/Module/Profiles.php:716 +#: ../../Zotlabs/Module/Profiles.php:717 msgid "Your full name" msgstr "Jouw volledige naam" -#: ../../Zotlabs/Module/Profiles.php:717 +#: ../../Zotlabs/Module/Profiles.php:718 msgid "Title/Description" msgstr "Titel/omschrijving" -#: ../../Zotlabs/Module/Profiles.php:720 +#: ../../Zotlabs/Module/Profiles.php:721 msgid "Street address" msgstr "Straat en huisnummer" -#: ../../Zotlabs/Module/Profiles.php:721 +#: ../../Zotlabs/Module/Profiles.php:722 msgid "Locality/City" msgstr "Woonplaats" -#: ../../Zotlabs/Module/Profiles.php:722 +#: ../../Zotlabs/Module/Profiles.php:723 msgid "Region/State" msgstr "Provincie/gewest/deelstaat" -#: ../../Zotlabs/Module/Profiles.php:723 +#: ../../Zotlabs/Module/Profiles.php:724 msgid "Postal/Zip code" msgstr "Postcode" -#: ../../Zotlabs/Module/Profiles.php:724 +#: ../../Zotlabs/Module/Profiles.php:725 msgid "Country" msgstr "Land" -#: ../../Zotlabs/Module/Profiles.php:729 +#: ../../Zotlabs/Module/Profiles.php:730 msgid "Who (if applicable)" msgstr "Wie (wanneer van toepassing)" -#: ../../Zotlabs/Module/Profiles.php:729 +#: ../../Zotlabs/Module/Profiles.php:730 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "Voorbeelden: petra123, Petra Jansen, petra@voorbeeld.nl" -#: ../../Zotlabs/Module/Profiles.php:730 +#: ../../Zotlabs/Module/Profiles.php:731 msgid "Since (date)" msgstr "Sinds (datum)" -#: ../../Zotlabs/Module/Profiles.php:733 +#: ../../Zotlabs/Module/Profiles.php:734 msgid "Tell us about yourself" msgstr "Vertel ons iets over jezelf" -#: ../../Zotlabs/Module/Profiles.php:735 +#: ../../Zotlabs/Module/Profiles.php:736 msgid "Hometown" msgstr "Oorspronkelijk uit" -#: ../../Zotlabs/Module/Profiles.php:736 +#: ../../Zotlabs/Module/Profiles.php:737 msgid "Political views" msgstr "Politieke overtuigingen" -#: ../../Zotlabs/Module/Profiles.php:737 +#: ../../Zotlabs/Module/Profiles.php:738 msgid "Religious views" msgstr "Religieuze overtuigingen" -#: ../../Zotlabs/Module/Profiles.php:738 +#: ../../Zotlabs/Module/Profiles.php:739 msgid "Keywords used in directory listings" msgstr "Trefwoorden voor in de kanalengids" -#: ../../Zotlabs/Module/Profiles.php:738 +#: ../../Zotlabs/Module/Profiles.php:739 msgid "Example: fishing photography software" msgstr "Voorbeeld: muziek, fotografie, software" -#: ../../Zotlabs/Module/Profiles.php:741 +#: ../../Zotlabs/Module/Profiles.php:742 msgid "Musical interests" msgstr "Muzikale interesses" -#: ../../Zotlabs/Module/Profiles.php:742 +#: ../../Zotlabs/Module/Profiles.php:743 msgid "Books, literature" msgstr "Boeken/literatuur" -#: ../../Zotlabs/Module/Profiles.php:743 +#: ../../Zotlabs/Module/Profiles.php:744 msgid "Television" msgstr "Televisie" -#: ../../Zotlabs/Module/Profiles.php:744 +#: ../../Zotlabs/Module/Profiles.php:745 msgid "Film/Dance/Culture/Entertainment" msgstr "Film/dans/cultuur/entertainment" -#: ../../Zotlabs/Module/Profiles.php:745 +#: ../../Zotlabs/Module/Profiles.php:746 msgid "Hobbies/Interests" msgstr "Hobby's/interesses" -#: ../../Zotlabs/Module/Profiles.php:746 +#: ../../Zotlabs/Module/Profiles.php:747 msgid "Love/Romance" msgstr "Liefde/romantiek" -#: ../../Zotlabs/Module/Profiles.php:748 +#: ../../Zotlabs/Module/Profiles.php:749 msgid "School/Education" msgstr "School/opleiding" -#: ../../Zotlabs/Module/Profiles.php:749 +#: ../../Zotlabs/Module/Profiles.php:750 msgid "Contact information and social networks" msgstr "Contactinformatie en sociale netwerken" -#: ../../Zotlabs/Module/Profiles.php:750 +#: ../../Zotlabs/Module/Profiles.php:751 msgid "My other channels" msgstr "Mijn andere kanalen" -#: ../../Zotlabs/Module/Profiles.php:770 ../../include/identity.php:948 +#: ../../Zotlabs/Module/Profiles.php:771 ../../include/identity.php:948 msgid "Profile Image" msgstr "Profielfoto" -#: ../../Zotlabs/Module/Profiles.php:780 ../../include/identity.php:930 +#: ../../Zotlabs/Module/Profiles.php:781 ../../include/identity.php:930 #: ../../include/nav.php:88 msgid "Edit Profiles" msgstr "Bewerk profielen" @@ -4826,8 +4811,8 @@ msgstr "Ja" msgid "Membership on this site is by invitation only." msgstr "Registreren op deze $Projectname-hub kan alleen op uitnodiging." -#: ../../Zotlabs/Module/Register.php:262 ../../include/nav.php:148 -#: ../../boot.php:1584 +#: ../../Zotlabs/Module/Register.php:262 ../../include/nav.php:147 +#: ../../boot.php:1597 msgid "Register" msgstr "Registreren" @@ -6135,8 +6120,8 @@ msgstr "Negeren/Verbergen" msgid "post" msgstr "bericht" -#: ../../Zotlabs/Module/Tagger.php:57 ../../include/conversation.php:150 -#: ../../include/text.php:1975 +#: ../../Zotlabs/Module/Tagger.php:57 ../../include/text.php:1948 +#: ../../include/conversation.php:150 msgid "comment" msgstr "reactie" @@ -6738,15 +6723,15 @@ msgstr "Registratie ingetrokken voor %s" msgid "Account verified. Please login." msgstr "Account is geverifieerd. Je kan inloggen." -#: ../../include/account.php:719 ../../include/account.php:721 +#: ../../include/account.php:722 ../../include/account.php:724 msgid "Click here to upgrade." msgstr "Klik hier om te upgraden." -#: ../../include/account.php:727 +#: ../../include/account.php:730 msgid "This action exceeds the limits set by your subscription plan." msgstr "Deze handeling overschrijdt de beperkingen die voor jouw abonnement gelden." -#: ../../include/account.php:732 +#: ../../include/account.php:735 msgid "This action is not available under your subscription plan." msgstr "Deze handeling is niet mogelijk met jouw abonnement." @@ -7022,9 +7007,328 @@ msgstr "Bezoek het %2$s van %1$s" msgid "%1$s has an updated %2$s, changing %3$s." msgstr "%1$s heeft een aangepaste %2$s, %3$s veranderd." -#: ../../include/api.php:1338 -msgid "Public Timeline" -msgstr "Openbare tijdlijn" +#: ../../include/text.php:394 +msgid "prev" +msgstr "vorige" + +#: ../../include/text.php:396 +msgid "first" +msgstr "eerste" + +#: ../../include/text.php:425 +msgid "last" +msgstr "laatste" + +#: ../../include/text.php:428 +msgid "next" +msgstr "volgende" + +#: ../../include/text.php:438 +msgid "older" +msgstr "ouder" + +#: ../../include/text.php:440 +msgid "newer" +msgstr "nieuwer" + +#: ../../include/text.php:822 +msgid "No connections" +msgstr "Geen connecties" + +#: ../../include/text.php:847 +#, php-format +msgid "View all %s connections" +msgstr "Toon alle %s connecties" + +#: ../../include/text.php:992 ../../include/text.php:997 +msgid "poke" +msgstr "aanstoten" + +#: ../../include/text.php:992 ../../include/text.php:997 +#: ../../include/conversation.php:243 +msgid "poked" +msgstr "aangestoten" + +#: ../../include/text.php:998 +msgid "ping" +msgstr "ping" + +#: ../../include/text.php:998 +msgid "pinged" +msgstr "gepingd" + +#: ../../include/text.php:999 +msgid "prod" +msgstr "por" + +#: ../../include/text.php:999 +msgid "prodded" +msgstr "gepord" + +#: ../../include/text.php:1000 +msgid "slap" +msgstr "slaan" + +#: ../../include/text.php:1000 +msgid "slapped" +msgstr "sloeg" + +#: ../../include/text.php:1001 +msgid "finger" +msgstr "finger" + +#: ../../include/text.php:1001 +msgid "fingered" +msgstr "gefingerd" + +#: ../../include/text.php:1002 +msgid "rebuff" +msgstr "afpoeieren" + +#: ../../include/text.php:1002 +msgid "rebuffed" +msgstr "afgepoeierd" + +#: ../../include/text.php:1014 +msgid "happy" +msgstr "gelukkig" + +#: ../../include/text.php:1015 +msgid "sad" +msgstr "bedroefd" + +#: ../../include/text.php:1016 +msgid "mellow" +msgstr "mellow" + +#: ../../include/text.php:1017 +msgid "tired" +msgstr "moe" + +#: ../../include/text.php:1018 +msgid "perky" +msgstr "parmantig" + +#: ../../include/text.php:1019 +msgid "angry" +msgstr "boos" + +#: ../../include/text.php:1020 +msgid "stupefied" +msgstr "verbijsterd" + +#: ../../include/text.php:1021 +msgid "puzzled" +msgstr "verward" + +#: ../../include/text.php:1022 +msgid "interested" +msgstr "geïnteresseerd" + +#: ../../include/text.php:1023 +msgid "bitter" +msgstr "verbitterd" + +#: ../../include/text.php:1024 +msgid "cheerful" +msgstr "vrolijk" + +#: ../../include/text.php:1025 +msgid "alive" +msgstr "levendig" + +#: ../../include/text.php:1026 +msgid "annoyed" +msgstr "geërgerd" + +#: ../../include/text.php:1027 +msgid "anxious" +msgstr "bezorgd" + +#: ../../include/text.php:1028 +msgid "cranky" +msgstr "humeurig" + +#: ../../include/text.php:1029 +msgid "disturbed" +msgstr "verontrust" + +#: ../../include/text.php:1030 +msgid "frustrated" +msgstr "gefrustreerd " + +#: ../../include/text.php:1031 +msgid "depressed" +msgstr "gedeprimeerd" + +#: ../../include/text.php:1032 +msgid "motivated" +msgstr "gemotiveerd" + +#: ../../include/text.php:1033 +msgid "relaxed" +msgstr "ontspannen" + +#: ../../include/text.php:1034 +msgid "surprised" +msgstr "verrast" + +#: ../../include/text.php:1206 ../../include/js_strings.php:70 +msgid "Monday" +msgstr "maandag" + +#: ../../include/text.php:1206 ../../include/js_strings.php:71 +msgid "Tuesday" +msgstr "dinsdag" + +#: ../../include/text.php:1206 ../../include/js_strings.php:72 +msgid "Wednesday" +msgstr "woensdag" + +#: ../../include/text.php:1206 ../../include/js_strings.php:73 +msgid "Thursday" +msgstr "donderdag" + +#: ../../include/text.php:1206 ../../include/js_strings.php:74 +msgid "Friday" +msgstr "vrijdag" + +#: ../../include/text.php:1206 ../../include/js_strings.php:75 +msgid "Saturday" +msgstr "zaterdag" + +#: ../../include/text.php:1206 ../../include/js_strings.php:69 +msgid "Sunday" +msgstr "zondag" + +#: ../../include/text.php:1210 ../../include/js_strings.php:45 +msgid "January" +msgstr "januari" + +#: ../../include/text.php:1210 ../../include/js_strings.php:46 +msgid "February" +msgstr "februari" + +#: ../../include/text.php:1210 ../../include/js_strings.php:47 +msgid "March" +msgstr "maart" + +#: ../../include/text.php:1210 ../../include/js_strings.php:48 +msgid "April" +msgstr "april" + +#: ../../include/text.php:1210 +msgid "May" +msgstr "mei" + +#: ../../include/text.php:1210 ../../include/js_strings.php:50 +msgid "June" +msgstr "juni" + +#: ../../include/text.php:1210 ../../include/js_strings.php:51 +msgid "July" +msgstr "juli" + +#: ../../include/text.php:1210 ../../include/js_strings.php:52 +msgid "August" +msgstr "augustus" + +#: ../../include/text.php:1210 ../../include/js_strings.php:53 +msgid "September" +msgstr "september" + +#: ../../include/text.php:1210 ../../include/js_strings.php:54 +msgid "October" +msgstr "oktober" + +#: ../../include/text.php:1210 ../../include/js_strings.php:55 +msgid "November" +msgstr "november" + +#: ../../include/text.php:1210 ../../include/js_strings.php:56 +msgid "December" +msgstr "december" + +#: ../../include/text.php:1287 ../../include/text.php:1291 +msgid "Unknown Attachment" +msgstr "Onbekende bijlage" + +#: ../../include/text.php:1293 +msgid "unknown" +msgstr "onbekend" + +#: ../../include/text.php:1329 +msgid "remove category" +msgstr "categorie verwijderen" + +#: ../../include/text.php:1406 +msgid "remove from file" +msgstr "uit map verwijderen" + +#: ../../include/text.php:1437 ../../include/bb2diaspora.php:487 +#: ../../include/event.php:22 +msgid "l F d, Y \\@ g:i A" +msgstr "l d F Y \\@ G:i" + +#: ../../include/text.php:1441 ../../include/bb2diaspora.php:493 +#: ../../include/event.php:30 +msgid "Starts:" +msgstr "Start:" + +#: ../../include/text.php:1445 ../../include/bb2diaspora.php:501 +#: ../../include/event.php:40 +msgid "Finishes:" +msgstr "Einde:" + +#: ../../include/text.php:1735 ../../include/text.php:1807 +msgid "default" +msgstr "standaard" + +#: ../../include/text.php:1743 +msgid "Page layout" +msgstr "Pagina-lay-out" + +#: ../../include/text.php:1743 +msgid "You can create your own with the layouts tool" +msgstr "Je kan jouw eigen lay-out ontwerpen onder lay-outs" + +#: ../../include/text.php:1785 +msgid "Page content type" +msgstr "Opmaaktype pagina" + +#: ../../include/text.php:1819 +msgid "Select an alternate language" +msgstr "Kies een andere taal" + +#: ../../include/text.php:1953 +msgid "activity" +msgstr "activiteit" + +#: ../../include/text.php:2248 +msgid "Design Tools" +msgstr "Ontwerp-hulpmiddelen" + + +#: ../../include/text.php:2254 +msgid "Pages" +msgstr "Pagina's" + +#: ../../include/zot.php:680 +msgid "Invalid data packet" +msgstr "Datapakket ongeldig" + +#: ../../include/zot.php:696 +msgid "Unable to verify channel signature" +msgstr "Kanaalkenmerk kon niet worden geverifieerd. " + +#: ../../include/zot.php:2332 +#, php-format +msgid "Unable to verify site signature for %s" +msgstr "Hubkenmerk voor %s kon niet worden geverifieerd" + +#: ../../include/zot.php:3670 +msgid "invalid target signature" +msgstr "ongeldig doelkenmerk" #: ../../include/apps.php:128 msgid "Site Admin" @@ -7039,28 +7343,28 @@ msgstr "Bladwijzers" msgid "Address Book" msgstr "Connecties" -#: ../../include/apps.php:131 ../../include/nav.php:110 ../../boot.php:1602 +#: ../../include/apps.php:131 ../../include/nav.php:110 ../../boot.php:1615 msgid "Login" msgstr "Inloggen" -#: ../../include/apps.php:133 ../../include/nav.php:182 +#: ../../include/apps.php:133 ../../include/nav.php:179 msgid "Grid" msgstr "Grid" -#: ../../include/apps.php:137 ../../include/nav.php:185 +#: ../../include/apps.php:137 ../../include/nav.php:182 msgid "Channel Home" msgstr "Jouw kanaal" #: ../../include/apps.php:140 ../../include/conversation.php:1667 -#: ../../include/conversation.php:1670 ../../include/nav.php:204 +#: ../../include/conversation.php:1670 ../../include/nav.php:201 msgid "Events" msgstr "Agenda" -#: ../../include/apps.php:141 ../../include/nav.php:170 +#: ../../include/apps.php:141 ../../include/nav.php:167 msgid "Directory" msgstr "Kanalengids" -#: ../../include/apps.php:143 ../../include/nav.php:196 +#: ../../include/apps.php:143 ../../include/nav.php:193 msgid "Mail" msgstr "Privéberichten" @@ -7100,97 +7404,23 @@ msgstr "Installeren" msgid "Purchase" msgstr "Aanschaffen" -#: ../../include/network.php:659 -msgid "view full size" -msgstr "volledige grootte tonen" - -#: ../../include/network.php:1827 ../../include/enotify.php:57 -msgid "$Projectname Notification" -msgstr "$Projectname-notificatie" - -#: ../../include/network.php:1828 ../../include/enotify.php:58 -msgid "$projectname" -msgstr "$projectname" - -#: ../../include/network.php:1830 ../../include/enotify.php:60 -msgid "Thank You," -msgstr "Bedankt," - -#: ../../include/network.php:1832 ../../include/enotify.php:62 -#, php-format -msgid "%s Administrator" -msgstr "Beheerder %s" +#: ../../include/import.php:23 +msgid "" +"Cannot create a duplicate channel identifier on this system. Import failed." +msgstr "Kan geen dubbele kanaal-identificator op deze hub aanmaken. Importeren mislukt." -#: ../../include/network.php:1889 -msgid "No Subject" -msgstr "Geen onderwerp" +#: ../../include/import.php:70 +msgid "Channel clone failed. Import failed." +msgstr "Het klonen van het kanaal is mislukt. Importeren mislukt." #: ../../include/bb2diaspora.php:398 msgid "Attachments:" msgstr "Bijlagen:" -#: ../../include/bb2diaspora.php:487 ../../include/event.php:22 -#: ../../include/text.php:1437 -msgid "l F d, Y \\@ g:i A" -msgstr "l d F Y \\@ G:i" - #: ../../include/bb2diaspora.php:489 msgid "$Projectname event notification:" msgstr "Notificatie $Projectname-gebeurtenis:" -#: ../../include/bb2diaspora.php:493 ../../include/event.php:30 -#: ../../include/text.php:1441 -msgid "Starts:" -msgstr "Start:" - -#: ../../include/bb2diaspora.php:501 ../../include/event.php:40 -#: ../../include/text.php:1445 -msgid "Finishes:" -msgstr "Einde:" - -#: ../../include/bbcode.php:123 ../../include/bbcode.php:801 -#: ../../include/bbcode.php:804 ../../include/bbcode.php:809 -#: ../../include/bbcode.php:812 ../../include/bbcode.php:815 -#: ../../include/bbcode.php:818 ../../include/bbcode.php:823 -#: ../../include/bbcode.php:826 ../../include/bbcode.php:831 -#: ../../include/bbcode.php:834 ../../include/bbcode.php:837 -#: ../../include/bbcode.php:840 -msgid "Image/photo" -msgstr "Afbeelding/foto" - -#: ../../include/bbcode.php:162 ../../include/bbcode.php:851 -msgid "Encrypted content" -msgstr "Versleutelde inhoud" - -#: ../../include/bbcode.php:179 -#, php-format -msgid "Install %s element: " -msgstr "Installeer %s-element: " - -#: ../../include/bbcode.php:183 -#, php-format -msgid "" -"This post contains an installable %s element, however you lack permissions " -"to install it on this site." -msgstr "Dit bericht heeft een te installeren %s-element, maar je hebt geen permissies om het op deze hub te installeren." - -#: ../../include/bbcode.php:255 -#, php-format -msgid "%1$s wrote the following %2$s %3$s" -msgstr "%1$s schreef het volgende %2$s %3$s" - -#: ../../include/bbcode.php:545 -msgid "Different viewers will see this text differently" -msgstr "Deze tekst wordt per persoon anders weergeven." - -#: ../../include/bbcode.php:762 -msgid "$1 spoiler" -msgstr "$1 spoiler" - -#: ../../include/bbcode.php:789 -msgid "$1 wrote:" -msgstr "$1 schreef:" - #: ../../include/conversation.php:204 #, php-format msgid "%1$s is now connected with %2$s" @@ -7201,11 +7431,6 @@ msgstr "%1$s is nu met %2$s verbonden" msgid "%1$s poked %2$s" msgstr "%1$s heeft %2$s aangestoten" -#: ../../include/conversation.php:243 ../../include/text.php:992 -#: ../../include/text.php:997 -msgid "poked" -msgstr "aangestoten" - #: ../../include/conversation.php:691 #, php-format msgid "View %s's profile @ %s" @@ -7227,7 +7452,7 @@ msgstr "In context bekijken" msgid "remove" msgstr "verwijderen" -#: ../../include/conversation.php:854 ../../include/nav.php:256 +#: ../../include/conversation.php:854 ../../include/nav.php:247 msgid "Loading..." msgstr "Aan het laden..." @@ -7551,6 +7776,10 @@ msgid "" "form has been opened for too long (>3 hours) before submitting it." msgstr "De beveiligings-token van het tekstvak was ongeldig. Dit is mogelijk het gevolg van dat er te lang (meer dan 3 uur) gewacht is om de tekst op te slaan. " +#: ../../include/api.php:1338 +msgid "Public Timeline" +msgstr "Openbare tijdlijn" + #: ../../include/contact_selectors.php:56 msgid "Frequently" msgstr "Regelmatig" @@ -7751,7 +7980,7 @@ msgstr "Leeftijd:" msgid "YYYY-MM-DD or MM-DD" msgstr "JJJJ-MM-DD of MM-DD" -#: ../../include/datetime.php:273 ../../boot.php:2432 +#: ../../include/datetime.php:273 ../../boot.php:2445 msgid "never" msgstr "nooit" @@ -7840,6 +8069,23 @@ msgstr "Alleen openbare forums" msgid "This Website Only" msgstr "Alleen deze hub" +#: ../../include/enotify.php:57 ../../include/network.php:1827 +msgid "$Projectname Notification" +msgstr "$Projectname-notificatie" + +#: ../../include/enotify.php:58 ../../include/network.php:1828 +msgid "$projectname" +msgstr "$projectname" + +#: ../../include/enotify.php:60 ../../include/network.php:1830 +msgid "Thank You," +msgstr "Bedankt," + +#: ../../include/enotify.php:62 ../../include/network.php:1832 +#, php-format +msgid "%s Administrator" +msgstr "Beheerder %s" + #: ../../include/enotify.php:96 #, php-format msgid "%s <!item_type!>" @@ -8385,6 +8631,53 @@ msgstr "Kanalen die zich in geen enkele privacygroep bevinden" msgid "add" msgstr "toevoegen" +#: ../../include/bbcode.php:123 ../../include/bbcode.php:813 +#: ../../include/bbcode.php:816 ../../include/bbcode.php:821 +#: ../../include/bbcode.php:824 ../../include/bbcode.php:827 +#: ../../include/bbcode.php:830 ../../include/bbcode.php:835 +#: ../../include/bbcode.php:838 ../../include/bbcode.php:843 +#: ../../include/bbcode.php:846 ../../include/bbcode.php:849 +#: ../../include/bbcode.php:852 +msgid "Image/photo" +msgstr "Afbeelding/foto" + +#: ../../include/bbcode.php:162 ../../include/bbcode.php:863 +msgid "Encrypted content" +msgstr "Versleutelde inhoud" + +#: ../../include/bbcode.php:179 +#, php-format +msgid "Install %s element: " +msgstr "Installeer %s-element: " + +#: ../../include/bbcode.php:183 +#, php-format +msgid "" +"This post contains an installable %s element, however you lack permissions " +"to install it on this site." +msgstr "Dit bericht heeft een te installeren %s-element, maar je hebt geen permissies om het op deze hub te installeren." + +#: ../../include/bbcode.php:255 +#, php-format +msgid "%1$s wrote the following %2$s %3$s" +msgstr "%1$s schreef het volgende %2$s %3$s" + +#: ../../include/bbcode.php:333 ../../include/bbcode.php:341 +msgid "Click to open/close" +msgstr "Klik om te openen of te sluiten" + +#: ../../include/bbcode.php:341 +msgid "spoiler" +msgstr "spoiler" + +#: ../../include/bbcode.php:556 +msgid "Different viewers will see this text differently" +msgstr "Deze tekst wordt per persoon anders weergeven." + +#: ../../include/bbcode.php:801 +msgid "$1 wrote:" +msgstr "$1 schreef:" + #: ../../include/items.php:1138 ../../include/items.php:1183 msgid "(Unknown)" msgstr "(Onbekend)" @@ -8439,32 +8732,13 @@ msgstr "Connectie niet gevonden." msgid "profile photo" msgstr "profielfoto" -#: ../../include/photos.php:112 -#, php-format -msgid "Image exceeds website size limit of %lu bytes" -msgstr "Afbeelding is groter dan op deze hub toegestane limiet van %lu bytes" - -#: ../../include/photos.php:119 -msgid "Image file is empty." -msgstr "Afbeeldingsbestand is leeg" - -#: ../../include/photos.php:257 -msgid "Photo storage failed." -msgstr "Foto kan niet worden opgeslagen" - -#: ../../include/photos.php:297 -msgid "a new photo" -msgstr "een nieuwe foto" - -#: ../../include/photos.php:301 -#, php-format -msgctxt "photo_upload" -msgid "%1$s posted %2$s to %3$s" -msgstr "%1$s plaatste %2$s op %3$s" +#: ../../include/network.php:659 +msgid "view full size" +msgstr "volledige grootte tonen" -#: ../../include/photos.php:510 -msgid "Upload New Photos" -msgstr "Nieuwe foto's uploaden" +#: ../../include/network.php:1889 +msgid "No Subject" +msgstr "Geen onderwerp" #: ../../include/widgets.php:103 msgid "System" @@ -8563,15 +8837,15 @@ msgstr "Privéberichten" msgid "Combined View" msgstr "Gecombineerd postvak" -#: ../../include/widgets.php:609 ../../include/nav.php:199 +#: ../../include/widgets.php:609 ../../include/nav.php:196 msgid "Inbox" msgstr "Postvak IN" -#: ../../include/widgets.php:614 ../../include/nav.php:200 +#: ../../include/widgets.php:614 ../../include/nav.php:197 msgid "Outbox" msgstr "Postvak UIT" -#: ../../include/widgets.php:619 ../../include/nav.php:201 +#: ../../include/widgets.php:619 ../../include/nav.php:198 msgid "New Message" msgstr "Nieuw bericht" @@ -8703,7 +8977,7 @@ msgstr "Inspecteer berichtenwachtrij" msgid "DB updates" msgstr "Database-updates" -#: ../../include/widgets.php:1368 ../../include/nav.php:219 +#: ../../include/widgets.php:1368 ../../include/nav.php:216 msgid "Admin" msgstr "Beheer" @@ -8876,55 +9150,11 @@ msgstr " " msgid "timeago.numbers" msgstr "timeago.numbers" -#: ../../include/js_strings.php:45 ../../include/text.php:1210 -msgid "January" -msgstr "januari" - -#: ../../include/js_strings.php:46 ../../include/text.php:1210 -msgid "February" -msgstr "februari" - -#: ../../include/js_strings.php:47 ../../include/text.php:1210 -msgid "March" -msgstr "maart" - -#: ../../include/js_strings.php:48 ../../include/text.php:1210 -msgid "April" -msgstr "april" - #: ../../include/js_strings.php:49 msgctxt "long" msgid "May" msgstr "mei" -#: ../../include/js_strings.php:50 ../../include/text.php:1210 -msgid "June" -msgstr "juni" - -#: ../../include/js_strings.php:51 ../../include/text.php:1210 -msgid "July" -msgstr "juli" - -#: ../../include/js_strings.php:52 ../../include/text.php:1210 -msgid "August" -msgstr "augustus" - -#: ../../include/js_strings.php:53 ../../include/text.php:1210 -msgid "September" -msgstr "september" - -#: ../../include/js_strings.php:54 ../../include/text.php:1210 -msgid "October" -msgstr "oktober" - -#: ../../include/js_strings.php:55 ../../include/text.php:1210 -msgid "November" -msgstr "november" - -#: ../../include/js_strings.php:56 ../../include/text.php:1210 -msgid "December" -msgstr "december" - #: ../../include/js_strings.php:57 msgid "Jan" msgstr "jan" @@ -8974,34 +9204,6 @@ msgstr "nov" msgid "Dec" msgstr "dec" -#: ../../include/js_strings.php:69 ../../include/text.php:1206 -msgid "Sunday" -msgstr "zondag" - -#: ../../include/js_strings.php:70 ../../include/text.php:1206 -msgid "Monday" -msgstr "maandag" - -#: ../../include/js_strings.php:71 ../../include/text.php:1206 -msgid "Tuesday" -msgstr "dinsdag" - -#: ../../include/js_strings.php:72 ../../include/text.php:1206 -msgid "Wednesday" -msgstr "woensdag" - -#: ../../include/js_strings.php:73 ../../include/text.php:1206 -msgid "Thursday" -msgstr "donderdag" - -#: ../../include/js_strings.php:74 ../../include/text.php:1206 -msgid "Friday" -msgstr "vrijdag" - -#: ../../include/js_strings.php:75 ../../include/text.php:1206 -msgid "Saturday" -msgstr "zaterdag" - #: ../../include/js_strings.php:76 msgid "Sun" msgstr "zo" @@ -9071,14 +9273,166 @@ msgstr "Afzender kan niet bepaald worden." msgid "Stored post could not be verified." msgstr "Opgeslagen bericht kon niet worden geverifieerd." -#: ../../include/import.php:23 -msgid "" -"Cannot create a duplicate channel identifier on this system. Import failed." -msgstr "Kan geen dubbele kanaal-identificator op deze hub aanmaken. Importeren mislukt." +#: ../../include/nav.php:82 ../../include/nav.php:113 ../../boot.php:1614 +msgid "Logout" +msgstr "Uitloggen" -#: ../../include/import.php:70 -msgid "Channel clone failed. Import failed." -msgstr "Het klonen van het kanaal is mislukt. Importeren mislukt." +#: ../../include/nav.php:82 ../../include/nav.php:113 +msgid "End this session" +msgstr "Beëindig deze sessie" + +#: ../../include/nav.php:85 ../../include/nav.php:144 +msgid "Home" +msgstr "Home" + +#: ../../include/nav.php:85 +msgid "Your posts and conversations" +msgstr "Jouw kanaal" + +#: ../../include/nav.php:86 +msgid "Your profile page" +msgstr "Jouw profielpagina" + +#: ../../include/nav.php:88 +msgid "Manage/Edit profiles" +msgstr "Beheer/wijzig profielen" + +#: ../../include/nav.php:90 +msgid "Edit your profile" +msgstr "Jouw profiel bewerken" + +#: ../../include/nav.php:92 +msgid "Your photos" +msgstr "Jouw foto's" + +#: ../../include/nav.php:93 +msgid "Your files" +msgstr "Jouw bestanden" + +#: ../../include/nav.php:96 +msgid "Your chatrooms" +msgstr "Jouw chatkanalen" + +#: ../../include/nav.php:102 +msgid "Your bookmarks" +msgstr "Jouw bladwijzers" + +#: ../../include/nav.php:106 +msgid "Your webpages" +msgstr "Jouw webpagina's" + +#: ../../include/nav.php:110 +msgid "Sign in" +msgstr "Inloggen" + +#: ../../include/nav.php:127 +#, php-format +msgid "%s - click to logout" +msgstr "%s - klik om uit te loggen" + +#: ../../include/nav.php:130 +msgid "Remote authentication" +msgstr "Authenticatie op afstand" + +#: ../../include/nav.php:130 +msgid "Click to authenticate to your home hub" +msgstr "Authenticeer jezelf via (bijvoorbeeld) jouw hub" + +#: ../../include/nav.php:144 +msgid "Home Page" +msgstr "Homepage" + +#: ../../include/nav.php:147 +msgid "Create an account" +msgstr "Maak een account aan" + +#: ../../include/nav.php:159 +msgid "Help and documentation" +msgstr "Hulp en documentatie" + +#: ../../include/nav.php:163 +msgid "Applications, utilities, links, games" +msgstr "Apps" + +#: ../../include/nav.php:165 +msgid "Search site @name, #tag, ?docs, content" +msgstr "Zoek een @kanaal, doorzoek inhoud hub met tekst en #tags, of doorzoek ?documentatie " + +#: ../../include/nav.php:167 +msgid "Channel Directory" +msgstr "Kanalengids" + +#: ../../include/nav.php:179 +msgid "Your grid" +msgstr "Jouw grid" + +#: ../../include/nav.php:180 +msgid "Mark all grid notifications seen" +msgstr "Markeer alle gridnotificaties als bekeken" + +#: ../../include/nav.php:182 +msgid "Channel home" +msgstr "Jouw kanaal" + +#: ../../include/nav.php:183 +msgid "Mark all channel notifications seen" +msgstr "Alle kanaalnotificaties als gelezen markeren" + +#: ../../include/nav.php:189 +msgid "Notices" +msgstr "Notificaties" + +#: ../../include/nav.php:189 +msgid "Notifications" +msgstr "Notificaties" + +#: ../../include/nav.php:190 +msgid "See all notifications" +msgstr "Alle notificaties weergeven" + +#: ../../include/nav.php:193 +msgid "Private mail" +msgstr "Privéberichten" + +#: ../../include/nav.php:194 +msgid "See all private messages" +msgstr "Alle privéberichten weergeven" + +#: ../../include/nav.php:195 +msgid "Mark all private messages seen" +msgstr "Markeer alle privéberichten als bekeken" + +#: ../../include/nav.php:201 +msgid "Event Calendar" +msgstr "Agenda" + +#: ../../include/nav.php:202 +msgid "See all events" +msgstr "Alle gebeurtenissen weergeven" + +#: ../../include/nav.php:203 +msgid "Mark all events seen" +msgstr "Markeer alle gebeurtenissen als bekeken" + +#: ../../include/nav.php:206 +msgid "Manage Your Channels" +msgstr "Beheer je kanalen" + +#: ../../include/nav.php:208 +msgid "Account/Channel Settings" +msgstr "Account-/kanaal-instellingen" + +#: ../../include/nav.php:216 +msgid "Site Setup and Configuration" +msgstr "Hub instellen en beheren" + +#: ../../include/nav.php:252 +msgid "@name, #tag, ?doc, content" +msgstr "@kanaal, #tag, inhoud, ?hulp" + +#: ../../include/nav.php:253 +msgid "Please wait..." +msgstr "Wachten aub..." #: ../../include/oembed.php:267 msgid "Embedded content" @@ -9237,400 +9591,32 @@ msgstr "Speciaal - Groepsopslag" msgid "Custom/Expert Mode" msgstr "Expertmodus/handmatig aanpassen" -#: ../../include/text.php:394 -msgid "prev" -msgstr "vorige" - -#: ../../include/text.php:396 -msgid "first" -msgstr "eerste" - -#: ../../include/text.php:425 -msgid "last" -msgstr "laatste" - -#: ../../include/text.php:428 -msgid "next" -msgstr "volgende" - -#: ../../include/text.php:438 -msgid "older" -msgstr "ouder" - -#: ../../include/text.php:440 -msgid "newer" -msgstr "nieuwer" - -#: ../../include/text.php:822 -msgid "No connections" -msgstr "Geen connecties" - -#: ../../include/text.php:847 -#, php-format -msgid "View all %s connections" -msgstr "Toon alle %s connecties" - -#: ../../include/text.php:992 ../../include/text.php:997 -msgid "poke" -msgstr "aanstoten" - -#: ../../include/text.php:998 -msgid "ping" -msgstr "ping" - -#: ../../include/text.php:998 -msgid "pinged" -msgstr "gepingd" - -#: ../../include/text.php:999 -msgid "prod" -msgstr "por" - -#: ../../include/text.php:999 -msgid "prodded" -msgstr "gepord" - -#: ../../include/text.php:1000 -msgid "slap" -msgstr "slaan" - -#: ../../include/text.php:1000 -msgid "slapped" -msgstr "sloeg" - -#: ../../include/text.php:1001 -msgid "finger" -msgstr "finger" - -#: ../../include/text.php:1001 -msgid "fingered" -msgstr "gefingerd" - -#: ../../include/text.php:1002 -msgid "rebuff" -msgstr "afpoeieren" - -#: ../../include/text.php:1002 -msgid "rebuffed" -msgstr "afgepoeierd" - -#: ../../include/text.php:1014 -msgid "happy" -msgstr "gelukkig" - -#: ../../include/text.php:1015 -msgid "sad" -msgstr "bedroefd" - -#: ../../include/text.php:1016 -msgid "mellow" -msgstr "mellow" - -#: ../../include/text.php:1017 -msgid "tired" -msgstr "moe" - -#: ../../include/text.php:1018 -msgid "perky" -msgstr "parmantig" - -#: ../../include/text.php:1019 -msgid "angry" -msgstr "boos" - -#: ../../include/text.php:1020 -msgid "stupefied" -msgstr "verbijsterd" - -#: ../../include/text.php:1021 -msgid "puzzled" -msgstr "verward" - -#: ../../include/text.php:1022 -msgid "interested" -msgstr "geïnteresseerd" - -#: ../../include/text.php:1023 -msgid "bitter" -msgstr "verbitterd" - -#: ../../include/text.php:1024 -msgid "cheerful" -msgstr "vrolijk" - -#: ../../include/text.php:1025 -msgid "alive" -msgstr "levendig" - -#: ../../include/text.php:1026 -msgid "annoyed" -msgstr "geërgerd" - -#: ../../include/text.php:1027 -msgid "anxious" -msgstr "bezorgd" - -#: ../../include/text.php:1028 -msgid "cranky" -msgstr "humeurig" - -#: ../../include/text.php:1029 -msgid "disturbed" -msgstr "verontrust" - -#: ../../include/text.php:1030 -msgid "frustrated" -msgstr "gefrustreerd " - -#: ../../include/text.php:1031 -msgid "depressed" -msgstr "gedeprimeerd" - -#: ../../include/text.php:1032 -msgid "motivated" -msgstr "gemotiveerd" - -#: ../../include/text.php:1033 -msgid "relaxed" -msgstr "ontspannen" - -#: ../../include/text.php:1034 -msgid "surprised" -msgstr "verrast" - -#: ../../include/text.php:1210 -msgid "May" -msgstr "mei" - -#: ../../include/text.php:1287 ../../include/text.php:1291 -msgid "Unknown Attachment" -msgstr "Onbekende bijlage" - -#: ../../include/text.php:1293 -msgid "unknown" -msgstr "onbekend" - -#: ../../include/text.php:1329 -msgid "remove category" -msgstr "categorie verwijderen" - -#: ../../include/text.php:1406 -msgid "remove from file" -msgstr "uit map verwijderen" - -#: ../../include/text.php:1548 ../../include/text.php:1559 -msgid "Click to open/close" -msgstr "Klik om te openen of te sluiten" - -#: ../../include/text.php:1764 ../../include/text.php:1836 -msgid "default" -msgstr "standaard" - -#: ../../include/text.php:1772 -msgid "Page layout" -msgstr "Pagina-lay-out" - -#: ../../include/text.php:1772 -msgid "You can create your own with the layouts tool" -msgstr "Je kan jouw eigen lay-out ontwerpen onder lay-outs" - -#: ../../include/text.php:1814 -msgid "Page content type" -msgstr "Opmaaktype pagina" - -#: ../../include/text.php:1848 -msgid "Select an alternate language" -msgstr "Kies een andere taal" - -#: ../../include/text.php:1980 -msgid "activity" -msgstr "activiteit" - -#: ../../include/text.php:2275 -msgid "Design Tools" -msgstr "Ontwerp-hulpmiddelen" - -#: ../../include/text.php:2281 -msgid "Pages" -msgstr "Pagina's" - -#: ../../include/nav.php:82 ../../include/nav.php:113 ../../boot.php:1601 -msgid "Logout" -msgstr "Uitloggen" - -#: ../../include/nav.php:82 ../../include/nav.php:113 -msgid "End this session" -msgstr "Beëindig deze sessie" - -#: ../../include/nav.php:85 ../../include/nav.php:144 -msgid "Home" -msgstr "Home" - -#: ../../include/nav.php:85 -msgid "Your posts and conversations" -msgstr "Jouw kanaal" - -#: ../../include/nav.php:86 -msgid "Your profile page" -msgstr "Jouw profielpagina" - -#: ../../include/nav.php:88 -msgid "Manage/Edit profiles" -msgstr "Beheer/wijzig profielen" - -#: ../../include/nav.php:90 -msgid "Edit your profile" -msgstr "Jouw profiel bewerken" - -#: ../../include/nav.php:92 -msgid "Your photos" -msgstr "Jouw foto's" - -#: ../../include/nav.php:93 -msgid "Your files" -msgstr "Jouw bestanden" - -#: ../../include/nav.php:96 -msgid "Your chatrooms" -msgstr "Jouw chatkanalen" - -#: ../../include/nav.php:102 -msgid "Your bookmarks" -msgstr "Jouw bladwijzers" - -#: ../../include/nav.php:106 -msgid "Your webpages" -msgstr "Jouw webpagina's" - -#: ../../include/nav.php:110 -msgid "Sign in" -msgstr "Inloggen" - -#: ../../include/nav.php:127 +#: ../../include/photos.php:112 #, php-format -msgid "%s - click to logout" -msgstr "%s - klik om uit te loggen" - -#: ../../include/nav.php:130 -msgid "Remote authentication" -msgstr "Authenticatie op afstand" - -#: ../../include/nav.php:130 -msgid "Click to authenticate to your home hub" -msgstr "Authenticeer jezelf via (bijvoorbeeld) jouw hub" - -#: ../../include/nav.php:144 -msgid "Home Page" -msgstr "Homepage" - -#: ../../include/nav.php:148 -msgid "Create an account" -msgstr "Maak een account aan" - -#: ../../include/nav.php:161 -msgid "Help and documentation" -msgstr "Hulp en documentatie" - -#: ../../include/nav.php:165 -msgid "Applications, utilities, links, games" -msgstr "Apps" - -#: ../../include/nav.php:167 -msgid "Search site @name, #tag, ?docs, content" -msgstr "Zoek een @kanaal, doorzoek inhoud hub met tekst en #tags, of doorzoek ?documentatie " - -#: ../../include/nav.php:170 -msgid "Channel Directory" -msgstr "Kanalengids" - -#: ../../include/nav.php:182 -msgid "Your grid" -msgstr "Jouw grid" - -#: ../../include/nav.php:183 -msgid "Mark all grid notifications seen" -msgstr "Markeer alle gridnotificaties als bekeken" - -#: ../../include/nav.php:185 -msgid "Channel home" -msgstr "Jouw kanaal" - -#: ../../include/nav.php:186 -msgid "Mark all channel notifications seen" -msgstr "Alle kanaalnotificaties als gelezen markeren" - -#: ../../include/nav.php:192 -msgid "Notices" -msgstr "Notificaties" - -#: ../../include/nav.php:192 -msgid "Notifications" -msgstr "Notificaties" - -#: ../../include/nav.php:193 -msgid "See all notifications" -msgstr "Alle notificaties weergeven" - -#: ../../include/nav.php:196 -msgid "Private mail" -msgstr "Privéberichten" - -#: ../../include/nav.php:197 -msgid "See all private messages" -msgstr "Alle privéberichten weergeven" - -#: ../../include/nav.php:198 -msgid "Mark all private messages seen" -msgstr "Markeer alle privéberichten als bekeken" - -#: ../../include/nav.php:204 -msgid "Event Calendar" -msgstr "Agenda" - -#: ../../include/nav.php:205 -msgid "See all events" -msgstr "Alle gebeurtenissen weergeven" - -#: ../../include/nav.php:206 -msgid "Mark all events seen" -msgstr "Markeer alle gebeurtenissen als bekeken" - -#: ../../include/nav.php:209 -msgid "Manage Your Channels" -msgstr "Beheer je kanalen" - -#: ../../include/nav.php:211 -msgid "Account/Channel Settings" -msgstr "Account-/kanaal-instellingen" - -#: ../../include/nav.php:219 -msgid "Site Setup and Configuration" -msgstr "Hub instellen en beheren" - -#: ../../include/nav.php:261 -msgid "@name, #tag, ?doc, content" -msgstr "@kanaal, #tag, inhoud, ?hulp" +msgid "Image exceeds website size limit of %lu bytes" +msgstr "Afbeelding is groter dan op deze hub toegestane limiet van %lu bytes" -#: ../../include/nav.php:262 -msgid "Please wait..." -msgstr "Wachten aub..." +#: ../../include/photos.php:119 +msgid "Image file is empty." +msgstr "Afbeeldingsbestand is leeg" -#: ../../include/zot.php:680 -msgid "Invalid data packet" -msgstr "Datapakket ongeldig" +#: ../../include/photos.php:257 +msgid "Photo storage failed." +msgstr "Foto kan niet worden opgeslagen" -#: ../../include/zot.php:696 -msgid "Unable to verify channel signature" -msgstr "Kanaalkenmerk kon niet worden geverifieerd. " +#: ../../include/photos.php:297 +msgid "a new photo" +msgstr "een nieuwe foto" -#: ../../include/zot.php:2332 +#: ../../include/photos.php:301 #, php-format -msgid "Unable to verify site signature for %s" -msgstr "Hubkenmerk voor %s kon niet worden geverifieerd" +msgctxt "photo_upload" +msgid "%1$s posted %2$s to %3$s" +msgstr "%1$s plaatste %2$s op %3$s" -#: ../../include/zot.php:3670 -msgid "invalid target signature" -msgstr "ongeldig doelkenmerk" +#: ../../include/photos.php:510 +msgid "Upload New Photos" +msgstr "Nieuwe foto's uploaden" #: ../../view/theme/redbasic/php/config.php:82 msgid "Focus (Hubzilla default)" @@ -9789,41 +9775,41 @@ msgstr "Update %s mislukt. Zie foutenlogboek." msgid "Update Error at %s" msgstr "Update-fout op %s" -#: ../../boot.php:1583 +#: ../../boot.php:1596 msgid "" "Create an account to access services and applications within the Hubzilla" msgstr "Maak een account aan om toegang te krijgen tot diensten en toepassingen van Hubzilla" -#: ../../boot.php:1605 +#: ../../boot.php:1618 msgid "Password" msgstr "Wachtwoord" -#: ../../boot.php:1606 +#: ../../boot.php:1619 msgid "Remember me" msgstr "Aangemeld blijven" -#: ../../boot.php:1609 +#: ../../boot.php:1622 msgid "Forgot your password?" msgstr "Wachtwoord vergeten?" -#: ../../boot.php:2238 +#: ../../boot.php:2251 msgid "toggle mobile" msgstr "mobiele weergave omschakelen" -#: ../../boot.php:2391 +#: ../../boot.php:2404 msgid "Website SSL certificate is not valid. Please correct." msgstr "Het SSL-certificaat van deze website is ongeldig. Corrigeer dit a.u.b." -#: ../../boot.php:2394 +#: ../../boot.php:2407 #, php-format msgid "[hubzilla] Website SSL error for %s" msgstr "[hubzilla] Probleem met SSL-certificaat voor %s" -#: ../../boot.php:2431 +#: ../../boot.php:2444 msgid "Cron/Scheduled tasks not running." msgstr "Cron is niet actief" -#: ../../boot.php:2435 +#: ../../boot.php:2448 #, php-format msgid "[hubzilla] Cron tasks not running on %s" msgstr "[hubzilla] Cron-taken zijn niet actief op %s" diff --git a/view/nl/hstrings.php b/view/nl/hstrings.php index 72fc4d2e1..197756606 100644 --- a/view/nl/hstrings.php +++ b/view/nl/hstrings.php @@ -152,8 +152,6 @@ App::$strings["Block communications from these channels"] = "Communicatie met de App::$strings["Allow embedded HTML content only from these domains"] = "Alleen ingesloten (embedded) HTML vanaf deze domeinen toestaan"; App::$strings["One site per line. Leave empty to allow from any site by default"] = "Eén per regel. Laat leeg om standaard vanaf elk domein toe te staan"; App::$strings["Block embedded HTML from these domains"] = "Ingesloten (embedded) HTML vanaf deze domeinen blokkeren"; -App::$strings["Cooperative embed security"] = "Met elkaar ingesloten (embedded) HTML beveiligen"; -App::$strings["Enable to share embed security with other compatible sites/hubs"] = "Beveiliging omtrent ingesloten (embedded) HTML met andere compatibele hubs delen."; App::$strings["Update has been marked successful"] = "Update is als succesvol gemarkeerd"; App::$strings["Executing %s failed. Check system logs."] = "Uitvoeren van %s is mislukt. Controleer systeemlogboek."; App::$strings["Update %s was successfully applied."] = "Update %s was geslaagd."; @@ -428,6 +426,7 @@ App::$strings["Connection requests will be approved without your interaction"] = App::$strings["This connection's primary address is"] = "Het primaire kanaaladres van deze connectie is"; App::$strings["Available locations:"] = "Beschikbare locaties:"; App::$strings["The permissions indicated on this page will be applied to all new connections."] = "Permissies die op deze pagina staan vermeld worden op alle nieuwe connecties toegepast."; +App::$strings["Connection Tools"] = "Hulpmiddelen"; App::$strings["Slide to adjust your degree of friendship"] = "Schuif om te bepalen hoe goed je iemand kent en/of mag"; App::$strings["Rating"] = "Beoordeling"; App::$strings["Slide to adjust your rating"] = "Gebruik de schuif om je beoordeling te geven"; @@ -523,25 +522,25 @@ App::$strings["Italic"] = "Cursief"; App::$strings["Underline"] = "Onderstrepen"; App::$strings["Quote"] = "Citeren"; App::$strings["Code"] = "Broncode"; -App::$strings["Upload photo"] = "Foto uploaden"; App::$strings["Attach file"] = "Bestand toevoegen"; -App::$strings["Insert YouTube video"] = "YouTube-video invoegen"; -App::$strings["Insert Vorbis [.ogg] video"] = "Vorbis-video [.ogg] invoegen"; -App::$strings["Insert Vorbis [.ogg] audio"] = "Vorbis-audio [.ogg] invoegen"; -App::$strings["Set your location"] = "Locatie instellen"; -App::$strings["Clear browser location"] = "Locatie van webbrowser wissen"; -App::$strings["Please wait"] = "Even wachten"; App::$strings["Permission settings"] = "Permissies"; App::$strings["Public post"] = "Openbaar bericht"; App::$strings["Title (optional)"] = "Titel (optioneel)"; App::$strings["Categories (optional, comma-separated list)"] = "Categorieën (optioneel, door komma's gescheiden lijst)"; App::$strings["Example: bob@example.com, mary@example.com"] = "Voorbeeld: bob@voorbeeld.nl, mary@voorbeeld.be"; App::$strings["Preview"] = "Voorvertoning"; -App::$strings["Set expiration date"] = "Verloopdatum instellen"; App::$strings["Edit Block"] = "Blok bewerken"; App::$strings["Delete layout?"] = "Lay-out verwijderen?"; +App::$strings["Upload photo"] = "Foto uploaden"; +App::$strings["Insert YouTube video"] = "YouTube-video invoegen"; +App::$strings["Insert Vorbis [.ogg] video"] = "Vorbis-video [.ogg] invoegen"; +App::$strings["Insert Vorbis [.ogg] audio"] = "Vorbis-audio [.ogg] invoegen"; +App::$strings["Set your location"] = "Locatie instellen"; +App::$strings["Clear browser location"] = "Locatie van webbrowser wissen"; +App::$strings["Please wait"] = "Even wachten"; App::$strings["Layout Description (Optional)"] = "Lay-out-omschrijving (optioneel)"; App::$strings["Layout Name"] = "Naam lay-out"; +App::$strings["Set expiration date"] = "Verloopdatum instellen"; App::$strings["Edit Layout"] = "Lay-out bewerken"; App::$strings["Item is not editable"] = "Item is niet te bewerken"; App::$strings["Expires YYYY-MM-DD HH:MM"] = "Verloopt op DD-MM-YYYY om HH:MM"; @@ -938,6 +937,7 @@ App::$strings["__ctx:noun__ Dislike"] = array( 0 => "vindt dit niet leuk", 1 => "vinden dit niet leuk", ); +App::$strings["Photo Tools"] = "Hulpmiddelen"; App::$strings["In This Photo:"] = "Op deze foto:"; App::$strings["Map"] = "Kaart"; App::$strings["__ctx:noun__ Likes"] = "vinden dit leuk"; @@ -982,6 +982,7 @@ App::$strings["Hide your connections list from viewers of this profile"] = "Laat App::$strings["Edit Profile Details"] = "Profiel bewerken"; App::$strings["View this profile"] = "Profiel weergeven"; App::$strings["Edit visibility"] = "Zichtbaarheid bewerken"; +App::$strings["Profile Tools"] = "Hulpmiddelen"; App::$strings["Change cover photo"] = "Omslagfoto wijzigen"; App::$strings["Change profile photo"] = "Profielfoto veranderen"; App::$strings["Create a new profile using these settings"] = "Een nieuw profiel aanmaken met dit profiel als basis"; @@ -1573,7 +1574,85 @@ App::$strings["public profile"] = "openbaar profiel"; App::$strings["%1\$s changed %2\$s to “%3\$s”"] = "%1\$s veranderde %2\$s naar “%3\$s”"; App::$strings["Visit %1\$s's %2\$s"] = "Bezoek het %2\$s van %1\$s"; App::$strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s heeft een aangepaste %2\$s, %3\$s veranderd."; -App::$strings["Public Timeline"] = "Openbare tijdlijn"; +App::$strings["prev"] = "vorige"; +App::$strings["first"] = "eerste"; +App::$strings["last"] = "laatste"; +App::$strings["next"] = "volgende"; +App::$strings["older"] = "ouder"; +App::$strings["newer"] = "nieuwer"; +App::$strings["No connections"] = "Geen connecties"; +App::$strings["View all %s connections"] = "Toon alle %s connecties"; +App::$strings["poke"] = "aanstoten"; +App::$strings["poked"] = "aangestoten"; +App::$strings["ping"] = "ping"; +App::$strings["pinged"] = "gepingd"; +App::$strings["prod"] = "por"; +App::$strings["prodded"] = "gepord"; +App::$strings["slap"] = "slaan"; +App::$strings["slapped"] = "sloeg"; +App::$strings["finger"] = "finger"; +App::$strings["fingered"] = "gefingerd"; +App::$strings["rebuff"] = "afpoeieren"; +App::$strings["rebuffed"] = "afgepoeierd"; +App::$strings["happy"] = "gelukkig"; +App::$strings["sad"] = "bedroefd"; +App::$strings["mellow"] = "mellow"; +App::$strings["tired"] = "moe"; +App::$strings["perky"] = "parmantig"; +App::$strings["angry"] = "boos"; +App::$strings["stupefied"] = "verbijsterd"; +App::$strings["puzzled"] = "verward"; +App::$strings["interested"] = "geïnteresseerd"; +App::$strings["bitter"] = "verbitterd"; +App::$strings["cheerful"] = "vrolijk"; +App::$strings["alive"] = "levendig"; +App::$strings["annoyed"] = "geërgerd"; +App::$strings["anxious"] = "bezorgd"; +App::$strings["cranky"] = "humeurig"; +App::$strings["disturbed"] = "verontrust"; +App::$strings["frustrated"] = "gefrustreerd "; +App::$strings["depressed"] = "gedeprimeerd"; +App::$strings["motivated"] = "gemotiveerd"; +App::$strings["relaxed"] = "ontspannen"; +App::$strings["surprised"] = "verrast"; +App::$strings["Monday"] = "maandag"; +App::$strings["Tuesday"] = "dinsdag"; +App::$strings["Wednesday"] = "woensdag"; +App::$strings["Thursday"] = "donderdag"; +App::$strings["Friday"] = "vrijdag"; +App::$strings["Saturday"] = "zaterdag"; +App::$strings["Sunday"] = "zondag"; +App::$strings["January"] = "januari"; +App::$strings["February"] = "februari"; +App::$strings["March"] = "maart"; +App::$strings["April"] = "april"; +App::$strings["May"] = "mei"; +App::$strings["June"] = "juni"; +App::$strings["July"] = "juli"; +App::$strings["August"] = "augustus"; +App::$strings["September"] = "september"; +App::$strings["October"] = "oktober"; +App::$strings["November"] = "november"; +App::$strings["December"] = "december"; +App::$strings["Unknown Attachment"] = "Onbekende bijlage"; +App::$strings["unknown"] = "onbekend"; +App::$strings["remove category"] = "categorie verwijderen"; +App::$strings["remove from file"] = "uit map verwijderen"; +App::$strings["l F d, Y \\@ g:i A"] = "l d F Y \\@ G:i"; +App::$strings["Starts:"] = "Start:"; +App::$strings["Finishes:"] = "Einde:"; +App::$strings["default"] = "standaard"; +App::$strings["Page layout"] = "Pagina-lay-out"; +App::$strings["You can create your own with the layouts tool"] = "Je kan jouw eigen lay-out ontwerpen onder lay-outs"; +App::$strings["Page content type"] = "Opmaaktype pagina"; +App::$strings["Select an alternate language"] = "Kies een andere taal"; +App::$strings["activity"] = "activiteit"; +App::$strings["Design Tools"] = "Ontwerp-hulpmiddelen"; +App::$strings["Pages"] = "Pagina's"; +App::$strings["Invalid data packet"] = "Datapakket ongeldig"; +App::$strings["Unable to verify channel signature"] = "Kanaalkenmerk kon niet worden geverifieerd. "; +App::$strings["Unable to verify site signature for %s"] = "Hubkenmerk voor %s kon niet worden geverifieerd"; +App::$strings["invalid target signature"] = "ongeldig doelkenmerk"; App::$strings["Site Admin"] = "Hubbeheerder"; App::$strings["Bookmarks"] = "Bladwijzers"; App::$strings["Address Book"] = "Connecties"; @@ -1592,28 +1671,12 @@ App::$strings["Features"] = "Extra functies"; App::$strings["Post"] = "Bericht"; App::$strings["Install"] = "Installeren"; App::$strings["Purchase"] = "Aanschaffen"; -App::$strings["view full size"] = "volledige grootte tonen"; -App::$strings["\$Projectname Notification"] = "\$Projectname-notificatie"; -App::$strings["\$projectname"] = "\$projectname"; -App::$strings["Thank You,"] = "Bedankt,"; -App::$strings["%s Administrator"] = "Beheerder %s"; -App::$strings["No Subject"] = "Geen onderwerp"; +App::$strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "Kan geen dubbele kanaal-identificator op deze hub aanmaken. Importeren mislukt."; +App::$strings["Channel clone failed. Import failed."] = "Het klonen van het kanaal is mislukt. Importeren mislukt."; App::$strings["Attachments:"] = "Bijlagen:"; -App::$strings["l F d, Y \\@ g:i A"] = "l d F Y \\@ G:i"; App::$strings["\$Projectname event notification:"] = "Notificatie \$Projectname-gebeurtenis:"; -App::$strings["Starts:"] = "Start:"; -App::$strings["Finishes:"] = "Einde:"; -App::$strings["Image/photo"] = "Afbeelding/foto"; -App::$strings["Encrypted content"] = "Versleutelde inhoud"; -App::$strings["Install %s element: "] = "Installeer %s-element: "; -App::$strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Dit bericht heeft een te installeren %s-element, maar je hebt geen permissies om het op deze hub te installeren."; -App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s schreef het volgende %2\$s %3\$s"; -App::$strings["Different viewers will see this text differently"] = "Deze tekst wordt per persoon anders weergeven."; -App::$strings["$1 spoiler"] = "$1 spoiler"; -App::$strings["$1 wrote:"] = "$1 schreef:"; App::$strings["%1\$s is now connected with %2\$s"] = "%1\$s is nu met %2\$s verbonden"; App::$strings["%1\$s poked %2\$s"] = "%1\$s heeft %2\$s aangestoten"; -App::$strings["poked"] = "aangestoten"; App::$strings["View %s's profile @ %s"] = "Bekijk het profiel van %s @ %s"; App::$strings["Categories:"] = "Categorieën:"; App::$strings["Filed under:"] = "Bewaard onder:"; @@ -1718,6 +1781,7 @@ App::$strings["User '%s' deleted"] = "Account '%s' verwijderd"; App::$strings["Logged out."] = "Uitgelogd."; App::$strings["Failed authentication"] = "Mislukte authenticatie"; App::$strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "De beveiligings-token van het tekstvak was ongeldig. Dit is mogelijk het gevolg van dat er te lang (meer dan 3 uur) gewacht is om de tekst op te slaan. "; +App::$strings["Public Timeline"] = "Openbare tijdlijn"; App::$strings["Frequently"] = "Regelmatig"; App::$strings["Hourly"] = "Elk uur"; App::$strings["Twice daily"] = "Twee keer per dag"; @@ -1808,6 +1872,10 @@ App::$strings["Directory Options"] = "Opties kanalengids"; App::$strings["Safe Mode"] = "Veilig zoeken"; App::$strings["Public Forums Only"] = "Alleen openbare forums"; App::$strings["This Website Only"] = "Alleen deze hub"; +App::$strings["\$Projectname Notification"] = "\$Projectname-notificatie"; +App::$strings["\$projectname"] = "\$projectname"; +App::$strings["Thank You,"] = "Bedankt,"; +App::$strings["%s Administrator"] = "Beheerder %s"; App::$strings["%s <!item_type!>"] = "%s <!item_type!>"; App::$strings["[Hubzilla:Notify] New mail received at %s"] = "[Hubzilla:Notificatie] Nieuw privébericht ontvangen op %s"; App::$strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s zond jou een nieuw privébericht om %3\$s."; @@ -1932,6 +2000,15 @@ App::$strings["Edit group"] = "Privacygroep bewerken"; App::$strings["Add privacy group"] = "Privacygroep toevoegen"; App::$strings["Channels not in any privacy group"] = "Kanalen die zich in geen enkele privacygroep bevinden"; App::$strings["add"] = "toevoegen"; +App::$strings["Image/photo"] = "Afbeelding/foto"; +App::$strings["Encrypted content"] = "Versleutelde inhoud"; +App::$strings["Install %s element: "] = "Installeer %s-element: "; +App::$strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Dit bericht heeft een te installeren %s-element, maar je hebt geen permissies om het op deze hub te installeren."; +App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s schreef het volgende %2\$s %3\$s"; +App::$strings["Click to open/close"] = "Klik om te openen of te sluiten"; +App::$strings["spoiler"] = "spoiler"; +App::$strings["Different viewers will see this text differently"] = "Deze tekst wordt per persoon anders weergeven."; +App::$strings["$1 wrote:"] = "$1 schreef:"; App::$strings["(Unknown)"] = "(Onbekend)"; App::$strings["Visible to anybody on the internet."] = "Voor iedereen op het internet zichtbaar."; App::$strings["Visible to you only."] = "Alleen voor jou zichtbaar."; @@ -1945,12 +2022,8 @@ App::$strings["Privacy group is empty."] = "Privacygroep is leeg"; App::$strings["Privacy group: %s"] = "Privacygroep: %s"; App::$strings["Connection not found."] = "Connectie niet gevonden."; App::$strings["profile photo"] = "profielfoto"; -App::$strings["Image exceeds website size limit of %lu bytes"] = "Afbeelding is groter dan op deze hub toegestane limiet van %lu bytes"; -App::$strings["Image file is empty."] = "Afbeeldingsbestand is leeg"; -App::$strings["Photo storage failed."] = "Foto kan niet worden opgeslagen"; -App::$strings["a new photo"] = "een nieuwe foto"; -App::$strings["__ctx:photo_upload__ %1\$s posted %2\$s to %3\$s"] = "%1\$s plaatste %2\$s op %3\$s"; -App::$strings["Upload New Photos"] = "Nieuwe foto's uploaden"; +App::$strings["view full size"] = "volledige grootte tonen"; +App::$strings["No Subject"] = "Geen onderwerp"; App::$strings["System"] = "Systeem"; App::$strings["Create Personal App"] = "Persoonlijke app maken"; App::$strings["Edit Personal App"] = "Persoonlijke app bewerken"; @@ -2052,18 +2125,7 @@ App::$strings["about a year"] = "ongeveer een jaar"; App::$strings["%d years"] = "%d jaren"; App::$strings[" "] = " "; App::$strings["timeago.numbers"] = "timeago.numbers"; -App::$strings["January"] = "januari"; -App::$strings["February"] = "februari"; -App::$strings["March"] = "maart"; -App::$strings["April"] = "april"; App::$strings["__ctx:long__ May"] = "mei"; -App::$strings["June"] = "juni"; -App::$strings["July"] = "juli"; -App::$strings["August"] = "augustus"; -App::$strings["September"] = "september"; -App::$strings["October"] = "oktober"; -App::$strings["November"] = "november"; -App::$strings["December"] = "december"; App::$strings["Jan"] = "jan"; App::$strings["Feb"] = "feb"; App::$strings["Mar"] = "mrt"; @@ -2076,13 +2138,6 @@ App::$strings["Sep"] = "sep"; App::$strings["Oct"] = "okt"; App::$strings["Nov"] = "nov"; App::$strings["Dec"] = "dec"; -App::$strings["Sunday"] = "zondag"; -App::$strings["Monday"] = "maandag"; -App::$strings["Tuesday"] = "dinsdag"; -App::$strings["Wednesday"] = "woensdag"; -App::$strings["Thursday"] = "donderdag"; -App::$strings["Friday"] = "vrijdag"; -App::$strings["Saturday"] = "zaterdag"; App::$strings["Sun"] = "zo"; App::$strings["Mon"] = "ma"; App::$strings["Tue"] = "di"; @@ -2099,101 +2154,6 @@ App::$strings["No recipient provided."] = "Geen ontvanger opgegeven."; App::$strings["[no subject]"] = "[geen onderwerp]"; App::$strings["Unable to determine sender."] = "Afzender kan niet bepaald worden."; App::$strings["Stored post could not be verified."] = "Opgeslagen bericht kon niet worden geverifieerd."; -App::$strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "Kan geen dubbele kanaal-identificator op deze hub aanmaken. Importeren mislukt."; -App::$strings["Channel clone failed. Import failed."] = "Het klonen van het kanaal is mislukt. Importeren mislukt."; -App::$strings["Embedded content"] = "Ingesloten (embedded) inhoud"; -App::$strings["Embedding disabled"] = "Insluiten (embedding) uitgeschakeld"; -App::$strings["New Page"] = "Nieuwe pagina"; -App::$strings["Title"] = "Titel"; -App::$strings["Can view my normal stream and posts"] = "Kan mijn normale kanaalstream en berichten bekijken"; -App::$strings["Can view my default channel profile"] = "Kan mijn standaard kanaalprofiel bekijken"; -App::$strings["Can view my connections"] = "Kan een lijst met mijn connecties bekijken"; -App::$strings["Can view my file storage and photos"] = "Kan mijn foto's en andere bestanden bekijken"; -App::$strings["Can view my webpages"] = "Kan mijn pagina's bekijken"; -App::$strings["Can send me their channel stream and posts"] = "Kan mij de inhoud van hun kanaal en berichten sturen"; -App::$strings["Can post on my channel page (\"wall\")"] = "Kan een bericht in mijn kanaal plaatsen"; -App::$strings["Can comment on or like my posts"] = "Kan op mijn berichten reageren of deze (niet) leuk vinden"; -App::$strings["Can send me private mail messages"] = "Kan mij privéberichten sturen"; -App::$strings["Can like/dislike stuff"] = "Kan dingen leuk of niet leuk vinden"; -App::$strings["Profiles and things other than posts/comments"] = "Profielen en dingen, buiten berichten en reacties"; -App::$strings["Can forward to all my channel contacts via post @mentions"] = "Kan naar al mijn kanaalconnecties berichten doorsturen met behulp van @vermeldingen+"; -App::$strings["Advanced - useful for creating group forum channels"] = "Geavanceerd - nuttig voor groepforums"; -App::$strings["Can chat with me (when available)"] = "Kan met mij chatten (wanneer beschikbaar)"; -App::$strings["Can write to my file storage and photos"] = "Kan foto's en andere bestanden aan mijn bestandsopslag toevoegen"; -App::$strings["Can edit my webpages"] = "Kan mijn pagina's bewerken"; -App::$strings["Can source my public posts in derived channels"] = "Kan mijn openbare berichten als bron voor andere kanalen gebruiken"; -App::$strings["Somewhat advanced - very useful in open communities"] = "Enigszins geavanceerd (erg nuttig voor kanalen van forums/groepen)"; -App::$strings["Can administer my channel resources"] = "Kan mijn kanaal beheren"; -App::$strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Zeer geavanceerd. Laat dit met rust, behalve als je weet wat je doet."; -App::$strings["Social Networking"] = "Sociaal netwerk"; -App::$strings["Social - Mostly Public"] = "Sociaal - Vrijwel alles openbaar"; -App::$strings["Social - Restricted"] = "Sociaal - Beperkt zichtbaar"; -App::$strings["Social - Private"] = "Sociaal - Verborgen kanaal"; -App::$strings["Community Forum"] = "Groepsforum"; -App::$strings["Forum - Mostly Public"] = "Forum - Vrijwel alles openbaar"; -App::$strings["Forum - Restricted"] = "Forum - Beperkt zichtbaar"; -App::$strings["Forum - Private"] = "Forum - Verborgen kanaal"; -App::$strings["Feed Republish"] = "Feed herpubliceren"; -App::$strings["Feed - Mostly Public"] = "Feed - Vrijwel alles openbaar"; -App::$strings["Feed - Restricted"] = "Feed - Beperkt zichtbaar"; -App::$strings["Special Purpose"] = "Speciaal doel"; -App::$strings["Special - Celebrity/Soapbox"] = "Speciaal - Beroemdheid/alleen volgen"; -App::$strings["Special - Group Repository"] = "Speciaal - Groepsopslag"; -App::$strings["Custom/Expert Mode"] = "Expertmodus/handmatig aanpassen"; -App::$strings["prev"] = "vorige"; -App::$strings["first"] = "eerste"; -App::$strings["last"] = "laatste"; -App::$strings["next"] = "volgende"; -App::$strings["older"] = "ouder"; -App::$strings["newer"] = "nieuwer"; -App::$strings["No connections"] = "Geen connecties"; -App::$strings["View all %s connections"] = "Toon alle %s connecties"; -App::$strings["poke"] = "aanstoten"; -App::$strings["ping"] = "ping"; -App::$strings["pinged"] = "gepingd"; -App::$strings["prod"] = "por"; -App::$strings["prodded"] = "gepord"; -App::$strings["slap"] = "slaan"; -App::$strings["slapped"] = "sloeg"; -App::$strings["finger"] = "finger"; -App::$strings["fingered"] = "gefingerd"; -App::$strings["rebuff"] = "afpoeieren"; -App::$strings["rebuffed"] = "afgepoeierd"; -App::$strings["happy"] = "gelukkig"; -App::$strings["sad"] = "bedroefd"; -App::$strings["mellow"] = "mellow"; -App::$strings["tired"] = "moe"; -App::$strings["perky"] = "parmantig"; -App::$strings["angry"] = "boos"; -App::$strings["stupefied"] = "verbijsterd"; -App::$strings["puzzled"] = "verward"; -App::$strings["interested"] = "geïnteresseerd"; -App::$strings["bitter"] = "verbitterd"; -App::$strings["cheerful"] = "vrolijk"; -App::$strings["alive"] = "levendig"; -App::$strings["annoyed"] = "geërgerd"; -App::$strings["anxious"] = "bezorgd"; -App::$strings["cranky"] = "humeurig"; -App::$strings["disturbed"] = "verontrust"; -App::$strings["frustrated"] = "gefrustreerd "; -App::$strings["depressed"] = "gedeprimeerd"; -App::$strings["motivated"] = "gemotiveerd"; -App::$strings["relaxed"] = "ontspannen"; -App::$strings["surprised"] = "verrast"; -App::$strings["May"] = "mei"; -App::$strings["Unknown Attachment"] = "Onbekende bijlage"; -App::$strings["unknown"] = "onbekend"; -App::$strings["remove category"] = "categorie verwijderen"; -App::$strings["remove from file"] = "uit map verwijderen"; -App::$strings["Click to open/close"] = "Klik om te openen of te sluiten"; -App::$strings["default"] = "standaard"; -App::$strings["Page layout"] = "Pagina-lay-out"; -App::$strings["You can create your own with the layouts tool"] = "Je kan jouw eigen lay-out ontwerpen onder lay-outs"; -App::$strings["Page content type"] = "Opmaaktype pagina"; -App::$strings["Select an alternate language"] = "Kies een andere taal"; -App::$strings["activity"] = "activiteit"; -App::$strings["Design Tools"] = "Ontwerp-hulpmiddelen"; -App::$strings["Pages"] = "Pagina's"; App::$strings["Logout"] = "Uitloggen"; App::$strings["End this session"] = "Beëindig deze sessie"; App::$strings["Home"] = "Home"; @@ -2234,10 +2194,51 @@ App::$strings["Account/Channel Settings"] = "Account-/kanaal-instellingen"; App::$strings["Site Setup and Configuration"] = "Hub instellen en beheren"; App::$strings["@name, #tag, ?doc, content"] = "@kanaal, #tag, inhoud, ?hulp"; App::$strings["Please wait..."] = "Wachten aub..."; -App::$strings["Invalid data packet"] = "Datapakket ongeldig"; -App::$strings["Unable to verify channel signature"] = "Kanaalkenmerk kon niet worden geverifieerd. "; -App::$strings["Unable to verify site signature for %s"] = "Hubkenmerk voor %s kon niet worden geverifieerd"; -App::$strings["invalid target signature"] = "ongeldig doelkenmerk"; +App::$strings["Embedded content"] = "Ingesloten (embedded) inhoud"; +App::$strings["Embedding disabled"] = "Insluiten (embedding) uitgeschakeld"; +App::$strings["New Page"] = "Nieuwe pagina"; +App::$strings["Title"] = "Titel"; +App::$strings["Can view my normal stream and posts"] = "Kan mijn normale kanaalstream en berichten bekijken"; +App::$strings["Can view my default channel profile"] = "Kan mijn standaard kanaalprofiel bekijken"; +App::$strings["Can view my connections"] = "Kan een lijst met mijn connecties bekijken"; +App::$strings["Can view my file storage and photos"] = "Kan mijn foto's en andere bestanden bekijken"; +App::$strings["Can view my webpages"] = "Kan mijn pagina's bekijken"; +App::$strings["Can send me their channel stream and posts"] = "Kan mij de inhoud van hun kanaal en berichten sturen"; +App::$strings["Can post on my channel page (\"wall\")"] = "Kan een bericht in mijn kanaal plaatsen"; +App::$strings["Can comment on or like my posts"] = "Kan op mijn berichten reageren of deze (niet) leuk vinden"; +App::$strings["Can send me private mail messages"] = "Kan mij privéberichten sturen"; +App::$strings["Can like/dislike stuff"] = "Kan dingen leuk of niet leuk vinden"; +App::$strings["Profiles and things other than posts/comments"] = "Profielen en dingen, buiten berichten en reacties"; +App::$strings["Can forward to all my channel contacts via post @mentions"] = "Kan naar al mijn kanaalconnecties berichten doorsturen met behulp van @vermeldingen+"; +App::$strings["Advanced - useful for creating group forum channels"] = "Geavanceerd - nuttig voor groepforums"; +App::$strings["Can chat with me (when available)"] = "Kan met mij chatten (wanneer beschikbaar)"; +App::$strings["Can write to my file storage and photos"] = "Kan foto's en andere bestanden aan mijn bestandsopslag toevoegen"; +App::$strings["Can edit my webpages"] = "Kan mijn pagina's bewerken"; +App::$strings["Can source my public posts in derived channels"] = "Kan mijn openbare berichten als bron voor andere kanalen gebruiken"; +App::$strings["Somewhat advanced - very useful in open communities"] = "Enigszins geavanceerd (erg nuttig voor kanalen van forums/groepen)"; +App::$strings["Can administer my channel resources"] = "Kan mijn kanaal beheren"; +App::$strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Zeer geavanceerd. Laat dit met rust, behalve als je weet wat je doet."; +App::$strings["Social Networking"] = "Sociaal netwerk"; +App::$strings["Social - Mostly Public"] = "Sociaal - Vrijwel alles openbaar"; +App::$strings["Social - Restricted"] = "Sociaal - Beperkt zichtbaar"; +App::$strings["Social - Private"] = "Sociaal - Verborgen kanaal"; +App::$strings["Community Forum"] = "Groepsforum"; +App::$strings["Forum - Mostly Public"] = "Forum - Vrijwel alles openbaar"; +App::$strings["Forum - Restricted"] = "Forum - Beperkt zichtbaar"; +App::$strings["Forum - Private"] = "Forum - Verborgen kanaal"; +App::$strings["Feed Republish"] = "Feed herpubliceren"; +App::$strings["Feed - Mostly Public"] = "Feed - Vrijwel alles openbaar"; +App::$strings["Feed - Restricted"] = "Feed - Beperkt zichtbaar"; +App::$strings["Special Purpose"] = "Speciaal doel"; +App::$strings["Special - Celebrity/Soapbox"] = "Speciaal - Beroemdheid/alleen volgen"; +App::$strings["Special - Group Repository"] = "Speciaal - Groepsopslag"; +App::$strings["Custom/Expert Mode"] = "Expertmodus/handmatig aanpassen"; +App::$strings["Image exceeds website size limit of %lu bytes"] = "Afbeelding is groter dan op deze hub toegestane limiet van %lu bytes"; +App::$strings["Image file is empty."] = "Afbeeldingsbestand is leeg"; +App::$strings["Photo storage failed."] = "Foto kan niet worden opgeslagen"; +App::$strings["a new photo"] = "een nieuwe foto"; +App::$strings["__ctx:photo_upload__ %1\$s posted %2\$s to %3\$s"] = "%1\$s plaatste %2\$s op %3\$s"; +App::$strings["Upload New Photos"] = "Nieuwe foto's uploaden"; App::$strings["Focus (Hubzilla default)"] = "Focus (Hubzilla-standaard)"; App::$strings["Theme settings"] = "Thema-instellingen"; App::$strings["Select scheme"] = "Kies schema van thema"; diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 7ed7e0934..58f216029 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1383,9 +1383,8 @@ img.mail-conv-sender-photo { -moz-border-radius: $radiuspx; } -.profile-thing-list img, .thing-show img, .thing-edit-links a { - margin-top: 8px; - margin-right: 15px; +.thing-show img { + margin: 10px; } .abook-self { @@ -1682,9 +1681,7 @@ nav .badge.mail-update:hover { .navbar-inverse .navbar-nav > li > a { - font-size: 12px; color: $nav_icon_colour; - text-shadow: 0px 0px 0px; } .navbar-inverse .navbar-nav > li > a:hover, @@ -1827,6 +1824,27 @@ nav .badge.mail-update:hover { margin-top:-3px; } +dl.bb-dl > dt { + /* overriding the default dl style from bootstrap, as bootstrap's + style of a bold unindented line followed by a plain unindented + line is already acheivable in bbcode without dl */ + font-weight: normal; +} +dl.dl-terms-monospace > dt { font-family: monospace; } +dl.dl-terms-bold > dt { font-weight: bold; } +dl.dl-terms-italic > dt { font-style: italic; } +dl.dl-terms-underline > dt { text-decoration: underline; } +dl.dl-terms-large > dt { font-size: 120%; } +dl.bb-dl:not(.dl-horizontal) > dd { + display: block; + margin-left: 2em; +} +dl.bb-dl > dd > li { + /* adding some indent so bullet-list items will line up better with + dl descriptions if someone wants to be impure and combine them */ + margin-left: 1em; +} + .bootstrap-tagsinput .tag:before { /* Copied from fa-asterisk, is there a better way to do it? */ font-family: FontAwesome; diff --git a/view/tpl/admin_security.tpl b/view/tpl/admin_security.tpl index 3823d8235..721b5f38f 100755 --- a/view/tpl/admin_security.tpl +++ b/view/tpl/admin_security.tpl @@ -7,7 +7,9 @@ {{include file="field_checkbox.tpl" field=$block_public}} - + {{include file="field_checkbox.tpl" field=$transport_security}} + {{include file="field_checkbox.tpl" field=$content_security}} + {{include file="field_checkbox.tpl" field=$embed_sslonly}} {{include file="field_textarea.tpl" field=$whitelisted_sites}} {{include file="field_textarea.tpl" field=$blacklisted_sites}} diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index c0207c623..870f7e9e1 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -20,7 +20,7 @@ {{/if}} {{foreach $entries as $item}} <tr id="cloud-index-{{$item.attachId}}"> - <td><i class="{{$item.iconFromType}}" title="{{$item.type}}"></i></td> + <td><i class="fa {{$item.iconFromType}}" title="{{$item.type}}"></i></td> <td><a href="{{$item.fullPath}}">{{$item.displayName}}</a></td> {{if $item.is_owner}} <td class="cloud-index-tool">{{$item.attachIcon}}</td> diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 3de92cddb..a9f6766dc 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -138,6 +138,9 @@ {{if $feature_expire}} <li><a href="#" onclick="jotGetExpiry(); return false;"><i class="fa fa-eraser"></i> {{$expires}}</a></li> {{/if}} + {{if $feature_future}} + <li><a href="#" onclick="jotGetPubDate();return false;"><i class="fa fa-clock-o"></i> {{$future_txt}}</a></li> + {{/if}} {{if $feature_encrypt}} <li><a href="#" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;"><i class="fa fa-key"></i> {{$encrypt}}</a></li> {{/if}} @@ -176,6 +179,7 @@ <div id="jot-preview-content" style="display:none;"></div> +{{if $feature_expire}} <!-- Modal for item expiry--> <div class="modal" id="expiryModal" tabindex="-1" role="dialog" aria-labelledby="expiryModalLabel" aria-hidden="true"> <div class="modal-dialog"> @@ -196,7 +200,9 @@ </div><!-- /.modal-content --> </div><!-- /.modal-dialog --> </div><!-- /.modal --> +{{/if}} +{{if $feature_future}} <!-- Modal for item created--> <div class="modal" id="createdModal" tabindex="-1" role="dialog" aria-labelledby="createdModalLabel" aria-hidden="true"> <div class="modal-dialog"> @@ -217,7 +223,7 @@ </div><!-- /.modal-content --> </div><!-- /.modal-dialog --> </div><!-- /.modal --> - +{{/if}} {{if $content || $attachment || $expanded}} <script>initEditor();</script> diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl index 762c82479..c617e6c14 100755 --- a/view/tpl/profile_advanced.tpl +++ b/view/tpl/profile_advanced.tpl @@ -273,7 +273,7 @@ <b>{{$profile.fullname.1}} {{$key}}</b> <ul class="profile-thing-list"> {{foreach $items as $item}} - <li>{{if $item.img}}<a href="{{$item.url}}" ><img src="{{$item.img}}" width="100" height="100" alt="{{$item.term}}" /></a>{{/if}} + <li>{{if $item.img}}<a href="{{$item.url}}" ><img src="{{$item.img}}" class="profile-thing-img" width="100" height="100" alt="{{$item.term}}" /></a>{{/if}} <a href="{{$item.url}}" >{{$item.term}}</a> {{if $profile.canlike}}<br /> <button type="button" class="btn btn-default btn-sm" onclick="doprofilelike('thing/' + '{{$item.term_hash}}','like'); return false;" title="{{$likethis}}" > diff --git a/view/tpl/sources_edit.tpl b/view/tpl/sources_edit.tpl index a5b384ca3..61f6e8cb0 100644 --- a/view/tpl/sources_edit.tpl +++ b/view/tpl/sources_edit.tpl @@ -7,6 +7,7 @@ <input type="hidden" name="source" value="{{$id}}" /> <input type="hidden" id="id_abook" name="abook" value="{{$abook}}" /> {{include file="field_input.tpl" field=$name}} +{{include file="field_input.tpl" field=$tags}} {{include file="field_textarea.tpl" field=$words}} <div class="sources-submit-wrapper" > diff --git a/view/tpl/sources_new.tpl b/view/tpl/sources_new.tpl index 3c8a54373..bbc22df84 100644 --- a/view/tpl/sources_new.tpl +++ b/view/tpl/sources_new.tpl @@ -6,6 +6,7 @@ <form action="sources" method="post"> <input type="hidden" id="id_abook" name="abook" value="{{$abook}}" /> {{include file="field_input.tpl" field=$name}} +{{include file="field_input.tpl" field=$tags}} {{include file="field_textarea.tpl" field=$words}} <div class="sources-submit-wrapper" > diff --git a/view/tpl/zcard_embed.tpl b/view/tpl/zcard_embed.tpl new file mode 100644 index 000000000..7981e3b0b --- /dev/null +++ b/view/tpl/zcard_embed.tpl @@ -0,0 +1,8 @@ +<div class="hz_card {{$size}}"> + <div class="hz_cover_photo" style="max-width: 100;"><img src="{{$cover.href}}" alt="{{$zcard.chan.xchan_name}}" /> + <div style="position: relative;top: -40px;left: 120px;color: #fff;font-size: 18px;text-rendering: optimizelegibility;text-shadow: 0 0 3px rgba(0, 0, 0, 0.8);" >{{$zcard.chan.xchan_name}}</div> + <div style="position: relative;top: -40px;left: 120px;color: #fff;font-size: 10px;text-rendering: optimizelegibility;text-shadow: 0 0 3px rgba(0, 0, 0, 0.8);" >{{$zcard.chan.channel_addr}}</div> + </div> + <div style="position:relative;top: -75px;left: 20px;background-color: white;border: 1px solid #ddd;padding: 3px;width: 80px;height: 80px;"><img src="{{$pphoto.href}}" alt="{{$zcard.chan.xchan_name}}" /></div> +</div> + |