diff options
| -rwxr-xr-x | boot.php | 6 | ||||
| -rw-r--r-- | include/contact_selectors.php | 22 | ||||
| -rw-r--r-- | include/crypto.php | 23 | ||||
| -rw-r--r-- | include/follow.php | 48 | ||||
| -rw-r--r-- | include/group.php | 16 | ||||
| -rwxr-xr-x | include/items.php | 4 | ||||
| -rw-r--r-- | include/network.php | 475 | ||||
| -rw-r--r-- | include/salmon.php | 196 | ||||
| -rw-r--r-- | include/widgets.php | 15 | ||||
| -rw-r--r-- | include/zot.php | 6 | ||||
| -rw-r--r-- | mod/acl.php | 19 | ||||
| -rw-r--r-- | mod/manage.php | 12 | ||||
| -rw-r--r-- | mod/oep.php | 4 | ||||
| -rw-r--r-- | mod/xrd.php | 17 | ||||
| -rw-r--r-- | util/hmessages.po | 860 | ||||
| -rw-r--r-- | version.inc | 2 | ||||
| -rw-r--r-- | view/css/mod_manage.css | 65 | ||||
| -rw-r--r-- | view/es-es/hmessages.po | 920 | ||||
| -rw-r--r-- | view/es-es/hstrings.php | 240 | ||||
| -rw-r--r-- | view/it/hmessages.po | 1425 | ||||
| -rw-r--r-- | view/it/hstrings.php | 252 | ||||
| -rw-r--r-- | view/js/acl.js | 24 | ||||
| -rw-r--r-- | view/nl/hmessages.po | 916 | ||||
| -rw-r--r-- | view/nl/hstrings.php | 238 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 10 | ||||
| -rwxr-xr-x | view/tpl/acl_selector.tpl | 3 | ||||
| -rwxr-xr-x | view/tpl/admin_aside.tpl | 21 | ||||
| -rwxr-xr-x | view/tpl/channel.tpl | 63 | ||||
| -rwxr-xr-x | view/tpl/channels.tpl | 60 | ||||
| -rw-r--r-- | view/tpl/magicsig.tpl | 9 | ||||
| -rwxr-xr-x | view/tpl/xrd_person.tpl | 5 |
31 files changed, 2924 insertions, 3052 deletions
@@ -47,7 +47,7 @@ require_once('include/account.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc'))); -define ( 'STD_VERSION', '1.3.1' ); +define ( 'STD_VERSION', '1.3.2' ); define ( 'ZOT_REVISION', 1 ); define ( 'DB_UPDATE_VERSION', 1165 ); @@ -271,9 +271,11 @@ define ( 'MENU_BOOKMARK', 0x0002 ); * Network and protocol family types */ -define ( 'NETWORK_DFRN', 'friendica-over-diaspora'); // Friendica, Mistpark, other DFRN implementations +define ( 'NETWORK_FRND', 'friendica-over-diaspora'); // Friendica, Mistpark, other DFRN implementations +define ( 'NETWORK_DFRN', 'dfrn'); // Friendica, Mistpark, other DFRN implementations define ( 'NETWORK_ZOT', 'zot'); // Zot! define ( 'NETWORK_OSTATUS', 'stat'); // status.net, identi.ca, GNU-social, other OStatus implementations +define ( 'NETWORK_GNUSOCIAL', 'gnusoc'); // status.net, identi.ca, GNU-social, other OStatus implementations define ( 'NETWORK_FEED', 'rss'); // RSS/Atom feeds with no known "post/notify" protocol define ( 'NETWORK_DIASPORA', 'diaspora'); // Diaspora define ( 'NETWORK_MAIL', 'mail'); // IMAP/POP diff --git a/include/contact_selectors.php b/include/contact_selectors.php index d44bee784..0de4ece00 100644 --- a/include/contact_selectors.php +++ b/include/contact_selectors.php @@ -73,16 +73,18 @@ function contact_poll_interval($current, $disabled = false) { function network_to_name($s) { $nets = array( - NETWORK_DFRN => t('Friendica'), - NETWORK_OSTATUS => t('OStatus'), - NETWORK_FEED => t('RSS/Atom'), - NETWORK_MAIL => t('Email'), - NETWORK_DIASPORA => t('Diaspora'), - NETWORK_FACEBOOK => t('Facebook'), - NETWORK_ZOT => t('Zot'), - NETWORK_LINKEDIN => t('LinkedIn'), - NETWORK_XMPP => t('XMPP/IM'), - NETWORK_MYSPACE => t('MySpace'), + NETWORK_DFRN => t('Friendica'), + NETWORK_FRND => t('Friendica'), + NETWORK_OSTATUS => t('OStatus'), + NETWORK_GNUSOCIAL => t('GNU-Social'), + NETWORK_FEED => t('RSS/Atom'), + NETWORK_MAIL => t('Email'), + NETWORK_DIASPORA => t('Diaspora'), + NETWORK_FACEBOOK => t('Facebook'), + NETWORK_ZOT => t('Zot'), + NETWORK_LINKEDIN => t('LinkedIn'), + NETWORK_XMPP => t('XMPP/IM'), + NETWORK_MYSPACE => t('MySpace'), ); call_hooks('network_to_name', $nets); diff --git a/include/crypto.php b/include/crypto.php index 3cddc7581..d82ee5114 100644 --- a/include/crypto.php +++ b/include/crypto.php @@ -308,11 +308,33 @@ function metorsa($m,$e) { return $key; } + + function salmon_key($pubkey) { pemtome($pubkey,$m,$e); return 'RSA' . '.' . base64url_encode($m,true) . '.' . base64url_encode($e,true) ; } + +function convert_salmon_key($key) { + + if(strstr($key,',')) + $rawkey = substr($key,strpos($key,',')+1); + else + $rawkey = substr($key,5); + + $key_info = explode('.',$rawkey); + + $m = base64url_decode($key_info[1]); + $e = base64url_decode($key_info[2]); + + logger('key details: ' . print_r($key_info,true), LOGGER_DATA); + $salmon_key = metopem($m,$e); + return $salmon_key; + +} + + function z_obscure($s) { return json_encode(crypto_encapsulate($s,get_config('system','pubkey'))); } @@ -322,3 +344,4 @@ function z_unobscure($s) { return $s; return crypto_unencapsulate(json_decode($s,true),get_config('system','prvkey')); } + diff --git a/include/follow.php b/include/follow.php index e71b0c713..70e717cfc 100644 --- a/include/follow.php +++ b/include/follow.php @@ -134,26 +134,29 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) $their_perms = 0; $xchan_hash = ''; - $r = q("select * from xchan where xchan_hash = '%s' or xchan_url = '%s' limit 1", dbesc($url), dbesc($url) ); - if(! $r) { // attempt network auto-discovery - if(strpos($url,'@') && (! $is_http)) { - $d = discover_by_webbie($url); - } - elseif($is_http) { - if(get_config('system','feed_contacts')) + + $d = discover_by_webbie($url); + + if((! $d) && ($is_http)) { + + // try RSS discovery + + if(get_config('system','feed_contacts')) { $d = discover_by_url($url); + } else { $result['message'] = t('Protocol disabled.'); return $result; } } + if($d) { $r = q("select * from xchan where xchan_hash = '%s' or xchan_url = '%s' limit 1", dbesc($url), @@ -161,6 +164,9 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) ); } } + + // if discovery was a success we should have an xchan record in $r + if($r) { $xchan = $r[0]; $xchan_hash = $r[0]['xchan_hash']; @@ -187,28 +193,13 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) } $singleton = intval($x['singleton']); - if((local_channel()) && $uid == local_channel()) { - $aid = get_account_id(); - $hash = get_observer_hash(); - $ch = $a->get_channel(); - $default_group = $ch['channel_default_group']; - } - else { - $r = q("select * from channel where channel_id = %d limit 1", - intval($uid) - ); - if(! $r) { - $result['message'] = t('local account not found.'); - return $result; - } - $aid = $r[0]['channel_account_id']; - $hash = $r[0]['channel_hash']; - $default_group = $r[0]['channel_default_group']; - } - + $aid = $channel['channel_account_id']; + $hash = get_observer_hash(); + $default_group = $channel['channel_default_group']; - if($is_http) { + if($xchan['xchan_network'] === 'rss') { + // check service class feed limits $r = q("select count(*) as total from abook where abook_account = %d and abook_feed = 1 ", intval($aid) @@ -232,7 +223,6 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) intval($uid) ); - if($r) { $abook_instance = $r[0]['abook_instance']; @@ -282,7 +272,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) proc_run('php', 'include/notifier.php', 'permission_create', $result['abook']['abook_id']); } - $arr = array('channel_id' => $uid, 'abook' => $result['abook']); + $arr = array('channel_id' => $uid, 'channel' => $channel, 'abook' => $result['abook']); call_hooks('follow', $arr); diff --git a/include/group.php b/include/group.php index 22f221059..748ec0c13 100644 --- a/include/group.php +++ b/include/group.php @@ -211,6 +211,22 @@ function group_get_members($gid) { return $ret; } +function group_get_members_xchan($gid) { + $ret = array(); + if(intval($gid)) { + $r = q("SELECT xchan FROM group_member WHERE gid = %d AND uid = %d", + intval($gid), + intval(local_channel()) + ); + if(count($r)) { + foreach($r as $rr) { + $ret[] = $rr['xchan']; + } + } + } + return $ret; +} + function mini_group_select($uid,$group = '') { $grps = array(); diff --git a/include/items.php b/include/items.php index c3a0b82d2..879f8ea12 100755 --- a/include/items.php +++ b/include/items.php @@ -4214,7 +4214,7 @@ function atom_entry($item,$type,$author,$owner,$comment = false,$cid = 0) { if(($item['parent'] != $item['id']) || ($item['parent_mid'] !== $item['mid']) || (($item['thr_parent'] !== '') && ($item['thr_parent'] !== $item['mid']))) { $parent_item = (($item['thr_parent']) ? $item['thr_parent'] : $item['parent_mid']); - $o .= '<thr:in-reply-to ref="' . xmlify($parent_item) . '" type="text/html" href="' . xmlify($item['plink']) . '" />' . "\r\n"; + $o .= '<thr:in-reply-to ref="' . z_root() . '/display/' . xmlify($parent_item) . '" type="text/html" href="' . xmlify($item['plink']) . '" />' . "\r\n"; } if(activity_match($item['obj_type'],ACTIVITY_OBJ_EVENT) && activity_match($item['verb'],ACTIVITY_POST)) { @@ -4232,7 +4232,7 @@ function atom_entry($item,$type,$author,$owner,$comment = false,$cid = 0) { $o .= '<content type="' . $type . '" >' . xmlify(prepare_text($body,$item['mimetype'])) . '</content>' . "\r\n"; } - $o .= '<id>' . xmlify($item['mid']) . '</id>' . "\r\n"; + $o .= '<id>' . z_root() . '/display/' . xmlify($item['mid']) . '</id>' . "\r\n"; $o .= '<published>' . xmlify(datetime_convert('UTC','UTC',$item['created'] . '+00:00',ATOM_TIME)) . '</published>' . "\r\n"; $o .= '<updated>' . xmlify(datetime_convert('UTC','UTC',$item['edited'] . '+00:00',ATOM_TIME)) . '</updated>' . "\r\n"; diff --git a/include/network.php b/include/network.php index 7d41a7eb7..e7d341321 100644 --- a/include/network.php +++ b/include/network.php @@ -185,9 +185,11 @@ function z_post_url($url,$params, $redirects = 0, $opts = array()) { if($ciphers) @curl_setopt($ch, CURLOPT_SSL_CIPHER_LIST, $ciphers); - if(x($opts,'headers')) + if(x($opts,'headers')) { @curl_setopt($ch, CURLOPT_HTTPHEADER, $opts['headers']); - +logger('headers: ' . print_r($opts['headers'],true) . 'redir: ' . $redirects); + } + if(x($opts,'nobody')) @curl_setopt($ch, CURLOPT_NOBODY, $opts['nobody']); @@ -236,6 +238,21 @@ function z_post_url($url,$params, $redirects = 0, $opts = array()) { $base = substr($base,strlen($chunk)); } + // would somebody take lighttpd and just shoot it? + + if($http_code == 417) { + curl_close($ch); + if($opts) { + if($opts['headers']) + $opts['headers'][] = 'Expect:'; + else + $opts['headers'] = array('Expect:'); + } + else + $opts = array('headers' => array('Expect:')); + return z_post_url($url,$params,++$redirects,$opts); + } + if($http_code == 301 || $http_code == 302 || $http_code == 303 || $http_code == 307 || $http_code == 308) { $matches = array(); preg_match('/(Location:|URI:)(.*?)\n/', $header, $matches); @@ -1044,32 +1061,16 @@ function discover_by_url($url,$arr = null) { } -function convert_salmon_key($key) { - - if(strstr($key,',')) - $rawkey = substr($key,strpos($key,',')+1); - else - $rawkey = substr($key,5); - - $key_info = explode('.',$rawkey); - - $m = base64url_decode($key_info[1]); - $e = base64url_decode($key_info[2]); - - logger('key details: ' . print_r($key_info,true), LOGGER_DEBUG); - $salmon_key = metopem($m,$e); - return $salmon_key; - -} - - function discover_by_webbie($webbie) { require_once('library/HTML5/Parser.php'); - $result = array(); - $network = null; + $result = array(); + + $network = null; + $diaspora = false; - $gnusoc = false; + $gnusoc = false; + $dfrn = false; $has_salmon = false; $salmon_key = false; @@ -1077,7 +1078,6 @@ function discover_by_webbie($webbie) { $diaspora_base = ''; $diaspora_guid = ''; $diaspora_key = ''; - $dfrn = false; $webbie = strtolower($webbie); @@ -1085,6 +1085,10 @@ function discover_by_webbie($webbie) { if($x && array_key_exists('links',$x) && $x['links']) { foreach($x['links'] as $link) { if(array_key_exists('rel',$link)) { + + // If we discover zot - don't search further; grab the info and get out of + // here. + if($link['rel'] == 'http://purl.org/zot/protocol') { logger('discover_by_webbie: zot found for ' . $webbie, LOGGER_DEBUG); if(array_key_exists('zot',$x) && $x['zot']['success']) @@ -1098,6 +1102,9 @@ function discover_by_webbie($webbie) { } } } + if($link['rel'] == NAMESPACE_DFRN) { + $dfrn = $link['href']; + } if($link['rel'] == 'magic-public-key') { if(substr($link['href'],0,5) === 'data:') { $salmon_key = convert_salmon_key($link['href']); @@ -1105,6 +1112,7 @@ function discover_by_webbie($webbie) { } if($link['rel'] == 'salmon') { $has_salmon = true; + $salmon = $link['href']; } if($link['rel'] == 'http://schemas.google.com/g/2010#updates-from') { $atom_feed = $link['href']; @@ -1113,82 +1121,40 @@ function discover_by_webbie($webbie) { } } - - logger('webfing: ' . print_r($x,true)); + logger('webfinger: ' . print_r($x,true), LOGGER_DATA, LOG_INFO); $arr = array('address' => $webbie, 'success' => false, 'webfinger' => $x); call_hooks('discover_channel_webfinger', $arr); if($arr['success']) return true; - if($salmon_key && $has_salmon && $atom_feed) { - - $gnusoc = true; - $addr = $x['address']; + $aliases = array(); - $m = parse_url($x['location']); + // Now let's make some decisions on what we may need + // to obtain further info - $k = z_fetch_url($atom_feed); - if($k['success']) - $feed_meta = feed_meta($k['body']); - if($feed_meta && $feed_meta['author']) { - $r = q("select * from xchan where xchan_hash = '%s' limit 1", - dbesc($addr) - ); - if($r) { - $r = q("update xchan set xchan_name = '%s', xchan_network = '%s', xchan_name_date = '%s' where xchan_hash = '%s' limit 1", - dbesc(($feed_meta['author']['author_name']) ? $feed_meta['author']['author_name'] : $x['nickname']), - dbesc('gnusoc'), - dbesc(datetime_convert()), - dbesc($addr) - ); - } - else { - - $r = q("insert into xchan ( xchan_hash, xchan_guid, xchan_pubkey, xchan_addr, xchan_url, xchan_name, xchan_network, xchan_name_date ) values ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s') ", - dbesc($addr), - dbesc($x['location']), - dbesc($salmon_key), - dbesc($addr), - dbesc($x['location']), - dbesc(($feed_meta['author']['author_name']) ? $feed_meta['author']['author_name'] : $x['nickname']), - dbesc('gnusoc'), - dbescdate(datetime_convert()) - ); - } + $probe_atom = false; + $probe_old = false; + $probe_hcard = false; - $r = q("select * from hubloc where hubloc_hash = '%s' limit 1", - dbesc($addr) - ); + $address = ''; + $location = ''; + $nickname = ''; + $fullname = ''; + $avatar = ''; + $pubkey = ''; - if(! $r) { - - $r = q("insert into hubloc ( hubloc_guid, hubloc_hash, hubloc_addr, hubloc_network, hubloc_url, hubloc_host, hubloc_callback, hubloc_updated, hubloc_primary ) values ('%s','%s','%s','%s','%s','%s','%s','%s', 1)", - dbesc($x['location']), - dbesc($addr), - dbesc($addr), - dbesc('gnusoc'), - dbesc($m['scheme'] . '://' . $m['host']), - dbesc($m['host']), - dbesc($salmon), - dbescdate(datetime_convert()) - ); - } - $photos = import_xchan_photo($feed_meta['author']['author_photo'],$addr); - $r = q("update xchan set xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s' where xchan_hash = '%s'", - dbescdate(datetime_convert()), - dbesc($photos[0]), - dbesc($photos[1]), - dbesc($photos[2]), - dbesc($photos[3]), - dbesc($addr) - ); - return true; + if(array_key_exists('address',$x)) + $address = $x['address']; + if(array_key_exists('location',$x)) + $location = $x['location']; + if(array_key_exists('nickname',$x)) + $nickname = $x['nickname']; - } - } - else { + if(! $x) + $probe_old = true; + if($probe_old) { $x = old_webfinger($webbie); if($x) { logger('old_webfinger: ' . print_r($x,true)); @@ -1221,174 +1187,195 @@ function discover_by_webbie($webbie) { $pubkey = $diaspora_key; $diaspora = true; } + if($link['@attributes']['rel'] == 'magic-public-key') { + if(substr($link['@attributes']['href'],0,5) === 'data:') { + $salmon_key = convert_salmon_key($link['@attributes']['href']); + } + } + if($link['@attributes']['rel'] == 'salmon') { + $has_salmon = true; + $salmon = $link['@attributes']['href']; + } + + if($link['@attributes']['rel'] == 'http://schemas.google.com/g/2010#updates-from') { + $atom_feed = $link['@attributes']['href']; + } + if($link['@attributes']['rel'] === 'alias') { + $aliases[] = $link['@attributes']['href']; + } + if($link['@attributes']['rel'] === 'subject') { + $subject = $link['@attributes']['href']; + } } } + } - if($diaspora && $diaspora_base && $diaspora_guid) { - $guid = $diaspora_guid; - $diaspora_base = trim($diaspora_base,'/'); + if($subject || $aliases) { + if(strpos($webbie,'@')) { + $rhs = substr($webbie,strpos($webbie,'@')+1); + } + else { + $m = parse_url($webbie); + if($m) { + $rhs = $m['host'] . (($m['port']) ? ':' . $m['port'] : ''); + } + } - $notify = $diaspora_base . '/receive'; + $v = array('subject' => $subject,'aliases' => $aliases); + $address = find_webfinger_address($v,$rhs); + $location = find_webfinger_location($v,$rhs); + if($address) + $nickname = substr($address,0,strpos($address,'@')); - if(strpos($webbie,'@')) { - $addr = str_replace('acct:', '', $webbie); - $hostname = substr($webbie,strpos($webbie,'@')+1); - } - $network = 'diaspora'; - // until we get a dfrn layer, we'll use diaspora protocols for Friendica, - // but give it a different network so we can go back and fix these when we get proper support. - // It really should be just 'friendica' but we also want to distinguish - // between Friendica sites that we can use D* protocols with and those we can't. - // Some Friendica sites will have Diaspora disabled. - if($dfrn) - $network = 'friendica-over-diaspora'; - if($hcard) { - $vcard = scrape_vcard($hcard); - $vcard['nick'] = substr($webbie,0,strpos($webbie,'@')); - if(! $vcard['fn']) - $vcard['fn'] = $webbie; - } - - $r = q("select * from xchan where xchan_hash = '%s' limit 1", - dbesc($addr) - ); + } + + if($salmon_key && $has_salmon && $atom_feed && (! $dfrn) && (! $diaspora)) { + $gnusoc = true; + $probe_atom = true; + } + + if(! $pubkey) + $pubkey = $salmon_key; + + if(($dfrn || $diaspora) && $hcard) + $probe_hcard = true; + + if(! $fullname) + $fullname = $nickname; + + if($probe_atom) { + $k = z_fetch_url($atom_feed); + if($k['success']) + $feed_meta = feed_meta($k['body']); + if($feed_meta) { - // fix relative urls - if($vcard['photo'] && (strpos($vcard['photo'],'http') !== 0)) - $vcard['photo'] = $diaspora_base . '/' . $vcard['photo']; - - /** - * - * Diaspora communications are notoriously unreliable and receiving profile update messages (indeed any messages) - * are pretty much random luck. We'll check the timestamp of the xchan_name_date at a higher level and refresh - * this record once a month; because if you miss a profile update message and they update their profile photo or name - * you're otherwise stuck with stale info until they change their profile again - which could be years from now. - * - */ - - if($r) { - $r = q("update xchan set xchan_name = '%s', xchan_network = '%s', xchan_name_date = '%s' where xchan_hash = '%s' limit 1", - dbesc($vcard['fn']), - dbesc($network), - dbesc(datetime_convert()), - dbesc($addr) - ); + // stash any discovered pubsubhubbub hubs in case we need to follow them + // this will save an expensive lookup later + + if($feed_meta['hubs'] && $address) { + set_xconfig($address,'system','push_hubs',$feed_meta['hubs']); + set_xconfig($address,'system','feed_url',$atom_feed); } - else { - - $r = q("insert into xchan ( xchan_hash, xchan_guid, xchan_pubkey, xchan_addr, xchan_url, xchan_name, xchan_network, xchan_name_date ) values ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s') ", - dbesc($addr), - dbesc($guid), - dbesc($pubkey), - dbesc($addr), - dbesc($profile), - dbesc($vcard['fn']), - dbesc($network), - dbescdate(datetime_convert()) - ); + if($feed_meta['author']['author_name']) { + $fullname = $feed_meta['author']['author_name']; } + if(! $avatar) { + if($feed_meta['author']['author_photo']) + $avatar = $feed_meta['author']['author_photo']; + } + } + } + else { + if($probe_hcard) { + $vcard = scrape_vcard($hcard); + if($vcard) { + logger('vcard: ' . print_r($vcard,true), LOGGER_DATA); + if($vcard['fn']) + $fullname = $vcard['fn']; + if($vcard['photo'] && (strpos($vcard['photo'],'http') !== 0)) + $vcard['photo'] = $diaspora_base . '/' . $vcard['photo']; + if(! $avatar) + $avatar = $vcard['photo']; - $r = q("select * from hubloc where hubloc_hash = '%s' limit 1", - dbesc($webbie) - ); - - if(! $r) { - - $r = q("insert into hubloc ( hubloc_guid, hubloc_hash, hubloc_addr, hubloc_network, hubloc_url, hubloc_host, hubloc_callback, hubloc_updated, hubloc_primary ) values ('%s','%s','%s','%s','%s','%s','%s','%s', 1)", - dbesc($guid), - dbesc($addr), - dbesc($addr), - dbesc($network), - dbesc(trim($diaspora_base,'/')), - dbesc($hostname), - dbesc($notify), - dbescdate(datetime_convert()) - ); } - $photos = import_xchan_photo($vcard['photo'],$addr); - $r = q("update xchan set xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s' where xchan_hash = '%s'", - dbescdate(datetime_convert()), - dbesc($photos[0]), - dbesc($photos[1]), - dbesc($photos[2]), - dbesc($photos[3]), - dbesc($addr) - ); - return true; + } + } + + if(($profile) && (! $location)) + $location = $profile; + + if($location) { + $m = parse_url($location); + $base = $m['scheme'] . '://' . $m['host']; + $host = $m['host']; + } + + if($diaspora && $diaspora_base && $diaspora_guid) { + if($dfrn) + $network = 'friendica-over-diaspora'; + else + $network = 'diaspora'; + + $base = trim($diaspora_base,'/'); + $notify = $base . '/receive'; + + } + else { + if($gnusoc) { + $network = 'gnusoc'; + $notify = $salmon; } } - return false; -/* - $vcard['fn'] = notags($vcard['fn']); - $vcard['nick'] = str_replace(' ','',notags($vcard['nick'])); - - $result['name'] = $vcard['fn']; - $result['nick'] = $vcard['nick']; - $result['guid'] = $guid; - $result['url'] = $profile; - $result['hostname'] = $hostname; - $result['addr'] = $addr; - $result['batch'] = $batch; - $result['notify'] = $notify; - $result['poll'] = $poll; - $result['request'] = $request; - $result['confirm'] = $confirm; - $result['poco'] = $poco; - $result['photo'] = $vcard['photo']; - $result['priority'] = $priority; - $result['network'] = $network; - $result['alias'] = $alias; - $result['pubkey'] = $pubkey; - - logger('probe_url: ' . print_r($result,true), LOGGER_DEBUG); - - return $result; - -*/ - -/* Sample Diaspora result. - -Array -( - [name] => Mike Macgirvin - [nick] => macgirvin - [guid] => a9174a618f8d269a - [url] => https://joindiaspora.com/u/macgirvin - [hostname] => joindiaspora.com - [addr] => macgirvin@joindiaspora.com - [batch] => - [notify] => https://joindiaspora.com/receive - [poll] => https://joindiaspora.com/public/macgirvin.atom - [request] => - [confirm] => - [poco] => - [photo] => https://joindiaspora.s3.amazonaws.com/uploads/images/thumb_large_fec4e6eef13ae5e56207.jpg - [priority] => - [network] => diaspora - [alias] => - [pubkey] => -----BEGIN PUBLIC KEY----- -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAtihtyIuRDWkDpCA+I1UaQ -jI4S7k625+A7EEJm+pL2ZVSJxeCKiFeEgHBQENjLMNNm8l8F6blxgQqE6ZJ9Spa7f -tlaXYTRCrfxKzh02L3hR7sNA+JS/nXJaUAIo+IwpIEspmcIRbD9GB7Wv/rr+M28uH -31EeYyDz8QL6InU/bJmnCdFvmEMBQxJOw1ih9tQp7UNJAbUMCje0WYFzBz7sfcaHL -OyYcCOqOCBLdGucUoJzTQ9iDBVzB8j1r1JkIHoEb2moUoKUp+tkCylNfd/3IVELF9 -7w1Qjmit3m50OrJk2DQOXvCW9KQxaQNdpRPSwhvemIt98zXSeyZ1q/YjjOwG0DWDq -AF8aLj3/oQaZndTPy/6tMiZogKaijoxj8xFLuPYDTw5VpKquriVC0z8oxyRbv4t9v -8JZZ9BXqzmayvY3xZGGp8NulrfjW+me2bKh0/df1aHaBwpZdDTXQ6kqAiS2FfsuPN -vg57fhfHbL1yJ4oDbNNNeI0kJTGchXqerr8C20khU/cQ2Xt31VyEZtnTB665Ceugv -kp3t2qd8UpAVKl430S5Quqx2ymfUIdxdW08CEjnoRNEL3aOWOXfbf4gSVaXmPCR4i -LSIeXnd14lQYK/uxW/8cTFjcmddsKxeXysoQxbSa9VdDK+KkpZdgYXYrTTofXs6v+ -4afAEhRaaY+MCAwEAAQ== ------END PUBLIC KEY----- - -) -*/ + logger('network: ' . $network); + logger('address: ' . $address); + logger('fullname: ' . $fullname); + logger('pubkey: ' . $pubkey); + logger('location: ' . $location); + + + + // if we have everything we need, let's create the records + + if($network && $address && $fullname && $pubkey && $location) { + $r = q("select * from xchan where xchan_hash = '%s' limit 1", + dbesc($address) + ); + if($r) { + $r = q("update xchan set xchan_name = '%s', xchan_network = '%s', xchan_name_date = '%s' where xchan_hash = '%s' limit 1", + dbesc($fullname), + dbesc($network), + dbesc(datetime_convert()), + dbesc($address) + ); + } + else { + $r = q("insert into xchan ( xchan_hash, xchan_guid, xchan_pubkey, xchan_addr, xchan_url, xchan_name, xchan_network, xchan_name_date ) values ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s') ", + dbesc($address), + dbesc(($diaspora_guid) ? $diaspora_guid : $location), + dbesc($pubkey), + dbesc($address), + dbesc($location), + dbesc($fullname), + dbesc($network), + dbescdate(datetime_convert()) + ); + } + + $r = q("select * from hubloc where hubloc_hash = '%s' limit 1", + dbesc($address) + ); + + if(! $r) { + $r = q("insert into hubloc ( hubloc_guid, hubloc_hash, hubloc_addr, hubloc_network, hubloc_url, hubloc_host, hubloc_callback, hubloc_updated, hubloc_primary ) values ('%s','%s','%s','%s','%s','%s','%s','%s', 1)", + dbesc(($diaspora_guid) ? $diaspora_guid : $location), + dbesc($address), + dbesc($address), + dbesc($network), + dbesc($base), + dbesc($host), + dbesc($notify), + dbescdate(datetime_convert()) + ); + } + $photos = import_xchan_photo($avatar,$address); + $r = q("update xchan set xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s' where xchan_hash = '%s'", + dbescdate(datetime_convert()), + dbesc($photos[0]), + dbesc($photos[1]), + dbesc($photos[2]), + dbesc($photos[3]), + dbesc($address) + ); + return true; + } + return false; } + function webfinger_rfc7033($webbie,$zot = false) { @@ -1473,8 +1460,8 @@ function find_webfinger_location($j,$rhs) { function match_webfinger_location($s,$h) { - // GNU-social and the older StatusNet - if(preg_match('|' . $h . '/user/([0-9]*?)$|',$s)) + // GNU-social and the older StatusNet - the $host/user/123 form doesn't work + if(preg_match('|' . $h . '/index.php/user/([0-9]*?)$|',$s)) return $s; // Redmatrix / hubzilla if(preg_match('|' . $h . '/channel/|',$s)) @@ -1549,7 +1536,7 @@ function fetch_lrdd_template($host) { function fetch_xrd_links($url) { -logger('fetch_xrd_links: ' . $url); + logger('fetch_xrd_links: ' . $url, LOGGER_DEBUG); $redirects = 0; $x = z_fetch_url($url,false,$redirects,array('timeout' => 20)); @@ -1595,6 +1582,10 @@ logger('fetch_xrd_links: ' . $url); } } + if(isset($arr['xrd']['subject'])) { + $links[]['@attributes'] = array('rel' => 'subject' , 'href' => $arr['xrd']['subject']); + } + logger('fetch_xrd_links: ' . print_r($links,true), LOGGER_DATA); return $links; diff --git a/include/salmon.php b/include/salmon.php deleted file mode 100644 index 737d1f0d0..000000000 --- a/include/salmon.php +++ /dev/null @@ -1,196 +0,0 @@ -<?php - -require_once('include/crypto.php'); - -function get_salmon_key($uri,$keyhash) { - $ret = array(); - - logger('Fetching salmon key for ' . $uri, LOGGER_DEBUG, LOG_INFO); - - $x = webfinger_rfc7033($uri,true); - - logger('webfinger returns: ' . print_r($x,true), LOGGER_DATA, LOG_DEBUG); - - if($x && array_key_exists('links',$x) && $x['links']) { - foreach($x['links'] as $link) { - if(array_key_exists('rel',$link) && $link['rel'] === 'magic-public-key') { - $ret[] = $link['href']; - } - } - } - - else { - $arr = old_webfinger($uri); - - logger('old webfinger returns: ' . print_r($arr,true), LOGGER_DATA, LOG_DEBUG); - - if(is_array($arr)) { - foreach($arr as $a) { - if($a['@attributes']['rel'] === 'magic-public-key') { - $ret[] = $a['@attributes']['href']; - } - } - } - else { - return ''; - } - } - - // We have found at least one key URL - // If it's inline, parse it - otherwise get the key - - if(count($ret)) { - for($x = 0; $x < count($ret); $x ++) { - if(substr($ret[$x],0,5) === 'data:') { - $ret[$x] = convert_salmon_key($ret[$x]); - } - } - } - - - logger('Key located: ' . print_r($ret,true), LOGGER_DEBUG, LOG_INFO); - - if(count($ret) == 1) { - - // We only found one one key so we don't care if the hash matches. - // If it's the wrong key we'll find out soon enough because - // message verification will fail. This also covers some older - // software which don't supply a keyhash. As long as they only - // have one key we'll be right. - - return $ret[0]; - } - else { - foreach($ret as $a) { - $hash = base64url_encode(hash('sha256',$a)); - if($hash == $keyhash) - return $a; - } - } - - return ''; -} - - - -function slapper($owner,$url,$slap) { - - // does contact have a salmon endpoint? - - if(! strlen($url)) - return; - - - if(! $owner['channel_prvkey']) { - logger(sprintf("channel '%s' (%d) does not have a salmon private key. Send failed.", - $owner['channel_address'],$owner['channel_id'])); - return; - } - - logger('slapper called for ' .$url . '. Data: ' . $slap, LOGGER_DATA, LOG_DEBUG); - - // create a magic envelope - - $data = base64url_encode($slap); - $data_type = 'application/atom+xml'; - $encoding = 'base64url'; - $algorithm = 'RSA-SHA256'; - $keyhash = base64url_encode(hash('sha256',salmon_key($owner['channel_pubkey'])),true); - - // precomputed base64url encoding of data_type, encoding, algorithm concatenated with periods - - $precomputed = '.YXBwbGljYXRpb24vYXRvbSt4bWw=.YmFzZTY0dXJs.UlNBLVNIQTI1Ng=='; - - $signature = base64url_encode(rsa_sign(str_replace('=','',$data . $precomputed),$owner['channel_prvkey'])); - - $signature2 = base64url_encode(rsa_sign($data . $precomputed,$owner['channel_prvkey'])); - - $signature3 = base64url_encode(rsa_sign($data,$owner['channel_prvkey'])); - - $salmon_tpl = get_markup_template('magicsig.tpl'); - - $salmon = replace_macros($salmon_tpl,array( - '$data' => $data, - '$encoding' => $encoding, - '$algorithm' => $algorithm, - '$keyhash' => $keyhash, - '$signature' => $signature - )); - - // slap them - - $redirects = 0; - - $ret = z_post_url($url,$salmon, $redirects, array('headers' => array( - 'Content-type: application/magic-envelope+xml', - 'Content-length: ' . strlen($salmon)) - )); - - - $return_code = $ret['return_code']; - - // check for success, e.g. 2xx - - if($return_code > 299) { - - logger('compliant salmon failed. Falling back to status.net hack2'); - - // Entirely likely that their salmon implementation is - // non-compliant. Let's try once more, this time only signing - // the data, without stripping '=' chars - - $salmon = replace_macros($salmon_tpl,array( - '$data' => $data, - '$encoding' => $encoding, - '$algorithm' => $algorithm, - '$keyhash' => $keyhash, - '$signature' => $signature2 - )); - - $redirects = 0; - - $ret = z_post_url($url,$salmon, $redirects, array('headers' => array( - 'Content-type: application/magic-envelope+xml', - 'Content-length: ' . strlen($salmon)) - )); - - - $return_code = $ret['return_code']; - - if($return_code > 299) { - - logger('compliant salmon failed. Falling back to status.net hack3'); - - // Entirely likely that their salmon implementation is - // non-compliant. Let's try once more, this time only signing - // the data, without the precomputed blob - - $salmon = replace_macros($salmon_tpl,array( - '$data' => $data, - '$encoding' => $encoding, - '$algorithm' => $algorithm, - '$keyhash' => $keyhash, - '$signature' => $signature3 - )); - - $redirects = 0; - - $ret = z_post_url($url,$salmon, $redirects, array('headers' => array( - 'Content-type: application/magic-envelope+xml', - 'Content-length: ' . strlen($salmon)) - )); - - - $return_code = $ret['return_code']; - } - } - logger('slapper for ' . $url . ' returned ' . $return_code); - - if(! $return_code) - return(-1); - if(($return_code == 503) && (stristr($ret['header'],'retry-after'))) - return(-1); - - return ((($return_code >= 200) && ($return_code < 300)) ? 0 : 1); -} - diff --git a/include/widgets.php b/include/widgets.php index 65c745a05..deb514915 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -1314,7 +1314,7 @@ function widget_admin($arr) { $aside = array( 'site' => array(z_root() . '/admin/site/', t('Site'), 'site'), - 'users' => array(z_root() . '/admin/users/', t('Accounts'), 'users'), + 'users' => array(z_root() . '/admin/users/', t('Accounts'), 'users', 'pending-update', t('Member registrations waiting for confirmation')), 'channels' => array(z_root() . '/admin/channels/', t('Channels'), 'channels'), 'security' => array(z_root() . '/admin/security/', t('Security'), 'security'), 'features' => array(z_root() . '/admin/features/', t('Features'), 'features'), @@ -1330,24 +1330,29 @@ function widget_admin($arr) { $r = q("SELECT * FROM addon WHERE plugin_admin = 1"); - $aside['plugins_admin'] = array(); + $plugins = array(); if($r) { foreach ($r as $h){ $plugin = $h['name']; - $aside['plugins_admin'][] = array(z_root() . '/admin/plugins/' . $plugin, $plugin, 'plugin'); + $plugins[] = array(z_root() . '/admin/plugins/' . $plugin, $plugin, 'plugin'); // temp plugins with admin $a->plugins_admin[] = $plugin; } } - $aside['logs'] = array(z_root() . '/admin/logs/', t('Logs'), 'logs'); + $logs = array(z_root() . '/admin/logs/', t('Logs'), 'logs'); + + $arr = array('links' => $aside,'plugins' => $plugins,'logs' => $logs); + call_hooks('admin_aside',$arr); $o .= replace_macros(get_markup_template('admin_aside.tpl'), array( '$admin' => $aside, '$admtxt' => t('Admin'), '$plugadmtxt' => t('Plugin Features'), + '$plugins' => $plugins, '$logtxt' => t('Logs'), - '$h_pending' => t('User registrations waiting for confirmation'), + '$logs' => $logs, + '$h_pending' => t('Member registrations waiting for confirmation'), '$admurl'=> z_root() . '/admin/' )); diff --git a/include/zot.php b/include/zot.php index cff9e1810..d8cae3954 100644 --- a/include/zot.php +++ b/include/zot.php @@ -2278,6 +2278,12 @@ function check_location_move($sender_hash,$locations) { dbesc($sender_hash) ); + // federation plugins may wish to notify connections + // of the move on singleton networks + + $arr = array('channel' => $r[0],'locations' => $locations); + call_hooks('location_move',$arr); + } } diff --git a/mod/acl.php b/mod/acl.php index aaf056b60..146cb74c8 100644 --- a/mod/acl.php +++ b/mod/acl.php @@ -2,6 +2,7 @@ /* ACL selector json backend */ require_once("include/acl_selectors.php"); +require_once("include/group.php"); function acl_init(&$a){ @@ -47,31 +48,29 @@ function acl_init(&$a){ $contacts = array(); if ($type=='' || $type=='g'){ - - $r = q("SELECT `groups`.`id`, `groups`.`hash`, `groups`.`name`, - %s as uids + + $r = q("SELECT `groups`.`id`, `groups`.`hash`, `groups`.`name` FROM `groups`,`group_member` WHERE `groups`.`deleted` = 0 AND `groups`.`uid` = %d - AND `group_member`.`gid`=`groups`.`id` - $sql_extra + AND `group_member`.`gid`=`groups`.`id` + $sql_extra GROUP BY `groups`.`id` ORDER BY `groups`.`name` LIMIT %d OFFSET %d", - db_concat('group_member.xchan', ','), intval(local_channel()), intval($count), intval($start) ); foreach($r as $g){ -// logger('acl: group: ' . $g['name'] . ' members: ' . $g['uids']); +// logger('acl: group: ' . $g['name'] . ' members: ' . group_get_members_xchan($g['id'])); $groups[] = array( "type" => "g", "photo" => "images/twopeople.png", "name" => $g['name'], "id" => $g['id'], "xid" => $g['hash'], - "uids" => explode(",",$g['uids']), + "uids" => group_get_members_xchan($g['id']), "link" => '' ); } @@ -94,7 +93,7 @@ function acl_init(&$a){ $r = q("SELECT abook_id as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, abook_their_perms, abook_flags, abook_self FROM abook left join xchan on abook_xchan = xchan_hash - WHERE (abook_channel = %d $extra_channels_sql) AND abook_blocked = 0 and abook_pending = 0 and abook_archived = 0 and xchan_deleted = 0 $sql_extra2 order by $order_extra2 xchan_name asc" , + WHERE (abook_channel = %d $extra_channels_sql) AND abook_blocked = 0 and abook_pending = 0 and xchan_deleted = 0 $sql_extra2 order by $order_extra2 xchan_name asc" , intval(local_channel()) ); @@ -118,7 +117,7 @@ function acl_init(&$a){ $r2 = q("SELECT abook_id as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, abook_their_perms, abook_flags, abook_self FROM abook left join xchan on abook_xchan = xchan_hash - WHERE abook_channel IN ($extra_channels_sql) $known_hashes_sql AND abook_blocked = 0 and abook_pending = 0 and abook_archived = 0 and abook_hidden = 0 and xchan_deleted = 0 $sql_extra2 order by $order_extra2 xchan_name asc"); + WHERE abook_channel IN ($extra_channels_sql) $known_hashes_sql AND abook_blocked = 0 and abook_pending = 0 and abook_hidden = 0 and xchan_deleted = 0 $sql_extra2 order by $order_extra2 xchan_name asc"); if($r2) $r = array_merge($r,$r2); diff --git a/mod/manage.php b/mod/manage.php index 671003efd..cb845befe 100644 --- a/mod/manage.php +++ b/mod/manage.php @@ -134,9 +134,7 @@ function manage_content(&$a) { } } - $links = array( - array( 'new_channel', t('Create a new channel'), t('Create a new channel')) - ); + $create = array( 'new_channel', t('Create a new channel'), t('Create New')); $delegates = q("select * from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and (abook_their_perms & %d) > 0", @@ -156,8 +154,6 @@ function manage_content(&$a) { $delegates = null; } - - $o = replace_macros(get_markup_template('channels.tpl'), array( '$header' => t('Channel Manager'), '$msg_selected' => t('Current Channel'), @@ -165,17 +161,17 @@ function manage_content(&$a) { '$desc' => t('Switch to one of your channels by selecting it.'), '$msg_default' => t('Default Channel'), '$msg_make_default' => t('Make Default'), - '$links' => $links, + '$create' => $create, '$all_channels' => $channels, '$mail_format' => t('%d new messages'), '$intros_format' => t('%d new introductions'), '$channel_usage_message' => $channel_usage_message, - '$delegate_header' => t('Delegated Channels'), + '$delegated_desc' => t('Delegated Channel'), '$delegates' => $delegates, + '$locs' => t('Manage locations') )); - return $o; } diff --git a/mod/oep.php b/mod/oep.php index 42535c069..36741a752 100644 --- a/mod/oep.php +++ b/mod/oep.php @@ -106,7 +106,7 @@ function oep_display_reply($args) { $w = (($maxwidth) ? $maxwidth : 640); $h = (($maxheight) ? $maxheight : $w * 2 / 3); - $ret['html'] = '<div style="width: ' . $w . '; height: ' . $h . ';" >' . $o . '</div>'; + $ret['html'] = '<div style="width: ' . $w . '; height: ' . $h . '; font-family: sans-serif,arial,freesans;" >' . $o . '</div>'; $ret['width'] = $w; $ret['height'] = $h; @@ -165,7 +165,7 @@ function oep_mid_reply($args) { $w = (($maxwidth) ? $maxwidth : 640); $h = (($maxheight) ? $maxheight : $w * 2 / 3); - $ret['html'] = '<div style="width: ' . $w . '; height: ' . $h . ';" >' . $o . '</div>'; + $ret['html'] = '<div style="width: ' . $w . '; height: ' . $h . '; font-family: sans-serif,arial,freesans;" >' . $o . '</div>'; $ret['width'] = $w; $ret['height'] = $h; diff --git a/mod/xrd.php b/mod/xrd.php index da4ab51a4..ed8e1eabe 100644 --- a/mod/xrd.php +++ b/mod/xrd.php @@ -7,8 +7,12 @@ function xrd_init(&$a) { $uri = urldecode(notags(trim($_GET['uri']))); logger('xrd: ' . $uri,LOGGER_DEBUG); - if(substr($uri,0,4) === 'http') + $resource = $uri; + + if(substr($uri,0,4) === 'http') { + $uri = str_replace('~','',$uri); $name = basename($uri); + } else { $local = str_replace('acct:', '', $uri); if(substr($local,0,2) == '//') @@ -35,9 +39,18 @@ function xrd_init(&$a) { header("Content-type: application/xrd+xml"); + $aliases = array('acct:' . $r[0]['channel_address'] . '@' . $a->get_hostname(), z_root() . '/channel/' . $r[0]['channel_address'], z_root() . '/~' . $r[0]['channel_address']); + + for($x = 0; $x < count($aliases); $x ++) { + if($aliases[$x] === $resource) + unset($aliases[$x]); + } + + $o = replace_macros(get_markup_template('xrd_person.tpl'), array( '$nick' => $r[0]['channel_address'], - '$accturi' => $uri, + '$accturi' => $resource, + '$aliases' => $aliases, '$profile_url' => $a->get_baseurl() . '/channel/' . $r[0]['channel_address'], '$hcard_url' => $a->get_baseurl() . '/hcard/' . $r[0]['channel_address'], '$atom' => $a->get_baseurl() . '/feed/' . $r[0]['channel_address'], diff --git a/util/hmessages.po b/util/hmessages.po index 664150e2e..7d5c03c14 100644 --- a/util/hmessages.po +++ b/util/hmessages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2016-03-11.1332H\n" +"Project-Id-Version: 2016-03-18.1339H\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-11 00:03-0800\n" +"POT-Creation-Date: 2016-03-18 00:03-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -58,7 +58,7 @@ msgid "Schedule Outbox" msgstr "" #: ../../Zotlabs/Storage/Browser.php:164 ../../include/apps.php:360 -#: ../../include/apps.php:415 ../../include/widgets.php:1434 +#: ../../include/apps.php:415 ../../include/widgets.php:1439 #: ../../include/conversation.php:1037 ../../mod/photos.php:766 #: ../../mod/photos.php:1209 msgid "Unknown" @@ -85,7 +85,7 @@ msgid "Create" msgstr "" #: ../../Zotlabs/Storage/Browser.php:231 ../../Zotlabs/Storage/Browser.php:305 -#: ../../include/widgets.php:1447 ../../mod/photos.php:793 +#: ../../include/widgets.php:1452 ../../mod/photos.php:793 #: ../../mod/photos.php:1333 ../../mod/profile_photo.php:401 #: ../../mod/cover_photo.php:353 msgid "Upload" @@ -112,8 +112,8 @@ msgstr "" #: ../../Zotlabs/Storage/Browser.php:240 ../../include/apps.php:259 #: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36 -#: ../../include/menu.php:108 ../../include/identity.php:924 -#: ../../include/identity.php:928 ../../include/ItemObject.php:100 +#: ../../include/menu.php:108 ../../include/ItemObject.php:100 +#: ../../include/identity.php:932 ../../include/identity.php:936 #: ../../mod/blocks.php:153 ../../mod/connections.php:286 #: ../../mod/connections.php:306 ../../mod/editblock.php:135 #: ../../mod/editlayout.php:134 ../../mod/editpost.php:112 @@ -164,7 +164,7 @@ msgstr "" #: ../../include/attach.php:352 ../../include/attach.php:359 #: ../../include/attach.php:437 ../../include/attach.php:889 #: ../../include/attach.php:960 ../../include/attach.php:1112 -#: ../../include/photos.php:29 ../../include/items.php:4573 +#: ../../include/photos.php:29 ../../include/items.php:4660 #: ../../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 @@ -213,8 +213,8 @@ msgid "Page not found." msgstr "" #: ../../include/Contact.php:101 ../../include/widgets.php:147 -#: ../../include/widgets.php:185 ../../include/identity.php:1003 -#: ../../include/conversation.php:961 ../../mod/directory.php:321 +#: ../../include/widgets.php:185 ../../include/conversation.php:961 +#: ../../include/identity.php:1011 ../../mod/directory.php:321 #: ../../mod/match.php:64 ../../mod/suggest.php:52 msgid "Connect" msgstr "" @@ -283,7 +283,7 @@ msgid "Registration request at %s" msgstr "" #: ../../include/account.php:317 ../../include/account.php:344 -#: ../../include/account.php:404 ../../include/network.php:1660 +#: ../../include/account.php:404 ../../include/network.php:1864 msgid "Administrator" msgstr "" @@ -416,7 +416,7 @@ msgstr "" msgid "Channel Home" msgstr "" -#: ../../include/apps.php:138 ../../include/identity.php:1387 +#: ../../include/apps.php:138 ../../include/identity.php:1395 #: ../../mod/profperm.php:112 msgid "Profile" msgstr "" @@ -509,15 +509,15 @@ msgstr "" msgid "Purchase" msgstr "" -#: ../../include/auth.php:132 +#: ../../include/auth.php:105 msgid "Logged out." msgstr "" -#: ../../include/auth.php:273 +#: ../../include/auth.php:246 msgid "Failed authentication" msgstr "" -#: ../../include/auth.php:287 ../../mod/openid.php:189 +#: ../../include/auth.php:260 ../../mod/openid.php:189 msgid "Login failed." msgstr "" @@ -545,7 +545,7 @@ msgid "Finishes:" msgstr "" #: ../../include/bb2diaspora.php:487 ../../include/event.php:52 -#: ../../include/text.php:1433 ../../include/identity.php:1018 +#: ../../include/text.php:1433 ../../include/identity.php:1026 #: ../../mod/directory.php:307 msgid "Location:" msgstr "" @@ -674,8 +674,9 @@ msgstr "" #: ../../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:105 +#: ../../mod/photos.php:634 ../../mod/admin.php:425 ../../mod/profiles.php:647 +#: ../../mod/removeme.php:60 ../../mod/settings.php:588 +#: ../../view/theme/redbasic/php/config.php:105 #: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1555 msgid "No" msgstr "" @@ -687,8 +688,9 @@ msgstr "" #: ../../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:105 +#: ../../mod/photos.php:634 ../../mod/admin.php:427 ../../mod/profiles.php:647 +#: ../../mod/removeme.php:60 ../../mod/settings.php:588 +#: ../../view/theme/redbasic/php/config.php:105 #: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1555 msgid "Yes" msgstr "" @@ -747,7 +749,7 @@ msgstr "" msgid "Channel was deleted and no longer exists." msgstr "" -#: ../../include/follow.php:153 ../../include/follow.php:183 +#: ../../include/follow.php:153 ../../include/follow.php:185 msgid "Protocol disabled." msgstr "" @@ -755,11 +757,11 @@ msgstr "" msgid "Channel discovery failed." msgstr "" -#: ../../include/follow.php:199 +#: ../../include/follow.php:201 msgid "local account not found." msgstr "" -#: ../../include/follow.php:224 +#: ../../include/follow.php:226 msgid "Cannot connect to yourself." msgstr "" @@ -882,7 +884,8 @@ msgid "Unsaved changes. Are you sure you wish to leave this page?" msgstr "" #: ../../include/js_strings.php:25 ../../mod/events.php:459 -#: ../../mod/profiles.php:472 ../../mod/pubsites.php:36 +#: ../../mod/profiles.php:472 ../../mod/profiles.php:697 +#: ../../mod/pubsites.php:36 msgid "Location" msgstr "" @@ -1179,7 +1182,8 @@ msgstr "" msgid "Your profile page" msgstr "" -#: ../../include/nav.php:88 ../../include/identity.php:924 +#: ../../include/nav.php:88 ../../include/identity.php:932 +#: ../../mod/profiles.php:776 msgid "Edit Profiles" msgstr "" @@ -1187,7 +1191,7 @@ msgstr "" msgid "Manage/Edit profiles" msgstr "" -#: ../../include/nav.php:90 ../../include/identity.php:928 +#: ../../include/nav.php:90 ../../include/identity.php:936 msgid "Edit Profile" msgstr "" @@ -1346,7 +1350,7 @@ msgstr "" msgid "Account/Channel Settings" msgstr "" -#: ../../include/nav.php:213 ../../include/widgets.php:1347 +#: ../../include/nav.php:213 ../../include/widgets.php:1350 msgid "Admin" msgstr "" @@ -1746,7 +1750,7 @@ msgstr "" msgid "Tags" msgstr "" -#: ../../include/taxonomy.php:305 ../../mod/profiles.php:717 +#: ../../include/taxonomy.php:305 msgid "Keywords" msgstr "" @@ -1782,8 +1786,8 @@ msgstr "" msgid "dislikes" msgstr "" -#: ../../include/taxonomy.php:415 ../../include/identity.php:1296 -#: ../../include/conversation.php:1756 ../../include/ItemObject.php:179 +#: ../../include/taxonomy.php:415 ../../include/conversation.php:1756 +#: ../../include/ItemObject.php:179 ../../include/identity.php:1304 #: ../../mod/photos.php:1097 msgctxt "noun" msgid "Like" @@ -1791,92 +1795,6 @@ msgid_plural "Likes" msgstr[0] "" msgstr[1] "" -#: ../../include/datetime.php:48 -msgid "Miscellaneous" -msgstr "" - -#: ../../include/datetime.php:132 -msgid "YYYY-MM-DD or MM-DD" -msgstr "" - -#: ../../include/datetime.php:236 ../../mod/appman.php:91 -#: ../../mod/appman.php:92 ../../mod/events.php:444 ../../mod/events.php:449 -msgid "Required" -msgstr "" - -#: ../../include/datetime.php:263 ../../boot.php:2382 -msgid "never" -msgstr "" - -#: ../../include/datetime.php:269 -msgid "less than a second ago" -msgstr "" - -#: ../../include/datetime.php:287 -#, php-format -msgctxt "e.g. 22 hours ago, 1 minute ago" -msgid "%1$d %2$s ago" -msgstr "" - -#: ../../include/datetime.php:298 -msgctxt "relative_date" -msgid "year" -msgid_plural "years" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/datetime.php:301 -msgctxt "relative_date" -msgid "month" -msgid_plural "months" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/datetime.php:304 -msgctxt "relative_date" -msgid "week" -msgid_plural "weeks" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/datetime.php:307 -msgctxt "relative_date" -msgid "day" -msgid_plural "days" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/datetime.php:310 -msgctxt "relative_date" -msgid "hour" -msgid_plural "hours" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/datetime.php:313 -msgctxt "relative_date" -msgid "minute" -msgid_plural "minutes" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/datetime.php:316 -msgctxt "relative_date" -msgid "second" -msgid_plural "seconds" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/datetime.php:553 -#, php-format -msgid "%1$s's birthday" -msgstr "" - -#: ../../include/datetime.php:554 -#, php-format -msgid "Happy Birthday %1$s" -msgstr "" - #: ../../include/zot.php:680 msgid "Invalid data packet" msgstr "" @@ -1885,12 +1803,12 @@ msgstr "" msgid "Unable to verify channel signature" msgstr "" -#: ../../include/zot.php:2326 +#: ../../include/zot.php:2332 #, php-format msgid "Unable to verify site signature for %s" msgstr "" -#: ../../include/zot.php:3661 +#: ../../include/zot.php:3667 msgid "invalid target signature" msgstr "" @@ -2026,24 +1944,24 @@ msgstr "" msgid "view full size" msgstr "" -#: ../../include/network.php:1612 ../../include/enotify.php:57 +#: ../../include/network.php:1816 ../../include/enotify.php:57 msgid "$Projectname Notification" msgstr "" -#: ../../include/network.php:1613 ../../include/enotify.php:58 +#: ../../include/network.php:1817 ../../include/enotify.php:58 msgid "$projectname" msgstr "" -#: ../../include/network.php:1615 ../../include/enotify.php:60 +#: ../../include/network.php:1819 ../../include/enotify.php:60 msgid "Thank You," msgstr "" -#: ../../include/network.php:1617 ../../include/enotify.php:62 +#: ../../include/network.php:1821 ../../include/enotify.php:62 #, php-format msgid "%s Administrator" msgstr "" -#: ../../include/network.php:1674 +#: ../../include/network.php:1878 msgid "No Subject" msgstr "" @@ -2368,6 +2286,7 @@ msgid "System" msgstr "" #: ../../include/widgets.php:105 ../../include/conversation.php:1541 +#: ../../mod/profiles.php:696 msgid "Personal" msgstr "" @@ -2625,6 +2544,10 @@ msgstr "" msgid "Accounts" msgstr "" +#: ../../include/widgets.php:1317 ../../include/widgets.php:1355 +msgid "Member registrations waiting for confirmation" +msgstr "" + #: ../../include/widgets.php:1318 ../../mod/admin.php:1149 msgid "Channels" msgstr "" @@ -2655,25 +2578,21 @@ msgstr "" msgid "DB updates" msgstr "" -#: ../../include/widgets.php:1343 ../../include/widgets.php:1349 +#: ../../include/widgets.php:1343 ../../include/widgets.php:1353 #: ../../mod/admin.php:1605 msgid "Logs" msgstr "" -#: ../../include/widgets.php:1348 +#: ../../include/widgets.php:1351 msgid "Plugin Features" msgstr "" -#: ../../include/widgets.php:1350 -msgid "User registrations waiting for confirmation" -msgstr "" - -#: ../../include/widgets.php:1428 ../../mod/photos.php:760 +#: ../../include/widgets.php:1433 ../../mod/photos.php:760 #: ../../mod/photos.php:1300 msgid "View Photo" msgstr "" -#: ../../include/widgets.php:1445 ../../mod/photos.php:791 +#: ../../include/widgets.php:1450 ../../mod/photos.php:791 msgid "Edit Album" msgstr "" @@ -3139,233 +3058,99 @@ msgstr "" msgid "[Hubzilla:Notify]" msgstr "" -#: ../../include/identity.php:32 -msgid "Unable to obtain identity information from database" -msgstr "" - -#: ../../include/identity.php:66 -msgid "Empty name" -msgstr "" - -#: ../../include/identity.php:69 -msgid "Name too long" -msgstr "" - -#: ../../include/identity.php:181 -msgid "No account identifier" -msgstr "" - -#: ../../include/identity.php:193 -msgid "Nickname is required." -msgstr "" - -#: ../../include/identity.php:207 -msgid "Reserved nickname. Please choose another." -msgstr "" - -#: ../../include/identity.php:212 -msgid "" -"Nickname has unsupported characters or is already being used on this site." -msgstr "" - -#: ../../include/identity.php:288 -msgid "Unable to retrieve created identity" -msgstr "" - -#: ../../include/identity.php:346 -msgid "Default Profile" -msgstr "" - -#: ../../include/identity.php:776 -msgid "Requested channel is not available." -msgstr "" - -#: ../../include/identity.php:822 ../../mod/achievements.php:11 -#: ../../mod/blocks.php:29 ../../mod/connect.php:13 ../../mod/editblock.php:29 -#: ../../mod/editlayout.php:27 ../../mod/editwebpage.php:28 -#: ../../mod/filestorage.php:54 ../../mod/hcard.php:8 ../../mod/layouts.php:29 -#: ../../mod/profile.php:16 ../../mod/webpages.php:29 -msgid "Requested profile is not available." -msgstr "" - -#: ../../include/identity.php:917 ../../mod/profiles.php:795 -msgid "Change profile photo" -msgstr "" - -#: ../../include/identity.php:925 ../../mod/profiles.php:796 -msgid "Create New Profile" -msgstr "" - -#: ../../include/identity.php:942 ../../mod/profiles.php:807 -msgid "Profile Image" -msgstr "" - -#: ../../include/identity.php:945 -msgid "Visible to everybody" -msgstr "" - -#: ../../include/identity.php:946 ../../mod/profiles.php:689 -#: ../../mod/profiles.php:811 -msgid "Edit visibility" -msgstr "" - -#: ../../include/identity.php:1022 ../../include/identity.php:1280 -msgid "Gender:" -msgstr "" - -#: ../../include/identity.php:1023 ../../include/identity.php:1324 -msgid "Status:" -msgstr "" - -#: ../../include/identity.php:1024 ../../include/identity.php:1335 -msgid "Homepage:" -msgstr "" - -#: ../../include/identity.php:1025 -msgid "Online Now" -msgstr "" - -#: ../../include/identity.php:1113 ../../include/identity.php:1191 -#: ../../mod/ping.php:318 -msgid "g A l F d" -msgstr "" - -#: ../../include/identity.php:1114 ../../include/identity.php:1192 -msgid "F d" -msgstr "" - -#: ../../include/identity.php:1159 ../../include/identity.php:1231 -#: ../../mod/ping.php:341 -msgid "[today]" -msgstr "" - -#: ../../include/identity.php:1170 -msgid "Birthday Reminders" -msgstr "" - -#: ../../include/identity.php:1171 -msgid "Birthdays this week:" -msgstr "" - -#: ../../include/identity.php:1224 -msgid "[No description]" -msgstr "" - -#: ../../include/identity.php:1242 -msgid "Event Reminders" -msgstr "" - -#: ../../include/identity.php:1243 -msgid "Events this week:" +#: ../../include/datetime.php:48 ../../mod/profiles.php:699 +msgid "Miscellaneous" msgstr "" -#: ../../include/identity.php:1278 ../../mod/settings.php:1047 -msgid "Full Name:" +#: ../../include/datetime.php:136 +msgid "Birthday" msgstr "" -#: ../../include/identity.php:1285 -msgid "Like this channel" +#: ../../include/datetime.php:138 +msgid "Age: " msgstr "" -#: ../../include/identity.php:1309 -msgid "j F, Y" +#: ../../include/datetime.php:140 +msgid "YYYY-MM-DD or MM-DD" msgstr "" -#: ../../include/identity.php:1310 -msgid "j F" +#: ../../include/datetime.php:246 ../../mod/appman.php:91 +#: ../../mod/appman.php:92 ../../mod/events.php:444 ../../mod/events.php:449 +#: ../../mod/profiles.php:708 ../../mod/profiles.php:712 +msgid "Required" msgstr "" -#: ../../include/identity.php:1317 -msgid "Birthday:" +#: ../../include/datetime.php:273 ../../boot.php:2382 +msgid "never" msgstr "" -#: ../../include/identity.php:1321 ../../mod/directory.php:302 -msgid "Age:" +#: ../../include/datetime.php:279 +msgid "less than a second ago" msgstr "" -#: ../../include/identity.php:1330 +#: ../../include/datetime.php:297 #, php-format -msgid "for %1$d %2$s" -msgstr "" - -#: ../../include/identity.php:1333 -msgid "Sexual Preference:" -msgstr "" - -#: ../../include/identity.php:1337 ../../mod/directory.php:318 -msgid "Hometown:" -msgstr "" - -#: ../../include/identity.php:1339 -msgid "Tags:" -msgstr "" - -#: ../../include/identity.php:1341 -msgid "Political Views:" -msgstr "" - -#: ../../include/identity.php:1343 -msgid "Religion:" -msgstr "" - -#: ../../include/identity.php:1345 ../../mod/directory.php:320 -msgid "About:" -msgstr "" - -#: ../../include/identity.php:1347 -msgid "Hobbies/Interests:" -msgstr "" - -#: ../../include/identity.php:1349 -msgid "Likes:" -msgstr "" - -#: ../../include/identity.php:1351 -msgid "Dislikes:" -msgstr "" - -#: ../../include/identity.php:1353 -msgid "Contact information and Social Networks:" -msgstr "" - -#: ../../include/identity.php:1355 -msgid "My other channels:" +msgctxt "e.g. 22 hours ago, 1 minute ago" +msgid "%1$d %2$s ago" msgstr "" -#: ../../include/identity.php:1357 -msgid "Musical interests:" -msgstr "" +#: ../../include/datetime.php:308 +msgctxt "relative_date" +msgid "year" +msgid_plural "years" +msgstr[0] "" +msgstr[1] "" -#: ../../include/identity.php:1359 -msgid "Books, literature:" -msgstr "" +#: ../../include/datetime.php:311 +msgctxt "relative_date" +msgid "month" +msgid_plural "months" +msgstr[0] "" +msgstr[1] "" -#: ../../include/identity.php:1361 -msgid "Television:" -msgstr "" +#: ../../include/datetime.php:314 +msgctxt "relative_date" +msgid "week" +msgid_plural "weeks" +msgstr[0] "" +msgstr[1] "" -#: ../../include/identity.php:1363 -msgid "Film/dance/culture/entertainment:" -msgstr "" +#: ../../include/datetime.php:317 +msgctxt "relative_date" +msgid "day" +msgid_plural "days" +msgstr[0] "" +msgstr[1] "" -#: ../../include/identity.php:1365 -msgid "Love/Romance:" -msgstr "" +#: ../../include/datetime.php:320 +msgctxt "relative_date" +msgid "hour" +msgid_plural "hours" +msgstr[0] "" +msgstr[1] "" -#: ../../include/identity.php:1367 -msgid "Work/employment:" -msgstr "" +#: ../../include/datetime.php:323 +msgctxt "relative_date" +msgid "minute" +msgid_plural "minutes" +msgstr[0] "" +msgstr[1] "" -#: ../../include/identity.php:1369 -msgid "School/education:" -msgstr "" +#: ../../include/datetime.php:326 +msgctxt "relative_date" +msgid "second" +msgid_plural "seconds" +msgstr[0] "" +msgstr[1] "" -#: ../../include/identity.php:1389 -msgid "Like this thing" +#: ../../include/datetime.php:563 +#, php-format +msgid "%1$s's birthday" msgstr "" -#: ../../include/identity.php:1799 ../../mod/cover_photo.php:236 -msgid "cover photo" +#: ../../include/datetime.php:564 +#, php-format +msgid "Happy Birthday %1$s" msgstr "" #: ../../include/oembed.php:267 @@ -4250,62 +4035,291 @@ msgstr "" msgid "Visible to specific connections." msgstr "" -#: ../../include/items.php:4494 ../../mod/display.php:36 +#: ../../include/items.php:4581 ../../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 "" -#: ../../include/items.php:5030 ../../mod/group.php:38 ../../mod/group.php:137 +#: ../../include/items.php:5117 ../../mod/group.php:38 ../../mod/group.php:137 msgid "Privacy group not found." msgstr "" -#: ../../include/items.php:5046 +#: ../../include/items.php:5133 msgid "Privacy group is empty." msgstr "" -#: ../../include/items.php:5053 +#: ../../include/items.php:5140 #, php-format msgid "Privacy group: %s" msgstr "" -#: ../../include/items.php:5063 ../../mod/connedit.php:701 +#: ../../include/items.php:5150 ../../mod/connedit.php:701 #, php-format msgid "Connection: %s" msgstr "" -#: ../../include/items.php:5065 +#: ../../include/items.php:5152 msgid "Connection not found." msgstr "" -#: ../../include/items.php:5491 ../../mod/cover_photo.php:229 +#: ../../include/items.php:5578 ../../mod/cover_photo.php:229 msgid "female" msgstr "" -#: ../../include/items.php:5492 ../../mod/cover_photo.php:230 +#: ../../include/items.php:5579 ../../mod/cover_photo.php:230 #, php-format msgid "%1$s updated her %2$s" msgstr "" -#: ../../include/items.php:5493 ../../mod/cover_photo.php:231 +#: ../../include/items.php:5580 ../../mod/cover_photo.php:231 msgid "male" msgstr "" -#: ../../include/items.php:5494 ../../mod/cover_photo.php:232 +#: ../../include/items.php:5581 ../../mod/cover_photo.php:232 #, php-format msgid "%1$s updated his %2$s" msgstr "" -#: ../../include/items.php:5496 ../../mod/cover_photo.php:234 +#: ../../include/items.php:5583 ../../mod/cover_photo.php:234 #, php-format msgid "%1$s updated their %2$s" msgstr "" -#: ../../include/items.php:5498 +#: ../../include/items.php:5585 msgid "profile photo" msgstr "" +#: ../../include/identity.php:32 +msgid "Unable to obtain identity information from database" +msgstr "" + +#: ../../include/identity.php:66 +msgid "Empty name" +msgstr "" + +#: ../../include/identity.php:69 +msgid "Name too long" +msgstr "" + +#: ../../include/identity.php:181 +msgid "No account identifier" +msgstr "" + +#: ../../include/identity.php:193 +msgid "Nickname is required." +msgstr "" + +#: ../../include/identity.php:207 +msgid "Reserved nickname. Please choose another." +msgstr "" + +#: ../../include/identity.php:212 +msgid "" +"Nickname has unsupported characters or is already being used on this site." +msgstr "" + +#: ../../include/identity.php:288 +msgid "Unable to retrieve created identity" +msgstr "" + +#: ../../include/identity.php:346 +msgid "Default Profile" +msgstr "" + +#: ../../include/identity.php:784 +msgid "Requested channel is not available." +msgstr "" + +#: ../../include/identity.php:830 ../../mod/achievements.php:11 +#: ../../mod/blocks.php:29 ../../mod/connect.php:13 ../../mod/editblock.php:29 +#: ../../mod/editlayout.php:27 ../../mod/editwebpage.php:28 +#: ../../mod/filestorage.php:54 ../../mod/hcard.php:8 ../../mod/layouts.php:29 +#: ../../mod/profile.php:16 ../../mod/webpages.php:29 +msgid "Requested profile is not available." +msgstr "" + +#: ../../include/identity.php:925 ../../mod/profiles.php:691 +msgid "Change profile photo" +msgstr "" + +#: ../../include/identity.php:933 +msgid "Create New Profile" +msgstr "" + +#: ../../include/identity.php:950 ../../mod/profiles.php:766 +msgid "Profile Image" +msgstr "" + +#: ../../include/identity.php:953 +msgid "Visible to everybody" +msgstr "" + +#: ../../include/identity.php:954 ../../mod/profiles.php:689 +#: ../../mod/profiles.php:770 +msgid "Edit visibility" +msgstr "" + +#: ../../include/identity.php:1030 ../../include/identity.php:1288 +msgid "Gender:" +msgstr "" + +#: ../../include/identity.php:1031 ../../include/identity.php:1332 +msgid "Status:" +msgstr "" + +#: ../../include/identity.php:1032 ../../include/identity.php:1343 +msgid "Homepage:" +msgstr "" + +#: ../../include/identity.php:1033 +msgid "Online Now" +msgstr "" + +#: ../../include/identity.php:1121 ../../include/identity.php:1199 +#: ../../mod/ping.php:318 +msgid "g A l F d" +msgstr "" + +#: ../../include/identity.php:1122 ../../include/identity.php:1200 +msgid "F d" +msgstr "" + +#: ../../include/identity.php:1167 ../../include/identity.php:1239 +#: ../../mod/ping.php:341 +msgid "[today]" +msgstr "" + +#: ../../include/identity.php:1178 +msgid "Birthday Reminders" +msgstr "" + +#: ../../include/identity.php:1179 +msgid "Birthdays this week:" +msgstr "" + +#: ../../include/identity.php:1232 +msgid "[No description]" +msgstr "" + +#: ../../include/identity.php:1250 +msgid "Event Reminders" +msgstr "" + +#: ../../include/identity.php:1251 +msgid "Events this week:" +msgstr "" + +#: ../../include/identity.php:1286 ../../mod/settings.php:1047 +msgid "Full Name:" +msgstr "" + +#: ../../include/identity.php:1293 +msgid "Like this channel" +msgstr "" + +#: ../../include/identity.php:1317 +msgid "j F, Y" +msgstr "" + +#: ../../include/identity.php:1318 +msgid "j F" +msgstr "" + +#: ../../include/identity.php:1325 +msgid "Birthday:" +msgstr "" + +#: ../../include/identity.php:1329 ../../mod/directory.php:302 +msgid "Age:" +msgstr "" + +#: ../../include/identity.php:1338 +#, php-format +msgid "for %1$d %2$s" +msgstr "" + +#: ../../include/identity.php:1341 +msgid "Sexual Preference:" +msgstr "" + +#: ../../include/identity.php:1345 ../../mod/directory.php:318 +msgid "Hometown:" +msgstr "" + +#: ../../include/identity.php:1347 +msgid "Tags:" +msgstr "" + +#: ../../include/identity.php:1349 +msgid "Political Views:" +msgstr "" + +#: ../../include/identity.php:1351 +msgid "Religion:" +msgstr "" + +#: ../../include/identity.php:1353 ../../mod/directory.php:320 +msgid "About:" +msgstr "" + +#: ../../include/identity.php:1355 +msgid "Hobbies/Interests:" +msgstr "" + +#: ../../include/identity.php:1357 +msgid "Likes:" +msgstr "" + +#: ../../include/identity.php:1359 +msgid "Dislikes:" +msgstr "" + +#: ../../include/identity.php:1361 +msgid "Contact information and Social Networks:" +msgstr "" + +#: ../../include/identity.php:1363 +msgid "My other channels:" +msgstr "" + +#: ../../include/identity.php:1365 +msgid "Musical interests:" +msgstr "" + +#: ../../include/identity.php:1367 +msgid "Books, literature:" +msgstr "" + +#: ../../include/identity.php:1369 +msgid "Television:" +msgstr "" + +#: ../../include/identity.php:1371 +msgid "Film/dance/culture/entertainment:" +msgstr "" + +#: ../../include/identity.php:1373 +msgid "Love/Romance:" +msgstr "" + +#: ../../include/identity.php:1375 +msgid "Work/employment:" +msgstr "" + +#: ../../include/identity.php:1377 +msgid "School/education:" +msgstr "" + +#: ../../include/identity.php:1397 +msgid "Like this thing" +msgstr "" + +#: ../../include/identity.php:1807 ../../mod/cover_photo.php:236 +msgid "cover photo" +msgstr "" + #: ../../mod/achievements.php:34 msgid "Some blurb about what to do when you're new here" msgstr "" @@ -5455,7 +5469,7 @@ msgstr "" msgid "Timezone" msgstr "" -#: ../../mod/id.php:27 ../../mod/profiles.php:713 +#: ../../mod/id.php:27 ../../mod/profiles.php:730 msgid "Homepage URL" msgstr "" @@ -7494,15 +7508,15 @@ msgstr "" msgid "Romantic Partner" msgstr "" -#: ../../mod/profiles.php:430 ../../mod/profiles.php:718 +#: ../../mod/profiles.php:430 ../../mod/profiles.php:735 msgid "Likes" msgstr "" -#: ../../mod/profiles.php:434 ../../mod/profiles.php:719 +#: ../../mod/profiles.php:434 ../../mod/profiles.php:736 msgid "Dislikes" msgstr "" -#: ../../mod/profiles.php:438 +#: ../../mod/profiles.php:438 ../../mod/profiles.php:743 msgid "Work/Employment" msgstr "" @@ -7510,11 +7524,11 @@ msgstr "" msgid "Religion" msgstr "" -#: ../../mod/profiles.php:445 ../../mod/profiles.php:715 +#: ../../mod/profiles.php:445 msgid "Political Views" msgstr "" -#: ../../mod/profiles.php:453 ../../mod/profiles.php:712 +#: ../../mod/profiles.php:453 msgid "Sexual Preference" msgstr "" @@ -7530,8 +7544,8 @@ msgstr "" msgid "Profile updated." msgstr "" -#: ../../mod/profiles.php:646 -msgid "Hide your contact/friend list from viewers of this profile?" +#: ../../mod/profiles.php:644 +msgid "Hide your connections list from viewers of this profile" msgstr "" #: ../../mod/profiles.php:686 @@ -7543,11 +7557,7 @@ msgid "View this profile" msgstr "" #: ../../mod/profiles.php:690 -msgid "Change Cover Photo" -msgstr "" - -#: ../../mod/profiles.php:691 -msgid "Change Profile Photo" +msgid "Change cover photo" msgstr "" #: ../../mod/profiles.php:692 @@ -7562,148 +7572,144 @@ msgstr "" msgid "Delete this profile" msgstr "" -#: ../../mod/profiles.php:696 -msgid "Import profile from file" -msgstr "" - -#: ../../mod/profiles.php:697 -msgid "Export profile to file" +#: ../../mod/profiles.php:695 +msgid "Add profile things" msgstr "" #: ../../mod/profiles.php:698 -msgid "Profile Name" -msgstr "" - -#: ../../mod/profiles.php:699 -msgid "Your Full Name" -msgstr "" - -#: ../../mod/profiles.php:700 -msgid "Title/Description" +msgid "Relation" msgstr "" #: ../../mod/profiles.php:701 -msgid "Your Gender" +msgid "Import profile from file" msgstr "" #: ../../mod/profiles.php:702 -msgid "Birthday" +msgid "Export profile to file" msgstr "" #: ../../mod/profiles.php:703 -msgid "Street Address" +msgid "Your gender" msgstr "" #: ../../mod/profiles.php:704 -msgid "Locality/City" +msgid "Marital status" msgstr "" #: ../../mod/profiles.php:705 -msgid "Postal/Zip Code" +msgid "Sexual preference" msgstr "" -#: ../../mod/profiles.php:706 -msgid "Country" +#: ../../mod/profiles.php:708 +msgid "Profile name" msgstr "" -#: ../../mod/profiles.php:707 -msgid "Region/State" +#: ../../mod/profiles.php:710 +msgid "This is your default profile." msgstr "" -#: ../../mod/profiles.php:708 -msgid "<span class=\"heart\">♥</span> Marital Status" +#: ../../mod/profiles.php:712 +msgid "Your full name" msgstr "" -#: ../../mod/profiles.php:709 -msgid "Who (if applicable)" +#: ../../mod/profiles.php:713 +msgid "Title/Description" msgstr "" -#: ../../mod/profiles.php:710 -msgid "Examples: cathy123, Cathy Williams, cathy@example.com" +#: ../../mod/profiles.php:716 +msgid "Street address" msgstr "" -#: ../../mod/profiles.php:711 -msgid "Since [date]" +#: ../../mod/profiles.php:717 +msgid "Locality/City" msgstr "" -#: ../../mod/profiles.php:714 -msgid "Hometown" +#: ../../mod/profiles.php:718 +msgid "Region/State" msgstr "" -#: ../../mod/profiles.php:716 -msgid "Religious Views" +#: ../../mod/profiles.php:719 +msgid "Postal/Zip code" msgstr "" #: ../../mod/profiles.php:720 -msgid "Example: fishing photography software" +msgid "Country" msgstr "" -#: ../../mod/profiles.php:721 -msgid "Used in directory listings" +#: ../../mod/profiles.php:725 +msgid "Who (if applicable)" msgstr "" -#: ../../mod/profiles.php:722 -msgid "Tell us about yourself..." +#: ../../mod/profiles.php:725 +msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "" -#: ../../mod/profiles.php:723 -msgid "Hobbies/Interests" +#: ../../mod/profiles.php:726 +msgid "Since (date)" msgstr "" -#: ../../mod/profiles.php:724 -msgid "Contact information and Social Networks" +#: ../../mod/profiles.php:729 +msgid "Tell us about yourself" msgstr "" -#: ../../mod/profiles.php:725 -msgid "My other channels" +#: ../../mod/profiles.php:731 +msgid "Hometown" msgstr "" -#: ../../mod/profiles.php:726 -msgid "Musical interests" +#: ../../mod/profiles.php:732 +msgid "Political views" msgstr "" -#: ../../mod/profiles.php:727 -msgid "Books, literature" +#: ../../mod/profiles.php:733 +msgid "Religious views" msgstr "" -#: ../../mod/profiles.php:728 -msgid "Television" +#: ../../mod/profiles.php:734 +msgid "Keywords used in directory listings" msgstr "" -#: ../../mod/profiles.php:729 -msgid "Film/dance/culture/entertainment" +#: ../../mod/profiles.php:734 +msgid "Example: fishing photography software" msgstr "" -#: ../../mod/profiles.php:730 -msgid "Love/romance" +#: ../../mod/profiles.php:737 +msgid "Musical interests" msgstr "" -#: ../../mod/profiles.php:731 -msgid "Work/employment" +#: ../../mod/profiles.php:738 +msgid "Books, literature" msgstr "" -#: ../../mod/profiles.php:732 -msgid "School/education" +#: ../../mod/profiles.php:739 +msgid "Television" msgstr "" -#: ../../mod/profiles.php:738 -msgid "This is your default profile." +#: ../../mod/profiles.php:740 +msgid "Film/Dance/Culture/Entertainment" msgstr "" -#: ../../mod/profiles.php:749 -msgid "Age: " +#: ../../mod/profiles.php:741 +msgid "Hobbies/Interests" msgstr "" -#: ../../mod/profiles.php:792 -msgid "Edit/Manage Profiles" +#: ../../mod/profiles.php:742 +msgid "Love/Romance" msgstr "" -#: ../../mod/profiles.php:793 -msgid "Add profile things" +#: ../../mod/profiles.php:744 +msgid "School/Education" +msgstr "" + +#: ../../mod/profiles.php:745 +msgid "Contact information and social networks" +msgstr "" + +#: ../../mod/profiles.php:746 +msgid "My other channels" msgstr "" -#: ../../mod/profiles.php:794 -msgid "Include desirable objects in your profile" +#: ../../mod/profiles.php:777 +msgid "Create New" msgstr "" #: ../../mod/profperm.php:29 ../../mod/profperm.php:58 diff --git a/version.inc b/version.inc index 921108423..c21e13b14 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2016-03-17.1338H +2016-03-23.1344H diff --git a/view/css/mod_manage.css b/view/css/mod_manage.css index fbe4a672a..077b6b838 100644 --- a/view/css/mod_manage.css +++ b/view/css/mod_manage.css @@ -1,57 +1,34 @@ -#channels-selected { - color: #666666; - font-size: 0.8em; +.make-default-link, +.make-default-link:hover { + color: inherit; + text-decoration: none; } -#channels-desc { - color: #666666; - font-size: 1.2em; - margin-top: 15px; - margin-bottom: 20px; -} - -.channels-break { - margin-bottom: 15px; -} - -.channel-selection-default { - font-size: 0.8em; - margin-bottom: 10px; +.new-notification { + color: #c60032; } -.channel-selection { - width: 12em; - height: 16em; - float: left; - text-align: center; +.channel-photo-wrapper { + display: table-cell; + table-layout: fixed; + vertical-align: top; } -.channel-selection img { - display: block; - margin-left: auto; - margin-right: auto; +.channel-photo-wrapper img { + border-radius: 4px; } -.channel-selection-name-link { - font-size: 1.2em; - margin-top: 10px; +.channel-notifications-wrapper { + display: table-cell; + table-layout: fixed; + vertical-align: top; + padding-left: 10px; } -.channel-selection-name-link .channel-name { - padding-top: 10px; - word-wrap: break-word; - overflow: hidden; +.selected-channel { + color: green; } -.channels-notifications-wrapper { - clear: both; - padding-top: 10px; -} - -.selected-channel img { - border: 2px solid #ff0000; +#all-channels-end { + margin-bottom: 20px; } - -.channels-end { - clear: both; -}
\ No newline at end of file diff --git a/view/es-es/hmessages.po b/view/es-es/hmessages.po index 942656112..e55530bf5 100644 --- a/view/es-es/hmessages.po +++ b/view/es-es/hmessages.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: Redmatrix\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-11 00:03-0800\n" -"PO-Revision-Date: 2016-03-13 12:23+0000\n" +"POT-Creation-Date: 2016-03-18 00:03-0700\n" +"PO-Revision-Date: 2016-03-20 10:32+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" @@ -64,7 +64,7 @@ msgid "Schedule Outbox" msgstr "Programar bandeja de salida" #: ../../Zotlabs/Storage/Browser.php:164 ../../include/apps.php:360 -#: ../../include/apps.php:415 ../../include/widgets.php:1434 +#: ../../include/apps.php:415 ../../include/widgets.php:1439 #: ../../include/conversation.php:1037 ../../mod/photos.php:766 #: ../../mod/photos.php:1209 msgid "Unknown" @@ -91,7 +91,7 @@ msgid "Create" msgstr "Crear" #: ../../Zotlabs/Storage/Browser.php:231 ../../Zotlabs/Storage/Browser.php:305 -#: ../../include/widgets.php:1447 ../../mod/photos.php:793 +#: ../../include/widgets.php:1452 ../../mod/photos.php:793 #: ../../mod/photos.php:1333 ../../mod/profile_photo.php:401 #: ../../mod/cover_photo.php:353 msgid "Upload" @@ -118,8 +118,8 @@ msgstr "Última modificación" #: ../../Zotlabs/Storage/Browser.php:240 ../../include/apps.php:259 #: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36 -#: ../../include/menu.php:108 ../../include/identity.php:924 -#: ../../include/identity.php:928 ../../include/ItemObject.php:100 +#: ../../include/menu.php:108 ../../include/ItemObject.php:100 +#: ../../include/identity.php:932 ../../include/identity.php:936 #: ../../mod/blocks.php:153 ../../mod/connections.php:286 #: ../../mod/connections.php:306 ../../mod/editblock.php:135 #: ../../mod/editlayout.php:134 ../../mod/editpost.php:112 @@ -170,7 +170,7 @@ msgstr "Subir fichero" #: ../../include/attach.php:352 ../../include/attach.php:359 #: ../../include/attach.php:437 ../../include/attach.php:889 #: ../../include/attach.php:960 ../../include/attach.php:1112 -#: ../../include/photos.php:29 ../../include/items.php:4573 +#: ../../include/photos.php:29 ../../include/items.php:4660 #: ../../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 @@ -219,8 +219,8 @@ msgid "Page not found." msgstr "Página no encontrada." #: ../../include/Contact.php:101 ../../include/widgets.php:147 -#: ../../include/widgets.php:185 ../../include/identity.php:1003 -#: ../../include/conversation.php:961 ../../mod/directory.php:321 +#: ../../include/widgets.php:185 ../../include/conversation.php:961 +#: ../../include/identity.php:1011 ../../mod/directory.php:321 #: ../../mod/match.php:64 ../../mod/suggest.php:52 msgid "Connect" msgstr "Conectar" @@ -289,7 +289,7 @@ msgid "Registration request at %s" msgstr "Solicitud de registro en %s" #: ../../include/account.php:317 ../../include/account.php:344 -#: ../../include/account.php:404 ../../include/network.php:1660 +#: ../../include/account.php:404 ../../include/network.php:1864 msgid "Administrator" msgstr "Administrador" @@ -422,7 +422,7 @@ msgstr "Páginas web" msgid "Channel Home" msgstr "Mi canal" -#: ../../include/apps.php:138 ../../include/identity.php:1387 +#: ../../include/apps.php:138 ../../include/identity.php:1395 #: ../../mod/profperm.php:112 msgid "Profile" msgstr "Perfil" @@ -515,15 +515,15 @@ msgstr "Instalar" msgid "Purchase" msgstr "Comprar" -#: ../../include/auth.php:132 +#: ../../include/auth.php:105 msgid "Logged out." msgstr "Desconectado/a." -#: ../../include/auth.php:273 +#: ../../include/auth.php:246 msgid "Failed authentication" msgstr "Autenticación fallida." -#: ../../include/auth.php:287 ../../mod/openid.php:189 +#: ../../include/auth.php:260 ../../mod/openid.php:189 msgid "Login failed." msgstr "El acceso ha fallado." @@ -551,7 +551,7 @@ msgid "Finishes:" msgstr "Finaliza:" #: ../../include/bb2diaspora.php:487 ../../include/event.php:52 -#: ../../include/text.php:1433 ../../include/identity.php:1018 +#: ../../include/text.php:1433 ../../include/identity.php:1026 #: ../../mod/directory.php:307 msgid "Location:" msgstr "Ubicación:" @@ -680,8 +680,9 @@ msgstr "Modo seguro" #: ../../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:105 +#: ../../mod/photos.php:634 ../../mod/admin.php:425 ../../mod/profiles.php:647 +#: ../../mod/removeme.php:60 ../../mod/settings.php:588 +#: ../../view/theme/redbasic/php/config.php:105 #: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1555 msgid "No" msgstr "No" @@ -693,8 +694,9 @@ msgstr "No" #: ../../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:105 +#: ../../mod/photos.php:634 ../../mod/admin.php:427 ../../mod/profiles.php:647 +#: ../../mod/removeme.php:60 ../../mod/settings.php:588 +#: ../../view/theme/redbasic/php/config.php:105 #: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1555 msgid "Yes" msgstr "SÃ" @@ -753,7 +755,7 @@ msgstr "Respuesta incompleta del canal." msgid "Channel was deleted and no longer exists." msgstr "El canal ha sido eliminado y ya no existe." -#: ../../include/follow.php:153 ../../include/follow.php:183 +#: ../../include/follow.php:153 ../../include/follow.php:185 msgid "Protocol disabled." msgstr "Protocolo deshabilitado." @@ -761,11 +763,11 @@ msgstr "Protocolo deshabilitado." msgid "Channel discovery failed." msgstr "El intento de acceder al canal ha fallado." -#: ../../include/follow.php:199 +#: ../../include/follow.php:201 msgid "local account not found." msgstr "No se ha encontrado la cuenta local." -#: ../../include/follow.php:224 +#: ../../include/follow.php:226 msgid "Cannot connect to yourself." msgstr "No puede conectarse consigo mismo." @@ -888,7 +890,8 @@ msgid "Unsaved changes. Are you sure you wish to leave this page?" msgstr "Cambios no guardados. ¿Está seguro de que desea abandonar la página?" #: ../../include/js_strings.php:25 ../../mod/events.php:459 -#: ../../mod/profiles.php:472 ../../mod/pubsites.php:36 +#: ../../mod/profiles.php:472 ../../mod/profiles.php:697 +#: ../../mod/pubsites.php:36 msgid "Location" msgstr "Ubicación" @@ -1185,7 +1188,8 @@ msgstr "Ver el perfil" msgid "Your profile page" msgstr "Su página del perfil" -#: ../../include/nav.php:88 ../../include/identity.php:924 +#: ../../include/nav.php:88 ../../include/identity.php:932 +#: ../../mod/profiles.php:776 msgid "Edit Profiles" msgstr "Editar perfiles" @@ -1193,7 +1197,7 @@ msgstr "Editar perfiles" msgid "Manage/Edit profiles" msgstr "Administrar/editar perfiles" -#: ../../include/nav.php:90 ../../include/identity.php:928 +#: ../../include/nav.php:90 ../../include/identity.php:936 msgid "Edit Profile" msgstr "Editar el perfil" @@ -1352,7 +1356,7 @@ msgstr "Gestionar sus canales" msgid "Account/Channel Settings" msgstr "Ajustes de cuenta/canales" -#: ../../include/nav.php:213 ../../include/widgets.php:1347 +#: ../../include/nav.php:213 ../../include/widgets.php:1350 msgid "Admin" msgstr "Administrador" @@ -1752,7 +1756,7 @@ msgstr "El \"token\" de seguridad del formulario no es correcto. Esto ha ocurrid msgid "Tags" msgstr "Etiquetas" -#: ../../include/taxonomy.php:305 ../../mod/profiles.php:717 +#: ../../include/taxonomy.php:305 msgid "Keywords" msgstr "Palabras clave" @@ -1788,8 +1792,8 @@ msgstr "no me gusta" msgid "dislikes" msgstr "no gusta de" -#: ../../include/taxonomy.php:415 ../../include/identity.php:1296 -#: ../../include/conversation.php:1756 ../../include/ItemObject.php:179 +#: ../../include/taxonomy.php:415 ../../include/conversation.php:1756 +#: ../../include/ItemObject.php:179 ../../include/identity.php:1304 #: ../../mod/photos.php:1097 msgctxt "noun" msgid "Like" @@ -1797,92 +1801,6 @@ 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:2382 -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:680 msgid "Invalid data packet" msgstr "Paquete de datos no válido" @@ -1891,12 +1809,12 @@ msgstr "Paquete de datos no válido" msgid "Unable to verify channel signature" msgstr "No ha sido posible de verificar la firma del canal" -#: ../../include/zot.php:2326 +#: ../../include/zot.php:2332 #, php-format msgid "Unable to verify site signature for %s" msgstr "No ha sido posible de verificar la firma del sitio para %s" -#: ../../include/zot.php:3661 +#: ../../include/zot.php:3667 msgid "invalid target signature" msgstr "La firma recibida no es válida" @@ -2032,24 +1950,24 @@ msgstr "MySpace" msgid "view full size" msgstr "Ver en el tamaño original" -#: ../../include/network.php:1612 ../../include/enotify.php:57 +#: ../../include/network.php:1816 ../../include/enotify.php:57 msgid "$Projectname Notification" msgstr "Notificación de $Projectname" -#: ../../include/network.php:1613 ../../include/enotify.php:58 +#: ../../include/network.php:1817 ../../include/enotify.php:58 msgid "$projectname" msgstr "$projectname" -#: ../../include/network.php:1615 ../../include/enotify.php:60 +#: ../../include/network.php:1819 ../../include/enotify.php:60 msgid "Thank You," msgstr "Gracias," -#: ../../include/network.php:1617 ../../include/enotify.php:62 +#: ../../include/network.php:1821 ../../include/enotify.php:62 #, php-format msgid "%s Administrator" msgstr "%s Administrador" -#: ../../include/network.php:1674 +#: ../../include/network.php:1878 msgid "No Subject" msgstr "Sin asunto" @@ -2374,6 +2292,7 @@ msgid "System" msgstr "Sistema" #: ../../include/widgets.php:105 ../../include/conversation.php:1541 +#: ../../mod/profiles.php:696 msgid "Personal" msgstr "Personales" @@ -2631,6 +2550,10 @@ msgstr "Sitio" msgid "Accounts" msgstr "Cuentas" +#: ../../include/widgets.php:1317 ../../include/widgets.php:1355 +msgid "Member registrations waiting for confirmation" +msgstr "Inscripciones en espera de aprobación" + #: ../../include/widgets.php:1318 ../../mod/admin.php:1149 msgid "Channels" msgstr "Canales" @@ -2661,25 +2584,21 @@ msgstr "Campos del perfil" msgid "DB updates" msgstr "Actualizaciones de la base de datos" -#: ../../include/widgets.php:1343 ../../include/widgets.php:1349 +#: ../../include/widgets.php:1343 ../../include/widgets.php:1353 #: ../../mod/admin.php:1605 msgid "Logs" msgstr "Informes" -#: ../../include/widgets.php:1348 +#: ../../include/widgets.php:1351 msgid "Plugin Features" msgstr "Extensiones" -#: ../../include/widgets.php:1350 -msgid "User registrations waiting for confirmation" -msgstr "Registros de usuarios pendientes de confirmación" - -#: ../../include/widgets.php:1428 ../../mod/photos.php:760 +#: ../../include/widgets.php:1433 ../../mod/photos.php:760 #: ../../mod/photos.php:1300 msgid "View Photo" msgstr "Ver foto" -#: ../../include/widgets.php:1445 ../../mod/photos.php:791 +#: ../../include/widgets.php:1450 ../../mod/photos.php:791 msgid "Edit Album" msgstr "Editar álbum" @@ -3146,234 +3065,100 @@ msgstr "Por favor, visite %s para aprobar o rechazar la sugerencia." msgid "[Hubzilla:Notify]" msgstr "[Hubzilla:Aviso]" -#: ../../include/identity.php:32 -msgid "Unable to obtain identity information from database" -msgstr "No ha sido posible obtener información sobre la identidad desde la base de datos" - -#: ../../include/identity.php:66 -msgid "Empty name" -msgstr "Nombre vacÃo" - -#: ../../include/identity.php:69 -msgid "Name too long" -msgstr "Nombre demasiado largo" - -#: ../../include/identity.php:181 -msgid "No account identifier" -msgstr "Ningún identificador de la cuenta" - -#: ../../include/identity.php:193 -msgid "Nickname is required." -msgstr "Se requiere un sobrenombre (alias)." - -#: ../../include/identity.php:207 -msgid "Reserved nickname. Please choose another." -msgstr "Sobrenombre en uso. Por favor, elija otro." - -#: ../../include/identity.php:212 -msgid "" -"Nickname has unsupported characters or is already being used on this site." -msgstr "El alias contiene caracteres no admitidos o está ya en uso por otros usuarios de este sitio." - -#: ../../include/identity.php:288 -msgid "Unable to retrieve created identity" -msgstr "No ha sido posible recuperar la identidad creada" - -#: ../../include/identity.php:346 -msgid "Default Profile" -msgstr "Perfil principal" - -#: ../../include/identity.php:776 -msgid "Requested channel is not available." -msgstr "El canal solicitado no está disponible." - -#: ../../include/identity.php:822 ../../mod/achievements.php:11 -#: ../../mod/blocks.php:29 ../../mod/connect.php:13 ../../mod/editblock.php:29 -#: ../../mod/editlayout.php:27 ../../mod/editwebpage.php:28 -#: ../../mod/filestorage.php:54 ../../mod/hcard.php:8 ../../mod/layouts.php:29 -#: ../../mod/profile.php:16 ../../mod/webpages.php:29 -msgid "Requested profile is not available." -msgstr "El perfil solicitado no está disponible." - -#: ../../include/identity.php:917 ../../mod/profiles.php:795 -msgid "Change profile photo" -msgstr "Cambiar la foto del perfil" - -#: ../../include/identity.php:925 ../../mod/profiles.php:796 -msgid "Create New Profile" -msgstr "Crear un nuevo perfil" - -#: ../../include/identity.php:942 ../../mod/profiles.php:807 -msgid "Profile Image" -msgstr "Imagen del perfil" - -#: ../../include/identity.php:945 -msgid "Visible to everybody" -msgstr "Visible para todos" - -#: ../../include/identity.php:946 ../../mod/profiles.php:689 -#: ../../mod/profiles.php:811 -msgid "Edit visibility" -msgstr "Editar visibilidad" - -#: ../../include/identity.php:1022 ../../include/identity.php:1280 -msgid "Gender:" -msgstr "Género:" - -#: ../../include/identity.php:1023 ../../include/identity.php:1324 -msgid "Status:" -msgstr "Estado:" - -#: ../../include/identity.php:1024 ../../include/identity.php:1335 -msgid "Homepage:" -msgstr "Página personal:" - -#: ../../include/identity.php:1025 -msgid "Online Now" -msgstr "Ahora en lÃnea" - -#: ../../include/identity.php:1113 ../../include/identity.php:1191 -#: ../../mod/ping.php:318 -msgid "g A l F d" -msgstr "g A l d F" - -#: ../../include/identity.php:1114 ../../include/identity.php:1192 -msgid "F d" -msgstr "d F" - -#: ../../include/identity.php:1159 ../../include/identity.php:1231 -#: ../../mod/ping.php:341 -msgid "[today]" -msgstr "[hoy]" - -#: ../../include/identity.php:1170 -msgid "Birthday Reminders" -msgstr "Recordatorios de cumpleaños" - -#: ../../include/identity.php:1171 -msgid "Birthdays this week:" -msgstr "Cumpleaños de esta semana:" - -#: ../../include/identity.php:1224 -msgid "[No description]" -msgstr "[Sin descripción]" - -#: ../../include/identity.php:1242 -msgid "Event Reminders" -msgstr "Recordatorios de eventos" - -#: ../../include/identity.php:1243 -msgid "Events this week:" -msgstr "Eventos de esta semana:" - -#: ../../include/identity.php:1278 ../../mod/settings.php:1047 -msgid "Full Name:" -msgstr "Nombre completo:" - -#: ../../include/identity.php:1285 -msgid "Like this channel" -msgstr "Me gusta este canal" - -#: ../../include/identity.php:1309 -msgid "j F, Y" -msgstr "j F Y" - -#: ../../include/identity.php:1310 -msgid "j F" -msgstr "j F" +#: ../../include/datetime.php:48 ../../mod/profiles.php:699 +msgid "Miscellaneous" +msgstr "Varios" -#: ../../include/identity.php:1317 -msgid "Birthday:" -msgstr "Cumpleaños:" +#: ../../include/datetime.php:136 +msgid "Birthday" +msgstr "Cumpleaños" -#: ../../include/identity.php:1321 ../../mod/directory.php:302 -msgid "Age:" +#: ../../include/datetime.php:138 +msgid "Age: " msgstr "Edad:" -#: ../../include/identity.php:1330 -#, php-format -msgid "for %1$d %2$s" -msgstr "por %1$d %2$s" - -#: ../../include/identity.php:1333 -msgid "Sexual Preference:" -msgstr "Orientación sexual:" - -#: ../../include/identity.php:1337 ../../mod/directory.php:318 -msgid "Hometown:" -msgstr "Lugar de nacimiento:" - -#: ../../include/identity.php:1339 -msgid "Tags:" -msgstr "Etiquetas:" - -#: ../../include/identity.php:1341 -msgid "Political Views:" -msgstr "Posición polÃtica:" - -#: ../../include/identity.php:1343 -msgid "Religion:" -msgstr "Religión:" - -#: ../../include/identity.php:1345 ../../mod/directory.php:320 -msgid "About:" -msgstr "Sobre mÃ:" - -#: ../../include/identity.php:1347 -msgid "Hobbies/Interests:" -msgstr "Aficciones/Intereses:" +#: ../../include/datetime.php:140 +msgid "YYYY-MM-DD or MM-DD" +msgstr "AAAA-MM-DD o MM-DD" -#: ../../include/identity.php:1349 -msgid "Likes:" -msgstr "Me gusta:" +#: ../../include/datetime.php:246 ../../mod/appman.php:91 +#: ../../mod/appman.php:92 ../../mod/events.php:444 ../../mod/events.php:449 +#: ../../mod/profiles.php:708 ../../mod/profiles.php:712 +msgid "Required" +msgstr "Obligatorio" -#: ../../include/identity.php:1351 -msgid "Dislikes:" -msgstr "No me gusta:" +#: ../../include/datetime.php:273 ../../boot.php:2382 +msgid "never" +msgstr "nunca" -#: ../../include/identity.php:1353 -msgid "Contact information and Social Networks:" -msgstr "Información de contacto y redes sociales:" +#: ../../include/datetime.php:279 +msgid "less than a second ago" +msgstr "hace un instante" -#: ../../include/identity.php:1355 -msgid "My other channels:" -msgstr "Mis otros canales:" +#: ../../include/datetime.php:297 +#, php-format +msgctxt "e.g. 22 hours ago, 1 minute ago" +msgid "%1$d %2$s ago" +msgstr "hace %1$d %2$s" -#: ../../include/identity.php:1357 -msgid "Musical interests:" -msgstr "Intereses musicales:" +#: ../../include/datetime.php:308 +msgctxt "relative_date" +msgid "year" +msgid_plural "years" +msgstr[0] "año" +msgstr[1] "años" -#: ../../include/identity.php:1359 -msgid "Books, literature:" -msgstr "Libros, literatura:" +#: ../../include/datetime.php:311 +msgctxt "relative_date" +msgid "month" +msgid_plural "months" +msgstr[0] "mes" +msgstr[1] "meses" -#: ../../include/identity.php:1361 -msgid "Television:" -msgstr "Televisión:" +#: ../../include/datetime.php:314 +msgctxt "relative_date" +msgid "week" +msgid_plural "weeks" +msgstr[0] "semana" +msgstr[1] "semanas" -#: ../../include/identity.php:1363 -msgid "Film/dance/culture/entertainment:" -msgstr "Cine/danza/cultura/entretenimiento:" +#: ../../include/datetime.php:317 +msgctxt "relative_date" +msgid "day" +msgid_plural "days" +msgstr[0] "dÃa" +msgstr[1] "dÃas" -#: ../../include/identity.php:1365 -msgid "Love/Romance:" -msgstr "Vida sentimental/amorosa:" +#: ../../include/datetime.php:320 +msgctxt "relative_date" +msgid "hour" +msgid_plural "hours" +msgstr[0] "hora" +msgstr[1] "horas" -#: ../../include/identity.php:1367 -msgid "Work/employment:" -msgstr "Trabajo:" +#: ../../include/datetime.php:323 +msgctxt "relative_date" +msgid "minute" +msgid_plural "minutes" +msgstr[0] "minuto" +msgstr[1] "minutos" -#: ../../include/identity.php:1369 -msgid "School/education:" -msgstr "Estudios:" +#: ../../include/datetime.php:326 +msgctxt "relative_date" +msgid "second" +msgid_plural "seconds" +msgstr[0] "segundo" +msgstr[1] "segundos" -#: ../../include/identity.php:1389 -msgid "Like this thing" -msgstr "Me gusta esto" +#: ../../include/datetime.php:563 +#, php-format +msgid "%1$s's birthday" +msgstr "Cumpleaños de %1$s" -#: ../../include/identity.php:1799 ../../mod/cover_photo.php:236 -msgid "cover photo" -msgstr "Imagen de portada del perfil" +#: ../../include/datetime.php:564 +#, php-format +msgid "Happy Birthday %1$s" +msgstr "Feliz cumpleaños %1$s" #: ../../include/oembed.php:267 msgid "Embedded content" @@ -4258,62 +4043,291 @@ msgstr "Visible para las conexiones permitidas." msgid "Visible to specific connections." msgstr "Visible para conexiones especÃficas." -#: ../../include/items.php:4494 ../../mod/display.php:36 +#: ../../include/items.php:4581 ../../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:5030 ../../mod/group.php:38 ../../mod/group.php:137 +#: ../../include/items.php:5117 ../../mod/group.php:38 ../../mod/group.php:137 msgid "Privacy group not found." msgstr "Grupo de canales no encontrado." -#: ../../include/items.php:5046 +#: ../../include/items.php:5133 msgid "Privacy group is empty." msgstr "El grupo de canales está vacÃo." -#: ../../include/items.php:5053 +#: ../../include/items.php:5140 #, php-format msgid "Privacy group: %s" msgstr "Grupo de canales: %s" -#: ../../include/items.php:5063 ../../mod/connedit.php:701 +#: ../../include/items.php:5150 ../../mod/connedit.php:701 #, php-format msgid "Connection: %s" msgstr "Conexión: %s" -#: ../../include/items.php:5065 +#: ../../include/items.php:5152 msgid "Connection not found." msgstr "Conexión no encontrada" -#: ../../include/items.php:5491 ../../mod/cover_photo.php:229 +#: ../../include/items.php:5578 ../../mod/cover_photo.php:229 msgid "female" msgstr "mujer" -#: ../../include/items.php:5492 ../../mod/cover_photo.php:230 +#: ../../include/items.php:5579 ../../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:5493 ../../mod/cover_photo.php:231 +#: ../../include/items.php:5580 ../../mod/cover_photo.php:231 msgid "male" msgstr "hombre" -#: ../../include/items.php:5494 ../../mod/cover_photo.php:232 +#: ../../include/items.php:5581 ../../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:5496 ../../mod/cover_photo.php:234 +#: ../../include/items.php:5583 ../../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:5498 +#: ../../include/items.php:5585 msgid "profile photo" msgstr "foto del perfil" +#: ../../include/identity.php:32 +msgid "Unable to obtain identity information from database" +msgstr "No ha sido posible obtener información sobre la identidad desde la base de datos" + +#: ../../include/identity.php:66 +msgid "Empty name" +msgstr "Nombre vacÃo" + +#: ../../include/identity.php:69 +msgid "Name too long" +msgstr "Nombre demasiado largo" + +#: ../../include/identity.php:181 +msgid "No account identifier" +msgstr "Ningún identificador de la cuenta" + +#: ../../include/identity.php:193 +msgid "Nickname is required." +msgstr "Se requiere un sobrenombre (alias)." + +#: ../../include/identity.php:207 +msgid "Reserved nickname. Please choose another." +msgstr "Sobrenombre en uso. Por favor, elija otro." + +#: ../../include/identity.php:212 +msgid "" +"Nickname has unsupported characters or is already being used on this site." +msgstr "El alias contiene caracteres no admitidos o está ya en uso por otros usuarios de este sitio." + +#: ../../include/identity.php:288 +msgid "Unable to retrieve created identity" +msgstr "No ha sido posible recuperar la identidad creada" + +#: ../../include/identity.php:346 +msgid "Default Profile" +msgstr "Perfil principal" + +#: ../../include/identity.php:784 +msgid "Requested channel is not available." +msgstr "El canal solicitado no está disponible." + +#: ../../include/identity.php:830 ../../mod/achievements.php:11 +#: ../../mod/blocks.php:29 ../../mod/connect.php:13 ../../mod/editblock.php:29 +#: ../../mod/editlayout.php:27 ../../mod/editwebpage.php:28 +#: ../../mod/filestorage.php:54 ../../mod/hcard.php:8 ../../mod/layouts.php:29 +#: ../../mod/profile.php:16 ../../mod/webpages.php:29 +msgid "Requested profile is not available." +msgstr "El perfil solicitado no está disponible." + +#: ../../include/identity.php:925 ../../mod/profiles.php:691 +msgid "Change profile photo" +msgstr "Cambiar la foto del perfil" + +#: ../../include/identity.php:933 +msgid "Create New Profile" +msgstr "Crear un nuevo perfil" + +#: ../../include/identity.php:950 ../../mod/profiles.php:766 +msgid "Profile Image" +msgstr "Imagen del perfil" + +#: ../../include/identity.php:953 +msgid "Visible to everybody" +msgstr "Visible para todos" + +#: ../../include/identity.php:954 ../../mod/profiles.php:689 +#: ../../mod/profiles.php:770 +msgid "Edit visibility" +msgstr "Editar visibilidad" + +#: ../../include/identity.php:1030 ../../include/identity.php:1288 +msgid "Gender:" +msgstr "Género:" + +#: ../../include/identity.php:1031 ../../include/identity.php:1332 +msgid "Status:" +msgstr "Estado:" + +#: ../../include/identity.php:1032 ../../include/identity.php:1343 +msgid "Homepage:" +msgstr "Página personal:" + +#: ../../include/identity.php:1033 +msgid "Online Now" +msgstr "Ahora en lÃnea" + +#: ../../include/identity.php:1121 ../../include/identity.php:1199 +#: ../../mod/ping.php:318 +msgid "g A l F d" +msgstr "g A l d F" + +#: ../../include/identity.php:1122 ../../include/identity.php:1200 +msgid "F d" +msgstr "d F" + +#: ../../include/identity.php:1167 ../../include/identity.php:1239 +#: ../../mod/ping.php:341 +msgid "[today]" +msgstr "[hoy]" + +#: ../../include/identity.php:1178 +msgid "Birthday Reminders" +msgstr "Recordatorios de cumpleaños" + +#: ../../include/identity.php:1179 +msgid "Birthdays this week:" +msgstr "Cumpleaños de esta semana:" + +#: ../../include/identity.php:1232 +msgid "[No description]" +msgstr "[Sin descripción]" + +#: ../../include/identity.php:1250 +msgid "Event Reminders" +msgstr "Recordatorios de eventos" + +#: ../../include/identity.php:1251 +msgid "Events this week:" +msgstr "Eventos de esta semana:" + +#: ../../include/identity.php:1286 ../../mod/settings.php:1047 +msgid "Full Name:" +msgstr "Nombre completo:" + +#: ../../include/identity.php:1293 +msgid "Like this channel" +msgstr "Me gusta este canal" + +#: ../../include/identity.php:1317 +msgid "j F, Y" +msgstr "j F Y" + +#: ../../include/identity.php:1318 +msgid "j F" +msgstr "j F" + +#: ../../include/identity.php:1325 +msgid "Birthday:" +msgstr "Cumpleaños:" + +#: ../../include/identity.php:1329 ../../mod/directory.php:302 +msgid "Age:" +msgstr "Edad:" + +#: ../../include/identity.php:1338 +#, php-format +msgid "for %1$d %2$s" +msgstr "por %1$d %2$s" + +#: ../../include/identity.php:1341 +msgid "Sexual Preference:" +msgstr "Orientación sexual:" + +#: ../../include/identity.php:1345 ../../mod/directory.php:318 +msgid "Hometown:" +msgstr "Lugar de nacimiento:" + +#: ../../include/identity.php:1347 +msgid "Tags:" +msgstr "Etiquetas:" + +#: ../../include/identity.php:1349 +msgid "Political Views:" +msgstr "Posición polÃtica:" + +#: ../../include/identity.php:1351 +msgid "Religion:" +msgstr "Religión:" + +#: ../../include/identity.php:1353 ../../mod/directory.php:320 +msgid "About:" +msgstr "Sobre mÃ:" + +#: ../../include/identity.php:1355 +msgid "Hobbies/Interests:" +msgstr "Aficciones/Intereses:" + +#: ../../include/identity.php:1357 +msgid "Likes:" +msgstr "Me gusta:" + +#: ../../include/identity.php:1359 +msgid "Dislikes:" +msgstr "No me gusta:" + +#: ../../include/identity.php:1361 +msgid "Contact information and Social Networks:" +msgstr "Información de contacto y redes sociales:" + +#: ../../include/identity.php:1363 +msgid "My other channels:" +msgstr "Mis otros canales:" + +#: ../../include/identity.php:1365 +msgid "Musical interests:" +msgstr "Intereses musicales:" + +#: ../../include/identity.php:1367 +msgid "Books, literature:" +msgstr "Libros, literatura:" + +#: ../../include/identity.php:1369 +msgid "Television:" +msgstr "Televisión:" + +#: ../../include/identity.php:1371 +msgid "Film/dance/culture/entertainment:" +msgstr "Cine/danza/cultura/entretenimiento:" + +#: ../../include/identity.php:1373 +msgid "Love/Romance:" +msgstr "Vida sentimental/amorosa:" + +#: ../../include/identity.php:1375 +msgid "Work/employment:" +msgstr "Trabajo:" + +#: ../../include/identity.php:1377 +msgid "School/education:" +msgstr "Estudios:" + +#: ../../include/identity.php:1397 +msgid "Like this thing" +msgstr "Me gusta esto" + +#: ../../include/identity.php:1807 ../../mod/cover_photo.php:236 +msgid "cover photo" +msgstr "Imagen de portada 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Ã" @@ -5464,7 +5478,7 @@ msgstr "Foto del perfil 128px" msgid "Timezone" msgstr "Huso horario" -#: ../../mod/id.php:27 ../../mod/profiles.php:713 +#: ../../mod/id.php:27 ../../mod/profiles.php:730 msgid "Homepage URL" msgstr "Dirección de la página personal" @@ -7505,15 +7519,15 @@ msgstr "Estado civil" msgid "Romantic Partner" msgstr "Pareja sentimental" -#: ../../mod/profiles.php:430 ../../mod/profiles.php:718 +#: ../../mod/profiles.php:430 ../../mod/profiles.php:735 msgid "Likes" msgstr "Me gusta" -#: ../../mod/profiles.php:434 ../../mod/profiles.php:719 +#: ../../mod/profiles.php:434 ../../mod/profiles.php:736 msgid "Dislikes" msgstr "No me gusta" -#: ../../mod/profiles.php:438 +#: ../../mod/profiles.php:438 ../../mod/profiles.php:743 msgid "Work/Employment" msgstr "Trabajo:" @@ -7521,11 +7535,11 @@ msgstr "Trabajo:" msgid "Religion" msgstr "Religión" -#: ../../mod/profiles.php:445 ../../mod/profiles.php:715 +#: ../../mod/profiles.php:445 msgid "Political Views" msgstr "Ideas polÃticas" -#: ../../mod/profiles.php:453 ../../mod/profiles.php:712 +#: ../../mod/profiles.php:453 msgid "Sexual Preference" msgstr "Preferencia sexual" @@ -7541,9 +7555,9 @@ msgstr "Intereses" msgid "Profile updated." msgstr "Perfil actualizado." -#: ../../mod/profiles.php:646 -msgid "Hide your contact/friend list from viewers of this profile?" -msgstr "¿Ocultar su lista de contactos a los visitantes de este perfil?" +#: ../../mod/profiles.php:644 +msgid "Hide your connections list from viewers of this profile" +msgstr "Ocultar la lista de conexiones a los visitantes del perfil" #: ../../mod/profiles.php:686 msgid "Edit Profile Details" @@ -7554,13 +7568,9 @@ msgid "View this profile" msgstr "Ver este perfil" #: ../../mod/profiles.php:690 -msgid "Change Cover Photo" +msgid "Change cover photo" msgstr "Cambiar la imagen de portada del perfil" -#: ../../mod/profiles.php:691 -msgid "Change Profile Photo" -msgstr "Cambiar la foto del perfil" - #: ../../mod/profiles.php:692 msgid "Create a new profile using these settings" msgstr "Crear un nuevo perfil usando estos ajustes" @@ -7573,149 +7583,145 @@ msgstr "Clonar este perfil" msgid "Delete this profile" msgstr "Eliminar este perfil" -#: ../../mod/profiles.php:696 +#: ../../mod/profiles.php:695 +msgid "Add profile things" +msgstr "Añadir cosas al perfil" + +#: ../../mod/profiles.php:698 +msgid "Relation" +msgstr "Relación" + +#: ../../mod/profiles.php:701 msgid "Import profile from file" msgstr "Importar perfil desde un fichero" -#: ../../mod/profiles.php:697 +#: ../../mod/profiles.php:702 msgid "Export profile to file" msgstr "Exportar perfil a un fichero" -#: ../../mod/profiles.php:698 -msgid "Profile Name" +#: ../../mod/profiles.php:703 +msgid "Your gender" +msgstr "Género" + +#: ../../mod/profiles.php:704 +msgid "Marital status" +msgstr "Estado civil" + +#: ../../mod/profiles.php:705 +msgid "Sexual preference" +msgstr "Preferencia sexual" + +#: ../../mod/profiles.php:708 +msgid "Profile name" msgstr "Nombre del perfil" -#: ../../mod/profiles.php:699 -msgid "Your Full Name" +#: ../../mod/profiles.php:710 +msgid "This is your default profile." +msgstr "Este es su perfil principal." + +#: ../../mod/profiles.php:712 +msgid "Your full name" msgstr "Nombre completo" -#: ../../mod/profiles.php:700 +#: ../../mod/profiles.php:713 msgid "Title/Description" msgstr "TÃtulo o descripción" -#: ../../mod/profiles.php:701 -msgid "Your Gender" -msgstr "Género" - -#: ../../mod/profiles.php:702 -msgid "Birthday" -msgstr "Cumpleaños" - -#: ../../mod/profiles.php:703 -msgid "Street Address" +#: ../../mod/profiles.php:716 +msgid "Street address" msgstr "Dirección" -#: ../../mod/profiles.php:704 +#: ../../mod/profiles.php:717 msgid "Locality/City" msgstr "Ciudad" -#: ../../mod/profiles.php:705 -msgid "Postal/Zip Code" +#: ../../mod/profiles.php:718 +msgid "Region/State" +msgstr "Región o Estado" + +#: ../../mod/profiles.php:719 +msgid "Postal/Zip code" msgstr "Código postal" -#: ../../mod/profiles.php:706 +#: ../../mod/profiles.php:720 msgid "Country" msgstr "PaÃs" -#: ../../mod/profiles.php:707 -msgid "Region/State" -msgstr "Región o Estado" - -#: ../../mod/profiles.php:708 -msgid "<span class=\"heart\">♥</span> Marital Status" -msgstr "<span class=\"heart\">♥</span> Estado sentimental" - -#: ../../mod/profiles.php:709 +#: ../../mod/profiles.php:725 msgid "Who (if applicable)" msgstr "Quién (si es aplicable)" -#: ../../mod/profiles.php:710 +#: ../../mod/profiles.php:725 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "Por ejemplo: ana123, MarÃa González, sara@ejemplo.com" -#: ../../mod/profiles.php:711 -msgid "Since [date]" -msgstr "Desde [fecha]" +#: ../../mod/profiles.php:726 +msgid "Since (date)" +msgstr "Desde (fecha)" + +#: ../../mod/profiles.php:729 +msgid "Tell us about yourself" +msgstr "Háblenos de usted" -#: ../../mod/profiles.php:714 +#: ../../mod/profiles.php:731 msgid "Hometown" msgstr "Lugar de nacimiento" -#: ../../mod/profiles.php:716 -msgid "Religious Views" +#: ../../mod/profiles.php:732 +msgid "Political views" +msgstr "Ideas polÃticas" + +#: ../../mod/profiles.php:733 +msgid "Religious views" msgstr "Creencias religiosas" -#: ../../mod/profiles.php:720 +#: ../../mod/profiles.php:734 +msgid "Keywords used in directory listings" +msgstr "Palabras clave utilizadas en los listados de directorios" + +#: ../../mod/profiles.php:734 msgid "Example: fishing photography software" msgstr "Por ejemplo: software de fotografÃa submarina" -#: ../../mod/profiles.php:721 -msgid "Used in directory listings" -msgstr "Visible en el directorio público del canal" - -#: ../../mod/profiles.php:722 -msgid "Tell us about yourself..." -msgstr "Háblenos de usted..." - -#: ../../mod/profiles.php:723 -msgid "Hobbies/Interests" -msgstr "Aficiones/Intereses" - -#: ../../mod/profiles.php:724 -msgid "Contact information and Social Networks" -msgstr "Información de contacto y redes sociales" - -#: ../../mod/profiles.php:725 -msgid "My other channels" -msgstr "Mis otros canales" - -#: ../../mod/profiles.php:726 +#: ../../mod/profiles.php:737 msgid "Musical interests" msgstr "Preferencias musicales" -#: ../../mod/profiles.php:727 +#: ../../mod/profiles.php:738 msgid "Books, literature" msgstr "Libros, literatura" -#: ../../mod/profiles.php:728 +#: ../../mod/profiles.php:739 msgid "Television" msgstr "Televisión" -#: ../../mod/profiles.php:729 -msgid "Film/dance/culture/entertainment" -msgstr "Cine/danza/cultura/entretenimiento" +#: ../../mod/profiles.php:740 +msgid "Film/Dance/Culture/Entertainment" +msgstr "Cine, danza, cultura, entretenimiento" -#: ../../mod/profiles.php:730 -msgid "Love/romance" -msgstr "Vida sentimental/amorosa" +#: ../../mod/profiles.php:741 +msgid "Hobbies/Interests" +msgstr "Aficiones/Intereses" -#: ../../mod/profiles.php:731 -msgid "Work/employment" -msgstr "Trabajo" +#: ../../mod/profiles.php:742 +msgid "Love/Romance" +msgstr "Vida sentimental o amorosa" -#: ../../mod/profiles.php:732 -msgid "School/education" +#: ../../mod/profiles.php:744 +msgid "School/Education" msgstr "Estudios" -#: ../../mod/profiles.php:738 -msgid "This is your default profile." -msgstr "Este es su perfil principal." - -#: ../../mod/profiles.php:749 -msgid "Age: " -msgstr "Edad:" - -#: ../../mod/profiles.php:792 -msgid "Edit/Manage Profiles" -msgstr "Modificar/gestionar perfiles" +#: ../../mod/profiles.php:745 +msgid "Contact information and social networks" +msgstr "Información de contacto y redes sociales" -#: ../../mod/profiles.php:793 -msgid "Add profile things" -msgstr "Añadir cosas al perfil" +#: ../../mod/profiles.php:746 +msgid "My other channels" +msgstr "Mis otros canales" -#: ../../mod/profiles.php:794 -msgid "Include desirable objects in your profile" -msgstr "Añadir objetos interesantes en su perfil" +#: ../../mod/profiles.php:777 +msgid "Create New" +msgstr "Crear un nuevo perfil" #: ../../mod/profperm.php:29 ../../mod/profperm.php:58 msgid "Invalid profile identifier." @@ -9146,7 +9152,7 @@ msgstr "Por favor, visite <a href=\"http://hubzilla.org\">hubzilla.org</a> para #: ../../mod/siteinfo.php:73 msgid "Bug reports and issues: please visit" -msgstr "Informes de errores e incidencias: por, favor visite" +msgstr "Informes de errores e incidencias: por favor visite" #: ../../mod/siteinfo.php:75 msgid "$projectname issues" diff --git a/view/es-es/hstrings.php b/view/es-es/hstrings.php index 8873e3c7a..8791b3ce6 100644 --- a/view/es-es/hstrings.php +++ b/view/es-es/hstrings.php @@ -398,42 +398,6 @@ $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"; @@ -614,6 +578,7 @@ $a->strings["For Administrators"] = "Para los administradores"; $a->strings["For Developers"] = "Para los desarrolladores"; $a->strings["Site"] = "Sitio"; $a->strings["Accounts"] = "Cuentas"; +$a->strings["Member registrations waiting for confirmation"] = "Inscripciones en espera de aprobación"; $a->strings["Channels"] = "Canales"; $a->strings["Security"] = "Seguridad"; $a->strings["Plugins"] = "Extensiones"; @@ -623,7 +588,6 @@ $a->strings["Profile Fields"] = "Campos del perfil"; $a->strings["DB updates"] = "Actualizaciones de la base de datos"; $a->strings["Logs"] = "Informes"; $a->strings["Plugin Features"] = "Extensiones"; -$a->strings["User registrations waiting for confirmation"] = "Registros de usuarios pendientes de confirmación"; $a->strings["View Photo"] = "Ver foto"; $a->strings["Edit Album"] = "Editar álbum"; $a->strings["prev"] = "anterior"; @@ -731,61 +695,44 @@ $a->strings["Name:"] = "Nombre:"; $a->strings["Photo:"] = "Foto:"; $a->strings["Please visit %s to approve or reject the suggestion."] = "Por favor, visite %s para aprobar o rechazar la sugerencia."; $a->strings["[Hubzilla:Notify]"] = "[Hubzilla:Aviso]"; -$a->strings["Unable to obtain identity information from database"] = "No ha sido posible obtener información sobre la identidad desde la base de datos"; -$a->strings["Empty name"] = "Nombre vacÃo"; -$a->strings["Name too long"] = "Nombre demasiado largo"; -$a->strings["No account identifier"] = "Ningún identificador de la cuenta"; -$a->strings["Nickname is required."] = "Se requiere un sobrenombre (alias)."; -$a->strings["Reserved nickname. Please choose another."] = "Sobrenombre en uso. Por favor, elija otro."; -$a->strings["Nickname has unsupported characters or is already being used on this site."] = "El alias contiene caracteres no admitidos o está ya en uso por otros usuarios de este sitio."; -$a->strings["Unable to retrieve created identity"] = "No ha sido posible recuperar la identidad creada"; -$a->strings["Default Profile"] = "Perfil principal"; -$a->strings["Requested channel is not available."] = "El canal solicitado no está disponible."; -$a->strings["Requested profile is not available."] = "El perfil solicitado no está disponible."; -$a->strings["Change profile photo"] = "Cambiar la foto del perfil"; -$a->strings["Create New Profile"] = "Crear un nuevo perfil"; -$a->strings["Profile Image"] = "Imagen del perfil"; -$a->strings["Visible to everybody"] = "Visible para todos"; -$a->strings["Edit visibility"] = "Editar visibilidad"; -$a->strings["Gender:"] = "Género:"; -$a->strings["Status:"] = "Estado:"; -$a->strings["Homepage:"] = "Página personal:"; -$a->strings["Online Now"] = "Ahora en lÃnea"; -$a->strings["g A l F d"] = "g A l d F"; -$a->strings["F d"] = "d F"; -$a->strings["[today]"] = "[hoy]"; -$a->strings["Birthday Reminders"] = "Recordatorios de cumpleaños"; -$a->strings["Birthdays this week:"] = "Cumpleaños de esta semana:"; -$a->strings["[No description]"] = "[Sin descripción]"; -$a->strings["Event Reminders"] = "Recordatorios de eventos"; -$a->strings["Events this week:"] = "Eventos de esta semana:"; -$a->strings["Full Name:"] = "Nombre completo:"; -$a->strings["Like this channel"] = "Me gusta este canal"; -$a->strings["j F, Y"] = "j F Y"; -$a->strings["j F"] = "j F"; -$a->strings["Birthday:"] = "Cumpleaños:"; -$a->strings["Age:"] = "Edad:"; -$a->strings["for %1\$d %2\$s"] = "por %1\$d %2\$s"; -$a->strings["Sexual Preference:"] = "Orientación sexual:"; -$a->strings["Hometown:"] = "Lugar de nacimiento:"; -$a->strings["Tags:"] = "Etiquetas:"; -$a->strings["Political Views:"] = "Posición polÃtica:"; -$a->strings["Religion:"] = "Religión:"; -$a->strings["About:"] = "Sobre mÃ:"; -$a->strings["Hobbies/Interests:"] = "Aficciones/Intereses:"; -$a->strings["Likes:"] = "Me gusta:"; -$a->strings["Dislikes:"] = "No me gusta:"; -$a->strings["Contact information and Social Networks:"] = "Información de contacto y redes sociales:"; -$a->strings["My other channels:"] = "Mis otros canales:"; -$a->strings["Musical interests:"] = "Intereses musicales:"; -$a->strings["Books, literature:"] = "Libros, literatura:"; -$a->strings["Television:"] = "Televisión:"; -$a->strings["Film/dance/culture/entertainment:"] = "Cine/danza/cultura/entretenimiento:"; -$a->strings["Love/Romance:"] = "Vida sentimental/amorosa:"; -$a->strings["Work/employment:"] = "Trabajo:"; -$a->strings["School/education:"] = "Estudios:"; -$a->strings["Like this thing"] = "Me gusta esto"; -$a->strings["cover photo"] = "Imagen de portada del perfil"; +$a->strings["Miscellaneous"] = "Varios"; +$a->strings["Birthday"] = "Cumpleaños"; +$a->strings["Age: "] = "Edad:"; +$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["Embedded content"] = "Contenido incorporado"; $a->strings["Embedding disabled"] = "Incrustación deshabilitada"; $a->strings["channel"] = "el canal"; @@ -1024,6 +971,61 @@ $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["Unable to obtain identity information from database"] = "No ha sido posible obtener información sobre la identidad desde la base de datos"; +$a->strings["Empty name"] = "Nombre vacÃo"; +$a->strings["Name too long"] = "Nombre demasiado largo"; +$a->strings["No account identifier"] = "Ningún identificador de la cuenta"; +$a->strings["Nickname is required."] = "Se requiere un sobrenombre (alias)."; +$a->strings["Reserved nickname. Please choose another."] = "Sobrenombre en uso. Por favor, elija otro."; +$a->strings["Nickname has unsupported characters or is already being used on this site."] = "El alias contiene caracteres no admitidos o está ya en uso por otros usuarios de este sitio."; +$a->strings["Unable to retrieve created identity"] = "No ha sido posible recuperar la identidad creada"; +$a->strings["Default Profile"] = "Perfil principal"; +$a->strings["Requested channel is not available."] = "El canal solicitado no está disponible."; +$a->strings["Requested profile is not available."] = "El perfil solicitado no está disponible."; +$a->strings["Change profile photo"] = "Cambiar la foto del perfil"; +$a->strings["Create New Profile"] = "Crear un nuevo perfil"; +$a->strings["Profile Image"] = "Imagen del perfil"; +$a->strings["Visible to everybody"] = "Visible para todos"; +$a->strings["Edit visibility"] = "Editar visibilidad"; +$a->strings["Gender:"] = "Género:"; +$a->strings["Status:"] = "Estado:"; +$a->strings["Homepage:"] = "Página personal:"; +$a->strings["Online Now"] = "Ahora en lÃnea"; +$a->strings["g A l F d"] = "g A l d F"; +$a->strings["F d"] = "d F"; +$a->strings["[today]"] = "[hoy]"; +$a->strings["Birthday Reminders"] = "Recordatorios de cumpleaños"; +$a->strings["Birthdays this week:"] = "Cumpleaños de esta semana:"; +$a->strings["[No description]"] = "[Sin descripción]"; +$a->strings["Event Reminders"] = "Recordatorios de eventos"; +$a->strings["Events this week:"] = "Eventos de esta semana:"; +$a->strings["Full Name:"] = "Nombre completo:"; +$a->strings["Like this channel"] = "Me gusta este canal"; +$a->strings["j F, Y"] = "j F Y"; +$a->strings["j F"] = "j F"; +$a->strings["Birthday:"] = "Cumpleaños:"; +$a->strings["Age:"] = "Edad:"; +$a->strings["for %1\$d %2\$s"] = "por %1\$d %2\$s"; +$a->strings["Sexual Preference:"] = "Orientación sexual:"; +$a->strings["Hometown:"] = "Lugar de nacimiento:"; +$a->strings["Tags:"] = "Etiquetas:"; +$a->strings["Political Views:"] = "Posición polÃtica:"; +$a->strings["Religion:"] = "Religión:"; +$a->strings["About:"] = "Sobre mÃ:"; +$a->strings["Hobbies/Interests:"] = "Aficciones/Intereses:"; +$a->strings["Likes:"] = "Me gusta:"; +$a->strings["Dislikes:"] = "No me gusta:"; +$a->strings["Contact information and Social Networks:"] = "Información de contacto y redes sociales:"; +$a->strings["My other channels:"] = "Mis otros canales:"; +$a->strings["Musical interests:"] = "Intereses musicales:"; +$a->strings["Books, literature:"] = "Libros, literatura:"; +$a->strings["Television:"] = "Televisión:"; +$a->strings["Film/dance/culture/entertainment:"] = "Cine/danza/cultura/entretenimiento:"; +$a->strings["Love/Romance:"] = "Vida sentimental/amorosa:"; +$a->strings["Work/employment:"] = "Trabajo:"; +$a->strings["School/education:"] = "Estudios:"; +$a->strings["Like this thing"] = "Me gusta esto"; +$a->strings["cover photo"] = "Imagen de portada 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"; @@ -1800,50 +1802,48 @@ $a->strings["Sexual Preference"] = "Preferencia sexual"; $a->strings["Homepage"] = "Página personal"; $a->strings["Interests"] = "Intereses"; $a->strings["Profile updated."] = "Perfil actualizado."; -$a->strings["Hide your contact/friend list from viewers of this profile?"] = "¿Ocultar su lista de contactos a los visitantes de este perfil?"; +$a->strings["Hide your connections list from viewers of this profile"] = "Ocultar la lista de conexiones a los visitantes del perfil"; $a->strings["Edit Profile Details"] = "Modificar los detalles de este perfil"; $a->strings["View this profile"] = "Ver este perfil"; -$a->strings["Change Cover Photo"] = "Cambiar la imagen de portada del perfil"; -$a->strings["Change Profile Photo"] = "Cambiar la foto del perfil"; +$a->strings["Change cover photo"] = "Cambiar la imagen de portada del perfil"; $a->strings["Create a new profile using these settings"] = "Crear un nuevo perfil usando estos ajustes"; $a->strings["Clone this profile"] = "Clonar este perfil"; $a->strings["Delete this profile"] = "Eliminar este perfil"; +$a->strings["Add profile things"] = "Añadir cosas al perfil"; +$a->strings["Relation"] = "Relación"; $a->strings["Import profile from file"] = "Importar perfil desde un fichero"; $a->strings["Export profile to file"] = "Exportar perfil a un fichero"; -$a->strings["Profile Name"] = "Nombre del perfil"; -$a->strings["Your Full Name"] = "Nombre completo"; +$a->strings["Your gender"] = "Género"; +$a->strings["Marital status"] = "Estado civil"; +$a->strings["Sexual preference"] = "Preferencia sexual"; +$a->strings["Profile name"] = "Nombre del perfil"; +$a->strings["This is your default profile."] = "Este es su perfil principal."; +$a->strings["Your full name"] = "Nombre completo"; $a->strings["Title/Description"] = "TÃtulo o descripción"; -$a->strings["Your Gender"] = "Género"; -$a->strings["Birthday"] = "Cumpleaños"; -$a->strings["Street Address"] = "Dirección"; +$a->strings["Street address"] = "Dirección"; $a->strings["Locality/City"] = "Ciudad"; -$a->strings["Postal/Zip Code"] = "Código postal"; -$a->strings["Country"] = "PaÃs"; $a->strings["Region/State"] = "Región o Estado"; -$a->strings["<span class=\"heart\">♥</span> Marital Status"] = "<span class=\"heart\">♥</span> Estado sentimental"; +$a->strings["Postal/Zip code"] = "Código postal"; +$a->strings["Country"] = "PaÃs"; $a->strings["Who (if applicable)"] = "Quién (si es aplicable)"; $a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Por ejemplo: ana123, MarÃa González, sara@ejemplo.com"; -$a->strings["Since [date]"] = "Desde [fecha]"; +$a->strings["Since (date)"] = "Desde (fecha)"; +$a->strings["Tell us about yourself"] = "Háblenos de usted"; $a->strings["Hometown"] = "Lugar de nacimiento"; -$a->strings["Religious Views"] = "Creencias religiosas"; +$a->strings["Political views"] = "Ideas polÃticas"; +$a->strings["Religious views"] = "Creencias religiosas"; +$a->strings["Keywords used in directory listings"] = "Palabras clave utilizadas en los listados de directorios"; $a->strings["Example: fishing photography software"] = "Por ejemplo: software de fotografÃa submarina"; -$a->strings["Used in directory listings"] = "Visible en el directorio público del canal"; -$a->strings["Tell us about yourself..."] = "Háblenos de usted..."; -$a->strings["Hobbies/Interests"] = "Aficiones/Intereses"; -$a->strings["Contact information and Social Networks"] = "Información de contacto y redes sociales"; -$a->strings["My other channels"] = "Mis otros canales"; $a->strings["Musical interests"] = "Preferencias musicales"; $a->strings["Books, literature"] = "Libros, literatura"; $a->strings["Television"] = "Televisión"; -$a->strings["Film/dance/culture/entertainment"] = "Cine/danza/cultura/entretenimiento"; -$a->strings["Love/romance"] = "Vida sentimental/amorosa"; -$a->strings["Work/employment"] = "Trabajo"; -$a->strings["School/education"] = "Estudios"; -$a->strings["This is your default profile."] = "Este es su perfil principal."; -$a->strings["Age: "] = "Edad:"; -$a->strings["Edit/Manage Profiles"] = "Modificar/gestionar perfiles"; -$a->strings["Add profile things"] = "Añadir cosas al perfil"; -$a->strings["Include desirable objects in your profile"] = "Añadir objetos interesantes en su perfil"; +$a->strings["Film/Dance/Culture/Entertainment"] = "Cine, danza, cultura, entretenimiento"; +$a->strings["Hobbies/Interests"] = "Aficiones/Intereses"; +$a->strings["Love/Romance"] = "Vida sentimental o amorosa"; +$a->strings["School/Education"] = "Estudios"; +$a->strings["Contact information and social networks"] = "Información de contacto y redes sociales"; +$a->strings["My other channels"] = "Mis otros canales"; +$a->strings["Create New"] = "Crear un nuevo perfil"; $a->strings["Invalid profile identifier."] = "Identificador del perfil no válido"; $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."; @@ -2167,7 +2167,7 @@ $a->strings["Last background fetch: "] = "Última actualización en segundo plan $a->strings["Current load average: "] = "Carga media actual:"; $a->strings["Running at web location"] = "Corriendo en el sitio web"; $a->strings["Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more about \$Projectname."] = "Por favor, visite <a href=\"http://hubzilla.org\">hubzilla.org</a> para más información sobre \$Projectname."; -$a->strings["Bug reports and issues: please visit"] = "Informes de errores e incidencias: por, favor visite"; +$a->strings["Bug reports and issues: please visit"] = "Informes de errores e incidencias: por favor visite"; $a->strings["\$projectname issues"] = "Problemas en \$projectname"; $a->strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "Sugerencias, elogios, etc - por favor, un correo electrónico a \"redmatrix\" en librelist - punto com"; $a->strings["Site Administrators"] = "Administradores del sitio"; diff --git a/view/it/hmessages.po b/view/it/hmessages.po index eacb53e6e..a7c7258c7 100644 --- a/view/it/hmessages.po +++ b/view/it/hmessages.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: Redmatrix\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-04 00:03-0800\n" -"PO-Revision-Date: 2016-03-08 14:43+0000\n" +"POT-Creation-Date: 2016-03-18 00:03-0700\n" +"PO-Revision-Date: 2016-03-22 10:43+0000\n" "Last-Translator: Paolo Wave <pynolo@tarine.net>\n" "Language-Team: Italian (http://www.transifex.com/Friendica/red-matrix/language/it/)\n" "MIME-Version: 1.0\n" @@ -61,14 +61,14 @@ msgid "Schedule Outbox" msgstr "Appuntamenti inviati" #: ../../Zotlabs/Storage/Browser.php:164 ../../include/apps.php:360 -#: ../../include/apps.php:415 ../../include/widgets.php:1430 +#: ../../include/apps.php:415 ../../include/widgets.php:1439 #: ../../include/conversation.php:1037 ../../mod/photos.php:766 #: ../../mod/photos.php:1209 msgid "Unknown" msgstr "Sconosciuto" #: ../../Zotlabs/Storage/Browser.php:226 ../../include/apps.php:135 -#: ../../include/nav.php:93 ../../include/conversation.php:1648 +#: ../../include/nav.php:93 ../../include/conversation.php:1653 #: ../../mod/fbrowser.php:109 msgid "Files" msgstr "Archivio file" @@ -88,7 +88,7 @@ msgid "Create" msgstr "Crea" #: ../../Zotlabs/Storage/Browser.php:231 ../../Zotlabs/Storage/Browser.php:305 -#: ../../include/widgets.php:1443 ../../mod/photos.php:793 +#: ../../include/widgets.php:1452 ../../mod/photos.php:793 #: ../../mod/photos.php:1333 ../../mod/profile_photo.php:401 #: ../../mod/cover_photo.php:353 msgid "Upload" @@ -115,8 +115,8 @@ msgstr "Ultima modifica" #: ../../Zotlabs/Storage/Browser.php:240 ../../include/apps.php:259 #: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36 -#: ../../include/menu.php:108 ../../include/identity.php:924 -#: ../../include/identity.php:928 ../../include/ItemObject.php:100 +#: ../../include/menu.php:108 ../../include/ItemObject.php:100 +#: ../../include/identity.php:932 ../../include/identity.php:936 #: ../../mod/blocks.php:153 ../../mod/connections.php:286 #: ../../mod/connections.php:306 ../../mod/editblock.php:135 #: ../../mod/editlayout.php:134 ../../mod/editpost.php:112 @@ -167,7 +167,7 @@ msgstr "Carica un file" #: ../../include/attach.php:352 ../../include/attach.php:359 #: ../../include/attach.php:437 ../../include/attach.php:889 #: ../../include/attach.php:960 ../../include/attach.php:1112 -#: ../../include/photos.php:29 ../../include/items.php:4575 +#: ../../include/photos.php:29 ../../include/items.php:4660 #: ../../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 @@ -194,7 +194,7 @@ msgstr "Carica un file" #: ../../mod/pdledit.php:22 ../../mod/photos.php:70 ../../mod/poke.php:133 #: ../../mod/profile.php:64 ../../mod/profile.php:72 #: ../../mod/profile_photo.php:289 ../../mod/profile_photo.php:302 -#: ../../mod/profiles.php:198 ../../mod/profiles.php:584 +#: ../../mod/profiles.php:198 ../../mod/profiles.php:596 #: ../../mod/rate.php:111 ../../mod/register.php:73 ../../mod/regmod.php:17 #: ../../mod/service_limits.php:7 ../../mod/settings.php:579 #: ../../mod/setup.php:233 ../../mod/sharedwithme.php:7 @@ -216,8 +216,8 @@ msgid "Page not found." msgstr "Pagina non trovata." #: ../../include/Contact.php:101 ../../include/widgets.php:147 -#: ../../include/widgets.php:185 ../../include/identity.php:1003 -#: ../../include/conversation.php:961 ../../mod/directory.php:321 +#: ../../include/widgets.php:185 ../../include/conversation.php:961 +#: ../../include/identity.php:1011 ../../mod/directory.php:321 #: ../../mod/match.php:64 ../../mod/suggest.php:52 msgid "Connect" msgstr "Aggiungi" @@ -243,7 +243,7 @@ msgstr "Impossibile trovare il nome utente nel file da importare." msgid "Unable to create a unique channel address. Import failed." msgstr "Impossibile creare un indirizzo univoco per il canale. L'import è fallito." -#: ../../include/Import/import_diaspora.php:143 ../../mod/import.php:511 +#: ../../include/Import/import_diaspora.php:143 ../../mod/import.php:509 msgid "Import completed." msgstr "L'importazione è terminata con successo." @@ -286,7 +286,7 @@ msgid "Registration request at %s" msgstr "Richiesta di registrazione su %s" #: ../../include/account.php:317 ../../include/account.php:344 -#: ../../include/account.php:404 ../../include/network.php:1660 +#: ../../include/account.php:404 ../../include/network.php:1864 msgid "Administrator" msgstr "Amministratore" @@ -383,7 +383,7 @@ msgid "Site Admin" msgstr "Amministrazione sito" #: ../../include/apps.php:129 ../../include/nav.php:104 -#: ../../include/conversation.php:1685 +#: ../../include/conversation.php:1690 msgid "Bookmarks" msgstr "Segnalibri" @@ -391,7 +391,7 @@ msgstr "Segnalibri" msgid "Address Book" msgstr "Rubrica" -#: ../../include/apps.php:131 ../../include/nav.php:112 ../../boot.php:1543 +#: ../../include/apps.php:131 ../../include/nav.php:112 ../../boot.php:1551 msgid "Login" msgstr "Accedi" @@ -411,7 +411,7 @@ msgid "Settings" msgstr "Impostazioni" #: ../../include/apps.php:136 ../../include/nav.php:108 -#: ../../include/conversation.php:1695 ../../mod/webpages.php:180 +#: ../../include/conversation.php:1700 ../../mod/webpages.php:180 msgid "Webpages" msgstr "Pagine web" @@ -419,18 +419,18 @@ msgstr "Pagine web" msgid "Channel Home" msgstr "Bacheca del canale" -#: ../../include/apps.php:138 ../../include/identity.php:1387 +#: ../../include/apps.php:138 ../../include/identity.php:1395 #: ../../mod/profperm.php:112 msgid "Profile" msgstr "Profilo" #: ../../include/apps.php:139 ../../include/nav.php:92 -#: ../../include/conversation.php:1641 ../../mod/fbrowser.php:25 +#: ../../include/conversation.php:1646 ../../mod/fbrowser.php:25 msgid "Photos" msgstr "Foto" #: ../../include/apps.php:140 ../../include/nav.php:198 -#: ../../include/conversation.php:1658 ../../include/conversation.php:1661 +#: ../../include/conversation.php:1663 ../../include/conversation.php:1666 msgid "Events" msgstr "Eventi" @@ -482,7 +482,7 @@ msgstr "Canale casuale" msgid "Invite" msgstr "Invita" -#: ../../include/apps.php:152 ../../include/widgets.php:1316 +#: ../../include/apps.php:152 ../../include/widgets.php:1320 msgid "Features" msgstr "Funzionalità " @@ -512,15 +512,15 @@ msgstr "Installa" msgid "Purchase" msgstr "Acquista" -#: ../../include/auth.php:132 +#: ../../include/auth.php:105 msgid "Logged out." msgstr "Uscita effettuata." -#: ../../include/auth.php:273 +#: ../../include/auth.php:246 msgid "Failed authentication" msgstr "Autenticazione fallita" -#: ../../include/auth.php:287 ../../mod/openid.php:189 +#: ../../include/auth.php:260 ../../mod/openid.php:189 msgid "Login failed." msgstr "Accesso fallito." @@ -548,7 +548,7 @@ msgid "Finishes:" msgstr "Fine:" #: ../../include/bb2diaspora.php:487 ../../include/event.php:52 -#: ../../include/text.php:1433 ../../include/identity.php:1018 +#: ../../include/text.php:1433 ../../include/identity.php:1026 #: ../../mod/directory.php:307 msgid "Location:" msgstr "Luogo:" @@ -677,9 +677,10 @@ msgstr "Modalità SafeSearch" #: ../../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:1547 +#: ../../mod/photos.php:634 ../../mod/admin.php:425 ../../mod/profiles.php:647 +#: ../../mod/removeme.php:60 ../../mod/settings.php:588 +#: ../../view/theme/redbasic/php/config.php:105 +#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1555 msgid "No" msgstr "No" @@ -690,9 +691,10 @@ msgstr "No" #: ../../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:1547 +#: ../../mod/photos.php:634 ../../mod/admin.php:427 ../../mod/profiles.php:647 +#: ../../mod/removeme.php:60 ../../mod/settings.php:588 +#: ../../view/theme/redbasic/php/config.php:105 +#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1555 msgid "Yes" msgstr "Sì" @@ -710,7 +712,7 @@ msgstr "Questo evento è stato aggiunto al tuo calendario" #: ../../include/event.php:915 ../../include/text.php:1951 #: ../../include/conversation.php:123 ../../mod/events.php:249 -#: ../../mod/like.php:363 ../../mod/tagger.php:47 +#: ../../mod/like.php:369 ../../mod/tagger.php:47 msgid "event" msgstr "l'evento" @@ -750,7 +752,7 @@ msgstr "La risposta dal canale non è completa." msgid "Channel was deleted and no longer exists." msgstr "Il canale è stato rimosso e non esiste più." -#: ../../include/follow.php:153 ../../include/follow.php:183 +#: ../../include/follow.php:153 ../../include/follow.php:185 msgid "Protocol disabled." msgstr "Protocollo disabilitato." @@ -758,11 +760,11 @@ msgstr "Protocollo disabilitato." msgid "Channel discovery failed." msgstr "La ricerca del canale non ha avuto successo." -#: ../../include/follow.php:199 +#: ../../include/follow.php:201 msgid "local account not found." msgstr "l'account locale non è stato trovato." -#: ../../include/follow.php:224 +#: ../../include/follow.php:226 msgid "Cannot connect to yourself." msgstr "Non puoi connetterti a te stesso." @@ -775,7 +777,7 @@ msgstr "Non posso creare un canale con un identificativo che già esiste su ques msgid "Channel clone failed. Import failed." msgstr "Impossibile clonare il canale. L'importazione è fallita." -#: ../../include/import.php:80 ../../mod/import.php:148 +#: ../../include/import.php:80 ../../mod/import.php:146 msgid "Cloned channel not found. Import failed." msgstr "Impossibile trovare il canale clonato. L'importazione è fallita." @@ -856,7 +858,7 @@ msgstr "Descrizione (facoltativa)" #: ../../mod/connect.php:93 ../../mod/connedit.php:729 #: ../../mod/events.php:468 ../../mod/events.php:665 #: ../../mod/filestorage.php:156 ../../mod/fsuggest.php:108 -#: ../../mod/group.php:81 ../../mod/import.php:551 +#: ../../mod/group.php:81 ../../mod/import.php:549 #: ../../mod/import_items.php:116 ../../mod/invite.php:142 #: ../../mod/locs.php:116 ../../mod/mail.php:380 ../../mod/mitem.php:231 #: ../../mod/mood.php:135 ../../mod/pconfig.php:108 ../../mod/pdledit.php:62 @@ -865,7 +867,7 @@ msgstr "Descrizione (facoltativa)" #: ../../mod/admin.php:646 ../../mod/admin.php:721 ../../mod/admin.php:986 #: ../../mod/admin.php:1150 ../../mod/admin.php:1326 ../../mod/admin.php:1521 #: ../../mod/admin.php:1606 ../../mod/admin.php:1770 ../../mod/poke.php:182 -#: ../../mod/profiles.php:675 ../../mod/rate.php:168 +#: ../../mod/profiles.php:687 ../../mod/rate.php:168 #: ../../mod/settings.php:597 ../../mod/settings.php:710 #: ../../mod/settings.php:738 ../../mod/settings.php:761 #: ../../mod/settings.php:849 ../../mod/settings.php:1041 @@ -885,7 +887,8 @@ msgid "Unsaved changes. Are you sure you wish to leave this page?" msgstr "Non hai salvato i cambiamenti. Vuoi davvero lasciare questa pagina?" #: ../../include/js_strings.php:25 ../../mod/events.php:459 -#: ../../mod/profiles.php:464 ../../mod/pubsites.php:36 +#: ../../mod/profiles.php:472 ../../mod/profiles.php:697 +#: ../../mod/pubsites.php:36 msgid "Location" msgstr "Posizione geografica" @@ -1157,7 +1160,7 @@ msgstr "Impossibile determinare il mittente." msgid "Stored post could not be verified." msgstr "Non è stato possibile verificare il post." -#: ../../include/nav.php:82 ../../include/nav.php:115 ../../boot.php:1542 +#: ../../include/nav.php:82 ../../include/nav.php:115 ../../boot.php:1550 msgid "Logout" msgstr "Esci" @@ -1182,7 +1185,8 @@ msgstr "Profilo" msgid "Your profile page" msgstr "Il tuo profilo" -#: ../../include/nav.php:88 ../../include/identity.php:924 +#: ../../include/nav.php:88 ../../include/identity.php:932 +#: ../../mod/profiles.php:776 msgid "Edit Profiles" msgstr "Modifica i tuoi profili" @@ -1190,7 +1194,7 @@ msgstr "Modifica i tuoi profili" msgid "Manage/Edit profiles" msgstr "Gestisci i tuoi profili" -#: ../../include/nav.php:90 ../../include/identity.php:928 +#: ../../include/nav.php:90 ../../include/identity.php:936 msgid "Edit Profile" msgstr "Modifica il profilo" @@ -1239,7 +1243,7 @@ msgstr "Clicca per farti riconoscere dal tuo hub principale" msgid "Home Page" msgstr "Bacheca" -#: ../../include/nav.php:150 ../../mod/register.php:258 ../../boot.php:1525 +#: ../../include/nav.php:150 ../../mod/register.php:258 ../../boot.php:1533 msgid "Register" msgstr "Registrati" @@ -1349,7 +1353,7 @@ msgstr "Gestisci i tuoi canali" msgid "Account/Channel Settings" msgstr "Impostazioni dell'account e del canale" -#: ../../include/nav.php:213 ../../include/widgets.php:1343 +#: ../../include/nav.php:213 ../../include/widgets.php:1350 msgid "Admin" msgstr "Amministrazione" @@ -1388,7 +1392,7 @@ msgstr "Nuova pagina web" msgid "View" msgstr "Guarda" -#: ../../include/page_widgets.php:40 ../../include/conversation.php:1179 +#: ../../include/page_widgets.php:40 ../../include/conversation.php:1184 #: ../../include/ItemObject.php:712 ../../mod/editblock.php:171 #: ../../mod/editpost.php:149 ../../mod/editwebpage.php:212 #: ../../mod/events.php:465 ../../mod/photos.php:1060 @@ -1424,17 +1428,17 @@ msgstr "Modificato" msgid "Profile Photos" msgstr "Foto del profilo" -#: ../../include/bbcode.php:123 ../../include/bbcode.php:798 -#: ../../include/bbcode.php:801 ../../include/bbcode.php:806 -#: ../../include/bbcode.php:809 ../../include/bbcode.php:812 -#: ../../include/bbcode.php:815 ../../include/bbcode.php:820 -#: ../../include/bbcode.php:823 ../../include/bbcode.php:828 -#: ../../include/bbcode.php:831 ../../include/bbcode.php:834 -#: ../../include/bbcode.php:837 +#: ../../include/bbcode.php:123 ../../include/bbcode.php:803 +#: ../../include/bbcode.php:806 ../../include/bbcode.php:811 +#: ../../include/bbcode.php:814 ../../include/bbcode.php:817 +#: ../../include/bbcode.php:820 ../../include/bbcode.php:825 +#: ../../include/bbcode.php:828 ../../include/bbcode.php:833 +#: ../../include/bbcode.php:836 ../../include/bbcode.php:839 +#: ../../include/bbcode.php:842 msgid "Image/photo" msgstr "Immagine" -#: ../../include/bbcode.php:162 ../../include/bbcode.php:848 +#: ../../include/bbcode.php:162 ../../include/bbcode.php:853 msgid "Encrypted content" msgstr "Contenuto cifrato" @@ -1479,11 +1483,11 @@ msgstr "il post" msgid "Different viewers will see this text differently" msgstr "Ad altri questo testo potrebbe apparire in modo differente" -#: ../../include/bbcode.php:759 +#: ../../include/bbcode.php:764 msgid "$1 spoiler" msgstr "$1 spoiler" -#: ../../include/bbcode.php:786 +#: ../../include/bbcode.php:791 msgid "$1 wrote:" msgstr "$1 ha scritto:" @@ -1540,7 +1544,7 @@ msgstr "Non specificato" #: ../../include/profile_selectors.php:6 #: ../../include/profile_selectors.php:23 #: ../../include/profile_selectors.php:61 -#: ../../include/profile_selectors.php:97 ../../include/permissions.php:871 +#: ../../include/profile_selectors.php:97 ../../include/permissions.php:881 msgid "Other" msgstr "Altro" @@ -1785,8 +1789,8 @@ msgstr "non mi piace" msgid "dislikes" msgstr "non gli piace" -#: ../../include/taxonomy.php:415 ../../include/identity.php:1296 -#: ../../include/conversation.php:1751 ../../include/ItemObject.php:179 +#: ../../include/taxonomy.php:415 ../../include/conversation.php:1756 +#: ../../include/ItemObject.php:179 ../../include/identity.php:1304 #: ../../mod/photos.php:1097 msgctxt "noun" msgid "Like" @@ -1794,92 +1798,6 @@ msgid_plural "Likes" msgstr[0] "Mi piace" msgstr[1] "Mi piace" -#: ../../include/datetime.php:48 -msgid "Miscellaneous" -msgstr "Altro" - -#: ../../include/datetime.php:132 -msgid "YYYY-MM-DD or MM-DD" -msgstr "AAAA-MM-GG oppure MM-GG" - -#: ../../include/datetime.php:236 ../../mod/appman.php:91 -#: ../../mod/appman.php:92 ../../mod/events.php:444 ../../mod/events.php:449 -msgid "Required" -msgstr "Obbligatorio" - -#: ../../include/datetime.php:263 ../../boot.php:2374 -msgid "never" -msgstr "mai" - -#: ../../include/datetime.php:269 -msgid "less than a second ago" -msgstr "meno di un secondo fa" - -#: ../../include/datetime.php:287 -#, php-format -msgctxt "e.g. 22 hours ago, 1 minute ago" -msgid "%1$d %2$s ago" -msgstr "%1$d %2$s fa" - -#: ../../include/datetime.php:298 -msgctxt "relative_date" -msgid "year" -msgid_plural "years" -msgstr[0] "anno" -msgstr[1] "anni" - -#: ../../include/datetime.php:301 -msgctxt "relative_date" -msgid "month" -msgid_plural "months" -msgstr[0] "mese" -msgstr[1] "mesi" - -#: ../../include/datetime.php:304 -msgctxt "relative_date" -msgid "week" -msgid_plural "weeks" -msgstr[0] "settimana" -msgstr[1] "settimane" - -#: ../../include/datetime.php:307 -msgctxt "relative_date" -msgid "day" -msgid_plural "days" -msgstr[0] "giorno" -msgstr[1] "giorni" - -#: ../../include/datetime.php:310 -msgctxt "relative_date" -msgid "hour" -msgid_plural "hours" -msgstr[0] "ora" -msgstr[1] "ore" - -#: ../../include/datetime.php:313 -msgctxt "relative_date" -msgid "minute" -msgid_plural "minutes" -msgstr[0] "minuto" -msgstr[1] "minuti" - -#: ../../include/datetime.php:316 -msgctxt "relative_date" -msgid "second" -msgid_plural "seconds" -msgstr[0] "secondo" -msgstr[1] "secondi" - -#: ../../include/datetime.php:553 -#, php-format -msgid "%1$s's birthday" -msgstr "Compleanno di %1$s" - -#: ../../include/datetime.php:554 -#, php-format -msgid "Happy Birthday %1$s" -msgstr "Buon compleanno %1$s" - #: ../../include/zot.php:680 msgid "Invalid data packet" msgstr "Dati ricevuti non validi" @@ -1888,12 +1806,12 @@ msgstr "Dati ricevuti non validi" msgid "Unable to verify channel signature" msgstr "Impossibile verificare la firma elettronica del canale" -#: ../../include/zot.php:2272 +#: ../../include/zot.php:2332 #, php-format msgid "Unable to verify site signature for %s" msgstr "Impossibile verificare la firma elettronica del sito %s" -#: ../../include/zot.php:3607 +#: ../../include/zot.php:3667 msgid "invalid target signature" msgstr "la firma ricevuta non è valida" @@ -1997,7 +1915,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:1545 +#: ../../boot.php:1553 msgid "Email" msgstr "Email" @@ -2029,24 +1947,24 @@ msgstr "MySpace" msgid "view full size" msgstr "guarda nelle dimensioni reali" -#: ../../include/network.php:1612 ../../include/enotify.php:57 +#: ../../include/network.php:1816 ../../include/enotify.php:57 msgid "$Projectname Notification" msgstr "Notifica $Projectname" -#: ../../include/network.php:1613 ../../include/enotify.php:58 +#: ../../include/network.php:1817 ../../include/enotify.php:58 msgid "$projectname" msgstr "$projectname" -#: ../../include/network.php:1615 ../../include/enotify.php:60 +#: ../../include/network.php:1819 ../../include/enotify.php:60 msgid "Thank You," msgstr "Grazie," -#: ../../include/network.php:1617 ../../include/enotify.php:62 +#: ../../include/network.php:1821 ../../include/enotify.php:62 #, php-format msgid "%s Administrator" msgstr "L'amministratore di %s" -#: ../../include/network.php:1674 +#: ../../include/network.php:1878 msgid "No Subject" msgstr "Nessun titolo" @@ -2078,7 +1996,7 @@ msgctxt "photo_upload" msgid "%1$s posted %2$s to %3$s" msgstr "%1$s ha pubblicato %2$s su %3$s" -#: ../../include/photos.php:506 ../../include/conversation.php:1644 +#: ../../include/photos.php:506 ../../include/conversation.php:1649 msgid "Photo Albums" msgstr "Album foto" @@ -2370,7 +2288,8 @@ msgstr "Mostra la nuvola dei tag che usi di più sulla pagina del tuo canale" msgid "System" msgstr "Sistema" -#: ../../include/widgets.php:105 ../../include/conversation.php:1536 +#: ../../include/widgets.php:105 ../../include/conversation.php:1541 +#: ../../mod/profiles.php:696 msgid "Personal" msgstr "Personali" @@ -2568,111 +2487,115 @@ msgstr "Chat nei segnalibri" msgid "Suggested Chatrooms" msgstr "Chat suggerite" -#: ../../include/widgets.php:972 ../../include/widgets.php:1082 +#: ../../include/widgets.php:972 ../../include/widgets.php:1086 msgid "photo/image" msgstr "foto/immagine" -#: ../../include/widgets.php:1176 +#: ../../include/widgets.php:1029 +msgid "Click to show more" +msgstr "Clicca per mostrare tutto" + +#: ../../include/widgets.php:1180 msgid "Rating Tools" msgstr "Valutazione" -#: ../../include/widgets.php:1180 ../../include/widgets.php:1182 +#: ../../include/widgets.php:1184 ../../include/widgets.php:1186 msgid "Rate Me" msgstr "Valutami" -#: ../../include/widgets.php:1185 +#: ../../include/widgets.php:1189 msgid "View Ratings" msgstr "Vedi le valutazioni ricevute" -#: ../../include/widgets.php:1196 ../../mod/pubsites.php:18 +#: ../../include/widgets.php:1200 ../../mod/pubsites.php:18 msgid "Public Hubs" msgstr "Hub pubblici" -#: ../../include/widgets.php:1244 +#: ../../include/widgets.php:1248 msgid "Forums" msgstr "Forum" -#: ../../include/widgets.php:1273 +#: ../../include/widgets.php:1277 msgid "Tasks" msgstr "Attività " -#: ../../include/widgets.php:1282 +#: ../../include/widgets.php:1286 msgid "Documentation" msgstr "Guida" -#: ../../include/widgets.php:1284 +#: ../../include/widgets.php:1288 msgid "Project/Site Information" msgstr "Informazioni sul sito/progetto" -#: ../../include/widgets.php:1285 +#: ../../include/widgets.php:1289 msgid "For Members" msgstr "Per gli utenti" -#: ../../include/widgets.php:1286 +#: ../../include/widgets.php:1290 msgid "For Administrators" msgstr "Per gli amministratori" -#: ../../include/widgets.php:1287 +#: ../../include/widgets.php:1291 msgid "For Developers" msgstr "Per sviluppatori" -#: ../../include/widgets.php:1312 ../../mod/admin.php:456 +#: ../../include/widgets.php:1316 ../../mod/admin.php:456 msgid "Site" msgstr "Sito" -#: ../../include/widgets.php:1313 +#: ../../include/widgets.php:1317 msgid "Accounts" msgstr "Account" -#: ../../include/widgets.php:1314 ../../mod/admin.php:1149 +#: ../../include/widgets.php:1317 ../../include/widgets.php:1355 +msgid "Member registrations waiting for confirmation" +msgstr "Richieste di registrazione in attesa di conferma" + +#: ../../include/widgets.php:1318 ../../mod/admin.php:1149 msgid "Channels" msgstr "Canali" -#: ../../include/widgets.php:1315 ../../mod/admin.php:710 +#: ../../include/widgets.php:1319 ../../mod/admin.php:710 msgid "Security" msgstr "Sicurezza" -#: ../../include/widgets.php:1317 ../../mod/admin.php:1264 +#: ../../include/widgets.php:1321 ../../mod/admin.php:1264 #: ../../mod/admin.php:1325 msgid "Plugins" msgstr "Plugin" -#: ../../include/widgets.php:1318 ../../mod/admin.php:1486 +#: ../../include/widgets.php:1322 ../../mod/admin.php:1486 #: ../../mod/admin.php:1520 msgid "Themes" msgstr "Temi" -#: ../../include/widgets.php:1319 +#: ../../include/widgets.php:1323 msgid "Inspect queue" msgstr "Coda di attesa" -#: ../../include/widgets.php:1320 ../../mod/admin.php:1760 +#: ../../include/widgets.php:1324 ../../mod/admin.php:1760 msgid "Profile Fields" msgstr "Campi del profilo" -#: ../../include/widgets.php:1321 +#: ../../include/widgets.php:1325 msgid "DB updates" msgstr "Aggiornamenti al DB" -#: ../../include/widgets.php:1339 ../../include/widgets.php:1345 +#: ../../include/widgets.php:1343 ../../include/widgets.php:1353 #: ../../mod/admin.php:1605 msgid "Logs" msgstr "Log" -#: ../../include/widgets.php:1344 +#: ../../include/widgets.php:1351 msgid "Plugin Features" msgstr "Plugin" -#: ../../include/widgets.php:1346 -msgid "User registrations waiting for confirmation" -msgstr "Registrazioni in attesa" - -#: ../../include/widgets.php:1424 ../../mod/photos.php:760 +#: ../../include/widgets.php:1433 ../../mod/photos.php:760 #: ../../mod/photos.php:1300 msgid "View Photo" msgstr "Guarda la foto" -#: ../../include/widgets.php:1441 ../../mod/photos.php:791 +#: ../../include/widgets.php:1450 ../../mod/photos.php:791 msgid "Edit Album" msgstr "Modifica album" @@ -2716,7 +2639,7 @@ msgstr "poke" #: ../../include/text.php:973 ../../include/text.php:978 #: ../../include/conversation.php:243 msgid "poked" -msgstr "ha ricevuto un poke" +msgstr "ha mandato un poke" #: ../../include/text.php:979 msgid "ping" @@ -2891,12 +2814,12 @@ msgid "Select an alternate language" msgstr "Seleziona una lingua diversa" #: ../../include/text.php:1948 ../../include/conversation.php:120 -#: ../../mod/like.php:361 ../../mod/subthread.php:83 ../../mod/tagger.php:43 +#: ../../mod/like.php:367 ../../mod/subthread.php:83 ../../mod/tagger.php:43 msgid "photo" msgstr "la foto" #: ../../include/text.php:1954 ../../include/conversation.php:148 -#: ../../mod/like.php:361 ../../mod/subthread.php:83 +#: ../../mod/like.php:367 ../../mod/subthread.php:83 msgid "status" msgstr "il messaggio di stato" @@ -3139,235 +3062,100 @@ msgstr "Visita %s per approvare o rifiutare il suggerimento." msgid "[Hubzilla:Notify]" msgstr "[Hubzilla]" -#: ../../include/identity.php:32 -msgid "Unable to obtain identity information from database" -msgstr "Impossibile ottenere le informazioni di identificazione dal database" - -#: ../../include/identity.php:66 -msgid "Empty name" -msgstr "Nome vuoto" - -#: ../../include/identity.php:69 -msgid "Name too long" -msgstr "Nome troppo lungo" - -#: ../../include/identity.php:181 -msgid "No account identifier" -msgstr "Account senza identificativo" - -#: ../../include/identity.php:193 -msgid "Nickname is required." -msgstr "Il nome dell'account è obbligatorio." - -#: ../../include/identity.php:207 -msgid "Reserved nickname. Please choose another." -msgstr "Nome utente riservato. Per favore scegline un altro." - -#: ../../include/identity.php:212 -msgid "" -"Nickname has unsupported characters or is already being used on this site." -msgstr "Il nome dell'account è già in uso oppure ha dei caratteri non supportati." - -#: ../../include/identity.php:288 -msgid "Unable to retrieve created identity" -msgstr "Impossibile caricare l'identità creata" - -#: ../../include/identity.php:346 -msgid "Default Profile" -msgstr "Profilo predefinito" - -#: ../../include/identity.php:776 -msgid "Requested channel is not available." -msgstr "Il canale che cerchi non è disponibile." - -#: ../../include/identity.php:822 ../../mod/achievements.php:11 -#: ../../mod/blocks.php:29 ../../mod/connect.php:13 ../../mod/editblock.php:29 -#: ../../mod/editlayout.php:27 ../../mod/editwebpage.php:28 -#: ../../mod/filestorage.php:54 ../../mod/hcard.php:8 ../../mod/layouts.php:29 -#: ../../mod/profile.php:16 ../../mod/webpages.php:29 -msgid "Requested profile is not available." -msgstr "Il profilo richiesto non è disponibile." - -#: ../../include/identity.php:917 ../../mod/profiles.php:782 -msgid "Change profile photo" -msgstr "Cambia la foto del profilo" - -#: ../../include/identity.php:925 ../../mod/profiles.php:783 -msgid "Create New Profile" -msgstr "Crea un nuovo profilo" - -#: ../../include/identity.php:942 ../../mod/profiles.php:794 -msgid "Profile Image" -msgstr "Immagine del profilo" - -#: ../../include/identity.php:945 -msgid "Visible to everybody" -msgstr "Visibile a tutti" - -#: ../../include/identity.php:946 ../../mod/profiles.php:677 -#: ../../mod/profiles.php:798 -msgid "Edit visibility" -msgstr "Cambia la visibilità " - -#: ../../include/identity.php:1022 ../../include/identity.php:1280 -msgid "Gender:" -msgstr "Sesso:" - -#: ../../include/identity.php:1023 ../../include/identity.php:1324 -msgid "Status:" -msgstr "Stato:" - -#: ../../include/identity.php:1024 ../../include/identity.php:1335 -msgid "Homepage:" -msgstr "Home page:" - -#: ../../include/identity.php:1025 -msgid "Online Now" -msgstr "Online adesso" - -#: ../../include/identity.php:1113 ../../include/identity.php:1191 -#: ../../mod/ping.php:318 -msgid "g A l F d" -msgstr "g A l d F" - -#: ../../include/identity.php:1114 ../../include/identity.php:1192 -msgid "F d" -msgstr "d F" - -#: ../../include/identity.php:1159 ../../include/identity.php:1231 -#: ../../mod/ping.php:341 -msgid "[today]" -msgstr "[oggi]" - -#: ../../include/identity.php:1170 -msgid "Birthday Reminders" -msgstr "Promemoria compleanni" - -#: ../../include/identity.php:1171 -msgid "Birthdays this week:" -msgstr "Compleanni questa settimana:" - -#: ../../include/identity.php:1224 -msgid "[No description]" -msgstr "[Nessuna descrizione]" - -#: ../../include/identity.php:1242 -msgid "Event Reminders" -msgstr "Promemoria" - -#: ../../include/identity.php:1243 -msgid "Events this week:" -msgstr "Eventi della settimana:" - -#: ../../include/identity.php:1278 ../../mod/settings.php:1047 -msgid "Full Name:" -msgstr "Nome completo:" - -#: ../../include/identity.php:1285 -msgid "Like this channel" -msgstr "Mi piace questo canale" - -#: ../../include/identity.php:1309 -msgid "j F, Y" -msgstr "j F Y" - -#: ../../include/identity.php:1310 -msgid "j F" -msgstr "j F" +#: ../../include/datetime.php:48 ../../mod/profiles.php:699 +msgid "Miscellaneous" +msgstr "Altro" -#: ../../include/identity.php:1317 -msgid "Birthday:" -msgstr "Compleanno:" +#: ../../include/datetime.php:136 +msgid "Birthday" +msgstr "Compleanno" -#: ../../include/identity.php:1321 ../../mod/directory.php:302 -msgid "Age:" +#: ../../include/datetime.php:138 +msgid "Age: " msgstr "Età :" -#: ../../include/identity.php:1330 -#, php-format -msgid "for %1$d %2$s" -msgstr "per %1$d %2$s" - -#: ../../include/identity.php:1333 ../../mod/profiles.php:699 -msgid "Sexual Preference:" -msgstr "Preferenze sessuali:" - -#: ../../include/identity.php:1337 ../../mod/directory.php:318 -#: ../../mod/profiles.php:701 -msgid "Hometown:" -msgstr "Città dove vivo:" - -#: ../../include/identity.php:1339 -msgid "Tags:" -msgstr "Tag:" - -#: ../../include/identity.php:1341 ../../mod/profiles.php:702 -msgid "Political Views:" -msgstr "Orientamento politico:" - -#: ../../include/identity.php:1343 -msgid "Religion:" -msgstr "Religione:" - -#: ../../include/identity.php:1345 ../../mod/directory.php:320 -msgid "About:" -msgstr "Informazioni:" - -#: ../../include/identity.php:1347 -msgid "Hobbies/Interests:" -msgstr "Interessi e hobby:" +#: ../../include/datetime.php:140 +msgid "YYYY-MM-DD or MM-DD" +msgstr "AAAA-MM-GG oppure MM-GG" -#: ../../include/identity.php:1349 ../../mod/profiles.php:705 -msgid "Likes:" -msgstr "Mi piace:" +#: ../../include/datetime.php:246 ../../mod/appman.php:91 +#: ../../mod/appman.php:92 ../../mod/events.php:444 ../../mod/events.php:449 +#: ../../mod/profiles.php:708 ../../mod/profiles.php:712 +msgid "Required" +msgstr "Obbligatorio" -#: ../../include/identity.php:1351 ../../mod/profiles.php:706 -msgid "Dislikes:" -msgstr "Non mi piace:" +#: ../../include/datetime.php:273 ../../boot.php:2382 +msgid "never" +msgstr "mai" -#: ../../include/identity.php:1353 -msgid "Contact information and Social Networks:" -msgstr "Contatti e social network:" +#: ../../include/datetime.php:279 +msgid "less than a second ago" +msgstr "meno di un secondo fa" -#: ../../include/identity.php:1355 -msgid "My other channels:" -msgstr "I miei altri canali:" +#: ../../include/datetime.php:297 +#, php-format +msgctxt "e.g. 22 hours ago, 1 minute ago" +msgid "%1$d %2$s ago" +msgstr "%1$d %2$s fa" -#: ../../include/identity.php:1357 -msgid "Musical interests:" -msgstr "Gusti musicali:" +#: ../../include/datetime.php:308 +msgctxt "relative_date" +msgid "year" +msgid_plural "years" +msgstr[0] "anno" +msgstr[1] "anni" -#: ../../include/identity.php:1359 -msgid "Books, literature:" -msgstr "Libri, letteratura:" +#: ../../include/datetime.php:311 +msgctxt "relative_date" +msgid "month" +msgid_plural "months" +msgstr[0] "mese" +msgstr[1] "mesi" -#: ../../include/identity.php:1361 -msgid "Television:" -msgstr "Televisione:" +#: ../../include/datetime.php:314 +msgctxt "relative_date" +msgid "week" +msgid_plural "weeks" +msgstr[0] "settimana" +msgstr[1] "settimane" -#: ../../include/identity.php:1363 -msgid "Film/dance/culture/entertainment:" -msgstr "Film, danza, cultura, intrattenimento:" +#: ../../include/datetime.php:317 +msgctxt "relative_date" +msgid "day" +msgid_plural "days" +msgstr[0] "giorno" +msgstr[1] "giorni" -#: ../../include/identity.php:1365 -msgid "Love/Romance:" -msgstr "Amore:" +#: ../../include/datetime.php:320 +msgctxt "relative_date" +msgid "hour" +msgid_plural "hours" +msgstr[0] "ora" +msgstr[1] "ore" -#: ../../include/identity.php:1367 -msgid "Work/employment:" -msgstr "Lavoro:" +#: ../../include/datetime.php:323 +msgctxt "relative_date" +msgid "minute" +msgid_plural "minutes" +msgstr[0] "minuto" +msgstr[1] "minuti" -#: ../../include/identity.php:1369 -msgid "School/education:" -msgstr "Scuola:" +#: ../../include/datetime.php:326 +msgctxt "relative_date" +msgid "second" +msgid_plural "seconds" +msgstr[0] "secondo" +msgstr[1] "secondi" -#: ../../include/identity.php:1389 -msgid "Like this thing" -msgstr "Mi piace" +#: ../../include/datetime.php:563 +#, php-format +msgid "%1$s's birthday" +msgstr "Compleanno di %1$s" -#: ../../include/identity.php:1799 ../../mod/cover_photo.php:236 -msgid "cover photo" -msgstr "Copertina del canale" +#: ../../include/datetime.php:564 +#, php-format +msgid "Happy Birthday %1$s" +msgstr "Buon compleanno %1$s" #: ../../include/oembed.php:267 msgid "Embedded content" @@ -3381,12 +3169,12 @@ msgstr "Disabilita la creazione di contenuti incorporati" msgid "channel" msgstr "il canale" -#: ../../include/conversation.php:164 ../../mod/like.php:410 +#: ../../include/conversation.php:164 ../../mod/like.php:416 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "A %1$s piace %3$s di %2$s" -#: ../../include/conversation.php:167 ../../mod/like.php:412 +#: ../../include/conversation.php:167 ../../mod/like.php:418 #, php-format msgid "%1$s doesn't like %2$s's %3$s" msgstr "A %1$s non piace %3$s di %2$s" @@ -3495,7 +3283,7 @@ msgstr "Scadenza: %s" msgid "View in context" msgstr "Vedi nel contesto" -#: ../../include/conversation.php:740 ../../include/conversation.php:1237 +#: ../../include/conversation.php:740 ../../include/conversation.php:1242 #: ../../include/ItemObject.php:389 ../../mod/editblock.php:150 #: ../../mod/editlayout.php:148 ../../mod/editpost.php:129 #: ../../mod/editwebpage.php:190 ../../mod/photos.php:1040 @@ -3584,305 +3372,305 @@ msgstr "Piace a %s." msgid "%s don't like this." msgstr "Non piace a %s." -#: ../../include/conversation.php:1164 +#: ../../include/conversation.php:1169 msgid "Visible to <strong>everybody</strong>" msgstr "Visibile a <strong>tutti</strong>" -#: ../../include/conversation.php:1165 ../../mod/mail.php:202 +#: ../../include/conversation.php:1170 ../../mod/mail.php:202 #: ../../mod/mail.php:316 msgid "Please enter a link URL:" msgstr "Inserisci l'indirizzo del link:" -#: ../../include/conversation.php:1166 +#: ../../include/conversation.php:1171 msgid "Please enter a video link/URL:" msgstr "Inserisci l'indirizzo del video:" -#: ../../include/conversation.php:1167 +#: ../../include/conversation.php:1172 msgid "Please enter an audio link/URL:" msgstr "Inserisci l'indirizzo dell'audio:" -#: ../../include/conversation.php:1168 +#: ../../include/conversation.php:1173 msgid "Tag term:" msgstr "Tag:" -#: ../../include/conversation.php:1169 ../../mod/filer.php:48 +#: ../../include/conversation.php:1174 ../../mod/filer.php:48 msgid "Save to Folder:" msgstr "Salva nella cartella:" -#: ../../include/conversation.php:1170 +#: ../../include/conversation.php:1175 msgid "Where are you right now?" msgstr "Dove sei ora?" -#: ../../include/conversation.php:1171 ../../mod/editpost.php:56 +#: ../../include/conversation.php:1176 ../../mod/editpost.php:56 #: ../../mod/mail.php:203 ../../mod/mail.php:317 msgid "Expires YYYY-MM-DD HH:MM" msgstr "Scade il YYYY-MM-DD HH:MM" -#: ../../include/conversation.php:1202 ../../mod/blocks.php:154 +#: ../../include/conversation.php:1207 ../../mod/blocks.php:154 #: ../../mod/layouts.php:184 ../../mod/photos.php:1039 #: ../../mod/webpages.php:184 msgid "Share" msgstr "Condividi" -#: ../../include/conversation.php:1204 +#: ../../include/conversation.php:1209 msgid "Page link name" msgstr "Nome del link alla pagina" -#: ../../include/conversation.php:1207 +#: ../../include/conversation.php:1212 msgid "Post as" msgstr "Pubblica come " -#: ../../include/conversation.php:1209 ../../include/ItemObject.php:704 +#: ../../include/conversation.php:1214 ../../include/ItemObject.php:704 #: ../../mod/editblock.php:136 ../../mod/editlayout.php:135 #: ../../mod/editpost.php:113 ../../mod/editwebpage.php:177 msgid "Bold" msgstr "Grassetto" -#: ../../include/conversation.php:1210 ../../include/ItemObject.php:705 +#: ../../include/conversation.php:1215 ../../include/ItemObject.php:705 #: ../../mod/editblock.php:137 ../../mod/editlayout.php:136 #: ../../mod/editpost.php:114 ../../mod/editwebpage.php:178 msgid "Italic" msgstr "Corsivo" -#: ../../include/conversation.php:1211 ../../include/ItemObject.php:706 +#: ../../include/conversation.php:1216 ../../include/ItemObject.php:706 #: ../../mod/editblock.php:138 ../../mod/editlayout.php:137 #: ../../mod/editpost.php:115 ../../mod/editwebpage.php:179 msgid "Underline" msgstr "Sottolineato" -#: ../../include/conversation.php:1212 ../../include/ItemObject.php:707 +#: ../../include/conversation.php:1217 ../../include/ItemObject.php:707 #: ../../mod/editblock.php:139 ../../mod/editlayout.php:138 #: ../../mod/editpost.php:116 ../../mod/editwebpage.php:180 msgid "Quote" msgstr "Citazione" -#: ../../include/conversation.php:1213 ../../include/ItemObject.php:708 +#: ../../include/conversation.php:1218 ../../include/ItemObject.php:708 #: ../../mod/editblock.php:140 ../../mod/editlayout.php:139 #: ../../mod/editpost.php:117 ../../mod/editwebpage.php:181 msgid "Code" msgstr "Codice" -#: ../../include/conversation.php:1214 ../../mod/editblock.php:142 +#: ../../include/conversation.php:1219 ../../mod/editblock.php:142 #: ../../mod/editlayout.php:140 ../../mod/editpost.php:118 #: ../../mod/editwebpage.php:182 msgid "Upload photo" msgstr "Carica foto" -#: ../../include/conversation.php:1215 +#: ../../include/conversation.php:1220 msgid "upload photo" msgstr "carica foto" -#: ../../include/conversation.php:1216 ../../mod/editblock.php:143 +#: ../../include/conversation.php:1221 ../../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 "Allega file" -#: ../../include/conversation.php:1217 +#: ../../include/conversation.php:1222 msgid "attach file" msgstr "allega file" -#: ../../include/conversation.php:1218 ../../mod/editblock.php:144 +#: ../../include/conversation.php:1223 ../../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 "Inserisci un indirizzo web" -#: ../../include/conversation.php:1219 +#: ../../include/conversation.php:1224 msgid "web link" msgstr "link web" -#: ../../include/conversation.php:1220 +#: ../../include/conversation.php:1225 msgid "Insert video link" msgstr "Inserisci l'indirizzo del video" -#: ../../include/conversation.php:1221 +#: ../../include/conversation.php:1226 msgid "video link" msgstr "link video" -#: ../../include/conversation.php:1222 +#: ../../include/conversation.php:1227 msgid "Insert audio link" msgstr "Inserisci l'indirizzo dell'audio" -#: ../../include/conversation.php:1223 +#: ../../include/conversation.php:1228 msgid "audio link" msgstr "link audio" -#: ../../include/conversation.php:1224 ../../mod/editblock.php:148 +#: ../../include/conversation.php:1229 ../../mod/editblock.php:148 #: ../../mod/editlayout.php:146 ../../mod/editpost.php:124 #: ../../mod/editwebpage.php:188 msgid "Set your location" msgstr "La tua località " -#: ../../include/conversation.php:1225 +#: ../../include/conversation.php:1230 msgid "set location" msgstr "la tua località " -#: ../../include/conversation.php:1226 ../../mod/editpost.php:126 +#: ../../include/conversation.php:1231 ../../mod/editpost.php:126 msgid "Toggle voting" msgstr "Abilita/disabilita il voto" -#: ../../include/conversation.php:1229 ../../mod/editblock.php:149 +#: ../../include/conversation.php:1234 ../../mod/editblock.php:149 #: ../../mod/editlayout.php:147 ../../mod/editpost.php:125 #: ../../mod/editwebpage.php:189 msgid "Clear browser location" msgstr "Rimuovi la località data dal browser" -#: ../../include/conversation.php:1230 +#: ../../include/conversation.php:1235 msgid "clear location" msgstr "rimuovi la località " -#: ../../include/conversation.php:1232 ../../mod/editblock.php:162 +#: ../../include/conversation.php:1237 ../../mod/editblock.php:162 #: ../../mod/editpost.php:141 ../../mod/editwebpage.php:205 msgid "Title (optional)" msgstr "Titolo (facoltativo)" -#: ../../include/conversation.php:1236 ../../mod/editblock.php:165 +#: ../../include/conversation.php:1241 ../../mod/editblock.php:165 #: ../../mod/editlayout.php:163 ../../mod/editpost.php:143 #: ../../mod/editwebpage.php:207 msgid "Categories (optional, comma-separated list)" msgstr "Categorie (facoltative, lista separata da virgole)" -#: ../../include/conversation.php:1238 ../../mod/editblock.php:151 +#: ../../include/conversation.php:1243 ../../mod/editblock.php:151 #: ../../mod/editlayout.php:149 ../../mod/editpost.php:130 #: ../../mod/editwebpage.php:191 ../../mod/events.php:466 msgid "Permission settings" msgstr "Permessi dei tuoi contatti" -#: ../../include/conversation.php:1239 +#: ../../include/conversation.php:1244 msgid "permissions" msgstr "permessi" -#: ../../include/conversation.php:1247 ../../mod/editblock.php:159 +#: ../../include/conversation.php:1252 ../../mod/editblock.php:159 #: ../../mod/editlayout.php:156 ../../mod/editpost.php:138 #: ../../mod/editwebpage.php:200 msgid "Public post" msgstr "Post pubblico" -#: ../../include/conversation.php:1249 ../../mod/editblock.php:166 +#: ../../include/conversation.php:1254 ../../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 "Per esempio: mario@esempio.com, simona@esempio.com" -#: ../../include/conversation.php:1262 ../../mod/editblock.php:176 +#: ../../include/conversation.php:1267 ../../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 "Data di scadenza" -#: ../../include/conversation.php:1265 +#: ../../include/conversation.php:1270 msgid "Set publish date" msgstr "Data di uscita programmata" -#: ../../include/conversation.php:1267 ../../include/ItemObject.php:715 +#: ../../include/conversation.php:1272 ../../include/ItemObject.php:715 #: ../../mod/editpost.php:157 ../../mod/mail.php:255 ../../mod/mail.php:385 msgid "Encrypt text" msgstr "Cifratura del messaggio" -#: ../../include/conversation.php:1269 ../../mod/editpost.php:159 +#: ../../include/conversation.php:1274 ../../mod/editpost.php:159 msgid "OK" msgstr "OK" -#: ../../include/conversation.php:1270 ../../mod/editpost.php:160 +#: ../../include/conversation.php:1275 ../../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 "Annulla" -#: ../../include/conversation.php:1513 +#: ../../include/conversation.php:1518 msgid "Discover" msgstr "Scopri" -#: ../../include/conversation.php:1516 +#: ../../include/conversation.php:1521 msgid "Imported public streams" msgstr "Contenuti pubblici importati" -#: ../../include/conversation.php:1521 +#: ../../include/conversation.php:1526 msgid "Commented Order" msgstr "Commenti recenti" -#: ../../include/conversation.php:1524 +#: ../../include/conversation.php:1529 msgid "Sort by Comment Date" msgstr "Per data del commento" -#: ../../include/conversation.php:1528 +#: ../../include/conversation.php:1533 msgid "Posted Order" msgstr "Post recenti" -#: ../../include/conversation.php:1531 +#: ../../include/conversation.php:1536 msgid "Sort by Post Date" msgstr "Per data di creazione" -#: ../../include/conversation.php:1539 +#: ../../include/conversation.php:1544 msgid "Posts that mention or involve you" msgstr "Post che ti riguardano" -#: ../../include/conversation.php:1545 ../../mod/connections.php:72 +#: ../../include/conversation.php:1550 ../../mod/connections.php:72 #: ../../mod/connections.php:82 ../../mod/menu.php:112 msgid "New" msgstr "Novità " -#: ../../include/conversation.php:1548 +#: ../../include/conversation.php:1553 msgid "Activity Stream - by date" msgstr "Elenco attività - per data" -#: ../../include/conversation.php:1554 +#: ../../include/conversation.php:1559 msgid "Starred" msgstr "Preferiti" -#: ../../include/conversation.php:1557 +#: ../../include/conversation.php:1562 msgid "Favourite Posts" msgstr "Post preferiti" -#: ../../include/conversation.php:1564 +#: ../../include/conversation.php:1569 msgid "Spam" msgstr "Spam" -#: ../../include/conversation.php:1567 +#: ../../include/conversation.php:1572 msgid "Posts flagged as SPAM" msgstr "Post marcati come spam" -#: ../../include/conversation.php:1620 ../../mod/admin.php:1157 +#: ../../include/conversation.php:1625 ../../mod/admin.php:1157 msgid "Channel" msgstr "Canale" -#: ../../include/conversation.php:1623 +#: ../../include/conversation.php:1628 msgid "Status Messages and Posts" msgstr "Post e messaggi di stato" -#: ../../include/conversation.php:1632 +#: ../../include/conversation.php:1637 msgid "About" msgstr "Informazioni" -#: ../../include/conversation.php:1635 +#: ../../include/conversation.php:1640 msgid "Profile Details" msgstr "Dettagli del profilo" -#: ../../include/conversation.php:1651 +#: ../../include/conversation.php:1656 msgid "Files and Storage" msgstr "Archivio file" -#: ../../include/conversation.php:1672 ../../include/conversation.php:1675 +#: ../../include/conversation.php:1677 ../../include/conversation.php:1680 msgid "Chatrooms" msgstr "Chat" -#: ../../include/conversation.php:1688 +#: ../../include/conversation.php:1693 msgid "Saved Bookmarks" msgstr "Segnalibri salvati" -#: ../../include/conversation.php:1698 +#: ../../include/conversation.php:1703 msgid "Manage Webpages" msgstr "Gestisci le pagine web" -#: ../../include/conversation.php:1727 ../../include/ItemObject.php:175 +#: ../../include/conversation.php:1732 ../../include/ItemObject.php:175 #: ../../include/ItemObject.php:187 ../../mod/photos.php:1093 #: ../../mod/photos.php:1105 msgid "View all" msgstr "Vedi tutto" -#: ../../include/conversation.php:1754 ../../include/ItemObject.php:184 +#: ../../include/conversation.php:1759 ../../include/ItemObject.php:184 #: ../../mod/photos.php:1102 msgctxt "noun" msgid "Dislike" @@ -3890,42 +3678,42 @@ msgid_plural "Dislikes" msgstr[0] "Non mi piace" msgstr[1] "Non mi piace" -#: ../../include/conversation.php:1757 +#: ../../include/conversation.php:1762 msgctxt "noun" msgid "Attending" msgid_plural "Attending" msgstr[0] "Partecipa" msgstr[1] "Partecipano" -#: ../../include/conversation.php:1760 +#: ../../include/conversation.php:1765 msgctxt "noun" msgid "Not Attending" msgid_plural "Not Attending" msgstr[0] "Non partecipa" msgstr[1] "Non partecipano" -#: ../../include/conversation.php:1763 +#: ../../include/conversation.php:1768 msgctxt "noun" msgid "Undecided" msgid_plural "Undecided" msgstr[0] "Indeciso" msgstr[1] "Indecisi" -#: ../../include/conversation.php:1766 +#: ../../include/conversation.php:1771 msgctxt "noun" msgid "Agree" msgid_plural "Agrees" msgstr[0] "D'accordo" msgstr[1] "D'accordo" -#: ../../include/conversation.php:1769 +#: ../../include/conversation.php:1774 msgctxt "noun" msgid "Disagree" msgid_plural "Disagrees" msgstr[0] "Non d'accordo" msgstr[1] "Non d'accordo" -#: ../../include/conversation.php:1772 +#: ../../include/conversation.php:1777 msgctxt "noun" msgid "Abstain" msgid_plural "Abstains" @@ -4148,63 +3936,63 @@ msgid "" "Extremely advanced. Leave this alone unless you know what you are doing" msgstr "Impostazione pericolosa - lasciare il valore predefinito se non si è assolutamente sicuri" -#: ../../include/permissions.php:867 +#: ../../include/permissions.php:877 msgid "Social Networking" msgstr "Social network" -#: ../../include/permissions.php:867 +#: ../../include/permissions.php:877 msgid "Social - Mostly Public" msgstr "Social - Prevalentemente pubblico" -#: ../../include/permissions.php:867 +#: ../../include/permissions.php:877 msgid "Social - Restricted" msgstr "Social - Con restrizioni" -#: ../../include/permissions.php:867 +#: ../../include/permissions.php:877 msgid "Social - Private" msgstr "Social - Privato" -#: ../../include/permissions.php:868 +#: ../../include/permissions.php:878 msgid "Community Forum" msgstr "Forum di discussione" -#: ../../include/permissions.php:868 +#: ../../include/permissions.php:878 msgid "Forum - Mostly Public" msgstr "Social - Prevalentemente pubblico" -#: ../../include/permissions.php:868 +#: ../../include/permissions.php:878 msgid "Forum - Restricted" msgstr "Forum - Con restrizioni" -#: ../../include/permissions.php:868 +#: ../../include/permissions.php:878 msgid "Forum - Private" msgstr "Forum - Privato" -#: ../../include/permissions.php:869 +#: ../../include/permissions.php:879 msgid "Feed Republish" msgstr "Aggregatore di feed esterni" -#: ../../include/permissions.php:869 +#: ../../include/permissions.php:879 msgid "Feed - Mostly Public" msgstr "Feed - Prevalentemente pubblico" -#: ../../include/permissions.php:869 +#: ../../include/permissions.php:879 msgid "Feed - Restricted" msgstr "Feed - Con restrizioni" -#: ../../include/permissions.php:870 +#: ../../include/permissions.php:880 msgid "Special Purpose" msgstr "Per finalità speciali" -#: ../../include/permissions.php:870 +#: ../../include/permissions.php:880 msgid "Special - Celebrity/Soapbox" msgstr "Speciale - Pagina per fan" -#: ../../include/permissions.php:870 +#: ../../include/permissions.php:880 msgid "Special - Group Repository" msgstr "Speciale - Repository di gruppo" -#: ../../include/permissions.php:871 +#: ../../include/permissions.php:881 msgid "Custom/Expert Mode" msgstr "Personalizzazione per esperti" @@ -4215,99 +4003,328 @@ msgstr "Personalizzazione per esperti" msgid "Permission denied" msgstr "Permesso negato" -#: ../../include/items.php:1138 ../../include/items.php:1184 +#: ../../include/items.php:1138 ../../include/items.php:1183 msgid "(Unknown)" msgstr "(Sconosciuto)" -#: ../../include/items.php:1384 +#: ../../include/items.php:1382 msgid "Visible to anybody on the internet." msgstr "Visibile a chiunque su internet." -#: ../../include/items.php:1386 +#: ../../include/items.php:1384 msgid "Visible to you only." msgstr "Visibile solo a te." -#: ../../include/items.php:1388 +#: ../../include/items.php:1386 msgid "Visible to anybody in this network." msgstr "Visibile a tutti su questa rete." -#: ../../include/items.php:1390 +#: ../../include/items.php:1388 msgid "Visible to anybody authenticated." msgstr "Visibile a chiunque sia autenticato." -#: ../../include/items.php:1392 +#: ../../include/items.php:1390 #, php-format msgid "Visible to anybody on %s." msgstr "Visibile a tutti su %s." -#: ../../include/items.php:1394 +#: ../../include/items.php:1392 msgid "Visible to all connections." msgstr "Visibile a tutti coloro che ti seguono." -#: ../../include/items.php:1396 +#: ../../include/items.php:1394 msgid "Visible to approved connections." msgstr "Visibile ai contatti approvati." -#: ../../include/items.php:1398 +#: ../../include/items.php:1396 msgid "Visible to specific connections." msgstr "Visibile ad alcuni contatti scelti." -#: ../../include/items.php:4496 ../../mod/display.php:36 +#: ../../include/items.php:4581 ../../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 non trovato." -#: ../../include/items.php:5032 ../../mod/group.php:38 ../../mod/group.php:137 +#: ../../include/items.php:5117 ../../mod/group.php:38 ../../mod/group.php:137 msgid "Privacy group not found." msgstr "Gruppo di canali non trovato." -#: ../../include/items.php:5048 +#: ../../include/items.php:5133 msgid "Privacy group is empty." msgstr "Gruppo di canali vuoto." -#: ../../include/items.php:5055 +#: ../../include/items.php:5140 #, php-format msgid "Privacy group: %s" msgstr "Gruppo di canali: %s" -#: ../../include/items.php:5065 ../../mod/connedit.php:701 +#: ../../include/items.php:5150 ../../mod/connedit.php:701 #, php-format msgid "Connection: %s" msgstr "Contatto: %s" -#: ../../include/items.php:5067 +#: ../../include/items.php:5152 msgid "Connection not found." msgstr "Contatto non trovato." -#: ../../include/items.php:5493 ../../mod/cover_photo.php:229 +#: ../../include/items.php:5578 ../../mod/cover_photo.php:229 msgid "female" msgstr "femmina" -#: ../../include/items.php:5494 ../../mod/cover_photo.php:230 +#: ../../include/items.php:5579 ../../mod/cover_photo.php:230 #, php-format msgid "%1$s updated her %2$s" msgstr "Aggiornamento: %2$s di %1$s" -#: ../../include/items.php:5495 ../../mod/cover_photo.php:231 +#: ../../include/items.php:5580 ../../mod/cover_photo.php:231 msgid "male" msgstr "maschio" -#: ../../include/items.php:5496 ../../mod/cover_photo.php:232 +#: ../../include/items.php:5581 ../../mod/cover_photo.php:232 #, php-format msgid "%1$s updated his %2$s" msgstr "Aggiornamento: %2$s di %1$s" -#: ../../include/items.php:5498 ../../mod/cover_photo.php:234 +#: ../../include/items.php:5583 ../../mod/cover_photo.php:234 #, php-format msgid "%1$s updated their %2$s" msgstr "Aggiornamento: %2$s di %1$s" -#: ../../include/items.php:5500 +#: ../../include/items.php:5585 msgid "profile photo" msgstr "foto del profilo" +#: ../../include/identity.php:32 +msgid "Unable to obtain identity information from database" +msgstr "Impossibile ottenere le informazioni di identificazione dal database" + +#: ../../include/identity.php:66 +msgid "Empty name" +msgstr "Nome vuoto" + +#: ../../include/identity.php:69 +msgid "Name too long" +msgstr "Nome troppo lungo" + +#: ../../include/identity.php:181 +msgid "No account identifier" +msgstr "Account senza identificativo" + +#: ../../include/identity.php:193 +msgid "Nickname is required." +msgstr "Il nome dell'account è obbligatorio." + +#: ../../include/identity.php:207 +msgid "Reserved nickname. Please choose another." +msgstr "Nome utente riservato. Per favore scegline un altro." + +#: ../../include/identity.php:212 +msgid "" +"Nickname has unsupported characters or is already being used on this site." +msgstr "Il nome dell'account è già in uso oppure ha dei caratteri non supportati." + +#: ../../include/identity.php:288 +msgid "Unable to retrieve created identity" +msgstr "Impossibile caricare l'identità creata" + +#: ../../include/identity.php:346 +msgid "Default Profile" +msgstr "Profilo predefinito" + +#: ../../include/identity.php:784 +msgid "Requested channel is not available." +msgstr "Il canale che cerchi non è disponibile." + +#: ../../include/identity.php:830 ../../mod/achievements.php:11 +#: ../../mod/blocks.php:29 ../../mod/connect.php:13 ../../mod/editblock.php:29 +#: ../../mod/editlayout.php:27 ../../mod/editwebpage.php:28 +#: ../../mod/filestorage.php:54 ../../mod/hcard.php:8 ../../mod/layouts.php:29 +#: ../../mod/profile.php:16 ../../mod/webpages.php:29 +msgid "Requested profile is not available." +msgstr "Il profilo richiesto non è disponibile." + +#: ../../include/identity.php:925 ../../mod/profiles.php:691 +msgid "Change profile photo" +msgstr "Cambia la foto del profilo" + +#: ../../include/identity.php:933 +msgid "Create New Profile" +msgstr "Crea un nuovo profilo" + +#: ../../include/identity.php:950 ../../mod/profiles.php:766 +msgid "Profile Image" +msgstr "Immagine del profilo" + +#: ../../include/identity.php:953 +msgid "Visible to everybody" +msgstr "Visibile a tutti" + +#: ../../include/identity.php:954 ../../mod/profiles.php:689 +#: ../../mod/profiles.php:770 +msgid "Edit visibility" +msgstr "Cambia la visibilità " + +#: ../../include/identity.php:1030 ../../include/identity.php:1288 +msgid "Gender:" +msgstr "Sesso:" + +#: ../../include/identity.php:1031 ../../include/identity.php:1332 +msgid "Status:" +msgstr "Stato:" + +#: ../../include/identity.php:1032 ../../include/identity.php:1343 +msgid "Homepage:" +msgstr "Home page:" + +#: ../../include/identity.php:1033 +msgid "Online Now" +msgstr "Online adesso" + +#: ../../include/identity.php:1121 ../../include/identity.php:1199 +#: ../../mod/ping.php:318 +msgid "g A l F d" +msgstr "g A l d F" + +#: ../../include/identity.php:1122 ../../include/identity.php:1200 +msgid "F d" +msgstr "d F" + +#: ../../include/identity.php:1167 ../../include/identity.php:1239 +#: ../../mod/ping.php:341 +msgid "[today]" +msgstr "[oggi]" + +#: ../../include/identity.php:1178 +msgid "Birthday Reminders" +msgstr "Promemoria compleanni" + +#: ../../include/identity.php:1179 +msgid "Birthdays this week:" +msgstr "Compleanni questa settimana:" + +#: ../../include/identity.php:1232 +msgid "[No description]" +msgstr "[Nessuna descrizione]" + +#: ../../include/identity.php:1250 +msgid "Event Reminders" +msgstr "Promemoria" + +#: ../../include/identity.php:1251 +msgid "Events this week:" +msgstr "Eventi della settimana:" + +#: ../../include/identity.php:1286 ../../mod/settings.php:1047 +msgid "Full Name:" +msgstr "Nome completo:" + +#: ../../include/identity.php:1293 +msgid "Like this channel" +msgstr "Mi piace questo canale" + +#: ../../include/identity.php:1317 +msgid "j F, Y" +msgstr "j F Y" + +#: ../../include/identity.php:1318 +msgid "j F" +msgstr "j F" + +#: ../../include/identity.php:1325 +msgid "Birthday:" +msgstr "Compleanno:" + +#: ../../include/identity.php:1329 ../../mod/directory.php:302 +msgid "Age:" +msgstr "Età :" + +#: ../../include/identity.php:1338 +#, php-format +msgid "for %1$d %2$s" +msgstr "per %1$d %2$s" + +#: ../../include/identity.php:1341 +msgid "Sexual Preference:" +msgstr "Preferenze sessuali:" + +#: ../../include/identity.php:1345 ../../mod/directory.php:318 +msgid "Hometown:" +msgstr "Città dove vivo:" + +#: ../../include/identity.php:1347 +msgid "Tags:" +msgstr "Tag:" + +#: ../../include/identity.php:1349 +msgid "Political Views:" +msgstr "Orientamento politico:" + +#: ../../include/identity.php:1351 +msgid "Religion:" +msgstr "Religione:" + +#: ../../include/identity.php:1353 ../../mod/directory.php:320 +msgid "About:" +msgstr "Informazioni:" + +#: ../../include/identity.php:1355 +msgid "Hobbies/Interests:" +msgstr "Interessi e hobby:" + +#: ../../include/identity.php:1357 +msgid "Likes:" +msgstr "Mi piace:" + +#: ../../include/identity.php:1359 +msgid "Dislikes:" +msgstr "Non mi piace:" + +#: ../../include/identity.php:1361 +msgid "Contact information and Social Networks:" +msgstr "Contatti e social network:" + +#: ../../include/identity.php:1363 +msgid "My other channels:" +msgstr "I miei altri canali:" + +#: ../../include/identity.php:1365 +msgid "Musical interests:" +msgstr "Gusti musicali:" + +#: ../../include/identity.php:1367 +msgid "Books, literature:" +msgstr "Libri, letteratura:" + +#: ../../include/identity.php:1369 +msgid "Television:" +msgstr "Televisione:" + +#: ../../include/identity.php:1371 +msgid "Film/dance/culture/entertainment:" +msgstr "Film, danza, cultura, intrattenimento:" + +#: ../../include/identity.php:1373 +msgid "Love/Romance:" +msgstr "Amore:" + +#: ../../include/identity.php:1375 +msgid "Work/employment:" +msgstr "Lavoro:" + +#: ../../include/identity.php:1377 +msgid "School/education:" +msgstr "Scuola:" + +#: ../../include/identity.php:1397 +msgid "Like this thing" +msgstr "Mi piace" + +#: ../../include/identity.php:1807 ../../mod/cover_photo.php:236 +msgid "cover photo" +msgstr "Copertina del canale" + #: ../../mod/achievements.php:34 msgid "Some blurb about what to do when you're new here" msgstr "Qualche suggerimento per i nuovi utenti su cosa fare" @@ -5458,7 +5475,7 @@ msgstr "Foto del profilo 128px" msgid "Timezone" msgstr "Fuso orario" -#: ../../mod/id.php:27 +#: ../../mod/id.php:27 ../../mod/profiles.php:730 msgid "Homepage URL" msgstr "Indirizzo home page" @@ -5478,7 +5495,7 @@ msgstr "Giorno di nascita" msgid "Birthdate" msgstr "Data di nascita" -#: ../../mod/id.php:33 ../../mod/profiles.php:441 +#: ../../mod/id.php:33 ../../mod/profiles.php:449 msgid "Gender" msgstr "Sesso" @@ -5509,55 +5526,51 @@ msgstr "Impossibile importare i dati dal vecchio hub" msgid "Imported file is empty." msgstr "Il file da importare è vuoto." -#: ../../mod/import.php:119 ../../mod/import_items.php:82 +#: ../../mod/import.php:118 ../../mod/import_items.php:82 #, php-format msgid "Warning: Database versions differ by %1$d updates." msgstr "Attenzione: le versioni di database differiscono di %1$d aggiornamenti." -#: ../../mod/import.php:124 -msgid "Server platform is not compatible. Operation not permitted." -msgstr "La tecnologia del server non è compatibile. Operazione non permessa." - -#: ../../mod/import.php:158 +#: ../../mod/import.php:156 msgid "No channel. Import failed." msgstr "Nessun canale. Import fallito." -#: ../../mod/import.php:533 +#: ../../mod/import.php:531 msgid "You must be logged in to use this feature." msgstr "Per questa funzionalità devi aver effettuato l'accesso." -#: ../../mod/import.php:538 +#: ../../mod/import.php:536 msgid "Import Channel" msgstr "Importa un canale" -#: ../../mod/import.php:539 +#: ../../mod/import.php:537 msgid "" "Use this form to import an existing channel from a different server/hub. You" " may retrieve the channel identity from the old server/hub via the network " "or provide an export file." msgstr "Usa questo modulo per importare un tuo canale da un altro hub. Puoi ottenere i dati identificativi del canale direttamente dall'altro hub oppure tramite un file esportato in precedenza." -#: ../../mod/import.php:540 ../../mod/import_items.php:115 +#: ../../mod/import.php:538 ../../mod/import_items.php:115 msgid "File to Upload" msgstr "File da caricare" -#: ../../mod/import.php:541 +#: ../../mod/import.php:539 msgid "Or provide the old server/hub details" msgstr "Oppure fornisci i dettagli del vecchio hub" -#: ../../mod/import.php:542 +#: ../../mod/import.php:540 msgid "Your old identity address (xyz@example.com)" msgstr "Il tuo vecchio identificativo (per esempio pippo@esempio.com)" -#: ../../mod/import.php:543 +#: ../../mod/import.php:541 msgid "Your old login email address" msgstr "L'email che usavi per accedere sul vecchio hub" -#: ../../mod/import.php:544 +#: ../../mod/import.php:542 msgid "Your old login password" msgstr "La password per il vecchio hub" -#: ../../mod/import.php:545 +#: ../../mod/import.php:543 msgid "" "For either option, please choose whether to make this hub your new primary " "address, or whether your old location should continue this role. You will be" @@ -5565,17 +5578,17 @@ msgid "" "primary location for files, photos, and media." msgstr "Scegli se vuoi spostare il tuo indirizzo primario su questo hub, oppure se preferisci che quello vecchio resti tale. Potrai pubblicare da entrambi i hub, ma solamente uno sarà indicato come la posizione su cui risiedono i tuoi file, foto, ecc." -#: ../../mod/import.php:546 +#: ../../mod/import.php:544 msgid "Make this hub my primary location" msgstr "Rendi questo hub il mio indirizzo primario" -#: ../../mod/import.php:547 +#: ../../mod/import.php:545 msgid "" "Import existing posts if possible (experimental - limited by available " "memory" msgstr "Importa i contenuti pubblicati, se possibile (sperimentale)" -#: ../../mod/import.php:548 +#: ../../mod/import.php:546 msgid "" "This process may take several minutes to complete. Please submit the form " "only once and leave this page open until finished." @@ -5740,41 +5753,41 @@ msgstr "Canale non trovato." msgid "Previous action reversed." msgstr "Il comando precedente è stato annullato." -#: ../../mod/like.php:414 +#: ../../mod/like.php:420 #, php-format msgid "%1$s agrees with %2$s's %3$s" msgstr "%3$s di %2$s: %1$s è d'accordo" -#: ../../mod/like.php:416 +#: ../../mod/like.php:422 #, php-format msgid "%1$s doesn't agree with %2$s's %3$s" msgstr "%3$s di %2$s: %1$s non è d'accordo" -#: ../../mod/like.php:418 +#: ../../mod/like.php:424 #, php-format msgid "%1$s abstains from a decision on %2$s's %3$s" msgstr "%3$s di %2$s: %1$s non si esprime" -#: ../../mod/like.php:420 +#: ../../mod/like.php:426 #, php-format msgid "%1$s is attending %2$s's %3$s" msgstr "%3$s di %2$s: %1$s partecipa" -#: ../../mod/like.php:422 +#: ../../mod/like.php:428 #, php-format msgid "%1$s is not attending %2$s's %3$s" msgstr "%3$s di %2$s: %1$s non partecipa" -#: ../../mod/like.php:424 +#: ../../mod/like.php:430 #, php-format msgid "%1$s may attend %2$s's %3$s" msgstr "%3$s di %2$s: %1$s forse partecipa" -#: ../../mod/like.php:527 +#: ../../mod/like.php:533 msgid "Action completed." msgstr "Comando completato." -#: ../../mod/like.php:528 +#: ../../mod/like.php:534 msgid "Thank you." msgstr "Grazie." @@ -6228,15 +6241,15 @@ msgstr "forum" msgid "Search Results For:" msgstr "Cerca risultati con:" -#: ../../mod/network.php:207 +#: ../../mod/network.php:209 msgid "Privacy group is empty" msgstr "Il gruppo di canali è vuoto" -#: ../../mod/network.php:216 +#: ../../mod/network.php:218 msgid "Privacy group: " msgstr "Gruppo di canali:" -#: ../../mod/network.php:242 +#: ../../mod/network.php:244 msgid "Invalid connection." msgstr "Contatto non valido." @@ -7202,7 +7215,7 @@ msgstr "Non permettere codice" msgid "UID" msgstr "UID" -#: ../../mod/admin.php:1158 ../../mod/profiles.php:457 +#: ../../mod/admin.php:1158 ../../mod/profiles.php:465 msgid "Address" msgstr "Indirizzo" @@ -7467,7 +7480,7 @@ msgid "Done Editing" msgstr "Modifica terminata" #: ../../mod/profiles.php:19 ../../mod/profiles.php:184 -#: ../../mod/profiles.php:241 ../../mod/profiles.php:608 +#: ../../mod/profiles.php:241 ../../mod/profiles.php:620 msgid "Profile not found." msgstr "Profilo non trovato." @@ -7495,225 +7508,217 @@ msgstr "Il profilo non è disponibile per l'export." msgid "Profile Name is required." msgstr "Il nome del profilo è obbligatorio." -#: ../../mod/profiles.php:414 +#: ../../mod/profiles.php:422 msgid "Marital Status" msgstr "Stato sentimentale" -#: ../../mod/profiles.php:418 +#: ../../mod/profiles.php:426 msgid "Romantic Partner" msgstr "Partner affettivo" -#: ../../mod/profiles.php:422 +#: ../../mod/profiles.php:430 ../../mod/profiles.php:735 msgid "Likes" msgstr "Mi piace" -#: ../../mod/profiles.php:426 +#: ../../mod/profiles.php:434 ../../mod/profiles.php:736 msgid "Dislikes" msgstr "Non mi piace" -#: ../../mod/profiles.php:430 +#: ../../mod/profiles.php:438 ../../mod/profiles.php:743 msgid "Work/Employment" msgstr "Lavoro/impiego" -#: ../../mod/profiles.php:433 +#: ../../mod/profiles.php:441 msgid "Religion" msgstr "Religione" -#: ../../mod/profiles.php:437 +#: ../../mod/profiles.php:445 msgid "Political Views" msgstr "Orientamento politico" -#: ../../mod/profiles.php:445 +#: ../../mod/profiles.php:453 msgid "Sexual Preference" msgstr "Preferenze sessuali" -#: ../../mod/profiles.php:449 +#: ../../mod/profiles.php:457 msgid "Homepage" msgstr "Home page" -#: ../../mod/profiles.php:453 +#: ../../mod/profiles.php:461 msgid "Interests" msgstr "Interessi" -#: ../../mod/profiles.php:547 +#: ../../mod/profiles.php:555 msgid "Profile updated." msgstr "Profilo aggiornato." -#: ../../mod/profiles.php:634 -msgid "Hide your contact/friend list from viewers of this profile?" -msgstr "Nascondi la tua lista di contatti/amici ai visitatori di questo profilo?" +#: ../../mod/profiles.php:644 +msgid "Hide your connections list from viewers of this profile" +msgstr "Nascondi la tua lista di contatti ai visitatori di questo profilo" -#: ../../mod/profiles.php:674 +#: ../../mod/profiles.php:686 msgid "Edit Profile Details" msgstr "Modifica i dettagli del profilo" -#: ../../mod/profiles.php:676 +#: ../../mod/profiles.php:688 msgid "View this profile" msgstr "Guarda questo profilo" -#: ../../mod/profiles.php:678 -msgid "Change Profile Photo" -msgstr "Cambia la foto del profilo" +#: ../../mod/profiles.php:690 +msgid "Change cover photo" +msgstr "Cambia la copertina del canale" -#: ../../mod/profiles.php:679 +#: ../../mod/profiles.php:692 msgid "Create a new profile using these settings" msgstr "Crea un nuovo profilo usando queste impostazioni" -#: ../../mod/profiles.php:680 +#: ../../mod/profiles.php:693 msgid "Clone this profile" msgstr "Clona questo profilo" -#: ../../mod/profiles.php:681 +#: ../../mod/profiles.php:694 msgid "Delete this profile" msgstr "Elimina questo profilo" -#: ../../mod/profiles.php:683 +#: ../../mod/profiles.php:695 +msgid "Add profile things" +msgstr "Aggiungi oggetti al profilo" + +#: ../../mod/profiles.php:698 +msgid "Relation" +msgstr "Relazione" + +#: ../../mod/profiles.php:701 msgid "Import profile from file" msgstr "Importa il profilo da un file" -#: ../../mod/profiles.php:684 +#: ../../mod/profiles.php:702 msgid "Export profile to file" msgstr "Esporta il profilo in un file" -#: ../../mod/profiles.php:685 -msgid "Profile Name:" -msgstr "Nome del profilo:" +#: ../../mod/profiles.php:703 +msgid "Your gender" +msgstr "Sesso" + +#: ../../mod/profiles.php:704 +msgid "Marital status" +msgstr "Stato civile" -#: ../../mod/profiles.php:686 -msgid "Your Full Name:" -msgstr "Il tuo nome completo:" +#: ../../mod/profiles.php:705 +msgid "Sexual preference" +msgstr "Preferenze sessuali" -#: ../../mod/profiles.php:687 -msgid "Title/Description:" -msgstr "Titolo/descrizione:" +#: ../../mod/profiles.php:708 +msgid "Profile name" +msgstr "Nome del profilo" -#: ../../mod/profiles.php:688 -msgid "Your Gender:" -msgstr "Sesso:" +#: ../../mod/profiles.php:710 +msgid "This is your default profile." +msgstr "Questo è il tuo profilo predefinito." -#: ../../mod/profiles.php:689 -msgid "Birthday :" -msgstr "Compleanno:" +#: ../../mod/profiles.php:712 +msgid "Your full name" +msgstr "Il tuo nome completo" -#: ../../mod/profiles.php:690 -msgid "Street Address:" -msgstr "Indirizzo (via/piazza):" +#: ../../mod/profiles.php:713 +msgid "Title/Description" +msgstr "Titolo/descrizione" -#: ../../mod/profiles.php:691 -msgid "Locality/City:" -msgstr "Località :" +#: ../../mod/profiles.php:716 +msgid "Street address" +msgstr "Indirizzo (via/piazza)" -#: ../../mod/profiles.php:692 -msgid "Postal/Zip Code:" -msgstr "CAP:" +#: ../../mod/profiles.php:717 +msgid "Locality/City" +msgstr "Località " -#: ../../mod/profiles.php:693 -msgid "Country:" -msgstr "Nazione:" +#: ../../mod/profiles.php:718 +msgid "Region/State" +msgstr "Regione/stato" -#: ../../mod/profiles.php:694 -msgid "Region/State:" -msgstr "Regione/stato:" +#: ../../mod/profiles.php:719 +msgid "Postal/Zip code" +msgstr "CAP" -#: ../../mod/profiles.php:695 -msgid "<span class=\"heart\">♥</span> Marital Status:" -msgstr "<span class=\"heart\">♥</span> Stato sentimentale:" +#: ../../mod/profiles.php:720 +msgid "Country" +msgstr "Nazione" -#: ../../mod/profiles.php:696 -msgid "Who: (if applicable)" -msgstr "Con chi: (se possibile)" +#: ../../mod/profiles.php:725 +msgid "Who (if applicable)" +msgstr "Con chi (se possibile)" -#: ../../mod/profiles.php:697 +#: ../../mod/profiles.php:725 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "Per esempio: cathy123, Cathy Williams, cathy@example.com" -#: ../../mod/profiles.php:698 -msgid "Since [date]:" -msgstr "dal [data]:" - -#: ../../mod/profiles.php:700 -msgid "Homepage URL:" -msgstr "Indirizzo home page:" +#: ../../mod/profiles.php:726 +msgid "Since (date)" +msgstr "dal (data)" -#: ../../mod/profiles.php:703 -msgid "Religious Views:" -msgstr "Orientamento religioso:" - -#: ../../mod/profiles.php:704 -msgid "Keywords:" -msgstr "Parole chiave, tag:" - -#: ../../mod/profiles.php:707 -msgid "Example: fishing photography software" -msgstr "Per esempio: pesca fotografia programmazione" +#: ../../mod/profiles.php:729 +msgid "Tell us about yourself" +msgstr "Raccontaci di te..." -#: ../../mod/profiles.php:708 -msgid "Used in directory listings" -msgstr "Visibile negli elenchi pubblici di canali" +#: ../../mod/profiles.php:731 +msgid "Hometown" +msgstr "Città dove vivo" -#: ../../mod/profiles.php:709 -msgid "Tell us about yourself..." -msgstr "Raccontaci di te..." +#: ../../mod/profiles.php:732 +msgid "Political views" +msgstr "Orientamento politico" -#: ../../mod/profiles.php:710 -msgid "Hobbies/Interests" -msgstr "Hobby/interessi" +#: ../../mod/profiles.php:733 +msgid "Religious views" +msgstr "Orientamento religioso" -#: ../../mod/profiles.php:711 -msgid "Contact information and Social Networks" -msgstr "Contatti personali e i tuoi social network" +#: ../../mod/profiles.php:734 +msgid "Keywords used in directory listings" +msgstr "Parole chiavi mostrate nell'elenco dei canali" -#: ../../mod/profiles.php:712 -msgid "My other channels" -msgstr "I miei altri canali" +#: ../../mod/profiles.php:734 +msgid "Example: fishing photography software" +msgstr "Per esempio: pesca fotografia programmazione" -#: ../../mod/profiles.php:713 +#: ../../mod/profiles.php:737 msgid "Musical interests" msgstr "Interessi musicali" -#: ../../mod/profiles.php:714 +#: ../../mod/profiles.php:738 msgid "Books, literature" msgstr "Libri, letteratura" -#: ../../mod/profiles.php:715 +#: ../../mod/profiles.php:739 msgid "Television" msgstr "Televisione" -#: ../../mod/profiles.php:716 -msgid "Film/dance/culture/entertainment" -msgstr "Film/danza/cultura/intrattenimento" +#: ../../mod/profiles.php:740 +msgid "Film/Dance/Culture/Entertainment" +msgstr "Film, danza, cultura, intrattenimento" -#: ../../mod/profiles.php:717 -msgid "Love/romance" -msgstr "Amore" +#: ../../mod/profiles.php:741 +msgid "Hobbies/Interests" +msgstr "Hobby/interessi" -#: ../../mod/profiles.php:718 -msgid "Work/employment" -msgstr "Lavoro/impiego" +#: ../../mod/profiles.php:742 +msgid "Love/Romance" +msgstr "Amore" -#: ../../mod/profiles.php:719 -msgid "School/education" +#: ../../mod/profiles.php:744 +msgid "School/Education" msgstr "Scuola/educazione" -#: ../../mod/profiles.php:725 -msgid "This is your default profile." -msgstr "Questo è il tuo profilo predefinito." +#: ../../mod/profiles.php:745 +msgid "Contact information and social networks" +msgstr "Contatti e social network" -#: ../../mod/profiles.php:736 -msgid "Age: " -msgstr "Età :" - -#: ../../mod/profiles.php:779 -msgid "Edit/Manage Profiles" -msgstr "Modifica/gestisci i profili" - -#: ../../mod/profiles.php:780 -msgid "Add profile things" -msgstr "Aggiungi oggetti al profilo" +#: ../../mod/profiles.php:746 +msgid "My other channels" +msgstr "I miei altri canali" -#: ../../mod/profiles.php:781 -msgid "Include desirable objects in your profile" -msgstr "Aggiungi oggetti interessanti al tuo profilo" +#: ../../mod/profiles.php:777 +msgid "Create New" +msgstr "Crea nuovo" #: ../../mod/profperm.php:29 ../../mod/profperm.php:58 msgid "Invalid profile identifier." @@ -9036,7 +9041,7 @@ msgid "" "Password reset failed." msgstr "La richiesta non può essere verificata (potresti averla già usata precedentemente). La password non sarà reimpostata." -#: ../../mod/lostpass.php:86 ../../boot.php:1551 +#: ../../mod/lostpass.php:86 ../../boot.php:1559 msgid "Password Reset" msgstr "Reimposta la password" @@ -9415,183 +9420,183 @@ msgstr "Permesso negato." msgid "Focus (Hubzilla default)" msgstr "Focus (predefinito)" -#: ../../view/theme/redbasic/php/config.php:102 +#: ../../view/theme/redbasic/php/config.php:103 msgid "Theme settings" msgstr "Impostazioni del tema" -#: ../../view/theme/redbasic/php/config.php:103 +#: ../../view/theme/redbasic/php/config.php:104 msgid "Select scheme" msgstr "Scegli uno schema" -#: ../../view/theme/redbasic/php/config.php:104 +#: ../../view/theme/redbasic/php/config.php:105 msgid "Narrow navbar" msgstr "Barra di navigazione ristretta" -#: ../../view/theme/redbasic/php/config.php:105 +#: ../../view/theme/redbasic/php/config.php:106 msgid "Navigation bar background color" msgstr "Barra di navigazione: Colore di sfondo" -#: ../../view/theme/redbasic/php/config.php:106 +#: ../../view/theme/redbasic/php/config.php:107 msgid "Navigation bar gradient top color" msgstr "Barra di navigazione: Gradiente superiore" -#: ../../view/theme/redbasic/php/config.php:107 +#: ../../view/theme/redbasic/php/config.php:108 msgid "Navigation bar gradient bottom color" msgstr "Barra di navigazione: Gradiente inferiore" -#: ../../view/theme/redbasic/php/config.php:108 +#: ../../view/theme/redbasic/php/config.php:109 msgid "Navigation active button gradient top color" msgstr "Bottone di navigazione attivo: Gradiente superiore" -#: ../../view/theme/redbasic/php/config.php:109 +#: ../../view/theme/redbasic/php/config.php:110 msgid "Navigation active button gradient bottom color" msgstr "Bottone di navigazione attivo: Gradiente inferiore" -#: ../../view/theme/redbasic/php/config.php:110 +#: ../../view/theme/redbasic/php/config.php:111 msgid "Navigation bar border color " msgstr "Barra di navigazione: Colore del bordo" -#: ../../view/theme/redbasic/php/config.php:111 +#: ../../view/theme/redbasic/php/config.php:112 msgid "Navigation bar icon color " msgstr "Barra di navigazione: Colore delle icone" -#: ../../view/theme/redbasic/php/config.php:112 +#: ../../view/theme/redbasic/php/config.php:113 msgid "Navigation bar active icon color " msgstr "Barra di navigazione: Colore dell'icona attiva" -#: ../../view/theme/redbasic/php/config.php:113 +#: ../../view/theme/redbasic/php/config.php:114 msgid "link color" msgstr "colore del link" -#: ../../view/theme/redbasic/php/config.php:114 +#: ../../view/theme/redbasic/php/config.php:115 msgid "Set font-color for banner" msgstr "Colore del font del banner" -#: ../../view/theme/redbasic/php/config.php:115 +#: ../../view/theme/redbasic/php/config.php:116 msgid "Set the background color" msgstr "Colore di sfondo" -#: ../../view/theme/redbasic/php/config.php:116 +#: ../../view/theme/redbasic/php/config.php:117 msgid "Set the background image" msgstr "Immagine di sfondo" -#: ../../view/theme/redbasic/php/config.php:117 +#: ../../view/theme/redbasic/php/config.php:118 msgid "Set the background color of items" msgstr "Colore di sfondo degli oggetti" -#: ../../view/theme/redbasic/php/config.php:118 +#: ../../view/theme/redbasic/php/config.php:119 msgid "Set the background color of comments" msgstr "Colore di sfondo dei commenti" -#: ../../view/theme/redbasic/php/config.php:119 +#: ../../view/theme/redbasic/php/config.php:120 msgid "Set the border color of comments" msgstr "Colore del bordo dei commenti" -#: ../../view/theme/redbasic/php/config.php:120 +#: ../../view/theme/redbasic/php/config.php:121 msgid "Set the indent for comments" msgstr "Spostamento a destra dei commenti" -#: ../../view/theme/redbasic/php/config.php:121 +#: ../../view/theme/redbasic/php/config.php:122 msgid "Set the basic color for item icons" msgstr "Colore di base per le icone" -#: ../../view/theme/redbasic/php/config.php:122 +#: ../../view/theme/redbasic/php/config.php:123 msgid "Set the hover color for item icons" msgstr "Colore per le icone in mouse-over" -#: ../../view/theme/redbasic/php/config.php:123 +#: ../../view/theme/redbasic/php/config.php:124 msgid "Set font-size for the entire application" msgstr "Dimensione font per tutto il sito" -#: ../../view/theme/redbasic/php/config.php:123 +#: ../../view/theme/redbasic/php/config.php:124 msgid "Example: 14px" msgstr "Esempio: 14px" -#: ../../view/theme/redbasic/php/config.php:124 +#: ../../view/theme/redbasic/php/config.php:125 msgid "Set font-size for posts and comments" msgstr "Dimensioni del carattere per post e commenti" -#: ../../view/theme/redbasic/php/config.php:125 +#: ../../view/theme/redbasic/php/config.php:126 msgid "Set font-color for posts and comments" msgstr "Colore del carattere per post e commenti" -#: ../../view/theme/redbasic/php/config.php:126 +#: ../../view/theme/redbasic/php/config.php:127 msgid "Set radius of corners" msgstr "Raggio degli angoli stondati" -#: ../../view/theme/redbasic/php/config.php:127 +#: ../../view/theme/redbasic/php/config.php:128 msgid "Set shadow depth of photos" msgstr "Profondità dell'ombra delle foto" -#: ../../view/theme/redbasic/php/config.php:128 +#: ../../view/theme/redbasic/php/config.php:129 msgid "Set maximum width of content region in pixel" msgstr "Larghezza massima dell'area dei contenuti in pixel" -#: ../../view/theme/redbasic/php/config.php:128 +#: ../../view/theme/redbasic/php/config.php:129 msgid "Leave empty for default width" msgstr "Lascia vuoto per usare il valore predefinito" -#: ../../view/theme/redbasic/php/config.php:129 +#: ../../view/theme/redbasic/php/config.php:130 msgid "Left align page content" msgstr "Allinea a sinistra il contenuto della pagina" -#: ../../view/theme/redbasic/php/config.php:130 +#: ../../view/theme/redbasic/php/config.php:131 msgid "Set minimum opacity of nav bar - to hide it" msgstr "Opacità minima della barra di navigazione - per nasconderla" -#: ../../view/theme/redbasic/php/config.php:131 +#: ../../view/theme/redbasic/php/config.php:132 msgid "Set size of conversation author photo" msgstr "Dimensione foto dell'autore della conversazione" -#: ../../view/theme/redbasic/php/config.php:132 +#: ../../view/theme/redbasic/php/config.php:133 msgid "Set size of followup author photos" msgstr "Dimensione foto dei partecipanti alla conversazione" -#: ../../boot.php:1351 +#: ../../boot.php:1359 #, php-format msgid "Update %s failed. See error logs." msgstr "%s: aggiornamento fallito. Controlla i log di errore." -#: ../../boot.php:1354 +#: ../../boot.php:1362 #, php-format msgid "Update Error at %s" msgstr "Errore di aggiornamento su %s" -#: ../../boot.php:1524 +#: ../../boot.php:1532 msgid "" "Create an account to access services and applications within the Hubzilla" msgstr "Registrati per accedere ai servizi e alle applicazioni di Hubzilla" -#: ../../boot.php:1546 +#: ../../boot.php:1554 msgid "Password" msgstr "Password" -#: ../../boot.php:1547 +#: ../../boot.php:1555 msgid "Remember me" msgstr "Resta connesso" -#: ../../boot.php:1550 +#: ../../boot.php:1558 msgid "Forgot your password?" msgstr "Hai dimenticato la password?" -#: ../../boot.php:2180 +#: ../../boot.php:2188 msgid "toggle mobile" msgstr "attiva/disattiva versione mobile" -#: ../../boot.php:2333 +#: ../../boot.php:2341 msgid "Website SSL certificate is not valid. Please correct." msgstr "Il certificato SSL del sito non è valido. Si prega di intervenire." -#: ../../boot.php:2336 +#: ../../boot.php:2344 #, php-format msgid "[hubzilla] Website SSL error for %s" msgstr "[hubzilla] Errore SSL su %s" -#: ../../boot.php:2373 +#: ../../boot.php:2381 msgid "Cron/Scheduled tasks not running." msgstr "Processi cron non avviati." -#: ../../boot.php:2377 +#: ../../boot.php:2385 #, php-format msgid "[hubzilla] Cron tasks not running on %s" msgstr "[hubzilla] Cron non è stato eseguito %s" diff --git a/view/it/hstrings.php b/view/it/hstrings.php index e3283f4d1..795ef1d7a 100644 --- a/view/it/hstrings.php +++ b/view/it/hstrings.php @@ -398,42 +398,6 @@ $a->strings["__ctx:noun__ Like"] = array( 0 => "Mi piace", 1 => "Mi piace", ); -$a->strings["Miscellaneous"] = "Altro"; -$a->strings["YYYY-MM-DD or MM-DD"] = "AAAA-MM-GG oppure MM-GG"; -$a->strings["Required"] = "Obbligatorio"; -$a->strings["never"] = "mai"; -$a->strings["less than a second ago"] = "meno di un secondo fa"; -$a->strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "%1\$d %2\$s fa"; -$a->strings["__ctx:relative_date__ year"] = array( - 0 => "anno", - 1 => "anni", -); -$a->strings["__ctx:relative_date__ month"] = array( - 0 => "mese", - 1 => "mesi", -); -$a->strings["__ctx:relative_date__ week"] = array( - 0 => "settimana", - 1 => "settimane", -); -$a->strings["__ctx:relative_date__ day"] = array( - 0 => "giorno", - 1 => "giorni", -); -$a->strings["__ctx:relative_date__ hour"] = array( - 0 => "ora", - 1 => "ore", -); -$a->strings["__ctx:relative_date__ minute"] = array( - 0 => "minuto", - 1 => "minuti", -); -$a->strings["__ctx:relative_date__ second"] = array( - 0 => "secondo", - 1 => "secondi", -); -$a->strings["%1\$s's birthday"] = "Compleanno di %1\$s"; -$a->strings["Happy Birthday %1\$s"] = "Buon compleanno %1\$s"; $a->strings["Invalid data packet"] = "Dati ricevuti non validi"; $a->strings["Unable to verify channel signature"] = "Impossibile verificare la firma elettronica del canale"; $a->strings["Unable to verify site signature for %s"] = "Impossibile verificare la firma elettronica del sito %s"; @@ -600,6 +564,7 @@ $a->strings["Chat Rooms"] = "Chat"; $a->strings["Bookmarked Chatrooms"] = "Chat nei segnalibri"; $a->strings["Suggested Chatrooms"] = "Chat suggerite"; $a->strings["photo/image"] = "foto/immagine"; +$a->strings["Click to show more"] = "Clicca per mostrare tutto"; $a->strings["Rating Tools"] = "Valutazione"; $a->strings["Rate Me"] = "Valutami"; $a->strings["View Ratings"] = "Vedi le valutazioni ricevute"; @@ -613,6 +578,7 @@ $a->strings["For Administrators"] = "Per gli amministratori"; $a->strings["For Developers"] = "Per sviluppatori"; $a->strings["Site"] = "Sito"; $a->strings["Accounts"] = "Account"; +$a->strings["Member registrations waiting for confirmation"] = "Richieste di registrazione in attesa di conferma"; $a->strings["Channels"] = "Canali"; $a->strings["Security"] = "Sicurezza"; $a->strings["Plugins"] = "Plugin"; @@ -622,7 +588,6 @@ $a->strings["Profile Fields"] = "Campi del profilo"; $a->strings["DB updates"] = "Aggiornamenti al DB"; $a->strings["Logs"] = "Log"; $a->strings["Plugin Features"] = "Plugin"; -$a->strings["User registrations waiting for confirmation"] = "Registrazioni in attesa"; $a->strings["View Photo"] = "Guarda la foto"; $a->strings["Edit Album"] = "Modifica album"; $a->strings["prev"] = "prec"; @@ -634,7 +599,7 @@ $a->strings["newer"] = "più nuovi"; $a->strings["No connections"] = "Nessun contatto"; $a->strings["View all %s connections"] = "Mostra tutti i %s contatti"; $a->strings["poke"] = "poke"; -$a->strings["poked"] = "ha ricevuto un poke"; +$a->strings["poked"] = "ha mandato un poke"; $a->strings["ping"] = "ping"; $a->strings["pinged"] = "ha effettuato un ping"; $a->strings["prod"] = "spintone"; @@ -730,61 +695,44 @@ $a->strings["Name:"] = "Nome:"; $a->strings["Photo:"] = "Foto:"; $a->strings["Please visit %s to approve or reject the suggestion."] = "Visita %s per approvare o rifiutare il suggerimento."; $a->strings["[Hubzilla:Notify]"] = "[Hubzilla]"; -$a->strings["Unable to obtain identity information from database"] = "Impossibile ottenere le informazioni di identificazione dal database"; -$a->strings["Empty name"] = "Nome vuoto"; -$a->strings["Name too long"] = "Nome troppo lungo"; -$a->strings["No account identifier"] = "Account senza identificativo"; -$a->strings["Nickname is required."] = "Il nome dell'account è obbligatorio."; -$a->strings["Reserved nickname. Please choose another."] = "Nome utente riservato. Per favore scegline un altro."; -$a->strings["Nickname has unsupported characters or is already being used on this site."] = "Il nome dell'account è già in uso oppure ha dei caratteri non supportati."; -$a->strings["Unable to retrieve created identity"] = "Impossibile caricare l'identità creata"; -$a->strings["Default Profile"] = "Profilo predefinito"; -$a->strings["Requested channel is not available."] = "Il canale che cerchi non è disponibile."; -$a->strings["Requested profile is not available."] = "Il profilo richiesto non è disponibile."; -$a->strings["Change profile photo"] = "Cambia la foto del profilo"; -$a->strings["Create New Profile"] = "Crea un nuovo profilo"; -$a->strings["Profile Image"] = "Immagine del profilo"; -$a->strings["Visible to everybody"] = "Visibile a tutti"; -$a->strings["Edit visibility"] = "Cambia la visibilità "; -$a->strings["Gender:"] = "Sesso:"; -$a->strings["Status:"] = "Stato:"; -$a->strings["Homepage:"] = "Home page:"; -$a->strings["Online Now"] = "Online adesso"; -$a->strings["g A l F d"] = "g A l d F"; -$a->strings["F d"] = "d F"; -$a->strings["[today]"] = "[oggi]"; -$a->strings["Birthday Reminders"] = "Promemoria compleanni"; -$a->strings["Birthdays this week:"] = "Compleanni questa settimana:"; -$a->strings["[No description]"] = "[Nessuna descrizione]"; -$a->strings["Event Reminders"] = "Promemoria"; -$a->strings["Events this week:"] = "Eventi della settimana:"; -$a->strings["Full Name:"] = "Nome completo:"; -$a->strings["Like this channel"] = "Mi piace questo canale"; -$a->strings["j F, Y"] = "j F Y"; -$a->strings["j F"] = "j F"; -$a->strings["Birthday:"] = "Compleanno:"; -$a->strings["Age:"] = "Età :"; -$a->strings["for %1\$d %2\$s"] = "per %1\$d %2\$s"; -$a->strings["Sexual Preference:"] = "Preferenze sessuali:"; -$a->strings["Hometown:"] = "Città dove vivo:"; -$a->strings["Tags:"] = "Tag:"; -$a->strings["Political Views:"] = "Orientamento politico:"; -$a->strings["Religion:"] = "Religione:"; -$a->strings["About:"] = "Informazioni:"; -$a->strings["Hobbies/Interests:"] = "Interessi e hobby:"; -$a->strings["Likes:"] = "Mi piace:"; -$a->strings["Dislikes:"] = "Non mi piace:"; -$a->strings["Contact information and Social Networks:"] = "Contatti e social network:"; -$a->strings["My other channels:"] = "I miei altri canali:"; -$a->strings["Musical interests:"] = "Gusti musicali:"; -$a->strings["Books, literature:"] = "Libri, letteratura:"; -$a->strings["Television:"] = "Televisione:"; -$a->strings["Film/dance/culture/entertainment:"] = "Film, danza, cultura, intrattenimento:"; -$a->strings["Love/Romance:"] = "Amore:"; -$a->strings["Work/employment:"] = "Lavoro:"; -$a->strings["School/education:"] = "Scuola:"; -$a->strings["Like this thing"] = "Mi piace"; -$a->strings["cover photo"] = "Copertina del canale"; +$a->strings["Miscellaneous"] = "Altro"; +$a->strings["Birthday"] = "Compleanno"; +$a->strings["Age: "] = "Età :"; +$a->strings["YYYY-MM-DD or MM-DD"] = "AAAA-MM-GG oppure MM-GG"; +$a->strings["Required"] = "Obbligatorio"; +$a->strings["never"] = "mai"; +$a->strings["less than a second ago"] = "meno di un secondo fa"; +$a->strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "%1\$d %2\$s fa"; +$a->strings["__ctx:relative_date__ year"] = array( + 0 => "anno", + 1 => "anni", +); +$a->strings["__ctx:relative_date__ month"] = array( + 0 => "mese", + 1 => "mesi", +); +$a->strings["__ctx:relative_date__ week"] = array( + 0 => "settimana", + 1 => "settimane", +); +$a->strings["__ctx:relative_date__ day"] = array( + 0 => "giorno", + 1 => "giorni", +); +$a->strings["__ctx:relative_date__ hour"] = array( + 0 => "ora", + 1 => "ore", +); +$a->strings["__ctx:relative_date__ minute"] = array( + 0 => "minuto", + 1 => "minuti", +); +$a->strings["__ctx:relative_date__ second"] = array( + 0 => "secondo", + 1 => "secondi", +); +$a->strings["%1\$s's birthday"] = "Compleanno di %1\$s"; +$a->strings["Happy Birthday %1\$s"] = "Buon compleanno %1\$s"; $a->strings["Embedded content"] = "Contenuti incorporati"; $a->strings["Embedding disabled"] = "Disabilita la creazione di contenuti incorporati"; $a->strings["channel"] = "il canale"; @@ -1023,6 +971,61 @@ $a->strings["male"] = "maschio"; $a->strings["%1\$s updated his %2\$s"] = "Aggiornamento: %2\$s di %1\$s"; $a->strings["%1\$s updated their %2\$s"] = "Aggiornamento: %2\$s di %1\$s"; $a->strings["profile photo"] = "foto del profilo"; +$a->strings["Unable to obtain identity information from database"] = "Impossibile ottenere le informazioni di identificazione dal database"; +$a->strings["Empty name"] = "Nome vuoto"; +$a->strings["Name too long"] = "Nome troppo lungo"; +$a->strings["No account identifier"] = "Account senza identificativo"; +$a->strings["Nickname is required."] = "Il nome dell'account è obbligatorio."; +$a->strings["Reserved nickname. Please choose another."] = "Nome utente riservato. Per favore scegline un altro."; +$a->strings["Nickname has unsupported characters or is already being used on this site."] = "Il nome dell'account è già in uso oppure ha dei caratteri non supportati."; +$a->strings["Unable to retrieve created identity"] = "Impossibile caricare l'identità creata"; +$a->strings["Default Profile"] = "Profilo predefinito"; +$a->strings["Requested channel is not available."] = "Il canale che cerchi non è disponibile."; +$a->strings["Requested profile is not available."] = "Il profilo richiesto non è disponibile."; +$a->strings["Change profile photo"] = "Cambia la foto del profilo"; +$a->strings["Create New Profile"] = "Crea un nuovo profilo"; +$a->strings["Profile Image"] = "Immagine del profilo"; +$a->strings["Visible to everybody"] = "Visibile a tutti"; +$a->strings["Edit visibility"] = "Cambia la visibilità "; +$a->strings["Gender:"] = "Sesso:"; +$a->strings["Status:"] = "Stato:"; +$a->strings["Homepage:"] = "Home page:"; +$a->strings["Online Now"] = "Online adesso"; +$a->strings["g A l F d"] = "g A l d F"; +$a->strings["F d"] = "d F"; +$a->strings["[today]"] = "[oggi]"; +$a->strings["Birthday Reminders"] = "Promemoria compleanni"; +$a->strings["Birthdays this week:"] = "Compleanni questa settimana:"; +$a->strings["[No description]"] = "[Nessuna descrizione]"; +$a->strings["Event Reminders"] = "Promemoria"; +$a->strings["Events this week:"] = "Eventi della settimana:"; +$a->strings["Full Name:"] = "Nome completo:"; +$a->strings["Like this channel"] = "Mi piace questo canale"; +$a->strings["j F, Y"] = "j F Y"; +$a->strings["j F"] = "j F"; +$a->strings["Birthday:"] = "Compleanno:"; +$a->strings["Age:"] = "Età :"; +$a->strings["for %1\$d %2\$s"] = "per %1\$d %2\$s"; +$a->strings["Sexual Preference:"] = "Preferenze sessuali:"; +$a->strings["Hometown:"] = "Città dove vivo:"; +$a->strings["Tags:"] = "Tag:"; +$a->strings["Political Views:"] = "Orientamento politico:"; +$a->strings["Religion:"] = "Religione:"; +$a->strings["About:"] = "Informazioni:"; +$a->strings["Hobbies/Interests:"] = "Interessi e hobby:"; +$a->strings["Likes:"] = "Mi piace:"; +$a->strings["Dislikes:"] = "Non mi piace:"; +$a->strings["Contact information and Social Networks:"] = "Contatti e social network:"; +$a->strings["My other channels:"] = "I miei altri canali:"; +$a->strings["Musical interests:"] = "Gusti musicali:"; +$a->strings["Books, literature:"] = "Libri, letteratura:"; +$a->strings["Television:"] = "Televisione:"; +$a->strings["Film/dance/culture/entertainment:"] = "Film, danza, cultura, intrattenimento:"; +$a->strings["Love/Romance:"] = "Amore:"; +$a->strings["Work/employment:"] = "Lavoro:"; +$a->strings["School/education:"] = "Scuola:"; +$a->strings["Like this thing"] = "Mi piace"; +$a->strings["cover photo"] = "Copertina del canale"; $a->strings["Some blurb about what to do when you're new here"] = "Qualche suggerimento per i nuovi utenti su cosa fare"; $a->strings["network"] = "rete"; $a->strings["RSS"] = "RSS"; @@ -1313,7 +1316,6 @@ $a->strings["Nothing to import."] = "Non c'è niente da importare."; $a->strings["Unable to download data from old server"] = "Impossibile importare i dati dal vecchio hub"; $a->strings["Imported file is empty."] = "Il file da importare è vuoto."; $a->strings["Warning: Database versions differ by %1\$d updates."] = "Attenzione: le versioni di database differiscono di %1\$d aggiornamenti."; -$a->strings["Server platform is not compatible. Operation not permitted."] = "La tecnologia del server non è compatibile. Operazione non permessa."; $a->strings["No channel. Import failed."] = "Nessun canale. Import fallito."; $a->strings["You must be logged in to use this feature."] = "Per questa funzionalità devi aver effettuato l'accesso."; $a->strings["Import Channel"] = "Importa un canale"; @@ -1800,50 +1802,48 @@ $a->strings["Sexual Preference"] = "Preferenze sessuali"; $a->strings["Homepage"] = "Home page"; $a->strings["Interests"] = "Interessi"; $a->strings["Profile updated."] = "Profilo aggiornato."; -$a->strings["Hide your contact/friend list from viewers of this profile?"] = "Nascondi la tua lista di contatti/amici ai visitatori di questo profilo?"; +$a->strings["Hide your connections list from viewers of this profile"] = "Nascondi la tua lista di contatti ai visitatori di questo profilo"; $a->strings["Edit Profile Details"] = "Modifica i dettagli del profilo"; $a->strings["View this profile"] = "Guarda questo profilo"; -$a->strings["Change Profile Photo"] = "Cambia la foto del profilo"; +$a->strings["Change cover photo"] = "Cambia la copertina del canale"; $a->strings["Create a new profile using these settings"] = "Crea un nuovo profilo usando queste impostazioni"; $a->strings["Clone this profile"] = "Clona questo profilo"; $a->strings["Delete this profile"] = "Elimina questo profilo"; +$a->strings["Add profile things"] = "Aggiungi oggetti al profilo"; +$a->strings["Relation"] = "Relazione"; $a->strings["Import profile from file"] = "Importa il profilo da un file"; $a->strings["Export profile to file"] = "Esporta il profilo in un file"; -$a->strings["Profile Name:"] = "Nome del profilo:"; -$a->strings["Your Full Name:"] = "Il tuo nome completo:"; -$a->strings["Title/Description:"] = "Titolo/descrizione:"; -$a->strings["Your Gender:"] = "Sesso:"; -$a->strings["Birthday :"] = "Compleanno:"; -$a->strings["Street Address:"] = "Indirizzo (via/piazza):"; -$a->strings["Locality/City:"] = "Località :"; -$a->strings["Postal/Zip Code:"] = "CAP:"; -$a->strings["Country:"] = "Nazione:"; -$a->strings["Region/State:"] = "Regione/stato:"; -$a->strings["<span class=\"heart\">♥</span> Marital Status:"] = "<span class=\"heart\">♥</span> Stato sentimentale:"; -$a->strings["Who: (if applicable)"] = "Con chi: (se possibile)"; +$a->strings["Your gender"] = "Sesso"; +$a->strings["Marital status"] = "Stato civile"; +$a->strings["Sexual preference"] = "Preferenze sessuali"; +$a->strings["Profile name"] = "Nome del profilo"; +$a->strings["This is your default profile."] = "Questo è il tuo profilo predefinito."; +$a->strings["Your full name"] = "Il tuo nome completo"; +$a->strings["Title/Description"] = "Titolo/descrizione"; +$a->strings["Street address"] = "Indirizzo (via/piazza)"; +$a->strings["Locality/City"] = "Località "; +$a->strings["Region/State"] = "Regione/stato"; +$a->strings["Postal/Zip code"] = "CAP"; +$a->strings["Country"] = "Nazione"; +$a->strings["Who (if applicable)"] = "Con chi (se possibile)"; $a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Per esempio: cathy123, Cathy Williams, cathy@example.com"; -$a->strings["Since [date]:"] = "dal [data]:"; -$a->strings["Homepage URL:"] = "Indirizzo home page:"; -$a->strings["Religious Views:"] = "Orientamento religioso:"; -$a->strings["Keywords:"] = "Parole chiave, tag:"; +$a->strings["Since (date)"] = "dal (data)"; +$a->strings["Tell us about yourself"] = "Raccontaci di te..."; +$a->strings["Hometown"] = "Città dove vivo"; +$a->strings["Political views"] = "Orientamento politico"; +$a->strings["Religious views"] = "Orientamento religioso"; +$a->strings["Keywords used in directory listings"] = "Parole chiavi mostrate nell'elenco dei canali"; $a->strings["Example: fishing photography software"] = "Per esempio: pesca fotografia programmazione"; -$a->strings["Used in directory listings"] = "Visibile negli elenchi pubblici di canali"; -$a->strings["Tell us about yourself..."] = "Raccontaci di te..."; -$a->strings["Hobbies/Interests"] = "Hobby/interessi"; -$a->strings["Contact information and Social Networks"] = "Contatti personali e i tuoi social network"; -$a->strings["My other channels"] = "I miei altri canali"; $a->strings["Musical interests"] = "Interessi musicali"; $a->strings["Books, literature"] = "Libri, letteratura"; $a->strings["Television"] = "Televisione"; -$a->strings["Film/dance/culture/entertainment"] = "Film/danza/cultura/intrattenimento"; -$a->strings["Love/romance"] = "Amore"; -$a->strings["Work/employment"] = "Lavoro/impiego"; -$a->strings["School/education"] = "Scuola/educazione"; -$a->strings["This is your default profile."] = "Questo è il tuo profilo predefinito."; -$a->strings["Age: "] = "Età :"; -$a->strings["Edit/Manage Profiles"] = "Modifica/gestisci i profili"; -$a->strings["Add profile things"] = "Aggiungi oggetti al profilo"; -$a->strings["Include desirable objects in your profile"] = "Aggiungi oggetti interessanti al tuo profilo"; +$a->strings["Film/Dance/Culture/Entertainment"] = "Film, danza, cultura, intrattenimento"; +$a->strings["Hobbies/Interests"] = "Hobby/interessi"; +$a->strings["Love/Romance"] = "Amore"; +$a->strings["School/Education"] = "Scuola/educazione"; +$a->strings["Contact information and social networks"] = "Contatti e social network"; +$a->strings["My other channels"] = "I miei altri canali"; +$a->strings["Create New"] = "Crea nuovo"; $a->strings["Invalid profile identifier."] = "Indentificativo del profilo non valido."; $a->strings["Profile Visibility Editor"] = "Modifica la visibilità del profilo"; $a->strings["Click on a contact to add or remove."] = "Clicca su un contatto per aggiungerlo o rimuoverlo."; diff --git a/view/js/acl.js b/view/js/acl.js index 6d94b4987..65f1009ed 100644 --- a/view/js/acl.js +++ b/view/js/acl.js @@ -121,8 +121,10 @@ ACL.prototype.on_button_show = function(event) { event.stopImmediatePropagation(); event.stopPropagation(); - that.set_allow($(this).parent().attr('id')); - that.on_submit(); + if(!$(this).parent().hasClass("grouphide")) { + that.set_allow($(this).parent().attr('id')); + that.on_submit(); + } return false; }; @@ -231,25 +233,29 @@ ACL.prototype.update_view = function() { } $(that.group_uids[id]).each(function(i, v) { if(uclass == "grouphide") - $("#c"+v).removeClass("groupshow"); + // we need attr selection here because the id can include an @ (diaspora/friendica xchans) + $('[id="c' + v + '"]').removeClass("groupshow"); if(uclass !== "") { - var cls = $("#c"+v).attr('class'); + var cls = $('[id="c' + v + '"]').attr('class'); if( cls === undefined) return true; var hiding = cls.indexOf('grouphide'); if(hiding == -1) - $("#c"+v).addClass(uclass); + $('[id="c' + v + '"]').addClass(uclass); } }); break; case "c": if (that.allow_cid.indexOf(id)>=0){ - btshow.removeClass("btn-default").addClass("btn-success"); - bthide.removeClass("btn-danger").addClass("btn-default"); + if(!$(this).hasClass("grouphide") ) { + btshow.removeClass("btn-default").addClass("btn-success"); + bthide.removeClass("btn-danger").addClass("btn-default"); + } } if (that.deny_cid.indexOf(id)>=0){ btshow.removeClass("btn-success").addClass("btn-default"); bthide.removeClass("btn-default").addClass("btn-danger"); + $(this).removeClass("groupshow"); } } }); @@ -277,7 +283,7 @@ ACL.prototype.populate = function(data) { $(data.items).each(function(){ html = "<div class='acl-list-item {4} {7} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>"; html = html.format(this.photo, this.name, this.type, this.xid, '', this.self, this.link, this.taggable); - if (this.uids !== undefined) that.group_uids[this.id] = this.uids; + if (this.uids !== undefined) that.group_uids[this.xid] = this.uids; //console.log(html); that.list_content.append(html); }); @@ -287,4 +293,4 @@ ACL.prototype.populate = function(data) { $(el).removeAttr("data-src"); }); that.update_view(); -};
\ No newline at end of file +}; diff --git a/view/nl/hmessages.po b/view/nl/hmessages.po index bba5099b8..28435df00 100644 --- a/view/nl/hmessages.po +++ b/view/nl/hmessages.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Redmatrix\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-11 00:03-0800\n" -"PO-Revision-Date: 2016-03-14 14:30+0000\n" +"POT-Creation-Date: 2016-03-18 00:03-0700\n" +"PO-Revision-Date: 2016-03-20 13:32+0000\n" "Last-Translator: jeroenpraat <jeroenpraat@xs4all.nl>\n" "Language-Team: Dutch (http://www.transifex.com/Friendica/red-matrix/language/nl/)\n" "MIME-Version: 1.0\n" @@ -59,7 +59,7 @@ msgid "Schedule Outbox" msgstr "Planning-postvak UIT" #: ../../Zotlabs/Storage/Browser.php:164 ../../include/apps.php:360 -#: ../../include/apps.php:415 ../../include/widgets.php:1434 +#: ../../include/apps.php:415 ../../include/widgets.php:1439 #: ../../include/conversation.php:1037 ../../mod/photos.php:766 #: ../../mod/photos.php:1209 msgid "Unknown" @@ -86,7 +86,7 @@ msgid "Create" msgstr "Aanmaken" #: ../../Zotlabs/Storage/Browser.php:231 ../../Zotlabs/Storage/Browser.php:305 -#: ../../include/widgets.php:1447 ../../mod/photos.php:793 +#: ../../include/widgets.php:1452 ../../mod/photos.php:793 #: ../../mod/photos.php:1333 ../../mod/profile_photo.php:401 #: ../../mod/cover_photo.php:353 msgid "Upload" @@ -113,8 +113,8 @@ msgstr "Laatst gewijzigd" #: ../../Zotlabs/Storage/Browser.php:240 ../../include/apps.php:259 #: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36 -#: ../../include/menu.php:108 ../../include/identity.php:924 -#: ../../include/identity.php:928 ../../include/ItemObject.php:100 +#: ../../include/menu.php:108 ../../include/ItemObject.php:100 +#: ../../include/identity.php:932 ../../include/identity.php:936 #: ../../mod/blocks.php:153 ../../mod/connections.php:286 #: ../../mod/connections.php:306 ../../mod/editblock.php:135 #: ../../mod/editlayout.php:134 ../../mod/editpost.php:112 @@ -165,7 +165,7 @@ msgstr "Bestand uploaden" #: ../../include/attach.php:352 ../../include/attach.php:359 #: ../../include/attach.php:437 ../../include/attach.php:889 #: ../../include/attach.php:960 ../../include/attach.php:1112 -#: ../../include/photos.php:29 ../../include/items.php:4573 +#: ../../include/photos.php:29 ../../include/items.php:4660 #: ../../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 @@ -214,8 +214,8 @@ msgid "Page not found." msgstr "Pagina niet gevonden." #: ../../include/Contact.php:101 ../../include/widgets.php:147 -#: ../../include/widgets.php:185 ../../include/identity.php:1003 -#: ../../include/conversation.php:961 ../../mod/directory.php:321 +#: ../../include/widgets.php:185 ../../include/conversation.php:961 +#: ../../include/identity.php:1011 ../../mod/directory.php:321 #: ../../mod/match.php:64 ../../mod/suggest.php:52 msgid "Connect" msgstr "Verbinden" @@ -284,7 +284,7 @@ msgid "Registration request at %s" msgstr "Registratiebevestiging voor %s" #: ../../include/account.php:317 ../../include/account.php:344 -#: ../../include/account.php:404 ../../include/network.php:1660 +#: ../../include/account.php:404 ../../include/network.php:1864 msgid "Administrator" msgstr "Beheerder" @@ -417,7 +417,7 @@ msgstr "Webpagina's" msgid "Channel Home" msgstr "Jouw kanaal" -#: ../../include/apps.php:138 ../../include/identity.php:1387 +#: ../../include/apps.php:138 ../../include/identity.php:1395 #: ../../mod/profperm.php:112 msgid "Profile" msgstr "Profiel" @@ -510,15 +510,15 @@ msgstr "Installeren" msgid "Purchase" msgstr "Aanschaffen" -#: ../../include/auth.php:132 +#: ../../include/auth.php:105 msgid "Logged out." msgstr "Uitgelogd." -#: ../../include/auth.php:273 +#: ../../include/auth.php:246 msgid "Failed authentication" msgstr "Mislukte authenticatie" -#: ../../include/auth.php:287 ../../mod/openid.php:189 +#: ../../include/auth.php:260 ../../mod/openid.php:189 msgid "Login failed." msgstr "Inloggen mislukt." @@ -546,7 +546,7 @@ msgid "Finishes:" msgstr "Einde:" #: ../../include/bb2diaspora.php:487 ../../include/event.php:52 -#: ../../include/text.php:1433 ../../include/identity.php:1018 +#: ../../include/text.php:1433 ../../include/identity.php:1026 #: ../../mod/directory.php:307 msgid "Location:" msgstr "Plaats:" @@ -675,8 +675,9 @@ msgstr "Veilig zoeken" #: ../../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:105 +#: ../../mod/photos.php:634 ../../mod/admin.php:425 ../../mod/profiles.php:647 +#: ../../mod/removeme.php:60 ../../mod/settings.php:588 +#: ../../view/theme/redbasic/php/config.php:105 #: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1555 msgid "No" msgstr "Nee" @@ -688,8 +689,9 @@ msgstr "Nee" #: ../../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:105 +#: ../../mod/photos.php:634 ../../mod/admin.php:427 ../../mod/profiles.php:647 +#: ../../mod/removeme.php:60 ../../mod/settings.php:588 +#: ../../view/theme/redbasic/php/config.php:105 #: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1555 msgid "Yes" msgstr "Ja" @@ -748,7 +750,7 @@ msgstr "Antwoord van het kanaal op afstand was niet volledig." msgid "Channel was deleted and no longer exists." msgstr "Kanaal is verwijderd en bestaat niet meer." -#: ../../include/follow.php:153 ../../include/follow.php:183 +#: ../../include/follow.php:153 ../../include/follow.php:185 msgid "Protocol disabled." msgstr "Protocol uitgeschakeld." @@ -756,11 +758,11 @@ msgstr "Protocol uitgeschakeld." msgid "Channel discovery failed." msgstr "Kanaal ontdekken mislukt." -#: ../../include/follow.php:199 +#: ../../include/follow.php:201 msgid "local account not found." msgstr "lokale account niet gevonden." -#: ../../include/follow.php:224 +#: ../../include/follow.php:226 msgid "Cannot connect to yourself." msgstr "Kan niet met jezelf verbinden" @@ -883,7 +885,8 @@ msgid "Unsaved changes. Are you sure you wish to leave this page?" msgstr "Niet opgeslagen wijzigingen. Ben je er zeker van dat je deze pagina wil verlaten?" #: ../../include/js_strings.php:25 ../../mod/events.php:459 -#: ../../mod/profiles.php:472 ../../mod/pubsites.php:36 +#: ../../mod/profiles.php:472 ../../mod/profiles.php:697 +#: ../../mod/pubsites.php:36 msgid "Location" msgstr "Locatie" @@ -1180,7 +1183,8 @@ msgstr "Profiel weergeven" msgid "Your profile page" msgstr "Jouw profielpagina" -#: ../../include/nav.php:88 ../../include/identity.php:924 +#: ../../include/nav.php:88 ../../include/identity.php:932 +#: ../../mod/profiles.php:776 msgid "Edit Profiles" msgstr "Bewerk profielen" @@ -1188,7 +1192,7 @@ msgstr "Bewerk profielen" msgid "Manage/Edit profiles" msgstr "Beheer/wijzig profielen" -#: ../../include/nav.php:90 ../../include/identity.php:928 +#: ../../include/nav.php:90 ../../include/identity.php:936 msgid "Edit Profile" msgstr "Profiel bewerken" @@ -1347,7 +1351,7 @@ msgstr "Beheer je kanalen" msgid "Account/Channel Settings" msgstr "Account-/kanaal-instellingen" -#: ../../include/nav.php:213 ../../include/widgets.php:1347 +#: ../../include/nav.php:213 ../../include/widgets.php:1350 msgid "Admin" msgstr "Beheer" @@ -1747,7 +1751,7 @@ msgstr "De beveiligings-token van het tekstvak was ongeldig. Dit is mogelijk het msgid "Tags" msgstr "Tags" -#: ../../include/taxonomy.php:305 ../../mod/profiles.php:717 +#: ../../include/taxonomy.php:305 msgid "Keywords" msgstr "Trefwoorden" @@ -1783,8 +1787,8 @@ msgstr "vind dit niet leuk" msgid "dislikes" msgstr "vindt dit niet leuk" -#: ../../include/taxonomy.php:415 ../../include/identity.php:1296 -#: ../../include/conversation.php:1756 ../../include/ItemObject.php:179 +#: ../../include/taxonomy.php:415 ../../include/conversation.php:1756 +#: ../../include/ItemObject.php:179 ../../include/identity.php:1304 #: ../../mod/photos.php:1097 msgctxt "noun" msgid "Like" @@ -1792,92 +1796,6 @@ msgid_plural "Likes" msgstr[0] "vindt dit leuk" msgstr[1] "vinden dit leuk" -#: ../../include/datetime.php:48 -msgid "Miscellaneous" -msgstr "Diversen" - -#: ../../include/datetime.php:132 -msgid "YYYY-MM-DD or MM-DD" -msgstr "JJJJ-MM-DD of 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 "Vereist" - -#: ../../include/datetime.php:263 ../../boot.php:2382 -msgid "never" -msgstr "nooit" - -#: ../../include/datetime.php:269 -msgid "less than a second ago" -msgstr "minder dan een seconde geleden" - -#: ../../include/datetime.php:287 -#, php-format -msgctxt "e.g. 22 hours ago, 1 minute ago" -msgid "%1$d %2$s ago" -msgstr "%1$d %2$s geleden" - -#: ../../include/datetime.php:298 -msgctxt "relative_date" -msgid "year" -msgid_plural "years" -msgstr[0] "jaar" -msgstr[1] "jaren" - -#: ../../include/datetime.php:301 -msgctxt "relative_date" -msgid "month" -msgid_plural "months" -msgstr[0] "maand" -msgstr[1] "maanden" - -#: ../../include/datetime.php:304 -msgctxt "relative_date" -msgid "week" -msgid_plural "weeks" -msgstr[0] "week" -msgstr[1] "weken" - -#: ../../include/datetime.php:307 -msgctxt "relative_date" -msgid "day" -msgid_plural "days" -msgstr[0] "dag" -msgstr[1] "dagen" - -#: ../../include/datetime.php:310 -msgctxt "relative_date" -msgid "hour" -msgid_plural "hours" -msgstr[0] "uur" -msgstr[1] "uren" - -#: ../../include/datetime.php:313 -msgctxt "relative_date" -msgid "minute" -msgid_plural "minutes" -msgstr[0] "minuut" -msgstr[1] "minuten" - -#: ../../include/datetime.php:316 -msgctxt "relative_date" -msgid "second" -msgid_plural "seconds" -msgstr[0] "seconde" -msgstr[1] "seconden" - -#: ../../include/datetime.php:553 -#, php-format -msgid "%1$s's birthday" -msgstr "Verjaardag van %1$s" - -#: ../../include/datetime.php:554 -#, php-format -msgid "Happy Birthday %1$s" -msgstr "Gefeliciteerd met je verjaardag %1$s" - #: ../../include/zot.php:680 msgid "Invalid data packet" msgstr "Datapakket ongeldig" @@ -1886,12 +1804,12 @@ msgstr "Datapakket ongeldig" msgid "Unable to verify channel signature" msgstr "Kanaalkenmerk kon niet worden geverifieerd. " -#: ../../include/zot.php:2326 +#: ../../include/zot.php:2332 #, php-format msgid "Unable to verify site signature for %s" msgstr "Hubkenmerk voor %s kon niet worden geverifieerd" -#: ../../include/zot.php:3661 +#: ../../include/zot.php:3667 msgid "invalid target signature" msgstr "ongeldig doelkenmerk" @@ -2027,24 +1945,24 @@ msgstr "MySpace" msgid "view full size" msgstr "volledige grootte tonen" -#: ../../include/network.php:1612 ../../include/enotify.php:57 +#: ../../include/network.php:1816 ../../include/enotify.php:57 msgid "$Projectname Notification" msgstr "$Projectname-notificatie" -#: ../../include/network.php:1613 ../../include/enotify.php:58 +#: ../../include/network.php:1817 ../../include/enotify.php:58 msgid "$projectname" msgstr "$projectname" -#: ../../include/network.php:1615 ../../include/enotify.php:60 +#: ../../include/network.php:1819 ../../include/enotify.php:60 msgid "Thank You," msgstr "Bedankt," -#: ../../include/network.php:1617 ../../include/enotify.php:62 +#: ../../include/network.php:1821 ../../include/enotify.php:62 #, php-format msgid "%s Administrator" msgstr "Beheerder %s" -#: ../../include/network.php:1674 +#: ../../include/network.php:1878 msgid "No Subject" msgstr "Geen onderwerp" @@ -2369,6 +2287,7 @@ msgid "System" msgstr "Systeem" #: ../../include/widgets.php:105 ../../include/conversation.php:1541 +#: ../../mod/profiles.php:696 msgid "Personal" msgstr "Persoonlijk" @@ -2626,6 +2545,10 @@ msgstr "Hub-instellingen" msgid "Accounts" msgstr "Accounts" +#: ../../include/widgets.php:1317 ../../include/widgets.php:1355 +msgid "Member registrations waiting for confirmation" +msgstr "Accounts die op goedkeuring wachten" + #: ../../include/widgets.php:1318 ../../mod/admin.php:1149 msgid "Channels" msgstr "Kanalen" @@ -2656,25 +2579,21 @@ msgstr "Profielvelden" msgid "DB updates" msgstr "Database-updates" -#: ../../include/widgets.php:1343 ../../include/widgets.php:1349 +#: ../../include/widgets.php:1343 ../../include/widgets.php:1353 #: ../../mod/admin.php:1605 msgid "Logs" msgstr "Logboeken" -#: ../../include/widgets.php:1348 +#: ../../include/widgets.php:1351 msgid "Plugin Features" msgstr "Plugin-opties" -#: ../../include/widgets.php:1350 -msgid "User registrations waiting for confirmation" -msgstr "Accounts die op goedkeuring wachten" - -#: ../../include/widgets.php:1428 ../../mod/photos.php:760 +#: ../../include/widgets.php:1433 ../../mod/photos.php:760 #: ../../mod/photos.php:1300 msgid "View Photo" msgstr "Foto weergeven" -#: ../../include/widgets.php:1445 ../../mod/photos.php:791 +#: ../../include/widgets.php:1450 ../../mod/photos.php:791 msgid "Edit Album" msgstr "Album bewerken" @@ -3141,234 +3060,100 @@ msgstr "Bezoek %s om het voorstel te accepteren of af te wijzen." msgid "[Hubzilla:Notify]" msgstr "[Hubzilla:Notificatie]" -#: ../../include/identity.php:32 -msgid "Unable to obtain identity information from database" -msgstr "Niet in staat om identiteitsinformatie uit de database te verkrijgen" - -#: ../../include/identity.php:66 -msgid "Empty name" -msgstr "Ontbrekende naam" - -#: ../../include/identity.php:69 -msgid "Name too long" -msgstr "Naam te lang" - -#: ../../include/identity.php:181 -msgid "No account identifier" -msgstr "Geen account-identificator" - -#: ../../include/identity.php:193 -msgid "Nickname is required." -msgstr "Bijnaam is verplicht" - -#: ../../include/identity.php:207 -msgid "Reserved nickname. Please choose another." -msgstr "Deze naam is gereserveerd. Kies een andere." - -#: ../../include/identity.php:212 -msgid "" -"Nickname has unsupported characters or is already being used on this site." -msgstr "Deze naam heeft niet ondersteunde karakters of is al op deze hub in gebruik." - -#: ../../include/identity.php:288 -msgid "Unable to retrieve created identity" -msgstr "Niet in staat om aangemaakte identiteit te vinden" - -#: ../../include/identity.php:346 -msgid "Default Profile" -msgstr "Standaardprofiel" - -#: ../../include/identity.php:776 -msgid "Requested channel is not available." -msgstr "Opgevraagd kanaal is niet beschikbaar." - -#: ../../include/identity.php:822 ../../mod/achievements.php:11 -#: ../../mod/blocks.php:29 ../../mod/connect.php:13 ../../mod/editblock.php:29 -#: ../../mod/editlayout.php:27 ../../mod/editwebpage.php:28 -#: ../../mod/filestorage.php:54 ../../mod/hcard.php:8 ../../mod/layouts.php:29 -#: ../../mod/profile.php:16 ../../mod/webpages.php:29 -msgid "Requested profile is not available." -msgstr "Opgevraagd profiel is niet beschikbaar" - -#: ../../include/identity.php:917 ../../mod/profiles.php:795 -msgid "Change profile photo" -msgstr "Profielfoto veranderen" - -#: ../../include/identity.php:925 ../../mod/profiles.php:796 -msgid "Create New Profile" -msgstr "Nieuw profiel aanmaken" - -#: ../../include/identity.php:942 ../../mod/profiles.php:807 -msgid "Profile Image" -msgstr "Profielfoto" - -#: ../../include/identity.php:945 -msgid "Visible to everybody" -msgstr "Voor iedereen zichtbaar" - -#: ../../include/identity.php:946 ../../mod/profiles.php:689 -#: ../../mod/profiles.php:811 -msgid "Edit visibility" -msgstr "Zichtbaarheid bewerken" - -#: ../../include/identity.php:1022 ../../include/identity.php:1280 -msgid "Gender:" -msgstr "Geslacht:" - -#: ../../include/identity.php:1023 ../../include/identity.php:1324 -msgid "Status:" -msgstr "Status:" - -#: ../../include/identity.php:1024 ../../include/identity.php:1335 -msgid "Homepage:" -msgstr "Homepagina:" - -#: ../../include/identity.php:1025 -msgid "Online Now" -msgstr "Nu online" - -#: ../../include/identity.php:1113 ../../include/identity.php:1191 -#: ../../mod/ping.php:318 -msgid "g A l F d" -msgstr "G:i, l d F" - -#: ../../include/identity.php:1114 ../../include/identity.php:1192 -msgid "F d" -msgstr "d F" - -#: ../../include/identity.php:1159 ../../include/identity.php:1231 -#: ../../mod/ping.php:341 -msgid "[today]" -msgstr "[vandaag]" - -#: ../../include/identity.php:1170 -msgid "Birthday Reminders" -msgstr "Verjaardagsherinneringen" - -#: ../../include/identity.php:1171 -msgid "Birthdays this week:" -msgstr "Verjaardagen deze week:" - -#: ../../include/identity.php:1224 -msgid "[No description]" -msgstr "[Geen omschrijving]" - -#: ../../include/identity.php:1242 -msgid "Event Reminders" -msgstr "Herinneringen" - -#: ../../include/identity.php:1243 -msgid "Events this week:" -msgstr "Gebeurtenissen deze week:" - -#: ../../include/identity.php:1278 ../../mod/settings.php:1047 -msgid "Full Name:" -msgstr "Volledige naam:" - -#: ../../include/identity.php:1285 -msgid "Like this channel" -msgstr "Vind dit kanaal leuk" - -#: ../../include/identity.php:1309 -msgid "j F, Y" -msgstr "F j Y" - -#: ../../include/identity.php:1310 -msgid "j F" -msgstr "F j" +#: ../../include/datetime.php:48 ../../mod/profiles.php:699 +msgid "Miscellaneous" +msgstr "Diversen" -#: ../../include/identity.php:1317 -msgid "Birthday:" -msgstr "Geboortedatum:" +#: ../../include/datetime.php:136 +msgid "Birthday" +msgstr "Verjaardag of geboortedatum" -#: ../../include/identity.php:1321 ../../mod/directory.php:302 -msgid "Age:" +#: ../../include/datetime.php:138 +msgid "Age: " msgstr "Leeftijd:" -#: ../../include/identity.php:1330 -#, php-format -msgid "for %1$d %2$s" -msgstr "voor %1$d %2$s" - -#: ../../include/identity.php:1333 -msgid "Sexual Preference:" -msgstr "Seksuele voorkeur:" - -#: ../../include/identity.php:1337 ../../mod/directory.php:318 -msgid "Hometown:" -msgstr "Oorspronkelijk uit:" - -#: ../../include/identity.php:1339 -msgid "Tags:" -msgstr "Tags:" - -#: ../../include/identity.php:1341 -msgid "Political Views:" -msgstr "Politieke overtuigingen:" - -#: ../../include/identity.php:1343 -msgid "Religion:" -msgstr "Religie:" - -#: ../../include/identity.php:1345 ../../mod/directory.php:320 -msgid "About:" -msgstr "Over:" - -#: ../../include/identity.php:1347 -msgid "Hobbies/Interests:" -msgstr "Hobby's/interesses:" +#: ../../include/datetime.php:140 +msgid "YYYY-MM-DD or MM-DD" +msgstr "JJJJ-MM-DD of MM-DD" -#: ../../include/identity.php:1349 -msgid "Likes:" -msgstr "Houdt van:" +#: ../../include/datetime.php:246 ../../mod/appman.php:91 +#: ../../mod/appman.php:92 ../../mod/events.php:444 ../../mod/events.php:449 +#: ../../mod/profiles.php:708 ../../mod/profiles.php:712 +msgid "Required" +msgstr "Vereist" -#: ../../include/identity.php:1351 -msgid "Dislikes:" -msgstr "Houdt niet van:" +#: ../../include/datetime.php:273 ../../boot.php:2382 +msgid "never" +msgstr "nooit" -#: ../../include/identity.php:1353 -msgid "Contact information and Social Networks:" -msgstr "Contactinformatie en sociale netwerken:" +#: ../../include/datetime.php:279 +msgid "less than a second ago" +msgstr "minder dan een seconde geleden" -#: ../../include/identity.php:1355 -msgid "My other channels:" -msgstr "Mijn andere kanalen" +#: ../../include/datetime.php:297 +#, php-format +msgctxt "e.g. 22 hours ago, 1 minute ago" +msgid "%1$d %2$s ago" +msgstr "%1$d %2$s geleden" -#: ../../include/identity.php:1357 -msgid "Musical interests:" -msgstr "Muzikale interesses:" +#: ../../include/datetime.php:308 +msgctxt "relative_date" +msgid "year" +msgid_plural "years" +msgstr[0] "jaar" +msgstr[1] "jaren" -#: ../../include/identity.php:1359 -msgid "Books, literature:" -msgstr "Boeken, literatuur:" +#: ../../include/datetime.php:311 +msgctxt "relative_date" +msgid "month" +msgid_plural "months" +msgstr[0] "maand" +msgstr[1] "maanden" -#: ../../include/identity.php:1361 -msgid "Television:" -msgstr "Televisie:" +#: ../../include/datetime.php:314 +msgctxt "relative_date" +msgid "week" +msgid_plural "weeks" +msgstr[0] "week" +msgstr[1] "weken" -#: ../../include/identity.php:1363 -msgid "Film/dance/culture/entertainment:" -msgstr "Films/dansen/cultuur/vermaak:" +#: ../../include/datetime.php:317 +msgctxt "relative_date" +msgid "day" +msgid_plural "days" +msgstr[0] "dag" +msgstr[1] "dagen" -#: ../../include/identity.php:1365 -msgid "Love/Romance:" -msgstr "Liefde/romantiek:" +#: ../../include/datetime.php:320 +msgctxt "relative_date" +msgid "hour" +msgid_plural "hours" +msgstr[0] "uur" +msgstr[1] "uren" -#: ../../include/identity.php:1367 -msgid "Work/employment:" -msgstr "Werk/beroep:" +#: ../../include/datetime.php:323 +msgctxt "relative_date" +msgid "minute" +msgid_plural "minutes" +msgstr[0] "minuut" +msgstr[1] "minuten" -#: ../../include/identity.php:1369 -msgid "School/education:" -msgstr "School/opleiding:" +#: ../../include/datetime.php:326 +msgctxt "relative_date" +msgid "second" +msgid_plural "seconds" +msgstr[0] "seconde" +msgstr[1] "seconden" -#: ../../include/identity.php:1389 -msgid "Like this thing" -msgstr "Vind dit ding leuk" +#: ../../include/datetime.php:563 +#, php-format +msgid "%1$s's birthday" +msgstr "Verjaardag van %1$s" -#: ../../include/identity.php:1799 ../../mod/cover_photo.php:236 -msgid "cover photo" -msgstr "omslagfoto" +#: ../../include/datetime.php:564 +#, php-format +msgid "Happy Birthday %1$s" +msgstr "Gefeliciteerd met je verjaardag %1$s" #: ../../include/oembed.php:267 msgid "Embedded content" @@ -4253,62 +4038,291 @@ msgstr "Voor alle geaccepteerde connecties zichtbaar." msgid "Visible to specific connections." msgstr "Voor specifieke connecties zichtbaar." -#: ../../include/items.php:4494 ../../mod/display.php:36 +#: ../../include/items.php:4581 ../../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 "Item niet gevonden." -#: ../../include/items.php:5030 ../../mod/group.php:38 ../../mod/group.php:137 +#: ../../include/items.php:5117 ../../mod/group.php:38 ../../mod/group.php:137 msgid "Privacy group not found." msgstr "Privacygroep niet gevonden" -#: ../../include/items.php:5046 +#: ../../include/items.php:5133 msgid "Privacy group is empty." msgstr "Privacygroep is leeg" -#: ../../include/items.php:5053 +#: ../../include/items.php:5140 #, php-format msgid "Privacy group: %s" msgstr "Privacygroep: %s" -#: ../../include/items.php:5063 ../../mod/connedit.php:701 +#: ../../include/items.php:5150 ../../mod/connedit.php:701 #, php-format msgid "Connection: %s" msgstr "Connectie: %s" -#: ../../include/items.php:5065 +#: ../../include/items.php:5152 msgid "Connection not found." msgstr "Connectie niet gevonden." -#: ../../include/items.php:5491 ../../mod/cover_photo.php:229 +#: ../../include/items.php:5578 ../../mod/cover_photo.php:229 msgid "female" msgstr "vrouw" -#: ../../include/items.php:5492 ../../mod/cover_photo.php:230 +#: ../../include/items.php:5579 ../../mod/cover_photo.php:230 #, php-format msgid "%1$s updated her %2$s" msgstr "%1$s heeft haar %2$s bijgewerkt" -#: ../../include/items.php:5493 ../../mod/cover_photo.php:231 +#: ../../include/items.php:5580 ../../mod/cover_photo.php:231 msgid "male" msgstr "man" -#: ../../include/items.php:5494 ../../mod/cover_photo.php:232 +#: ../../include/items.php:5581 ../../mod/cover_photo.php:232 #, php-format msgid "%1$s updated his %2$s" msgstr "%1$s heeft zijn %2$s bijgewerkt" -#: ../../include/items.php:5496 ../../mod/cover_photo.php:234 +#: ../../include/items.php:5583 ../../mod/cover_photo.php:234 #, php-format msgid "%1$s updated their %2$s" msgstr "De %2$s van %1$s is bijgewerkt" -#: ../../include/items.php:5498 +#: ../../include/items.php:5585 msgid "profile photo" msgstr "profielfoto" +#: ../../include/identity.php:32 +msgid "Unable to obtain identity information from database" +msgstr "Niet in staat om identiteitsinformatie uit de database te verkrijgen" + +#: ../../include/identity.php:66 +msgid "Empty name" +msgstr "Ontbrekende naam" + +#: ../../include/identity.php:69 +msgid "Name too long" +msgstr "Naam te lang" + +#: ../../include/identity.php:181 +msgid "No account identifier" +msgstr "Geen account-identificator" + +#: ../../include/identity.php:193 +msgid "Nickname is required." +msgstr "Bijnaam is verplicht" + +#: ../../include/identity.php:207 +msgid "Reserved nickname. Please choose another." +msgstr "Deze naam is gereserveerd. Kies een andere." + +#: ../../include/identity.php:212 +msgid "" +"Nickname has unsupported characters or is already being used on this site." +msgstr "Deze naam heeft niet ondersteunde karakters of is al op deze hub in gebruik." + +#: ../../include/identity.php:288 +msgid "Unable to retrieve created identity" +msgstr "Niet in staat om aangemaakte identiteit te vinden" + +#: ../../include/identity.php:346 +msgid "Default Profile" +msgstr "Standaardprofiel" + +#: ../../include/identity.php:784 +msgid "Requested channel is not available." +msgstr "Opgevraagd kanaal is niet beschikbaar." + +#: ../../include/identity.php:830 ../../mod/achievements.php:11 +#: ../../mod/blocks.php:29 ../../mod/connect.php:13 ../../mod/editblock.php:29 +#: ../../mod/editlayout.php:27 ../../mod/editwebpage.php:28 +#: ../../mod/filestorage.php:54 ../../mod/hcard.php:8 ../../mod/layouts.php:29 +#: ../../mod/profile.php:16 ../../mod/webpages.php:29 +msgid "Requested profile is not available." +msgstr "Opgevraagd profiel is niet beschikbaar" + +#: ../../include/identity.php:925 ../../mod/profiles.php:691 +msgid "Change profile photo" +msgstr "Profielfoto veranderen" + +#: ../../include/identity.php:933 +msgid "Create New Profile" +msgstr "Nieuw profiel aanmaken" + +#: ../../include/identity.php:950 ../../mod/profiles.php:766 +msgid "Profile Image" +msgstr "Profielfoto" + +#: ../../include/identity.php:953 +msgid "Visible to everybody" +msgstr "Voor iedereen zichtbaar" + +#: ../../include/identity.php:954 ../../mod/profiles.php:689 +#: ../../mod/profiles.php:770 +msgid "Edit visibility" +msgstr "Zichtbaarheid bewerken" + +#: ../../include/identity.php:1030 ../../include/identity.php:1288 +msgid "Gender:" +msgstr "Geslacht:" + +#: ../../include/identity.php:1031 ../../include/identity.php:1332 +msgid "Status:" +msgstr "Status:" + +#: ../../include/identity.php:1032 ../../include/identity.php:1343 +msgid "Homepage:" +msgstr "Homepagina:" + +#: ../../include/identity.php:1033 +msgid "Online Now" +msgstr "Nu online" + +#: ../../include/identity.php:1121 ../../include/identity.php:1199 +#: ../../mod/ping.php:318 +msgid "g A l F d" +msgstr "G:i, l d F" + +#: ../../include/identity.php:1122 ../../include/identity.php:1200 +msgid "F d" +msgstr "d F" + +#: ../../include/identity.php:1167 ../../include/identity.php:1239 +#: ../../mod/ping.php:341 +msgid "[today]" +msgstr "[vandaag]" + +#: ../../include/identity.php:1178 +msgid "Birthday Reminders" +msgstr "Verjaardagsherinneringen" + +#: ../../include/identity.php:1179 +msgid "Birthdays this week:" +msgstr "Verjaardagen deze week:" + +#: ../../include/identity.php:1232 +msgid "[No description]" +msgstr "[Geen omschrijving]" + +#: ../../include/identity.php:1250 +msgid "Event Reminders" +msgstr "Herinneringen" + +#: ../../include/identity.php:1251 +msgid "Events this week:" +msgstr "Gebeurtenissen deze week:" + +#: ../../include/identity.php:1286 ../../mod/settings.php:1047 +msgid "Full Name:" +msgstr "Volledige naam:" + +#: ../../include/identity.php:1293 +msgid "Like this channel" +msgstr "Vind dit kanaal leuk" + +#: ../../include/identity.php:1317 +msgid "j F, Y" +msgstr "F j Y" + +#: ../../include/identity.php:1318 +msgid "j F" +msgstr "F j" + +#: ../../include/identity.php:1325 +msgid "Birthday:" +msgstr "Geboortedatum:" + +#: ../../include/identity.php:1329 ../../mod/directory.php:302 +msgid "Age:" +msgstr "Leeftijd:" + +#: ../../include/identity.php:1338 +#, php-format +msgid "for %1$d %2$s" +msgstr "voor %1$d %2$s" + +#: ../../include/identity.php:1341 +msgid "Sexual Preference:" +msgstr "Seksuele voorkeur:" + +#: ../../include/identity.php:1345 ../../mod/directory.php:318 +msgid "Hometown:" +msgstr "Oorspronkelijk uit:" + +#: ../../include/identity.php:1347 +msgid "Tags:" +msgstr "Tags:" + +#: ../../include/identity.php:1349 +msgid "Political Views:" +msgstr "Politieke overtuigingen:" + +#: ../../include/identity.php:1351 +msgid "Religion:" +msgstr "Religie:" + +#: ../../include/identity.php:1353 ../../mod/directory.php:320 +msgid "About:" +msgstr "Over:" + +#: ../../include/identity.php:1355 +msgid "Hobbies/Interests:" +msgstr "Hobby's/interesses:" + +#: ../../include/identity.php:1357 +msgid "Likes:" +msgstr "Houdt van:" + +#: ../../include/identity.php:1359 +msgid "Dislikes:" +msgstr "Houdt niet van:" + +#: ../../include/identity.php:1361 +msgid "Contact information and Social Networks:" +msgstr "Contactinformatie en sociale netwerken:" + +#: ../../include/identity.php:1363 +msgid "My other channels:" +msgstr "Mijn andere kanalen" + +#: ../../include/identity.php:1365 +msgid "Musical interests:" +msgstr "Muzikale interesses:" + +#: ../../include/identity.php:1367 +msgid "Books, literature:" +msgstr "Boeken, literatuur:" + +#: ../../include/identity.php:1369 +msgid "Television:" +msgstr "Televisie:" + +#: ../../include/identity.php:1371 +msgid "Film/dance/culture/entertainment:" +msgstr "Films/dansen/cultuur/vermaak:" + +#: ../../include/identity.php:1373 +msgid "Love/Romance:" +msgstr "Liefde/romantiek:" + +#: ../../include/identity.php:1375 +msgid "Work/employment:" +msgstr "Werk/beroep:" + +#: ../../include/identity.php:1377 +msgid "School/education:" +msgstr "School/opleiding:" + +#: ../../include/identity.php:1397 +msgid "Like this thing" +msgstr "Vind dit ding leuk" + +#: ../../include/identity.php:1807 ../../mod/cover_photo.php:236 +msgid "cover photo" +msgstr "omslagfoto" + #: ../../mod/achievements.php:34 msgid "Some blurb about what to do when you're new here" msgstr "Welkom op $Projectname. Klik op de tab ontdekken of klik rechtsboven op de <a href=\"directory\">kanalengids</a>, om kanalen te vinden. Rechtsboven vind je ook <a href=\"directory\">apps</a>, waar je vrijwel alle functies van $Projectname kunt vinden. Voor <a href=\"directory\">hulp</a> met $Projectname klik je op het vraagteken." @@ -5459,7 +5473,7 @@ msgstr "Profielfoto 128px" msgid "Timezone" msgstr "Tijdzone" -#: ../../mod/id.php:27 ../../mod/profiles.php:713 +#: ../../mod/id.php:27 ../../mod/profiles.php:730 msgid "Homepage URL" msgstr "URL homepagina" @@ -7500,15 +7514,15 @@ msgstr "Huwelijke status" msgid "Romantic Partner" msgstr "Romantische partner" -#: ../../mod/profiles.php:430 ../../mod/profiles.php:718 +#: ../../mod/profiles.php:430 ../../mod/profiles.php:735 msgid "Likes" msgstr "Houdt van" -#: ../../mod/profiles.php:434 ../../mod/profiles.php:719 +#: ../../mod/profiles.php:434 ../../mod/profiles.php:736 msgid "Dislikes" msgstr "Houdt niet van" -#: ../../mod/profiles.php:438 +#: ../../mod/profiles.php:438 ../../mod/profiles.php:743 msgid "Work/Employment" msgstr "Werk/arbeid" @@ -7516,11 +7530,11 @@ msgstr "Werk/arbeid" msgid "Religion" msgstr "Religie" -#: ../../mod/profiles.php:445 ../../mod/profiles.php:715 +#: ../../mod/profiles.php:445 msgid "Political Views" msgstr "Politieke overtuigingen" -#: ../../mod/profiles.php:453 ../../mod/profiles.php:712 +#: ../../mod/profiles.php:453 msgid "Sexual Preference" msgstr "Seksuele voorkeur" @@ -7536,8 +7550,8 @@ msgstr "Interesses" msgid "Profile updated." msgstr "Profiel bijgewerkt" -#: ../../mod/profiles.php:646 -msgid "Hide your contact/friend list from viewers of this profile?" +#: ../../mod/profiles.php:644 +msgid "Hide your connections list from viewers of this profile" msgstr "Laat de lijst met connecties niet aan bezoekers van dit profiel zien." #: ../../mod/profiles.php:686 @@ -7549,13 +7563,9 @@ msgid "View this profile" msgstr "Profiel weergeven" #: ../../mod/profiles.php:690 -msgid "Change Cover Photo" +msgid "Change cover photo" msgstr "Omslagfoto wijzigen" -#: ../../mod/profiles.php:691 -msgid "Change Profile Photo" -msgstr "Profielfoto wijzigen" - #: ../../mod/profiles.php:692 msgid "Create a new profile using these settings" msgstr "Een nieuw profiel aanmaken met dit profiel als basis" @@ -7568,149 +7578,145 @@ msgstr "Dit profiel klonen" msgid "Delete this profile" msgstr "Dit profiel verwijderen" -#: ../../mod/profiles.php:696 +#: ../../mod/profiles.php:695 +msgid "Add profile things" +msgstr "Dingen aan je profiel toevoegen" + +#: ../../mod/profiles.php:698 +msgid "Relation" +msgstr "Relatie" + +#: ../../mod/profiles.php:701 msgid "Import profile from file" msgstr "Profiel vanuit bestand importeren" -#: ../../mod/profiles.php:697 +#: ../../mod/profiles.php:702 msgid "Export profile to file" msgstr "Profiel naar bestand exporteren" -#: ../../mod/profiles.php:698 -msgid "Profile Name" +#: ../../mod/profiles.php:703 +msgid "Your gender" +msgstr "Jouw geslacht" + +#: ../../mod/profiles.php:704 +msgid "Marital status" +msgstr "Burgerlijke staat" + +#: ../../mod/profiles.php:705 +msgid "Sexual preference" +msgstr "Seksuele voorkeur" + +#: ../../mod/profiles.php:708 +msgid "Profile name" msgstr "Profielnaam" -#: ../../mod/profiles.php:699 -msgid "Your Full Name" +#: ../../mod/profiles.php:710 +msgid "This is your default profile." +msgstr "Dit is jouw standaardprofiel" + +#: ../../mod/profiles.php:712 +msgid "Your full name" msgstr "Jouw volledige naam" -#: ../../mod/profiles.php:700 +#: ../../mod/profiles.php:713 msgid "Title/Description" msgstr "Titel/omschrijving" -#: ../../mod/profiles.php:701 -msgid "Your Gender" -msgstr "Jouw geslacht" - -#: ../../mod/profiles.php:702 -msgid "Birthday" -msgstr "Verjaardag of geboortedatum" - -#: ../../mod/profiles.php:703 -msgid "Street Address" +#: ../../mod/profiles.php:716 +msgid "Street address" msgstr "Straat en huisnummer" -#: ../../mod/profiles.php:704 +#: ../../mod/profiles.php:717 msgid "Locality/City" msgstr "Woonplaats" -#: ../../mod/profiles.php:705 -msgid "Postal/Zip Code" +#: ../../mod/profiles.php:718 +msgid "Region/State" +msgstr "Provincie/gewest/deelstaat" + +#: ../../mod/profiles.php:719 +msgid "Postal/Zip code" msgstr "Postcode" -#: ../../mod/profiles.php:706 +#: ../../mod/profiles.php:720 msgid "Country" msgstr "Land" -#: ../../mod/profiles.php:707 -msgid "Region/State" -msgstr "Provincie/gewest/deelstaat" - -#: ../../mod/profiles.php:708 -msgid "<span class=\"heart\">♥</span> Marital Status" -msgstr "<span class=\"heart\">♥</span> Huwelijkse staat" - -#: ../../mod/profiles.php:709 +#: ../../mod/profiles.php:725 msgid "Who (if applicable)" msgstr "Wie (wanneer van toepassing)" -#: ../../mod/profiles.php:710 +#: ../../mod/profiles.php:725 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "Voorbeelden: petra123, Petra Jansen, petra@voorbeeld.nl" -#: ../../mod/profiles.php:711 -msgid "Since [date]" -msgstr "Sinds [datum]" +#: ../../mod/profiles.php:726 +msgid "Since (date)" +msgstr "Sinds (datum)" -#: ../../mod/profiles.php:714 +#: ../../mod/profiles.php:729 +msgid "Tell us about yourself" +msgstr "Vertel ons iets over jezelf" + +#: ../../mod/profiles.php:731 msgid "Hometown" msgstr "Oorspronkelijk uit" -#: ../../mod/profiles.php:716 -msgid "Religious Views" +#: ../../mod/profiles.php:732 +msgid "Political views" +msgstr "Politieke overtuigingen" + +#: ../../mod/profiles.php:733 +msgid "Religious views" msgstr "Religieuze overtuigingen" -#: ../../mod/profiles.php:720 +#: ../../mod/profiles.php:734 +msgid "Keywords used in directory listings" +msgstr "Trefwoorden voor in de kanalengids" + +#: ../../mod/profiles.php:734 msgid "Example: fishing photography software" msgstr "Voorbeeld: muziek, fotografie, software" -#: ../../mod/profiles.php:721 -msgid "Used in directory listings" -msgstr "Wordt in de kanalengids gebruikt" - -#: ../../mod/profiles.php:722 -msgid "Tell us about yourself..." -msgstr "Vertel ons iets over jezelf..." - -#: ../../mod/profiles.php:723 -msgid "Hobbies/Interests" -msgstr "Hobby's/interesses" - -#: ../../mod/profiles.php:724 -msgid "Contact information and Social Networks" -msgstr "Contactinformatie en sociale netwerken" - -#: ../../mod/profiles.php:725 -msgid "My other channels" -msgstr "Mijn andere kanalen" - -#: ../../mod/profiles.php:726 +#: ../../mod/profiles.php:737 msgid "Musical interests" msgstr "Muzikale interesses" -#: ../../mod/profiles.php:727 +#: ../../mod/profiles.php:738 msgid "Books, literature" msgstr "Boeken/literatuur" -#: ../../mod/profiles.php:728 +#: ../../mod/profiles.php:739 msgid "Television" msgstr "Televisie" -#: ../../mod/profiles.php:729 -msgid "Film/dance/culture/entertainment" +#: ../../mod/profiles.php:740 +msgid "Film/Dance/Culture/Entertainment" msgstr "Film/dans/cultuur/entertainment" -#: ../../mod/profiles.php:730 -msgid "Love/romance" -msgstr "Liefde/romantiek" - -#: ../../mod/profiles.php:731 -msgid "Work/employment" -msgstr "Werk/arbeid" - -#: ../../mod/profiles.php:732 -msgid "School/education" -msgstr "School/onderwijs" +#: ../../mod/profiles.php:741 +msgid "Hobbies/Interests" +msgstr "Hobby's/interesses" -#: ../../mod/profiles.php:738 -msgid "This is your default profile." -msgstr "Dit is jouw standaardprofiel" +#: ../../mod/profiles.php:742 +msgid "Love/Romance" +msgstr "Liefde/romantiek" -#: ../../mod/profiles.php:749 -msgid "Age: " -msgstr "Leeftijd:" +#: ../../mod/profiles.php:744 +msgid "School/Education" +msgstr "School/opleiding" -#: ../../mod/profiles.php:792 -msgid "Edit/Manage Profiles" -msgstr "Profielen bewerken/beheren" +#: ../../mod/profiles.php:745 +msgid "Contact information and social networks" +msgstr "Contactinformatie en sociale netwerken" -#: ../../mod/profiles.php:793 -msgid "Add profile things" -msgstr "Dingen aan je profiel toevoegen" +#: ../../mod/profiles.php:746 +msgid "My other channels" +msgstr "Mijn andere kanalen" -#: ../../mod/profiles.php:794 -msgid "Include desirable objects in your profile" -msgstr "Voeg door jou gewenste dingen aan jouw profiel toe" +#: ../../mod/profiles.php:777 +msgid "Create New" +msgstr "Nieuwe aanmaken" #: ../../mod/profperm.php:29 ../../mod/profperm.php:58 msgid "Invalid profile identifier." diff --git a/view/nl/hstrings.php b/view/nl/hstrings.php index b06019480..44819d71f 100644 --- a/view/nl/hstrings.php +++ b/view/nl/hstrings.php @@ -398,42 +398,6 @@ $a->strings["__ctx:noun__ Like"] = array( 0 => "vindt dit leuk", 1 => "vinden dit leuk", ); -$a->strings["Miscellaneous"] = "Diversen"; -$a->strings["YYYY-MM-DD or MM-DD"] = "JJJJ-MM-DD of MM-DD"; -$a->strings["Required"] = "Vereist"; -$a->strings["never"] = "nooit"; -$a->strings["less than a second ago"] = "minder dan een seconde geleden"; -$a->strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "%1\$d %2\$s geleden"; -$a->strings["__ctx:relative_date__ year"] = array( - 0 => "jaar", - 1 => "jaren", -); -$a->strings["__ctx:relative_date__ month"] = array( - 0 => "maand", - 1 => "maanden", -); -$a->strings["__ctx:relative_date__ week"] = array( - 0 => "week", - 1 => "weken", -); -$a->strings["__ctx:relative_date__ day"] = array( - 0 => "dag", - 1 => "dagen", -); -$a->strings["__ctx:relative_date__ hour"] = array( - 0 => "uur", - 1 => "uren", -); -$a->strings["__ctx:relative_date__ minute"] = array( - 0 => "minuut", - 1 => "minuten", -); -$a->strings["__ctx:relative_date__ second"] = array( - 0 => "seconde", - 1 => "seconden", -); -$a->strings["%1\$s's birthday"] = "Verjaardag van %1\$s"; -$a->strings["Happy Birthday %1\$s"] = "Gefeliciteerd met je verjaardag %1\$s"; $a->strings["Invalid data packet"] = "Datapakket ongeldig"; $a->strings["Unable to verify channel signature"] = "Kanaalkenmerk kon niet worden geverifieerd. "; $a->strings["Unable to verify site signature for %s"] = "Hubkenmerk voor %s kon niet worden geverifieerd"; @@ -614,6 +578,7 @@ $a->strings["For Administrators"] = "Voor beheerders"; $a->strings["For Developers"] = "Voor ontwikkelaars"; $a->strings["Site"] = "Hub-instellingen"; $a->strings["Accounts"] = "Accounts"; +$a->strings["Member registrations waiting for confirmation"] = "Accounts die op goedkeuring wachten"; $a->strings["Channels"] = "Kanalen"; $a->strings["Security"] = "Beveiliging"; $a->strings["Plugins"] = "Plugins"; @@ -623,7 +588,6 @@ $a->strings["Profile Fields"] = "Profielvelden"; $a->strings["DB updates"] = "Database-updates"; $a->strings["Logs"] = "Logboeken"; $a->strings["Plugin Features"] = "Plugin-opties"; -$a->strings["User registrations waiting for confirmation"] = "Accounts die op goedkeuring wachten"; $a->strings["View Photo"] = "Foto weergeven"; $a->strings["Edit Album"] = "Album bewerken"; $a->strings["prev"] = "vorige"; @@ -731,61 +695,44 @@ $a->strings["Name:"] = "Naam:"; $a->strings["Photo:"] = "Foto:"; $a->strings["Please visit %s to approve or reject the suggestion."] = "Bezoek %s om het voorstel te accepteren of af te wijzen."; $a->strings["[Hubzilla:Notify]"] = "[Hubzilla:Notificatie]"; -$a->strings["Unable to obtain identity information from database"] = "Niet in staat om identiteitsinformatie uit de database te verkrijgen"; -$a->strings["Empty name"] = "Ontbrekende naam"; -$a->strings["Name too long"] = "Naam te lang"; -$a->strings["No account identifier"] = "Geen account-identificator"; -$a->strings["Nickname is required."] = "Bijnaam is verplicht"; -$a->strings["Reserved nickname. Please choose another."] = "Deze naam is gereserveerd. Kies een andere."; -$a->strings["Nickname has unsupported characters or is already being used on this site."] = "Deze naam heeft niet ondersteunde karakters of is al op deze hub in gebruik."; -$a->strings["Unable to retrieve created identity"] = "Niet in staat om aangemaakte identiteit te vinden"; -$a->strings["Default Profile"] = "Standaardprofiel"; -$a->strings["Requested channel is not available."] = "Opgevraagd kanaal is niet beschikbaar."; -$a->strings["Requested profile is not available."] = "Opgevraagd profiel is niet beschikbaar"; -$a->strings["Change profile photo"] = "Profielfoto veranderen"; -$a->strings["Create New Profile"] = "Nieuw profiel aanmaken"; -$a->strings["Profile Image"] = "Profielfoto"; -$a->strings["Visible to everybody"] = "Voor iedereen zichtbaar"; -$a->strings["Edit visibility"] = "Zichtbaarheid bewerken"; -$a->strings["Gender:"] = "Geslacht:"; -$a->strings["Status:"] = "Status:"; -$a->strings["Homepage:"] = "Homepagina:"; -$a->strings["Online Now"] = "Nu online"; -$a->strings["g A l F d"] = "G:i, l d F"; -$a->strings["F d"] = "d F"; -$a->strings["[today]"] = "[vandaag]"; -$a->strings["Birthday Reminders"] = "Verjaardagsherinneringen"; -$a->strings["Birthdays this week:"] = "Verjaardagen deze week:"; -$a->strings["[No description]"] = "[Geen omschrijving]"; -$a->strings["Event Reminders"] = "Herinneringen"; -$a->strings["Events this week:"] = "Gebeurtenissen deze week:"; -$a->strings["Full Name:"] = "Volledige naam:"; -$a->strings["Like this channel"] = "Vind dit kanaal leuk"; -$a->strings["j F, Y"] = "F j Y"; -$a->strings["j F"] = "F j"; -$a->strings["Birthday:"] = "Geboortedatum:"; -$a->strings["Age:"] = "Leeftijd:"; -$a->strings["for %1\$d %2\$s"] = "voor %1\$d %2\$s"; -$a->strings["Sexual Preference:"] = "Seksuele voorkeur:"; -$a->strings["Hometown:"] = "Oorspronkelijk uit:"; -$a->strings["Tags:"] = "Tags:"; -$a->strings["Political Views:"] = "Politieke overtuigingen:"; -$a->strings["Religion:"] = "Religie:"; -$a->strings["About:"] = "Over:"; -$a->strings["Hobbies/Interests:"] = "Hobby's/interesses:"; -$a->strings["Likes:"] = "Houdt van:"; -$a->strings["Dislikes:"] = "Houdt niet van:"; -$a->strings["Contact information and Social Networks:"] = "Contactinformatie en sociale netwerken:"; -$a->strings["My other channels:"] = "Mijn andere kanalen"; -$a->strings["Musical interests:"] = "Muzikale interesses:"; -$a->strings["Books, literature:"] = "Boeken, literatuur:"; -$a->strings["Television:"] = "Televisie:"; -$a->strings["Film/dance/culture/entertainment:"] = "Films/dansen/cultuur/vermaak:"; -$a->strings["Love/Romance:"] = "Liefde/romantiek:"; -$a->strings["Work/employment:"] = "Werk/beroep:"; -$a->strings["School/education:"] = "School/opleiding:"; -$a->strings["Like this thing"] = "Vind dit ding leuk"; -$a->strings["cover photo"] = "omslagfoto"; +$a->strings["Miscellaneous"] = "Diversen"; +$a->strings["Birthday"] = "Verjaardag of geboortedatum"; +$a->strings["Age: "] = "Leeftijd:"; +$a->strings["YYYY-MM-DD or MM-DD"] = "JJJJ-MM-DD of MM-DD"; +$a->strings["Required"] = "Vereist"; +$a->strings["never"] = "nooit"; +$a->strings["less than a second ago"] = "minder dan een seconde geleden"; +$a->strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "%1\$d %2\$s geleden"; +$a->strings["__ctx:relative_date__ year"] = array( + 0 => "jaar", + 1 => "jaren", +); +$a->strings["__ctx:relative_date__ month"] = array( + 0 => "maand", + 1 => "maanden", +); +$a->strings["__ctx:relative_date__ week"] = array( + 0 => "week", + 1 => "weken", +); +$a->strings["__ctx:relative_date__ day"] = array( + 0 => "dag", + 1 => "dagen", +); +$a->strings["__ctx:relative_date__ hour"] = array( + 0 => "uur", + 1 => "uren", +); +$a->strings["__ctx:relative_date__ minute"] = array( + 0 => "minuut", + 1 => "minuten", +); +$a->strings["__ctx:relative_date__ second"] = array( + 0 => "seconde", + 1 => "seconden", +); +$a->strings["%1\$s's birthday"] = "Verjaardag van %1\$s"; +$a->strings["Happy Birthday %1\$s"] = "Gefeliciteerd met je verjaardag %1\$s"; $a->strings["Embedded content"] = "Ingesloten (embedded) inhoud"; $a->strings["Embedding disabled"] = "Insluiten (embedding) uitgeschakeld"; $a->strings["channel"] = "kanaal"; @@ -1024,6 +971,61 @@ $a->strings["male"] = "man"; $a->strings["%1\$s updated his %2\$s"] = "%1\$s heeft zijn %2\$s bijgewerkt"; $a->strings["%1\$s updated their %2\$s"] = "De %2\$s van %1\$s is bijgewerkt"; $a->strings["profile photo"] = "profielfoto"; +$a->strings["Unable to obtain identity information from database"] = "Niet in staat om identiteitsinformatie uit de database te verkrijgen"; +$a->strings["Empty name"] = "Ontbrekende naam"; +$a->strings["Name too long"] = "Naam te lang"; +$a->strings["No account identifier"] = "Geen account-identificator"; +$a->strings["Nickname is required."] = "Bijnaam is verplicht"; +$a->strings["Reserved nickname. Please choose another."] = "Deze naam is gereserveerd. Kies een andere."; +$a->strings["Nickname has unsupported characters or is already being used on this site."] = "Deze naam heeft niet ondersteunde karakters of is al op deze hub in gebruik."; +$a->strings["Unable to retrieve created identity"] = "Niet in staat om aangemaakte identiteit te vinden"; +$a->strings["Default Profile"] = "Standaardprofiel"; +$a->strings["Requested channel is not available."] = "Opgevraagd kanaal is niet beschikbaar."; +$a->strings["Requested profile is not available."] = "Opgevraagd profiel is niet beschikbaar"; +$a->strings["Change profile photo"] = "Profielfoto veranderen"; +$a->strings["Create New Profile"] = "Nieuw profiel aanmaken"; +$a->strings["Profile Image"] = "Profielfoto"; +$a->strings["Visible to everybody"] = "Voor iedereen zichtbaar"; +$a->strings["Edit visibility"] = "Zichtbaarheid bewerken"; +$a->strings["Gender:"] = "Geslacht:"; +$a->strings["Status:"] = "Status:"; +$a->strings["Homepage:"] = "Homepagina:"; +$a->strings["Online Now"] = "Nu online"; +$a->strings["g A l F d"] = "G:i, l d F"; +$a->strings["F d"] = "d F"; +$a->strings["[today]"] = "[vandaag]"; +$a->strings["Birthday Reminders"] = "Verjaardagsherinneringen"; +$a->strings["Birthdays this week:"] = "Verjaardagen deze week:"; +$a->strings["[No description]"] = "[Geen omschrijving]"; +$a->strings["Event Reminders"] = "Herinneringen"; +$a->strings["Events this week:"] = "Gebeurtenissen deze week:"; +$a->strings["Full Name:"] = "Volledige naam:"; +$a->strings["Like this channel"] = "Vind dit kanaal leuk"; +$a->strings["j F, Y"] = "F j Y"; +$a->strings["j F"] = "F j"; +$a->strings["Birthday:"] = "Geboortedatum:"; +$a->strings["Age:"] = "Leeftijd:"; +$a->strings["for %1\$d %2\$s"] = "voor %1\$d %2\$s"; +$a->strings["Sexual Preference:"] = "Seksuele voorkeur:"; +$a->strings["Hometown:"] = "Oorspronkelijk uit:"; +$a->strings["Tags:"] = "Tags:"; +$a->strings["Political Views:"] = "Politieke overtuigingen:"; +$a->strings["Religion:"] = "Religie:"; +$a->strings["About:"] = "Over:"; +$a->strings["Hobbies/Interests:"] = "Hobby's/interesses:"; +$a->strings["Likes:"] = "Houdt van:"; +$a->strings["Dislikes:"] = "Houdt niet van:"; +$a->strings["Contact information and Social Networks:"] = "Contactinformatie en sociale netwerken:"; +$a->strings["My other channels:"] = "Mijn andere kanalen"; +$a->strings["Musical interests:"] = "Muzikale interesses:"; +$a->strings["Books, literature:"] = "Boeken, literatuur:"; +$a->strings["Television:"] = "Televisie:"; +$a->strings["Film/dance/culture/entertainment:"] = "Films/dansen/cultuur/vermaak:"; +$a->strings["Love/Romance:"] = "Liefde/romantiek:"; +$a->strings["Work/employment:"] = "Werk/beroep:"; +$a->strings["School/education:"] = "School/opleiding:"; +$a->strings["Like this thing"] = "Vind dit ding leuk"; +$a->strings["cover photo"] = "omslagfoto"; $a->strings["Some blurb about what to do when you're new here"] = "Welkom op \$Projectname. Klik op de tab ontdekken of klik rechtsboven op de <a href=\"directory\">kanalengids</a>, om kanalen te vinden. Rechtsboven vind je ook <a href=\"directory\">apps</a>, waar je vrijwel alle functies van \$Projectname kunt vinden. Voor <a href=\"directory\">hulp</a> met \$Projectname klik je op het vraagteken."; $a->strings["network"] = "netwerk"; $a->strings["RSS"] = "RSS"; @@ -1800,50 +1802,48 @@ $a->strings["Sexual Preference"] = "Seksuele voorkeur"; $a->strings["Homepage"] = "Homepage"; $a->strings["Interests"] = "Interesses"; $a->strings["Profile updated."] = "Profiel bijgewerkt"; -$a->strings["Hide your contact/friend list from viewers of this profile?"] = "Laat de lijst met connecties niet aan bezoekers van dit profiel zien."; +$a->strings["Hide your connections list from viewers of this profile"] = "Laat de lijst met connecties niet aan bezoekers van dit profiel zien."; $a->strings["Edit Profile Details"] = "Profiel bewerken"; $a->strings["View this profile"] = "Profiel weergeven"; -$a->strings["Change Cover Photo"] = "Omslagfoto wijzigen"; -$a->strings["Change Profile Photo"] = "Profielfoto wijzigen"; +$a->strings["Change cover photo"] = "Omslagfoto wijzigen"; $a->strings["Create a new profile using these settings"] = "Een nieuw profiel aanmaken met dit profiel als basis"; $a->strings["Clone this profile"] = "Dit profiel klonen"; $a->strings["Delete this profile"] = "Dit profiel verwijderen"; +$a->strings["Add profile things"] = "Dingen aan je profiel toevoegen"; +$a->strings["Relation"] = "Relatie"; $a->strings["Import profile from file"] = "Profiel vanuit bestand importeren"; $a->strings["Export profile to file"] = "Profiel naar bestand exporteren"; -$a->strings["Profile Name"] = "Profielnaam"; -$a->strings["Your Full Name"] = "Jouw volledige naam"; +$a->strings["Your gender"] = "Jouw geslacht"; +$a->strings["Marital status"] = "Burgerlijke staat"; +$a->strings["Sexual preference"] = "Seksuele voorkeur"; +$a->strings["Profile name"] = "Profielnaam"; +$a->strings["This is your default profile."] = "Dit is jouw standaardprofiel"; +$a->strings["Your full name"] = "Jouw volledige naam"; $a->strings["Title/Description"] = "Titel/omschrijving"; -$a->strings["Your Gender"] = "Jouw geslacht"; -$a->strings["Birthday"] = "Verjaardag of geboortedatum"; -$a->strings["Street Address"] = "Straat en huisnummer"; +$a->strings["Street address"] = "Straat en huisnummer"; $a->strings["Locality/City"] = "Woonplaats"; -$a->strings["Postal/Zip Code"] = "Postcode"; -$a->strings["Country"] = "Land"; $a->strings["Region/State"] = "Provincie/gewest/deelstaat"; -$a->strings["<span class=\"heart\">♥</span> Marital Status"] = "<span class=\"heart\">♥</span> Huwelijkse staat"; +$a->strings["Postal/Zip code"] = "Postcode"; +$a->strings["Country"] = "Land"; $a->strings["Who (if applicable)"] = "Wie (wanneer van toepassing)"; $a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Voorbeelden: petra123, Petra Jansen, petra@voorbeeld.nl"; -$a->strings["Since [date]"] = "Sinds [datum]"; +$a->strings["Since (date)"] = "Sinds (datum)"; +$a->strings["Tell us about yourself"] = "Vertel ons iets over jezelf"; $a->strings["Hometown"] = "Oorspronkelijk uit"; -$a->strings["Religious Views"] = "Religieuze overtuigingen"; +$a->strings["Political views"] = "Politieke overtuigingen"; +$a->strings["Religious views"] = "Religieuze overtuigingen"; +$a->strings["Keywords used in directory listings"] = "Trefwoorden voor in de kanalengids"; $a->strings["Example: fishing photography software"] = "Voorbeeld: muziek, fotografie, software"; -$a->strings["Used in directory listings"] = "Wordt in de kanalengids gebruikt"; -$a->strings["Tell us about yourself..."] = "Vertel ons iets over jezelf..."; -$a->strings["Hobbies/Interests"] = "Hobby's/interesses"; -$a->strings["Contact information and Social Networks"] = "Contactinformatie en sociale netwerken"; -$a->strings["My other channels"] = "Mijn andere kanalen"; $a->strings["Musical interests"] = "Muzikale interesses"; $a->strings["Books, literature"] = "Boeken/literatuur"; $a->strings["Television"] = "Televisie"; -$a->strings["Film/dance/culture/entertainment"] = "Film/dans/cultuur/entertainment"; -$a->strings["Love/romance"] = "Liefde/romantiek"; -$a->strings["Work/employment"] = "Werk/arbeid"; -$a->strings["School/education"] = "School/onderwijs"; -$a->strings["This is your default profile."] = "Dit is jouw standaardprofiel"; -$a->strings["Age: "] = "Leeftijd:"; -$a->strings["Edit/Manage Profiles"] = "Profielen bewerken/beheren"; -$a->strings["Add profile things"] = "Dingen aan je profiel toevoegen"; -$a->strings["Include desirable objects in your profile"] = "Voeg door jou gewenste dingen aan jouw profiel toe"; +$a->strings["Film/Dance/Culture/Entertainment"] = "Film/dans/cultuur/entertainment"; +$a->strings["Hobbies/Interests"] = "Hobby's/interesses"; +$a->strings["Love/Romance"] = "Liefde/romantiek"; +$a->strings["School/Education"] = "School/opleiding"; +$a->strings["Contact information and social networks"] = "Contactinformatie en sociale netwerken"; +$a->strings["My other channels"] = "Mijn andere kanalen"; +$a->strings["Create New"] = "Nieuwe aanmaken"; $a->strings["Invalid profile identifier."] = "Ongeldige profiel-identificator"; $a->strings["Profile Visibility Editor"] = "Zichtbaarheid profiel "; $a->strings["Click on a contact to add or remove."] = "Klik op een connectie om deze toe te voegen of te verwijderen"; diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index f0e057425..6ef9ea284 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -915,7 +915,15 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { border-radius: $radiuspx; } -.acl-list-item img{ +.acl-list-item.grouphide { + border: 1px solid red; +} + +.acl-list-item.groupshow { + border: 1px solid green; +} + +.acl-list-item img { width: 40px; height: 40px; float: left; diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl index 013f3f296..88df7481a 100755 --- a/view/tpl/acl_selector.tpl +++ b/view/tpl/acl_selector.tpl @@ -15,14 +15,11 @@ <div class="clear"></div> </div> {{/if}} - <div id="acl-wrapper"> <button id="acl-showall" class="btn btn-block btn-default"><i class="icon-globe"></i> {{$showall}}</button> <input type="text" id="acl-search" placeholder=""> - <div id="acl-list"> <div id="acl-list-content"></div> - </div> <span id="acl-fields"></span> </div> diff --git a/view/tpl/admin_aside.tpl b/view/tpl/admin_aside.tpl index da762a094..70e1677af 100755 --- a/view/tpl/admin_aside.tpl +++ b/view/tpl/admin_aside.tpl @@ -5,7 +5,7 @@ $("nav").bind('nav-update', function(e,data){ var elm = $('#pending-update'); var register = $(data).find('register').text(); - if (register=="0") { reigster=""; elm.hide();} else { elm.show(); } + if (register=="0") { register=""; elm.hide();} else { elm.show(); } elm.html(register); }); }); @@ -13,16 +13,9 @@ <div class="widget"> <h3>{{$admtxt}}</h3> <ul class="nav nav-pills nav-stacked"> - <li><a href='{{$admin.site.0}}'>{{$admin.site.1}}</a></li> - <li><a href='{{$admin.users.0}}'>{{$admin.users.1}}<span id='pending-update' title='{{$h_pending}}'></span></a></li> - <li><a href='{{$admin.channels.0}}'>{{$admin.channels.1}}</a></li> - <li><a href='{{$admin.security.0}}'>{{$admin.security.1}}</a></li> - <li><a href='{{$admin.queue.0}}'>{{$admin.queue.1}}</a></li> - <li><a href='{{$admin.plugins.0}}'>{{$admin.plugins.1}}</a></li> - <li><a href='{{$admin.themes.0}}'>{{$admin.themes.1}}</a></li> - <li><a href='{{$admin.features.0}}'>{{$admin.features.1}}</a></li> - <li><a href='{{$admin.profs.0}}'>{{$admin.profs.1}}</a></li> - <li><a href='{{$admin.dbsync.0}}'>{{$admin.dbsync.1}}</a></li> + {{foreach $admin as $link}} + <li><a href='{{$link.0}}'>{{$link.1}}{{if $link.3}}<span id='{{$link.3}}' title='{{$link.4}}'></span>{{/if}}</a></li> + {{/foreach}} </ul> </div> @@ -34,11 +27,11 @@ {{/if}} -{{if $admin.plugins_admin}} +{{if $plugins}} <div class="widget"> <h3>{{$plugadmtxt}}</h3> <ul class="nav nav-pills nav-stacked"> - {{foreach $admin.plugins_admin as $l}} + {{foreach $plugins as $l}} <li><a href='{{$l.0}}'>{{$l.1}}</a></li> {{/foreach}} </ul> @@ -48,6 +41,6 @@ <div class="widget"> <h3>{{$logtxt}}</h3> <ul class="nav nav-pills nav-stacked"> - <li><a href='{{$admin.logs.0}}'>{{$admin.logs.1}}</a></li> + <li><a href='{{$logs.0}}'>{{$logs.1}}</a></li> </ul> </div> diff --git a/view/tpl/channel.tpl b/view/tpl/channel.tpl index 23f1e0dd4..17713aef4 100755 --- a/view/tpl/channel.tpl +++ b/view/tpl/channel.tpl @@ -1,12 +1,53 @@ -<div class='channel-selection {{if $selected == $channel.channel_id}}selected-channel{{/if}}'> -{{if $channel.default_links}} -{{if $channel.default}} -<div class="channel-selection-default default"><i class="icon-check"></i> {{$msg_default}}</div> -{{else}} -<div class="channel-selection-default"><a href="manage/{{$channel.channel_id}}/default"><i class="icon-check-empty" title="{{$msg_make_default}}"></i></a></div> -{{/if}} -{{/if}} -<a href="{{$channel.link}}" class="channel-selection-photo-link" title="{{$channel.channel_name}}"><img class="channel-photo" src="{{$channel.xchan_photo_m}}" alt="{{$channel.channel_name}}" /></a> -<div class="channels-notifications-wrapper">{{if $channel.delegate}}{{else}}<a href='manage/{{$channel.channel_id}}/message' style="{{if $channel.mail != 0}}color:#c60032;{{/if}}" title='{{$channel.mail|string_format:$mail_format}}'><i class="icon-envelope"></i> {{$channel.mail}}</a> <a href='manage/{{$channel.channel_id}}/connections/ifpending' style="{{if $channel.intros != 0}}color:#c60032;{{/if}}" title='{{$channel.intros|string_format:$intros_format}}'><i class="icon-user"></i> {{$channel.intros}}</a>{{/if}}</div> -<a href="{{$channel.link}}" class="channel-selection-name-link" title="{{$channel.channel_name}}"><div class="channel-name">{{$channel.channel_name}}</div></a> +<div class="section-subtitle-wrapper"> + <div class="pull-right"> + {{if $channel.default_links}} + {{if $channel.default}} + <div> + <i class="icon-check"></i> {{$msg_default}} + </div> + {{else}} + <a href="manage/{{$channel.channel_id}}/default" class="make-default-link"> + <i class="icon-check-empty"></i> {{$msg_make_default}} + </a> + {{/if}} + {{/if}} + {{if $channel.delegate}} + {{$delegated_desc}} + {{/if}} + </div> + <h3> + {{if $selected == $channel.channel_id}} + <i class="selected-channel icon-circle" title="{{$msg_selected}}"></i> + {{/if}} + {{if $channel.delegate}} + <i class="icon-circle-arrow-right" title="{{$delegated_desc}}"></i> + {{/if}} + {{if $selected != $channel.channel_id}}<a href="{{$channel.link}}" title="{{$channel.channel_name}}">{{/if}} + {{$channel.channel_name}} + {{if $selected != $channel.channel_id}}</a>{{/if}} + </h3> + <div class="clear"></div> +</div> +<div class="section-content-wrapper"> + <div class="channel-photo-wrapper"> + {{if $selected != $channel.channel_id}}<a href="{{$channel.link}}" class="channel-selection-photo-link" title="{{$channel.channel_name}}">{{/if}} + <img class="channel-photo" src="{{$channel.xchan_photo_m}}" alt="{{$channel.channel_name}}" /> + {{if $selected != $channel.channel_id}}</a>{{/if}} + </div> + <div class="channel-notifications-wrapper"> + {{if !$channel.delegate}} + <div class="channel-notification"> + <i class="icon-envelope{{if $channel.mail != 0}} new-notification{{/if}}"></i> + {{if $channel.mail != 0}}<a href="manage/{{$channel.channel_id}}/mail/combined">{{/if}}{{$channel.mail|string_format:$mail_format}}{{if $channel.mail != 0}}</a>{{/if}} + </div> + <div class="channel-notification"> + <i class="icon-user{{if $channel.intros != 0}} new-notification{{/if}}"></i> + {{if $channel.intros != 0}}<a href='manage/{{$channel.channel_id}}/connections/ifpending'>{{/if}}{{$channel.intros|string_format:$intros_format}}{{if $channel.intros != 0}}</a>{{/if}} + </div> + <div class="channel-link"> + <i class="icon-map-marker"></i> + <a href="manage/{{$channel.channel_id}}/locs">{{$locs}}</a> + </div> + {{/if}} + </div> </div> diff --git a/view/tpl/channels.tpl b/view/tpl/channels.tpl index 44daa0a3e..1a6012926 100755 --- a/view/tpl/channels.tpl +++ b/view/tpl/channels.tpl @@ -1,38 +1,24 @@ -<div class="generic-content-wrapper-styled"> -<h3>{{$header}}</h3> - -{{if $links}} -{{foreach $links as $l}} -<a class="channels-links" href="{{$l.0}}" title="{{$l.1}}">{{$l.2}}</a> -{{/foreach}} -{{/if}} -<div class="channels-break"></div> - -{{if $channel_usage_message}} -<div id="channel-usage-message" class="usage-message"> -{{$channel_usage_message}} -</div> -{{/if}} -<div id="channels-desc" class="descriptive-text">{{$desc}}</div> - -<div id="all-channels"> -{{foreach $all_channels as $chn}} -{{include file="channel.tpl" channel=$chn}} -{{/foreach}} -</div> - -<div class="channels-end all"></div> - -{{if $delegates}} -<hr /> -<h3>{{$delegate_header}}</h3> -<div id="delegated-channels"> -{{foreach $delegates as $chn}} -{{include file="channel.tpl" channel=$chn}} -{{/foreach}} -</div> - -<div class="channels-end all"></div> -{{/if}} - +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <a class="btn btn-success btn-xs pull-right" href="{{$create.0}}" title="{{$create.1}}"><i class="icon-plus-sign"></i> {{$create.2}}</a> + <h2>{{$header}}</h2> + </div> + <div class="section-content-wrapper-np"> + {{if $channel_usage_message}} + <div id="channel-usage-message" class="section-content-warning-wrapper"> + {{$channel_usage_message}} + </div> + {{/if}} + <div id="channels-desc" class="section-content-info-wrapper"> + {{$desc}} + </div> + {{foreach $all_channels as $chn}} + {{include file="channel.tpl" channel=$chn}} + {{/foreach}} + {{if $delegates}} + {{foreach $delegates as $chn}} + {{include file="channel.tpl" channel=$chn}} + {{/foreach}} + {{/if}} + </div> </div> diff --git a/view/tpl/magicsig.tpl b/view/tpl/magicsig.tpl deleted file mode 100644 index 78d8bbbd3..000000000 --- a/view/tpl/magicsig.tpl +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<me:env xmlns:me="http://salmon-protocol.org/ns/magic-env"> -<me:data type="application/atom+xml"> -{{$data}} -</me:data> -<me:encoding>{{$encoding}}</me:encoding> -<me:alg>{{$algorithm}}</me:alg> -<me:sig key_id="{{$keyhash}}">{{$signature}}</me:sig> -</me:env> diff --git a/view/tpl/xrd_person.tpl b/view/tpl/xrd_person.tpl index 754eb3944..93fdcb1df 100755 --- a/view/tpl/xrd_person.tpl +++ b/view/tpl/xrd_person.tpl @@ -2,7 +2,10 @@ <XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0"> <Subject>{{$accturi}}</Subject> - + {{if $aliases}}{{foreach $aliases as $a}} + <Alias>{{$a}}</Alias> + {{/foreach}}{{/if}} + <Link rel="http://schemas.google.com/g/2010#updates-from" type="application/atom+xml" href="{{$atom}}" /> |