diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-03-02 06:06:39 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-03-02 06:06:39 +0100 |
| commit | 264abef81761a3ed0d27126dbc5a6e0a47fb8ec8 (patch) | |
| tree | 883418e21b721217b28380f9313405373825650a | |
| parent | e084a85e79af2c56f6e715fcf44a1be815ea5c45 (diff) | |
| parent | a0baa480e3968306c8ebc297a60f84b4d2ccf8c9 (diff) | |
| download | volse-hubzilla-264abef81761a3ed0d27126dbc5a6e0a47fb8ec8.tar.gz volse-hubzilla-264abef81761a3ed0d27126dbc5a6e0a47fb8ec8.tar.bz2 volse-hubzilla-264abef81761a3ed0d27126dbc5a6e0a47fb8ec8.zip | |
Merge remote-tracking branch 'upstream/master'
| -rwxr-xr-x | boot.php | 4 | ||||
| -rw-r--r-- | include/attach.php | 49 | ||||
| -rw-r--r-- | include/bbcode.php | 6 | ||||
| -rw-r--r-- | include/config.php | 66 | ||||
| -rw-r--r-- | include/crypto.php | 2 | ||||
| -rw-r--r-- | include/identity.php | 123 | ||||
| -rw-r--r-- | include/photos.php | 8 | ||||
| -rw-r--r-- | include/widgets.php | 2 | ||||
| -rw-r--r-- | include/zot.php | 25 | ||||
| -rw-r--r-- | install/schema_mysql.sql | 14 | ||||
| -rw-r--r-- | install/schema_postgres.sql | 15 | ||||
| -rw-r--r-- | install/update.php | 43 | ||||
| -rw-r--r-- | mod/connedit.php | 7 | ||||
| -rw-r--r-- | mod/follow.php | 8 | ||||
| -rw-r--r-- | mod/import.php | 15 | ||||
| -rw-r--r-- | version.inc | 2 | ||||
| -rw-r--r-- | view/css/conversation.css | 26 | ||||
| -rw-r--r-- | view/css/mod_cloud.css | 2 | ||||
| -rw-r--r-- | view/css/mod_photos.css | 2 | ||||
| -rw-r--r-- | view/es-es/hmessages.po | 2170 | ||||
| -rw-r--r-- | view/es-es/hstrings.php | 498 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 52 | ||||
| -rwxr-xr-x | view/tpl/events-js.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/field_input.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/jot.tpl | 18 | ||||
| -rwxr-xr-x | view/tpl/photos_upload.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/profile_advanced.tpl | 88 | ||||
| -rwxr-xr-x | view/tpl/profile_vcard.tpl | 18 |
28 files changed, 1764 insertions, 1505 deletions
@@ -47,10 +47,10 @@ require_once('include/account.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc'))); -define ( 'STD_VERSION', '1.2.4' ); +define ( 'STD_VERSION', '1.2.5' ); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1164 ); +define ( 'DB_UPDATE_VERSION', 1165 ); /** diff --git a/include/attach.php b/include/attach.php index 78114b415..2777b5813 100644 --- a/include/attach.php +++ b/include/attach.php @@ -1243,7 +1243,7 @@ function attach_delete($channel_id, $resource, $is_photo = 0) { $channel_address = (($c) ? $c[0]['channel_address'] : 'notfound'); $photo_sql = (($is_photo) ? " and is_photo = 1 " : ''); - $r = q("SELECT hash, flags, is_dir, is_photo, folder FROM attach WHERE hash = '%s' AND uid = %d $photo_sql limit 1", + $r = q("SELECT hash, os_storage, flags, is_dir, is_photo, folder FROM attach WHERE hash = '%s' AND uid = %d $photo_sql limit 1", dbesc($resource), intval($channel_id) ); @@ -1471,7 +1471,7 @@ function pipe_streams($in, $out) { * @param string $deny_cid * @param string $deny_gid * @param string $verb - * @param boolean $no_activity + * @param boolean $notify */ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $verb, $notify) { @@ -1517,13 +1517,21 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid, $mid = item_message_id(); - $arr = array(); + $objtype = ACTIVITY_OBJ_FILE; + $arr = array(); + $arr['aid'] = get_account_id(); + $arr['uid'] = $channel_id; $arr['item_wall'] = 1; $arr['item_origin'] = 1; $arr['item_unseen'] = 1; - - $objtype = ACTIVITY_OBJ_FILE; + $arr['author_xchan'] = $poster['xchan_hash']; + $arr['owner_xchan'] = $poster['xchan_hash']; + $arr['title'] = ''; + $arr['item_hidden'] = 1; + $arr['obj_type'] = $objtype; + $arr['resource_id'] = $object['hash']; + $arr['resource_type'] = 'attach'; $private = (($arr_allow_cid[0] || $arr_allow_gid[0] || $arr_deny_cid[0] || $arr_deny_gid[0]) ? 1 : 0); @@ -1551,9 +1559,8 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid, } + //send update activity and create a new one if($update && $verb == 'post' ) { - //send update activity and create a new one - //updates should be sent to everybody with recursive perms and all eventual former allowed members ($object['allow_cid'] etc.). $u_arr_allow_cid = array_unique(array_merge($arr_allow_cid, expand_acl($object['allow_cid']))); $u_arr_allow_gid = array_unique(array_merge($arr_allow_gid, expand_acl($object['allow_gid']))); @@ -1564,24 +1571,15 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid, $u_mid = item_message_id(); - $arr['aid'] = get_account_id(); - $arr['uid'] = $channel_id; $arr['mid'] = $u_mid; $arr['parent_mid'] = $u_mid; - $arr['author_xchan'] = $poster['xchan_hash']; - $arr['owner_xchan'] = $poster['xchan_hash']; - $arr['title'] = ''; $arr['allow_cid'] = perms2str($u_arr_allow_cid); $arr['allow_gid'] = perms2str($u_arr_allow_gid); $arr['deny_cid'] = perms2str($u_arr_deny_cid); $arr['deny_gid'] = perms2str($u_arr_deny_gid); - $arr['item_hidden'] = 1; $arr['item_private'] = $private; $arr['verb'] = ACTIVITY_UPDATE; - $arr['obj_type'] = $objtype; $arr['object'] = $u_jsonobject; - $arr['resource_id'] = $object['hash']; - $arr['resource_type'] = 'attach'; $arr['body'] = ''; $post = item_store($arr); @@ -1597,32 +1595,25 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid, //notice( t('File activity updated') . EOL); } + //don't create new activity if notify was not enabled if(! $notify) { return; } - $arr = array(); + //don't create new activity if we have an update request but there is no item to update + //this can e.g. happen when deleting images + if(! $y && $verb == 'update') { + return; + } - $arr['aid'] = get_account_id(); - $arr['uid'] = $channel_id; $arr['mid'] = $mid; $arr['parent_mid'] = $mid; - $arr['item_wall'] = 1; - $arr['item_origin'] = 1; - $arr['item_unseen'] = 1; - $arr['author_xchan'] = $poster['xchan_hash']; - $arr['owner_xchan'] = $poster['xchan_hash']; - $arr['title'] = ''; $arr['allow_cid'] = perms2str($arr_allow_cid); $arr['allow_gid'] = perms2str($arr_allow_gid); $arr['deny_cid'] = perms2str($arr_deny_cid); $arr['deny_gid'] = perms2str($arr_deny_gid); - $arr['item_hidden'] = 1; $arr['item_private'] = $private; $arr['verb'] = (($update) ? ACTIVITY_UPDATE : ACTIVITY_POST); - $arr['obj_type'] = $objtype; - $arr['resource_id'] = $object['hash']; - $arr['resource_type'] = 'attach'; $arr['object'] = (($update) ? $u_jsonobject : $jsonobject); $arr['body'] = ''; diff --git a/include/bbcode.php b/include/bbcode.php index a8372d728..477436475 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -684,7 +684,11 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false) } // Check for centered text if (strpos($Text,'[/center]') !== false) { - $Text = preg_replace("(\[center\](.*?)\[\/center\])ism", "<div style=\"text-align:center;\">$1</div>", $Text); + $Text = preg_replace("(\[center\](.*?)\[\/center\])ism", "<div style=\"text-align:center;\">$1</div>", $Text); + } + // Check for footer + if (strpos($Text,'[/footer]') !== false) { + $Text = preg_replace("(\[footer\](.*?)\[\/footer\])ism", "<div class=\"wall-item-footer\">$1</div>", $Text); } // Check for list text $Text = str_replace("[*]", "<li>", $Text); diff --git a/include/config.php b/include/config.php index f65e4a470..51d4e99ac 100644 --- a/include/config.php +++ b/include/config.php @@ -549,4 +549,68 @@ function set_aconfig($account_id, $family, $key, $value) { function del_aconfig($account_id, $family, $key) { return del_xconfig('a_' . $account_id, $family, $key); -}
\ No newline at end of file +} + + +function load_abconfig($chash,$xhash) { + $r = q("select * from abconfig where chan = '%s' and xchan = '%s'", + dbesc($chash), + dbesc($xhash) + ); + return $r; +} + +function get_abconfig($chash,$xhash,$family,$key) { + $r = q("select * from abconfig where chan = '%s' and xchan = '%s' and cat = '%s' and k = '%s' limit 1", + dbesc($chash), + dbesc($xhash), + dbesc($family), + dbesc($key) + ); + if($r) { + return ((preg_match('|^a:[0-9]+:{.*}$|s', $r[0]['v'])) ? unserialize($r[0]['v']) : $r[0]['v']); + } + return false; +} + + +function set_abconfig($chash,$xhash,$family,$key,$value) { + + $dbvalue = ((is_array($value)) ? serialize($value) : $value); + $dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue) : $dbvalue); + + if(get_abconfig($chash,$xhash,$family,$key) === false) { + $r = q("insert into abconfig ( chan, xchan, cat, k, v ) values ( '%s', '%s', '%s', '%s', '%s' ) ", + dbesc($chash), + dbesc($xhash), + dbesc($family), + dbesc($key), + dbesc($dbvalue) + ); + } + else { + $r = q("update abconfig set v = '%s' where chan = '%s' and xchan = '%s' and cat = '%s' and k = '%s' ", + dbesc($dbvalue), + dbesc($chash), + dbesc($xhash), + dbesc($family), + dbesc($key) + ); + } + if($r) + return $value; + return false; +} + + +function del_abconfig($chash,$xhash,$family,$key) { + + $r = q("delete from abconfig where chan = '%s' and xchan = '%s' and cat = '%s' and k = '%s' ", + dbesc($chash), + dbesc($xhash), + dbesc($family), + dbesc($key) + ); + + return $r; +} diff --git a/include/crypto.php b/include/crypto.php index 50ec2a3a6..94a6b4a58 100644 --- a/include/crypto.php +++ b/include/crypto.php @@ -20,7 +20,7 @@ function rsa_verify($data,$sig,$key,$alg = 'sha256') { if(intval(OPENSSL_ALGO_SHA256) && $alg === 'sha256') $alg = OPENSSL_ALGO_SHA256; - $verify = openssl_verify($data,$sig,$key,$alg); + $verify = @openssl_verify($data,$sig,$key,$alg); if(! $verify) { logger('openssl_verify: ' . openssl_error_string(),LOGGER_NORMAL,LOG_ERR); diff --git a/include/identity.php b/include/identity.php index caf2de710..382b096fe 100644 --- a/include/identity.php +++ b/include/identity.php @@ -505,8 +505,12 @@ function identity_basic_export($channel_id, $items = false) { if($r) { $ret['abook'] = $r; - foreach($r as $rr) - $xchans[] = $rr['abook_xchan']; + for($x = 0; $x < count($ret['abook']); $x ++) { + $xchans[] = $ret['abook'][$x]['abook_chan']; + $abconfig = load_abconfig($ret['channel']['channel_hash'],$ret['abook'][$x]['abook_xchan']); + if($abconfig) + $ret['abook'][$x]['abconfig'] = $abconfig; + } stringify_array_elms($xchans); } @@ -900,6 +904,55 @@ function profile_load(&$a, $nickname, $profile = '') { } +function profile_edit_menu($uid) { + + $a = get_app(); + $ret = array(); + + $is_owner = (($uid == local_channel()) ? true : false); + + // show edit profile to profile owner + if($is_owner) { + $ret['menu'] = array( + 'chg_photo' => t('Change profile photo'), + 'entries' => array(), + ); + + $multi_profiles = feature_enabled(local_channel(), 'multi_profiles'); + if($multi_profiles) { + $ret['multi'] = 1; + $ret['edit'] = array($a->get_baseurl(). '/profiles', t('Edit Profiles'), '', t('Edit')); + $ret['menu']['cr_new'] = t('Create New Profile'); + } + else { + $ret['edit'] = array($a->get_baseurl() . '/profiles/' . $uid, t('Edit Profile'), '', t('Edit')); + } + + $r = q("SELECT * FROM profile WHERE uid = %d", + local_channel() + ); + + if($r) { + foreach($r as $rr) { + if(!($multi_profiles || $rr['is_default'])) + continue; + $ret['menu']['entries'][] = array( + 'photo' => $rr['thumb'], + 'id' => $rr['id'], + 'alt' => t('Profile Image'), + 'profile_name' => $rr['profile_name'], + 'isdefault' => $rr['is_default'], + 'visible_to_everybody' => t('Visible to everybody'), + 'edit_visibility' => t('Edit visibility'), + ); + } + } + } + + return $ret; + +} + /** * @brief Formats a profile for display in the sidebar. * @@ -933,13 +986,9 @@ function profile_sidebar($profile, $block = 0, $show_connect = true, $zcard = fa head_set_icon($profile['thumb']); - $is_owner = (($profile['uid'] == local_channel()) ? true : false); - if(is_sys_channel($profile['uid'])) $show_connect = false; - - $profile['picdate'] = urlencode($profile['picdate']); call_hooks('profile_sidebar_enter', $profile); @@ -961,42 +1010,6 @@ function profile_sidebar($profile, $block = 0, $show_connect = true, $zcard = fa $connect_url = z_root() . '/connect/' . $profile['channel_address']; } - // show edit profile to yourself - if($is_owner) { - $profile['menu'] = array( - 'chg_photo' => t('Change profile photo'), - 'entries' => array(), - ); - - $multi_profiles = feature_enabled(local_channel(), 'multi_profiles'); - if($multi_profiles) { - $profile['edit'] = array($a->get_baseurl(). '/profiles', t('Profiles'),"", t('Manage/edit profiles')); - $profile['menu']['cr_new'] = t('Create New Profile'); - } - else - $profile['edit'] = array($a->get_baseurl() . '/profiles/' . $profile['id'], t('Edit Profile'),'',t('Edit Profile')); - - $r = q("SELECT * FROM `profile` WHERE `uid` = %d", - local_channel()); - - if($r) { - foreach($r as $rr) { - if(!($multi_profiles || $rr['is_default'])) - continue; - $profile['menu']['entries'][] = array( - 'photo' => $rr['thumb'], - 'id' => $rr['id'], - 'alt' => t('Profile Image'), - 'profile_name' => $rr['profile_name'], - 'isdefault' => $rr['is_default'], - 'visible_to_everybody' => t('visible to everybody'), - 'edit_visibility' => t('Edit visibility'), - ); - } - } - } - - if((x($profile,'address') == 1) || (x($profile,'locality') == 1) || (x($profile,'region') == 1) @@ -1075,6 +1088,7 @@ function profile_sidebar($profile, $block = 0, $show_connect = true, $zcard = fa '$reddress' => $reddress, '$rating' => $z, '$contact_block' => $contact_block, + '$editmenu' => profile_edit_menu($profile['uid']) )); $arr = array('profile' => &$profile, 'entry' => &$o); @@ -1239,6 +1253,24 @@ function advanced_profile(&$a) { if($a->profile['name']) { + $profile_fields_basic = get_profile_fields_basic(); + $profile_fields_advanced = get_profile_fields_advanced(); + + $advanced = ((feature_enabled($a->profile['profile_uid'],'advanced_profiles')) ? true : false); + if($advanced) + $fields = $profile_fields_advanced; + else + $fields = $profile_fields_basic; + + $clean_fields = array(); + if($fields) { + foreach($fields as $k => $v) { + $clean_fields[] = trim($k); + } + } + + + $tpl = get_markup_template('profile_advanced.tpl'); $profile = array(); @@ -1347,10 +1379,6 @@ function advanced_profile(&$a) { $profile['extra_fields'] = $a->profile['extra_fields']; } - - $is_owner = (($a->profile['profile_uid'] == local_channel()) ? true : false); - $edit = (($is_owner) ? array('link' => $a->get_baseurl() . '/profiles/' . $a->profile['profile_uid'], 'label' => t('Edit')) : ''); - $things = get_things($a->profile['profile_guid'],$a->profile['profile_uid']); // logger('mod_profile: things: ' . print_r($things,true), LOGGER_DATA); @@ -1360,7 +1388,8 @@ function advanced_profile(&$a) { '$canlike' => (($profile['canlike'])? true : false), '$likethis' => t('Like this thing'), '$profile' => $profile, - '$edit' => $edit, + '$fields' => $clean_fields, + '$editmenu' => profile_edit_menu($a->profile['profile_uid']), '$things' => $things )); } diff --git a/include/photos.php b/include/photos.php index be18600de..5dd5f3c62 100644 --- a/include/photos.php +++ b/include/photos.php @@ -300,7 +300,7 @@ function photo_upload($channel, $observer, $args) { $activity_format = sprintf(t('%1$s posted %2$s to %3$s','photo_upload'), $author_link, $photo_link, $album_link); - $summary = $activity_format . "\n\n" . (($args['body']) ? $args['body'] . "\n\n" : ''); + $summary = (($args['body']) ? $args['body'] : '') . '[footer]' . $activity_format . '[/footer]'; $obj_body = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash . ']' . $tag . z_root() . "/photo/{$photo_hash}-{$scale}." . $ph->getExt() . '[/zmg]' @@ -391,8 +391,8 @@ function photo_upload($channel, $observer, $args) { $arr['deny_cid'] = $ac['deny_cid']; $arr['deny_gid'] = $ac['deny_gid']; $arr['verb'] = ACTIVITY_POST; - $arr['obj_type'] = ACTIVITY_OBJ_PHOTO; - $arr['object'] = json_encode($object); + $arr['obj_type'] = ACTIVITY_OBJ_PHOTO; + $arr['object'] = json_encode($object); $arr['tgt_type'] = ACTIVITY_OBJ_ALBUM; $arr['target'] = json_encode($target); $arr['item_wall'] = 1; @@ -400,7 +400,7 @@ function photo_upload($channel, $observer, $args) { $arr['item_thread_top'] = 1; $arr['item_private'] = intval($acl->is_private()); $arr['plink'] = z_root() . '/channel/' . $channel['channel_address'] . '/?f=&mid=' . $arr['mid']; - $arr['body'] = $summary; + $arr['body'] = $summary; // this one is tricky because the item and the photo have the same permissions, those of the photo. diff --git a/include/widgets.php b/include/widgets.php index a995fdf1c..aa0be87d6 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -1197,7 +1197,7 @@ function widget_forums($arr) { $perms_sql = item_permissions_sql(local_channel()) . item_normal(); - $r1 = q("select * from abook left join xchan on abook_xchan = xchan_hash where ( xchan_pubforum = 1 or ((abook_their_perms & %d ) != 0 and (abook_their_perms & %d ) = 0) ) and abook_channel = %d order by xchan_name $limit ", + $r1 = q("select * from abook left join xchan on abook_xchan = xchan_hash where ( xchan_pubforum = 1 or ((abook_their_perms & %d ) != 0 and (abook_their_perms & %d ) = 0) ) and xchan_deleted = 0 and abook_channel = %d order by xchan_name $limit ", intval(PERMS_W_TAGWALL), intval(PERMS_W_STREAM), intval(local_channel()) diff --git a/include/zot.php b/include/zot.php index de841f956..a60a50d8f 100644 --- a/include/zot.php +++ b/include/zot.php @@ -522,6 +522,11 @@ function zot_refresh($them, $channel = null, $force = false) { unset($new_connection[0]['abook_id']); unset($new_connection[0]['abook_account']); unset($new_connection[0]['abook_channel']); + + $abconfig = load_abconfig($channel['channel_hash'],$new_connection['abook_xchan']); + if($abconfig) + $new_connection['abconfig'] = $abconfig; + build_sync_packet($channel['channel_id'], array('abook' => $new_connection)); } } @@ -2971,6 +2976,8 @@ function build_sync_packet($uid = 0, $packet = null, $groups_changed = false) { logger('build_sync_packet: packet: ' . print_r($info,true), LOGGER_DATA, LOG_DEBUG); + $total = count($synchubs); + foreach($synchubs as $hub) { $hash = random_string(); $n = zot_build_packet($channel,'notify',$env_recips,$hub['hubloc_sitekey'],$hash); @@ -2984,7 +2991,9 @@ function build_sync_packet($uid = 0, $packet = null, $groups_changed = false) { )); proc_run('php', 'include/deliver.php', $hash); - if($interval) + $total = $total - 1; + + if($interval && $total) @time_sleep_until(microtime(true) + (float) $interval); } } @@ -3120,6 +3129,11 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) { foreach($arr['abook'] as $abook) { + $abconfig = null; + + if(array_key_exists('abconfig',$abook) && is_array($abook['abconfig']) && count($abook['abconfig'])) + $abconfig = $abook['abconfig']; + if(! array_key_exists('abook_blocked',$abook)) { // convert from redmatrix $abook['abook_blocked'] = (($abook['abook_flags'] & 0x0001) ? 1 : 0); @@ -3210,8 +3224,13 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) { } } - - + if($abconfig) { + // @fixme does not handle sync of del_abconfig + foreach($abconfig as $abc) { + if($abc['chan'] === $channel['channel_hash']) + set_abconfig($abc['chan'],$abc['xchan'],$abc['cat'],$abc['k'],$abc['v']); + } + } } } diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql index 07a88cf0a..01cf97674 100644 --- a/install/schema_mysql.sql +++ b/install/schema_mysql.sql @@ -1,4 +1,18 @@ +CREATE TABLE IF NOT EXISTS `abconfig` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `chan` char(255) NOT NULL DEFAULT '', + `xchan` char(255) NOT NULL DEFAULT '', + `cat` char(255) NOT NULL DEFAULT '', + `k` char(255) NOT NULL DEFAULT '', + `v` mediumtext NOT NULL, + PRIMARY KEY (`id`), + KEY `chan` (`chan`), + KEY `xchan` (`xchan`), + KEY `cat` (`cat`), + KEY `k` (`k`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + CREATE TABLE IF NOT EXISTS `abook` ( `abook_id` int(10) unsigned NOT NULL AUTO_INCREMENT, `abook_account` int(10) unsigned NOT NULL DEFAULT '0', diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql index 3302ef6c0..a7cd5875c 100644 --- a/install/schema_postgres.sql +++ b/install/schema_postgres.sql @@ -1,3 +1,16 @@ +CREATE TABLE "abconfig" ( + "id" serial NOT NULL, + "chan" text NOT NULL, + "xchan" text NOT NULL, + "cat" text NOT NULL, + "k" text NOT NULL, + "v" text NOT NULL, + PRIMARY KEY ("id") +); +create index "abconfig_chan" on abconfig ("chan"); +create index "abconfig_xchan" on abconfig ("xchan"); +create index "abconfig_cat" on abconfig ("cat"); +create index "abconfig_k" on abconfig ("k"); CREATE TABLE "abook" ( "abook_id" serial NOT NULL, "abook_account" bigint NOT NULL, @@ -547,7 +560,7 @@ CREATE TABLE "iconfig" ( "k" text NOT NULL DEFAULT '', "v" text NOT NULL DEFAULT '', "sharing" int NOT NULL DEFAULT '0', - PRIMARY_KEY("id") + PRIMARY KEY("id") ); create index "iconfig_iid" on iconfig ("iid"); create index "iconfig_cat" on iconfig ("cat"); diff --git a/install/update.php b/install/update.php index 0f9b3ab28..bfd01494f 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ <?php -define( 'UPDATE_VERSION' , 1164 ); +define( 'UPDATE_VERSION' , 1165 ); /** * @@ -2018,4 +2018,43 @@ function update_r1163() { if($r1 && $r2) return UPDATE_SUCCESS; return UPDATE_FAILED; -}
\ No newline at end of file +} + +function update_r1164() { + + if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) { + $r1 = q("CREATE TABLE \"abconfig\" ( + \"id\" serial NOT NULL, + \"chan\" text NOT NULL, + \"xchan\" text NOT NULL, + \"cat\" text NOT NULL, + \"k\" text NOT NULL, + \"v\" text NOT NULL, + PRIMARY KEY (\"id\") "); + $r2 = q("create index \"abconfig_chan\" on abconfig (\"chan\") "); + $r3 = q("create index \"abconfig_xchan\" on abconfig (\"xchan\") "); + $r4 = q("create index \"abconfig_cat\" on abconfig (\"cat\") "); + $r5 = q("create index \"abconfig_k\" on abconfig (\"k\") "); + $r = $r1 && $r2 && $r3 && $r4 && $r5; + } + else { + $r = q("CREATE TABLE IF NOT EXISTS `abconfig` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `chan` char(255) NOT NULL DEFAULT '', + `xchan` char(255) NOT NULL DEFAULT '', + `cat` char(255) NOT NULL DEFAULT '', + `k` char(255) NOT NULL DEFAULT '', + `v` mediumtext NOT NULL, + PRIMARY KEY (`id`), + KEY `chan` (`chan`), + KEY `xchan` (`xchan`), + KEY `cat` (`cat`), + KEY `k` (`k`) + ) ENGINE=MyISAM DEFAULT CHARSET=utf8 "); + + } + if($r) + return UPDATE_SUCCESS; + return UPDATE_FAILED; +} + diff --git a/mod/connedit.php b/mod/connedit.php index d50783d31..008bc21ac 100644 --- a/mod/connedit.php +++ b/mod/connedit.php @@ -322,6 +322,9 @@ function connedit_clone(&$a) { if(! $a->poi) return; + + $channel = $a->get_channel(); + $r = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d and abook_id = %d LIMIT 1", @@ -338,6 +341,10 @@ function connedit_clone(&$a) { unset($clone['abook_account']); unset($clone['abook_channel']); + $abconfig = load_abconfig($channel['channel_hash'],$clone['abook_xchan']); + if($abconfig) + $clone['abconfig'] = $abconfig; + build_sync_packet(0 /* use the current local_channel */, array('abook' => array($clone))); } diff --git a/mod/follow.php b/mod/follow.php index 3ad2cb3bb..73e87c16f 100644 --- a/mod/follow.php +++ b/mod/follow.php @@ -14,7 +14,9 @@ function follow_init(&$a) { $return_url = $_SESSION['return_url']; $confirm = intval($_REQUEST['confirm']); - $result = new_contact($uid,$url,$a->get_channel(),true,$confirm); + $channel = $a->get_channel(); + + $result = new_contact($uid,$url,$channel,true,$confirm); if($result['success'] == false) { if($result['message']) @@ -34,6 +36,10 @@ function follow_init(&$a) { unset($clone['abook_account']); unset($clone['abook_channel']); + $abconfig = load_abconfig($channel['channel_hash'],$clone['abook_xchan']); + if($abconfig) + $clone['abconfig'] = $abconfig; + build_sync_packet(0 /* use the current local_channel */, array('abook' => array($clone))); diff --git a/mod/import.php b/mod/import.php index 184159585..0b239d822 100644 --- a/mod/import.php +++ b/mod/import.php @@ -341,6 +341,10 @@ function import_account(&$a, $account_id) { if($abooks) { foreach($abooks as $abook) { + $abconfig = null; + if(array_key_exists('abconfig',$abook) && is_array($abook['abconfig']) && count($abook['abconfig'])) + $abconfig = $abook['abconfig']; + unset($abook['abook_id']); unset($abook['abook_rating']); unset($abook['abook_rating_text']); @@ -382,6 +386,17 @@ function import_account(&$a, $account_id) { $friends ++; if(intval($abook['abook_feed'])) $feeds ++; + + if($abconfig) { + // @fixme does not handle sync of del_abconfig + foreach($abconfig as $abc) { + if($abc['chan'] === $channel['channel_hash']) + set_abconfig($abc['chan'],$abc['xchan'],$abc['cat'],$abc['k'],$abc['v']); + } + } + + + } } logger('import step 8'); diff --git a/version.inc b/version.inc index 24a246ad6..9881b9f45 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2016-02-27.1320H +2016-03-01.1323H diff --git a/view/css/conversation.css b/view/css/conversation.css index 9063ffa60..39c973c14 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -19,20 +19,30 @@ code { display:none; } +#jot-title-wrap, +#jot-pagetitle-wrap, +#jot-category-wrap { + border-bottom: 1px solid #ccc; +} + +#jot-attachment-wrap { + border-top: 1px solid #ccc; +} + #jot-title-wrap input, #jot-pagetitle-wrap input { - padding: 8px; - margin-bottom: 5px; + padding: 10px; } .profile-jot-text { height: 39px; - padding: 8px; + padding: 10px; width: 100%; } .jot-attachment { - padding: 8px; + border: 0px; + padding: 10px; width: 100%; } @@ -42,13 +52,18 @@ code { } #profile-jot-submit-wrapper { - margin-top: 10px; + border-top: 1px solid #ccc; + padding: 10px; } #profile-jot-perms-end { height: 30px; } +#profile-jot-form { + line-height: initial; +} + #profile-jot-wrapper { margin-bottom: 30px; } @@ -194,6 +209,7 @@ a.wall-item-name-link { padding: 8px; height: 150px; overflow: auto; + resize: vertical; } .qcomment { diff --git a/view/css/mod_cloud.css b/view/css/mod_cloud.css index 76ac82690..ed07ceb6f 100644 --- a/view/css/mod_cloud.css +++ b/view/css/mod_cloud.css @@ -38,6 +38,6 @@ } #files-upload { - padding: 4px; + padding: 7px 10px; width: 100%; } diff --git a/view/css/mod_photos.css b/view/css/mod_photos.css index ae250bc1c..72dd7ffe7 100644 --- a/view/css/mod_photos.css +++ b/view/css/mod_photos.css @@ -25,7 +25,7 @@ } #photos-upload-choose { - padding: 4px; + padding: 7px 10px; width: 100%; } diff --git a/view/es-es/hmessages.po b/view/es-es/hmessages.po index e40957456..e42fe0a5d 100644 --- a/view/es-es/hmessages.po +++ b/view/es-es/hmessages.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: Redmatrix\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-19 19:12-0800\n" -"PO-Revision-Date: 2016-02-21 07:37+0000\n" +"POT-Creation-Date: 2016-02-26 00:03-0800\n" +"PO-Revision-Date: 2016-02-28 17:12+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" @@ -62,14 +62,14 @@ msgid "Schedule Outbox" msgstr "Programar bandeja de salida" #: ../../Zotlabs/Storage/Browser.php:164 ../../include/apps.php:360 -#: ../../include/apps.php:415 ../../include/conversation.php:1037 -#: ../../include/widgets.php:1410 ../../mod/photos.php:766 +#: ../../include/apps.php:415 ../../include/widgets.php:1410 +#: ../../include/conversation.php:1037 ../../mod/photos.php:766 #: ../../mod/photos.php:1209 msgid "Unknown" msgstr "Desconocido" #: ../../Zotlabs/Storage/Browser.php:226 ../../include/apps.php:135 -#: ../../include/conversation.php:1639 ../../include/nav.php:93 +#: ../../include/nav.php:93 ../../include/conversation.php:1648 #: ../../mod/fbrowser.php:109 msgid "Files" msgstr "Ficheros" @@ -84,8 +84,7 @@ msgstr "Compartido" #: ../../Zotlabs/Storage/Browser.php:230 ../../Zotlabs/Storage/Browser.php:303 #: ../../mod/blocks.php:152 ../../mod/layouts.php:175 ../../mod/menu.php:114 -#: ../../mod/new_channel.php:146 ../../mod/register.php:257 -#: ../../mod/webpages.php:180 +#: ../../mod/new_channel.php:138 ../../mod/webpages.php:182 msgid "Create" msgstr "Crear" @@ -97,8 +96,8 @@ msgid "Upload" msgstr "Subir" #: ../../Zotlabs/Storage/Browser.php:235 ../../mod/admin.php:1158 -#: ../../mod/register.php:247 ../../mod/settings.php:599 -#: ../../mod/settings.php:625 ../../mod/sharedwithme.php:95 +#: ../../mod/settings.php:599 ../../mod/settings.php:625 +#: ../../mod/sharedwithme.php:95 msgid "Name" msgstr "Nombre" @@ -116,14 +115,14 @@ msgid "Last Modified" msgstr "Última modificación" #: ../../Zotlabs/Storage/Browser.php:240 ../../include/apps.php:259 -#: ../../include/menu.php:108 ../../include/page_widgets.php:8 -#: ../../include/page_widgets.php:36 ../../include/ItemObject.php:100 -#: ../../mod/blocks.php:153 ../../mod/connections.php:286 -#: ../../mod/connections.php:306 ../../mod/editblock.php:135 -#: ../../mod/editlayout.php:134 ../../mod/editpost.php:112 -#: ../../mod/editwebpage.php:176 ../../mod/layouts.php:183 -#: ../../mod/menu.php:108 ../../mod/settings.php:659 ../../mod/thing.php:256 -#: ../../mod/webpages.php:181 +#: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36 +#: ../../include/menu.php:108 ../../include/identity.php:1352 +#: ../../include/ItemObject.php:100 ../../mod/blocks.php:153 +#: ../../mod/connections.php:286 ../../mod/connections.php:306 +#: ../../mod/editblock.php:135 ../../mod/editlayout.php:134 +#: ../../mod/editpost.php:112 ../../mod/editwebpage.php:176 +#: ../../mod/layouts.php:183 ../../mod/menu.php:108 ../../mod/settings.php:659 +#: ../../mod/thing.php:256 ../../mod/webpages.php:183 msgid "Edit" msgstr "Editar" @@ -134,7 +133,7 @@ msgstr "Editar" #: ../../mod/editlayout.php:179 ../../mod/editwebpage.php:223 #: ../../mod/group.php:173 ../../mod/photos.php:1140 ../../mod/admin.php:993 #: ../../mod/admin.php:1152 ../../mod/settings.php:660 ../../mod/thing.php:257 -#: ../../mod/webpages.php:183 +#: ../../mod/webpages.php:185 msgid "Delete" msgstr "Eliminar" @@ -167,8 +166,8 @@ msgstr "Subir fichero" #: ../../include/attach.php:358 ../../include/attach.php:436 #: ../../include/attach.php:888 ../../include/attach.php:959 #: ../../include/attach.php:1111 ../../include/chat.php:133 -#: ../../include/photos.php:29 ../../include/items.php:4512 -#: ../../index.php:194 ../../mod/achievements.php:30 ../../mod/api.php:26 +#: ../../include/photos.php:29 ../../include/items.php:4575 +#: ../../index.php:180 ../../mod/achievements.php:30 ../../mod/api.php:26 #: ../../mod/api.php:31 ../../mod/appman.php:66 ../../mod/authtest.php:13 #: ../../mod/block.php:22 ../../mod/block.php:72 ../../mod/blocks.php:69 #: ../../mod/blocks.php:76 ../../mod/bookmarks.php:48 @@ -189,7 +188,7 @@ msgstr "Subir fichero" #: ../../mod/locs.php:83 ../../mod/mail.php:126 ../../mod/manage.php:6 #: ../../mod/menu.php:74 ../../mod/message.php:16 ../../mod/mitem.php:111 #: ../../mod/mood.php:112 ../../mod/network.php:12 -#: ../../mod/new_channel.php:75 ../../mod/new_channel.php:108 +#: ../../mod/new_channel.php:73 ../../mod/new_channel.php:100 #: ../../mod/notifications.php:66 ../../mod/page.php:31 ../../mod/page.php:86 #: ../../mod/pdledit.php:22 ../../mod/photos.php:70 ../../mod/poke.php:133 #: ../../mod/profile.php:64 ../../mod/profile.php:72 @@ -215,9 +214,9 @@ msgstr "No encontrado" msgid "Page not found." msgstr "Página no encontrada." -#: ../../include/Contact.php:101 ../../include/conversation.php:961 -#: ../../include/widgets.php:147 ../../include/widgets.php:185 -#: ../../include/identity.php:954 ../../mod/directory.php:321 +#: ../../include/Contact.php:101 ../../include/widgets.php:147 +#: ../../include/widgets.php:185 ../../include/identity.php:954 +#: ../../include/conversation.php:961 ../../mod/directory.php:321 #: ../../mod/match.php:64 ../../mod/suggest.php:52 msgid "Connect" msgstr "Conectar" @@ -382,8 +381,8 @@ msgstr "Cronología pública" msgid "Site Admin" msgstr "Administrador del sitio" -#: ../../include/apps.php:129 ../../include/conversation.php:1665 -#: ../../include/nav.php:104 +#: ../../include/apps.php:129 ../../include/nav.php:104 +#: ../../include/conversation.php:1685 msgid "Bookmarks" msgstr "Marcadores" @@ -391,7 +390,7 @@ msgstr "Marcadores" msgid "Address Book" msgstr "Libreta de direcciones" -#: ../../include/apps.php:131 ../../include/nav.php:112 ../../boot.php:1544 +#: ../../include/apps.php:131 ../../include/nav.php:112 ../../boot.php:1543 msgid "Login" msgstr "Iniciar sesión" @@ -410,8 +409,8 @@ msgstr "Red" msgid "Settings" msgstr "Ajustes" -#: ../../include/apps.php:136 ../../include/conversation.php:1675 -#: ../../include/nav.php:108 ../../mod/webpages.php:178 +#: ../../include/apps.php:136 ../../include/nav.php:108 +#: ../../include/conversation.php:1695 ../../mod/webpages.php:180 msgid "Webpages" msgstr "Páginas web" @@ -419,17 +418,18 @@ msgstr "Páginas web" msgid "Channel Home" msgstr "Mi canal" -#: ../../include/apps.php:138 ../../include/identity.php:1242 -#: ../../include/identity.php:1359 ../../mod/profperm.php:112 +#: ../../include/apps.php:138 ../../include/identity.php:1359 +#: ../../mod/profperm.php:112 msgid "Profile" msgstr "Perfil" -#: ../../include/apps.php:139 ../../include/conversation.php:1632 -#: ../../include/nav.php:92 ../../mod/fbrowser.php:25 +#: ../../include/apps.php:139 ../../include/nav.php:92 +#: ../../include/conversation.php:1641 ../../mod/fbrowser.php:25 msgid "Photos" msgstr "Fotos" #: ../../include/apps.php:140 ../../include/nav.php:198 +#: ../../include/conversation.php:1658 ../../include/conversation.php:1661 msgid "Events" msgstr "Eventos" @@ -781,706 +781,6 @@ msgstr[1] "%d conexiones en común" msgid "show more" msgstr "mostrar más" -#: ../../include/conversation.php:120 ../../include/text.php:1948 -#: ../../mod/like.php:361 ../../mod/subthread.php:83 ../../mod/tagger.php:43 -msgid "photo" -msgstr "foto" - -#: ../../include/conversation.php:123 ../../include/event.php:904 -#: ../../include/text.php:1951 ../../mod/events.php:249 ../../mod/like.php:363 -#: ../../mod/tagger.php:47 -msgid "event" -msgstr "evento" - -#: ../../include/conversation.php:126 ../../mod/like.php:113 -msgid "channel" -msgstr "el canal" - -#: ../../include/conversation.php:148 ../../include/text.php:1954 -#: ../../mod/like.php:361 ../../mod/subthread.php:83 -msgid "status" -msgstr "el mensaje de estado" - -#: ../../include/conversation.php:150 ../../include/text.php:1956 -#: ../../mod/tagger.php:53 -msgid "comment" -msgstr "el comentario" - -#: ../../include/conversation.php:164 ../../mod/like.php:410 -#, php-format -msgid "%1$s likes %2$s's %3$s" -msgstr "A %1$s le gusta %3$s de %2$s" - -#: ../../include/conversation.php:167 ../../mod/like.php:412 -#, php-format -msgid "%1$s doesn't like %2$s's %3$s" -msgstr "A %1$s no le gusta %3$s de %2$s" - -#: ../../include/conversation.php:204 -#, php-format -msgid "%1$s is now connected with %2$s" -msgstr "%1$s ahora está conectado/a con %2$s" - -#: ../../include/conversation.php:239 -#, php-format -msgid "%1$s poked %2$s" -msgstr "%1$s ha dado un toque a %2$s" - -#: ../../include/conversation.php:243 ../../include/text.php:973 -#: ../../include/text.php:978 -msgid "poked" -msgstr "ha dado un toque a" - -#: ../../include/conversation.php:260 ../../mod/mood.php:63 -#, php-format -msgctxt "mood" -msgid "%1$s is %2$s" -msgstr "%1$s está %2$s" - -#: ../../include/conversation.php:574 ../../mod/photos.php:1074 -msgctxt "title" -msgid "Likes" -msgstr "Me gusta" - -#: ../../include/conversation.php:574 ../../mod/photos.php:1074 -msgctxt "title" -msgid "Dislikes" -msgstr "No me gusta" - -#: ../../include/conversation.php:575 ../../mod/photos.php:1075 -msgctxt "title" -msgid "Agree" -msgstr "De acuerdo" - -#: ../../include/conversation.php:575 ../../mod/photos.php:1075 -msgctxt "title" -msgid "Disagree" -msgstr "En desacuerdo" - -#: ../../include/conversation.php:575 ../../mod/photos.php:1075 -msgctxt "title" -msgid "Abstain" -msgstr "Abstención" - -#: ../../include/conversation.php:576 ../../mod/photos.php:1076 -msgctxt "title" -msgid "Attending" -msgstr "Participaré" - -#: ../../include/conversation.php:576 ../../mod/photos.php:1076 -msgctxt "title" -msgid "Not attending" -msgstr "No participaré" - -#: ../../include/conversation.php:576 ../../mod/photos.php:1076 -msgctxt "title" -msgid "Might attend" -msgstr "Quizá participe" - -#: ../../include/conversation.php:656 ../../include/ItemObject.php:126 -msgid "Select" -msgstr "Seleccionar" - -#: ../../include/conversation.php:664 ../../include/ItemObject.php:89 -msgid "Private Message" -msgstr "Mensaje Privado" - -#: ../../include/conversation.php:671 ../../include/ItemObject.php:227 -msgid "Message signature validated" -msgstr "Firma de mensaje validada" - -#: ../../include/conversation.php:672 ../../include/ItemObject.php:228 -msgid "Message signature incorrect" -msgstr "Firma de mensaje incorrecta" - -#: ../../include/conversation.php:691 -#, php-format -msgid "View %s's profile @ %s" -msgstr "Ver el perfil @ %s de %s" - -#: ../../include/conversation.php:710 -msgid "Categories:" -msgstr "Categorías:" - -#: ../../include/conversation.php:711 -msgid "Filed under:" -msgstr "Archivado bajo:" - -#: ../../include/conversation.php:719 ../../include/ItemObject.php:334 -#, php-format -msgid "from %s" -msgstr "desde %s" - -#: ../../include/conversation.php:722 ../../include/ItemObject.php:337 -#, php-format -msgid "last edited: %s" -msgstr "último cambio: %s" - -#: ../../include/conversation.php:723 ../../include/ItemObject.php:338 -#, php-format -msgid "Expires: %s" -msgstr "Caduca: %s" - -#: ../../include/conversation.php:738 -msgid "View in context" -msgstr "Mostrar en su contexto" - -#: ../../include/conversation.php:740 ../../include/conversation.php:1237 -#: ../../include/ItemObject.php:389 ../../mod/editblock.php:150 -#: ../../mod/editlayout.php:148 ../../mod/editpost.php:129 -#: ../../mod/editwebpage.php:190 ../../mod/photos.php:1040 -msgid "Please wait" -msgstr "Espere por favor" - -#: ../../include/conversation.php:850 -msgid "remove" -msgstr "eliminar" - -#: ../../include/conversation.php:854 ../../include/nav.php:244 -msgid "Loading..." -msgstr "Cargando..." - -#: ../../include/conversation.php:855 -msgid "Delete Selected Items" -msgstr "Eliminar elementos seleccionados" - -#: ../../include/conversation.php:953 -msgid "View Source" -msgstr "Ver la fuente original de la publicación" - -#: ../../include/conversation.php:954 -msgid "Follow Thread" -msgstr "Seguir este hilo" - -#: ../../include/conversation.php:955 -msgid "Unfollow Thread" -msgstr "Dejar de seguir este hilo" - -#: ../../include/conversation.php:959 ../../include/nav.php:86 -#: ../../mod/connedit.php:509 -msgid "View Profile" -msgstr "Ver el perfil" - -#: ../../include/conversation.php:960 -msgid "Activity/Posts" -msgstr "Actividad y publicaciones" - -#: ../../include/conversation.php:962 -msgid "Edit Connection" -msgstr "Editar conexión" - -#: ../../include/conversation.php:963 -msgid "Message" -msgstr "Mensaje" - -#: ../../include/conversation.php:964 ../../mod/ratings.php:99 -msgid "Ratings" -msgstr "Valoraciones" - -#: ../../include/conversation.php:1080 -#, php-format -msgid "%s likes this." -msgstr "A %s le gusta esto." - -#: ../../include/conversation.php:1080 -#, php-format -msgid "%s doesn't like this." -msgstr "A %s no le gusta esto." - -#: ../../include/conversation.php:1084 -#, php-format -msgid "<span %1$s>%2$d people</span> like this." -msgid_plural "<span %1$s>%2$d people</span> like this." -msgstr[0] "a <span %1$s>%2$d personas</span> le gusta esto." -msgstr[1] "A <span %1$s>%2$d personas</span> les gusta esto." - -#: ../../include/conversation.php:1086 -#, php-format -msgid "<span %1$s>%2$d people</span> don't like this." -msgid_plural "<span %1$s>%2$d people</span> don't like this." -msgstr[0] "a <span %1$s>%2$d personas</span> no les gusta esto." -msgstr[1] "A <span %1$s>%2$d personas</span> no les gusta esto." - -#: ../../include/conversation.php:1092 -msgid "and" -msgstr "y" - -#: ../../include/conversation.php:1095 -#, php-format -msgid ", and %d other people" -msgid_plural ", and %d other people" -msgstr[0] ", y %d persona más" -msgstr[1] ", y %d personas más" - -#: ../../include/conversation.php:1096 -#, php-format -msgid "%s like this." -msgstr "A %s le gusta esto." - -#: ../../include/conversation.php:1096 -#, php-format -msgid "%s don't like this." -msgstr "A %s no le gusta esto." - -#: ../../include/conversation.php:1164 -msgid "Visible to <strong>everybody</strong>" -msgstr "Visible para <strong>cualquiera</strong>" - -#: ../../include/conversation.php:1165 ../../mod/mail.php:202 -#: ../../mod/mail.php:316 -msgid "Please enter a link URL:" -msgstr "Por favor, introduzca la dirección del enlace:" - -#: ../../include/conversation.php:1166 -msgid "Please enter a video link/URL:" -msgstr "Por favor, introduzca un enlace de vídeo:" - -#: ../../include/conversation.php:1167 -msgid "Please enter an audio link/URL:" -msgstr "Por favor, introduzca un enlace de audio:" - -#: ../../include/conversation.php:1168 -msgid "Tag term:" -msgstr "Término de la etiqueta:" - -#: ../../include/conversation.php:1169 ../../mod/filer.php:48 -msgid "Save to Folder:" -msgstr "Guardar en carpeta:" - -#: ../../include/conversation.php:1170 -msgid "Where are you right now?" -msgstr "¿Donde está ahora?" - -#: ../../include/conversation.php:1171 ../../mod/editpost.php:56 -#: ../../mod/mail.php:203 ../../mod/mail.php:317 -msgid "Expires YYYY-MM-DD HH:MM" -msgstr "Caduca YYYY-MM-DD HH:MM" - -#: ../../include/conversation.php:1179 ../../include/page_widgets.php:40 -#: ../../include/ItemObject.php:712 ../../mod/editblock.php:171 -#: ../../mod/editpost.php:149 ../../mod/editwebpage.php:212 -#: ../../mod/events.php:458 ../../mod/photos.php:1060 -#: ../../mod/webpages.php:188 -msgid "Preview" -msgstr "Previsualizar" - -#: ../../include/conversation.php:1202 ../../mod/blocks.php:154 -#: ../../mod/layouts.php:184 ../../mod/photos.php:1039 -#: ../../mod/webpages.php:182 -msgid "Share" -msgstr "Compartir" - -#: ../../include/conversation.php:1204 -msgid "Page link name" -msgstr "Nombre de enlace de página" - -#: ../../include/conversation.php:1207 -msgid "Post as" -msgstr "Publicar como" - -#: ../../include/conversation.php:1209 ../../include/ItemObject.php:704 -#: ../../mod/editblock.php:136 ../../mod/editlayout.php:135 -#: ../../mod/editpost.php:113 ../../mod/editwebpage.php:177 -msgid "Bold" -msgstr "Negrita" - -#: ../../include/conversation.php:1210 ../../include/ItemObject.php:705 -#: ../../mod/editblock.php:137 ../../mod/editlayout.php:136 -#: ../../mod/editpost.php:114 ../../mod/editwebpage.php:178 -msgid "Italic" -msgstr "Itálico " - -#: ../../include/conversation.php:1211 ../../include/ItemObject.php:706 -#: ../../mod/editblock.php:138 ../../mod/editlayout.php:137 -#: ../../mod/editpost.php:115 ../../mod/editwebpage.php:179 -msgid "Underline" -msgstr "Subrayar" - -#: ../../include/conversation.php:1212 ../../include/ItemObject.php:707 -#: ../../mod/editblock.php:139 ../../mod/editlayout.php:138 -#: ../../mod/editpost.php:116 ../../mod/editwebpage.php:180 -msgid "Quote" -msgstr "Citar" - -#: ../../include/conversation.php:1213 ../../include/ItemObject.php:708 -#: ../../mod/editblock.php:140 ../../mod/editlayout.php:139 -#: ../../mod/editpost.php:117 ../../mod/editwebpage.php:181 -msgid "Code" -msgstr "Código" - -#: ../../include/conversation.php:1214 ../../mod/editblock.php:142 -#: ../../mod/editlayout.php:140 ../../mod/editpost.php:118 -#: ../../mod/editwebpage.php:182 -msgid "Upload photo" -msgstr "Subir foto" - -#: ../../include/conversation.php:1215 -msgid "upload photo" -msgstr "subir foto" - -#: ../../include/conversation.php:1216 ../../mod/editblock.php:143 -#: ../../mod/editlayout.php:141 ../../mod/editpost.php:119 -#: ../../mod/editwebpage.php:183 ../../mod/mail.php:248 ../../mod/mail.php:378 -msgid "Attach file" -msgstr "Adjuntar fichero" - -#: ../../include/conversation.php:1217 -msgid "attach file" -msgstr "adjuntar fichero" - -#: ../../include/conversation.php:1218 ../../mod/editblock.php:144 -#: ../../mod/editlayout.php:142 ../../mod/editpost.php:120 -#: ../../mod/editwebpage.php:184 ../../mod/mail.php:249 ../../mod/mail.php:379 -msgid "Insert web link" -msgstr "Insertar enlace web" - -#: ../../include/conversation.php:1219 -msgid "web link" -msgstr "enlace web" - -#: ../../include/conversation.php:1220 -msgid "Insert video link" -msgstr "Insertar enlace de vídeo" - -#: ../../include/conversation.php:1221 -msgid "video link" -msgstr "enlace de vídeo" - -#: ../../include/conversation.php:1222 -msgid "Insert audio link" -msgstr "Insertar enlace de audio" - -#: ../../include/conversation.php:1223 -msgid "audio link" -msgstr "enlace de audio" - -#: ../../include/conversation.php:1224 ../../mod/editblock.php:148 -#: ../../mod/editlayout.php:146 ../../mod/editpost.php:124 -#: ../../mod/editwebpage.php:188 -msgid "Set your location" -msgstr "Establecer su ubicación" - -#: ../../include/conversation.php:1225 -msgid "set location" -msgstr "establecer ubicación" - -#: ../../include/conversation.php:1226 ../../mod/editpost.php:126 -msgid "Toggle voting" -msgstr "Cambiar votación" - -#: ../../include/conversation.php:1229 ../../mod/editblock.php:149 -#: ../../mod/editlayout.php:147 ../../mod/editpost.php:125 -#: ../../mod/editwebpage.php:189 -msgid "Clear browser location" -msgstr "Eliminar los datos de ubicación del navegador" - -#: ../../include/conversation.php:1230 -msgid "clear location" -msgstr "borrar los datos de ubicación" - -#: ../../include/conversation.php:1232 ../../mod/editblock.php:162 -#: ../../mod/editpost.php:141 ../../mod/editwebpage.php:205 -msgid "Title (optional)" -msgstr "Título (opcional)" - -#: ../../include/conversation.php:1236 ../../mod/editblock.php:165 -#: ../../mod/editlayout.php:163 ../../mod/editpost.php:143 -#: ../../mod/editwebpage.php:207 -msgid "Categories (optional, comma-separated list)" -msgstr "Categorías (opcional, lista separada por comas)" - -#: ../../include/conversation.php:1238 ../../mod/editblock.php:151 -#: ../../mod/editlayout.php:149 ../../mod/editpost.php:130 -#: ../../mod/editwebpage.php:191 ../../mod/events.php:459 -msgid "Permission settings" -msgstr "Configuración de permisos" - -#: ../../include/conversation.php:1239 -msgid "permissions" -msgstr "permisos" - -#: ../../include/conversation.php:1247 ../../mod/editblock.php:159 -#: ../../mod/editlayout.php:156 ../../mod/editpost.php:138 -#: ../../mod/editwebpage.php:200 -msgid "Public post" -msgstr "Entrada pública" - -#: ../../include/conversation.php:1249 ../../mod/editblock.php:166 -#: ../../mod/editlayout.php:164 ../../mod/editpost.php:144 -#: ../../mod/editwebpage.php:208 -msgid "Example: bob@example.com, mary@example.com" -msgstr "Ejemplo: roberto@ejemplo.com, maría@ejemplo.com" - -#: ../../include/conversation.php:1262 ../../mod/editblock.php:176 -#: ../../mod/editlayout.php:173 ../../mod/editpost.php:155 -#: ../../mod/editwebpage.php:217 ../../mod/mail.php:253 ../../mod/mail.php:383 -msgid "Set expiration date" -msgstr "Configurar fecha de caducidad" - -#: ../../include/conversation.php:1265 -msgid "Set publish date" -msgstr "Establecer la fecha de publicación" - -#: ../../include/conversation.php:1267 ../../include/ItemObject.php:715 -#: ../../mod/editpost.php:157 ../../mod/mail.php:255 ../../mod/mail.php:385 -msgid "Encrypt text" -msgstr "Cifrar texto" - -#: ../../include/conversation.php:1269 ../../mod/editpost.php:159 -msgid "OK" -msgstr "OK" - -#: ../../include/conversation.php:1270 ../../mod/editpost.php:160 -#: ../../mod/fbrowser.php:77 ../../mod/fbrowser.php:112 -#: ../../mod/settings.php:598 ../../mod/settings.php:624 -#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:134 -msgid "Cancel" -msgstr "Cancelar" - -#: ../../include/conversation.php:1513 -msgid "Discover" -msgstr "Descubrir" - -#: ../../include/conversation.php:1516 -msgid "Imported public streams" -msgstr "Contenidos públicos importados" - -#: ../../include/conversation.php:1521 -msgid "Commented Order" -msgstr "Comentarios recientes" - -#: ../../include/conversation.php:1524 -msgid "Sort by Comment Date" -msgstr "Ordenar por fecha de comentario" - -#: ../../include/conversation.php:1528 -msgid "Posted Order" -msgstr "Publicaciones recientes" - -#: ../../include/conversation.php:1531 -msgid "Sort by Post Date" -msgstr "Ordenar por fecha de publicación" - -#: ../../include/conversation.php:1536 ../../include/widgets.php:105 -msgid "Personal" -msgstr "Personales" - -#: ../../include/conversation.php:1539 -msgid "Posts that mention or involve you" -msgstr "Publicaciones que le mencionan o involucran" - -#: ../../include/conversation.php:1545 ../../mod/connections.php:72 -#: ../../mod/connections.php:82 ../../mod/menu.php:112 -msgid "New" -msgstr "Nuevas" - -#: ../../include/conversation.php:1548 -msgid "Activity Stream - by date" -msgstr "Contenido - por fecha" - -#: ../../include/conversation.php:1554 -msgid "Starred" -msgstr "Preferidas" - -#: ../../include/conversation.php:1557 -msgid "Favourite Posts" -msgstr "Publicaciones favoritas" - -#: ../../include/conversation.php:1564 -msgid "Spam" -msgstr "Correo basura" - -#: ../../include/conversation.php:1567 -msgid "Posts flagged as SPAM" -msgstr "Publicaciones marcadas como basura" - -#: ../../include/conversation.php:1611 ../../mod/admin.php:1157 -msgid "Channel" -msgstr "Canal" - -#: ../../include/conversation.php:1614 -msgid "Status Messages and Posts" -msgstr "Mensajes de estado y publicaciones" - -#: ../../include/conversation.php:1623 -msgid "About" -msgstr "Mi perfil" - -#: ../../include/conversation.php:1626 -msgid "Profile Details" -msgstr "Detalles del perfil" - -#: ../../include/conversation.php:1635 ../../include/photos.php:506 -msgid "Photo Albums" -msgstr "Álbumes de fotos" - -#: ../../include/conversation.php:1642 -msgid "Files and Storage" -msgstr "Ficheros y repositorio" - -#: ../../include/conversation.php:1652 ../../include/conversation.php:1655 -msgid "Chatrooms" -msgstr "Salas de chat" - -#: ../../include/conversation.php:1668 -msgid "Saved Bookmarks" -msgstr "Marcadores guardados" - -#: ../../include/conversation.php:1678 -msgid "Manage Webpages" -msgstr "Administrar páginas web" - -#: ../../include/conversation.php:1707 ../../include/ItemObject.php:175 -#: ../../include/ItemObject.php:187 ../../mod/photos.php:1093 -#: ../../mod/photos.php:1105 -msgid "View all" -msgstr "Ver todo" - -#: ../../include/conversation.php:1731 ../../include/taxonomy.php:415 -#: ../../include/identity.php:1268 ../../include/ItemObject.php:179 -#: ../../mod/photos.php:1097 -msgctxt "noun" -msgid "Like" -msgid_plural "Likes" -msgstr[0] "Me gusta" -msgstr[1] "Me gusta" - -#: ../../include/conversation.php:1734 ../../include/ItemObject.php:184 -#: ../../mod/photos.php:1102 -msgctxt "noun" -msgid "Dislike" -msgid_plural "Dislikes" -msgstr[0] "No me gusta" -msgstr[1] "No me gusta" - -#: ../../include/conversation.php:1737 -msgctxt "noun" -msgid "Attending" -msgid_plural "Attending" -msgstr[0] "Participaré" -msgstr[1] "Participaré" - -#: ../../include/conversation.php:1740 -msgctxt "noun" -msgid "Not Attending" -msgid_plural "Not Attending" -msgstr[0] "No participaré" -msgstr[1] "No participaré" - -#: ../../include/conversation.php:1743 -msgctxt "noun" -msgid "Undecided" -msgid_plural "Undecided" -msgstr[0] "Indeciso/a" -msgstr[1] "Indecisos/as" - -#: ../../include/conversation.php:1746 -msgctxt "noun" -msgid "Agree" -msgid_plural "Agrees" -msgstr[0] "De acuerdo" -msgstr[1] "De acuerdo" - -#: ../../include/conversation.php:1749 -msgctxt "noun" -msgid "Disagree" -msgid_plural "Disagrees" -msgstr[0] "En desacuerdo" -msgstr[1] "En desacuerdo" - -#: ../../include/conversation.php:1752 -msgctxt "noun" -msgid "Abstain" -msgid_plural "Abstains" -msgstr[0] "se abstiene" -msgstr[1] "Se abstienen" - -#: ../../include/datetime.php:48 -msgid "Miscellaneous" -msgstr "Varios" - -#: ../../include/datetime.php:132 -msgid "YYYY-MM-DD or MM-DD" -msgstr "AAAA-MM-DD o MM-DD" - -#: ../../include/datetime.php:236 ../../mod/appman.php:91 -#: ../../mod/appman.php:92 ../../mod/events.php:437 ../../mod/events.php:442 -msgid "Required" -msgstr "Obligatorio" - -#: ../../include/datetime.php:263 ../../boot.php:2375 -msgid "never" -msgstr "nunca" - -#: ../../include/datetime.php:269 -msgid "less than a second ago" -msgstr "hace un instante" - -#: ../../include/datetime.php:287 -#, php-format -msgctxt "e.g. 22 hours ago, 1 minute ago" -msgid "%1$d %2$s ago" -msgstr "hace %1$d %2$s" - -#: ../../include/datetime.php:298 -msgctxt "relative_date" -msgid "year" -msgid_plural "years" -msgstr[0] "año" -msgstr[1] "años" - -#: ../../include/datetime.php:301 -msgctxt "relative_date" -msgid "month" -msgid_plural "months" -msgstr[0] "mes" -msgstr[1] "meses" - -#: ../../include/datetime.php:304 -msgctxt "relative_date" -msgid "week" -msgid_plural "weeks" -msgstr[0] "semana" -msgstr[1] "semanas" - -#: ../../include/datetime.php:307 -msgctxt "relative_date" -msgid "day" -msgid_plural "days" -msgstr[0] "día" -msgstr[1] "días" - -#: ../../include/datetime.php:310 -msgctxt "relative_date" -msgid "hour" -msgid_plural "hours" -msgstr[0] "hora" -msgstr[1] "horas" - -#: ../../include/datetime.php:313 -msgctxt "relative_date" -msgid "minute" -msgid_plural "minutes" -msgstr[0] "minuto" -msgstr[1] "minutos" - -#: ../../include/datetime.php:316 -msgctxt "relative_date" -msgid "second" -msgid_plural "seconds" -msgstr[0] "segundo" -msgstr[1] "segundos" - -#: ../../include/datetime.php:553 -#, php-format -msgid "%1$s's birthday" -msgstr "Cumpleaños de %1$s" - -#: ../../include/datetime.php:554 -#, php-format -msgid "Happy Birthday %1$s" -msgstr "Feliz cumpleaños %1$s" - #: ../../include/dba/dba_driver.php:141 #, php-format msgid "Cannot locate DNS info for database server '%s'" @@ -1497,26 +797,26 @@ msgstr "Modo seguro" #: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142 #: ../../include/dir_fns.php:143 ../../mod/api.php:102 #: ../../mod/connedit.php:368 ../../mod/connedit.php:646 -#: ../../mod/events.php:447 ../../mod/events.php:448 ../../mod/events.php:457 +#: ../../mod/events.php:454 ../../mod/events.php:455 ../../mod/events.php:464 #: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159 #: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/mitem.php:154 #: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229 #: ../../mod/photos.php:634 ../../mod/admin.php:425 ../../mod/removeme.php:60 #: ../../mod/settings.php:588 ../../view/theme/redbasic/php/config.php:104 -#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1548 +#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1547 msgid "No" msgstr "No" #: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142 #: ../../include/dir_fns.php:143 ../../mod/api.php:101 -#: ../../mod/connedit.php:368 ../../mod/events.php:447 -#: ../../mod/events.php:448 ../../mod/events.php:457 +#: ../../mod/connedit.php:368 ../../mod/events.php:454 +#: ../../mod/events.php:455 ../../mod/events.php:464 #: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159 #: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/mitem.php:154 #: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229 #: ../../mod/photos.php:634 ../../mod/admin.php:427 ../../mod/removeme.php:60 #: ../../mod/settings.php:588 ../../view/theme/redbasic/php/config.php:104 -#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1548 +#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1547 msgid "Yes" msgstr "Sí" @@ -1528,27 +828,33 @@ msgstr "Solo foros públicos" msgid "This Website Only" msgstr "Solo este sitio web" -#: ../../include/event.php:768 +#: ../../include/event.php:779 msgid "This event has been added to your calendar." msgstr "Este evento ha sido añadido a su calendario." -#: ../../include/event.php:967 +#: ../../include/event.php:915 ../../include/text.php:1951 +#: ../../include/conversation.php:123 ../../mod/events.php:249 +#: ../../mod/like.php:363 ../../mod/tagger.php:47 +msgid "event" +msgstr "evento" + +#: ../../include/event.php:978 msgid "Not specified" msgstr "Sin especificar" -#: ../../include/event.php:968 +#: ../../include/event.php:979 msgid "Needs Action" msgstr "Necesita de una intervención" -#: ../../include/event.php:969 +#: ../../include/event.php:980 msgid "Completed" msgstr "Completado/a" -#: ../../include/event.php:970 +#: ../../include/event.php:981 msgid "In Process" msgstr "En proceso" -#: ../../include/event.php:971 +#: ../../include/event.php:982 msgid "Cancelled" msgstr "Cancelado/a" @@ -1584,45 +890,6 @@ msgstr "No se ha encontrado la cuenta local." msgid "Cannot connect to yourself." msgstr "No puede conectarse consigo mismo." -#: ../../include/group.php:26 -msgid "" -"A deleted group with this name was revived. Existing item permissions " -"<strong>may</strong> apply to this group and any future members. If this is " -"not what you intended, please create another group with a different name." -msgstr "Un grupo suprimido con este nombre ha sido restablecido. <strong>Es posible</strong> que los permisos existentes sean aplicados a este grupo y sus futuros miembros. Si no quiere esto, por favor cree otro grupo con un nombre diferente." - -#: ../../include/group.php:232 -msgid "Add new connections to this privacy group" -msgstr "Añadir conexiones nuevas a este grupo de canales" - -#: ../../include/group.php:251 ../../mod/admin.php:998 -msgid "All Channels" -msgstr "Todos los canales" - -#: ../../include/group.php:273 -msgid "edit" -msgstr "editar" - -#: ../../include/group.php:295 ../../include/features.php:82 -msgid "Privacy Groups" -msgstr "Grupos de canales" - -#: ../../include/group.php:296 -msgid "Edit group" -msgstr "Editar grupo" - -#: ../../include/group.php:297 -msgid "Add privacy group" -msgstr "Añadir un grupo de canales" - -#: ../../include/group.php:298 -msgid "Channels not in any privacy group" -msgstr "Sin canales en ningún grupo" - -#: ../../include/group.php:300 ../../include/widgets.php:285 -msgid "add" -msgstr "añadir" - #: ../../include/import.php:23 msgid "" "Cannot create a duplicate channel identifier on this system. Import failed." @@ -1670,6 +937,7 @@ msgid "Passwords do not match" msgstr "Las contraseñas no coinciden" #: ../../include/js_strings.php:13 ../../mod/photos.php:41 +#: ../../mod/cal.php:37 msgid "everybody" msgstr "cualquiera" @@ -1710,7 +978,7 @@ msgstr "Describir (opcional)" #: ../../include/widgets.php:714 ../../include/ItemObject.php:703 #: ../../mod/appman.php:99 ../../mod/chat.php:184 ../../mod/chat.php:213 #: ../../mod/connect.php:93 ../../mod/connedit.php:722 -#: ../../mod/events.php:461 ../../mod/events.php:658 +#: ../../mod/events.php:468 ../../mod/events.php:665 #: ../../mod/filestorage.php:156 ../../mod/fsuggest.php:108 #: ../../mod/group.php:81 ../../mod/import.php:536 #: ../../mod/import_items.php:116 ../../mod/invite.php:142 @@ -1726,7 +994,7 @@ msgstr "Describir (opcional)" #: ../../mod/settings.php:761 ../../mod/settings.php:849 #: ../../mod/settings.php:1041 ../../mod/setup.php:333 ../../mod/setup.php:374 #: ../../mod/sources.php:104 ../../mod/sources.php:138 ../../mod/thing.php:312 -#: ../../mod/thing.php:358 ../../mod/xchan.php:11 +#: ../../mod/thing.php:358 ../../mod/xchan.php:11 ../../mod/cal.php:332 #: ../../view/theme/redbasic/php/config.php:99 msgid "Submit" msgstr "Enviar" @@ -1739,8 +1007,8 @@ msgstr "Por favor, introduzca una dirección de enlace" msgid "Unsaved changes. Are you sure you wish to leave this page?" msgstr "Cambios no guardados. ¿Está seguro de que desea abandonar la página?" -#: ../../include/js_strings.php:25 ../../mod/events.php:452 -#: ../../mod/profiles.php:464 ../../mod/pubsites.php:28 +#: ../../include/js_strings.php:25 ../../mod/events.php:459 +#: ../../mod/profiles.php:464 ../../mod/pubsites.php:36 msgid "Location" msgstr "Ubicación" @@ -2012,7 +1280,7 @@ 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/nav.php:82 ../../include/nav.php:115 ../../boot.php:1543 +#: ../../include/nav.php:82 ../../include/nav.php:115 ../../boot.php:1542 msgid "Logout" msgstr "Finalizar sesión" @@ -2028,6 +1296,11 @@ msgstr "Inicio" msgid "Your posts and conversations" msgstr "Sus publicaciones y conversaciones" +#: ../../include/nav.php:86 ../../include/conversation.php:959 +#: ../../mod/connedit.php:509 +msgid "View Profile" +msgstr "Ver el perfil" + #: ../../include/nav.php:86 msgid "Your profile page" msgstr "Su página del perfil" @@ -2089,7 +1362,7 @@ msgstr "Pulsar para identificarse en su servidor de inicio" msgid "Home Page" msgstr "Página de inicio" -#: ../../include/nav.php:150 ../../mod/register.php:266 ../../boot.php:1526 +#: ../../include/nav.php:150 ../../mod/register.php:258 ../../boot.php:1525 msgid "Register" msgstr "Registrarse" @@ -2207,6 +1480,10 @@ msgstr "Administrador" msgid "Site Setup and Configuration" msgstr "Ajustes y configuración del sitio" +#: ../../include/nav.php:244 ../../include/conversation.php:854 +msgid "Loading..." +msgstr "Cargando..." + #: ../../include/nav.php:249 msgid "@name, #tag, ?doc, content" msgstr "@nombre, #etiqueta, ?ayuda, contenido" @@ -2229,15 +1506,24 @@ msgid "New Page" msgstr "Nueva página" #: ../../include/page_widgets.php:39 ../../mod/blocks.php:159 -#: ../../mod/layouts.php:188 ../../mod/webpages.php:187 +#: ../../mod/layouts.php:188 ../../mod/pubsites.php:42 +#: ../../mod/webpages.php:189 msgid "View" msgstr "Ver" -#: ../../include/page_widgets.php:41 ../../mod/webpages.php:189 +#: ../../include/page_widgets.php:40 ../../include/conversation.php:1179 +#: ../../include/ItemObject.php:712 ../../mod/editblock.php:171 +#: ../../mod/editpost.php:149 ../../mod/editwebpage.php:212 +#: ../../mod/events.php:465 ../../mod/photos.php:1060 +#: ../../mod/webpages.php:190 +msgid "Preview" +msgstr "Previsualizar" + +#: ../../include/page_widgets.php:41 ../../mod/webpages.php:191 msgid "Actions" msgstr "Acciones" -#: ../../include/page_widgets.php:42 ../../mod/webpages.php:190 +#: ../../include/page_widgets.php:42 ../../mod/webpages.php:192 msgid "Page Link" msgstr "Vínculo de la página" @@ -2246,12 +1532,12 @@ msgid "Title" msgstr "Título" #: ../../include/page_widgets.php:44 ../../mod/blocks.php:150 -#: ../../mod/layouts.php:181 ../../mod/menu.php:110 ../../mod/webpages.php:192 +#: ../../mod/layouts.php:181 ../../mod/menu.php:110 ../../mod/webpages.php:194 msgid "Created" msgstr "Creado" #: ../../include/page_widgets.php:45 ../../mod/blocks.php:151 -#: ../../mod/layouts.php:182 ../../mod/menu.php:111 ../../mod/webpages.php:193 +#: ../../mod/layouts.php:182 ../../mod/menu.php:111 ../../mod/webpages.php:195 msgid "Edited" msgstr "Editado" @@ -2261,38 +1547,6 @@ msgstr "Editado" msgid "Profile Photos" msgstr "Fotos 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:146 ../../mod/profile_photo.php:225 -#: ../../mod/cover_photo.php:164 -msgid "Unable to process image" -msgstr "No ha sido posible procesar la imagen" - -#: ../../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/photos.php:510 -msgid "Upload New Photos" -msgstr "Subir nuevas fotos" - #: ../../include/profile_selectors.php:6 #: ../../include/profile_selectors.php:23 ../../mod/id.php:103 msgid "Male" @@ -2545,7 +1799,7 @@ msgstr "No me importa" msgid "Ask me" msgstr "Pregúnteme" -#: ../../include/security.php:384 +#: ../../include/security.php:388 msgid "" "The form security token was not correct. This probably happened because the " "form has been opened for too long (>3 hours) before submitting it." @@ -2591,6 +1845,101 @@ msgstr "no me gusta" msgid "dislikes" msgstr "no gusta de" +#: ../../include/taxonomy.php:415 ../../include/identity.php:1264 +#: ../../include/conversation.php:1751 ../../include/ItemObject.php:179 +#: ../../mod/photos.php:1097 +msgctxt "noun" +msgid "Like" +msgid_plural "Likes" +msgstr[0] "Me gusta" +msgstr[1] "Me gusta" + +#: ../../include/datetime.php:48 +msgid "Miscellaneous" +msgstr "Varios" + +#: ../../include/datetime.php:132 +msgid "YYYY-MM-DD or MM-DD" +msgstr "AAAA-MM-DD o MM-DD" + +#: ../../include/datetime.php:236 ../../mod/appman.php:91 +#: ../../mod/appman.php:92 ../../mod/events.php:444 ../../mod/events.php:449 +msgid "Required" +msgstr "Obligatorio" + +#: ../../include/datetime.php:263 ../../boot.php:2374 +msgid "never" +msgstr "nunca" + +#: ../../include/datetime.php:269 +msgid "less than a second ago" +msgstr "hace un instante" + +#: ../../include/datetime.php:287 +#, php-format +msgctxt "e.g. 22 hours ago, 1 minute ago" +msgid "%1$d %2$s ago" +msgstr "hace %1$d %2$s" + +#: ../../include/datetime.php:298 +msgctxt "relative_date" +msgid "year" +msgid_plural "years" +msgstr[0] "año" +msgstr[1] "años" + +#: ../../include/datetime.php:301 +msgctxt "relative_date" +msgid "month" +msgid_plural "months" +msgstr[0] "mes" +msgstr[1] "meses" + +#: ../../include/datetime.php:304 +msgctxt "relative_date" +msgid "week" +msgid_plural "weeks" +msgstr[0] "semana" +msgstr[1] "semanas" + +#: ../../include/datetime.php:307 +msgctxt "relative_date" +msgid "day" +msgid_plural "days" +msgstr[0] "día" +msgstr[1] "días" + +#: ../../include/datetime.php:310 +msgctxt "relative_date" +msgid "hour" +msgid_plural "hours" +msgstr[0] "hora" +msgstr[1] "horas" + +#: ../../include/datetime.php:313 +msgctxt "relative_date" +msgid "minute" +msgid_plural "minutes" +msgstr[0] "minuto" +msgstr[1] "minutos" + +#: ../../include/datetime.php:316 +msgctxt "relative_date" +msgid "second" +msgid_plural "seconds" +msgstr[0] "segundo" +msgstr[1] "segundos" + +#: ../../include/datetime.php:553 +#, php-format +msgid "%1$s's birthday" +msgstr "Cumpleaños de %1$s" + +#: ../../include/datetime.php:554 +#, php-format +msgid "Happy Birthday %1$s" +msgstr "Feliz cumpleaños %1$s" + #: ../../include/zot.php:675 msgid "Invalid data packet" msgstr "Paquete de datos no válido" @@ -2646,7 +1995,7 @@ msgstr "RSS/Atom" #: ../../include/contact_selectors.php:79 ../../mod/id.php:15 #: ../../mod/id.php:16 ../../mod/admin.php:989 ../../mod/admin.php:998 -#: ../../boot.php:1546 +#: ../../boot.php:1545 msgid "Email" msgstr "Correo electrónico" @@ -2699,6 +2048,42 @@ msgstr "%s Administrador" msgid "No Subject" msgstr "Sin asunto" +#: ../../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:146 ../../mod/profile_photo.php:225 +#: ../../mod/cover_photo.php:164 +msgid "Unable to process image" +msgstr "No ha sido posible procesar la imagen" + +#: ../../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/photos.php:506 ../../include/conversation.php:1644 +msgid "Photo Albums" +msgstr "Álbumes de fotos" + +#: ../../include/photos.php:510 +msgid "Upload New Photos" +msgstr "Subir nuevas fotos" + #: ../../include/features.php:48 msgid "General Features" msgstr "Funcionalidades básicas" @@ -2873,6 +2258,10 @@ msgstr "Buscar por fecha" msgid "Ability to select posts by date ranges" msgstr "Capacidad de seleccionar entradas por rango de fechas" +#: ../../include/features.php:82 ../../include/group.php:295 +msgid "Privacy Groups" +msgstr "Grupos de canales" + #: ../../include/features.php:82 msgid "Enable management and selection of privacy groups" msgstr "Activar la gestión y selección de grupos de canales" @@ -2973,110 +2362,14 @@ msgstr "Nube de etiquetas" msgid "Provide a personal tag cloud on your channel page" msgstr "Proveer nube de etiquetas personal en su página de canal" -#: ../../include/items.php:423 ../../index.php:193 ../../mod/dreport.php:6 -#: ../../mod/dreport.php:45 ../../mod/group.php:68 -#: ../../mod/import_items.php:108 ../../mod/like.php:280 -#: ../../mod/profperm.php:23 ../../mod/subthread.php:58 -msgid "Permission denied" -msgstr "Permiso denegado" - -#: ../../include/items.php:1138 ../../include/items.php:1184 -msgid "(Unknown)" -msgstr "(Desconocido)" - -#: ../../include/items.php:1384 -msgid "Visible to anybody on the internet." -msgstr "Visible para cualquiera en internet." - -#: ../../include/items.php:1386 -msgid "Visible to you only." -msgstr "Visible sólo para usted." - -#: ../../include/items.php:1388 -msgid "Visible to anybody in this network." -msgstr "Visible para cualquiera en esta red." - -#: ../../include/items.php:1390 -msgid "Visible to anybody authenticated." -msgstr "Visible para cualquiera que haya sido autenticado." - -#: ../../include/items.php:1392 -#, php-format -msgid "Visible to anybody on %s." -msgstr "Visible para cualquiera en %s." - -#: ../../include/items.php:1394 -msgid "Visible to all connections." -msgstr "Visible para todas las conexiones." - -#: ../../include/items.php:1396 -msgid "Visible to approved connections." -msgstr "Visible para las conexiones permitidas." - -#: ../../include/items.php:1398 -msgid "Visible to specific connections." -msgstr "Visible para conexiones específicas." - -#: ../../include/items.php:4433 ../../mod/display.php:36 -#: ../../mod/filestorage.php:27 ../../mod/admin.php:141 -#: ../../mod/admin.php:1189 ../../mod/admin.php:1434 ../../mod/thing.php:85 -#: ../../mod/viewsrc.php:20 -msgid "Item not found." -msgstr "Elemento no encontrado." - -#: ../../include/items.php:4969 ../../mod/group.php:38 ../../mod/group.php:137 -msgid "Privacy group not found." -msgstr "Grupo de canales no encontrado." - -#: ../../include/items.php:4985 -msgid "Privacy group is empty." -msgstr "El grupo de canales está vacío." - -#: ../../include/items.php:4992 -#, php-format -msgid "Privacy group: %s" -msgstr "Grupo de canales: %s" - -#: ../../include/items.php:5002 ../../mod/connedit.php:694 -#, php-format -msgid "Connection: %s" -msgstr "Conexión: %s" - -#: ../../include/items.php:5004 -msgid "Connection not found." -msgstr "Conexión no encontrada" - -#: ../../include/items.php:5430 ../../mod/cover_photo.php:229 -msgid "female" -msgstr "mujer" - -#: ../../include/items.php:5431 ../../mod/cover_photo.php:230 -#, php-format -msgid "%1$s updated her %2$s" -msgstr "%1$s ha actualizado su %2$s" - -#: ../../include/items.php:5432 ../../mod/cover_photo.php:231 -msgid "male" -msgstr "hombre" - -#: ../../include/items.php:5433 ../../mod/cover_photo.php:232 -#, php-format -msgid "%1$s updated his %2$s" -msgstr "%1$s ha actualizado su %2$s" - -#: ../../include/items.php:5435 ../../mod/cover_photo.php:234 -#, php-format -msgid "%1$s updated their %2$s" -msgstr "%1$s ha actualizado su %2$s" - -#: ../../include/items.php:5437 -msgid "profile photo" -msgstr "foto del perfil" - #: ../../include/widgets.php:103 msgid "System" msgstr "Sistema" +#: ../../include/widgets.php:105 ../../include/conversation.php:1536 +msgid "Personal" +msgstr "Personales" + #: ../../include/widgets.php:106 msgid "Create Personal App" msgstr "Crear una aplicación personal" @@ -3128,6 +2421,10 @@ msgstr "Guardar" msgid "Remove term" msgstr "Eliminar término" +#: ../../include/widgets.php:285 ../../include/group.php:300 +msgid "add" +msgstr "añadir" + #: ../../include/widgets.php:359 msgid "Archives" msgstr "Hemeroteca" @@ -3233,11 +2530,13 @@ msgstr "Eventos de la semana" msgid "Month View" msgstr "Eventos del mes" -#: ../../include/widgets.php:700 ../../mod/events.php:654 +#: ../../include/widgets.php:700 ../../mod/events.php:661 +#: ../../mod/cal.php:328 msgid "Export" msgstr "Exportar" -#: ../../include/widgets.php:701 ../../mod/events.php:657 +#: ../../include/widgets.php:701 ../../mod/events.php:664 +#: ../../mod/cal.php:331 msgid "Import" msgstr "Importar" @@ -3281,7 +2580,7 @@ msgstr "Valorar este canal" msgid "View Ratings" msgstr "Mostrar las valoraciones" -#: ../../include/widgets.php:1176 +#: ../../include/widgets.php:1176 ../../mod/pubsites.php:18 msgid "Public Hubs" msgstr "Servidores públicos" @@ -3410,6 +2709,11 @@ msgstr "Ver todas las %s conexiones" msgid "poke" msgstr "un toque" +#: ../../include/text.php:973 ../../include/text.php:978 +#: ../../include/conversation.php:243 +msgid "poked" +msgstr "ha dado un toque a" + #: ../../include/text.php:979 msgid "ping" msgstr "un \"ping\"" @@ -3558,7 +2862,7 @@ msgstr "eliminar del fichero" msgid "Click to open/close" msgstr "Pulsar para abrir/cerrar" -#: ../../include/text.php:1724 ../../mod/events.php:623 +#: ../../include/text.php:1724 ../../mod/events.php:630 ../../mod/cal.php:302 msgid "Link to Source" msgstr "Enlazar con la entrada en su ubicación original" @@ -3582,6 +2886,21 @@ msgstr "Tipo de contenido de página" msgid "Select an alternate language" msgstr "Seleccionar un idioma alternativo" +#: ../../include/text.php:1948 ../../include/conversation.php:120 +#: ../../mod/like.php:361 ../../mod/subthread.php:83 ../../mod/tagger.php:43 +msgid "photo" +msgstr "foto" + +#: ../../include/text.php:1954 ../../include/conversation.php:148 +#: ../../mod/like.php:361 ../../mod/subthread.php:83 +msgid "status" +msgstr "el mensaje de estado" + +#: ../../include/text.php:1956 ../../include/conversation.php:150 +#: ../../mod/tagger.php:53 +msgid "comment" +msgstr "el comentario" + #: ../../include/text.php:1961 msgid "activity" msgstr "la actividad" @@ -3606,6 +2925,37 @@ msgstr "Formato gráfico" msgid "Pages" msgstr "Páginas" +#: ../../include/group.php:26 +msgid "" +"A deleted group with this name was revived. Existing item permissions " +"<strong>may</strong> apply to this group and any future members. If this is " +"not what you intended, please create another group with a different name." +msgstr "Un grupo suprimido con este nombre ha sido restablecido. <strong>Es posible</strong> que los permisos existentes sean aplicados a este grupo y sus futuros miembros. Si no quiere esto, por favor cree otro grupo con un nombre diferente." + +#: ../../include/group.php:232 +msgid "Add new connections to this privacy group" +msgstr "Añadir conexiones nuevas a este grupo de canales" + +#: ../../include/group.php:251 ../../mod/admin.php:998 +msgid "All Channels" +msgstr "Todos los canales" + +#: ../../include/group.php:273 +msgid "edit" +msgstr "editar" + +#: ../../include/group.php:296 +msgid "Edit group" +msgstr "Editar grupo" + +#: ../../include/group.php:297 +msgid "Add privacy group" +msgstr "Añadir un grupo de canales" + +#: ../../include/group.php:298 +msgid "Channels not in any privacy group" +msgstr "Sin canales en ningún grupo" + #: ../../include/enotify.php:96 #, php-format msgid "%s <!item_type!>" @@ -3863,15 +3213,15 @@ msgstr "visible para cualquiera" msgid "Edit visibility" msgstr "Editar visibilidad" -#: ../../include/identity.php:1009 ../../include/identity.php:1252 +#: ../../include/identity.php:1009 ../../include/identity.php:1248 msgid "Gender:" msgstr "Género:" -#: ../../include/identity.php:1010 ../../include/identity.php:1296 +#: ../../include/identity.php:1010 ../../include/identity.php:1292 msgid "Status:" msgstr "Estado:" -#: ../../include/identity.php:1011 ../../include/identity.php:1307 +#: ../../include/identity.php:1011 ../../include/identity.php:1303 msgid "Homepage:" msgstr "Página personal:" @@ -3913,105 +3263,105 @@ msgstr "Recordatorios de eventos" msgid "Events this week:" msgstr "Eventos de esta semana:" -#: ../../include/identity.php:1250 ../../mod/settings.php:1047 +#: ../../include/identity.php:1246 ../../mod/settings.php:1047 msgid "Full Name:" msgstr "Nombre completo:" -#: ../../include/identity.php:1257 +#: ../../include/identity.php:1253 msgid "Like this channel" msgstr "Me gusta este canal" -#: ../../include/identity.php:1281 +#: ../../include/identity.php:1277 msgid "j F, Y" msgstr "j F Y" -#: ../../include/identity.php:1282 +#: ../../include/identity.php:1278 msgid "j F" msgstr "j F" -#: ../../include/identity.php:1289 +#: ../../include/identity.php:1285 msgid "Birthday:" msgstr "Cumpleaños:" -#: ../../include/identity.php:1293 ../../mod/directory.php:302 +#: ../../include/identity.php:1289 ../../mod/directory.php:302 msgid "Age:" msgstr "Edad:" -#: ../../include/identity.php:1302 +#: ../../include/identity.php:1298 #, php-format msgid "for %1$d %2$s" msgstr "por %1$d %2$s" -#: ../../include/identity.php:1305 ../../mod/profiles.php:699 +#: ../../include/identity.php:1301 ../../mod/profiles.php:699 msgid "Sexual Preference:" msgstr "Orientación sexual:" -#: ../../include/identity.php:1309 ../../mod/directory.php:318 +#: ../../include/identity.php:1305 ../../mod/directory.php:318 #: ../../mod/profiles.php:701 msgid "Hometown:" msgstr "Ciudad de origen:" -#: ../../include/identity.php:1311 +#: ../../include/identity.php:1307 msgid "Tags:" msgstr "Etiquetas:" -#: ../../include/identity.php:1313 ../../mod/profiles.php:702 +#: ../../include/identity.php:1309 ../../mod/profiles.php:702 msgid "Political Views:" msgstr "Posición política:" -#: ../../include/identity.php:1315 +#: ../../include/identity.php:1311 msgid "Religion:" msgstr "Religión:" -#: ../../include/identity.php:1317 ../../mod/directory.php:320 +#: ../../include/identity.php:1313 ../../mod/directory.php:320 msgid "About:" msgstr "Sobre mí:" -#: ../../include/identity.php:1319 +#: ../../include/identity.php:1315 msgid "Hobbies/Interests:" msgstr "Aficciones/Intereses:" -#: ../../include/identity.php:1321 ../../mod/profiles.php:705 +#: ../../include/identity.php:1317 ../../mod/profiles.php:705 msgid "Likes:" msgstr "Me gusta:" -#: ../../include/identity.php:1323 ../../mod/profiles.php:706 +#: ../../include/identity.php:1319 ../../mod/profiles.php:706 msgid "Dislikes:" msgstr "No me gusta:" -#: ../../include/identity.php:1325 +#: ../../include/identity.php:1321 msgid "Contact information and Social Networks:" msgstr "Información de contacto y redes sociales:" -#: ../../include/identity.php:1327 +#: ../../include/identity.php:1323 msgid "My other channels:" msgstr "Mis otros canales:" -#: ../../include/identity.php:1329 +#: ../../include/identity.php:1325 msgid "Musical interests:" msgstr "Intereses musicales:" -#: ../../include/identity.php:1331 +#: ../../include/identity.php:1327 msgid "Books, literature:" msgstr "Libros, literatura:" -#: ../../include/identity.php:1333 +#: ../../include/identity.php:1329 msgid "Television:" msgstr "Televisión:" -#: ../../include/identity.php:1335 +#: ../../include/identity.php:1331 msgid "Film/dance/culture/entertainment:" msgstr "Cine/danza/cultura/entretenimiento:" -#: ../../include/identity.php:1337 +#: ../../include/identity.php:1333 msgid "Love/Romance:" msgstr "Vida sentimental/amorosa:" -#: ../../include/identity.php:1339 +#: ../../include/identity.php:1335 msgid "Work/employment:" msgstr "Trabajo:" -#: ../../include/identity.php:1341 +#: ../../include/identity.php:1337 msgid "School/education:" msgstr "Estudios:" @@ -4019,7 +3369,7 @@ msgstr "Estudios:" msgid "Like this thing" msgstr "Me gusta esto" -#: ../../include/identity.php:1769 ../../mod/cover_photo.php:236 +#: ../../include/identity.php:1770 ../../mod/cover_photo.php:236 msgid "cover photo" msgstr "Imagen de portada del perfil" @@ -4031,6 +3381,561 @@ msgstr "Contenido incorporado" msgid "Embedding disabled" msgstr "Incrustación deshabilitada" +#: ../../include/conversation.php:126 ../../mod/like.php:113 +msgid "channel" +msgstr "el canal" + +#: ../../include/conversation.php:164 ../../mod/like.php:410 +#, php-format +msgid "%1$s likes %2$s's %3$s" +msgstr "A %1$s le gusta %3$s de %2$s" + +#: ../../include/conversation.php:167 ../../mod/like.php:412 +#, php-format +msgid "%1$s doesn't like %2$s's %3$s" +msgstr "A %1$s no le gusta %3$s de %2$s" + +#: ../../include/conversation.php:204 +#, php-format +msgid "%1$s is now connected with %2$s" +msgstr "%1$s ahora está conectado/a con %2$s" + +#: ../../include/conversation.php:239 +#, php-format +msgid "%1$s poked %2$s" +msgstr "%1$s ha dado un toque a %2$s" + +#: ../../include/conversation.php:260 ../../mod/mood.php:63 +#, php-format +msgctxt "mood" +msgid "%1$s is %2$s" +msgstr "%1$s está %2$s" + +#: ../../include/conversation.php:574 ../../mod/photos.php:1074 +msgctxt "title" +msgid "Likes" +msgstr "Me gusta" + +#: ../../include/conversation.php:574 ../../mod/photos.php:1074 +msgctxt "title" +msgid "Dislikes" +msgstr "No me gusta" + +#: ../../include/conversation.php:575 ../../mod/photos.php:1075 +msgctxt "title" +msgid "Agree" +msgstr "De acuerdo" + +#: ../../include/conversation.php:575 ../../mod/photos.php:1075 +msgctxt "title" +msgid "Disagree" +msgstr "En desacuerdo" + +#: ../../include/conversation.php:575 ../../mod/photos.php:1075 +msgctxt "title" +msgid "Abstain" +msgstr "Abstención" + +#: ../../include/conversation.php:576 ../../mod/photos.php:1076 +msgctxt "title" +msgid "Attending" +msgstr "Participaré" + +#: ../../include/conversation.php:576 ../../mod/photos.php:1076 +msgctxt "title" +msgid "Not attending" +msgstr "No participaré" + +#: ../../include/conversation.php:576 ../../mod/photos.php:1076 +msgctxt "title" +msgid "Might attend" +msgstr "Quizá participe" + +#: ../../include/conversation.php:656 ../../include/ItemObject.php:126 +msgid "Select" +msgstr "Seleccionar" + +#: ../../include/conversation.php:664 ../../include/ItemObject.php:89 +msgid "Private Message" +msgstr "Mensaje Privado" + +#: ../../include/conversation.php:671 ../../include/ItemObject.php:227 +msgid "Message signature validated" +msgstr "Firma de mensaje validada" + +#: ../../include/conversation.php:672 ../../include/ItemObject.php:228 +msgid "Message signature incorrect" +msgstr "Firma de mensaje incorrecta" + +#: ../../include/conversation.php:691 +#, php-format +msgid "View %s's profile @ %s" +msgstr "Ver el perfil @ %s de %s" + +#: ../../include/conversation.php:710 +msgid "Categories:" +msgstr "Categorías:" + +#: ../../include/conversation.php:711 +msgid "Filed under:" +msgstr "Archivado bajo:" + +#: ../../include/conversation.php:719 ../../include/ItemObject.php:334 +#, php-format +msgid "from %s" +msgstr "desde %s" + +#: ../../include/conversation.php:722 ../../include/ItemObject.php:337 +#, php-format +msgid "last edited: %s" +msgstr "último cambio: %s" + +#: ../../include/conversation.php:723 ../../include/ItemObject.php:338 +#, php-format +msgid "Expires: %s" +msgstr "Caduca: %s" + +#: ../../include/conversation.php:738 +msgid "View in context" +msgstr "Mostrar en su contexto" + +#: ../../include/conversation.php:740 ../../include/conversation.php:1237 +#: ../../include/ItemObject.php:389 ../../mod/editblock.php:150 +#: ../../mod/editlayout.php:148 ../../mod/editpost.php:129 +#: ../../mod/editwebpage.php:190 ../../mod/photos.php:1040 +msgid "Please wait" +msgstr "Espere por favor" + +#: ../../include/conversation.php:850 +msgid "remove" +msgstr "eliminar" + +#: ../../include/conversation.php:855 +msgid "Delete Selected Items" +msgstr "Eliminar elementos seleccionados" + +#: ../../include/conversation.php:953 +msgid "View Source" +msgstr "Ver la fuente original de la publicación" + +#: ../../include/conversation.php:954 +msgid "Follow Thread" +msgstr "Seguir este hilo" + +#: ../../include/conversation.php:955 +msgid "Unfollow Thread" +msgstr "Dejar de seguir este hilo" + +#: ../../include/conversation.php:960 +msgid "Activity/Posts" +msgstr "Actividad y publicaciones" + +#: ../../include/conversation.php:962 +msgid "Edit Connection" +msgstr "Editar conexión" + +#: ../../include/conversation.php:963 +msgid "Message" +msgstr "Mensaje" + +#: ../../include/conversation.php:964 ../../mod/pubsites.php:27 +#: ../../mod/ratings.php:99 +msgid "Ratings" +msgstr "Valoraciones" + +#: ../../include/conversation.php:1080 +#, php-format +msgid "%s likes this." +msgstr "A %s le gusta esto." + +#: ../../include/conversation.php:1080 +#, php-format +msgid "%s doesn't like this." +msgstr "A %s no le gusta esto." + +#: ../../include/conversation.php:1084 +#, php-format +msgid "<span %1$s>%2$d people</span> like this." +msgid_plural "<span %1$s>%2$d people</span> like this." +msgstr[0] "a <span %1$s>%2$d personas</span> le gusta esto." +msgstr[1] "A <span %1$s>%2$d personas</span> les gusta esto." + +#: ../../include/conversation.php:1086 +#, php-format +msgid "<span %1$s>%2$d people</span> don't like this." +msgid_plural "<span %1$s>%2$d people</span> don't like this." +msgstr[0] "a <span %1$s>%2$d personas</span> no les gusta esto." +msgstr[1] "A <span %1$s>%2$d personas</span> no les gusta esto." + +#: ../../include/conversation.php:1092 +msgid "and" +msgstr "y" + +#: ../../include/conversation.php:1095 +#, php-format +msgid ", and %d other people" +msgid_plural ", and %d other people" +msgstr[0] ", y %d persona más" +msgstr[1] ", y %d personas más" + +#: ../../include/conversation.php:1096 +#, php-format +msgid "%s like this." +msgstr "A %s le gusta esto." + +#: ../../include/conversation.php:1096 +#, php-format +msgid "%s don't like this." +msgstr "A %s no le gusta esto." + +#: ../../include/conversation.php:1164 +msgid "Visible to <strong>everybody</strong>" +msgstr "Visible para <strong>cualquiera</strong>" + +#: ../../include/conversation.php:1165 ../../mod/mail.php:202 +#: ../../mod/mail.php:316 +msgid "Please enter a link URL:" +msgstr "Por favor, introduzca la dirección del enlace:" + +#: ../../include/conversation.php:1166 +msgid "Please enter a video link/URL:" +msgstr "Por favor, introduzca un enlace de vídeo:" + +#: ../../include/conversation.php:1167 +msgid "Please enter an audio link/URL:" +msgstr "Por favor, introduzca un enlace de audio:" + +#: ../../include/conversation.php:1168 +msgid "Tag term:" +msgstr "Término de la etiqueta:" + +#: ../../include/conversation.php:1169 ../../mod/filer.php:48 +msgid "Save to Folder:" +msgstr "Guardar en carpeta:" + +#: ../../include/conversation.php:1170 +msgid "Where are you right now?" +msgstr "¿Donde está ahora?" + +#: ../../include/conversation.php:1171 ../../mod/editpost.php:56 +#: ../../mod/mail.php:203 ../../mod/mail.php:317 +msgid "Expires YYYY-MM-DD HH:MM" +msgstr "Caduca YYYY-MM-DD HH:MM" + +#: ../../include/conversation.php:1202 ../../mod/blocks.php:154 +#: ../../mod/layouts.php:184 ../../mod/photos.php:1039 +#: ../../mod/webpages.php:184 +msgid "Share" +msgstr "Compartir" + +#: ../../include/conversation.php:1204 +msgid "Page link name" +msgstr "Nombre de enlace de página" + +#: ../../include/conversation.php:1207 +msgid "Post as" +msgstr "Publicar como" + +#: ../../include/conversation.php:1209 ../../include/ItemObject.php:704 +#: ../../mod/editblock.php:136 ../../mod/editlayout.php:135 +#: ../../mod/editpost.php:113 ../../mod/editwebpage.php:177 +msgid "Bold" +msgstr "Negrita" + +#: ../../include/conversation.php:1210 ../../include/ItemObject.php:705 +#: ../../mod/editblock.php:137 ../../mod/editlayout.php:136 +#: ../../mod/editpost.php:114 ../../mod/editwebpage.php:178 +msgid "Italic" +msgstr "Itálico " + +#: ../../include/conversation.php:1211 ../../include/ItemObject.php:706 +#: ../../mod/editblock.php:138 ../../mod/editlayout.php:137 +#: ../../mod/editpost.php:115 ../../mod/editwebpage.php:179 +msgid "Underline" +msgstr "Subrayar" + +#: ../../include/conversation.php:1212 ../../include/ItemObject.php:707 +#: ../../mod/editblock.php:139 ../../mod/editlayout.php:138 +#: ../../mod/editpost.php:116 ../../mod/editwebpage.php:180 +msgid "Quote" +msgstr "Citar" + +#: ../../include/conversation.php:1213 ../../include/ItemObject.php:708 +#: ../../mod/editblock.php:140 ../../mod/editlayout.php:139 +#: ../../mod/editpost.php:117 ../../mod/editwebpage.php:181 +msgid "Code" +msgstr "Código" + +#: ../../include/conversation.php:1214 ../../mod/editblock.php:142 +#: ../../mod/editlayout.php:140 ../../mod/editpost.php:118 +#: ../../mod/editwebpage.php:182 +msgid "Upload photo" +msgstr "Subir foto" + +#: ../../include/conversation.php:1215 +msgid "upload photo" +msgstr "subir foto" + +#: ../../include/conversation.php:1216 ../../mod/editblock.php:143 +#: ../../mod/editlayout.php:141 ../../mod/editpost.php:119 +#: ../../mod/editwebpage.php:183 ../../mod/mail.php:248 ../../mod/mail.php:378 +msgid "Attach file" +msgstr "Adjuntar fichero" + +#: ../../include/conversation.php:1217 +msgid "attach file" +msgstr "adjuntar fichero" + +#: ../../include/conversation.php:1218 ../../mod/editblock.php:144 +#: ../../mod/editlayout.php:142 ../../mod/editpost.php:120 +#: ../../mod/editwebpage.php:184 ../../mod/mail.php:249 ../../mod/mail.php:379 +msgid "Insert web link" +msgstr "Insertar enlace web" + +#: ../../include/conversation.php:1219 +msgid "web link" +msgstr "enlace web" + +#: ../../include/conversation.php:1220 +msgid "Insert video link" +msgstr "Insertar enlace de vídeo" + +#: ../../include/conversation.php:1221 +msgid "video link" +msgstr "enlace de vídeo" + +#: ../../include/conversation.php:1222 +msgid "Insert audio link" +msgstr "Insertar enlace de audio" + +#: ../../include/conversation.php:1223 +msgid "audio link" +msgstr "enlace de audio" + +#: ../../include/conversation.php:1224 ../../mod/editblock.php:148 +#: ../../mod/editlayout.php:146 ../../mod/editpost.php:124 +#: ../../mod/editwebpage.php:188 +msgid "Set your location" +msgstr "Establecer su ubicación" + +#: ../../include/conversation.php:1225 +msgid "set location" +msgstr "establecer ubicación" + +#: ../../include/conversation.php:1226 ../../mod/editpost.php:126 +msgid "Toggle voting" +msgstr "Cambiar votación" + +#: ../../include/conversation.php:1229 ../../mod/editblock.php:149 +#: ../../mod/editlayout.php:147 ../../mod/editpost.php:125 +#: ../../mod/editwebpage.php:189 +msgid "Clear browser location" +msgstr "Eliminar los datos de ubicación del navegador" + +#: ../../include/conversation.php:1230 +msgid "clear location" +msgstr "borrar los datos de ubicación" + +#: ../../include/conversation.php:1232 ../../mod/editblock.php:162 +#: ../../mod/editpost.php:141 ../../mod/editwebpage.php:205 +msgid "Title (optional)" +msgstr "Título (opcional)" + +#: ../../include/conversation.php:1236 ../../mod/editblock.php:165 +#: ../../mod/editlayout.php:163 ../../mod/editpost.php:143 +#: ../../mod/editwebpage.php:207 +msgid "Categories (optional, comma-separated list)" +msgstr "Categorías (opcional, lista separada por comas)" + +#: ../../include/conversation.php:1238 ../../mod/editblock.php:151 +#: ../../mod/editlayout.php:149 ../../mod/editpost.php:130 +#: ../../mod/editwebpage.php:191 ../../mod/events.php:466 +msgid "Permission settings" +msgstr "Configuración de permisos" + +#: ../../include/conversation.php:1239 +msgid "permissions" +msgstr "permisos" + +#: ../../include/conversation.php:1247 ../../mod/editblock.php:159 +#: ../../mod/editlayout.php:156 ../../mod/editpost.php:138 +#: ../../mod/editwebpage.php:200 +msgid "Public post" +msgstr "Entrada pública" + +#: ../../include/conversation.php:1249 ../../mod/editblock.php:166 +#: ../../mod/editlayout.php:164 ../../mod/editpost.php:144 +#: ../../mod/editwebpage.php:208 +msgid "Example: bob@example.com, mary@example.com" +msgstr "Ejemplo: roberto@ejemplo.com, maría@ejemplo.com" + +#: ../../include/conversation.php:1262 ../../mod/editblock.php:176 +#: ../../mod/editlayout.php:173 ../../mod/editpost.php:155 +#: ../../mod/editwebpage.php:217 ../../mod/mail.php:253 ../../mod/mail.php:383 +msgid "Set expiration date" +msgstr "Configurar fecha de caducidad" + +#: ../../include/conversation.php:1265 +msgid "Set publish date" +msgstr "Establecer la fecha de publicación" + +#: ../../include/conversation.php:1267 ../../include/ItemObject.php:715 +#: ../../mod/editpost.php:157 ../../mod/mail.php:255 ../../mod/mail.php:385 +msgid "Encrypt text" +msgstr "Cifrar texto" + +#: ../../include/conversation.php:1269 ../../mod/editpost.php:159 +msgid "OK" +msgstr "OK" + +#: ../../include/conversation.php:1270 ../../mod/editpost.php:160 +#: ../../mod/fbrowser.php:77 ../../mod/fbrowser.php:112 +#: ../../mod/settings.php:598 ../../mod/settings.php:624 +#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:134 +msgid "Cancel" +msgstr "Cancelar" + +#: ../../include/conversation.php:1513 +msgid "Discover" +msgstr "Descubrir" + +#: ../../include/conversation.php:1516 +msgid "Imported public streams" +msgstr "Contenidos públicos importados" + +#: ../../include/conversation.php:1521 +msgid "Commented Order" +msgstr "Comentarios recientes" + +#: ../../include/conversation.php:1524 +msgid "Sort by Comment Date" +msgstr "Ordenar por fecha de comentario" + +#: ../../include/conversation.php:1528 +msgid "Posted Order" +msgstr "Publicaciones recientes" + +#: ../../include/conversation.php:1531 +msgid "Sort by Post Date" +msgstr "Ordenar por fecha de publicación" + +#: ../../include/conversation.php:1539 +msgid "Posts that mention or involve you" +msgstr "Publicaciones que le mencionan o involucran" + +#: ../../include/conversation.php:1545 ../../mod/connections.php:72 +#: ../../mod/connections.php:82 ../../mod/menu.php:112 +msgid "New" +msgstr "Nuevas" + +#: ../../include/conversation.php:1548 +msgid "Activity Stream - by date" +msgstr "Contenido - por fecha" + +#: ../../include/conversation.php:1554 +msgid "Starred" +msgstr "Preferidas" + +#: ../../include/conversation.php:1557 +msgid "Favourite Posts" +msgstr "Publicaciones favoritas" + +#: ../../include/conversation.php:1564 +msgid "Spam" +msgstr "Correo basura" + +#: ../../include/conversation.php:1567 +msgid "Posts flagged as SPAM" +msgstr "Publicaciones marcadas como basura" + +#: ../../include/conversation.php:1620 ../../mod/admin.php:1157 +msgid "Channel" +msgstr "Canal" + +#: ../../include/conversation.php:1623 +msgid "Status Messages and Posts" +msgstr "Mensajes de estado y publicaciones" + +#: ../../include/conversation.php:1632 +msgid "About" +msgstr "Mi perfil" + +#: ../../include/conversation.php:1635 +msgid "Profile Details" +msgstr "Detalles del perfil" + +#: ../../include/conversation.php:1651 +msgid "Files and Storage" +msgstr "Ficheros y repositorio" + +#: ../../include/conversation.php:1672 ../../include/conversation.php:1675 +msgid "Chatrooms" +msgstr "Salas de chat" + +#: ../../include/conversation.php:1688 +msgid "Saved Bookmarks" +msgstr "Marcadores guardados" + +#: ../../include/conversation.php:1698 +msgid "Manage Webpages" +msgstr "Administrar páginas web" + +#: ../../include/conversation.php:1727 ../../include/ItemObject.php:175 +#: ../../include/ItemObject.php:187 ../../mod/photos.php:1093 +#: ../../mod/photos.php:1105 +msgid "View all" +msgstr "Ver todo" + +#: ../../include/conversation.php:1754 ../../include/ItemObject.php:184 +#: ../../mod/photos.php:1102 +msgctxt "noun" +msgid "Dislike" +msgid_plural "Dislikes" +msgstr[0] "No me gusta" +msgstr[1] "No me gusta" + +#: ../../include/conversation.php:1757 +msgctxt "noun" +msgid "Attending" +msgid_plural "Attending" +msgstr[0] "Participaré" +msgstr[1] "Participaré" + +#: ../../include/conversation.php:1760 +msgctxt "noun" +msgid "Not Attending" +msgid_plural "Not Attending" +msgstr[0] "No participaré" +msgstr[1] "No participaré" + +#: ../../include/conversation.php:1763 +msgctxt "noun" +msgid "Undecided" +msgid_plural "Undecided" +msgstr[0] "Indeciso/a" +msgstr[1] "Indecisos/as" + +#: ../../include/conversation.php:1766 +msgctxt "noun" +msgid "Agree" +msgid_plural "Agrees" +msgstr[0] "De acuerdo" +msgstr[1] "De acuerdo" + +#: ../../include/conversation.php:1769 +msgctxt "noun" +msgid "Disagree" +msgid_plural "Disagrees" +msgstr[0] "En desacuerdo" +msgstr[1] "En desacuerdo" + +#: ../../include/conversation.php:1772 +msgctxt "noun" +msgid "Abstain" +msgid_plural "Abstains" +msgstr[0] "se abstiene" +msgstr[1] "Se abstienen" + #: ../../include/ItemObject.php:130 msgid "Save to Folder" msgstr "Guardar en carpeta" @@ -4307,6 +4212,106 @@ msgstr "Especial - Repositorio de grupo" msgid "Custom/Expert Mode" msgstr "Modo personalizado/experto" +#: ../../include/items.php:423 ../../index.php:179 ../../mod/dreport.php:6 +#: ../../mod/dreport.php:45 ../../mod/group.php:68 +#: ../../mod/import_items.php:108 ../../mod/like.php:280 +#: ../../mod/profperm.php:23 ../../mod/subthread.php:58 +msgid "Permission denied" +msgstr "Permiso denegado" + +#: ../../include/items.php:1138 ../../include/items.php:1184 +msgid "(Unknown)" +msgstr "(Desconocido)" + +#: ../../include/items.php:1384 +msgid "Visible to anybody on the internet." +msgstr "Visible para cualquiera en internet." + +#: ../../include/items.php:1386 +msgid "Visible to you only." +msgstr "Visible sólo para usted." + +#: ../../include/items.php:1388 +msgid "Visible to anybody in this network." +msgstr "Visible para cualquiera en esta red." + +#: ../../include/items.php:1390 +msgid "Visible to anybody authenticated." +msgstr "Visible para cualquiera que haya sido autenticado." + +#: ../../include/items.php:1392 +#, php-format +msgid "Visible to anybody on %s." +msgstr "Visible para cualquiera en %s." + +#: ../../include/items.php:1394 +msgid "Visible to all connections." +msgstr "Visible para todas las conexiones." + +#: ../../include/items.php:1396 +msgid "Visible to approved connections." +msgstr "Visible para las conexiones permitidas." + +#: ../../include/items.php:1398 +msgid "Visible to specific connections." +msgstr "Visible para conexiones específicas." + +#: ../../include/items.php:4496 ../../mod/display.php:36 +#: ../../mod/filestorage.php:27 ../../mod/admin.php:141 +#: ../../mod/admin.php:1189 ../../mod/admin.php:1434 ../../mod/thing.php:85 +#: ../../mod/viewsrc.php:20 +msgid "Item not found." +msgstr "Elemento no encontrado." + +#: ../../include/items.php:5032 ../../mod/group.php:38 ../../mod/group.php:137 +msgid "Privacy group not found." +msgstr "Grupo de canales no encontrado." + +#: ../../include/items.php:5048 +msgid "Privacy group is empty." +msgstr "El grupo de canales está vacío." + +#: ../../include/items.php:5055 +#, php-format +msgid "Privacy group: %s" +msgstr "Grupo de canales: %s" + +#: ../../include/items.php:5065 ../../mod/connedit.php:694 +#, php-format +msgid "Connection: %s" +msgstr "Conexión: %s" + +#: ../../include/items.php:5067 +msgid "Connection not found." +msgstr "Conexión no encontrada" + +#: ../../include/items.php:5493 ../../mod/cover_photo.php:229 +msgid "female" +msgstr "mujer" + +#: ../../include/items.php:5494 ../../mod/cover_photo.php:230 +#, php-format +msgid "%1$s updated her %2$s" +msgstr "%1$s ha actualizado su %2$s" + +#: ../../include/items.php:5495 ../../mod/cover_photo.php:231 +msgid "male" +msgstr "hombre" + +#: ../../include/items.php:5496 ../../mod/cover_photo.php:232 +#, php-format +msgid "%1$s updated his %2$s" +msgstr "%1$s ha actualizado su %2$s" + +#: ../../include/items.php:5498 ../../mod/cover_photo.php:234 +#, php-format +msgid "%1$s updated their %2$s" +msgstr "%1$s ha actualizado su %2$s" + +#: ../../include/items.php:5500 +msgid "profile photo" +msgstr "foto del perfil" + #: ../../mod/achievements.php:34 msgid "Some blurb about what to do when you're new here" msgstr "Algunas propuestas para el nuevo usuario sobre qué se puede hacer aquí" @@ -4365,7 +4370,7 @@ msgstr "Nombre de la aplicación" msgid "Location (URL) of app" msgstr "Ubicación (URL) de la aplicación" -#: ../../mod/appman.php:93 ../../mod/events.php:450 ../../mod/rbmark.php:97 +#: ../../mod/appman.php:93 ../../mod/events.php:457 ../../mod/rbmark.php:97 msgid "Description" msgstr "Descripción" @@ -4398,6 +4403,7 @@ msgid "Invalid item." msgstr "Elemento no válido." #: ../../mod/block.php:39 ../../mod/page.php:52 ../../mod/wall_upload.php:29 +#: ../../mod/cal.php:56 msgid "Channel not found." msgstr "Canal no encontrado." @@ -5154,114 +5160,115 @@ msgstr "Se requieren el título del evento y su hora de inicio." msgid "Event not found." msgstr "Evento no encontrado." -#: ../../mod/events.php:437 +#: ../../mod/events.php:444 msgid "Edit event title" msgstr "Editar el título del evento" -#: ../../mod/events.php:437 +#: ../../mod/events.php:444 msgid "Event title" msgstr "Título del evento" -#: ../../mod/events.php:439 +#: ../../mod/events.php:446 msgid "Categories (comma-separated list)" msgstr "Categorías (lista separada por comas)" -#: ../../mod/events.php:440 +#: ../../mod/events.php:447 msgid "Edit Category" msgstr "Editar la categoría" -#: ../../mod/events.php:440 +#: ../../mod/events.php:447 msgid "Category" msgstr "Categoría" -#: ../../mod/events.php:443 +#: ../../mod/events.php:450 msgid "Edit start date and time" msgstr "Modificar la fecha y hora de comienzo" -#: ../../mod/events.php:443 +#: ../../mod/events.php:450 msgid "Start date and time" msgstr "Fecha y hora de comienzo" -#: ../../mod/events.php:444 ../../mod/events.php:447 +#: ../../mod/events.php:451 ../../mod/events.php:454 msgid "Finish date and time are not known or not relevant" msgstr "La fecha y hora de terminación no se conocen o no son relevantes" -#: ../../mod/events.php:446 +#: ../../mod/events.php:453 msgid "Edit finish date and time" msgstr "Modificar la fecha y hora de terminación" -#: ../../mod/events.php:446 +#: ../../mod/events.php:453 msgid "Finish date and time" msgstr "Fecha y hora de terminación" -#: ../../mod/events.php:448 ../../mod/events.php:449 +#: ../../mod/events.php:455 ../../mod/events.php:456 msgid "Adjust for viewer timezone" msgstr "Ajustar para obtener el visor de zona horaria" -#: ../../mod/events.php:448 +#: ../../mod/events.php:455 msgid "" "Important for events that happen in a particular place. Not practical for " "global holidays." msgstr "Importante para los eventos que suceden en un lugar determinado. No es práctico para los globales." -#: ../../mod/events.php:450 +#: ../../mod/events.php:457 msgid "Edit Description" msgstr "Editar la descripción" -#: ../../mod/events.php:452 +#: ../../mod/events.php:459 msgid "Edit Location" msgstr "Modificar la localización" -#: ../../mod/events.php:455 ../../mod/events.php:457 +#: ../../mod/events.php:462 ../../mod/events.php:464 msgid "Share this event" msgstr "Compartir este evento" -#: ../../mod/events.php:462 +#: ../../mod/events.php:469 msgid "Advanced Options" msgstr "Opciones avanzadas" -#: ../../mod/events.php:574 +#: ../../mod/events.php:581 ../../mod/cal.php:253 msgid "l, F j" msgstr "l j F" -#: ../../mod/events.php:596 +#: ../../mod/events.php:603 msgid "Edit event" msgstr "Editar evento" -#: ../../mod/events.php:598 +#: ../../mod/events.php:605 msgid "Delete event" msgstr "Borrar evento" -#: ../../mod/events.php:632 +#: ../../mod/events.php:639 msgid "calendar" msgstr "calendario" -#: ../../mod/events.php:651 +#: ../../mod/events.php:658 ../../mod/cal.php:325 msgid "Edit Event" msgstr "Editar el evento" -#: ../../mod/events.php:651 +#: ../../mod/events.php:658 ../../mod/cal.php:325 msgid "Create Event" msgstr "Crear un evento" -#: ../../mod/events.php:652 ../../mod/events.php:659 ../../mod/photos.php:916 +#: ../../mod/events.php:659 ../../mod/events.php:666 ../../mod/photos.php:916 +#: ../../mod/cal.php:326 ../../mod/cal.php:333 msgid "Previous" msgstr "Anterior" -#: ../../mod/events.php:653 ../../mod/events.php:660 ../../mod/photos.php:925 -#: ../../mod/setup.php:288 +#: ../../mod/events.php:660 ../../mod/events.php:667 ../../mod/photos.php:925 +#: ../../mod/setup.php:288 ../../mod/cal.php:327 ../../mod/cal.php:334 msgid "Next" msgstr "Siguiente" -#: ../../mod/events.php:661 +#: ../../mod/events.php:668 ../../mod/cal.php:335 msgid "Today" msgstr "Hoy" -#: ../../mod/events.php:692 +#: ../../mod/events.php:699 msgid "Event removed" msgstr "Evento borrado" -#: ../../mod/events.php:695 +#: ../../mod/events.php:702 msgid "Failed to remove event" msgstr "Error al eliminar el evento" @@ -5767,11 +5774,11 @@ msgstr "%3$s de %2$s: %1$s no participa" msgid "%1$s may attend %2$s's %3$s" msgstr "%3$s de %2$s: %1$s quizá participe" -#: ../../mod/like.php:520 +#: ../../mod/like.php:527 msgid "Action completed." msgstr "Acción completada." -#: ../../mod/like.php:521 +#: ../../mod/like.php:528 msgid "Thank you." msgstr "Gracias." @@ -5938,7 +5945,7 @@ msgstr "Responder" msgid "Your message for %s (%s):" msgstr "Su mensaje para %s (%s):" -#: ../../mod/manage.php:130 ../../mod/new_channel.php:125 +#: ../../mod/manage.php:130 ../../mod/new_channel.php:117 #, php-format msgid "You have created %1$.0f of %2$.0f allowed channels." msgstr "Ha creado %1$.0f de %2$.0f canales permitidos." @@ -6237,51 +6244,52 @@ msgstr "Grupo de canales:" msgid "Invalid connection." msgstr "Conexión no válida." -#: ../../mod/new_channel.php:132 +#: ../../mod/new_channel.php:124 ../../mod/register.php:227 msgid "Name or caption" msgstr "Nombre o descripción" -#: ../../mod/new_channel.php:132 +#: ../../mod/new_channel.php:124 ../../mod/register.php:227 msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\"" msgstr "Ejemplos: \"Juan García\", \"Luisa y sus caballos\", \"Fútbol\", \"Grupo de aviación\"" -#: ../../mod/new_channel.php:134 ../../mod/register.php:249 +#: ../../mod/new_channel.php:126 ../../mod/register.php:229 msgid "Choose a short nickname" msgstr "Elija un alias corto" -#: ../../mod/new_channel.php:134 +#: ../../mod/new_channel.php:126 ../../mod/register.php:229 #, php-format msgid "" "Your nickname will be used to create an easy to remember channel address " "e.g. nickname%s" msgstr "Su alias se usará para crear una dirección de canal fácil de recordar, p. ej.: alias%s" -#: ../../mod/new_channel.php:136 +#: ../../mod/new_channel.php:128 ../../mod/register.php:231 msgid "Channel role and privacy" msgstr "Clase de canal y privacidad" -#: ../../mod/new_channel.php:136 +#: ../../mod/new_channel.php:128 ../../mod/register.php:231 msgid "Select a channel role with your privacy requirements." msgstr "Seleccione un tipo de canal con sus requisitos de privacidad" -#: ../../mod/new_channel.php:136 ../../mod/register.php:254 +#: ../../mod/new_channel.php:128 ../../mod/register.php:231 msgid "Read more about roles" msgstr "Leer más sobre los roles" -#: ../../mod/new_channel.php:139 -msgid "Create a Channel" +#: ../../mod/new_channel.php:131 +msgid "Create Channel" msgstr "Crear un canal" -#: ../../mod/new_channel.php:140 +#: ../../mod/new_channel.php:132 msgid "" -"A channel is your identity on the grid. It can represent a person, a blog, " -"or a forum to name a few. Channels can make connections with other channels " -"to share information with highly detailed permissions." -msgstr "Un canal es su identidad en la red. Puede representar a una persona, un blog o un foro, por nombrar unos pocos ejemplos. Los canales se pueden conectar con otros canales para compartir información con distintos permisos extremadamente detallados." +"A channel is your identity on this network. It can represent a person, a " +"blog, or a forum to name a few. Channels can make connections with other " +"channels to share information with highly detailed permissions." +msgstr "Un canal es su identidad en esta red. Puede representar a una persona, un blog o un foro, por nombrar unos pocos ejemplos. Los canales se pueden conectar con otros canales para compartir información con una gama de permisos extremadamente detallada." -#: ../../mod/new_channel.php:141 -msgid "Or <a href=\"import\">import an existing channel</a> from another location" -msgstr "O <a href=\"import\">importar un canal existente</a> de otro lugar" +#: ../../mod/new_channel.php:133 +msgid "" +"or <a href=\"import\">import an existing channel</a> from another location." +msgstr "O <a href=\"import\">importar un canal existente</a> desde otro lugar." #: ../../mod/notifications.php:26 msgid "Invalid request identifier." @@ -6611,7 +6619,7 @@ msgstr "Mi sitio es un servicio gratuito" msgid "My site offers free accounts with optional paid upgrades" msgstr "Mi sitio ofrece cuentas gratuitas con opciones extra de pago" -#: ../../mod/admin.php:458 ../../mod/register.php:238 +#: ../../mod/admin.php:458 ../../mod/register.php:241 msgid "Registration" msgstr "Registro" @@ -7256,6 +7264,10 @@ msgstr "Versión máxima del proyecto:" msgid "Minimum PHP version: " msgstr "Versión mínima de PHP:" +#: ../../mod/admin.php:1278 +msgid "Requires: " +msgstr "Se requiere:" + #: ../../mod/admin.php:1279 ../../mod/admin.php:1330 msgid "Disabled - version incompatibility" msgstr "Deshabilitado - versiones incompatibles" @@ -7699,51 +7711,31 @@ msgstr "Pulsar en un contacto para añadirlo o eliminarlo." msgid "Visible To" msgstr "Visible para" -#: ../../mod/pubsites.php:18 -msgid "Public Sites" -msgstr "Sitios públicos" - #: ../../mod/pubsites.php:21 msgid "" -"The listed sites allow public registration for the $Projectname network. All" -" sites in the network are interlinked so membership on any of them conveys " -"membership in the network as a whole. Some sites may require subscription or" -" provide tiered service plans. The provider links <strong>may</strong> " -"provide additional details." -msgstr "Los sitios listados permiten el registro público en la red $Projectname. Todos los sitios de la red están vinculados entre sí, por lo que sus miembros, en ninguno de ellos, indican la pertenencia a la red en su conjunto. Algunos sitios pueden requerir suscripción o proporcionar planes de servicio por niveles. Los enlaces de los proveedores <strong> pueden </strong> proporcionar detalles adicionales." +"The listed hubs allow public registration for the $Projectname network. All " +"hubs in the network are interlinked so membership on any of them conveys " +"membership in the network as a whole. Some hubs may require subscription or " +"provide tiered service plans. The hub itself <strong>may</strong> provide " +"additional details." +msgstr "Los sitios listados permiten el registro público en la red $Projectname. Todos los sitios de la red están vinculados entre sí, por lo que sus miembros, en ninguno de ellos, indican la pertenencia a la red en su conjunto. Algunos sitios pueden requerir suscripción o proporcionar planes de servicio por niveles. Los mismos hubs <strong>pueden</strong> proporcionar detalles adicionales." #: ../../mod/pubsites.php:27 -msgid "Rate this hub" -msgstr "Valorar este sitio" +msgid "Hub URL" +msgstr "Dirección del hub" -#: ../../mod/pubsites.php:28 -msgid "Site URL" -msgstr "Dirección del sitio" - -#: ../../mod/pubsites.php:28 +#: ../../mod/pubsites.php:27 msgid "Access Type" msgstr "Tipo de acceso" -#: ../../mod/pubsites.php:28 +#: ../../mod/pubsites.php:27 msgid "Registration Policy" msgstr "Normas de registro" -#: ../../mod/pubsites.php:28 -msgid "Project" -msgstr "Proyecto" - -#: ../../mod/pubsites.php:28 -msgid "View hub ratings" -msgstr "Ver las valoraciones del sitio" - -#: ../../mod/pubsites.php:32 +#: ../../mod/pubsites.php:33 msgid "Rate" msgstr "Valorar" -#: ../../mod/pubsites.php:33 -msgid "View ratings" -msgstr "Ver valoraciones" - #: ../../mod/rate.php:158 msgid "Website:" msgstr "Sitio web:" @@ -7821,16 +7813,16 @@ msgid "Your registration can not be processed." msgstr "Su registro no puede ser procesado." #: ../../mod/register.php:180 -msgid "Registration on this site is disabled." +msgid "Registration on this hub is disabled." msgstr "El registro está deshabilitado en este sitio." #: ../../mod/register.php:189 -msgid "Registration on this site/hub is by approval only." -msgstr "El registro en este servidor/hub está sometido a aprobación previa." +msgid "Registration on this hub is by approval only." +msgstr "El registro en este hub está sometido a aprobación previa." #: ../../mod/register.php:190 -msgid "<a href=\"pubsites\">Register at another affiliated site/hub</a>" -msgstr "<a href=\"pubsites\">Inscribirse en un servidor/hub afiliado</a>" +msgid "<a href=\"pubsites\">Register at another affiliated hub.</a>" +msgstr "<a href=\"pubsites\">Registrarse en otro hub afiliado.</a>" #: ../../mod/register.php:200 msgid "" @@ -7852,46 +7844,38 @@ msgstr "Acepto los %s de este sitio" msgid "I am over 13 years of age and accept the %s for this website" msgstr "Tengo más de 13 años de edad y acepto los %s de este sitio" -#: ../../mod/register.php:243 -msgid "Membership on this site is by invitation only." -msgstr "Para registrarse en este sitio es necesaria una invitación." - -#: ../../mod/register.php:244 -msgid "Please enter your invitation code" -msgstr "Por favor, introduzca el código de su invitación" - -#: ../../mod/register.php:248 -msgid "Enter your name" -msgstr "Su nombre" - -#: ../../mod/register.php:251 -msgid "" -"Your nickname will be used to create an easily remembered channel address " -"(like an email address) which you can share with others." -msgstr "Su alias podrá usarse para crear una dirección de canal fácilmente memorizable (como una dirección de correo electrónico) que puede ser compartido con otros." - -#: ../../mod/register.php:253 -msgid "" -"Please choose a channel type (such as social networking or community forum) " -"and privacy requirements so we can select the best permissions for you" -msgstr "Elija el tipo de canal (como red social o foro de discusión) y la privacidad que requiera, así podremos seleccionar el mejor conjunto de permisos para usted" - -#: ../../mod/register.php:254 -msgid "Channel Type" -msgstr "Tipo de canal" - -#: ../../mod/register.php:258 +#: ../../mod/register.php:223 msgid "Your email address" msgstr "Su dirección de correo electrónico" -#: ../../mod/register.php:259 +#: ../../mod/register.php:224 msgid "Choose a password" msgstr "Elija una contraseña" -#: ../../mod/register.php:260 +#: ../../mod/register.php:225 msgid "Please re-enter your password" msgstr "Por favor, vuelva a escribir su contraseña" +#: ../../mod/register.php:226 +msgid "Please enter your invitation code" +msgstr "Por favor, introduzca el código de su invitación" + +#: ../../mod/register.php:232 +msgid "no" +msgstr "no" + +#: ../../mod/register.php:232 +msgid "yes" +msgstr "sí" + +#: ../../mod/register.php:246 +msgid "Membership on this site is by invitation only." +msgstr "Para registrarse en este sitio es necesaria una invitación." + +#: ../../mod/register.php:258 +msgid "Proceed to create your first channel" +msgstr "Crear su primer canal" + #: ../../mod/regmod.php:11 msgid "Please login." msgstr "Por favor, inicie sesión." @@ -9032,7 +9016,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." -#: ../../mod/lostpass.php:86 ../../boot.php:1552 +#: ../../mod/lostpass.php:86 ../../boot.php:1551 msgid "Password Reset" msgstr "Restablecer la contraseña" @@ -9383,7 +9367,7 @@ msgstr "Ver conexiones" msgid "Source of Item" msgstr "Origen del elemento" -#: ../../mod/webpages.php:191 +#: ../../mod/webpages.php:193 msgid "Page Title" msgstr "Título de página" @@ -9403,6 +9387,10 @@ msgstr "Imágenes de portada del perfil" msgid "Upload Cover Photo" msgstr "Subir imagen de portada del perfil" +#: ../../mod/cal.php:63 +msgid "Permissions denied." +msgstr "Permisos denegados." + #: ../../view/theme/redbasic/php/config.php:82 msgid "Focus (Hubzilla default)" msgstr "Focus (predefinido)" @@ -9539,51 +9527,51 @@ msgstr "Ajustar el tamaño de la foto del autor de la conversación" msgid "Set size of followup author photos" msgstr "Ajustar el tamaño de foto de los seguidores del autor" -#: ../../boot.php:1352 +#: ../../boot.php:1351 #, php-format msgid "Update %s failed. See error logs." msgstr "La actualización %s ha fallado. Mire el informe de errores." -#: ../../boot.php:1355 +#: ../../boot.php:1354 #, php-format msgid "Update Error at %s" msgstr "Error de actualización en %s" -#: ../../boot.php:1525 +#: ../../boot.php:1524 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:1547 +#: ../../boot.php:1546 msgid "Password" msgstr "Contraseña" -#: ../../boot.php:1548 +#: ../../boot.php:1547 msgid "Remember me" msgstr "Recordarme" -#: ../../boot.php:1551 +#: ../../boot.php:1550 msgid "Forgot your password?" msgstr "¿Olvidó su contraseña?" -#: ../../boot.php:2181 +#: ../../boot.php:2180 msgid "toggle mobile" msgstr "cambiar a modo móvil" -#: ../../boot.php:2334 +#: ../../boot.php:2333 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:2337 +#: ../../boot.php:2336 #, php-format msgid "[hubzilla] Website SSL error for %s" msgstr "[hubzilla] Error SSL del sitio web en %s" -#: ../../boot.php:2374 +#: ../../boot.php:2373 msgid "Cron/Scheduled tasks not running." msgstr "Las tareas del Planificador/Cron no están funcionando." -#: ../../boot.php:2378 +#: ../../boot.php:2377 #, 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 dda53f991..865263944 100644 --- a/view/es-es/hstrings.php +++ b/view/es-es/hstrings.php @@ -167,200 +167,6 @@ $a->strings["%d connection in common"] = array( 1 => "%d conexiones en común", ); $a->strings["show more"] = "mostrar más"; -$a->strings["photo"] = "foto"; -$a->strings["event"] = "evento"; -$a->strings["channel"] = "el canal"; -$a->strings["status"] = "el mensaje de estado"; -$a->strings["comment"] = "el comentario"; -$a->strings["%1\$s likes %2\$s's %3\$s"] = "A %1\$s le gusta %3\$s de %2\$s"; -$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "A %1\$s no le gusta %3\$s de %2\$s"; -$a->strings["%1\$s is now connected with %2\$s"] = "%1\$s ahora está conectado/a con %2\$s"; -$a->strings["%1\$s poked %2\$s"] = "%1\$s ha dado un toque a %2\$s"; -$a->strings["poked"] = "ha dado un toque a"; -$a->strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s está %2\$s"; -$a->strings["__ctx:title__ Likes"] = "Me gusta"; -$a->strings["__ctx:title__ Dislikes"] = "No me gusta"; -$a->strings["__ctx:title__ Agree"] = "De acuerdo"; -$a->strings["__ctx:title__ Disagree"] = "En desacuerdo"; -$a->strings["__ctx:title__ Abstain"] = "Abstención"; -$a->strings["__ctx:title__ Attending"] = "Participaré"; -$a->strings["__ctx:title__ Not attending"] = "No participaré"; -$a->strings["__ctx:title__ Might attend"] = "Quizá participe"; -$a->strings["Select"] = "Seleccionar"; -$a->strings["Private Message"] = "Mensaje Privado"; -$a->strings["Message signature validated"] = "Firma de mensaje validada"; -$a->strings["Message signature incorrect"] = "Firma de mensaje incorrecta"; -$a->strings["View %s's profile @ %s"] = "Ver el perfil @ %s de %s"; -$a->strings["Categories:"] = "Categorías:"; -$a->strings["Filed under:"] = "Archivado bajo:"; -$a->strings["from %s"] = "desde %s"; -$a->strings["last edited: %s"] = "último cambio: %s"; -$a->strings["Expires: %s"] = "Caduca: %s"; -$a->strings["View in context"] = "Mostrar en su contexto"; -$a->strings["Please wait"] = "Espere por favor"; -$a->strings["remove"] = "eliminar"; -$a->strings["Loading..."] = "Cargando..."; -$a->strings["Delete Selected Items"] = "Eliminar elementos seleccionados"; -$a->strings["View Source"] = "Ver la fuente original de la publicación"; -$a->strings["Follow Thread"] = "Seguir este hilo"; -$a->strings["Unfollow Thread"] = "Dejar de seguir este hilo"; -$a->strings["View Profile"] = "Ver el perfil"; -$a->strings["Activity/Posts"] = "Actividad y publicaciones"; -$a->strings["Edit Connection"] = "Editar conexión"; -$a->strings["Message"] = "Mensaje"; -$a->strings["Ratings"] = "Valoraciones"; -$a->strings["%s likes this."] = "A %s le gusta esto."; -$a->strings["%s doesn't like this."] = "A %s no le gusta esto."; -$a->strings["<span %1\$s>%2\$d people</span> like this."] = array( - 0 => "a <span %1\$s>%2\$d personas</span> le gusta esto.", - 1 => "A <span %1\$s>%2\$d personas</span> les gusta esto.", -); -$a->strings["<span %1\$s>%2\$d people</span> don't like this."] = array( - 0 => "a <span %1\$s>%2\$d personas</span> no les gusta esto.", - 1 => "A <span %1\$s>%2\$d personas</span> no les gusta esto.", -); -$a->strings["and"] = "y"; -$a->strings[", and %d other people"] = array( - 0 => ", y %d persona más", - 1 => ", y %d personas más", -); -$a->strings["%s like this."] = "A %s le gusta esto."; -$a->strings["%s don't like this."] = "A %s no le gusta esto."; -$a->strings["Visible to <strong>everybody</strong>"] = "Visible para <strong>cualquiera</strong>"; -$a->strings["Please enter a link URL:"] = "Por favor, introduzca la dirección del enlace:"; -$a->strings["Please enter a video link/URL:"] = "Por favor, introduzca un enlace de vídeo:"; -$a->strings["Please enter an audio link/URL:"] = "Por favor, introduzca un enlace de audio:"; -$a->strings["Tag term:"] = "Término de la etiqueta:"; -$a->strings["Save to Folder:"] = "Guardar en carpeta:"; -$a->strings["Where are you right now?"] = "¿Donde está ahora?"; -$a->strings["Expires YYYY-MM-DD HH:MM"] = "Caduca YYYY-MM-DD HH:MM"; -$a->strings["Preview"] = "Previsualizar"; -$a->strings["Share"] = "Compartir"; -$a->strings["Page link name"] = "Nombre de enlace de página"; -$a->strings["Post as"] = "Publicar como"; -$a->strings["Bold"] = "Negrita"; -$a->strings["Italic"] = "Itálico "; -$a->strings["Underline"] = "Subrayar"; -$a->strings["Quote"] = "Citar"; -$a->strings["Code"] = "Código"; -$a->strings["Upload photo"] = "Subir foto"; -$a->strings["upload photo"] = "subir foto"; -$a->strings["Attach file"] = "Adjuntar fichero"; -$a->strings["attach file"] = "adjuntar fichero"; -$a->strings["Insert web link"] = "Insertar enlace web"; -$a->strings["web link"] = "enlace web"; -$a->strings["Insert video link"] = "Insertar enlace de vídeo"; -$a->strings["video link"] = "enlace de vídeo"; -$a->strings["Insert audio link"] = "Insertar enlace de audio"; -$a->strings["audio link"] = "enlace de audio"; -$a->strings["Set your location"] = "Establecer su ubicación"; -$a->strings["set location"] = "establecer ubicación"; -$a->strings["Toggle voting"] = "Cambiar votación"; -$a->strings["Clear browser location"] = "Eliminar los datos de ubicación del navegador"; -$a->strings["clear location"] = "borrar los datos de ubicación"; -$a->strings["Title (optional)"] = "Título (opcional)"; -$a->strings["Categories (optional, comma-separated list)"] = "Categorías (opcional, lista separada por comas)"; -$a->strings["Permission settings"] = "Configuración de permisos"; -$a->strings["permissions"] = "permisos"; -$a->strings["Public post"] = "Entrada pública"; -$a->strings["Example: bob@example.com, mary@example.com"] = "Ejemplo: roberto@ejemplo.com, maría@ejemplo.com"; -$a->strings["Set expiration date"] = "Configurar fecha de caducidad"; -$a->strings["Set publish date"] = "Establecer la fecha de publicación"; -$a->strings["Encrypt text"] = "Cifrar texto"; -$a->strings["OK"] = "OK"; -$a->strings["Cancel"] = "Cancelar"; -$a->strings["Discover"] = "Descubrir"; -$a->strings["Imported public streams"] = "Contenidos públicos importados"; -$a->strings["Commented Order"] = "Comentarios recientes"; -$a->strings["Sort by Comment Date"] = "Ordenar por fecha de comentario"; -$a->strings["Posted Order"] = "Publicaciones recientes"; -$a->strings["Sort by Post Date"] = "Ordenar por fecha de publicación"; -$a->strings["Personal"] = "Personales"; -$a->strings["Posts that mention or involve you"] = "Publicaciones que le mencionan o involucran"; -$a->strings["New"] = "Nuevas"; -$a->strings["Activity Stream - by date"] = "Contenido - por fecha"; -$a->strings["Starred"] = "Preferidas"; -$a->strings["Favourite Posts"] = "Publicaciones favoritas"; -$a->strings["Spam"] = "Correo basura"; -$a->strings["Posts flagged as SPAM"] = "Publicaciones marcadas como basura"; -$a->strings["Channel"] = "Canal"; -$a->strings["Status Messages and Posts"] = "Mensajes de estado y publicaciones"; -$a->strings["About"] = "Mi perfil"; -$a->strings["Profile Details"] = "Detalles del perfil"; -$a->strings["Photo Albums"] = "Álbumes de fotos"; -$a->strings["Files and Storage"] = "Ficheros y repositorio"; -$a->strings["Chatrooms"] = "Salas de chat"; -$a->strings["Saved Bookmarks"] = "Marcadores guardados"; -$a->strings["Manage Webpages"] = "Administrar páginas web"; -$a->strings["View all"] = "Ver todo"; -$a->strings["__ctx:noun__ Like"] = array( - 0 => "Me gusta", - 1 => "Me gusta", -); -$a->strings["__ctx:noun__ Dislike"] = array( - 0 => "No me gusta", - 1 => "No me gusta", -); -$a->strings["__ctx:noun__ Attending"] = array( - 0 => "Participaré", - 1 => "Participaré", -); -$a->strings["__ctx:noun__ Not Attending"] = array( - 0 => "No participaré", - 1 => "No participaré", -); -$a->strings["__ctx:noun__ Undecided"] = array( - 0 => "Indeciso/a", - 1 => "Indecisos/as", -); -$a->strings["__ctx:noun__ Agree"] = array( - 0 => "De acuerdo", - 1 => "De acuerdo", -); -$a->strings["__ctx:noun__ Disagree"] = array( - 0 => "En desacuerdo", - 1 => "En desacuerdo", -); -$a->strings["__ctx:noun__ Abstain"] = array( - 0 => "se abstiene", - 1 => "Se abstienen", -); -$a->strings["Miscellaneous"] = "Varios"; -$a->strings["YYYY-MM-DD or MM-DD"] = "AAAA-MM-DD o MM-DD"; -$a->strings["Required"] = "Obligatorio"; -$a->strings["never"] = "nunca"; -$a->strings["less than a second ago"] = "hace un instante"; -$a->strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "hace %1\$d %2\$s"; -$a->strings["__ctx:relative_date__ year"] = array( - 0 => "año", - 1 => "años", -); -$a->strings["__ctx:relative_date__ month"] = array( - 0 => "mes", - 1 => "meses", -); -$a->strings["__ctx:relative_date__ week"] = array( - 0 => "semana", - 1 => "semanas", -); -$a->strings["__ctx:relative_date__ day"] = array( - 0 => "día", - 1 => "días", -); -$a->strings["__ctx:relative_date__ hour"] = array( - 0 => "hora", - 1 => "horas", -); -$a->strings["__ctx:relative_date__ minute"] = array( - 0 => "minuto", - 1 => "minutos", -); -$a->strings["__ctx:relative_date__ second"] = array( - 0 => "segundo", - 1 => "segundos", -); -$a->strings["%1\$s's birthday"] = "Cumpleaños de %1\$s"; -$a->strings["Happy Birthday %1\$s"] = "Feliz cumpleaños %1\$s"; $a->strings["Cannot locate DNS info for database server '%s'"] = "No se ha podido localizar información de DNS para el servidor de base de datos “%s”"; $a->strings["Directory Options"] = "Opciones del directorio"; $a->strings["Safe Mode"] = "Modo seguro"; @@ -369,6 +175,7 @@ $a->strings["Yes"] = "Sí"; $a->strings["Public Forums Only"] = "Solo foros públicos"; $a->strings["This Website Only"] = "Solo este sitio web"; $a->strings["This event has been added to your calendar."] = "Este evento ha sido añadido a su calendario."; +$a->strings["event"] = "evento"; $a->strings["Not specified"] = "Sin especificar"; $a->strings["Needs Action"] = "Necesita de una intervención"; $a->strings["Completed"] = "Completado/a"; @@ -382,15 +189,6 @@ $a->strings["Protocol disabled."] = "Protocolo deshabilitado."; $a->strings["Channel discovery failed."] = "El intento de acceder al canal ha fallado."; $a->strings["local account not found."] = "No se ha encontrado la cuenta local."; $a->strings["Cannot connect to yourself."] = "No puede conectarse consigo mismo."; -$a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Un grupo suprimido con este nombre ha sido restablecido. <strong>Es posible</strong> que los permisos existentes sean aplicados a este grupo y sus futuros miembros. Si no quiere esto, por favor cree otro grupo con un nombre diferente."; -$a->strings["Add new connections to this privacy group"] = "Añadir conexiones nuevas a este grupo de canales"; -$a->strings["All Channels"] = "Todos los canales"; -$a->strings["edit"] = "editar"; -$a->strings["Privacy Groups"] = "Grupos de canales"; -$a->strings["Edit group"] = "Editar grupo"; -$a->strings["Add privacy group"] = "Añadir un grupo de canales"; -$a->strings["Channels not in any privacy group"] = "Sin canales en ningún grupo"; -$a->strings["add"] = "añadir"; $a->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."; $a->strings["Channel clone failed. Import failed."] = "La clonación del canal no ha salido bien. La importación ha fallado."; $a->strings["Cloned channel not found. Import failed."] = "No se ha podido importar el canal porque el canal clonado no se ha encontrado."; @@ -483,6 +281,7 @@ $a->strings["Logout"] = "Finalizar sesión"; $a->strings["End this session"] = "Finalizar esta sesión"; $a->strings["Home"] = "Inicio"; $a->strings["Your posts and conversations"] = "Sus publicaciones y conversaciones"; +$a->strings["View Profile"] = "Ver el perfil"; $a->strings["Your profile page"] = "Su página del perfil"; $a->strings["Edit Profiles"] = "Editar perfiles"; $a->strings["Manage/Edit profiles"] = "Administrar/editar perfiles"; @@ -527,25 +326,20 @@ $a->strings["Manage Your Channels"] = "Gestionar sus canales"; $a->strings["Account/Channel Settings"] = "Ajustes de cuenta/canales"; $a->strings["Admin"] = "Administrador"; $a->strings["Site Setup and Configuration"] = "Ajustes y configuración del sitio"; +$a->strings["Loading..."] = "Cargando..."; $a->strings["@name, #tag, ?doc, content"] = "@nombre, #etiqueta, ?ayuda, contenido"; $a->strings["Please wait..."] = "Espere por favor…"; $a->strings["created a new post"] = "ha creado una nueva entrada"; $a->strings["commented on %s's post"] = "ha comentado la entrada de %s"; $a->strings["New Page"] = "Nueva página"; $a->strings["View"] = "Ver"; +$a->strings["Preview"] = "Previsualizar"; $a->strings["Actions"] = "Acciones"; $a->strings["Page Link"] = "Vínculo de la página"; $a->strings["Title"] = "Título"; $a->strings["Created"] = "Creado"; $a->strings["Edited"] = "Editado"; $a->strings["Profile Photos"] = "Fotos del perfil"; -$a->strings["Image exceeds website size limit of %lu bytes"] = "La imagen excede el límite de %lu bytes del sitio"; -$a->strings["Image file is empty."] = "El fichero de imagen está vacío. "; -$a->strings["Unable to process image"] = "No ha sido posible procesar la imagen"; -$a->strings["Photo storage failed."] = "La foto no ha podido ser guardada."; -$a->strings["a new photo"] = "una nueva foto"; -$a->strings["__ctx:photo_upload__ %1\$s posted %2\$s to %3\$s"] = "%1\$s ha publicado %2\$s en %3\$s"; -$a->strings["Upload New Photos"] = "Subir nuevas fotos"; $a->strings["Male"] = "Hombre"; $a->strings["Female"] = "Mujer"; $a->strings["Currently Male"] = "Actualmente hombre"; @@ -615,6 +409,46 @@ $a->strings["like"] = "me gusta"; $a->strings["likes"] = "gusta de"; $a->strings["dislike"] = "no me gusta"; $a->strings["dislikes"] = "no gusta de"; +$a->strings["__ctx:noun__ Like"] = array( + 0 => "Me gusta", + 1 => "Me gusta", +); +$a->strings["Miscellaneous"] = "Varios"; +$a->strings["YYYY-MM-DD or MM-DD"] = "AAAA-MM-DD o MM-DD"; +$a->strings["Required"] = "Obligatorio"; +$a->strings["never"] = "nunca"; +$a->strings["less than a second ago"] = "hace un instante"; +$a->strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "hace %1\$d %2\$s"; +$a->strings["__ctx:relative_date__ year"] = array( + 0 => "año", + 1 => "años", +); +$a->strings["__ctx:relative_date__ month"] = array( + 0 => "mes", + 1 => "meses", +); +$a->strings["__ctx:relative_date__ week"] = array( + 0 => "semana", + 1 => "semanas", +); +$a->strings["__ctx:relative_date__ day"] = array( + 0 => "día", + 1 => "días", +); +$a->strings["__ctx:relative_date__ hour"] = array( + 0 => "hora", + 1 => "horas", +); +$a->strings["__ctx:relative_date__ minute"] = array( + 0 => "minuto", + 1 => "minutos", +); +$a->strings["__ctx:relative_date__ second"] = array( + 0 => "segundo", + 1 => "segundos", +); +$a->strings["%1\$s's birthday"] = "Cumpleaños de %1\$s"; +$a->strings["Happy Birthday %1\$s"] = "Feliz cumpleaños %1\$s"; $a->strings["Invalid data packet"] = "Paquete de datos no válido"; $a->strings["Unable to verify channel signature"] = "No ha sido posible de verificar la firma del canal"; $a->strings["Unable to verify site signature for %s"] = "No ha sido posible de verificar la firma del sitio para %s"; @@ -641,6 +475,14 @@ $a->strings["\$projectname"] = "\$projectname"; $a->strings["Thank You,"] = "Gracias,"; $a->strings["%s Administrator"] = "%s Administrador"; $a->strings["No Subject"] = "Sin asunto"; +$a->strings["Image exceeds website size limit of %lu bytes"] = "La imagen excede el límite de %lu bytes del sitio"; +$a->strings["Image file is empty."] = "El fichero de imagen está vacío. "; +$a->strings["Unable to process image"] = "No ha sido posible procesar la imagen"; +$a->strings["Photo storage failed."] = "La foto no ha podido ser guardada."; +$a->strings["a new photo"] = "una nueva foto"; +$a->strings["__ctx:photo_upload__ %1\$s posted %2\$s to %3\$s"] = "%1\$s ha publicado %2\$s en %3\$s"; +$a->strings["Photo Albums"] = "Álbumes de fotos"; +$a->strings["Upload New Photos"] = "Subir nuevas fotos"; $a->strings["General Features"] = "Funcionalidades básicas"; $a->strings["Content Expiration"] = "Caducidad del contenido"; $a->strings["Remove posts/comments and/or private messages at a future time"] = "Eliminar publicaciones/comentarios y/o mensajes privados más adelante"; @@ -682,6 +524,7 @@ $a->strings["Prevent posts with identical content to be published with less than $a->strings["Network and Stream Filtering"] = "Filtrado del contenido"; $a->strings["Search by Date"] = "Buscar por fecha"; $a->strings["Ability to select posts by date ranges"] = "Capacidad de seleccionar entradas por rango de fechas"; +$a->strings["Privacy Groups"] = "Grupos de canales"; $a->strings["Enable management and selection of privacy groups"] = "Activar la gestión y selección de grupos de canales"; $a->strings["Saved Searches"] = "Búsquedas guardadas"; $a->strings["Save search terms for re-use"] = "Guardar términos de búsqueda para su reutilización"; @@ -707,29 +550,8 @@ $a->strings["Star Posts"] = "Entradas destacadas"; $a->strings["Ability to mark special posts with a star indicator"] = "Capacidad de marcar entradas destacadas con un indicador de estrella"; $a->strings["Tag Cloud"] = "Nube de etiquetas"; $a->strings["Provide a personal tag cloud on your channel page"] = "Proveer nube de etiquetas personal en su página de canal"; -$a->strings["Permission denied"] = "Permiso denegado"; -$a->strings["(Unknown)"] = "(Desconocido)"; -$a->strings["Visible to anybody on the internet."] = "Visible para cualquiera en internet."; -$a->strings["Visible to you only."] = "Visible sólo para usted."; -$a->strings["Visible to anybody in this network."] = "Visible para cualquiera en esta red."; -$a->strings["Visible to anybody authenticated."] = "Visible para cualquiera que haya sido autenticado."; -$a->strings["Visible to anybody on %s."] = "Visible para cualquiera en %s."; -$a->strings["Visible to all connections."] = "Visible para todas las conexiones."; -$a->strings["Visible to approved connections."] = "Visible para las conexiones permitidas."; -$a->strings["Visible to specific connections."] = "Visible para conexiones específicas."; -$a->strings["Item not found."] = "Elemento no encontrado."; -$a->strings["Privacy group not found."] = "Grupo de canales no encontrado."; -$a->strings["Privacy group is empty."] = "El grupo de canales está vacío."; -$a->strings["Privacy group: %s"] = "Grupo de canales: %s"; -$a->strings["Connection: %s"] = "Conexión: %s"; -$a->strings["Connection not found."] = "Conexión no encontrada"; -$a->strings["female"] = "mujer"; -$a->strings["%1\$s updated her %2\$s"] = "%1\$s ha actualizado su %2\$s"; -$a->strings["male"] = "hombre"; -$a->strings["%1\$s updated his %2\$s"] = "%1\$s ha actualizado su %2\$s"; -$a->strings["%1\$s updated their %2\$s"] = "%1\$s ha actualizado su %2\$s"; -$a->strings["profile photo"] = "foto del perfil"; $a->strings["System"] = "Sistema"; +$a->strings["Personal"] = "Personales"; $a->strings["Create Personal App"] = "Crear una aplicación personal"; $a->strings["Edit Personal App"] = "Editar una aplicación personal"; $a->strings["Ignore/Hide"] = "Ignorar/Ocultar"; @@ -742,6 +564,7 @@ $a->strings["Examples: bob@example.com, https://example.com/barbara"] = "Ejemplo $a->strings["Notes"] = "Notas"; $a->strings["Save"] = "Guardar"; $a->strings["Remove term"] = "Eliminar término"; +$a->strings["add"] = "añadir"; $a->strings["Archives"] = "Hemeroteca"; $a->strings["Me"] = "Yo"; $a->strings["Family"] = "Familia"; @@ -811,6 +634,7 @@ $a->strings["newer"] = "más recientes"; $a->strings["No connections"] = "Sin conexiones"; $a->strings["View all %s connections"] = "Ver todas las %s conexiones"; $a->strings["poke"] = "un toque"; +$a->strings["poked"] = "ha dado un toque a"; $a->strings["ping"] = "un \"ping\""; $a->strings["pinged"] = "ha enviado un \"ping\" a"; $a->strings["prod"] = "una incitación "; @@ -854,12 +678,22 @@ $a->strings["Page layout"] = "Formato de la página"; $a->strings["You can create your own with the layouts tool"] = "Puede crear su propio formato gráfico con las herramientas de diseño"; $a->strings["Page content type"] = "Tipo de contenido de página"; $a->strings["Select an alternate language"] = "Seleccionar un idioma alternativo"; +$a->strings["photo"] = "foto"; +$a->strings["status"] = "el mensaje de estado"; +$a->strings["comment"] = "el comentario"; $a->strings["activity"] = "la actividad"; $a->strings["Design Tools"] = "Herramientas de diseño"; $a->strings["Blocks"] = "Bloques"; $a->strings["Menus"] = "Menús"; $a->strings["Layouts"] = "Formato gráfico"; $a->strings["Pages"] = "Páginas"; +$a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Un grupo suprimido con este nombre ha sido restablecido. <strong>Es posible</strong> que los permisos existentes sean aplicados a este grupo y sus futuros miembros. Si no quiere esto, por favor cree otro grupo con un nombre diferente."; +$a->strings["Add new connections to this privacy group"] = "Añadir conexiones nuevas a este grupo de canales"; +$a->strings["All Channels"] = "Todos los canales"; +$a->strings["edit"] = "editar"; +$a->strings["Edit group"] = "Editar grupo"; +$a->strings["Add privacy group"] = "Añadir un grupo de canales"; +$a->strings["Channels not in any privacy group"] = "Sin canales en ningún grupo"; $a->strings["%s <!item_type!>"] = "%s <!item_type!>"; $a->strings["[Hubzilla:Notify] New mail received at %s"] = "[Hubzilla:Aviso] Nuevo mensaje en %s"; $a->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."; @@ -955,6 +789,150 @@ $a->strings["Like this thing"] = "Me gusta esto"; $a->strings["cover photo"] = "Imagen de portada del perfil"; $a->strings["Embedded content"] = "Contenido incorporado"; $a->strings["Embedding disabled"] = "Incrustación deshabilitada"; +$a->strings["channel"] = "el canal"; +$a->strings["%1\$s likes %2\$s's %3\$s"] = "A %1\$s le gusta %3\$s de %2\$s"; +$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "A %1\$s no le gusta %3\$s de %2\$s"; +$a->strings["%1\$s is now connected with %2\$s"] = "%1\$s ahora está conectado/a con %2\$s"; +$a->strings["%1\$s poked %2\$s"] = "%1\$s ha dado un toque a %2\$s"; +$a->strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s está %2\$s"; +$a->strings["__ctx:title__ Likes"] = "Me gusta"; +$a->strings["__ctx:title__ Dislikes"] = "No me gusta"; +$a->strings["__ctx:title__ Agree"] = "De acuerdo"; +$a->strings["__ctx:title__ Disagree"] = "En desacuerdo"; +$a->strings["__ctx:title__ Abstain"] = "Abstención"; +$a->strings["__ctx:title__ Attending"] = "Participaré"; +$a->strings["__ctx:title__ Not attending"] = "No participaré"; +$a->strings["__ctx:title__ Might attend"] = "Quizá participe"; +$a->strings["Select"] = "Seleccionar"; +$a->strings["Private Message"] = "Mensaje Privado"; +$a->strings["Message signature validated"] = "Firma de mensaje validada"; +$a->strings["Message signature incorrect"] = "Firma de mensaje incorrecta"; +$a->strings["View %s's profile @ %s"] = "Ver el perfil @ %s de %s"; +$a->strings["Categories:"] = "Categorías:"; +$a->strings["Filed under:"] = "Archivado bajo:"; +$a->strings["from %s"] = "desde %s"; +$a->strings["last edited: %s"] = "último cambio: %s"; +$a->strings["Expires: %s"] = "Caduca: %s"; +$a->strings["View in context"] = "Mostrar en su contexto"; +$a->strings["Please wait"] = "Espere por favor"; +$a->strings["remove"] = "eliminar"; +$a->strings["Delete Selected Items"] = "Eliminar elementos seleccionados"; +$a->strings["View Source"] = "Ver la fuente original de la publicación"; +$a->strings["Follow Thread"] = "Seguir este hilo"; +$a->strings["Unfollow Thread"] = "Dejar de seguir este hilo"; +$a->strings["Activity/Posts"] = "Actividad y publicaciones"; +$a->strings["Edit Connection"] = "Editar conexión"; +$a->strings["Message"] = "Mensaje"; +$a->strings["Ratings"] = "Valoraciones"; +$a->strings["%s likes this."] = "A %s le gusta esto."; +$a->strings["%s doesn't like this."] = "A %s no le gusta esto."; +$a->strings["<span %1\$s>%2\$d people</span> like this."] = array( + 0 => "a <span %1\$s>%2\$d personas</span> le gusta esto.", + 1 => "A <span %1\$s>%2\$d personas</span> les gusta esto.", +); +$a->strings["<span %1\$s>%2\$d people</span> don't like this."] = array( + 0 => "a <span %1\$s>%2\$d personas</span> no les gusta esto.", + 1 => "A <span %1\$s>%2\$d personas</span> no les gusta esto.", +); +$a->strings["and"] = "y"; +$a->strings[", and %d other people"] = array( + 0 => ", y %d persona más", + 1 => ", y %d personas más", +); +$a->strings["%s like this."] = "A %s le gusta esto."; +$a->strings["%s don't like this."] = "A %s no le gusta esto."; +$a->strings["Visible to <strong>everybody</strong>"] = "Visible para <strong>cualquiera</strong>"; +$a->strings["Please enter a link URL:"] = "Por favor, introduzca la dirección del enlace:"; +$a->strings["Please enter a video link/URL:"] = "Por favor, introduzca un enlace de vídeo:"; +$a->strings["Please enter an audio link/URL:"] = "Por favor, introduzca un enlace de audio:"; +$a->strings["Tag term:"] = "Término de la etiqueta:"; +$a->strings["Save to Folder:"] = "Guardar en carpeta:"; +$a->strings["Where are you right now?"] = "¿Donde está ahora?"; +$a->strings["Expires YYYY-MM-DD HH:MM"] = "Caduca YYYY-MM-DD HH:MM"; +$a->strings["Share"] = "Compartir"; +$a->strings["Page link name"] = "Nombre de enlace de página"; +$a->strings["Post as"] = "Publicar como"; +$a->strings["Bold"] = "Negrita"; +$a->strings["Italic"] = "Itálico "; +$a->strings["Underline"] = "Subrayar"; +$a->strings["Quote"] = "Citar"; +$a->strings["Code"] = "Código"; +$a->strings["Upload photo"] = "Subir foto"; +$a->strings["upload photo"] = "subir foto"; +$a->strings["Attach file"] = "Adjuntar fichero"; +$a->strings["attach file"] = "adjuntar fichero"; +$a->strings["Insert web link"] = "Insertar enlace web"; +$a->strings["web link"] = "enlace web"; +$a->strings["Insert video link"] = "Insertar enlace de vídeo"; +$a->strings["video link"] = "enlace de vídeo"; +$a->strings["Insert audio link"] = "Insertar enlace de audio"; +$a->strings["audio link"] = "enlace de audio"; +$a->strings["Set your location"] = "Establecer su ubicación"; +$a->strings["set location"] = "establecer ubicación"; +$a->strings["Toggle voting"] = "Cambiar votación"; +$a->strings["Clear browser location"] = "Eliminar los datos de ubicación del navegador"; +$a->strings["clear location"] = "borrar los datos de ubicación"; +$a->strings["Title (optional)"] = "Título (opcional)"; +$a->strings["Categories (optional, comma-separated list)"] = "Categorías (opcional, lista separada por comas)"; +$a->strings["Permission settings"] = "Configuración de permisos"; +$a->strings["permissions"] = "permisos"; +$a->strings["Public post"] = "Entrada pública"; +$a->strings["Example: bob@example.com, mary@example.com"] = "Ejemplo: roberto@ejemplo.com, maría@ejemplo.com"; +$a->strings["Set expiration date"] = "Configurar fecha de caducidad"; +$a->strings["Set publish date"] = "Establecer la fecha de publicación"; +$a->strings["Encrypt text"] = "Cifrar texto"; +$a->strings["OK"] = "OK"; +$a->strings["Cancel"] = "Cancelar"; +$a->strings["Discover"] = "Descubrir"; +$a->strings["Imported public streams"] = "Contenidos públicos importados"; +$a->strings["Commented Order"] = "Comentarios recientes"; +$a->strings["Sort by Comment Date"] = "Ordenar por fecha de comentario"; +$a->strings["Posted Order"] = "Publicaciones recientes"; +$a->strings["Sort by Post Date"] = "Ordenar por fecha de publicación"; +$a->strings["Posts that mention or involve you"] = "Publicaciones que le mencionan o involucran"; +$a->strings["New"] = "Nuevas"; +$a->strings["Activity Stream - by date"] = "Contenido - por fecha"; +$a->strings["Starred"] = "Preferidas"; +$a->strings["Favourite Posts"] = "Publicaciones favoritas"; +$a->strings["Spam"] = "Correo basura"; +$a->strings["Posts flagged as SPAM"] = "Publicaciones marcadas como basura"; +$a->strings["Channel"] = "Canal"; +$a->strings["Status Messages and Posts"] = "Mensajes de estado y publicaciones"; +$a->strings["About"] = "Mi perfil"; +$a->strings["Profile Details"] = "Detalles del perfil"; +$a->strings["Files and Storage"] = "Ficheros y repositorio"; +$a->strings["Chatrooms"] = "Salas de chat"; +$a->strings["Saved Bookmarks"] = "Marcadores guardados"; +$a->strings["Manage Webpages"] = "Administrar páginas web"; +$a->strings["View all"] = "Ver todo"; +$a->strings["__ctx:noun__ Dislike"] = array( + 0 => "No me gusta", + 1 => "No me gusta", +); +$a->strings["__ctx:noun__ Attending"] = array( + 0 => "Participaré", + 1 => "Participaré", +); +$a->strings["__ctx:noun__ Not Attending"] = array( + 0 => "No participaré", + 1 => "No participaré", +); +$a->strings["__ctx:noun__ Undecided"] = array( + 0 => "Indeciso/a", + 1 => "Indecisos/as", +); +$a->strings["__ctx:noun__ Agree"] = array( + 0 => "De acuerdo", + 1 => "De acuerdo", +); +$a->strings["__ctx:noun__ Disagree"] = array( + 0 => "En desacuerdo", + 1 => "En desacuerdo", +); +$a->strings["__ctx:noun__ Abstain"] = array( + 0 => "se abstiene", + 1 => "Se abstienen", +); $a->strings["Save to Folder"] = "Guardar en carpeta"; $a->strings["I will attend"] = "Participaré"; $a->strings["I will not attend"] = "No participaré"; @@ -1025,6 +1003,28 @@ $a->strings["Special Purpose"] = "Propósito especial"; $a->strings["Special - Celebrity/Soapbox"] = "Especial - Celebridad / Tribuna improvisada"; $a->strings["Special - Group Repository"] = "Especial - Repositorio de grupo"; $a->strings["Custom/Expert Mode"] = "Modo personalizado/experto"; +$a->strings["Permission denied"] = "Permiso denegado"; +$a->strings["(Unknown)"] = "(Desconocido)"; +$a->strings["Visible to anybody on the internet."] = "Visible para cualquiera en internet."; +$a->strings["Visible to you only."] = "Visible sólo para usted."; +$a->strings["Visible to anybody in this network."] = "Visible para cualquiera en esta red."; +$a->strings["Visible to anybody authenticated."] = "Visible para cualquiera que haya sido autenticado."; +$a->strings["Visible to anybody on %s."] = "Visible para cualquiera en %s."; +$a->strings["Visible to all connections."] = "Visible para todas las conexiones."; +$a->strings["Visible to approved connections."] = "Visible para las conexiones permitidas."; +$a->strings["Visible to specific connections."] = "Visible para conexiones específicas."; +$a->strings["Item not found."] = "Elemento no encontrado."; +$a->strings["Privacy group not found."] = "Grupo de canales no encontrado."; +$a->strings["Privacy group is empty."] = "El grupo de canales está vacío."; +$a->strings["Privacy group: %s"] = "Grupo de canales: %s"; +$a->strings["Connection: %s"] = "Conexión: %s"; +$a->strings["Connection not found."] = "Conexión no encontrada"; +$a->strings["female"] = "mujer"; +$a->strings["%1\$s updated her %2\$s"] = "%1\$s ha actualizado su %2\$s"; +$a->strings["male"] = "hombre"; +$a->strings["%1\$s updated his %2\$s"] = "%1\$s ha actualizado su %2\$s"; +$a->strings["%1\$s updated their %2\$s"] = "%1\$s ha actualizado su %2\$s"; +$a->strings["profile photo"] = "foto del perfil"; $a->strings["Some blurb about what to do when you're new here"] = "Algunas propuestas para el nuevo usuario sobre qué se puede hacer aquí"; $a->strings["network"] = "red"; $a->strings["RSS"] = "RSS"; @@ -1497,9 +1497,9 @@ $a->strings["Your nickname will be used to create an easy to remember channel ad $a->strings["Channel role and privacy"] = "Clase de canal y privacidad"; $a->strings["Select a channel role with your privacy requirements."] = "Seleccione un tipo de canal con sus requisitos de privacidad"; $a->strings["Read more about roles"] = "Leer más sobre los roles"; -$a->strings["Create a Channel"] = "Crear un canal"; -$a->strings["A channel is your identity on the grid. It can represent a person, a blog, or a forum to name a few. Channels can make connections with other channels to share information with highly detailed permissions."] = "Un canal es su identidad en la red. Puede representar a una persona, un blog o un foro, por nombrar unos pocos ejemplos. Los canales se pueden conectar con otros canales para compartir información con distintos permisos extremadamente detallados."; -$a->strings["Or <a href=\"import\">import an existing channel</a> from another location"] = "O <a href=\"import\">importar un canal existente</a> de otro lugar"; +$a->strings["Create Channel"] = "Crear un canal"; +$a->strings["A channel is your identity on this network. It can represent a person, a blog, or a forum to name a few. Channels can make connections with other channels to share information with highly detailed permissions."] = "Un canal es su identidad en esta red. Puede representar a una persona, un blog o un foro, por nombrar unos pocos ejemplos. Los canales se pueden conectar con otros canales para compartir información con una gama de permisos extremadamente detallada."; +$a->strings["or <a href=\"import\">import an existing channel</a> from another location."] = "O <a href=\"import\">importar un canal existente</a> desde otro lugar."; $a->strings["Invalid request identifier."] = "Petición inválida del identificador."; $a->strings["Discard"] = "Descartar"; $a->strings["No more system notifications."] = "No hay más notificaciones del sistema"; @@ -1734,6 +1734,7 @@ $a->strings["Maintainer: "] = "Mantenedor:"; $a->strings["Minimum project version: "] = "Versión mínima del proyecto:"; $a->strings["Maximum project version: "] = "Versión máxima del proyecto:"; $a->strings["Minimum PHP version: "] = "Versión mínima de PHP:"; +$a->strings["Requires: "] = "Se requiere:"; $a->strings["Disabled - version incompatibility"] = "Deshabilitado - versiones incompatibles"; $a->strings["No themes found."] = "No se han encontrado temas."; $a->strings["Screenshot"] = "Instantánea de pantalla"; @@ -1843,16 +1844,11 @@ $a->strings["Invalid profile identifier."] = "Identificador del perfil no válid $a->strings["Profile Visibility Editor"] = "Editor de visibilidad del perfil"; $a->strings["Click on a contact to add or remove."] = "Pulsar en un contacto para añadirlo o eliminarlo."; $a->strings["Visible To"] = "Visible para"; -$a->strings["Public Sites"] = "Sitios públicos"; -$a->strings["The listed sites allow public registration for the \$Projectname network. All sites in the network are interlinked so membership on any of them conveys membership in the network as a whole. Some sites may require subscription or provide tiered service plans. The provider links <strong>may</strong> provide additional details."] = "Los sitios listados permiten el registro público en la red \$Projectname. Todos los sitios de la red están vinculados entre sí, por lo que sus miembros, en ninguno de ellos, indican la pertenencia a la red en su conjunto. Algunos sitios pueden requerir suscripción o proporcionar planes de servicio por niveles. Los enlaces de los proveedores <strong> pueden </strong> proporcionar detalles adicionales."; -$a->strings["Rate this hub"] = "Valorar este sitio"; -$a->strings["Site URL"] = "Dirección del sitio"; +$a->strings["The listed hubs allow public registration for the \$Projectname network. All hubs in the network are interlinked so membership on any of them conveys membership in the network as a whole. Some hubs may require subscription or provide tiered service plans. The hub itself <strong>may</strong> provide additional details."] = "Los sitios listados permiten el registro público en la red \$Projectname. Todos los sitios de la red están vinculados entre sí, por lo que sus miembros, en ninguno de ellos, indican la pertenencia a la red en su conjunto. Algunos sitios pueden requerir suscripción o proporcionar planes de servicio por niveles. Los mismos hubs <strong>pueden</strong> proporcionar detalles adicionales."; +$a->strings["Hub URL"] = "Dirección del hub"; $a->strings["Access Type"] = "Tipo de acceso"; $a->strings["Registration Policy"] = "Normas de registro"; -$a->strings["Project"] = "Proyecto"; -$a->strings["View hub ratings"] = "Ver las valoraciones del sitio"; $a->strings["Rate"] = "Valorar"; -$a->strings["View ratings"] = "Ver valoraciones"; $a->strings["Website:"] = "Sitio web:"; $a->strings["Remote Channel [%s] (not yet known on this site)"] = "Canal remoto [%s] (aún no es conocido en este sitio)"; $a->strings["Rating (this information is public)"] = "Valoración (esta información es pública)"; @@ -1871,22 +1867,21 @@ $a->strings["Passwords do not match."] = "Las contraseñas no coinciden."; $a->strings["Registration successful. Please check your email for validation instructions."] = "Registro realizado con éxito. Por favor, compruebe su correo electrónico para ver las instrucciones para validarlo."; $a->strings["Your registration is pending approval by the site owner."] = "Su registro está pendiente de aprobación por el propietario del sitio."; $a->strings["Your registration can not be processed."] = "Su registro no puede ser procesado."; -$a->strings["Registration on this site is disabled."] = "El registro está deshabilitado en este sitio."; -$a->strings["Registration on this site/hub is by approval only."] = "El registro en este servidor/hub está sometido a aprobación previa."; -$a->strings["<a href=\"pubsites\">Register at another affiliated site/hub</a>"] = "<a href=\"pubsites\">Inscribirse en un servidor/hub afiliado</a>"; +$a->strings["Registration on this hub is disabled."] = "El registro está deshabilitado en este sitio."; +$a->strings["Registration on this hub is by approval only."] = "El registro en este hub está sometido a aprobación previa."; +$a->strings["<a href=\"pubsites\">Register at another affiliated hub.</a>"] = "<a href=\"pubsites\">Registrarse en otro hub afiliado.</a>"; $a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Este sitio ha excedido el límite de inscripción diaria de cuentas. Por favor, inténtelo de nuevo mañana."; $a->strings["Terms of Service"] = "Términos del servicio"; $a->strings["I accept the %s for this website"] = "Acepto los %s de este sitio"; $a->strings["I am over 13 years of age and accept the %s for this website"] = "Tengo más de 13 años de edad y acepto los %s de este sitio"; -$a->strings["Membership on this site is by invitation only."] = "Para registrarse en este sitio es necesaria una invitación."; -$a->strings["Please enter your invitation code"] = "Por favor, introduzca el código de su invitación"; -$a->strings["Enter your name"] = "Su nombre"; -$a->strings["Your nickname will be used to create an easily remembered channel address (like an email address) which you can share with others."] = "Su alias podrá usarse para crear una dirección de canal fácilmente memorizable (como una dirección de correo electrónico) que puede ser compartido con otros."; -$a->strings["Please choose a channel type (such as social networking or community forum) and privacy requirements so we can select the best permissions for you"] = "Elija el tipo de canal (como red social o foro de discusión) y la privacidad que requiera, así podremos seleccionar el mejor conjunto de permisos para usted"; -$a->strings["Channel Type"] = "Tipo de canal"; $a->strings["Your email address"] = "Su dirección de correo electrónico"; $a->strings["Choose a password"] = "Elija una contraseña"; $a->strings["Please re-enter your password"] = "Por favor, vuelva a escribir su contraseña"; +$a->strings["Please enter your invitation code"] = "Por favor, introduzca el código de su invitación"; +$a->strings["no"] = "no"; +$a->strings["yes"] = "sí"; +$a->strings["Membership on this site is by invitation only."] = "Para registrarse en este sitio es necesaria una invitación."; +$a->strings["Proceed to create your first channel"] = "Crear su primer canal"; $a->strings["Please login."] = "Por favor, inicie sesión."; $a->strings["Account removals are not allowed within 48 hours of changing the account password."] = "La eliminación de cuentas no está permitida hasta después de que hayan transcurrido 48 horas desde el último cambio de contraseña."; $a->strings["Remove This Account"] = "Eliminar esta cuenta"; @@ -2226,6 +2221,7 @@ $a->strings["Xchan Lookup"] = "Búsqueda de canales"; $a->strings["Lookup xchan beginning with (or webbie): "] = "Buscar un canal (o un \"webbie\") que comience por:"; $a->strings["Cover Photos"] = "Imágenes de portada del perfil"; $a->strings["Upload Cover Photo"] = "Subir imagen de portada del perfil"; +$a->strings["Permissions denied."] = "Permisos denegados."; $a->strings["Focus (Hubzilla default)"] = "Focus (predefinido)"; $a->strings["Theme settings"] = "Ajustes del tema"; $a->strings["Select scheme"] = "Elegir un esquema"; diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index f4fa0415c..2cf311baa 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -295,7 +295,7 @@ footer { .vcard { margin-bottom: 10px; - padding: 10px; + padding: 0px 10px 10px 10px; background-color: rgba(254,254,254,0.5); border: 1px solid rgba(254,254,254,0.5); -moz-border-radius: $radiuspx; @@ -341,9 +341,7 @@ footer { #profile-photo-wrapper { width: 251px; height: 251px; - margin-top: -10px; margin-bottom: 10px; - border: 1px solid #ccc; border-radius: $radiuspx; } @@ -1142,7 +1140,6 @@ img.mail-conv-sender-photo { .jothidden { font-weight: bold; - border-radius: $radiuspx; } .jothidden input::-webkit-input-placeholder { @@ -1153,30 +1150,26 @@ img.mail-conv-sender-photo { font-weight: bold; } -.jothidden > input { - border: 1px solid transparent; - background-color: transparent; -} -.jothidden > input:hover, -.jothidden > input:focus { - border: 1px solid #cccccc; - background-color: #fff; -} + #profile-jot-wrapper { - background-color: rgba(254,254,254,.5); - border: 1px solid rgba(254,254,254,.5); + background-color: rgba(254,254,254,1); + border: 1px solid #ccc; border-radius: $radiuspx; } #profile-jot-text { - color:#000; - border: 1px solid #cccccc; - -moz-border-radius: $radiuspx; + resize: none; + border-width: 0px; border-radius: $radiuspx; } +#profile-jot-text:focus { + resize: vertical; +} + + #profile-jot-text::-webkit-input-placeholder { font-size:16px; } @@ -1243,6 +1236,11 @@ img.mail-conv-sender-photo { font-size: $font_size; } +.wall-item-footer { + font-size: $body_font_size; + margin-top: 2em; +} + .wall-item-content-wrapper { background-color: $item_colour; border-top-right-radius: $radiuspx; @@ -1510,7 +1508,7 @@ nav .dropdown-menu { .section-content-tools-wrapper { padding: 7px 10px; background-color: $comment_item_colour; - border-bottom: 3px solid $comment_item_colour; + border-bottom: 3px solid comment_item_colour; } .section-content-info-wrapper { @@ -1704,9 +1702,8 @@ nav .badge.mail-update:hover { .nav-tabs.nav-justified { background-color: rgba(254,254,254,.5); - border: 1px solid rgba(254,254,254,.5); - border-top-left-radius: $radiuspx; - border-top-right-radius: $radiuspx; + border-top-left-radius: 4px; + border-top-right-radius: 4px; } .nav-tabs.nav-justified > .active > a, @@ -1819,13 +1816,13 @@ nav .badge.mail-update:hover { /* Modified original CSS to match input in Redbasic */ .jothidden .bootstrap-tagsinput { - border-color: $bgcolour; - background-color: $bgcolour; + border: 0px solid transparent; + margin-bottom: 0px; box-shadow: none; display: inline-block; border-radius: $radiuspx; cursor: text; - padding: 0px 8px; + padding: 0px 10px; width: 100%; } @@ -1833,11 +1830,6 @@ nav .badge.mail-update:hover { font-size: 100%; } -.jothidden .bootstrap-tagsinput:hover, .jothidden .bootstrap-tagsinput:focus { - border: 1px solid #ccc; - background-color: #fff; -} - /* Abusing theme-green is less work than makeing a new new one */ .theme-green .back-bar .selected-bar { background-color: #000000; background-image: none; !important } diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl index 08c8aa64a..c29d80347 100755 --- a/view/tpl/events-js.tpl +++ b/view/tpl/events-js.tpl @@ -1,7 +1,7 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> <div class="pull-right"> - <button class="btn btn-success btn-xs" onclick="openClose('form'); closeMenu('event-tools');">{{$new_event.1}}</button> + <button class="btn btn-success btn-xs" onclick="openClose('form');">{{$new_event.1}}</button> <div class="btn-group"> <button class="btn btn-default btn-xs" onclick="changeView('prev', false);" title="{{$prev}}"><i class="icon-backward"></i></button> <button id="events-spinner" class="btn btn-default btn-xs" onclick="changeView('today', false);" title="{{$today}}"><i class="icon-bullseye"></i></button> diff --git a/view/tpl/field_input.tpl b/view/tpl/field_input.tpl index 128bbfbe1..d6a7f56b2 100755 --- a/view/tpl/field_input.tpl +++ b/view/tpl/field_input.tpl @@ -1,4 +1,4 @@ - <div class='form-group field input'> + <div id="id_{{$field.0}}_wrapper" class='form-group field input'> <label for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}{{if $field.4}}<span class="required"> {{$field.4}}</span>{{/if}}</label> <input class="form-control" name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2}}"{{if $field.5}} {{$field.5}}{{/if}}> <span id='help_{{$field.0}}' class='help-block'>{{$field.3}}</span> diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 32a08a9b3..631f55d83 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -1,3 +1,10 @@ +{{$mimeselect}} +{{$layoutselect}} +{{if $id_select}} +<div class="channel-id-select-div"> + <span class="channel-id-select-desc">{{$id_seltext}}</span> {{$id_select}} +</div> +{{/if}} <div id="profile-jot-wrapper"> <form id="profile-jot-form" action="{{$action}}" method="post"> {{if $parent}} @@ -17,13 +24,7 @@ <input type="hidden" name="preview" id="jot-preview" value="0" /> <input type="hidden" id="jot-consensus" name="consensus" value="{{if $consensus}}{{$consensus}}{{else}}0{{/if}}" /> {{if $showacl}}{{$acl}}{{/if}} - {{$mimeselect}} - {{$layoutselect}} - {{if $id_select}} - <div class="channel-id-select-div"> - <span class="channel-id-select-desc">{{$id_seltext}}</span> {{$id_select}} - </div> - {{/if}} + {{if $webpage}} <div id="jot-pagetitle-wrap" class="jothidden"> <input name="pagetitle" id="jot-pagetitle" type="text" placeholder="{{$placeholdpagetitle}}" value="{{$pagetitle}}"> @@ -159,10 +160,11 @@ </div> <div id="profile-jot-text-loading"></div> <div id="profile-jot-end" class="clear"></div> - <div id="jot-preview-content" style="display:none;"></div> </form> </div> +<div id="jot-preview-content" style="display:none;"></div> + <!-- Modal for item expiry--> <div class="modal" id="expiryModal" tabindex="-1" role="dialog" aria-labelledby="expiryModalLabel" aria-hidden="true"> <div class="modal-dialog"> diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl index 11a08204d..5bcef5dc1 100755 --- a/view/tpl/photos_upload.tpl +++ b/view/tpl/photos_upload.tpl @@ -26,7 +26,7 @@ <div id="body-textarea"> {{include file="field_textarea.tpl" field=$body}} </div> - <div class="pull-right btn-group form-group"> + <div class="pull-right btn-group"> <div class="btn-group"> {{if $lockstate}} <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl index 780626cf9..034a6d43d 100755 --- a/view/tpl/profile_advanced.tpl +++ b/view/tpl/profile_advanced.tpl @@ -12,194 +12,260 @@ <i class="icon-thumbs-up-alt" title="{{$profile.likethis}}"></i> </button> {{/if}} - {{if $edit}} - <a href="{{$edit.link}}" class="btn btn-primary btn-xs"><i class="icon-pencil"></i> {{$edit.label}}</a> + {{if $editmenu.multi}} + <a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#" ><i class="icon-pencil"></i> {{$editmenu.edit.3}}</a> + <ul class="dropdown-menu" role="menu"> + {{foreach $editmenu.menu.entries as $e}} + <li> + <a href="profiles/{{$e.id}}"><img class="dropdown-menu-img-xs" src='{{$e.photo}}'>{{$e.profile_name}}<div class='clear'></div></a> + </li> + {{/foreach}} + <li><a href="profile_photo" >{{$editmenu.menu.chg_photo}}</a></li> + {{if $editmenu.menu.cr_new}}<li><a href="profiles/new" id="profile-listing-new-link">{{$editmenu.menu.cr_new}}</a></li>{{/if}} + </ul> + {{elseif $editmenu}} + <a class="btn btn-primary btn-xs" href="{{$editmenu.edit.0}}" ><i class="icon-pencil"></i> {{$editmenu.edit.3}}</a> {{/if}} </div> <h2>{{$title}}</h2> <div class="clear"></div> </div> <div class="section-content-wrapper"> - <dl id="aprofile-fullname" class="aprofile"> - <dt>{{$profile.fullname.0}}</dt> - <dd>{{$profile.fullname.1}}</dd> - </dl> + {{foreach $fields as $f}} + {{if $f == 'name'}} + <dl id="aprofile-fullname" class="aprofile"> + <dt>{{$profile.fullname.0}}</dt> + <dd>{{$profile.fullname.1}}</dd> + </dl> + {{/if}} + + {{if $f == 'gender'}} {{if $profile.gender}} <dl id="aprofile-gender" class="aprofile"> <dt>{{$profile.gender.0}}</dt> <dd>{{$profile.gender.1}}</dd> </dl> {{/if}} + {{/if}} + {{if $f == 'birthday'}} {{if $profile.birthday}} <dl id="aprofile-birthday" class="aprofile"> <dt>{{$profile.birthday.0}}</dt> <dd>{{$profile.birthday.1}}</dd> </dl> {{/if}} + {{/if}} + {{if $f == 'age'}} {{if $profile.age}} <dl id="aprofile-age" class="aprofile"> <dt>{{$profile.age.0}}</dt> <dd>{{$profile.age.1}}</dd> </dl> {{/if}} + {{/if}} + + {{if $f == 'marital'}} {{if $profile.marital}} <dl id="aprofile-marital" class="aprofile"> <dt><span class="heart">♥</span> {{$profile.marital.0}}</dt> <dd>{{$profile.marital.1}}{{if $profile.marital.with}} ({{$profile.marital.with}}){{/if}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}</dd> </dl> {{/if}} + {{/if}} + {{if $f == 'sexual'}} {{if $profile.sexual}} <dl id="aprofile-sexual" class="aprofile"> <dt>{{$profile.sexual.0}}</dt> <dd>{{$profile.sexual.1}}</dd> </dl> {{/if}} + {{/if}} + {{if $f == 'keywords'}} {{if $profile.keywords}} <dl id="aprofile-tags" class="aprofile"> <dt>{{$profile.keywords.0}}</dt> <dd>{{$profile.keywords.1}}</dd> </dl> {{/if}} + {{/if}} + {{if $f == 'homepage'}} {{if $profile.homepage}} <dl id="aprofile-homepage" class="aprofile"> <dt>{{$profile.homepage.0}}</dt> <dd>{{$profile.homepage.1}}</dd> </dl> {{/if}} + {{/if}} + {{if $f == 'hometown'}} {{if $profile.hometown}} <dl id="aprofile-hometown" class="aprofile"> <dt>{{$profile.hometown.0}}</dt> <dd>{{$profile.hometown.1}}</dd> </dl> {{/if}} + {{/if}} + + {{if $f == 'politic'}} {{if $profile.politic}} <dl id="aprofile-politic" class="aprofile"> <dt>{{$profile.politic.0}}</dt> <dd>{{$profile.politic.1}}</dd> </dl> {{/if}} + {{/if}} + {{if $f == 'religion'}} {{if $profile.religion}} <dl id="aprofile-religion" class="aprofile"> <dt>{{$profile.religion.0}}</dt> <dd>{{$profile.religion.1}}</dd> </dl> {{/if}} + {{/if}} + {{if $f == 'about'}} {{if $profile.about}} <dl id="aprofile-about" class="aprofile"> <dt>{{$profile.about.0}}</dt> <dd>{{$profile.about.1}}</dd> </dl> {{/if}} + {{/if}} + {{if $f == 'interest'}} {{if $profile.interest}} <dl id="aprofile-interest" class="aprofile"> <dt>{{$profile.interest.0}}</dt> <dd>{{$profile.interest.1}}</dd> </dl> {{/if}} + {{/if}} + {{if $f == 'likes'}} {{if $profile.likes}} <dl id="aprofile-likes" class="aprofile"> <dt>{{$profile.likes.0}}</dt> <dd>{{$profile.likes.1}}</dd> </dl> {{/if}} + {{/if}} + {{if $f == 'dislikes'}} {{if $profile.dislikes}} <dl id="aprofile-dislikes" class="aprofile"> <dt>{{$profile.dislikes.0}}</dt> <dd>{{$profile.dislikes.1}}</dd> </dl> {{/if}} + {{/if}} + {{if $f == 'contact'}} {{if $profile.contact}} <dl id="aprofile-contact" class="aprofile"> <dt>{{$profile.contact.0}}</dt> <dd>{{$profile.contact.1}}</dd> </dl> {{/if}} + {{/if}} + {{if $f == 'channels'}} {{if $profile.channels}} <dl id="aprofile-channels" class="aprofile"> <dt>{{$profile.channels.0}}</dt> <dd>{{$profile.channels.1}}</dd> </dl> {{/if}} + {{/if}} + {{if $f == 'music'}} {{if $profile.music}} <dl id="aprofile-music" class="aprofile"> <dt>{{$profile.music.0}}</dt> <dd>{{$profile.music.1}}</dd> </dl> {{/if}} + {{/if}} + {{if $f == 'book'}} {{if $profile.book}} <dl id="aprofile-book" class="aprofile"> <dt>{{$profile.book.0}}</dt> <dd>{{$profile.book.1}}</dd> </dl> {{/if}} + {{/if}} + {{if $f == 'tv'}} {{if $profile.tv}} <dl id="aprofile-tv" class="aprofile"> <dt>{{$profile.tv.0}}</dt> <dd>{{$profile.tv.1}}</dd> </dl> {{/if}} + {{/if}} + {{if $f == 'film'}} {{if $profile.film}} <dl id="aprofile-film" class="aprofile"> <dt>{{$profile.film.0}}</dt> <dd>{{$profile.film.1}}</dd> </dl> {{/if}} + {{/if}} + {{if $f == 'romance'}} {{if $profile.romance}} <dl id="aprofile-romance" class="aprofile"> <dt>{{$profile.romance.0}}</dt> <dd>{{$profile.romance.1}}</dd> </dl> {{/if}} + {{/if}} + {{if $f == 'work'}} {{if $profile.work}} <dl id="aprofile-work" class="aprofile"> <dt>{{$profile.work.0}}</dt> <dd>{{$profile.work.1}}</dd> </dl> {{/if}} + {{/if}} + {{if $f == 'education'}} {{if $profile.education}} <dl id="aprofile-education" class="aprofile"> <dt>{{$profile.education.0}}</dt> <dd>{{$profile.education.1}}</dd> </dl> {{/if}} + {{/if}} - {{foreach $profile.extra_fields as $f}} - {{if $profile.$f}} - <dl id="aprofile-{{$f}}" class="aprofile"> - <dt>{{$profile.$f.0}}</dt> - <dd>{{$profile.$f.1}}</dd> + {{foreach $profile.extra_fields as $fld}} + {{if $f == $fld}} + {{if $profile.$fld}} + <dl id="aprofile-{{$fld}}" class="aprofile"> + <dt>{{$profile.$fld.0}}</dt> + <dd>{{$profile.$fld.1}}</dd> </dl> {{/if}} + {{/if}} {{/foreach}} + {{/foreach}} {{if $things}} diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index 56c262564..943cc6339 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -6,19 +6,21 @@ <div class="connect-btn-wrapper"><a href="{{$connect_url}}" class="btn btn-block btn-success btn-sm"><i class="icon-plus"></i> {{$connect}}</a></div> {{/if}} {{if ! $zcard}} - {{if $profile.edit}} + {{if $editmenu.multi}} <div class="dropdown"> - <a class="profile-edit-side-link dropdown-toggle" data-toggle="dropdown" title="{{$profile.edit.3}}" href="#" ><i class="icon-pencil" title="{{$profile.edit.1}}" ></i></a> + <a class="profile-edit-side-link dropdown-toggle" data-toggle="dropdown" href="#" ><i class="icon-pencil" title="{{$editmenu.edit.1}}"></i></a> <ul class="dropdown-menu" role="menu"> - {{foreach $profile.menu.entries as $e}} + {{foreach $editmenu.menu.entries as $e}} <li> - <a href="profiles/{{$e.id}}"><img class="dropdown-menu-img-xs" src='{{$e.photo}}'>{{$e.profile_name}}<div class='clear'></div></a> + <a href="profiles/{{$e.id}}"><img class="dropdown-menu-img-xs" src='{{$e.photo}}'>{{$e.profile_name}}</a> </li> {{/foreach}} - <li><a href="profile_photo" >{{$profile.menu.chg_photo}}</a></li> - {{if $profile.menu.cr_new}}<li><a href="profiles/new" id="profile-listing-new-link">{{$profile.menu.cr_new}}</a></li>{{/if}} + <li><a href="profile_photo" >{{$editmenu.menu.chg_photo}}</a></li> + {{if $editmenu.menu.cr_new}}<li><a href="profiles/new" id="profile-listing-new-link">{{$editmenu.menu.cr_new}}</a></li>{{/if}} </ul> </div> + {{elseif $editmenu}} + <a class="profile-edit-side-link" href="{{$editmenu.edit.0}}" ><i class="icon-pencil" title="{{$editmenu.edit.1}}"></i></a> {{/if}} {{/if}} @@ -27,9 +29,6 @@ {{if $reddress}}<div class="reddress" oncopy="return false;">{{$profile.reddress}}</div>{{/if}} {{/if}} {{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}} - - - {{if $location}} <dl class="location"><dt class="location-label">{{$location}}</dt> <dd class="adr"> @@ -45,7 +44,6 @@ {{/if}} {{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}} - {{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">♥</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}} |