diff options
36 files changed, 3420 insertions, 6000 deletions
@@ -17,7 +17,7 @@ require_once('include/features.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica Red'); define ( 'FRIENDICA_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1034 ); +define ( 'DB_UPDATE_VERSION', 1035 ); define ( 'EOL', '<br />' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); @@ -992,6 +992,18 @@ function check_config(&$a) { if(! x($build)) $build = set_config('system','db_version',DB_UPDATE_VERSION); + $saved = get_config('system','urlverify'); + if(! $saved) + set_config('system','urlverify',bin2hex(z_root())); + if(($saved) && ($saved != bin2hex(z_root()))) { + // our URL changed. Do something. + $oldurl = hex2bin($saved); + fix_system_urls($oldurl,z_root()); + set_config('system','urlverify',bin2hex(z_root())); + + } + + // $url = get_config('system','baseurl'); // if the url isn't set or the stored url is radically different @@ -1130,6 +1142,53 @@ function check_config(&$a) { +function fix_system_urls($oldurl,$newurl) { + + require_once('include/crypto.php'); + + // Basically a site rename, but this can happen if you change from http to https for instance - even if the site name didn't change + // This should fix URL changes on our site, but other sites will end up with orphan hublocs which they will try to contact and will + // cause wasted communications. + // What we need to do after fixing this up is to send a revocation of the old URL to every other site that we communicate with so + // that they can clean up their hubloc tables (this includes directories). + // It's a very expensive operation so you don't want to have to do it often or after your site gets to be large. + + $r = q("select xchan_hash, channel_prvkey from xchan left join channel on channel_hash = xchan_hash where xchan_url = '%s'", + dbesc($oldurl) + ); + if($r) { + foreach($r as $rr) { + $channel = substr($rr['xchan_addr'],0,strpos($rr['xchan_addr'],'@')); + $parsed = @parse_url($rr['xchan_url']); + if(! $parsed) + continue; + $newhost = $parsed['host']; + $rhs = $newhost . (($parsed['port']) ? ':' . $parsed['port'] : '') . (($parsed['path']) ? $parsed['path'] : ''); + + $x = q("update xchan set xchan_addr = '%s', xchan_url = '%s', xchan_connurl = '%s' where xchan_hash = '%s' limit 1", + dbesc($channel . '@' . $rhs), + dbesc($newurl), + dbesc($newurl . '/poco/' . $channel), + dbesc($rr['xchan_hash']) + ); + + + $y = q("update hubloc set hubloc_addr = '%s', hubloc_url = '%s', hubloc_url_sig = '%s', hubloc_host = '%s', hubloc_callback = '%s' where hubloc_hash = '%s' and hubloc_url = '%s' limit 1", + dbesc($channel . '@' . $rhs), + dbesc($newurl), + dbesc(base64url_encode(rsa_sign($newurl,$rr['channel_prvkey']))), + dbesc($newhost), + dbesc($newurl . '/post'), + dbesc($rr['xchan_hash']), + dbesc($oldurl) + ); + } + } +} + + + + // wrapper for adding a login box. If $register == true provide a registration // link. This will most always depend on the value of $a->config['system']['register_policy']. // returns the complete html for inserting into the page @@ -0,0 +1,4 @@ +- send refresh posts to everybody that needs to see it, e.g. when site url changes + +- when you clear one type of notification or view the target item, clear the corresponding system notification. Issue: what to do about matrix/network posts where you might not have actually seen it. + @@ -32,18 +32,15 @@ include/ ? dba.php ? delivery.php + directory.php -- email.php + enotify.php + event.php + expire.php - fcontact.php ? follow.php - gprobe.php ++ gprobe.php + group.php - html2bbcode.php - html2plain.php += html2bbcode.php += html2plain.php + identity.php - iquery.php ? items.php + js_strings.php + language.php @@ -63,7 +60,6 @@ include/ ? queue_fn.php ? queue.php - salmon.php -= Scrape.php + security.php ? session.php ? socgraph.php @@ -79,8 +75,8 @@ mod/ + abook.php -> moved to connections.php ? acl.php admin.php - allfriends.php - api.php ++ allfriends.php ++ api.php + apps.php + attach.php - auth.php diff --git a/include/Scrape.php b/include/Scrape.php deleted file mode 100644 index b1138091c..000000000 --- a/include/Scrape.php +++ /dev/null @@ -1,712 +0,0 @@ -<?php /** @file */ - -require_once('library/HTML5/Parser.php'); -require_once('include/crypto.php'); - -if(! function_exists('scrape_dfrn')) { -function scrape_dfrn($url) { - - $a = get_app(); - - $ret = array(); - - logger('scrape_dfrn: url=' . $url); - - $s = fetch_url($url); - - if(! $s) - return $ret; - - $headers = $a->get_curl_headers(); - logger('scrape_dfrn: headers=' . $headers, LOGGER_DEBUG); - - - $lines = explode("\n",$headers); - if(count($lines)) { - foreach($lines as $line) { - // don't try and run feeds through the html5 parser - if(stristr($line,'content-type:') && ((stristr($line,'application/atom+xml')) || (stristr($line,'application/rss+xml')))) - return ret; - } - } - - try { - $dom = HTML5_Parser::parse($s); - } catch (DOMException $e) { - logger('scrape_dfrn: parse error: ' . $e); - } - - if(! $dom) - return $ret; - - $items = $dom->getElementsByTagName('link'); - - // get DFRN link elements - - foreach($items as $item) { - $x = $item->getAttribute('rel'); - if(($x === 'alternate') && ($item->getAttribute('type') === 'application/atom+xml')) - $ret['feed_atom'] = $item->getAttribute('href'); - if(substr($x,0,5) == "dfrn-") { - $ret[$x] = $item->getAttribute('href'); - } - if($x === 'lrdd') { - $decoded = urldecode($item->getAttribute('href')); - if(preg_match('/acct:([^@]*)@/',$decoded,$matches)) - $ret['nick'] = $matches[1]; - } - } - - // Pull out hCard profile elements - - $largest_photo = 0; - - $items = $dom->getElementsByTagName('*'); - foreach($items as $item) { - if(attribute_contains($item->getAttribute('class'), 'vcard')) { - $level2 = $item->getElementsByTagName('*'); - foreach($level2 as $x) { - if(attribute_contains($x->getAttribute('class'),'fn')) { - $ret['fn'] = $x->textContent; - } - if((attribute_contains($x->getAttribute('class'),'photo')) - || (attribute_contains($x->getAttribute('class'),'avatar'))) { - $size = intval($x->getAttribute('width')); - // dfrn prefers 175, so if we find this, we set largest_size so it can't be topped. - if(($size > $largest_photo) || ($size == 175) || (! $largest_photo)) { - $ret['photo'] = $x->getAttribute('src'); - $largest_photo = (($size == 175) ? 9999 : $size); - } - } - if(attribute_contains($x->getAttribute('class'),'key')) { - $ret['key'] = $x->textContent; - } - } - } - } - - return $ret; -}} - - - - - - -if(! function_exists('validate_dfrn')) { -function validate_dfrn($a) { - $errors = 0; - if(! x($a,'key')) - $errors ++; - if(! x($a,'dfrn-request')) - $errors ++; - if(! x($a,'dfrn-confirm')) - $errors ++; - if(! x($a,'dfrn-notify')) - $errors ++; - if(! x($a,'dfrn-poll')) - $errors ++; - return $errors; -}} - -if(! function_exists('scrape_meta')) { -function scrape_meta($url) { - - $a = get_app(); - - $ret = array(); - - logger('scrape_meta: url=' . $url); - - $s = fetch_url($url); - - if(! $s) - return $ret; - - $headers = $a->get_curl_headers(); - logger('scrape_meta: headers=' . $headers, LOGGER_DEBUG); - - $lines = explode("\n",$headers); - if(count($lines)) { - foreach($lines as $line) { - // don't try and run feeds through the html5 parser - if(stristr($line,'content-type:') && ((stristr($line,'application/atom+xml')) || (stristr($line,'application/rss+xml')))) - return ret; - } - } - - try { - $dom = HTML5_Parser::parse($s); - } catch (DOMException $e) { - logger('scrape_meta: parse error: ' . $e); - } - - if(! $dom) - return $ret; - - $items = $dom->getElementsByTagName('meta'); - - // get DFRN link elements - - foreach($items as $item) { - $x = $item->getAttribute('name'); - if(substr($x,0,5) == "dfrn-") - $ret[$x] = $item->getAttribute('content'); - } - - return $ret; -}} - - -if(! function_exists('scrape_vcard')) { -function scrape_vcard($url) { - - $a = get_app(); - - $ret = array(); - - logger('scrape_vcard: url=' . $url); - - $s = fetch_url($url); - - if(! $s) - return $ret; - - $headers = $a->get_curl_headers(); - $lines = explode("\n",$headers); - if(count($lines)) { - foreach($lines as $line) { - // don't try and run feeds through the html5 parser - if(stristr($line,'content-type:') && ((stristr($line,'application/atom+xml')) || (stristr($line,'application/rss+xml')))) - return ret; - } - } - - try { - $dom = HTML5_Parser::parse($s); - } catch (DOMException $e) { - logger('scrape_vcard: parse error: ' . $e); - } - - if(! $dom) - return $ret; - - // Pull out hCard profile elements - - $largest_photo = 0; - - $items = $dom->getElementsByTagName('*'); - foreach($items as $item) { - if(attribute_contains($item->getAttribute('class'), 'vcard')) { - $level2 = $item->getElementsByTagName('*'); - foreach($level2 as $x) { - if(attribute_contains($x->getAttribute('class'),'fn')) - $ret['fn'] = $x->textContent; - if((attribute_contains($x->getAttribute('class'),'photo')) - || (attribute_contains($x->getAttribute('class'),'avatar'))) { - $size = intval($x->getAttribute('width')); - if(($size > $largest_photo) || (! $largest_photo)) { - $ret['photo'] = $x->getAttribute('src'); - $largest_photo = $size; - } - } - if((attribute_contains($x->getAttribute('class'),'nickname')) - || (attribute_contains($x->getAttribute('class'),'uid'))) { - $ret['nick'] = $x->textContent; - } - } - } - } - - return $ret; -}} - - -if(! function_exists('scrape_feed')) { -function scrape_feed($url) { - - $a = get_app(); - - $ret = array(); - $s = fetch_url($url); - - $headers = $a->get_curl_headers(); - $code = $a->get_curl_code(); - - logger('scrape_feed: returns: ' . $code . ' headers=' . $headers, LOGGER_DEBUG); - - if(! $s) { - logger('scrape_feed: no data returned for ' . $url); - return $ret; - } - - - $lines = explode("\n",$headers); - if(count($lines)) { - foreach($lines as $line) { - if(stristr($line,'content-type:')) { - if(stristr($line,'application/atom+xml') || stristr($s,'<feed')) { - $ret['feed_atom'] = $url; - return $ret; - } - if(stristr($line,'application/rss+xml') || stristr($s,'<rss')) { - $ret['feed_rss'] = $url; - return $ret; - } - } - } - // perhaps an RSS version 1 feed with a generic or incorrect content-type? - if(stristr($s,'</item>')) { - $ret['feed_rss'] = $url; - return $ret; - } - } - - try { - $dom = HTML5_Parser::parse($s); - } catch (DOMException $e) { - logger('scrape_feed: parse error: ' . $e); - } - - if(! $dom) { - logger('scrape_feed: failed to parse.'); - return $ret; - } - - - $head = $dom->getElementsByTagName('base'); - if($head) { - foreach($head as $head0) { - $basename = $head0->getAttribute('href'); - break; - } - } - if(! $basename) - $basename = implode('/', array_slice(explode('/',$url),0,3)) . '/'; - - $items = $dom->getElementsByTagName('link'); - - // get Atom/RSS link elements, take the first one of either. - - if($items) { - foreach($items as $item) { - $x = $item->getAttribute('rel'); - if(($x === 'alternate') && ($item->getAttribute('type') === 'application/atom+xml')) { - if(! x($ret,'feed_atom')) - $ret['feed_atom'] = $item->getAttribute('href'); - } - if(($x === 'alternate') && ($item->getAttribute('type') === 'application/rss+xml')) { - if(! x($ret,'feed_rss')) - $ret['feed_rss'] = $item->getAttribute('href'); - } - } - } - - // Drupal and perhaps others only provide relative URL's. Turn them into absolute. - - if(x($ret,'feed_atom') && (! strstr($ret['feed_atom'],'://'))) - $ret['feed_atom'] = $basename . $ret['feed_atom']; - if(x($ret,'feed_rss') && (! strstr($ret['feed_rss'],'://'))) - $ret['feed_rss'] = $basename . $ret['feed_rss']; - - return $ret; -}} - - -/** - * - * Probe a network address to discover what kind of protocols we need to communicate with it. - * - * Warning: this function is a bit touchy and there are some subtle dependencies within the logic flow. - * Edit with care. - * - */ - -/** - * - * PROBE_DIASPORA has a bias towards returning Diaspora information - * while PROBE_NORMAL has a bias towards dfrn/zot - in the case where - * an address (such as a Friendica address) supports more than one type - * of network. - * - */ - - -define ( 'PROBE_NORMAL', 0); - -function probe_url($url, $mode = PROBE_NORMAL) { - require_once('include/email.php'); - - $result = array(); - - if(! $url) - return $result; - - $network = null; - $has_lrdd = false; - $email_conversant = false; - - $twitter = ((strpos($url,'twitter.com') !== false) ? true : false); - $lastfm = ((strpos($url,'last.fm/user') !== false) ? true : false); - - $at_addr = ((strpos($url,'@') !== false) ? true : false); - - if((! $twitter) && (! $lastfm)) { - - if(strpos($url,'mailto:') !== false && $at_addr) { - $url = str_replace('mailto:','',$url); - $links = array(); - } - else - $links = lrdd($url); - - if(count($links)) { - $has_lrdd = true; - - logger('probe_url: found lrdd links: ' . print_r($links,true), LOGGER_DATA); - foreach($links as $link) { - if($link['@attributes']['rel'] === NAMESPACE_ZOT) - $zot = unamp($link['@attributes']['href']); - if($link['@attributes']['rel'] === NAMESPACE_DFRN) - $dfrn = unamp($link['@attributes']['href']); - if($link['@attributes']['rel'] === 'salmon') - $notify = unamp($link['@attributes']['href']); - if($link['@attributes']['rel'] === NAMESPACE_FEED) - $poll = unamp($link['@attributes']['href']); - if($link['@attributes']['rel'] === 'http://microformats.org/profile/hcard') - $hcard = unamp($link['@attributes']['href']); - if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page') - $profile = unamp($link['@attributes']['href']); - if($link['@attributes']['rel'] === 'http://portablecontacts.net/spec/1.0') - $poco = unamp($link['@attributes']['href']); - - } - - // Status.Net can have more than one profile URL. We need to match the profile URL - // to a contact on incoming messages to prevent spam, and we won't know which one - // to match. So in case of two, one of them is stored as an alias. Only store URL's - // and not webfinger user@host aliases. If they've got more than two non-email style - // aliases, let's hope we're lucky and get one that matches the feed author-uri because - // otherwise we're screwed. - - foreach($links as $link) { - if($link['@attributes']['rel'] === 'alias') { - if(strpos($link['@attributes']['href'],'@') === false) { - if(isset($profile)) { - if($link['@attributes']['href'] !== $profile) - $alias = unamp($link['@attributes']['href']); - } - else - $profile = unamp($link['@attributes']['href']); - } - } - } - } - elseif($mode == PROBE_NORMAL) { - - // Check email - - $orig_url = $url; - if((strpos($orig_url,'@')) && validate_email($orig_url)) { - $x = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1", - intval(local_user()) - ); - $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1", - intval(local_user()) - ); - if(count($x) && count($r)) { - $mailbox = construct_mailbox_name($r[0]); - $password = ''; - openssl_private_decrypt(hex2bin($r[0]['pass']),$password,$x[0]['prvkey']); - $mbox = email_connect($mailbox,$r[0]['user'],$password); - if(! $mbox) - logger('probe_url: email_connect failed.'); - unset($password); - } - if($mbox) { - $msgs = email_poll($mbox,$orig_url); - logger('probe_url: searching ' . $orig_url . ', ' . count($msgs) . ' messages found.', LOGGER_DEBUG); - if(count($msgs)) { - $addr = $orig_url; - $network = NETWORK_MAIL; - $name = substr($url,0,strpos($url,'@')); - $phost = substr($url,strpos($url,'@')+1); - $profile = 'http://' . $phost; - // fix nick character range - $vcard = array('fn' => $name, 'nick' => $name, 'photo' => avatar_img($url)); - $notify = 'smtp ' . random_string(); - $poll = 'email ' . random_string(); - $priority = 0; - $x = email_msg_meta($mbox,$msgs[0]); - if(stristr($x[0]->from,$orig_url)) - $adr = imap_rfc822_parse_adrlist($x[0]->from,''); - elseif(stristr($x[0]->to,$orig_url)) - $adr = imap_rfc822_parse_adrlist($x[0]->to,''); - if(isset($adr)) { - foreach($adr as $feadr) { - if((strcasecmp($feadr->mailbox,$name) == 0) - &&(strcasecmp($feadr->host,$phost) == 0) - && (strlen($feadr->personal))) { - - $personal = imap_mime_header_decode($feadr->personal); - $vcard['fn'] = ""; - foreach($personal as $perspart) - if ($perspart->charset != "default") - $vcard['fn'] .= iconv($perspart->charset, 'UTF-8//IGNORE', $perspart->text); - else - $vcard['fn'] .= $perspart->text; - - $vcard['fn'] = notags($vcard['fn']); - } - } - } - } - imap_close($mbox); - } - } - } - } - - if($mode == PROBE_NORMAL) { - if(strlen($zot)) { - $s = fetch_url($zot); - if($s) { - $j = json_decode($s); - if($j) { - $network = NETWORK_ZOT; - $vcard = array( - 'fn' => $j->fullname, - 'nick' => $j->nickname, - 'photo' => $j->photo - ); - $profile = $j->url; - $notify = $j->post; - $pubkey = $j->pubkey; - $poll = 'N/A'; - } - } - } - - if(strlen($dfrn)) { - $ret = scrape_dfrn(($hcard) ? $hcard : $dfrn); - if(is_array($ret) && x($ret,'dfrn-request')) { - $network = NETWORK_DFRN; - $request = $ret['dfrn-request']; - $confirm = $ret['dfrn-confirm']; - $notify = $ret['dfrn-notify']; - $poll = $ret['dfrn-poll']; - - $vcard = array(); - $vcard['fn'] = $ret['fn']; - $vcard['nick'] = $ret['nick']; - $vcard['photo'] = $ret['photo']; - } - } - } - - if($network !== NETWORK_ZOT && $network !== NETWORK_DFRN && $network !== NETWORK_MAIL) { - if($has_lrdd) - $network = NETWORK_OSTATUS; - $priority = 0; - - if($hcard && ! $vcard) { - $vcard = scrape_vcard($hcard); - - // Google doesn't use absolute url in profile photos - - if((x($vcard,'photo')) && substr($vcard['photo'],0,1) == '/') { - $h = @parse_url($hcard); - if($h) - $vcard['photo'] = $h['scheme'] . '://' . $h['host'] . $vcard['photo']; - } - - logger('probe_url: scrape_vcard: ' . print_r($vcard,true), LOGGER_DATA); - } - - if($diaspora && $addr) { - // Diaspora returns the name as the nick. As the nick will never be updated, - // let's use the Diaspora nickname (the first part of the handle) as the nick instead - $addr_parts = explode('@', $addr); - $vcard['nick'] = $addr_parts[0]; - } - - if($twitter) { - logger('twitter: setup'); - $tid = basename($url); - $tapi = 'https://api.twitter.com/1/statuses/user_timeline.rss'; - if(intval($tid)) - $poll = $tapi . '?user_id=' . $tid; - else - $poll = $tapi . '?screen_name=' . $tid; - $profile = 'http://twitter.com/#!/' . $tid; - //$vcard['photo'] = 'https://api.twitter.com/1/users/profile_image/' . $tid; - $vcard['photo'] = 'https://api.twitter.com/1/users/profile_image?screen_name=' . $tid . '&size=bigger'; - $vcard['nick'] = $tid; - $vcard['fn'] = $tid; - } - - if($lastfm) { - $profile = $url; - $poll = str_replace(array('www.','last.fm/'),array('','ws.audioscrobbler.com/1.0/'),$url) . '/recenttracks.rss'; - $vcard['nick'] = basename($url); - $vcard['fn'] = $vcard['nick'] . t(' on Last.fm'); - $network = NETWORK_FEED; - } - - if(! x($vcard,'fn')) - if(x($vcard,'nick')) - $vcard['fn'] = $vcard['nick']; - - $check_feed = false; - - if($twitter || ! $poll) - $check_feed = true; - if((! isset($vcard)) || (! x($vcard,'fn')) || (! $profile)) - $check_feed = true; - if(($at_addr) && (! count($links))) - $check_feed = false; - - if($check_feed) { - - $feedret = scrape_feed(($poll) ? $poll : $url); - logger('probe_url: scrape_feed ' . (($poll)? $poll : $url) . ' returns: ' . print_r($feedret,true), LOGGER_DATA); - if(count($feedret) && ($feedret['feed_atom'] || $feedret['feed_rss'])) { - $poll = ((x($feedret,'feed_atom')) ? unamp($feedret['feed_atom']) : unamp($feedret['feed_rss'])); - if(! x($vcard)) - $vcard = array(); - } - - if(x($feedret,'photo') && (! x($vcard,'photo'))) - $vcard['photo'] = $feedret['photo']; - require_once('library/simplepie/simplepie.inc'); - $feed = new SimplePie(); - $xml = fetch_url($poll); - - logger('probe_url: fetch feed: ' . $poll . ' returns: ' . $xml, LOGGER_DATA); - $a = get_app(); - - logger('probe_url: scrape_feed: headers: ' . $a->get_curl_headers(), LOGGER_DATA); - - $feed->set_raw_data($xml); - - $feed->init(); - if($feed->error()) - logger('probe_url: scrape_feed: Error parsing XML: ' . $feed->error()); - - - if(! x($vcard,'photo')) - $vcard['photo'] = $feed->get_image_url(); - $author = $feed->get_author(); - - if($author) { - $vcard['fn'] = unxmlify(trim($author->get_name())); - if(! $vcard['fn']) - $vcard['fn'] = trim(unxmlify($author->get_email())); - if(strpos($vcard['fn'],'@') !== false) - $vcard['fn'] = substr($vcard['fn'],0,strpos($vcard['fn'],'@')); - $email = unxmlify($author->get_email()); - if(! $profile && $author->get_link()) - $profile = trim(unxmlify($author->get_link())); - if(! $vcard['photo']) { - $rawtags = $feed->get_feed_tags( SIMPLEPIE_NAMESPACE_ATOM_10, 'author'); - if($rawtags) { - $elems = $rawtags[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]; - if((x($elems,'link')) && ($elems['link'][0]['attribs']['']['rel'] === 'photo')) - $vcard['photo'] = $elems['link'][0]['attribs']['']['href']; - } - } - } - else { - $item = $feed->get_item(0); - if($item) { - $author = $item->get_author(); - if($author) { - $vcard['fn'] = trim(unxmlify($author->get_name())); - if(! $vcard['fn']) - $vcard['fn'] = trim(unxmlify($author->get_email())); - if(strpos($vcard['fn'],'@') !== false) - $vcard['fn'] = substr($vcard['fn'],0,strpos($vcard['fn'],'@')); - $email = unxmlify($author->get_email()); - if(! $profile && $author->get_link()) - $profile = trim(unxmlify($author->get_link())); - } - if(! $vcard['photo']) { - $rawmedia = $item->get_item_tags('http://search.yahoo.com/mrss/','thumbnail'); - if($rawmedia && $rawmedia[0]['attribs']['']['url']) - $vcard['photo'] = unxmlify($rawmedia[0]['attribs']['']['url']); - } - if(! $vcard['photo']) { - $rawtags = $item->get_item_tags( SIMPLEPIE_NAMESPACE_ATOM_10, 'author'); - if($rawtags) { - $elems = $rawtags[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]; - if((x($elems,'link')) && ($elems['link'][0]['attribs']['']['rel'] === 'photo')) - $vcard['photo'] = $elems['link'][0]['attribs']['']['href']; - } - } - } - } - - if((! $vcard['photo']) && strlen($email)) - $vcard['photo'] = avatar_img($email); - if($poll === $profile) - $lnk = $feed->get_permalink(); - if(isset($lnk) && strlen($lnk)) - $profile = $lnk; - - if(! (x($vcard,'fn'))) - $vcard['fn'] = notags($feed->get_title()); - if(! (x($vcard,'fn'))) - $vcard['fn'] = notags($feed->get_description()); - - if(strpos($vcard['fn'],'Twitter / ') !== false) { - $vcard['fn'] = substr($vcard['fn'],strpos($vcard['fn'],'/')+1); - $vcard['fn'] = trim($vcard['fn']); - } - if(! x($vcard,'nick')) { - $vcard['nick'] = strtolower(notags(unxmlify($vcard['fn']))); - if(strpos($vcard['nick'],' ')) - $vcard['nick'] = trim(substr($vcard['nick'],0,strpos($vcard['nick'],' '))); - } - if(! $network) - $network = NETWORK_FEED; - if(! $priority) - $priority = 2; - } - } - - if(! x($vcard,'photo')) { - $a = get_app(); - $vcard['photo'] = $a->get_baseurl() . '/images/person-175.jpg' ; - } - - if(! $profile) - $profile = $url; - - // No human could be associated with this link, use the URL as the contact name - - if(($network === NETWORK_FEED) && ($poll) && (! x($vcard,'fn'))) - $vcard['fn'] = $url; - - $vcard['fn'] = notags($vcard['fn']); - $vcard['nick'] = str_replace(' ','',notags($vcard['nick'])); - - $result['name'] = $vcard['fn']; - $result['nick'] = $vcard['nick']; - $result['url'] = $profile; - $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; -} diff --git a/include/acl_selectors.php b/include/acl_selectors.php index eabd2169f..033186151 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -229,41 +229,6 @@ function populate_acl($user = null,$celeb = false) { array_walk($deny_cid,'fixacl'); array_walk($deny_gid,'fixacl'); } - - /*$o = ''; - $o .= '<div id="acl-wrapper">'; - $o .= '<div id="acl-permit-outer-wrapper">'; - $o .= '<div id="acl-permit-text">' . t('Visible To:') . '</div><div id="jot-public">' . t('everybody') . '</div>'; - $o .= '<div id="acl-permit-text-end"></div>'; - $o .= '<div id="acl-permit-wrapper">'; - $o .= '<div id="group_allow_wrapper">'; - $o .= '<label id="acl-allow-group-label" for="group_allow" >' . t('Groups') . '</label>'; - $o .= group_select('group_allow','group_allow',$allow_gid); - $o .= '</div>'; - $o .= '<div id="contact_allow_wrapper">'; - $o .= '<label id="acl-allow-contact-label" for="contact_allow" >' . t('Contacts') . '</label>'; - $o .= contact_select('contact_allow','contact_allow',$allow_cid,4,false,$celeb,true); - $o .= '</div>'; - $o .= '</div>' . "\r\n"; - $o .= '<div id="acl-allow-end"></div>' . "\r\n"; - $o .= '</div>'; - $o .= '<div id="acl-deny-outer-wrapper">'; - $o .= '<div id="acl-deny-text">' . t('Except For:') . '</div>'; - $o .= '<div id="acl-deny-text-end"></div>'; - $o .= '<div id="acl-deny-wrapper">'; - $o .= '<div id="group_deny_wrapper" >'; - $o .= '<label id="acl-deny-group-label" for="group_deny" >' . t('Groups') . '</label>'; - $o .= group_select('group_deny','group_deny', $deny_gid); - $o .= '</div>'; - $o .= '<div id="contact_deny_wrapper" >'; - $o .= '<label id="acl-deny-contact-label" for="contact_deny" >' . t('Contacts') . '</label>'; - $o .= contact_select('contact_deny','contact_deny', $deny_cid,4,false, $celeb,true); - $o .= '</div>'; - $o .= '</div>' . "\r\n"; - $o .= '<div id="acl-deny-end"></div>' . "\r\n"; - $o .= '</div>'; - $o .= '</div>' . "\r\n"; - $o .= '<div id="acl-wrapper-end"></div>' . "\r\n";*/ $tpl = get_markup_template("acl_selector.tpl"); $o = replace_macros($tpl, array( diff --git a/include/api.php b/include/api.php index 1456ec29a..f240b60bf 100644 --- a/include/api.php +++ b/include/api.php @@ -1452,7 +1452,7 @@ require_once('include/security.php'); return api_apply_template('test', $type, array('$ok' => $ok)); } - api_register_func('api/help/test','api_help_test',true); + api_register_func('api/help/test','api_help_test',false); /** * https://dev.twitter.com/docs/api/1/get/statuses/friends diff --git a/include/bbcode.php b/include/bbcode.php index 021f2ac27..82d25ffc8 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -101,93 +101,101 @@ function bb_replace_images($body, $images) { function bb_ShareAttributes($match) { - $attributes = $match[1]; + $attributes = $match[1]; - $author = ""; - preg_match("/author='(.*?)'/ism", $attributes, $matches); - if ($matches[1] != "") - $author = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8'); + $author = ""; + preg_match("/author='(.*?)'/ism", $attributes, $matches); + if ($matches[1] != "") + $author = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8'); - preg_match('/author="(.*?)"/ism', $attributes, $matches); - if ($matches[1] != "") - $author = $matches[1]; + preg_match('/author="(.*?)"/ism', $attributes, $matches); + if ($matches[1] != "") + $author = $matches[1]; - $link = ""; - preg_match("/link='(.*?)'/ism", $attributes, $matches); - if ($matches[1] != "") - $link = $matches[1]; + $link = ""; + preg_match("/link='(.*?)'/ism", $attributes, $matches); + if ($matches[1] != "") + $link = $matches[1]; - preg_match('/link="(.*?)"/ism', $attributes, $matches); - if ($matches[1] != "") - $link = $matches[1]; + preg_match('/link="(.*?)"/ism', $attributes, $matches); + if ($matches[1] != "") + $link = $matches[1]; - $avatar = ""; - preg_match("/avatar='(.*?)'/ism", $attributes, $matches); - if ($matches[1] != "") - $avatar = $matches[1]; + $avatar = ""; + preg_match("/avatar='(.*?)'/ism", $attributes, $matches); + if ($matches[1] != "") + $avatar = $matches[1]; - preg_match('/avatar="(.*?)"/ism', $attributes, $matches); - if ($matches[1] != "") - $avatar = $matches[1]; + preg_match('/avatar="(.*?)"/ism', $attributes, $matches); + if ($matches[1] != "") + $avatar = $matches[1]; - $profile = ""; - preg_match("/profile='(.*?)'/ism", $attributes, $matches); - if ($matches[1] != "") - $profile = $matches[1]; + $profile = ""; + preg_match("/profile='(.*?)'/ism", $attributes, $matches); + if ($matches[1] != "") + $profile = $matches[1]; - preg_match('/profile="(.*?)"/ism', $attributes, $matches); - if ($matches[1] != "") - $profile = $matches[1]; + preg_match('/profile="(.*?)"/ism', $attributes, $matches); + if ($matches[1] != "") + $profile = $matches[1]; - $posted = ""; - preg_match("/posted='(.*?)'/ism", $attributes, $matches); - if ($matches[1] != "") - $posted = $matches[1]; + $posted = ""; + preg_match("/posted='(.*?)'/ism", $attributes, $matches); + if ($matches[1] != "") + $posted = $matches[1]; - preg_match('/posted="(.*?)"/ism', $attributes, $matches); - if ($matches[1] != "") - $posted = $matches[1]; - $reldate = (($posted) ? " " . relative_date($posted) : ''); + preg_match('/posted="(.*?)"/ism', $attributes, $matches); + if ($matches[1] != "") + $posted = $matches[1]; - $headline = '<div class="shared_header">'; + // FIXME - this should really be a wall-item-ago so it will get updated on the client + $reldate = (($posted) ? relative_date($posted) : ''); + + $headline = '<div class="shared_header">'; if ($avatar != "") - $headline .= '<img src="'.$avatar.'" height="32" width="32" >'; + $headline .= '<img src="' . $avatar . '" alt="' . $author . '" height="32" width="32" />'; + + // Bob Smith wrote the following post 2 hours ago - $headline .= sprintf(t('<span><a href="%s" target="external-link">%s</a> wrote the following <a href="%s" target="external-link">post</a>'.$reldate.':</span>'), $profile, $author, $link); + $fmt = sprintf( t('%1$s wrote the following %2$s %3$s'), + '<a href="' . zid($profile) . '" >' . $author . '</a>', + '<a href="' . zid($link) . '" >' . t('post') . '</a>', + $reldate + ); - $headline .= "</div>"; + $headline .= '<span>' . $fmt . '</span></div>'; - $text = $headline.'<blockquote class="shared_content">'.trim($match[2])."</blockquote>"; + $text = $headline . '<div class="reshared-content">' . trim($match[2]) . '</div>'; - return($text); + return($text); } function bb_ShareAttributesSimple($match) { - $attributes = $match[1]; + $attributes = $match[1]; - $author = ""; - preg_match("/author='(.*?)'/ism", $attributes, $matches); - if ($matches[1] != "") - $author = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8'); + $author = ""; + preg_match("/author='(.*?)'/ism", $attributes, $matches); + if ($matches[1] != "") + $author = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8'); - preg_match('/author="(.*?)"/ism', $attributes, $matches); - if ($matches[1] != "") - $author = $matches[1]; + preg_match('/author="(.*?)"/ism', $attributes, $matches); + if ($matches[1] != "") + $author = $matches[1]; - $profile = ""; - preg_match("/profile='(.*?)'/ism", $attributes, $matches); - if ($matches[1] != "") - $profile = $matches[1]; + $profile = ""; + preg_match("/profile='(.*?)'/ism", $attributes, $matches); + if ($matches[1] != "") + $profile = $matches[1]; - preg_match('/profile="(.*?)"/ism', $attributes, $matches); - if ($matches[1] != "") - $profile = $matches[1]; + preg_match('/profile="(.*?)"/ism', $attributes, $matches); + if ($matches[1] != "") + $profile = $matches[1]; - $text = "<br />".html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8').' <a href="'.$profile.'">'.$author."</a>: <br />»".$match[2]."«"; + $text = "<br />".html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8').' <a href="'.$profile.'">'.$author."</a>: div class=\"reshared-content\">" .$match[2]."</div>"; - return($text); + return($text); } // BBcode 2 HTML was written by WAY2WEB.net @@ -195,7 +203,6 @@ function bb_ShareAttributesSimple($match) { function bbcode($Text,$preserve_nl = false, $tryoembed = true) { - $a = get_app(); // Extract the private images which use data url's since preg has issues with @@ -232,9 +239,6 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { $Text = str_replace("<", "<", $Text); $Text = str_replace(">", ">", $Text); - // This only matters when looking for tags - otherwise has no meaning - - $Text = str_replace(array('[share]','[/share]'), array('',''), $Text); // Convert new line chars to html <br /> tags @@ -259,13 +263,15 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { // Perform URL Search - $Text = preg_replace("/([^\]\=]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1<a href="$2" >$2</a>', $Text); + $Text = preg_replace("/([^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1<a href="$2" >$2</a>', $Text); if ($tryoembed) $Text = preg_replace_callback("/\[bookmark\=([^\]]*)\].*?\[\/bookmark\]/ism",'tryoembed',$Text); $Text = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",'[url=$1]$2[/url]',$Text); + $Text = preg_replace_callback("/\[share(.*?)\](.*?)\[\/share\]/ism","bb_ShareAttributes",$Text); + if ($tryoembed) $Text = preg_replace_callback("/\[url\]([$URLSearchString]*)\[\/url\]/ism",'tryoembed',$Text); @@ -296,7 +302,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { $Text = preg_replace("(\[color=(.*?)\](.*?)\[\/color\])ism","<span style=\"color: $1;\">$2</span>",$Text); // Check for sized text - // [size=50] --> font-size: 50px (with the unit). + // [size=50] --> font-size: 50px (with the unit). $Text = preg_replace("(\[size=(\d*?)\](.*?)\[\/size\])ism","<span style=\"font-size: $1px;\">$2</span>",$Text); $Text = preg_replace("(\[size=(.*?)\](.*?)\[\/size\])ism","<span style=\"font-size: $1;\">$2</span>",$Text); @@ -316,9 +322,9 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { $endlessloop = 0; while ((((strpos($Text, "[/list]") !== false) && (strpos($Text, "[list") !== false)) || - ((strpos($Text, "[/ol]") !== false) && (strpos($Text, "[ol]") !== false)) || - ((strpos($Text, "[/ul]") !== false) && (strpos($Text, "[ul]") !== false)) || - ((strpos($Text, "[/li]") !== false) && (strpos($Text, "[li]") !== false))) && (++$endlessloop < 20)) { + ((strpos($Text, "[/ol]") !== false) && (strpos($Text, "[ol]") !== false)) || + ((strpos($Text, "[/ul]") !== false) && (strpos($Text, "[ul]") !== false)) || + ((strpos($Text, "[/li]") !== false) && (strpos($Text, "[li]") !== false))) && (++$endlessloop < 20)) { $Text = preg_replace("/\[list\](.*?)\[\/list\]/ism", '<ul class="listbullet" style="list-style-type: circle;">$1</ul>' ,$Text); $Text = preg_replace("/\[list=\](.*?)\[\/list\]/ism", '<ul class="listnone" style="list-style-type: none;">$1</ul>' ,$Text); $Text = preg_replace("/\[list=1\](.*?)\[\/list\]/ism", '<ul class="listdecimal" style="list-style-type: decimal;">$1</ul>' ,$Text); @@ -371,8 +377,8 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { $endlessloop = 0; while ((strpos($Text, "[/spoiler]")!== false) and (strpos($Text, "[spoiler=") !== false) and (++$endlessloop < 20)) $Text = preg_replace("/\[spoiler=[\"\']*(.*?)[\"\']*\](.*?)\[\/spoiler\]/ism", - "<br /><strong class=".'"spoiler"'.">" . $t_wrote . "</strong><blockquote class=".'"spoiler"'.">$2</blockquote>", - $Text); + "<br /><strong class=".'"spoiler"'.">" . $t_wrote . "</strong><blockquote class=".'"spoiler"'.">$2</blockquote>", + $Text); // Declare the format for [quote] layout $QuoteLayout = '<blockquote>$1</blockquote>'; @@ -391,8 +397,8 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { $endlessloop = 0; while ((strpos($Text, "[/quote]")!== false) and (strpos($Text, "[quote=") !== false) and (++$endlessloop < 20)) $Text = preg_replace("/\[quote=[\"\']*(.*?)[\"\']*\](.*?)\[\/quote\]/ism", - "<br /><strong class=".'"author"'.">" . $t_wrote . "</strong><blockquote>$2</blockquote>", - $Text); + "<br /><strong class=".'"author"'.">" . $t_wrote . "</strong><blockquote>$2</blockquote>", + $Text); // [img=widthxheight]image source[/img] //$Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '<img src="$3" style="height: $2px; width: $1px;" >', $Text); @@ -402,7 +408,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { // [img]pathtoimage[/img] $Text = preg_replace("/\[img\](.*?)\[\/img\]/ism", '<img src="$1" alt="' . t('Image/photo') . '" />', $Text); - $Text = preg_replace_callback("/\[share(.*?)\](.*?)\[\/share\]/ism","bb_ShareAttributes",$Text); + $Text = preg_replace("/\[crypt\](.*?)\[\/crypt\]/ism",'<br/><img src="' .$a->get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . t('Encrypted content') . '" /><br />', $Text); $Text = preg_replace("/\[crypt=(.*?)\](.*?)\[\/crypt\]/ism",'<br/><img src="' .$a->get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . '$1' . ' ' . t('Encrypted content') . '" /><br />', $Text); @@ -429,8 +435,8 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { // Youtube extensions if ($tryoembed) { - $Text = preg_replace_callback("/\[youtube\](https?:\/\/www.youtube.com\/watch\?v\=.*?)\[\/youtube\]/ism", 'tryoembed', $Text); - $Text = preg_replace_callback("/\[youtube\](www.youtube.com\/watch\?v\=.*?)\[\/youtube\]/ism", 'tryoembed', $Text); + $Text = preg_replace_callback("/\[youtube\](https?:\/\/www.youtube.com\/watch\?v\=.*?)\[\/youtube\]/ism", 'tryoembed', $Text); + $Text = preg_replace_callback("/\[youtube\](www.youtube.com\/watch\?v\=.*?)\[\/youtube\]/ism", 'tryoembed', $Text); $Text = preg_replace_callback("/\[youtube\](https?:\/\/youtu.be\/.*?)\[\/youtube\]/ism",'tryoembed',$Text); } diff --git a/include/conversation.php b/include/conversation.php index 06bc7ff70..9a2ddd151 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -652,6 +652,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') { else { // Normal View +// logger('conv: items: ' . print_r($items,true)); require_once('include/ConversationObject.php'); require_once('include/ItemObject.php'); diff --git a/include/event.php b/include/event.php index e334c5a4f..a178c717a 100644 --- a/include/event.php +++ b/include/event.php @@ -45,74 +45,6 @@ function format_event_html($ev) { return $o; } -/* -function parse_event($h) { - - require_once('include/Scrape.php'); - require_once('library/HTMLPurifier.auto.php'); - require_once('include/html2bbcode'); - - $h = '<html><body>' . $h . '</body></html>'; - - $ret = array(); - - - try { - $dom = HTML5_Parser::parse($h); - } catch (DOMException $e) { - logger('parse_event: parse error: ' . $e); - } - - if(! $dom) - return $ret; - - $items = $dom->getElementsByTagName('*'); - - foreach($items as $item) { - if(attribute_contains($item->getAttribute('class'), 'vevent')) { - $level2 = $item->getElementsByTagName('*'); - foreach($level2 as $x) { - if(attribute_contains($x->getAttribute('class'),'dtstart') && $x->getAttribute('title')) { - $ret['start'] = $x->getAttribute('title'); - if(! strpos($ret['start'],'Z')) - $ret['adjust'] = true; - } - if(attribute_contains($x->getAttribute('class'),'dtend') && $x->getAttribute('title')) - $ret['finish'] = $x->getAttribute('title'); - - if(attribute_contains($x->getAttribute('class'),'description')) - $ret['desc'] = $x->textContent; - if(attribute_contains($x->getAttribute('class'),'location')) - $ret['location'] = $x->textContent; - } - } - } - - // sanitise - - if((x($ret,'desc')) && ((strpos($ret['desc'],'<') !== false) || (strpos($ret['desc'],'>') !== false))) { - $config = HTMLPurifier_Config::createDefault(); - $config->set('Cache.DefinitionImpl', null); - $purifier = new HTMLPurifier($config); - $ret['desc'] = html2bbcode($purifier->purify($ret['desc'])); - } - - if((x($ret,'location')) && ((strpos($ret['location'],'<') !== false) || (strpos($ret['location'],'>') !== false))) { - $config = HTMLPurifier_Config::createDefault(); - $config->set('Cache.DefinitionImpl', null); - $purifier = new HTMLPurifier($config); - $ret['location'] = html2bbcode($purifier->purify($ret['location'])); - } - - if(x($ret,'start')) - $ret['start'] = datetime_convert('UTC','UTC',$ret['start']); - if(x($ret,'finish')) - $ret['finish'] = datetime_convert('UTC','UTC',$ret['finish']); - - return $ret; -} -*/ - function format_event_bbcode($ev) { $o = ''; diff --git a/include/fcontact.php b/include/fcontact.php deleted file mode 100644 index 50ac5f3f3..000000000 --- a/include/fcontact.php +++ /dev/null @@ -1,41 +0,0 @@ -<?php /** @file */ - - - -function fcontact_store($url,$name,$photo) { - - $nurl = str_replace(array('https:','//www.'), array('http:','//'), $url); - - $r = q("SELECT `id` FROM `fcontact` WHERE `url` = '%s' LIMIT 1", - dbesc($nurl) - ); - - if(count($r)) - return $r[0]['id']; - - $r = q("INSERT INTO `fcontact` ( `url`, `name`, `photo` ) VALUES ( '%s', '%s', '%s' ) ", - dbesc($nurl), - dbesc($name), - dbesc($photo) - ); - - if($r) { - $r = q("SELECT `id` FROM `fcontact` WHERE `url` = '%s' LIMIT 1", - dbesc($nurl) - ); - if(count($r)) - return $r[0]['id']; - } - - return 0; -} - -function ffinder_store($uid,$cid,$fid) { - $r = q("INSERT INTO `ffinder` ( `uid`, `cid`, `fid` ) VALUES ( %d, %d, %d ) ", - intval($uid), - intval($cid), - intval($fid) - ); - return $r; -} - diff --git a/include/html2plain.php b/include/html2plain.php index b86d88710..2f5be7f69 100644 --- a/include/html2plain.php +++ b/include/html2plain.php @@ -219,4 +219,4 @@ function html2plain($html, $wraplength = 75, $compact = false) return(trim($message)); } -?> + diff --git a/include/iquery.php b/include/iquery.php deleted file mode 100644 index e3ac215b7..000000000 --- a/include/iquery.php +++ /dev/null @@ -1,139 +0,0 @@ -<?php /** @file */ - - -function network_query($a,$arr) { - - - $parent_options = ''; - $child_options = ''; - - $ordering = (($arr['order'] === 'post') ? "`created`" : "`commented`") . " DESC "; - - $itemspage = get_pconfig($arr['uid'],'system','itemspage'); - $a->set_pager_itemspage(((intval($itemspage)) ? $itemspage : 40)); - - $pager_sql = ((intval($arr['update'])) ? '' : sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']))); - - $arr['cmin'] = ((x($arr,'cmin')) ? $arr['cmin'] : 0); - $arr['cmax'] = ((x($arr,'cmax')) ? $arr['cmax'] : 0); - - $simple_update = (($arr['update']) ? " and `item`.`unseen` = 1 " : ''); - - if($arr['new']) { - - // "New Item View" - show all items unthreaded in reverse created date order - - $items = q("SELECT `item`.*, `item`.`id` AS `item_id`, - `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`writable`, - `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn_id`, `contact`.`self`, - `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` - FROM `item`, `contact` - WHERE `item`.`uid` = %d AND `item`.`visible` = 1 - AND `item`.`deleted` = 0 and `item`.`moderated` = 0 - $simple_update - AND `contact`.`closeness` >= %d and `contact`.`closeness` <= %d - AND `contact`.`id` = `item`.`contact-id` - AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 - $sql_extra $sql_nets - ORDER BY `item`.`received` DESC $pager_sql ", - intval($arr['uid']), - intval($arr['cmin']), - intval($arr['cmax']) - - ); - - $items = fetch_post_tags($items); - return $items; - - } - if($update) { - $r = q("SELECT `parent` AS `item_id`, `contact`.`uid` AS `contact_uid` - FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` - WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND - `contact`.`closeness` >= %d and `contact`.`closeness` <= %d - (`item`.`deleted` = 0 OR item.verb = '" . ACTIVITY_LIKE ."' OR item.verb = '" . ACTIVITY_DISLIKE . "') - and `item`.`moderated` = 0 $simple_update - AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 - $sql_extra3 $sql_extra $sql_nets ", - intval($arr['uid']), - intval($arr['cmin']), - intval($arr['cmax']) - ); - } - else { - $r = q("SELECT `item`.`id` AS `item_id`, `contact`.`uid` AS `contact_uid` - FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` - WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 - AND `item`.`moderated` = 0 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 - AND `contact`.`closeness` >= %d and `contact`.`closeness` <= %d - AND `item`.`parent` = `item`.`id` - $sql_extra3 $sql_extra $sql_nets - ORDER BY `item`.$ordering $pager_sql ", - intval($arr['uid']), - intval($arr['cmin']), - intval($arr['cmax']) - ); - } - - // Then fetch all the children of the parents that are on this page - - $parents_arr = array(); - $parents_str = ''; - - if(count($r)) { - foreach($r as $rr) - if(! in_array($rr['item_id'],$parents_arr)) - $parents_arr[] = $rr['item_id']; - $parents_str = implode(', ', $parents_arr); - - $items = q("SELECT `item`.*, `item`.`id` AS `item_id`, - `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, - `contact`.`rel`, `contact`.`writable`, - `contact`.`network`, `contact`.`thumb`, `contact`.`self`, - `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` - FROM `item`, `contact` - WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 - AND `item`.`moderated` = 0 AND `contact`.`id` = `item`.`contact-id` - AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 - AND `item`.`parent` IN ( %s ) - $sql_extra ", - intval($arr['uid']), - dbesc($parents_str) - ); - - $items = fetch_post_tags($items); - - $items = conv_sort($items,$ordering); - } - else { - $items = array(); - } - - return $items; -} - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/include/language.php b/include/language.php index 853b6ebee..2e7ad5ff1 100644 --- a/include/language.php +++ b/include/language.php @@ -15,35 +15,33 @@ * */ - -if(! function_exists('get_browser_language')) { function get_browser_language() { $langs = array(); if (x($_SERVER,'HTTP_ACCEPT_LANGUAGE')) { - // break up string into pieces (languages and q factors) - preg_match_all('/([a-z]{1,8}(-[a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i', + // break up string into pieces (languages and q factors) + preg_match_all('/([a-z]{1,8}(-[a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i', $_SERVER['HTTP_ACCEPT_LANGUAGE'], $lang_parse); - if (count($lang_parse[1])) { - // create a list like "en" => 0.8 - $langs = array_combine($lang_parse[1], $lang_parse[4]); - - // set default to 1 for any without q factor - foreach ($langs as $lang => $val) { - if ($val === '') $langs[$lang] = 1; - } - - // sort list based on value - arsort($langs, SORT_NUMERIC); - } + if (count($lang_parse[1])) { + // create a list like "en" => 0.8 + $langs = array_combine($lang_parse[1], $lang_parse[4]); + + // set default to 1 for any without q factor + foreach ($langs as $lang => $val) { + if ($val === '') $langs[$lang] = 1; + } + + // sort list based on value + arsort($langs, SORT_NUMERIC); + } } else $langs['en'] = 1; return $langs; -}} +} function get_best_language() { @@ -62,7 +60,7 @@ function get_best_language() { if(isset($preferred)) return $preferred; - $a = get_app(); + $a = get_app(); return ((isset($a->config['system']['language'])) ? $a->config['system']['language'] : 'en'); } @@ -101,15 +99,25 @@ function pop_lang() { // load string translation table for alternate language -if(! function_exists('load_translation_table')) { -function load_translation_table($lang) { +function load_translation_table($lang, $install = false) { global $a; + $a->strings = array(); if(file_exists("view/$lang/strings.php")) { include("view/$lang/strings.php"); } - else - $a->strings = array(); + + if(! $install) { + $plugins = q("SELECT name FROM addon WHERE installed=1;"); + if ($plugins!==false) { + foreach($plugins as $p) { + $name = $p['name']; + if(file_exists("addon/$name/lang/$lang/strings.php")) { + include("addon/$name/lang/$lang/strings.php"); + } + } + } + } // Allow individual strings to be over-ridden on this site // Either for the default language or for all languages @@ -118,11 +126,10 @@ function load_translation_table($lang) { include("view/local-$lang/strings.php"); } -}} +} // translate string if translation exists -if(! function_exists('t')) { function t($s) { global $a; @@ -132,9 +139,9 @@ function t($s) { return is_array($t)?$t[0]:$t; } return $s; -}} +} + -if(! function_exists('tt')){ function tt($singular, $plural, $count){ $a = get_app(); @@ -152,15 +159,14 @@ function tt($singular, $plural, $count){ } else { return $singular; } -}} +} // provide a fallback which will not collide with // a function defined in any language file -if(! function_exists('string_plural_select_default')) { function string_plural_select_default($n) { return ($n != 1); -}} +} diff --git a/include/queue.php b/include/queue.php index 44816673c..ec7246cb2 100644 --- a/include/queue.php +++ b/include/queue.php @@ -40,14 +40,14 @@ function queue_run($argv, $argc){ return; foreach($r as $rr) { - if(in_array($rr['outq_hub'],$deadguys)) + if(in_array($rr['outq_posturl'],$deadguys)) continue; $result = zot_zot($rr['outq_posturl'],$rr['outq_notify']); if($result['success']) { zot_process_response($rr['outq_posturl'],$result, $rr); } else { - $deadguys[] = $rr['outq_hub']; + $deadguys[] = $rr['outq_posturl']; $y = q("update outq set outq_updated = '%s' where outq_hash = '%s' limit 1", dbesc(datetime_convert()), dbesc($rr['outq_hash']) diff --git a/include/zot.php b/include/zot.php index 1cf34170e..abaa5c9ab 100644 --- a/include/zot.php +++ b/include/zot.php @@ -454,12 +454,19 @@ function import_xchan($arr) { $new_flags = $r[0]['xchan_flags']; - if(($r[0]['xchan_name_date'] != $arr['name_updated']) || ($r[0]['xchan_connurl'] != $arr['connections_url']) || ($r[0]['xchan_flags'] != $new_flags)) { - $r = q("update xchan set xchan_name = '%s', xchan_name_date = '%s', xchan_connurl = '%s', xchan_flags = %d where xchan_hash = '%s' limit 1", + if(($r[0]['xchan_name_date'] != $arr['name_updated']) + || ($r[0]['xchan_connurl'] != $arr['connections_url']) + || ($r[0]['xchan_flags'] != $new_flags) + || ($r[0]['xchan_addr'] != $arr['address']) + || ($r[0]['xchan_url'] != $arr['url'])) { + $r = q("update xchan set xchan_name = '%s', xchan_name_date = '%s', xchan_connurl = '%s', xchan_flags = %d, + xchan_addr = '%s', xchan_url = '%s' where xchan_hash = '%s' limit 1", dbesc($arr['name']), dbesc($arr['name_updated']), dbesc($arr['connections_url']), intval($new_flags), + dbesc($arr['address']), + dbesc($arr['url']), dbesc($xchan_hash) ); } @@ -503,7 +510,15 @@ function import_xchan($arr) { ); } + // what we are missing for true hub independence is for any changes in the primary hub to + // get reflected not only in the hublocs, but also to update the URLs and addr in the appropriate xchan + if($arr['locations']) { + + $xisting = q("select hubloc_id, hubloc_url from hubloc where hubloc_hash = '%s'", + dbesc($xchan_hash) + ); + foreach($arr['locations'] as $location) { if(! rsa_verify($location['url'],base64url_decode($location['url_sig']),$arr['key'])) { logger('import_xchan: Unable to verify site signature for ' . $location['url']); @@ -511,12 +526,19 @@ function import_xchan($arr) { continue; } + for($x = 0; $x < count($xisting); $x ++) { + if($xisting[$x]['hubloc_url'] == $location['url']) { + $xisting[$x]['updated'] = true; + } + } + $r = q("select * from hubloc where hubloc_hash = '%s' and hubloc_url = '%s' limit 1", dbesc($xchan_hash), dbesc($location['url']) ); if($r) { - if(($r[0]['hubloc_flags'] & HUBLOC_FLAGS_PRIMARY) && (! $location['primary'])) { + if((($r[0]['hubloc_flags'] & HUBLOC_FLAGS_PRIMARY) && (! $location['primary'])) + || ((! ($r[0]['hubloc_flags'] & HUBLOC_FLAGS_PRIMARY)) && ($location['primary']))) { $r = q("update hubloc set hubloc_flags = (hubloc_flags ^ %d) where hubloc_id = %d limit 1", intval(HUBLOC_FLAGS_PRIMARY), intval($r[0]['hubloc_id']) @@ -525,6 +547,16 @@ function import_xchan($arr) { continue; } + // new hub claiming to be primary. Make it so. + + if(intval($location['primary'])) { + $r = q("update hubloc set hubloc_flags = (hubloc_flags ^ %d) where hubloc_hash = '%s' and (hubloc_flags & %d )", + intval(HUBLOC_FLAGS_PRIMARY), + dbesc($xchan_hash), + intval(HUBLOC_FLAGS_PRIMARY) + ); + } + $r = q("insert into hubloc ( hubloc_guid, hubloc_guid_sig, hubloc_hash, hubloc_addr, hubloc_flags, hubloc_url, hubloc_url_sig, hubloc_host, hubloc_callback, hubloc_sitekey) values ( '%s','%s','%s','%s', %d ,'%s','%s','%s','%s','%s')", dbesc($arr['guid']), @@ -541,6 +573,18 @@ function import_xchan($arr) { } + // get rid of any hubs we have for this channel which weren't reported. + if($xisting) { + foreach($xisting as $x) { + if(! array_key_exists('updated',$x)) { + logger('import_xchan: removing unreferenced hub location ' . $x['hubloc_url']); + $r = q("delete from hubloc where hubloc_id = %d limit 1", + intval($x['hubloc_id']) + ); + } + } + } + } if(! x($ret,'message')) { @@ -29,7 +29,6 @@ $install = ((file_exists('.htconfig.php') && filesize('.htconfig.php')) ? false $a->language = get_best_language(); -load_translation_table($a->language); /** * @@ -53,9 +52,17 @@ if(! $install) { require_once("session.php"); load_hooks(); call_hooks('init_1'); + + load_translation_table($a->language); +} +else { + // load translations but do not check plugins as we have no database + load_translation_table($a->language,true); } + + /** * * Important stuff we always need to do. diff --git a/install/INSTALL.txt b/install/INSTALL.txt index e6adbba7d..53e2018cc 100644 --- a/install/INSTALL.txt +++ b/install/INSTALL.txt @@ -107,10 +107,10 @@ You can generally find the location of PHP by executing "which php". If you have troubles with this section please contact your hosting provider for assistance. Friendica will not work correctly if you cannot perform this step. -You should also be sure that $a->config['php_path'] is set correctly, it should +You should also be sure that $a->config['system']['php_path'] is set correctly, it should look like (changing it to the correct PHP location) -$a->config['php_path'] = '/usr/local/php53/bin/php' +$a->config['system']['php_path'] = '/usr/local/php53/bin/php'; Alternative: You may be able to use the 'poormancron' plugin to perform this step if you are using a recent Friendica release. 'poormancron' may result in @@ -260,7 +260,7 @@ are NOT called with -d suhosin.executor.func.blacklist=none. So the simple solution is to put the correct parameters into .htconfig.php: // Location of PHP command line processor - $a->config['php_path'] = '/usr/bin/php -d suhosin.executor.func.blacklist=none + $a->config['system']['php_path'] = '/usr/bin/php -d suhosin.executor.func.blacklist=none -d suhosin.executor.eval.blacklist=none'; diff --git a/install/database.sql b/install/database.sql index 24b5a550a..4f503fc12 100644 --- a/install/database.sql +++ b/install/database.sql @@ -840,6 +840,13 @@ CREATE TABLE IF NOT EXISTS `tokens` ( KEY `uid` (`uid`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE IF NOT EXISTS `updates` ( + `ud_hash` char(128) NOT NULL, + `ud_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + PRIMARY KEY (`ud_hash`), + KEY `ud_date` (`ud_date`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + CREATE TABLE IF NOT EXISTS `verify` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `channel` int(10) unsigned NOT NULL DEFAULT '0', diff --git a/install/update.php b/install/update.php index 2d06e406a..4bdba3507 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ <?php -define( 'UPDATE_VERSION' , 1034 ); +define( 'UPDATE_VERSION' , 1035 ); /** * @@ -433,3 +433,15 @@ KEY `share_xchan` (`share_xchan`) return UPDATE_FAILED; } +function update_r1034() { + $r = q("CREATE TABLE if not exists `updates` ( +`ud_hash` CHAR( 128 ) NOT NULL , +`ud_date` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', +PRIMARY KEY ( `ud_hash` ), +KEY `ud_date` ( `ud_date` ) +) ENGINE = MYISAM DEFAULT CHARSET = utf8"); + + if($r) + return UPDATE_SUCCESS; + return UPDATE_FAILED; +} diff --git a/mod/editpost.php b/mod/editpost.php index 43c71ca8a..1d7b7b6fb 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -18,13 +18,14 @@ function editpost_content(&$a) { return; } - $itm = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1", + $itm = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d and author_xchan = '%s' LIMIT 1", intval($post_id), - intval(local_user()) + intval(local_user()), + dbesc(get_observer_hash()) ); if(! count($itm)) { - notice( t('Item not found') . EOL); + notice( t('Item is not editable') . EOL); return; } diff --git a/mod/fsuggest.php b/mod/fsuggest.php index 9ef8f4c55..8b6f077d3 100644 --- a/mod/fsuggest.php +++ b/mod/fsuggest.php @@ -100,8 +100,9 @@ function fsuggest_content(&$a) { $o .= '<form id="fsuggest-form" action="fsuggest/' . $contact_id . '" method="post" >'; - $o .= contact_selector('suggest','suggest-select', false, - array('size' => 4, 'exclude' => $contact_id, 'networks' => 'DFRN_ONLY', 'single' => true)); +// FIXME contact_selector deprecated, removed +// $o .= contact_selector('suggest','suggest-select', false, +// array('size' => 4, 'exclude' => $contact_id, 'networks' => 'DFRN_ONLY', 'single' => true)); $o .= '<div id="fsuggest-submit-wrapper"><input id="fsuggest-submit" type="submit" name="submit" value="' . t('Submit') . '" /></div>'; diff --git a/mod/like.php b/mod/like.php index 7c3df98ba..16be071bc 100755 --- a/mod/like.php +++ b/mod/like.php @@ -149,11 +149,11 @@ function like_content(&$a) { $arr['author_xchan'] = $observer['xchan_hash']; - $ulink = '[url=' . $item_owner['xchan_url'] . ']' . $item_owner['xchan_name'] . '[/url]'; + $ulink = '[url=' . $thread_owner['xchan_url'] . ']' . $thread_owner['xchan_name'] . '[/url]'; $alink = '[url=' . $observer['xchan_url'] . ']' . $observer['xchan_name'] . '[/url]'; $plink = '[url=' . $a->get_baseurl() . '/display/' . $item['uri'] . ']' . $post_type . '[/url]'; - $arr['body'] = sprintf( $bodyverb, $ulink, $alink, $plink ); + $arr['body'] = sprintf( $bodyverb, $alink, $ulink, $plink ); $arr['verb'] = $activity; $arr['obj_type'] = $objtype; diff --git a/mod/post.php b/mod/post.php index e5fa1a418..af08d3f98 100644 --- a/mod/post.php +++ b/mod/post.php @@ -261,6 +261,7 @@ function post_post(&$a) { } } + if($msgtype === 'refresh') { // remote channel info (such as permissions or photo or something) diff --git a/mod/probe.php b/mod/probe.php index f90728df2..397f571c5 100644 --- a/mod/probe.php +++ b/mod/probe.php @@ -1,6 +1,5 @@ <?php -require_once('include/Scrape.php'); require_once('include/zot.php'); function probe_content(&$a) { diff --git a/mod/zfinger.php b/mod/zfinger.php index 74353e8f9..48582b3d6 100644 --- a/mod/zfinger.php +++ b/mod/zfinger.php @@ -145,6 +145,12 @@ function zfinger_init(&$a) { // array of (verified) hubs this channel uses $ret['locations'] = array(); + + + + + + $x = zot_get_hubloc(array($e['channel_hash'])); if($x && count($x)) { foreach($x as $hub) { diff --git a/util/messages.po b/util/messages.po index 472d1c21f..9662d36ef 100644 --- a/util/messages.po +++ b/util/messages.po @@ -1,7847 +1,6136 @@ -# FRIENDICA Distributed Social Network -# Copyright (C) 2010, 2011 the Friendica Project -# This file is distributed under the same license as the Friendica package. -# Mike Macgirvin, 2010 +# Red Communications Project +# Copyright (C) 2013 the Friendica Project +# This file is distributed under the same license as the Red package. +# Mike Macgirvin, 2013 # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1397\n" +"Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-07 10:00-0700\n" +"POT-Creation-Date: 2013-03-10 15:08-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" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: ../../mod/oexchange.php:25 -msgid "Post successful." -msgstr "" - -#: ../../mod/update_notes.php:41 ../../mod/update_community.php:18 -#: ../../mod/update_network.php:22 ../../mod/update_profile.php:41 -msgid "[Embedded content - reload page to view]" +#: ../../include/plugin.php:400 ../../include/plugin.php:402 +msgid "Click here to upgrade." msgstr "" -#: ../../mod/crepair.php:102 -msgid "Contact settings applied." +#: ../../include/plugin.php:408 +msgid "This action exceeds the limits set by your subscription plan." msgstr "" -#: ../../mod/crepair.php:104 -msgid "Contact update failed." +#: ../../include/plugin.php:413 +msgid "This action is not available under your subscription plan." msgstr "" -#: ../../mod/crepair.php:115 ../../mod/wall_attach.php:44 -#: ../../mod/fsuggest.php:78 ../../mod/events.php:140 ../../mod/api.php:26 -#: ../../mod/api.php:31 ../../mod/photos.php:135 ../../mod/photos.php:957 -#: ../../mod/editpost.php:10 ../../mod/install.php:151 -#: ../../mod/notifications.php:66 ../../mod/contacts.php:145 -#: ../../mod/settings.php:106 ../../mod/settings.php:537 -#: ../../mod/settings.php:542 ../../mod/manage.php:86 ../../mod/network.php:6 -#: ../../mod/notes.php:20 ../../mod/wallmessage.php:9 -#: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79 -#: ../../mod/wallmessage.php:103 ../../mod/attach.php:33 -#: ../../mod/group.php:19 ../../mod/viewconnections.php:22 -#: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:124 -#: ../../mod/item.php:140 ../../mod/profile_photo.php:19 -#: ../../mod/profile_photo.php:141 ../../mod/profile_photo.php:152 -#: ../../mod/profile_photo.php:165 ../../mod/message.php:45 -#: ../../mod/message.php:97 ../../mod/allfriends.php:9 -#: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:53 -#: ../../mod/follow.php:9 ../../mod/display.php:138 ../../mod/profiles.php:7 -#: ../../mod/profiles.php:400 ../../mod/delegate.php:6 -#: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81 -#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510 -#: ../../addon/facebook/facebook.php:516 ../../addon/dav/layout.fnk.php:353 -#: ../../include/items.php:3457 ../../index.php:309 -msgid "Permission denied." +#: ../../include/ItemObject.php:105 ../../mod/photos.php:964 +msgid "Private Message" msgstr "" -#: ../../mod/crepair.php:129 ../../mod/fsuggest.php:20 -#: ../../mod/fsuggest.php:92 ../../mod/dfrn_confirm.php:118 -msgid "Contact not found." +#: ../../include/ItemObject.php:110 ../../mod/settings.php:657 +#: ../../mod/editpost.php:65 +msgid "Edit" msgstr "" -#: ../../mod/crepair.php:135 -msgid "Repair Contact Settings" +#: ../../include/ItemObject.php:123 ../../include/conversation.php:573 +#: ../../mod/admin.php:615 ../../mod/connections.php:304 +#: ../../mod/settings.php:658 ../../mod/group.php:175 +#: ../../mod/photos.php:1223 +msgid "Delete" msgstr "" -#: ../../mod/crepair.php:137 -msgid "" -"<strong>WARNING: This is highly advanced</strong> and if you enter incorrect " -"information your communications with this contact may stop working." +#: ../../include/ItemObject.php:129 ../../include/conversation.php:572 +msgid "Select" msgstr "" -#: ../../mod/crepair.php:138 -msgid "" -"Please use your browser 'Back' button <strong>now</strong> if you are " -"uncertain what to do on this page." +#: ../../include/ItemObject.php:133 +msgid "save to folder" msgstr "" -#: ../../mod/crepair.php:144 -msgid "Return to contact editor" +#: ../../include/ItemObject.php:160 +msgid "add star" msgstr "" -#: ../../mod/crepair.php:148 ../../mod/settings.php:557 -#: ../../mod/settings.php:583 ../../mod/admin.php:661 ../../mod/admin.php:670 -msgid "Name" +#: ../../include/ItemObject.php:161 +msgid "remove star" msgstr "" -#: ../../mod/crepair.php:149 -msgid "Account Nickname" +#: ../../include/ItemObject.php:162 +msgid "toggle star status" msgstr "" -#: ../../mod/crepair.php:150 -msgid "@Tagname - overrides Name/Nickname" +#: ../../include/ItemObject.php:166 +msgid "starred" msgstr "" -#: ../../mod/crepair.php:151 -msgid "Account URL" +#: ../../include/ItemObject.php:170 +msgid "add tag" msgstr "" -#: ../../mod/crepair.php:152 -msgid "Friend Request URL" +#: ../../include/ItemObject.php:179 ../../mod/photos.php:1110 +msgid "I like this (toggle)" msgstr "" -#: ../../mod/crepair.php:153 -msgid "Friend Confirm URL" +#: ../../include/ItemObject.php:179 +msgid "like" msgstr "" -#: ../../mod/crepair.php:154 -msgid "Notification Endpoint URL" +#: ../../include/ItemObject.php:180 ../../mod/photos.php:1111 +msgid "I don't like this (toggle)" msgstr "" -#: ../../mod/crepair.php:155 -msgid "Poll/Feed URL" +#: ../../include/ItemObject.php:180 +msgid "dislike" msgstr "" -#: ../../mod/crepair.php:156 -msgid "New photo from this URL" +#: ../../include/ItemObject.php:182 +msgid "Share this" msgstr "" -#: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107 -#: ../../mod/events.php:436 ../../mod/photos.php:992 ../../mod/photos.php:1063 -#: ../../mod/photos.php:1309 ../../mod/photos.php:1349 -#: ../../mod/photos.php:1389 ../../mod/photos.php:1420 -#: ../../mod/install.php:246 ../../mod/install.php:284 -#: ../../mod/localtime.php:45 ../../mod/content.php:691 -#: ../../mod/contacts.php:343 ../../mod/settings.php:555 -#: ../../mod/settings.php:709 ../../mod/settings.php:770 -#: ../../mod/settings.php:971 ../../mod/group.php:85 ../../mod/message.php:216 -#: ../../mod/message.php:412 ../../mod/admin.php:422 ../../mod/admin.php:658 -#: ../../mod/admin.php:794 ../../mod/admin.php:993 ../../mod/admin.php:1080 -#: ../../mod/profiles.php:569 ../../mod/invite.php:119 -#: ../../addon/fromgplus/fromgplus.php:40 -#: ../../addon/facebook/facebook.php:619 -#: ../../addon/snautofollow/snautofollow.php:64 -#: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93 -#: ../../addon/nsfw/nsfw.php:57 ../../addon/page/page.php:210 -#: ../../addon/planets/planets.php:158 -#: ../../addon/uhremotestorage/uhremotestorage.php:89 -#: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93 -#: ../../addon/drpost/drpost.php:110 ../../addon/startpage/startpage.php:92 -#: ../../addon/geonames/geonames.php:187 ../../addon/oembed.old/oembed.php:41 -#: ../../addon/impressum/impressum.php:82 -#: ../../addon/notimeline/notimeline.php:64 ../../addon/blockem/blockem.php:57 -#: ../../addon/qcomment/qcomment.php:61 -#: ../../addon/openstreetmap/openstreetmap.php:70 -#: ../../addon/libertree/libertree.php:90 ../../addon/mathjax/mathjax.php:42 -#: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:98 -#: ../../addon/gravatar/gravatar.php:86 -#: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93 -#: ../../addon/jappixmini/jappixmini.php:302 -#: ../../addon/statusnet/statusnet.php:278 -#: ../../addon/statusnet/statusnet.php:292 -#: ../../addon/statusnet/statusnet.php:318 -#: ../../addon/statusnet/statusnet.php:325 -#: ../../addon/statusnet/statusnet.php:353 -#: ../../addon/statusnet/statusnet.php:567 ../../addon/tumblr/tumblr.php:90 -#: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88 -#: ../../addon/wppost/wppost.php:110 ../../addon/showmore/showmore.php:48 -#: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180 -#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:387 -#: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102 -#: ../../addon/posterous/posterous.php:103 -#: ../../view/theme/cleanzero/config.php:80 -#: ../../view/theme/diabook/theme.php:757 -#: ../../view/theme/diabook/config.php:190 -#: ../../view/theme/quattro/config.php:52 ../../view/theme/dispy/config.php:70 -#: ../../include/conversation.php:580 -msgid "Submit" +#: ../../include/ItemObject.php:182 +msgid "share" msgstr "" -#: ../../mod/help.php:30 -msgid "Help:" +#: ../../include/ItemObject.php:206 ../../include/ItemObject.php:207 +#, php-format +msgid "View %s's profile - %s" msgstr "" -#: ../../mod/help.php:34 ../../addon/dav/layout.fnk.php:116 -#: ../../include/nav.php:86 -msgid "Help" +#: ../../include/ItemObject.php:208 +msgid "to" msgstr "" -#: ../../mod/help.php:38 ../../index.php:218 -msgid "Not Found" +#: ../../include/ItemObject.php:209 +msgid "Wall-to-Wall" msgstr "" -#: ../../mod/help.php:41 ../../index.php:221 -msgid "Page not found." +#: ../../include/ItemObject.php:210 +msgid "via Wall-To-Wall:" msgstr "" -#: ../../mod/wall_attach.php:58 +#: ../../include/ItemObject.php:220 #, php-format -msgid "File exceeds size limit of %d" -msgstr "" - -#: ../../mod/wall_attach.php:99 ../../mod/wall_attach.php:110 -msgid "File upload failed." -msgstr "" - -#: ../../mod/fsuggest.php:63 -msgid "Friend suggestion sent." +msgid "%s from %s" msgstr "" -#: ../../mod/fsuggest.php:97 -msgid "Suggest Friends" +#: ../../include/ItemObject.php:245 ../../include/conversation.php:639 +#: ../../include/conversation.php:981 ../../mod/editpost.php:74 +#: ../../mod/message.php:288 ../../mod/message.php:421 +#: ../../mod/photos.php:1113 +msgid "Please wait" msgstr "" -#: ../../mod/fsuggest.php:99 +#: ../../include/ItemObject.php:266 #, php-format -msgid "Suggest a friend for %s" -msgstr "" +msgid "%d comment" +msgid_plural "%d comments" +msgstr[0] "" +msgstr[1] "" -#: ../../mod/events.php:66 -msgid "Event title and start time are required." +#: ../../include/ItemObject.php:267 ../../include/contact_widgets.php:126 +#: ../../include/js_strings.php:7 +msgid "show more" msgstr "" -#: ../../mod/events.php:260 -msgid "l, F j" +#: ../../include/ItemObject.php:536 ../../mod/photos.php:1128 +#: ../../mod/photos.php:1166 ../../mod/photos.php:1193 +msgid "This is you" msgstr "" -#: ../../mod/events.php:282 -msgid "Edit event" +#: ../../include/ItemObject.php:538 ../../include/js_strings.php:6 +#: ../../mod/photos.php:1130 ../../mod/photos.php:1168 +#: ../../mod/photos.php:1195 +msgid "Comment" msgstr "" -#: ../../mod/events.php:304 ../../include/text.php:1069 -msgid "link to source" +#: ../../include/ItemObject.php:539 ../../mod/profiles.php:520 +#: ../../mod/admin.php:375 ../../mod/admin.php:608 ../../mod/admin.php:744 +#: ../../mod/admin.php:943 ../../mod/admin.php:1030 ../../mod/poke.php:200 +#: ../../mod/setup.php:257 ../../mod/setup.php:298 +#: ../../mod/connections.php:372 ../../mod/settings.php:595 +#: ../../mod/settings.php:707 ../../mod/settings.php:736 +#: ../../mod/settings.php:759 ../../mod/settings.php:830 +#: ../../mod/settings.php:996 ../../mod/crepair.php:166 +#: ../../mod/events.php:455 ../../mod/fsuggest.php:107 ../../mod/group.php:83 +#: ../../mod/import.php:339 ../../mod/invite.php:138 ../../mod/message.php:289 +#: ../../mod/message.php:420 ../../mod/mood.php:134 ../../mod/photos.php:720 +#: ../../mod/photos.php:812 ../../mod/photos.php:1092 +#: ../../mod/photos.php:1131 ../../mod/photos.php:1169 +#: ../../mod/photos.php:1196 ../../view/theme/redbasic/php/config.php:131 +msgid "Submit" msgstr "" -#: ../../mod/events.php:328 ../../view/theme/diabook/theme.php:131 -#: ../../include/nav.php:52 ../../boot.php:1595 -msgid "Events" +#: ../../include/ItemObject.php:540 +msgid "Bold" msgstr "" -#: ../../mod/events.php:329 -msgid "Create New Event" +#: ../../include/ItemObject.php:541 +msgid "Italic" msgstr "" -#: ../../mod/events.php:330 ../../addon/dav/layout.fnk.php:154 -msgid "Previous" +#: ../../include/ItemObject.php:542 +msgid "Underline" msgstr "" -#: ../../mod/events.php:331 ../../mod/install.php:205 -#: ../../addon/dav/layout.fnk.php:157 -msgid "Next" +#: ../../include/ItemObject.php:543 +msgid "Quote" msgstr "" -#: ../../mod/events.php:404 -msgid "hour:minute" +#: ../../include/ItemObject.php:544 +msgid "Code" msgstr "" -#: ../../mod/events.php:414 -msgid "Event details" +#: ../../include/ItemObject.php:545 +msgid "Image" msgstr "" -#: ../../mod/events.php:415 -#, php-format -msgid "Format is %s %s. Starting date and Title are required." +#: ../../include/ItemObject.php:546 +msgid "Link" msgstr "" -#: ../../mod/events.php:417 -msgid "Event Starts:" +#: ../../include/ItemObject.php:547 +msgid "Video" msgstr "" -#: ../../mod/events.php:417 ../../mod/events.php:431 -msgid "Required" +#: ../../include/ItemObject.php:548 ../../include/conversation.php:999 +#: ../../mod/editpost.php:94 ../../mod/photos.php:1132 +msgid "Preview" msgstr "" -#: ../../mod/events.php:420 -msgid "Finish date/time is not known or not relevant" +#: ../../include/Contact.php:53 ../../include/contact_widgets.php:9 +#: ../../mod/suggest.php:56 ../../mod/match.php:58 ../../boot.php:1490 +msgid "Connect" msgstr "" -#: ../../mod/events.php:422 -msgid "Event Finishes:" +#: ../../include/Contact.php:66 +msgid "New window" msgstr "" -#: ../../mod/events.php:425 -msgid "Adjust for viewer timezone" +#: ../../include/Contact.php:67 +msgid "Open the selected location in a different window or browser tab" msgstr "" -#: ../../mod/events.php:427 -msgid "Description:" +#: ../../include/Contact.php:375 ../../include/conversation.php:834 +msgid "Poke" msgstr "" -#: ../../mod/events.php:429 ../../mod/directory.php:132 -#: ../../include/event.php:40 ../../include/bb2diaspora.php:409 -#: ../../boot.php:1172 -msgid "Location:" +#: ../../include/Contact.php:376 ../../include/conversation.php:828 +msgid "View Status" msgstr "" -#: ../../mod/events.php:431 -msgid "Title:" +#: ../../include/Contact.php:377 ../../include/conversation.php:829 +#: ../../include/nav.php:75 ../../mod/connections.php:264 +#: ../../mod/connections.php:363 +msgid "View Profile" msgstr "" -#: ../../mod/events.php:433 -msgid "Share this event" +#: ../../include/Contact.php:378 ../../include/conversation.php:830 +msgid "View Photos" msgstr "" -#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 -#: ../../mod/dfrn_request.php:845 ../../mod/settings.php:556 -#: ../../mod/settings.php:582 ../../addon/js_upload/js_upload.php:45 -msgid "Cancel" +#: ../../include/Contact.php:379 ../../include/conversation.php:831 +msgid "Network Posts" msgstr "" -#: ../../mod/tagrm.php:41 -msgid "Tag removed" +#: ../../include/Contact.php:380 ../../include/conversation.php:832 +msgid "Edit Contact" msgstr "" -#: ../../mod/tagrm.php:79 -msgid "Remove Item Tag" +#: ../../include/Contact.php:381 ../../include/conversation.php:833 +msgid "Send PM" msgstr "" -#: ../../mod/tagrm.php:81 -msgid "Select a tag to remove: " +#: ../../include/photos.php:13 ../../include/attach.php:102 +#: ../../include/attach.php:133 ../../include/attach.php:189 +#: ../../include/attach.php:204 ../../include/attach.php:237 +#: ../../include/attach.php:251 ../../include/attach.php:272 +#: ../../include/attach.php:464 ../../include/items.php:4400 +#: ../../mod/profile_photo.php:185 ../../mod/profile_photo.php:198 +#: ../../mod/profiles.php:163 ../../mod/profiles.php:468 +#: ../../mod/poke.php:138 ../../mod/allfriends.php:10 ../../mod/setup.php:157 +#: ../../mod/api.php:26 ../../mod/api.php:31 ../../mod/viewconnections.php:33 +#: ../../mod/viewconnections.php:38 ../../mod/channel.php:105 +#: ../../mod/suggest.php:32 ../../mod/common.php:43 +#: ../../mod/connections.php:146 ../../mod/settings.php:577 +#: ../../mod/crepair.php:115 ../../mod/delegate.php:6 +#: ../../mod/editpost.php:10 ../../mod/events.php:134 ../../mod/viewsrc.php:12 +#: ../../mod/fsuggest.php:78 ../../mod/group.php:15 ../../mod/intro.php:50 +#: ../../mod/invite.php:13 ../../mod/invite.php:99 ../../mod/item.php:147 +#: ../../mod/manage.php:6 ../../mod/message.php:196 ../../mod/mood.php:111 +#: ../../mod/network.php:7 ../../mod/new_channel.php:66 +#: ../../mod/new_channel.php:97 ../../mod/nogroup.php:25 +#: ../../mod/notifications.php:66 ../../mod/photos.php:72 +#: ../../mod/photos.php:685 ../../mod/register.php:60 ../../mod/regmod.php:18 +#: ../../index.php:167 ../../index.php:329 +msgid "Permission denied." msgstr "" -#: ../../mod/tagrm.php:93 ../../mod/delegate.php:130 -msgid "Remove" +#: ../../include/photos.php:49 ../../include/Photo.php:744 +#: ../../include/Photo.php:751 ../../include/Photo.php:758 +#: ../../mod/profile_photo.php:88 ../../mod/profile_photo.php:93 +#: ../../mod/profile_photo.php:98 ../../mod/profile_photo.php:223 +#: ../../mod/profile_photo.php:323 ../../mod/profile_photo.php:332 +#: ../../mod/photos.php:95 ../../mod/photos.php:797 ../../mod/photos.php:819 +msgid "Profile Photos" msgstr "" -#: ../../mod/dfrn_poll.php:94 ../../mod/dfrn_poll.php:522 +#: ../../include/photos.php:86 #, php-format -msgid "%s welcomes %s" -msgstr "" - -#: ../../mod/api.php:76 ../../mod/api.php:102 -msgid "Authorize application connection" -msgstr "" - -#: ../../mod/api.php:77 -msgid "Return to your app and insert this Securty Code:" +msgid "Image exceeds website size limit of %lu bytes" msgstr "" -#: ../../mod/api.php:89 -msgid "Please login to continue." -msgstr "" - -#: ../../mod/api.php:104 -msgid "" -"Do you want to authorize this application to access your posts and contacts, " -"and/or create new posts for you?" +#: ../../include/photos.php:93 +msgid "Image file is empty." msgstr "" -#: ../../mod/api.php:105 ../../mod/dfrn_request.php:833 -#: ../../mod/settings.php:887 ../../mod/settings.php:893 -#: ../../mod/settings.php:901 ../../mod/settings.php:905 -#: ../../mod/settings.php:910 ../../mod/settings.php:916 -#: ../../mod/settings.php:922 ../../mod/settings.php:928 -#: ../../mod/settings.php:958 ../../mod/settings.php:959 -#: ../../mod/settings.php:960 ../../mod/settings.php:961 -#: ../../mod/settings.php:962 ../../mod/register.php:234 -#: ../../mod/profiles.php:546 -msgid "Yes" +#: ../../include/photos.php:122 ../../mod/profile_photo.php:145 +msgid "Unable to process image" msgstr "" -#: ../../mod/api.php:106 ../../mod/dfrn_request.php:834 -#: ../../mod/settings.php:887 ../../mod/settings.php:893 -#: ../../mod/settings.php:901 ../../mod/settings.php:905 -#: ../../mod/settings.php:910 ../../mod/settings.php:916 -#: ../../mod/settings.php:922 ../../mod/settings.php:928 -#: ../../mod/settings.php:958 ../../mod/settings.php:959 -#: ../../mod/settings.php:960 ../../mod/settings.php:961 -#: ../../mod/settings.php:962 ../../mod/register.php:235 -#: ../../mod/profiles.php:547 -msgid "No" +#: ../../include/photos.php:176 +msgid "Photo storage failed." msgstr "" -#: ../../mod/photos.php:46 ../../boot.php:1589 +#: ../../include/photos.php:271 ../../boot.php:1942 msgid "Photo Albums" msgstr "" -#: ../../mod/photos.php:54 ../../mod/photos.php:156 ../../mod/photos.php:971 -#: ../../mod/photos.php:1055 ../../mod/photos.php:1070 -#: ../../mod/photos.php:1498 ../../mod/photos.php:1510 -#: ../../addon/communityhome/communityhome.php:110 -#: ../../view/theme/diabook/theme.php:598 -msgid "Contact Photos" -msgstr "" - -#: ../../mod/photos.php:61 ../../mod/photos.php:1080 ../../mod/photos.php:1548 +#: ../../include/photos.php:275 ../../mod/photos.php:835 +#: ../../mod/photos.php:1357 msgid "Upload New Photos" msgstr "" -#: ../../mod/photos.php:72 ../../mod/settings.php:21 -msgid "everybody" +#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:84 +#: ../../mod/profperm.php:112 ../../boot.php:1932 +msgid "Profile" msgstr "" -#: ../../mod/photos.php:145 -msgid "Contact information unavailable" +#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1004 +msgid "Full Name:" msgstr "" -#: ../../mod/photos.php:156 ../../mod/photos.php:660 ../../mod/photos.php:1055 -#: ../../mod/photos.php:1070 ../../mod/profile_photo.php:60 -#: ../../mod/profile_photo.php:67 ../../mod/profile_photo.php:74 -#: ../../mod/profile_photo.php:176 ../../mod/profile_photo.php:254 -#: ../../mod/profile_photo.php:263 -#: ../../addon/communityhome/communityhome.php:111 -#: ../../view/theme/diabook/theme.php:599 ../../include/user.php:318 -#: ../../include/user.php:325 ../../include/user.php:332 -msgid "Profile Photos" +#: ../../include/profile_advanced.php:17 ../../mod/directory.php:118 +#: ../../boot.php:1546 +msgid "Gender:" msgstr "" -#: ../../mod/photos.php:166 -msgid "Album not found." +#: ../../include/profile_advanced.php:22 +msgid "j F, Y" msgstr "" -#: ../../mod/photos.php:184 ../../mod/photos.php:1064 -msgid "Delete Album" +#: ../../include/profile_advanced.php:23 +msgid "j F" msgstr "" -#: ../../mod/photos.php:247 ../../mod/photos.php:1310 -msgid "Delete Photo" +#: ../../include/profile_advanced.php:30 +msgid "Birthday:" msgstr "" -#: ../../mod/photos.php:591 -msgid "was tagged in a" +#: ../../include/profile_advanced.php:34 +msgid "Age:" msgstr "" -#: ../../mod/photos.php:591 ../../mod/like.php:144 ../../mod/tagger.php:70 -#: ../../addon/communityhome/communityhome.php:163 -#: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1321 -#: ../../include/diaspora.php:1777 ../../include/conversation.php:53 -#: ../../include/conversation.php:126 -msgid "photo" +#: ../../include/profile_advanced.php:37 ../../mod/directory.php:120 +#: ../../boot.php:1547 +msgid "Status:" msgstr "" -#: ../../mod/photos.php:591 -msgid "by" +#: ../../include/profile_advanced.php:43 +#, php-format +msgid "for %1$d %2$s" msgstr "" -#: ../../mod/photos.php:696 ../../addon/js_upload/js_upload.php:315 -msgid "Image exceeds size limit of " +#: ../../include/profile_advanced.php:46 ../../mod/profiles.php:540 +msgid "Sexual Preference:" msgstr "" -#: ../../mod/photos.php:704 -msgid "Image file is empty." +#: ../../include/profile_advanced.php:48 ../../mod/directory.php:122 +#: ../../boot.php:1548 +msgid "Homepage:" msgstr "" -#: ../../mod/photos.php:736 ../../mod/profile_photo.php:126 -#: ../../mod/wall_upload.php:99 -msgid "Unable to process image." +#: ../../include/profile_advanced.php:50 ../../mod/profiles.php:542 +msgid "Hometown:" msgstr "" -#: ../../mod/photos.php:763 ../../mod/profile_photo.php:259 -#: ../../mod/wall_upload.php:118 -msgid "Image upload failed." +#: ../../include/profile_advanced.php:52 +msgid "Tags:" msgstr "" -#: ../../mod/photos.php:849 ../../mod/community.php:16 -#: ../../mod/dfrn_request.php:759 ../../mod/viewconnections.php:17 -#: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:29 -msgid "Public access denied." +#: ../../include/profile_advanced.php:54 ../../mod/profiles.php:543 +msgid "Political Views:" msgstr "" -#: ../../mod/photos.php:859 -msgid "No photos selected" +#: ../../include/profile_advanced.php:56 +msgid "Religion:" msgstr "" -#: ../../mod/photos.php:938 -msgid "Access to this item is restricted." +#: ../../include/profile_advanced.php:58 ../../mod/directory.php:124 +msgid "About:" msgstr "" -#: ../../mod/photos.php:1002 -#, php-format -msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." +#: ../../include/profile_advanced.php:60 +msgid "Hobbies/Interests:" msgstr "" -#: ../../mod/photos.php:1005 -#, php-format -msgid "You have used %1$.2f Mbytes of photo storage." +#: ../../include/profile_advanced.php:62 ../../mod/profiles.php:546 +msgid "Likes:" msgstr "" -#: ../../mod/photos.php:1011 -msgid "Upload Photos" +#: ../../include/profile_advanced.php:64 ../../mod/profiles.php:547 +msgid "Dislikes:" msgstr "" -#: ../../mod/photos.php:1015 ../../mod/photos.php:1059 -msgid "New album name: " +#: ../../include/profile_advanced.php:67 +msgid "Contact information and Social Networks:" msgstr "" -#: ../../mod/photos.php:1016 -msgid "or existing album name: " +#: ../../include/profile_advanced.php:69 +msgid "Musical interests:" msgstr "" -#: ../../mod/photos.php:1017 -msgid "Do not show a status post for this upload" +#: ../../include/profile_advanced.php:71 +msgid "Books, literature:" msgstr "" -#: ../../mod/photos.php:1019 ../../mod/photos.php:1305 -msgid "Permissions" +#: ../../include/profile_advanced.php:73 +msgid "Television:" msgstr "" -#: ../../mod/photos.php:1074 -msgid "Edit Album" +#: ../../include/profile_advanced.php:75 +msgid "Film/dance/culture/entertainment:" msgstr "" -#: ../../mod/photos.php:1098 ../../mod/photos.php:1531 -msgid "View Photo" +#: ../../include/profile_advanced.php:77 +msgid "Love/Romance:" msgstr "" -#: ../../mod/photos.php:1133 -msgid "Permission denied. Access to this item may be restricted." +#: ../../include/profile_advanced.php:79 +msgid "Work/employment:" msgstr "" -#: ../../mod/photos.php:1135 -msgid "Photo not available" +#: ../../include/profile_advanced.php:81 +msgid "School/education:" msgstr "" -#: ../../mod/photos.php:1185 -msgid "View photo" +#: ../../include/Scrape.php:552 +msgid " on Last.fm" msgstr "" -#: ../../mod/photos.php:1185 -msgid "Edit photo" +#: ../../include/account.php:22 +msgid "Not a valid email address" msgstr "" -#: ../../mod/photos.php:1186 -msgid "Use as profile photo" +#: ../../include/account.php:24 +msgid "Your email domain is not among those allowed on this site" msgstr "" -#: ../../mod/photos.php:1192 ../../mod/content.php:601 -#: ../../include/conversation.php:490 -msgid "Private Message" +#: ../../include/account.php:30 +msgid "Your email address is already registered at this site." msgstr "" -#: ../../mod/photos.php:1214 -msgid "View Full Size" +#: ../../include/account.php:63 +msgid "An invitation is required." msgstr "" -#: ../../mod/photos.php:1282 -msgid "Tags: " +#: ../../include/account.php:67 +msgid "Invitation could not be verified." msgstr "" -#: ../../mod/photos.php:1285 -msgid "[Remove any tag]" +#: ../../include/account.php:116 +msgid "Please enter the required information." msgstr "" -#: ../../mod/photos.php:1295 -msgid "Rotate CW (right)" +#: ../../include/account.php:177 +msgid "Failed to store account information." msgstr "" -#: ../../mod/photos.php:1296 -msgid "Rotate CCW (left)" +#: ../../include/account.php:263 +#, php-format +msgid "Registration request at %s" msgstr "" -#: ../../mod/photos.php:1298 -msgid "New album name" +#: ../../include/account.php:265 ../../include/account.php:292 +#: ../../include/account.php:349 ../../include/items.php:3928 +#: ../../boot.php:1073 +msgid "Administrator" msgstr "" -#: ../../mod/photos.php:1301 -msgid "Caption" +#: ../../include/account.php:287 +msgid "your registration password" msgstr "" -#: ../../mod/photos.php:1303 -msgid "Add a Tag" +#: ../../include/account.php:290 ../../include/account.php:347 +#, php-format +msgid "Registration details for %s" msgstr "" -#: ../../mod/photos.php:1307 -msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" +#: ../../include/account.php:356 +msgid "Account approved." msgstr "" -#: ../../mod/photos.php:1327 ../../mod/content.php:665 -#: ../../include/conversation.php:554 -msgid "I like this (toggle)" +#: ../../include/account.php:390 +#, php-format +msgid "Registration revoked for %s" msgstr "" -#: ../../mod/photos.php:1328 ../../mod/content.php:666 -#: ../../include/conversation.php:555 -msgid "I don't like this (toggle)" +#: ../../include/profile_selectors.php:6 +msgid "Male" msgstr "" -#: ../../mod/photos.php:1329 ../../include/conversation.php:993 -msgid "Share" +#: ../../include/profile_selectors.php:6 +msgid "Female" msgstr "" -#: ../../mod/photos.php:1330 ../../mod/editpost.php:104 -#: ../../mod/content.php:482 ../../mod/content.php:842 -#: ../../mod/wallmessage.php:145 ../../mod/message.php:215 -#: ../../mod/message.php:413 ../../include/conversation.php:371 -#: ../../include/conversation.php:731 ../../include/conversation.php:1012 -msgid "Please wait" +#: ../../include/profile_selectors.php:6 +msgid "Currently Male" msgstr "" -#: ../../mod/photos.php:1346 ../../mod/photos.php:1386 -#: ../../mod/photos.php:1417 ../../mod/content.php:688 -#: ../../include/conversation.php:577 -msgid "This is you" +#: ../../include/profile_selectors.php:6 +msgid "Currently Female" msgstr "" -#: ../../mod/photos.php:1348 ../../mod/photos.php:1388 -#: ../../mod/photos.php:1419 ../../mod/content.php:690 -#: ../../include/conversation.php:579 ../../boot.php:564 -msgid "Comment" +#: ../../include/profile_selectors.php:6 +msgid "Mostly Male" msgstr "" -#: ../../mod/photos.php:1350 ../../mod/editpost.php:125 -#: ../../mod/content.php:700 ../../include/conversation.php:589 -#: ../../include/conversation.php:1030 -msgid "Preview" +#: ../../include/profile_selectors.php:6 +msgid "Mostly Female" msgstr "" -#: ../../mod/photos.php:1447 ../../mod/content.php:439 -#: ../../mod/content.php:720 ../../mod/settings.php:618 -#: ../../mod/settings.php:707 ../../mod/group.php:168 ../../mod/admin.php:665 -#: ../../include/conversation.php:328 ../../include/conversation.php:609 -msgid "Delete" +#: ../../include/profile_selectors.php:6 +msgid "Transgender" msgstr "" -#: ../../mod/photos.php:1537 -msgid "View Album" +#: ../../include/profile_selectors.php:6 +msgid "Intersex" msgstr "" -#: ../../mod/photos.php:1546 -msgid "Recent Photos" +#: ../../include/profile_selectors.php:6 +msgid "Transsexual" msgstr "" -#: ../../mod/community.php:21 -msgid "Not available." +#: ../../include/profile_selectors.php:6 +msgid "Hermaphrodite" msgstr "" -#: ../../mod/community.php:30 ../../view/theme/diabook/theme.php:133 -#: ../../include/nav.php:101 -msgid "Community" +#: ../../include/profile_selectors.php:6 +msgid "Neuter" msgstr "" -#: ../../mod/community.php:61 ../../mod/search.php:144 -msgid "No results." +#: ../../include/profile_selectors.php:6 +msgid "Non-specific" msgstr "" -#: ../../mod/friendica.php:55 -msgid "This is Friendica, version" +#: ../../include/profile_selectors.php:6 +msgid "Other" msgstr "" -#: ../../mod/friendica.php:56 -msgid "running at web location" +#: ../../include/profile_selectors.php:6 +msgid "Undecided" msgstr "" -#: ../../mod/friendica.php:58 -msgid "" -"Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn " -"more about the Friendica project." +#: ../../include/profile_selectors.php:23 +msgid "Males" msgstr "" -#: ../../mod/friendica.php:60 -msgid "Bug reports and issues: please visit" +#: ../../include/profile_selectors.php:23 +msgid "Females" msgstr "" -#: ../../mod/friendica.php:61 -msgid "" -"Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - " -"dot com" +#: ../../include/profile_selectors.php:23 +msgid "Gay" msgstr "" -#: ../../mod/friendica.php:75 -msgid "Installed plugins/addons/apps:" +#: ../../include/profile_selectors.php:23 +msgid "Lesbian" msgstr "" -#: ../../mod/friendica.php:88 -msgid "No installed plugins/addons/apps" +#: ../../include/profile_selectors.php:23 +msgid "No Preference" msgstr "" -#: ../../mod/editpost.php:17 ../../mod/editpost.php:27 -msgid "Item not found" +#: ../../include/profile_selectors.php:23 +msgid "Bisexual" msgstr "" -#: ../../mod/editpost.php:36 -msgid "Edit post" +#: ../../include/profile_selectors.php:23 +msgid "Autosexual" msgstr "" -#: ../../mod/editpost.php:80 ../../include/conversation.php:979 -msgid "Post to Email" +#: ../../include/profile_selectors.php:23 +msgid "Abstinent" msgstr "" -#: ../../mod/editpost.php:95 ../../mod/content.php:707 -#: ../../mod/settings.php:617 ../../include/conversation.php:596 -msgid "Edit" +#: ../../include/profile_selectors.php:23 +msgid "Virgin" msgstr "" -#: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143 -#: ../../mod/message.php:213 ../../mod/message.php:410 -#: ../../include/conversation.php:994 -msgid "Upload photo" +#: ../../include/profile_selectors.php:23 +msgid "Deviant" msgstr "" -#: ../../mod/editpost.php:97 ../../include/conversation.php:996 -msgid "Attach file" +#: ../../include/profile_selectors.php:23 +msgid "Fetish" msgstr "" -#: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144 -#: ../../mod/message.php:214 ../../mod/message.php:411 -#: ../../include/conversation.php:998 -msgid "Insert web link" +#: ../../include/profile_selectors.php:23 +msgid "Oodles" msgstr "" -#: ../../mod/editpost.php:99 -msgid "Insert YouTube video" +#: ../../include/profile_selectors.php:23 +msgid "Nonsexual" msgstr "" -#: ../../mod/editpost.php:100 -msgid "Insert Vorbis [.ogg] video" +#: ../../include/profile_selectors.php:42 +msgid "Single" msgstr "" -#: ../../mod/editpost.php:101 -msgid "Insert Vorbis [.ogg] audio" +#: ../../include/profile_selectors.php:42 +msgid "Lonely" msgstr "" -#: ../../mod/editpost.php:102 ../../include/conversation.php:1004 -msgid "Set your location" +#: ../../include/profile_selectors.php:42 +msgid "Available" msgstr "" -#: ../../mod/editpost.php:103 ../../include/conversation.php:1006 -msgid "Clear browser location" +#: ../../include/profile_selectors.php:42 +msgid "Unavailable" msgstr "" -#: ../../mod/editpost.php:105 ../../include/conversation.php:1013 -msgid "Permission settings" +#: ../../include/profile_selectors.php:42 +msgid "Has crush" msgstr "" -#: ../../mod/editpost.php:113 ../../include/conversation.php:1022 -msgid "CC: email addresses" +#: ../../include/profile_selectors.php:42 +msgid "Infatuated" msgstr "" -#: ../../mod/editpost.php:114 ../../include/conversation.php:1023 -msgid "Public post" +#: ../../include/profile_selectors.php:42 +msgid "Dating" msgstr "" -#: ../../mod/editpost.php:117 ../../include/conversation.php:1009 -msgid "Set title" +#: ../../include/profile_selectors.php:42 +msgid "Unfaithful" msgstr "" -#: ../../mod/editpost.php:119 ../../include/conversation.php:1011 -msgid "Categories (comma-separated list)" +#: ../../include/profile_selectors.php:42 +msgid "Sex Addict" msgstr "" -#: ../../mod/editpost.php:120 ../../include/conversation.php:1025 -msgid "Example: bob@example.com, mary@example.com" +#: ../../include/profile_selectors.php:42 ../../include/identity.php:208 +#: ../../mod/connections.php:337 ../../mod/network.php:377 +msgid "Friends" msgstr "" -#: ../../mod/editpost.php:135 ../../include/conversation.php:1166 -msgid "Friendica mobile web" +#: ../../include/profile_selectors.php:42 +msgid "Friends/Benefits" msgstr "" -#: ../../mod/dfrn_request.php:93 -msgid "This introduction has already been accepted." +#: ../../include/profile_selectors.php:42 +msgid "Casual" msgstr "" -#: ../../mod/dfrn_request.php:118 ../../mod/dfrn_request.php:512 -msgid "Profile location is not valid or does not contain profile information." +#: ../../include/profile_selectors.php:42 +msgid "Engaged" msgstr "" -#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:517 -msgid "Warning: profile location has no identifiable owner name." +#: ../../include/profile_selectors.php:42 +msgid "Married" msgstr "" -#: ../../mod/dfrn_request.php:125 ../../mod/dfrn_request.php:519 -msgid "Warning: profile location has no profile photo." +#: ../../include/profile_selectors.php:42 +msgid "Imaginarily married" msgstr "" -#: ../../mod/dfrn_request.php:128 ../../mod/dfrn_request.php:522 -#, php-format -msgid "%d required parameter was not found at the given location" -msgid_plural "%d required parameters were not found at the given location" -msgstr[0] "" -msgstr[1] "" - -#: ../../mod/dfrn_request.php:170 -msgid "Introduction complete." +#: ../../include/profile_selectors.php:42 +msgid "Partners" msgstr "" -#: ../../mod/dfrn_request.php:209 -msgid "Unrecoverable protocol error." +#: ../../include/profile_selectors.php:42 +msgid "Cohabiting" msgstr "" -#: ../../mod/dfrn_request.php:237 -msgid "Profile unavailable." +#: ../../include/profile_selectors.php:42 +msgid "Common law" msgstr "" -#: ../../mod/dfrn_request.php:262 -#, php-format -msgid "%s has received too many connection requests today." +#: ../../include/profile_selectors.php:42 +msgid "Happy" msgstr "" -#: ../../mod/dfrn_request.php:263 -msgid "Spam protection measures have been invoked." +#: ../../include/profile_selectors.php:42 +msgid "Not looking" msgstr "" -#: ../../mod/dfrn_request.php:264 -msgid "Friends are advised to please try again in 24 hours." +#: ../../include/profile_selectors.php:42 +msgid "Swinger" msgstr "" -#: ../../mod/dfrn_request.php:326 -msgid "Invalid locator" +#: ../../include/profile_selectors.php:42 +msgid "Betrayed" msgstr "" -#: ../../mod/dfrn_request.php:335 -msgid "Invalid email address." +#: ../../include/profile_selectors.php:42 +msgid "Separated" msgstr "" -#: ../../mod/dfrn_request.php:361 -msgid "This account has not been configured for email. Request failed." +#: ../../include/profile_selectors.php:42 +msgid "Unstable" msgstr "" -#: ../../mod/dfrn_request.php:457 -msgid "Unable to resolve your name at the provided location." +#: ../../include/profile_selectors.php:42 +msgid "Divorced" msgstr "" -#: ../../mod/dfrn_request.php:470 -msgid "You have already introduced yourself here." +#: ../../include/profile_selectors.php:42 +msgid "Imaginarily divorced" msgstr "" -#: ../../mod/dfrn_request.php:474 -#, php-format -msgid "Apparently you are already friends with %s." +#: ../../include/profile_selectors.php:42 +msgid "Widowed" msgstr "" -#: ../../mod/dfrn_request.php:495 -msgid "Invalid profile URL." +#: ../../include/profile_selectors.php:42 +msgid "Uncertain" msgstr "" -#: ../../mod/dfrn_request.php:501 ../../include/follow.php:27 -msgid "Disallowed profile URL." +#: ../../include/profile_selectors.php:42 +msgid "It's complicated" msgstr "" -#: ../../mod/dfrn_request.php:570 ../../mod/contacts.php:122 -msgid "Failed to update contact record." +#: ../../include/profile_selectors.php:42 +msgid "Don't care" msgstr "" -#: ../../mod/dfrn_request.php:591 -msgid "Your introduction has been sent." +#: ../../include/profile_selectors.php:42 +msgid "Ask me" msgstr "" -#: ../../mod/dfrn_request.php:644 -msgid "Please login to confirm introduction." +#: ../../include/acl_selectors.php:270 +msgid "Visible to everybody" msgstr "" -#: ../../mod/dfrn_request.php:658 -msgid "" -"Incorrect identity currently logged in. Please login to <strong>this</" -"strong> profile." +#: ../../include/acl_selectors.php:271 +msgid "show" msgstr "" -#: ../../mod/dfrn_request.php:669 -msgid "Hide this contact" +#: ../../include/acl_selectors.php:272 +msgid "don't show" msgstr "" -#: ../../mod/dfrn_request.php:672 -#, php-format -msgid "Welcome home %s." +#: ../../include/activities.php:37 +msgid " and " msgstr "" -#: ../../mod/dfrn_request.php:673 -#, php-format -msgid "Please confirm your introduction/connection request to %s." +#: ../../include/activities.php:45 +msgid "public profile" msgstr "" -#: ../../mod/dfrn_request.php:674 -msgid "Confirm" +#: ../../include/activities.php:48 +#, php-format +msgid "%1$s changed %2$s to “%3$s”" msgstr "" -#: ../../mod/dfrn_request.php:715 ../../include/items.php:2883 -msgid "[Name Withheld]" +#: ../../include/activities.php:49 +#, php-format +msgid "Visit %1$s's %2$s" msgstr "" -#: ../../mod/dfrn_request.php:808 -msgid "" -"Please enter your 'Identity Address' from one of the following supported " -"communications networks:" +#: ../../include/activities.php:52 +#, php-format +msgid "%1$s has an updated %2$s, changing %3$s." msgstr "" -#: ../../mod/dfrn_request.php:824 -msgid "<strike>Connect as an email follower</strike> (Coming soon)" +#: ../../include/api.php:915 +msgid "Public Timeline" msgstr "" -#: ../../mod/dfrn_request.php:826 -msgid "" -"If you are not yet a member of the free social web, <a href=\"http://dir." -"friendica.com/siteinfo\">follow this link to find a public Friendica site " -"and join us today</a>." +#: ../../include/attach.php:184 ../../include/attach.php:232 +msgid "Item was not found." msgstr "" -#: ../../mod/dfrn_request.php:829 -msgid "Friend/Connection Request" +#: ../../include/attach.php:285 +msgid "No source file." msgstr "" -#: ../../mod/dfrn_request.php:830 -msgid "" -"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, " -"testuser@identi.ca" +#: ../../include/attach.php:302 +msgid "Cannot locate file to replace" msgstr "" -#: ../../mod/dfrn_request.php:831 -msgid "Please answer the following:" +#: ../../include/attach.php:320 +msgid "Cannot locate file to revise/update" msgstr "" -#: ../../mod/dfrn_request.php:832 +#: ../../include/attach.php:331 #, php-format -msgid "Does %s know you?" +msgid "File exceeds size limit of %d" msgstr "" -#: ../../mod/dfrn_request.php:835 -msgid "Add a personal note:" +#: ../../include/attach.php:424 +msgid "File upload failed. Possible system limit or action terminated." msgstr "" -#: ../../mod/dfrn_request.php:837 ../../include/contact_selectors.php:76 -msgid "Friendica" +#: ../../include/attach.php:436 +msgid "Stored file could not be verified. Upload failed." msgstr "" -#: ../../mod/dfrn_request.php:838 -msgid "StatusNet/Federated Social Web" +#: ../../include/attach.php:480 ../../include/attach.php:497 +msgid "Path not available." msgstr "" -#: ../../mod/dfrn_request.php:839 ../../mod/settings.php:652 -#: ../../include/contact_selectors.php:80 -msgid "Diaspora" +#: ../../include/auth.php:65 +msgid "Logged out." msgstr "" -#: ../../mod/dfrn_request.php:840 -#, php-format -msgid "" -" - please do not use this form. Instead, enter %s into your Diaspora search " -"bar." +#: ../../include/auth.php:162 +msgid "Failed authentication" msgstr "" -#: ../../mod/dfrn_request.php:841 -msgid "Your Identity Address:" +#: ../../include/auth.php:171 +msgid "Login failed." msgstr "" -#: ../../mod/dfrn_request.php:844 -msgid "Submit Request" +#: ../../include/bb2diaspora.php:433 ../../include/event.php:11 +msgid "l F d, Y \\@ g:i A" msgstr "" -#: ../../mod/install.php:117 -msgid "Friendica Social Communications Server - Setup" +#: ../../include/bb2diaspora.php:439 ../../include/event.php:20 +msgid "Starts:" msgstr "" -#: ../../mod/install.php:123 -msgid "Could not connect to database." +#: ../../include/bb2diaspora.php:447 ../../include/event.php:30 +msgid "Finishes:" msgstr "" -#: ../../mod/install.php:127 -msgid "Could not create table." +#: ../../include/bb2diaspora.php:455 ../../include/event.php:40 +#: ../../mod/directory.php:116 ../../mod/events.php:447 ../../boot.php:1544 +msgid "Location:" msgstr "" -#: ../../mod/install.php:133 -msgid "Your Friendica site database has been installed." +#: ../../include/bbcode.php:94 ../../include/bbcode.php:403 +msgid "Image/photo" msgstr "" -#: ../../mod/install.php:138 +#: ../../include/bbcode.php:157 +#, php-format msgid "" -"You may need to import the file \"database.sql\" manually using phpmyadmin " -"or mysql." -msgstr "" - -#: ../../mod/install.php:139 ../../mod/install.php:204 -#: ../../mod/install.php:489 -msgid "Please see the file \"INSTALL.txt\"." -msgstr "" - -#: ../../mod/install.php:201 -msgid "System check" +"<span><a href=\"%s\" target=\"external-link\">%s</a> wrote the following <a " +"href=\"%s\" target=\"external-link\">post</a>" msgstr "" -#: ../../mod/install.php:206 -msgid "Check again" -msgstr "" - -#: ../../mod/install.php:225 -msgid "Database connection" +#: ../../include/bbcode.php:368 ../../include/bbcode.php:388 +msgid "$1 wrote:" msgstr "" -#: ../../mod/install.php:226 -msgid "" -"In order to install Friendica we need to know how to connect to your " -"database." +#: ../../include/bbcode.php:407 ../../include/bbcode.php:408 +msgid "Encrypted content" msgstr "" -#: ../../mod/install.php:227 -msgid "" -"Please contact your hosting provider or site administrator if you have " -"questions about these settings." +#: ../../include/contact_selectors.php:32 +msgid "Unknown | Not categorised" msgstr "" -#: ../../mod/install.php:228 -msgid "" -"The database you specify below should already exist. If it does not, please " -"create it before continuing." +#: ../../include/contact_selectors.php:33 +msgid "Block immediately" msgstr "" -#: ../../mod/install.php:232 -msgid "Database Server Name" +#: ../../include/contact_selectors.php:34 +msgid "Shady, spammer, self-marketer" msgstr "" -#: ../../mod/install.php:233 -msgid "Database Login Name" +#: ../../include/contact_selectors.php:35 +msgid "Known to me, but no opinion" msgstr "" -#: ../../mod/install.php:234 -msgid "Database Login Password" +#: ../../include/contact_selectors.php:36 +msgid "OK, probably harmless" msgstr "" -#: ../../mod/install.php:235 -msgid "Database Name" +#: ../../include/contact_selectors.php:37 +msgid "Reputable, has my trust" msgstr "" -#: ../../mod/install.php:236 ../../mod/install.php:275 -msgid "Site administrator email address" +#: ../../include/contact_selectors.php:56 +msgid "Frequently" msgstr "" -#: ../../mod/install.php:236 ../../mod/install.php:275 -msgid "" -"Your account email address must match this in order to use the web admin " -"panel." +#: ../../include/contact_selectors.php:57 +msgid "Hourly" msgstr "" -#: ../../mod/install.php:240 ../../mod/install.php:278 -msgid "Please select a default timezone for your website" +#: ../../include/contact_selectors.php:58 +msgid "Twice daily" msgstr "" -#: ../../mod/install.php:265 -msgid "Site settings" +#: ../../include/contact_selectors.php:59 +msgid "Daily" msgstr "" -#: ../../mod/install.php:318 -msgid "Could not find a command line version of PHP in the web server PATH." +#: ../../include/contact_selectors.php:60 +msgid "Weekly" msgstr "" -#: ../../mod/install.php:319 -msgid "" -"If you don't have a command line version of PHP installed on server, you " -"will not be able to run background polling via cron. See <a href='http://" -"friendica.com/node/27'>'Activating scheduled tasks'</a>" +#: ../../include/contact_selectors.php:61 +msgid "Monthly" msgstr "" -#: ../../mod/install.php:323 -msgid "PHP executable path" +#: ../../include/contact_selectors.php:76 +msgid "Friendica" msgstr "" -#: ../../mod/install.php:323 -msgid "" -"Enter full path to php executable. You can leave this blank to continue the " -"installation." +#: ../../include/contact_selectors.php:77 +msgid "OStatus" msgstr "" -#: ../../mod/install.php:328 -msgid "Command line PHP" +#: ../../include/contact_selectors.php:78 +msgid "RSS/Atom" msgstr "" -#: ../../mod/install.php:337 -msgid "" -"The command line version of PHP on your system does not have " -"\"register_argc_argv\" enabled." +#: ../../include/contact_selectors.php:79 ../../mod/admin.php:611 +#: ../../mod/admin.php:620 ../../boot.php:1235 +msgid "Email" msgstr "" -#: ../../mod/install.php:338 -msgid "This is required for message delivery to work." +#: ../../include/contact_selectors.php:80 +msgid "Diaspora" msgstr "" -#: ../../mod/install.php:340 -msgid "PHP register_argc_argv" +#: ../../include/contact_selectors.php:81 +msgid "Facebook" msgstr "" -#: ../../mod/install.php:361 -msgid "" -"Error: the \"openssl_pkey_new\" function on this system is not able to " -"generate encryption keys" +#: ../../include/contact_selectors.php:82 +msgid "Zot!" msgstr "" -#: ../../mod/install.php:362 -msgid "" -"If running under Windows, please see \"http://www.php.net/manual/en/openssl." -"installation.php\"." +#: ../../include/contact_selectors.php:83 +msgid "LinkedIn" msgstr "" -#: ../../mod/install.php:364 -msgid "Generate encryption keys" +#: ../../include/contact_selectors.php:84 +msgid "XMPP/IM" msgstr "" -#: ../../mod/install.php:371 -msgid "libCurl PHP module" +#: ../../include/contact_selectors.php:85 +msgid "MySpace" msgstr "" -#: ../../mod/install.php:372 -msgid "GD graphics PHP module" +#: ../../include/contact_widgets.php:6 +msgid "Add New Connection" msgstr "" -#: ../../mod/install.php:373 -msgid "OpenSSL PHP module" +#: ../../include/contact_widgets.php:7 +msgid "Enter the channel address" msgstr "" -#: ../../mod/install.php:374 -msgid "mysqli PHP module" +#: ../../include/contact_widgets.php:8 +msgid "Example: bob@example.com, http://example.com/barbara" msgstr "" -#: ../../mod/install.php:375 -msgid "mb_string PHP module" -msgstr "" +#: ../../include/contact_widgets.php:23 +#, php-format +msgid "%d invitation available" +msgid_plural "%d invitations available" +msgstr[0] "" +msgstr[1] "" -#: ../../mod/install.php:380 ../../mod/install.php:382 -msgid "Apache mod_rewrite module" +#: ../../include/contact_widgets.php:29 +msgid "Find Channels" msgstr "" -#: ../../mod/install.php:380 -msgid "" -"Error: Apache webserver mod-rewrite module is required but not installed." +#: ../../include/contact_widgets.php:30 +msgid "Enter name or interest" msgstr "" -#: ../../mod/install.php:388 -msgid "Error: libCURL PHP module required but not installed." +#: ../../include/contact_widgets.php:31 +msgid "Connect/Follow" msgstr "" -#: ../../mod/install.php:392 -msgid "" -"Error: GD graphics PHP module with JPEG support required but not installed." +#: ../../include/contact_widgets.php:32 +msgid "Examples: Robert Morgenstein, Fishing" msgstr "" -#: ../../mod/install.php:396 -msgid "Error: openssl PHP module required but not installed." +#: ../../include/contact_widgets.php:33 ../../mod/connections.php:616 +#: ../../mod/directory.php:160 ../../mod/directory.php:165 +msgid "Find" msgstr "" -#: ../../mod/install.php:400 -msgid "Error: mysqli PHP module required but not installed." +#: ../../include/contact_widgets.php:34 ../../mod/suggest.php:64 +msgid "Channel Suggestions" msgstr "" -#: ../../mod/install.php:404 -msgid "Error: mb_string PHP module required but not installed." +#: ../../include/contact_widgets.php:35 +msgid "Similar Interests" msgstr "" -#: ../../mod/install.php:421 -msgid "" -"The web installer needs to be able to create a file called \".htconfig.php\" " -"in the top folder of your web server and it is unable to do so." +#: ../../include/contact_widgets.php:36 +msgid "Random Profile" msgstr "" -#: ../../mod/install.php:422 -msgid "" -"This is most often a permission setting, as the web server may not be able " -"to write files in your folder - even if you can." +#: ../../include/contact_widgets.php:37 +msgid "Invite Friends" msgstr "" -#: ../../mod/install.php:423 -msgid "" -"At the end of this procedure, we will give you a text to save in a file " -"named .htconfig.php in your Friendica top folder." +#: ../../include/contact_widgets.php:61 ../../include/features.php:55 +msgid "Saved Folders" msgstr "" -#: ../../mod/install.php:424 -msgid "" -"You can alternatively skip this procedure and perform a manual installation. " -"Please see the file \"INSTALL.txt\" for instructions." +#: ../../include/contact_widgets.php:64 ../../include/contact_widgets.php:91 +msgid "Everything" msgstr "" -#: ../../mod/install.php:427 -msgid ".htconfig.php is writable" +#: ../../include/contact_widgets.php:88 +msgid "Categories" msgstr "" -#: ../../mod/install.php:439 -msgid "" -"Url rewrite in .htaccess is not working. Check your server configuration." -msgstr "" +#: ../../include/contact_widgets.php:121 +#, php-format +msgid "%d connection in common" +msgid_plural "%d connections in common" +msgstr[0] "" +msgstr[1] "" -#: ../../mod/install.php:441 -msgid "Url rewrite is working" +#: ../../include/conversation.php:122 ../../include/text.php:1337 +#: ../../mod/subthread.php:89 ../../mod/tagger.php:62 ../../mod/like.php:102 +msgid "photo" msgstr "" -#: ../../mod/install.php:451 -msgid "" -"The database configuration file \".htconfig.php\" could not be written. " -"Please use the enclosed text to create a configuration file in your web " -"server root." +#: ../../include/conversation.php:125 ../../include/text.php:1335 +msgid "event" msgstr "" -#: ../../mod/install.php:476 -msgid "Errors encountered creating database tables." +#: ../../include/conversation.php:133 ../../mod/subthread.php:89 +#: ../../mod/tagger.php:62 ../../mod/like.php:102 +msgid "status" msgstr "" -#: ../../mod/install.php:487 -msgid "<h1>What next</h1>" +#: ../../include/conversation.php:140 ../../mod/like.php:128 +#, php-format +msgid "%1$s likes %2$s's %3$s" msgstr "" -#: ../../mod/install.php:488 -msgid "" -"IMPORTANT: You will need to [manually] setup a scheduled task for the poller." +#: ../../include/conversation.php:143 ../../mod/like.php:130 +#, php-format +msgid "%1$s doesn't like %2$s's %3$s" msgstr "" -#: ../../mod/localtime.php:12 ../../include/event.php:11 -#: ../../include/bb2diaspora.php:387 -msgid "l F d, Y \\@ g:i A" +#: ../../include/conversation.php:174 +#, php-format +msgid "%1$s is now connected with %2$s" msgstr "" -#: ../../mod/localtime.php:24 -msgid "Time Conversion" +#: ../../include/conversation.php:205 +#, php-format +msgid "%1$s poked %2$s" msgstr "" -#: ../../mod/localtime.php:26 -msgid "" -"Friendika provides this service for sharing events with other networks and " -"friends in unknown timezones." +#: ../../include/conversation.php:209 ../../include/text.php:729 +msgid "poked" msgstr "" -#: ../../mod/localtime.php:30 +#: ../../include/conversation.php:227 ../../mod/mood.php:63 #, php-format -msgid "UTC time: %s" +msgid "%1$s is currently %2$s" msgstr "" -#: ../../mod/localtime.php:33 +#: ../../include/conversation.php:598 #, php-format -msgid "Current timezone: %s" +msgid "View %s's profile @ %s" msgstr "" -#: ../../mod/localtime.php:36 -#, php-format -msgid "Converted localtime: %s" +#: ../../include/conversation.php:610 ../../include/text.php:1025 +msgid "Categories:" msgstr "" -#: ../../mod/localtime.php:41 -msgid "Please select your timezone:" +#: ../../include/conversation.php:611 ../../include/text.php:1040 +msgid "Filed under:" msgstr "" -#: ../../mod/match.php:12 -msgid "Profile Match" +#: ../../include/conversation.php:620 +#, php-format +msgid " from %s" msgstr "" -#: ../../mod/match.php:20 -msgid "No keywords to match. Please add keywords to your default profile." +#: ../../include/conversation.php:637 +msgid "View in context" msgstr "" -#: ../../mod/match.php:57 -msgid "is interested in:" +#: ../../include/conversation.php:734 ../../include/text.php:1022 +#: ../../include/text.php:1037 +msgid "remove" msgstr "" -#: ../../mod/match.php:58 ../../mod/suggest.php:59 -#: ../../include/contact_widgets.php:9 ../../boot.php:1116 -msgid "Connect" +#: ../../include/conversation.php:738 +msgid "Loading..." msgstr "" -#: ../../mod/match.php:65 ../../mod/dirfind.php:60 -msgid "No matches" +#: ../../include/conversation.php:739 +msgid "Delete Selected Items" msgstr "" -#: ../../mod/lockview.php:39 -msgid "Remote privacy information not available." +#: ../../include/conversation.php:827 +msgid "Follow Thread" msgstr "" -#: ../../mod/lockview.php:43 -msgid "Visible to:" +#: ../../include/conversation.php:896 +#, php-format +msgid "%s likes this." msgstr "" -#: ../../mod/content.php:119 ../../mod/network.php:436 -msgid "No such group" +#: ../../include/conversation.php:896 +#, php-format +msgid "%s doesn't like this." msgstr "" -#: ../../mod/content.php:130 ../../mod/network.php:447 -msgid "Group is empty" +#: ../../include/conversation.php:900 +#, php-format +msgid "<span %1$s>%2$d people</span> like this." msgstr "" -#: ../../mod/content.php:134 ../../mod/network.php:451 -msgid "Group: " +#: ../../include/conversation.php:902 +#, php-format +msgid "<span %1$s>%2$d people</span> don't like this." msgstr "" -#: ../../mod/content.php:438 ../../mod/content.php:719 -#: ../../include/conversation.php:327 ../../include/conversation.php:608 -msgid "Select" +#: ../../include/conversation.php:908 +msgid "and" msgstr "" -#: ../../mod/content.php:455 ../../mod/content.php:812 -#: ../../mod/content.php:813 ../../include/conversation.php:344 -#: ../../include/conversation.php:701 ../../include/conversation.php:702 +#: ../../include/conversation.php:911 #, php-format -msgid "View %s's profile @ %s" +msgid ", and %d other people" msgstr "" -#: ../../mod/content.php:465 ../../mod/content.php:824 -#: ../../include/conversation.php:354 ../../include/conversation.php:713 +#: ../../include/conversation.php:912 #, php-format -msgid "%s from %s" -msgstr "" - -#: ../../mod/content.php:480 ../../include/conversation.php:369 -msgid "View in context" +msgid "%s like this." msgstr "" -#: ../../mod/content.php:586 ../../include/conversation.php:475 +#: ../../include/conversation.php:912 #, php-format -msgid "%d comment" -msgid_plural "%d comments" -msgstr[0] "" -msgstr[1] "" - -#: ../../mod/content.php:587 ../../addon/page/page.php:76 -#: ../../addon/page/page.php:110 ../../addon/showmore/showmore.php:87 -#: ../../include/contact_widgets.php:188 ../../include/conversation.php:476 -#: ../../boot.php:565 -msgid "show more" -msgstr "" - -#: ../../mod/content.php:665 ../../include/conversation.php:554 -msgid "like" +msgid "%s don't like this." msgstr "" -#: ../../mod/content.php:666 ../../include/conversation.php:555 -msgid "dislike" +#: ../../include/conversation.php:937 +msgid "Visible to <strong>everybody</strong>" msgstr "" -#: ../../mod/content.php:668 ../../include/conversation.php:557 -msgid "Share this" +#: ../../include/conversation.php:938 ../../mod/message.php:244 +#: ../../mod/message.php:355 +msgid "Please enter a link URL:" msgstr "" -#: ../../mod/content.php:668 ../../include/conversation.php:557 -msgid "share" +#: ../../include/conversation.php:939 +msgid "Please enter a video link/URL:" msgstr "" -#: ../../mod/content.php:692 ../../include/conversation.php:581 -msgid "Bold" +#: ../../include/conversation.php:940 +msgid "Please enter an audio link/URL:" msgstr "" -#: ../../mod/content.php:693 ../../include/conversation.php:582 -msgid "Italic" +#: ../../include/conversation.php:941 +msgid "Tag term:" msgstr "" -#: ../../mod/content.php:694 ../../include/conversation.php:583 -msgid "Underline" +#: ../../include/conversation.php:942 ../../mod/filer.php:35 +msgid "Save to Folder:" msgstr "" -#: ../../mod/content.php:695 ../../include/conversation.php:584 -msgid "Quote" +#: ../../include/conversation.php:943 +msgid "Where are you right now?" msgstr "" -#: ../../mod/content.php:696 ../../include/conversation.php:585 -msgid "Code" +#: ../../include/conversation.php:958 ../../mod/photos.php:1112 +msgid "Share" msgstr "" -#: ../../mod/content.php:697 ../../include/conversation.php:586 -msgid "Image" +#: ../../include/conversation.php:960 +msgid "Page link title" msgstr "" -#: ../../mod/content.php:698 ../../include/conversation.php:587 -msgid "Link" +#: ../../include/conversation.php:962 ../../mod/editpost.php:66 +#: ../../mod/message.php:286 ../../mod/message.php:418 +msgid "Upload photo" msgstr "" -#: ../../mod/content.php:699 ../../include/conversation.php:588 -msgid "Video" +#: ../../include/conversation.php:963 +msgid "upload photo" msgstr "" -#: ../../mod/content.php:732 ../../include/conversation.php:621 -msgid "add star" +#: ../../include/conversation.php:964 ../../mod/editpost.php:67 +msgid "Attach file" msgstr "" -#: ../../mod/content.php:733 ../../include/conversation.php:622 -msgid "remove star" +#: ../../include/conversation.php:965 +msgid "attach file" msgstr "" -#: ../../mod/content.php:734 ../../include/conversation.php:623 -msgid "toggle star status" +#: ../../include/conversation.php:966 ../../mod/editpost.php:68 +#: ../../mod/message.php:287 ../../mod/message.php:419 +msgid "Insert web link" msgstr "" -#: ../../mod/content.php:737 ../../include/conversation.php:626 -msgid "starred" +#: ../../include/conversation.php:967 +msgid "web link" msgstr "" -#: ../../mod/content.php:738 ../../include/conversation.php:627 -msgid "add tag" +#: ../../include/conversation.php:968 +msgid "Insert video link" msgstr "" -#: ../../mod/content.php:742 ../../include/conversation.php:631 -msgid "save to folder" +#: ../../include/conversation.php:969 +msgid "video link" msgstr "" -#: ../../mod/content.php:814 ../../include/conversation.php:703 -msgid "to" +#: ../../include/conversation.php:970 +msgid "Insert audio link" msgstr "" -#: ../../mod/content.php:815 ../../include/conversation.php:704 -msgid "Wall-to-Wall" +#: ../../include/conversation.php:971 +msgid "audio link" msgstr "" -#: ../../mod/content.php:816 ../../include/conversation.php:705 -msgid "via Wall-To-Wall:" +#: ../../include/conversation.php:972 ../../mod/editpost.php:72 +msgid "Set your location" msgstr "" -#: ../../mod/home.php:26 ../../addon/communityhome/communityhome.php:179 -#, php-format -msgid "Welcome to %s" +#: ../../include/conversation.php:973 +msgid "set location" msgstr "" -#: ../../mod/notifications.php:26 -msgid "Invalid request identifier." +#: ../../include/conversation.php:974 ../../mod/editpost.php:73 +msgid "Clear browser location" msgstr "" -#: ../../mod/notifications.php:35 ../../mod/notifications.php:161 -#: ../../mod/notifications.php:207 -msgid "Discard" +#: ../../include/conversation.php:975 +msgid "clear location" msgstr "" -#: ../../mod/notifications.php:51 ../../mod/notifications.php:160 -#: ../../mod/notifications.php:206 ../../mod/contacts.php:316 -#: ../../mod/contacts.php:370 -msgid "Ignore" +#: ../../include/conversation.php:977 ../../mod/editpost.php:86 +msgid "Set title" msgstr "" -#: ../../mod/notifications.php:75 -msgid "System" +#: ../../include/conversation.php:980 ../../mod/editpost.php:88 +msgid "Categories (comma-separated list)" msgstr "" -#: ../../mod/notifications.php:80 ../../include/nav.php:113 -msgid "Network" +#: ../../include/conversation.php:982 ../../mod/editpost.php:75 +msgid "Permission settings" msgstr "" -#: ../../mod/notifications.php:85 ../../mod/network.php:300 -msgid "Personal" +#: ../../include/conversation.php:983 +msgid "permissions" msgstr "" -#: ../../mod/notifications.php:90 ../../view/theme/diabook/theme.php:127 -#: ../../include/nav.php:77 ../../include/nav.php:115 -msgid "Home" +#: ../../include/conversation.php:991 ../../mod/editpost.php:83 +msgid "Public post" msgstr "" -#: ../../mod/notifications.php:95 ../../include/nav.php:121 -msgid "Introductions" +#: ../../include/conversation.php:993 ../../mod/editpost.php:89 +msgid "Example: bob@example.com, mary@example.com" msgstr "" -#: ../../mod/notifications.php:100 ../../mod/message.php:105 -#: ../../include/nav.php:128 -msgid "Messages" +#: ../../include/datetime.php:43 ../../include/datetime.php:45 +msgid "Miscellaneous" msgstr "" -#: ../../mod/notifications.php:119 -msgid "Show Ignored Requests" +#: ../../include/datetime.php:152 ../../include/datetime.php:284 +msgid "year" msgstr "" -#: ../../mod/notifications.php:119 -msgid "Hide Ignored Requests" +#: ../../include/datetime.php:157 ../../include/datetime.php:285 +msgid "month" msgstr "" -#: ../../mod/notifications.php:145 ../../mod/notifications.php:191 -msgid "Notification type: " +#: ../../include/datetime.php:162 ../../include/datetime.php:287 +msgid "day" msgstr "" -#: ../../mod/notifications.php:146 -msgid "Friend Suggestion" +#: ../../include/datetime.php:275 +msgid "never" msgstr "" -#: ../../mod/notifications.php:148 -#, php-format -msgid "suggested by %s" +#: ../../include/datetime.php:281 +msgid "less than a second ago" msgstr "" -#: ../../mod/notifications.php:153 ../../mod/notifications.php:200 -#: ../../mod/contacts.php:376 -msgid "Hide this contact from others" +#: ../../include/datetime.php:284 +msgid "years" msgstr "" -#: ../../mod/notifications.php:154 ../../mod/notifications.php:201 -msgid "Post a new friend activity" +#: ../../include/datetime.php:285 +msgid "months" msgstr "" -#: ../../mod/notifications.php:154 ../../mod/notifications.php:201 -msgid "if applicable" +#: ../../include/datetime.php:286 +msgid "week" msgstr "" -#: ../../mod/notifications.php:157 ../../mod/notifications.php:204 -#: ../../mod/admin.php:663 -msgid "Approve" +#: ../../include/datetime.php:286 +msgid "weeks" msgstr "" -#: ../../mod/notifications.php:177 -msgid "Claims to be known to you: " +#: ../../include/datetime.php:287 +msgid "days" msgstr "" -#: ../../mod/notifications.php:177 -msgid "yes" +#: ../../include/datetime.php:288 +msgid "hour" msgstr "" -#: ../../mod/notifications.php:177 -msgid "no" +#: ../../include/datetime.php:288 +msgid "hours" msgstr "" -#: ../../mod/notifications.php:184 -msgid "Approve as: " +#: ../../include/datetime.php:289 +msgid "minute" msgstr "" -#: ../../mod/notifications.php:185 -msgid "Friend" +#: ../../include/datetime.php:289 +msgid "minutes" msgstr "" -#: ../../mod/notifications.php:186 -msgid "Sharer" +#: ../../include/datetime.php:290 +msgid "second" msgstr "" -#: ../../mod/notifications.php:186 -msgid "Fan/Admirer" +#: ../../include/datetime.php:290 +msgid "seconds" msgstr "" -#: ../../mod/notifications.php:192 -msgid "Friend/Connect Request" +#: ../../include/datetime.php:299 +#, php-format +msgid "%1$d %2$s ago" msgstr "" -#: ../../mod/notifications.php:192 -msgid "New Follower" +#: ../../include/dba.php:41 +#, php-format +msgid "Cannot locate DNS info for database server '%s'" msgstr "" -#: ../../mod/notifications.php:213 -msgid "No introductions." +#: ../../include/enotify.php:36 +msgid "Red Notification" msgstr "" -#: ../../mod/notifications.php:216 ../../include/nav.php:122 -msgid "Notifications" +#: ../../include/enotify.php:39 +msgid "Thank You," msgstr "" -#: ../../mod/notifications.php:253 ../../mod/notifications.php:378 -#: ../../mod/notifications.php:465 +#: ../../include/enotify.php:41 #, php-format -msgid "%s liked %s's post" +msgid "%s Administrator" msgstr "" -#: ../../mod/notifications.php:262 ../../mod/notifications.php:387 -#: ../../mod/notifications.php:474 +#: ../../include/enotify.php:62 #, php-format -msgid "%s disliked %s's post" +msgid "%s <!item_type!>" msgstr "" -#: ../../mod/notifications.php:276 ../../mod/notifications.php:401 -#: ../../mod/notifications.php:488 +#: ../../include/enotify.php:66 #, php-format -msgid "%s is now friends with %s" +msgid "[Red:Notify] New mail received at %s" msgstr "" -#: ../../mod/notifications.php:283 ../../mod/notifications.php:408 +#: ../../include/enotify.php:68 #, php-format -msgid "%s created a new post" +msgid "%1$s sent you a new private message at %2$s." msgstr "" -#: ../../mod/notifications.php:284 ../../mod/notifications.php:409 -#: ../../mod/notifications.php:497 +#: ../../include/enotify.php:69 #, php-format -msgid "%s commented on %s's post" -msgstr "" - -#: ../../mod/notifications.php:298 -msgid "No more network notifications." -msgstr "" - -#: ../../mod/notifications.php:302 -msgid "Network Notifications" -msgstr "" - -#: ../../mod/notifications.php:328 ../../mod/notify.php:61 -msgid "No more system notifications." -msgstr "" - -#: ../../mod/notifications.php:332 ../../mod/notify.php:65 -msgid "System Notifications" +msgid "%1$s sent you %2$s." msgstr "" -#: ../../mod/notifications.php:423 -msgid "No more personal notifications." +#: ../../include/enotify.php:69 +msgid "a private message" msgstr "" -#: ../../mod/notifications.php:427 -msgid "Personal Notifications" +#: ../../include/enotify.php:70 +#, php-format +msgid "Please visit %s to view and/or reply to your private messages." msgstr "" -#: ../../mod/notifications.php:504 -msgid "No more home notifications." +#: ../../include/enotify.php:114 +#, php-format +msgid "%1$s commented on [url=%2$s]a %3$s[/url]" msgstr "" -#: ../../mod/notifications.php:508 -msgid "Home Notifications" +#: ../../include/enotify.php:121 +#, php-format +msgid "%1$s commented on [url=%2$s]%3$s's %4$s[/url]" msgstr "" -#: ../../mod/contacts.php:83 ../../mod/contacts.php:163 -msgid "Could not access contact record." +#: ../../include/enotify.php:129 +#, php-format +msgid "%1$s commented on [url=%2$s]your %3$s[/url]" msgstr "" -#: ../../mod/contacts.php:97 -msgid "Could not locate selected profile." +#: ../../include/enotify.php:139 +#, php-format +msgid "[Red:Notify] Comment to conversation #%1$d by %2$s" msgstr "" -#: ../../mod/contacts.php:120 -msgid "Contact updated." +#: ../../include/enotify.php:140 +#, php-format +msgid "%s commented on an item/conversation you have been following." msgstr "" -#: ../../mod/contacts.php:185 -msgid "Contact has been blocked" +#: ../../include/enotify.php:143 ../../include/enotify.php:158 +#: ../../include/enotify.php:171 ../../include/enotify.php:189 +#: ../../include/enotify.php:202 +#, php-format +msgid "Please visit %s to view and/or reply to the conversation." msgstr "" -#: ../../mod/contacts.php:185 -msgid "Contact has been unblocked" +#: ../../include/enotify.php:150 +#, php-format +msgid "[Red:Notify] %s posted to your profile wall" msgstr "" -#: ../../mod/contacts.php:199 -msgid "Contact has been ignored" +#: ../../include/enotify.php:152 +#, php-format +msgid "%1$s posted to your profile wall at %2$s" msgstr "" -#: ../../mod/contacts.php:199 -msgid "Contact has been unignored" +#: ../../include/enotify.php:154 +#, php-format +msgid "%1$s posted to [url=%2$s]your wall[/url]" msgstr "" -#: ../../mod/contacts.php:215 -msgid "Contact has been archived" +#: ../../include/enotify.php:165 +#, php-format +msgid "[Red:Notify] %s tagged you" msgstr "" -#: ../../mod/contacts.php:215 -msgid "Contact has been unarchived" +#: ../../include/enotify.php:166 +#, php-format +msgid "%1$s tagged you at %2$s" msgstr "" -#: ../../mod/contacts.php:228 -msgid "Contact has been removed." +#: ../../include/enotify.php:167 +#, php-format +msgid "%1$s [url=%2$s]tagged you[/url]." msgstr "" -#: ../../mod/contacts.php:258 +#: ../../include/enotify.php:179 #, php-format -msgid "You are mutual friends with %s" +msgid "[Red:Notify] %1$s poked you" msgstr "" -#: ../../mod/contacts.php:262 +#: ../../include/enotify.php:180 #, php-format -msgid "You are sharing with %s" +msgid "%1$s poked you at %2$s" msgstr "" -#: ../../mod/contacts.php:267 +#: ../../include/enotify.php:181 #, php-format -msgid "%s is sharing with you" +msgid "%1$s [url=%2$s]poked you[/url]." msgstr "" -#: ../../mod/contacts.php:284 -msgid "Private communications are not available for this contact." +#: ../../include/enotify.php:196 +#, php-format +msgid "[Red:Notify] %s tagged your post" msgstr "" -#: ../../mod/contacts.php:287 -msgid "Never" +#: ../../include/enotify.php:197 +#, php-format +msgid "%1$s tagged your post at %2$s" msgstr "" -#: ../../mod/contacts.php:291 -msgid "(Update was successful)" +#: ../../include/enotify.php:198 +#, php-format +msgid "%1$s tagged [url=%2$s]your post[/url]" msgstr "" -#: ../../mod/contacts.php:291 -msgid "(Update was not successful)" +#: ../../include/enotify.php:209 +msgid "[Red:Notify] Introduction received" msgstr "" -#: ../../mod/contacts.php:293 -msgid "Suggest friends" +#: ../../include/enotify.php:210 +#, php-format +msgid "You've received an introduction from '%1$s' at %2$s" msgstr "" -#: ../../mod/contacts.php:297 +#: ../../include/enotify.php:211 #, php-format -msgid "Network type: %s" +msgid "You've received [url=%1$s]an introduction[/url] from %2$s." msgstr "" -#: ../../mod/contacts.php:300 ../../include/contact_widgets.php:183 +#: ../../include/enotify.php:214 ../../include/enotify.php:232 #, php-format -msgid "%d contact in common" -msgid_plural "%d contacts in common" -msgstr[0] "" -msgstr[1] "" - -#: ../../mod/contacts.php:305 -msgid "View all contacts" +msgid "You may visit their profile at %s" msgstr "" -#: ../../mod/contacts.php:310 ../../mod/contacts.php:369 -#: ../../mod/admin.php:667 -msgid "Unblock" +#: ../../include/enotify.php:216 +#, php-format +msgid "Please visit %s to approve or reject the introduction." msgstr "" -#: ../../mod/contacts.php:310 ../../mod/contacts.php:369 -#: ../../mod/admin.php:666 -msgid "Block" +#: ../../include/enotify.php:223 +msgid "[Red:Notify] Friend suggestion received" msgstr "" -#: ../../mod/contacts.php:313 -msgid "Toggle Blocked status" +#: ../../include/enotify.php:224 +#, php-format +msgid "You've received a friend suggestion from '%1$s' at %2$s" msgstr "" -#: ../../mod/contacts.php:316 ../../mod/contacts.php:370 -msgid "Unignore" +#: ../../include/enotify.php:225 +#, php-format +msgid "You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s." msgstr "" -#: ../../mod/contacts.php:319 -msgid "Toggle Ignored status" +#: ../../include/enotify.php:230 +msgid "Name:" msgstr "" -#: ../../mod/contacts.php:323 -msgid "Unarchive" +#: ../../include/enotify.php:231 +msgid "Photo:" msgstr "" -#: ../../mod/contacts.php:323 -msgid "Archive" +#: ../../include/enotify.php:234 +#, php-format +msgid "Please visit %s to approve or reject the suggestion." msgstr "" -#: ../../mod/contacts.php:326 -msgid "Toggle Archive status" +#: ../../include/features.php:21 +msgid "General Features" msgstr "" -#: ../../mod/contacts.php:329 -msgid "Repair" +#: ../../include/features.php:22 +msgid "Content Expiration" msgstr "" -#: ../../mod/contacts.php:332 -msgid "Advanced Contact Settings" +#: ../../include/features.php:22 +msgid "Remove old posts/comments after a period of time" msgstr "" -#: ../../mod/contacts.php:338 -msgid "Communications lost with this contact!" +#: ../../include/features.php:23 +msgid "Multiple Profiles" msgstr "" -#: ../../mod/contacts.php:341 -msgid "Contact Editor" +#: ../../include/features.php:23 +msgid "Ability to create multiple profiles" msgstr "" -#: ../../mod/contacts.php:344 -msgid "Profile Visibility" +#: ../../include/features.php:24 +msgid "Web Pages" msgstr "" -#: ../../mod/contacts.php:345 -#, php-format -msgid "" -"Please choose the profile you would like to display to %s when viewing your " -"profile securely." +#: ../../include/features.php:24 +msgid "Provide managed web pages on your channel" msgstr "" -#: ../../mod/contacts.php:346 -msgid "Contact Information / Notes" +#: ../../include/features.php:25 +msgid "Expert Mode" msgstr "" -#: ../../mod/contacts.php:347 -msgid "Edit contact notes" +#: ../../include/features.php:25 +msgid "Enable Expert Mode to provide advanced configuration options" msgstr "" -#: ../../mod/contacts.php:352 ../../mod/contacts.php:544 -#: ../../mod/viewconnections.php:62 ../../mod/nogroup.php:40 -#, php-format -msgid "Visit %s's profile [%s]" +#: ../../include/features.php:32 +msgid "Post Composition Features" msgstr "" -#: ../../mod/contacts.php:353 -msgid "Block/Unblock contact" +#: ../../include/features.php:33 +msgid "Richtext Editor" msgstr "" -#: ../../mod/contacts.php:354 -msgid "Ignore contact" +#: ../../include/features.php:33 +msgid "Enable richtext editor" msgstr "" -#: ../../mod/contacts.php:355 -msgid "Repair URL settings" +#: ../../include/features.php:34 +msgid "Post Preview" msgstr "" -#: ../../mod/contacts.php:356 -msgid "View conversations" +#: ../../include/features.php:34 +msgid "Allow previewing posts and comments before publishing them" msgstr "" -#: ../../mod/contacts.php:358 -msgid "Delete contact" +#: ../../include/features.php:39 +msgid "Network and Stream Filtering" msgstr "" -#: ../../mod/contacts.php:362 -msgid "Last update:" +#: ../../include/features.php:40 +msgid "Search by Date" msgstr "" -#: ../../mod/contacts.php:364 -msgid "Update public posts" +#: ../../include/features.php:40 +msgid "Ability to select posts by date ranges" msgstr "" -#: ../../mod/contacts.php:366 ../../mod/admin.php:1138 -msgid "Update now" +#: ../../include/features.php:41 +msgid "Collections Filter" msgstr "" -#: ../../mod/contacts.php:373 -msgid "Currently blocked" +#: ../../include/features.php:41 +msgid "Enable widget to display Network posts only from selected collections" msgstr "" -#: ../../mod/contacts.php:374 -msgid "Currently ignored" +#: ../../include/features.php:42 ../../mod/network.php:163 +#: ../../mod/search.php:17 +msgid "Saved Searches" msgstr "" -#: ../../mod/contacts.php:375 -msgid "Currently archived" +#: ../../include/features.php:42 +msgid "Save search terms for re-use" msgstr "" -#: ../../mod/contacts.php:376 -msgid "" -"Replies/likes to your public posts <strong>may</strong> still be visible" +#: ../../include/features.php:43 +msgid "Network Personal Tab" msgstr "" -#: ../../mod/contacts.php:429 -msgid "Suggestions" +#: ../../include/features.php:43 +msgid "Enable tab to display only Network posts that you've interacted on" msgstr "" -#: ../../mod/contacts.php:432 -msgid "Suggest potential friends" +#: ../../include/features.php:44 +msgid "Network New Tab" msgstr "" -#: ../../mod/contacts.php:435 ../../mod/group.php:191 -msgid "All Contacts" +#: ../../include/features.php:44 +msgid "Enable tab to display all new Network activity" msgstr "" -#: ../../mod/contacts.php:438 -msgid "Show all contacts" +#: ../../include/features.php:45 +msgid "Affinity Tool" msgstr "" -#: ../../mod/contacts.php:441 -msgid "Unblocked" +#: ../../include/features.php:45 +msgid "Filter stream activity by depth of relationships" msgstr "" -#: ../../mod/contacts.php:444 -msgid "Only show unblocked contacts" +#: ../../include/features.php:50 +msgid "Post/Comment Tools" msgstr "" -#: ../../mod/contacts.php:448 -msgid "Blocked" +#: ../../include/features.php:51 +msgid "Multiple Deletion" msgstr "" -#: ../../mod/contacts.php:451 -msgid "Only show blocked contacts" +#: ../../include/features.php:51 +msgid "Select and delete multiple posts/comments at once" msgstr "" -#: ../../mod/contacts.php:455 -msgid "Ignored" +#: ../../include/features.php:52 +msgid "Edit Sent Posts" msgstr "" -#: ../../mod/contacts.php:458 -msgid "Only show ignored contacts" +#: ../../include/features.php:52 +msgid "Edit and correct posts and comments after sending" msgstr "" -#: ../../mod/contacts.php:462 -msgid "Archived" +#: ../../include/features.php:53 +msgid "Tagging" msgstr "" -#: ../../mod/contacts.php:465 -msgid "Only show archived contacts" +#: ../../include/features.php:53 +msgid "Ability to tag existing posts" msgstr "" -#: ../../mod/contacts.php:469 -msgid "Hidden" +#: ../../include/features.php:54 +msgid "Post Categories" msgstr "" -#: ../../mod/contacts.php:472 -msgid "Only show hidden contacts" +#: ../../include/features.php:54 +msgid "Add categories to your posts" msgstr "" -#: ../../mod/contacts.php:520 -msgid "Mutual Friendship" +#: ../../include/features.php:55 +msgid "Ability to file posts under folders" msgstr "" -#: ../../mod/contacts.php:524 -msgid "is a fan of yours" +#: ../../include/features.php:56 +msgid "Dislike Posts" msgstr "" -#: ../../mod/contacts.php:528 -msgid "you are a fan of" +#: ../../include/features.php:56 +msgid "Ability to dislike posts/comments" msgstr "" -#: ../../mod/contacts.php:545 ../../mod/nogroup.php:41 -msgid "Edit contact" +#: ../../include/features.php:57 +msgid "Star Posts" msgstr "" -#: ../../mod/contacts.php:566 ../../view/theme/diabook/theme.php:129 -#: ../../include/nav.php:139 -msgid "Contacts" +#: ../../include/features.php:57 +msgid "Ability to mark special posts with a star indicator" msgstr "" -#: ../../mod/contacts.php:570 -msgid "Search your contacts" +#: ../../include/follow.php:21 +msgid "Channel is blocked on this site." msgstr "" -#: ../../mod/contacts.php:571 ../../mod/directory.php:57 -msgid "Finding: " +#: ../../include/follow.php:26 +msgid "Channel location missing." msgstr "" -#: ../../mod/contacts.php:572 ../../mod/directory.php:59 -#: ../../include/contact_widgets.php:33 -msgid "Find" +#: ../../include/follow.php:43 +msgid "Channel discovery failed. Website may be down or misconfigured." msgstr "" -#: ../../mod/lostpass.php:16 -msgid "No valid account found." +#: ../../include/follow.php:51 +msgid "Response from remote channel was not understood." msgstr "" -#: ../../mod/lostpass.php:32 -msgid "Password reset request issued. Check your email." +#: ../../include/follow.php:58 +msgid "Response from remote channel was incomplete." msgstr "" -#: ../../mod/lostpass.php:43 -#, php-format -msgid "Password reset requested at %s" +#: ../../include/follow.php:121 +msgid "local account not found." msgstr "" -#: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107 -#: ../../mod/register.php:90 ../../mod/register.php:144 -#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752 -#: ../../addon/facebook/facebook.php:702 -#: ../../addon/facebook/facebook.php:1192 -#: ../../addon/public_server/public_server.php:62 -#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:2892 -#: ../../boot.php:766 -msgid "Administrator" +#: ../../include/follow.php:129 +msgid "Cannot connect to yourself." msgstr "" -#: ../../mod/lostpass.php:65 +#: ../../include/group.php:25 msgid "" -"Request could not be verified. (You may have previously submitted it.) " -"Password reset failed." -msgstr "" - -#: ../../mod/lostpass.php:83 ../../boot.php:898 -msgid "Password Reset" -msgstr "" - -#: ../../mod/lostpass.php:84 -msgid "Your password has been reset as requested." -msgstr "" - -#: ../../mod/lostpass.php:85 -msgid "Your new password is" -msgstr "" - -#: ../../mod/lostpass.php:86 -msgid "Save or copy your new password - and then" +"A deleted group with this name was revived. Existing item permissions " +"<strong>may</strong> apply to this group and any future members. If this is " +"not what you intended, please create another group with a different name." msgstr "" -#: ../../mod/lostpass.php:87 -msgid "click here to login" +#: ../../include/group.php:205 +msgid "Default privacy group for new contacts" msgstr "" -#: ../../mod/lostpass.php:88 -msgid "" -"Your password may be changed from the <em>Settings</em> page after " -"successful login." +#: ../../include/group.php:224 +msgid "All Channels" msgstr "" -#: ../../mod/lostpass.php:119 -msgid "Forgot your Password?" +#: ../../include/group.php:246 +msgid "edit" msgstr "" -#: ../../mod/lostpass.php:120 -msgid "" -"Enter your email address and submit to have your password reset. Then check " -"your email for further instructions." +#: ../../include/group.php:267 +msgid "Collections" msgstr "" -#: ../../mod/lostpass.php:121 -msgid "Nickname or Email: " +#: ../../include/group.php:268 +msgid "Edit collection" msgstr "" -#: ../../mod/lostpass.php:122 -msgid "Reset" +#: ../../include/group.php:269 +msgid "Create a new collection" msgstr "" -#: ../../mod/settings.php:50 ../../include/nav.php:137 -msgid "Account settings" +#: ../../include/group.php:270 +msgid "Channels not in any collection" msgstr "" -#: ../../mod/settings.php:55 -msgid "Display settings" +#: ../../include/group.php:272 ../../mod/network.php:164 +msgid "add" msgstr "" -#: ../../mod/settings.php:61 -msgid "Connector settings" +#: ../../include/identity.php:14 +msgid "Unable to obtain identity information from database" msgstr "" -#: ../../mod/settings.php:66 -msgid "Plugin settings" +#: ../../include/identity.php:36 +msgid "Empty name" msgstr "" -#: ../../mod/settings.php:71 -msgid "Connected apps" +#: ../../include/identity.php:38 +msgid "Name too long" msgstr "" -#: ../../mod/settings.php:76 -msgid "Export personal data" +#: ../../include/identity.php:57 +msgid "No account identifier" msgstr "" -#: ../../mod/settings.php:81 -msgid "Remove account" +#: ../../include/identity.php:72 +msgid "" +"Nickname has unsupported characters or is already being used on this site." msgstr "" -#: ../../mod/settings.php:89 ../../mod/admin.php:753 ../../mod/admin.php:958 -#: ../../addon/dav/layout.fnk.php:116 ../../addon/mathjax/mathjax.php:36 -#: ../../view/theme/diabook/theme.php:643 -#: ../../view/theme/diabook/theme.php:773 ../../include/nav.php:137 -msgid "Settings" +#: ../../include/identity.php:120 +msgid "Unable to retrieve created identity" msgstr "" -#: ../../mod/settings.php:133 -msgid "Missing some important data!" +#: ../../include/identity.php:184 +msgid "Default Profile" msgstr "" -#: ../../mod/settings.php:136 ../../mod/settings.php:581 -msgid "Update" +#: ../../include/items.php:2456 +#, php-format +msgid "%s's birthday" msgstr "" -#: ../../mod/settings.php:241 -msgid "Failed to connect with email account using the settings provided." +#: ../../include/items.php:2457 +#, php-format +msgid "Happy Birthday %s" msgstr "" -#: ../../mod/settings.php:246 -msgid "Email settings updated." +#: ../../include/items.php:3918 +msgid "[Name Withheld]" msgstr "" -#: ../../mod/settings.php:305 -msgid "Passwords do not match. Password unchanged." +#: ../../include/items.php:3926 +msgid "A new person is sharing with you at " msgstr "" -#: ../../mod/settings.php:310 -msgid "Empty passwords are not allowed. Password unchanged." +#: ../../include/items.php:3926 +msgid "You have a new follower at " msgstr "" -#: ../../mod/settings.php:321 -msgid "Password changed." +#: ../../include/items.php:4349 ../../mod/admin.php:142 +#: ../../mod/admin.php:652 ../../mod/admin.php:851 ../../mod/display.php:29 +#: ../../mod/viewsrc.php:18 ../../mod/page.php:34 +msgid "Item not found." msgstr "" -#: ../../mod/settings.php:323 -msgid "Password update failed. Please try again." +#: ../../include/items.php:4521 +msgid "Archives" msgstr "" -#: ../../mod/settings.php:386 -msgid " Please use a shorter name." +#: ../../include/js_strings.php:5 +msgid "Delete this item?" msgstr "" -#: ../../mod/settings.php:388 -msgid " Name too short." +#: ../../include/js_strings.php:8 +msgid "show fewer" msgstr "" -#: ../../mod/settings.php:394 -msgid " Not valid email." +#: ../../include/js_strings.php:9 +msgid "Password too short" msgstr "" -#: ../../mod/settings.php:396 -msgid " Cannot change to that email." +#: ../../include/js_strings.php:10 +msgid "Passwords do not match" msgstr "" -#: ../../mod/settings.php:450 -msgid "Private forum has no privacy permissions. Using default privacy group." +#: ../../include/js_strings.php:11 ../../mod/photos.php:45 +msgid "everybody" msgstr "" -#: ../../mod/settings.php:454 -msgid "Private forum has no privacy permissions and no default privacy group." +#: ../../include/js_strings.php:13 +msgid "timeago.prefixAgo" msgstr "" -#: ../../mod/settings.php:484 ../../addon/facebook/facebook.php:495 -#: ../../addon/impressum/impressum.php:77 -#: ../../addon/openstreetmap/openstreetmap.php:80 -#: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105 -#: ../../addon/twitter/twitter.php:382 -msgid "Settings updated." +#: ../../include/js_strings.php:14 +msgid "timeago.suffixAgo" msgstr "" -#: ../../mod/settings.php:554 ../../mod/settings.php:580 -#: ../../mod/settings.php:616 -msgid "Add application" +#: ../../include/js_strings.php:15 +msgid "ago" msgstr "" -#: ../../mod/settings.php:558 ../../mod/settings.php:584 -#: ../../addon/statusnet/statusnet.php:561 -msgid "Consumer Key" +#: ../../include/js_strings.php:16 +msgid "from now" msgstr "" -#: ../../mod/settings.php:559 ../../mod/settings.php:585 -#: ../../addon/statusnet/statusnet.php:560 -msgid "Consumer Secret" +#: ../../include/js_strings.php:17 +msgid "less than a minute" msgstr "" -#: ../../mod/settings.php:560 ../../mod/settings.php:586 -msgid "Redirect" +#: ../../include/js_strings.php:18 +msgid "about a minute" msgstr "" -#: ../../mod/settings.php:561 ../../mod/settings.php:587 -msgid "Icon url" +#: ../../include/js_strings.php:19 +#, php-format +msgid "%d minutes" msgstr "" -#: ../../mod/settings.php:572 -msgid "You can't edit this application." +#: ../../include/js_strings.php:20 +msgid "about an hour" msgstr "" -#: ../../mod/settings.php:615 -msgid "Connected Apps" +#: ../../include/js_strings.php:21 +#, php-format +msgid "about %d hours" msgstr "" -#: ../../mod/settings.php:619 -msgid "Client key starts with" +#: ../../include/js_strings.php:22 +msgid "a day" msgstr "" -#: ../../mod/settings.php:620 -msgid "No name" +#: ../../include/js_strings.php:23 +#, php-format +msgid "%d days" msgstr "" -#: ../../mod/settings.php:621 -msgid "Remove authorization" +#: ../../include/js_strings.php:24 +msgid "about a month" msgstr "" -#: ../../mod/settings.php:632 -msgid "No Plugin settings configured" +#: ../../include/js_strings.php:25 +#, php-format +msgid "%d months" msgstr "" -#: ../../mod/settings.php:640 ../../addon/widgets/widgets.php:123 -msgid "Plugin Settings" +#: ../../include/js_strings.php:26 +msgid "about a year" msgstr "" -#: ../../mod/settings.php:652 ../../mod/settings.php:653 +#: ../../include/js_strings.php:27 #, php-format -msgid "Built-in support for %s connectivity is %s" -msgstr "" - -#: ../../mod/settings.php:652 ../../mod/settings.php:653 -msgid "enabled" +msgid "%d years" msgstr "" -#: ../../mod/settings.php:652 ../../mod/settings.php:653 -msgid "disabled" +#: ../../include/js_strings.php:28 +msgid " " msgstr "" -#: ../../mod/settings.php:653 -msgid "StatusNet" +#: ../../include/js_strings.php:29 +msgid "timeago.numbers" msgstr "" -#: ../../mod/settings.php:685 -msgid "Email access is disabled on this site." +#: ../../include/message.php:16 +msgid "No recipient provided." msgstr "" -#: ../../mod/settings.php:691 -msgid "Connector Settings" +#: ../../include/message.php:21 +msgid "[no subject]" msgstr "" -#: ../../mod/settings.php:696 -msgid "Email/Mailbox Setup" +#: ../../include/message.php:36 +msgid "Unable to determine sender." msgstr "" -#: ../../mod/settings.php:697 -msgid "" -"If you wish to communicate with email contacts using this service " -"(optional), please specify how to connect to your mailbox." +#: ../../include/message.php:82 +msgid "Stored post could not be verified." msgstr "" -#: ../../mod/settings.php:698 -msgid "Last successful email check:" +#: ../../include/nav.php:71 ../../include/nav.php:86 ../../boot.php:1232 +msgid "Logout" msgstr "" -#: ../../mod/settings.php:700 -msgid "IMAP server name:" +#: ../../include/nav.php:71 ../../include/nav.php:86 +msgid "End this session" msgstr "" -#: ../../mod/settings.php:701 -msgid "IMAP port:" +#: ../../include/nav.php:74 ../../include/nav.php:114 +#: ../../include/nav.php:146 ../../mod/notifications.php:90 +msgid "Home" msgstr "" -#: ../../mod/settings.php:702 -msgid "Security:" +#: ../../include/nav.php:74 ../../include/nav.php:146 +msgid "Your posts and conversations" msgstr "" -#: ../../mod/settings.php:702 ../../mod/settings.php:707 -msgid "None" +#: ../../include/nav.php:75 +msgid "Your profile page" msgstr "" -#: ../../mod/settings.php:703 -msgid "Email login name:" +#: ../../include/nav.php:77 +msgid "Edit Profiles" msgstr "" -#: ../../mod/settings.php:704 -msgid "Email password:" +#: ../../include/nav.php:77 +msgid "Manage/Edit Profiles" msgstr "" -#: ../../mod/settings.php:705 -msgid "Reply-to address:" +#: ../../include/nav.php:78 ../../mod/fbrowser.php:25 ../../boot.php:1939 +msgid "Photos" msgstr "" -#: ../../mod/settings.php:706 -msgid "Send public posts to all email contacts:" +#: ../../include/nav.php:78 +msgid "Your photos" msgstr "" -#: ../../mod/settings.php:707 -msgid "Action after import:" +#: ../../include/nav.php:84 ../../boot.php:1233 +msgid "Login" msgstr "" -#: ../../mod/settings.php:707 -msgid "Mark as seen" +#: ../../include/nav.php:84 +msgid "Sign in" msgstr "" -#: ../../mod/settings.php:707 -msgid "Move to folder" +#: ../../include/nav.php:100 +#, php-format +msgid "%s - click to logout" msgstr "" -#: ../../mod/settings.php:708 -msgid "Move to folder:" +#: ../../include/nav.php:103 +msgid "Click to authenticate to your home hub" msgstr "" -#: ../../mod/settings.php:768 -msgid "Display Settings" +#: ../../include/nav.php:114 +msgid "Home Page" msgstr "" -#: ../../mod/settings.php:774 -msgid "Display Theme:" +#: ../../include/nav.php:118 ../../mod/register.php:181 ../../boot.php:1208 +msgid "Register" msgstr "" -#: ../../mod/settings.php:775 -msgid "Update browser every xx seconds" +#: ../../include/nav.php:118 +msgid "Create an account" msgstr "" -#: ../../mod/settings.php:775 -msgid "Minimum of 10 seconds, no maximum" +#: ../../include/nav.php:123 ../../mod/help.php:34 +msgid "Help" msgstr "" -#: ../../mod/settings.php:776 -msgid "Number of items to display on the network page:" +#: ../../include/nav.php:123 +msgid "Help and documentation" msgstr "" -#: ../../mod/settings.php:776 -msgid "Maximum of 100 items" +#: ../../include/nav.php:126 +msgid "Apps" msgstr "" -#: ../../mod/settings.php:777 -msgid "Don't show emoticons" +#: ../../include/nav.php:126 +msgid "Addon applications, utilities, games" msgstr "" -#: ../../mod/settings.php:848 -msgid "Normal Account Page" +#: ../../include/nav.php:128 ../../include/text.php:688 +#: ../../include/text.php:689 ../../mod/search.php:96 +msgid "Search" msgstr "" -#: ../../mod/settings.php:849 -msgid "This account is a normal personal profile" +#: ../../include/nav.php:128 +msgid "Search site content" msgstr "" -#: ../../mod/settings.php:852 -msgid "Soapbox Page" +#: ../../include/nav.php:131 ../../mod/directory.php:164 +msgid "Directory" msgstr "" -#: ../../mod/settings.php:853 -msgid "Automatically approve all connection/friend requests as read-only fans" +#: ../../include/nav.php:131 +msgid "Channel Locator" msgstr "" -#: ../../mod/settings.php:856 -msgid "Community Forum/Celebrity Account" +#: ../../include/nav.php:142 +msgid "Matrix" msgstr "" -#: ../../mod/settings.php:857 -msgid "Automatically approve all connection/friend requests as read-write fans" +#: ../../include/nav.php:142 +msgid "Conversations from your grid" msgstr "" -#: ../../mod/settings.php:860 -msgid "Automatic Friend Page" +#: ../../include/nav.php:143 +msgid "See all matrix notifications" msgstr "" -#: ../../mod/settings.php:861 -msgid "Automatically approve all connection/friend requests as friends" +#: ../../include/nav.php:144 +msgid "Mark all matrix notifications seen" msgstr "" -#: ../../mod/settings.php:864 -msgid "Private Forum [Experimental]" +#: ../../include/nav.php:147 +msgid "See all channel notifications" msgstr "" -#: ../../mod/settings.php:865 -msgid "Private forum - approved members only" +#: ../../include/nav.php:148 +msgid "Mark all channel notifications seen" msgstr "" -#: ../../mod/settings.php:877 -msgid "OpenID:" +#: ../../include/nav.php:151 +msgid "Intros" msgstr "" -#: ../../mod/settings.php:877 -msgid "(Optional) Allow this OpenID to login to this account." +#: ../../include/nav.php:151 ../../mod/connections.php:502 +msgid "New Connections" msgstr "" -#: ../../mod/settings.php:887 -msgid "Publish your default profile in your local site directory?" +#: ../../include/nav.php:152 +msgid "See all channel introductions" msgstr "" -#: ../../mod/settings.php:893 -msgid "Publish your default profile in the global social directory?" +#: ../../include/nav.php:155 +msgid "Notices" msgstr "" -#: ../../mod/settings.php:901 -msgid "Hide your contact/friend list from viewers of your default profile?" +#: ../../include/nav.php:155 ../../mod/notifications.php:216 +msgid "Notifications" msgstr "" -#: ../../mod/settings.php:905 -msgid "Hide your profile details from unknown viewers?" +#: ../../include/nav.php:156 +msgid "See all notifications" msgstr "" -#: ../../mod/settings.php:910 -msgid "Allow friends to post to your profile page?" +#: ../../include/nav.php:157 +msgid "Mark all system notifications seen" msgstr "" -#: ../../mod/settings.php:916 -msgid "Allow friends to tag your posts?" +#: ../../include/nav.php:159 +msgid "Mail" msgstr "" -#: ../../mod/settings.php:922 -msgid "Allow us to suggest you as a potential friend to new members?" +#: ../../include/nav.php:159 +msgid "Private mail" msgstr "" -#: ../../mod/settings.php:928 -msgid "Permit unknown people to send you private mail?" +#: ../../include/nav.php:160 +msgid "See all private messages" msgstr "" -#: ../../mod/settings.php:936 -msgid "Profile is <strong>not published</strong>." +#: ../../include/nav.php:161 +msgid "Mark all private messages seen" msgstr "" -#: ../../mod/settings.php:939 ../../mod/profile_photo.php:213 -msgid "or" +#: ../../include/nav.php:162 +msgid "Inbox" msgstr "" -#: ../../mod/settings.php:944 -msgid "Your Identity Address is" +#: ../../include/nav.php:163 +msgid "Outbox" msgstr "" -#: ../../mod/settings.php:955 -msgid "Automatically expire posts after this many days:" +#: ../../include/nav.php:164 ../../mod/message.php:15 +msgid "New Message" msgstr "" -#: ../../mod/settings.php:955 -msgid "If empty, posts will not expire. Expired posts will be deleted" +#: ../../include/nav.php:167 ../../mod/events.php:345 ../../boot.php:1949 +msgid "Events" msgstr "" -#: ../../mod/settings.php:956 -msgid "Advanced expiration settings" +#: ../../include/nav.php:167 +msgid "Event Calendar" msgstr "" -#: ../../mod/settings.php:957 -msgid "Advanced Expiration" +#: ../../include/nav.php:168 +msgid "See all events" msgstr "" -#: ../../mod/settings.php:958 -msgid "Expire posts:" +#: ../../include/nav.php:169 +msgid "Mark all events seen" msgstr "" -#: ../../mod/settings.php:959 -msgid "Expire personal notes:" +#: ../../include/nav.php:171 +msgid "Channel Select" msgstr "" -#: ../../mod/settings.php:960 -msgid "Expire starred posts:" +#: ../../include/nav.php:171 +msgid "Manage Your Channels" msgstr "" -#: ../../mod/settings.php:961 -msgid "Expire photos:" +#: ../../include/nav.php:173 ../../mod/admin.php:703 ../../mod/admin.php:908 +#: ../../mod/settings.php:101 +msgid "Settings" msgstr "" -#: ../../mod/settings.php:962 -msgid "Only expire posts by others:" +#: ../../include/nav.php:173 +msgid "Account/Channel Settings" msgstr "" -#: ../../mod/settings.php:969 -msgid "Account Settings" +#: ../../include/nav.php:175 ../../mod/connections.php:610 +msgid "Connections" msgstr "" -#: ../../mod/settings.php:977 -msgid "Password Settings" +#: ../../include/nav.php:175 +msgid "Manage/Edit Friends and Connections" msgstr "" -#: ../../mod/settings.php:978 -msgid "New Password:" +#: ../../include/nav.php:182 ../../mod/admin.php:106 +msgid "Admin" msgstr "" -#: ../../mod/settings.php:979 -msgid "Confirm:" +#: ../../include/nav.php:182 +msgid "Site Setup and Configuration" msgstr "" -#: ../../mod/settings.php:979 -msgid "Leave password fields blank unless changing" +#: ../../include/nav.php:206 +msgid "Nothing new here" msgstr "" -#: ../../mod/settings.php:983 -msgid "Basic Settings" +#: ../../include/nav.php:211 +msgid "Please wait..." msgstr "" -#: ../../mod/settings.php:984 ../../include/profile_advanced.php:15 -msgid "Full Name:" +#: ../../include/network.php:1068 +msgid "view full size" msgstr "" -#: ../../mod/settings.php:985 -msgid "Email Address:" +#: ../../include/notify.php:23 +msgid "created a new post" msgstr "" -#: ../../mod/settings.php:986 -msgid "Your Timezone:" +#: ../../include/notify.php:24 +#, php-format +msgid "commented on %s's post" msgstr "" -#: ../../mod/settings.php:987 -msgid "Default Post Location:" +#: ../../include/oembed.php:143 +msgid "Embedded content" msgstr "" -#: ../../mod/settings.php:988 -msgid "Use Browser Location:" +#: ../../include/oembed.php:152 +msgid "Embedding disabled" msgstr "" -#: ../../mod/settings.php:991 -msgid "Security and Privacy Settings" +#: ../../include/permissions.php:13 +msgid "Can view my \"public\" stream and posts" msgstr "" -#: ../../mod/settings.php:993 -msgid "Maximum Friend Requests/Day:" +#: ../../include/permissions.php:14 +msgid "Can view my \"public\" channel profile" msgstr "" -#: ../../mod/settings.php:993 ../../mod/settings.php:1012 -msgid "(to prevent spam abuse)" +#: ../../include/permissions.php:15 +msgid "Can view my \"public\" photo albums" msgstr "" -#: ../../mod/settings.php:994 -msgid "Default Post Permissions" +#: ../../include/permissions.php:16 +msgid "Can view my \"public\" address book" msgstr "" -#: ../../mod/settings.php:995 -msgid "(click to open/close)" +#: ../../include/permissions.php:17 +msgid "Can view my \"public\" file storage" msgstr "" -#: ../../mod/settings.php:1012 -msgid "Maximum private messages per day from unknown people:" +#: ../../include/permissions.php:18 +msgid "Can view my \"public\" pages" msgstr "" -#: ../../mod/settings.php:1015 -msgid "Notification Settings" +#: ../../include/permissions.php:21 +msgid "Can send me their channel stream and posts" msgstr "" -#: ../../mod/settings.php:1016 -msgid "By default post a status message when:" +#: ../../include/permissions.php:22 +msgid "Can post on my channel page (\"wall\")" msgstr "" -#: ../../mod/settings.php:1017 -msgid "accepting a friend request" +#: ../../include/permissions.php:23 +msgid "Can comment on my posts" msgstr "" -#: ../../mod/settings.php:1018 -msgid "joining a forum/community" +#: ../../include/permissions.php:24 +msgid "Can send me private mail messages" msgstr "" -#: ../../mod/settings.php:1019 -msgid "making an <em>interesting</em> profile change" +#: ../../include/permissions.php:25 +msgid "Can post photos to my photo albums" msgstr "" -#: ../../mod/settings.php:1020 -msgid "Send a notification email when:" +#: ../../include/permissions.php:26 +msgid "Can forward to all my channel contacts via post tags" msgstr "" -#: ../../mod/settings.php:1021 -msgid "You receive an introduction" +#: ../../include/permissions.php:26 +msgid "Advanced - useful for creating group forum channels" msgstr "" -#: ../../mod/settings.php:1022 -msgid "Your introductions are confirmed" +#: ../../include/permissions.php:27 +msgid "Can chat with me (when available)" msgstr "" -#: ../../mod/settings.php:1023 -msgid "Someone writes on your profile wall" +#: ../../include/permissions.php:27 +msgid "Requires compatible chat plugin" msgstr "" -#: ../../mod/settings.php:1024 -msgid "Someone writes a followup comment" +#: ../../include/permissions.php:28 +msgid "Can write to my \"public\" file storage" msgstr "" -#: ../../mod/settings.php:1025 -msgid "You receive a private message" +#: ../../include/permissions.php:29 +msgid "Can edit my \"public\" pages" msgstr "" -#: ../../mod/settings.php:1026 -msgid "You receive a friend suggestion" +#: ../../include/permissions.php:31 +msgid "Can administer my channel resources" msgstr "" -#: ../../mod/settings.php:1027 -msgid "You are tagged in a post" +#: ../../include/permissions.php:31 +msgid "Extremely advanced. Leave this alone unless you know what you are doing" msgstr "" -#: ../../mod/settings.php:1030 -msgid "Advanced Account/Page Type Settings" +#: ../../include/security.php:48 +msgid "Welcome " msgstr "" -#: ../../mod/settings.php:1031 -msgid "Change the behaviour of this account for special situations" +#: ../../include/security.php:49 +msgid "Please upload a profile photo." msgstr "" -#: ../../mod/manage.php:90 -msgid "Manage Identities and/or Pages" +#: ../../include/security.php:52 +msgid "Welcome back " msgstr "" -#: ../../mod/manage.php:93 +#: ../../include/security.php:349 msgid "" -"Toggle between different identities or community/group pages which share " -"your account details or which you have been granted \"manage\" permissions" -msgstr "" - -#: ../../mod/manage.php:95 -msgid "Select an identity to manage: " +"The form security token was not correct. This probably happened because the " +"form has been opened for too long (>3 hours) before submitting it." msgstr "" -#: ../../mod/network.php:97 -msgid "Search Results For:" +#: ../../include/text.php:265 +msgid "prev" msgstr "" -#: ../../mod/network.php:137 ../../mod/search.php:16 -msgid "Remove term" +#: ../../include/text.php:267 +msgid "first" msgstr "" -#: ../../mod/network.php:146 ../../mod/search.php:13 -msgid "Saved Searches" +#: ../../include/text.php:296 +msgid "last" msgstr "" -#: ../../mod/network.php:147 ../../include/group.php:244 -msgid "add" +#: ../../include/text.php:299 +msgid "next" msgstr "" -#: ../../mod/network.php:287 -msgid "Commented Order" +#: ../../include/text.php:311 +msgid "older" msgstr "" -#: ../../mod/network.php:290 -msgid "Sort by Comment Date" +#: ../../include/text.php:313 +msgid "newer" msgstr "" -#: ../../mod/network.php:293 -msgid "Posted Order" +#: ../../include/text.php:607 +msgid "No connections" msgstr "" -#: ../../mod/network.php:296 -msgid "Sort by Post Date" -msgstr "" - -#: ../../mod/network.php:303 -msgid "Posts that mention or involve you" -msgstr "" +#: ../../include/text.php:618 +#, php-format +msgid "%d Connection" +msgid_plural "%d Connections" +msgstr[0] "" +msgstr[1] "" -#: ../../mod/network.php:306 -msgid "New" +#: ../../include/text.php:630 +msgid "View Connections" msgstr "" -#: ../../mod/network.php:309 -msgid "Activity Stream - by date" +#: ../../include/text.php:691 ../../mod/filer.php:36 +msgid "Save" msgstr "" -#: ../../mod/network.php:312 -msgid "Starred" +#: ../../include/text.php:729 +msgid "poke" msgstr "" -#: ../../mod/network.php:315 -msgid "Favourite Posts" +#: ../../include/text.php:730 +msgid "ping" msgstr "" -#: ../../mod/network.php:318 -msgid "Shared Links" +#: ../../include/text.php:730 +msgid "pinged" msgstr "" -#: ../../mod/network.php:321 -msgid "Interesting Links" +#: ../../include/text.php:731 +msgid "prod" msgstr "" -#: ../../mod/network.php:388 -#, php-format -msgid "Warning: This group contains %s member from an insecure network." -msgid_plural "" -"Warning: This group contains %s members from an insecure network." -msgstr[0] "" -msgstr[1] "" - -#: ../../mod/network.php:391 -msgid "Private messages to this group are at risk of public disclosure." +#: ../../include/text.php:731 +msgid "prodded" msgstr "" -#: ../../mod/network.php:461 -msgid "Contact: " +#: ../../include/text.php:732 +msgid "slap" msgstr "" -#: ../../mod/network.php:463 -msgid "Private messages to this person are at risk of public disclosure." +#: ../../include/text.php:732 +msgid "slapped" msgstr "" -#: ../../mod/network.php:468 -msgid "Invalid contact." +#: ../../include/text.php:733 +msgid "finger" msgstr "" -#: ../../mod/notes.php:44 ../../boot.php:1601 -msgid "Personal Notes" +#: ../../include/text.php:733 +msgid "fingered" msgstr "" -#: ../../mod/notes.php:63 ../../mod/filer.php:30 -#: ../../addon/facebook/facebook.php:770 -#: ../../addon/privacy_image_cache/privacy_image_cache.php:187 -#: ../../addon/dav/layout.fnk.php:384 ../../include/text.php:652 -msgid "Save" +#: ../../include/text.php:734 +msgid "rebuff" msgstr "" -#: ../../mod/wallmessage.php:42 ../../mod/wallmessage.php:112 -#, php-format -msgid "Number of daily wall messages for %s exceeded. Message failed." +#: ../../include/text.php:734 +msgid "rebuffed" msgstr "" -#: ../../mod/wallmessage.php:56 ../../mod/message.php:66 -msgid "No recipient selected." +#: ../../include/text.php:746 +msgid "happy" msgstr "" -#: ../../mod/wallmessage.php:59 -msgid "Unable to check your home location." +#: ../../include/text.php:747 +msgid "sad" msgstr "" -#: ../../mod/wallmessage.php:62 ../../mod/message.php:73 -msgid "Message could not be sent." +#: ../../include/text.php:748 +msgid "mellow" msgstr "" -#: ../../mod/wallmessage.php:65 ../../mod/message.php:76 -msgid "Message collection failure." +#: ../../include/text.php:749 +msgid "tired" msgstr "" -#: ../../mod/wallmessage.php:68 ../../mod/message.php:79 -msgid "Message sent." +#: ../../include/text.php:750 +msgid "perky" msgstr "" -#: ../../mod/wallmessage.php:86 ../../mod/wallmessage.php:95 -msgid "No recipient." +#: ../../include/text.php:751 +msgid "angry" msgstr "" -#: ../../mod/wallmessage.php:124 ../../mod/message.php:172 -#: ../../include/conversation.php:947 -msgid "Please enter a link URL:" +#: ../../include/text.php:752 +msgid "stupified" msgstr "" -#: ../../mod/wallmessage.php:131 ../../mod/message.php:200 -msgid "Send Private Message" +#: ../../include/text.php:753 +msgid "puzzled" msgstr "" -#: ../../mod/wallmessage.php:132 -#, php-format -msgid "" -"If you wish for %s to respond, please check that the privacy settings on " -"your site allow private mail from unknown senders." +#: ../../include/text.php:754 +msgid "interested" msgstr "" -#: ../../mod/wallmessage.php:133 ../../mod/message.php:201 -#: ../../mod/message.php:401 -msgid "To:" +#: ../../include/text.php:755 +msgid "bitter" msgstr "" -#: ../../mod/wallmessage.php:134 ../../mod/message.php:206 -#: ../../mod/message.php:403 -msgid "Subject:" +#: ../../include/text.php:756 +msgid "cheerful" msgstr "" -#: ../../mod/wallmessage.php:140 ../../mod/message.php:210 -#: ../../mod/message.php:406 ../../mod/invite.php:113 -msgid "Your message:" +#: ../../include/text.php:757 +msgid "alive" msgstr "" -#: ../../mod/newmember.php:6 -msgid "Welcome to Friendica" +#: ../../include/text.php:758 +msgid "annoyed" msgstr "" -#: ../../mod/newmember.php:8 -msgid "New Member Checklist" +#: ../../include/text.php:759 +msgid "anxious" msgstr "" -#: ../../mod/newmember.php:12 -msgid "" -"We would like to offer some tips and links to help make your experience " -"enjoyable. Click any item to visit the relevant page. A link to this page " -"will be visible from your home page for two weeks after your initial " -"registration and then will quietly disappear." +#: ../../include/text.php:760 +msgid "cranky" msgstr "" -#: ../../mod/newmember.php:16 -msgid "" -"On your <em>Quick Start</em> page - find a brief introduction to your " -"profile and network tabs, connect to Facebook, make some new connections, " -"and find some groups to join." +#: ../../include/text.php:761 +msgid "disturbed" msgstr "" -#: ../../mod/newmember.php:18 -msgid "" -"On your <em>Settings</em> page - change your initial password. Also make a " -"note of your Identity Address. This looks just like an email address - and " -"will be useful in making friends on the free social web." +#: ../../include/text.php:762 +msgid "frustrated" msgstr "" -#: ../../mod/newmember.php:20 -msgid "" -"Review the other settings, particularly the privacy settings. An unpublished " -"directory listing is like having an unlisted phone number. In general, you " -"should probably publish your listing - unless all of your friends and " -"potential friends know exactly how to find you." +#: ../../include/text.php:763 +msgid "motivated" msgstr "" -#: ../../mod/newmember.php:32 ../../mod/profperm.php:103 -#: ../../view/theme/diabook/theme.php:128 ../../include/profile_advanced.php:7 -#: ../../include/profile_advanced.php:84 ../../include/nav.php:50 -#: ../../boot.php:1642 -msgid "Profile" +#: ../../include/text.php:764 +msgid "relaxed" msgstr "" -#: ../../mod/newmember.php:36 ../../mod/profile_photo.php:211 -msgid "Upload Profile Photo" +#: ../../include/text.php:765 +msgid "surprised" msgstr "" -#: ../../mod/newmember.php:36 -msgid "" -"Upload a profile photo if you have not done so already. Studies have shown " -"that people with real photos of themselves are ten times more likely to make " -"friends than people who do not." +#: ../../include/text.php:927 +msgid "Monday" msgstr "" -#: ../../mod/newmember.php:38 -msgid "Edit Your Profile" +#: ../../include/text.php:927 +msgid "Tuesday" msgstr "" -#: ../../mod/newmember.php:38 -msgid "" -"Edit your <strong>default</strong> profile to your liking. Review the " -"settings for hiding your list of friends and hiding the profile from unknown " -"visitors." +#: ../../include/text.php:927 +msgid "Wednesday" msgstr "" -#: ../../mod/newmember.php:40 -msgid "Profile Keywords" +#: ../../include/text.php:927 +msgid "Thursday" msgstr "" -#: ../../mod/newmember.php:40 -msgid "" -"Set some public keywords for your default profile which describe your " -"interests. We may be able to find other people with similar interests and " -"suggest friendships." +#: ../../include/text.php:927 +msgid "Friday" msgstr "" -#: ../../mod/newmember.php:44 -msgid "Connecting" +#: ../../include/text.php:927 +msgid "Saturday" msgstr "" -#: ../../mod/newmember.php:49 ../../mod/newmember.php:51 -#: ../../addon/facebook/facebook.php:728 -#: ../../include/contact_selectors.php:81 -msgid "Facebook" +#: ../../include/text.php:927 +msgid "Sunday" msgstr "" -#: ../../mod/newmember.php:49 -msgid "" -"Authorise the Facebook Connector if you currently have a Facebook account " -"and we will (optionally) import all your Facebook friends and conversations." +#: ../../include/text.php:931 +msgid "January" msgstr "" -#: ../../mod/newmember.php:51 -msgid "" -"<em>If</em> this is your own personal server, installing the Facebook addon " -"may ease your transition to the free social web." +#: ../../include/text.php:931 +msgid "February" msgstr "" -#: ../../mod/newmember.php:56 -msgid "Importing Emails" +#: ../../include/text.php:931 +msgid "March" msgstr "" -#: ../../mod/newmember.php:56 -msgid "" -"Enter your email access information on your Connector Settings page if you " -"wish to import and interact with friends or mailing lists from your email " -"INBOX" +#: ../../include/text.php:931 +msgid "April" msgstr "" -#: ../../mod/newmember.php:58 -msgid "Go to Your Contacts Page" +#: ../../include/text.php:931 +msgid "May" msgstr "" -#: ../../mod/newmember.php:58 -msgid "" -"Your Contacts page is your gateway to managing friendships and connecting " -"with friends on other networks. Typically you enter their address or site " -"URL in the <em>Add New Contact</em> dialog." +#: ../../include/text.php:931 +msgid "June" msgstr "" -#: ../../mod/newmember.php:60 -msgid "Go to Your Site's Directory" +#: ../../include/text.php:931 +msgid "July" msgstr "" -#: ../../mod/newmember.php:60 -msgid "" -"The Directory page lets you find other people in this network or other " -"federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on " -"their profile page. Provide your own Identity Address if requested." +#: ../../include/text.php:931 +msgid "August" msgstr "" -#: ../../mod/newmember.php:62 -msgid "Finding New People" +#: ../../include/text.php:931 +msgid "September" msgstr "" -#: ../../mod/newmember.php:62 -msgid "" -"On the side panel of the Contacts page are several tools to find new " -"friends. We can match people by interest, look up people by name or " -"interest, and provide suggestions based on network relationships. On a brand " -"new site, friend suggestions will usually begin to be populated within 24 " -"hours." +#: ../../include/text.php:931 +msgid "October" msgstr "" -#: ../../mod/newmember.php:66 ../../include/group.php:239 -msgid "Groups" +#: ../../include/text.php:931 +msgid "November" msgstr "" -#: ../../mod/newmember.php:70 -msgid "Group Your Contacts" +#: ../../include/text.php:931 +msgid "December" msgstr "" -#: ../../mod/newmember.php:70 -msgid "" -"Once you have made some friends, organize them into private conversation " -"groups from the sidebar of your Contacts page and then you can interact with " -"each group privately on your Network page." +#: ../../include/text.php:1004 +msgid "unknown.???" msgstr "" -#: ../../mod/newmember.php:73 -msgid "Why Aren't My Posts Public?" +#: ../../include/text.php:1005 +msgid "bytes" msgstr "" -#: ../../mod/newmember.php:73 -msgid "" -"Friendica respects your privacy. By default, your posts will only show up to " -"people you've added as friends. For more information, see the help section " -"from the link above." +#: ../../include/text.php:1022 ../../include/text.php:1037 +msgid "[remove]" msgstr "" -#: ../../mod/newmember.php:78 -msgid "Getting Help" +#: ../../include/text.php:1056 ../../include/text.php:1068 +msgid "Click to open/close" msgstr "" -#: ../../mod/newmember.php:82 -msgid "Go to the Help Section" +#: ../../include/text.php:1142 ../../mod/events.php:324 +msgid "link to source" msgstr "" -#: ../../mod/newmember.php:82 -msgid "" -"Our <strong>help</strong> pages may be consulted for detail on other program " -"features and resources." +#: ../../include/text.php:1174 +msgid "default" msgstr "" -#: ../../mod/attach.php:8 -msgid "Item not available." +#: ../../include/text.php:1186 +msgid "Select an alternate language" msgstr "" -#: ../../mod/attach.php:20 -msgid "Item was not found." +#: ../../include/text.php:1339 +msgid "activity" msgstr "" -#: ../../mod/group.php:29 -msgid "Group created." +#: ../../include/text.php:1341 +msgid "comment" msgstr "" -#: ../../mod/group.php:35 -msgid "Could not create group." +#: ../../include/text.php:1342 +msgid "post" msgstr "" -#: ../../mod/group.php:47 ../../mod/group.php:137 -msgid "Group not found." +#: ../../include/text.php:1566 +msgid "Item filed" msgstr "" -#: ../../mod/group.php:60 -msgid "Group name changed." +#: ../../include/zot.php:426 +msgid "Unable to verify channel signature" msgstr "" -#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:308 -msgid "Permission denied" +#: ../../include/zot.php:518 +#, php-format +msgid "Unable to verify site signature for %s" msgstr "" -#: ../../mod/group.php:90 -msgid "Create a group of contacts/friends." +#: ../../mod/profile_photo.php:54 +msgid "Image uploaded but image cropping failed." msgstr "" -#: ../../mod/group.php:91 ../../mod/group.php:177 -msgid "Group Name: " +#: ../../mod/profile_photo.php:102 +msgid "Image resize failed." msgstr "" -#: ../../mod/group.php:110 -msgid "Group removed." +#: ../../mod/profile_photo.php:139 +msgid "" +"Shift-reload the page or clear browser cache if the new photo does not " +"display immediately." msgstr "" -#: ../../mod/group.php:112 -msgid "Unable to remove group." +#: ../../mod/profile_photo.php:161 +#, php-format +msgid "Image exceeds size limit of %d" msgstr "" -#: ../../mod/group.php:176 -msgid "Group Editor" +#: ../../mod/profile_photo.php:170 +msgid "Unable to process image." msgstr "" -#: ../../mod/group.php:189 -msgid "Members" +#: ../../mod/profile_photo.php:212 ../../mod/profile_photo.php:250 +msgid "Photo not available." msgstr "" -#: ../../mod/group.php:221 ../../mod/profperm.php:105 -msgid "Click on a contact to add or remove." +#: ../../mod/profile_photo.php:269 +msgid "Upload File:" msgstr "" -#: ../../mod/profperm.php:25 ../../mod/profperm.php:55 -msgid "Invalid profile identifier." +#: ../../mod/profile_photo.php:270 +msgid "Select a profile:" msgstr "" -#: ../../mod/profperm.php:101 -msgid "Profile Visibility Editor" +#: ../../mod/profile_photo.php:271 +msgid "Upload Profile Photo" msgstr "" -#: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:128 -#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:84 -#: ../../include/nav.php:50 ../../boot.php:1580 -msgid "Profile" +#: ../../mod/profile_photo.php:272 +msgid "Upload" msgstr "" -#: ../../mod/profperm.php:114 -msgid "Visible To" +#: ../../mod/profile_photo.php:276 ../../mod/settings.php:960 +msgid "or" msgstr "" -#: ../../mod/profperm.php:130 -msgid "All Contacts (with secure profile access)" +#: ../../mod/profile_photo.php:276 +msgid "skip this step" msgstr "" -#: ../../mod/viewconnections.php:39 -msgid "No contacts." +#: ../../mod/profile_photo.php:276 +msgid "select a photo from your photo albums" msgstr "" -#: ../../mod/viewconnections.php:76 ../../include/text.php:589 -msgid "View Contacts" +#: ../../mod/profile_photo.php:290 +msgid "Crop Image" msgstr "" -#: ../../mod/register.php:88 ../../mod/regmod.php:52 -#, php-format -msgid "Registration details for %s" +#: ../../mod/profile_photo.php:291 +msgid "Please adjust the image cropping for optimum viewing." msgstr "" -#: ../../mod/register.php:96 -msgid "" -"Registration successful. Please check your email for further instructions." +#: ../../mod/profile_photo.php:293 +msgid "Done Editing" msgstr "" -#: ../../mod/register.php:100 -msgid "Failed to send email message. Here is the message that failed." +#: ../../mod/profile_photo.php:326 +msgid "Image uploaded successfully." msgstr "" -#: ../../mod/register.php:105 -msgid "Your registration can not be processed." +#: ../../mod/profile_photo.php:328 +msgid "Image upload failed." msgstr "" -#: ../../mod/register.php:142 +#: ../../mod/profile_photo.php:335 #, php-format -msgid "Registration request at %s" -msgstr "" - -#: ../../mod/register.php:151 -msgid "Your registration is pending approval by the site owner." +msgid "Image size reduction [%s] failed." msgstr "" -#: ../../mod/register.php:189 -msgid "" -"This site has exceeded the number of allowed daily account registrations. " -"Please try again tomorrow." +#: ../../mod/profiles.php:18 ../../mod/profiles.php:138 +#: ../../mod/profiles.php:179 ../../mod/profiles.php:478 +msgid "Profile not found." msgstr "" -#: ../../mod/register.php:215 -msgid "" -"You may (optionally) fill in this form via OpenID by supplying your OpenID " -"and clicking 'Register'." +#: ../../mod/profiles.php:38 +msgid "Profile deleted." msgstr "" -#: ../../mod/register.php:216 -msgid "" -"If you are not familiar with OpenID, please leave that field blank and fill " -"in the rest of the items." +#: ../../mod/profiles.php:56 ../../mod/profiles.php:92 +msgid "Profile-" msgstr "" -#: ../../mod/register.php:217 -msgid "Your OpenID (optional): " +#: ../../mod/profiles.php:77 ../../mod/profiles.php:120 +msgid "New profile created." msgstr "" -#: ../../mod/register.php:231 -msgid "Include your profile in member directory?" +#: ../../mod/profiles.php:98 +msgid "Profile unavailable to clone." msgstr "" -#: ../../mod/register.php:251 -msgid "Membership on this site is by invitation only." +#: ../../mod/profiles.php:189 +msgid "Profile Name is required." msgstr "" -#: ../../mod/register.php:252 -msgid "Your invitation ID: " +#: ../../mod/profiles.php:311 +msgid "Marital Status" msgstr "" -#: ../../mod/register.php:255 ../../mod/admin.php:423 -msgid "Registration" +#: ../../mod/profiles.php:315 +msgid "Romantic Partner" msgstr "" -#: ../../mod/register.php:263 -msgid "Your Full Name (e.g. Joe Smith): " +#: ../../mod/profiles.php:319 +msgid "Likes" msgstr "" -#: ../../mod/register.php:264 -msgid "Your Email Address: " +#: ../../mod/profiles.php:323 +msgid "Dislikes" msgstr "" -#: ../../mod/register.php:265 -msgid "" -"Choose a profile nickname. This must begin with a text character. Your " -"profile address on this site will then be '<strong>nickname@$sitename</" -"strong>'." +#: ../../mod/profiles.php:327 +msgid "Work/Employment" msgstr "" -#: ../../mod/register.php:266 -msgid "Choose a nickname: " +#: ../../mod/profiles.php:330 +msgid "Religion" msgstr "" -#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:864 -msgid "Register" +#: ../../mod/profiles.php:334 +msgid "Political Views" msgstr "" -#: ../../mod/dirfind.php:26 -msgid "People Search" +#: ../../mod/profiles.php:338 +msgid "Gender" msgstr "" -#: ../../mod/like.php:144 ../../mod/like.php:301 ../../mod/tagger.php:70 -#: ../../addon/facebook/facebook.php:1586 -#: ../../addon/communityhome/communityhome.php:158 -#: ../../addon/communityhome/communityhome.php:167 -#: ../../view/theme/diabook/theme.php:565 -#: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1777 -#: ../../include/conversation.php:48 ../../include/conversation.php:57 -#: ../../include/conversation.php:121 ../../include/conversation.php:130 -msgid "status" +#: ../../mod/profiles.php:342 +msgid "Sexual Preference" msgstr "" -#: ../../mod/like.php:161 ../../addon/facebook/facebook.php:1590 -#: ../../addon/communityhome/communityhome.php:172 -#: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1793 -#: ../../include/conversation.php:65 -#, php-format -msgid "%1$s likes %2$s's %3$s" +#: ../../mod/profiles.php:346 +msgid "Homepage" msgstr "" -#: ../../mod/like.php:163 ../../include/conversation.php:68 -#, php-format -msgid "%1$s doesn't like %2$s's %3$s" +#: ../../mod/profiles.php:350 +msgid "Interests" msgstr "" -#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159 -#: ../../mod/admin.php:702 ../../mod/admin.php:901 ../../mod/display.php:37 -#: ../../mod/display.php:142 ../../include/items.php:3336 -msgid "Item not found." +#: ../../mod/profiles.php:354 +msgid "Address" msgstr "" -#: ../../mod/viewsrc.php:7 -msgid "Access denied." +#: ../../mod/profiles.php:361 +msgid "Location" msgstr "" -#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130 -#: ../../include/nav.php:51 ../../boot.php:1586 -msgid "Photos" +#: ../../mod/profiles.php:442 +msgid "Profile updated." msgstr "" -#: ../../mod/fbrowser.php:96 -msgid "Files" +#: ../../mod/profiles.php:497 +msgid "Hide your contact/friend list from viewers of this profile?" msgstr "" -#: ../../mod/regmod.php:61 -msgid "Account approved." +#: ../../mod/profiles.php:498 ../../mod/api.php:105 ../../mod/settings.php:951 +#: ../../mod/settings.php:956 ../../mod/settings.php:979 +#: ../../mod/settings.php:981 ../../mod/settings.php:982 +#: ../../mod/settings.php:983 +msgid "Yes" msgstr "" -#: ../../mod/regmod.php:98 -#, php-format -msgid "Registration revoked for %s" +#: ../../mod/profiles.php:499 ../../mod/api.php:106 ../../mod/settings.php:951 +#: ../../mod/settings.php:956 ../../mod/settings.php:979 +#: ../../mod/settings.php:981 ../../mod/settings.php:982 +#: ../../mod/settings.php:983 +msgid "No" msgstr "" -#: ../../mod/regmod.php:110 -msgid "Please login." +#: ../../mod/profiles.php:519 +msgid "Edit Profile Details" msgstr "" -#: ../../mod/item.php:89 -msgid "Unable to locate original post." +#: ../../mod/profiles.php:521 +msgid "View this profile" msgstr "" -#: ../../mod/item.php:258 -msgid "Empty post discarded." +#: ../../mod/profiles.php:522 +msgid "Change Profile Photo" msgstr "" -#: ../../mod/item.php:379 ../../mod/wall_upload.php:115 -#: ../../mod/wall_upload.php:124 ../../mod/wall_upload.php:131 -#: ../../include/message.php:144 -msgid "Wall Photos" +#: ../../mod/profiles.php:523 +msgid "Create a new profile using these settings" msgstr "" -#: ../../mod/item.php:784 -msgid "System error. Post not saved." +#: ../../mod/profiles.php:524 +msgid "Clone this profile" msgstr "" -#: ../../mod/item.php:809 -#, php-format -msgid "" -"This message was sent to you by %s, a member of the Friendica social network." +#: ../../mod/profiles.php:525 +msgid "Delete this profile" msgstr "" -#: ../../mod/item.php:811 -#, php-format -msgid "You may visit them online at %s" +#: ../../mod/profiles.php:526 +msgid "Profile Name:" msgstr "" -#: ../../mod/item.php:812 -msgid "" -"Please contact the sender by replying to this post if you do not wish to " -"receive these messages." +#: ../../mod/profiles.php:527 +msgid "Your Full Name:" msgstr "" -#: ../../mod/item.php:814 -#, php-format -msgid "%s posted an update." +#: ../../mod/profiles.php:528 +msgid "Title/Description:" msgstr "" -#: ../../mod/profile_photo.php:30 -msgid "Image uploaded but image cropping failed." +#: ../../mod/profiles.php:529 +msgid "Your Gender:" msgstr "" -#: ../../mod/profile_photo.php:63 ../../mod/profile_photo.php:70 -#: ../../mod/profile_photo.php:77 ../../mod/profile_photo.php:266 +#: ../../mod/profiles.php:530 #, php-format -msgid "Image size reduction [%s] failed." +msgid "Birthday (%s):" msgstr "" -#: ../../mod/profile_photo.php:91 -msgid "" -"Shift-reload the page or clear browser cache if the new photo does not " -"display immediately." +#: ../../mod/profiles.php:531 +msgid "Street Address:" msgstr "" -#: ../../mod/profile_photo.php:101 -msgid "Unable to process image" +#: ../../mod/profiles.php:532 +msgid "Locality/City:" msgstr "" -#: ../../mod/profile_photo.php:117 ../../mod/wall_upload.php:77 -#, php-format -msgid "Image exceeds size limit of %d" +#: ../../mod/profiles.php:533 +msgid "Postal/Zip Code:" msgstr "" -#: ../../mod/profile_photo.php:209 -msgid "Upload File:" +#: ../../mod/profiles.php:534 +msgid "Country:" msgstr "" -#: ../../mod/profile_photo.php:210 -msgid "Upload Profile Photo" +#: ../../mod/profiles.php:535 +msgid "Region/State:" msgstr "" -#: ../../mod/profile_photo.php:211 -msgid "Upload" +#: ../../mod/profiles.php:536 +msgid "<span class=\"heart\">♥</span> Marital Status:" msgstr "" -#: ../../mod/profile_photo.php:213 -msgid "skip this step" +#: ../../mod/profiles.php:537 +msgid "Who: (if applicable)" msgstr "" -#: ../../mod/profile_photo.php:213 -msgid "select a photo from your photo albums" +#: ../../mod/profiles.php:538 +msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "" -#: ../../mod/profile_photo.php:226 -msgid "Crop Image" +#: ../../mod/profiles.php:539 +msgid "Since [date]:" msgstr "" -#: ../../mod/profile_photo.php:227 -msgid "Please adjust the image cropping for optimum viewing." +#: ../../mod/profiles.php:541 +msgid "Homepage URL:" msgstr "" -#: ../../mod/profile_photo.php:229 -msgid "Done Editing" +#: ../../mod/profiles.php:544 +msgid "Religious Views:" msgstr "" -#: ../../mod/profile_photo.php:257 -msgid "Image uploaded successfully." +#: ../../mod/profiles.php:545 +msgid "Keywords:" msgstr "" -#: ../../mod/hcard.php:10 -msgid "No profile" +#: ../../mod/profiles.php:548 +msgid "Example: fishing photography software" msgstr "" -#: ../../mod/removeme.php:45 ../../mod/removeme.php:48 -msgid "Remove My Account" +#: ../../mod/profiles.php:549 +msgid "Used in directory listings" msgstr "" -#: ../../mod/removeme.php:46 -msgid "" -"This will completely remove your account. Once this has been done it is not " -"recoverable." +#: ../../mod/profiles.php:550 +msgid "Tell us about yourself..." msgstr "" -#: ../../mod/removeme.php:47 -msgid "Please enter your password for verification:" +#: ../../mod/profiles.php:551 +msgid "Hobbies/Interests" msgstr "" -#: ../../mod/message.php:9 ../../include/nav.php:131 -msgid "New Message" +#: ../../mod/profiles.php:552 +msgid "Contact information and Social Networks" msgstr "" -#: ../../mod/message.php:70 -msgid "Unable to locate contact information." +#: ../../mod/profiles.php:553 +msgid "Musical interests" msgstr "" -#: ../../mod/message.php:120 -msgid "Message deleted." +#: ../../mod/profiles.php:554 +msgid "Books, literature" msgstr "" -#: ../../mod/message.php:150 -msgid "Conversation removed." +#: ../../mod/profiles.php:555 +msgid "Television" msgstr "" -#: ../../mod/message.php:249 -msgid "No messages." +#: ../../mod/profiles.php:556 +msgid "Film/dance/culture/entertainment" msgstr "" -#: ../../mod/message.php:256 -#, php-format -msgid "Unknown sender - %s" +#: ../../mod/profiles.php:557 +msgid "Love/romance" msgstr "" -#: ../../mod/message.php:259 -#, php-format -msgid "You and %s" +#: ../../mod/profiles.php:558 +msgid "Work/employment" msgstr "" -#: ../../mod/message.php:262 -#, php-format -msgid "%s and You" +#: ../../mod/profiles.php:559 +msgid "School/education" msgstr "" -#: ../../mod/message.php:272 ../../mod/message.php:394 -msgid "Delete conversation" +#: ../../mod/profiles.php:564 +msgid "" +"This is your <strong>public</strong> profile.<br />It <strong>may</strong> " +"be visible to anybody using the internet." msgstr "" -#: ../../mod/message.php:275 -msgid "D, d M Y - g:i A" +#: ../../mod/profiles.php:574 ../../mod/directory.php:103 +msgid "Age: " msgstr "" -#: ../../mod/message.php:277 -#, php-format -msgid "%d message" -msgid_plural "%d messages" -msgstr[0] "" -msgstr[1] "" - -#: ../../mod/message.php:312 -msgid "Message not available." +#: ../../mod/profiles.php:612 +msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/message.php:377 -msgid "Delete message" +#: ../../mod/profiles.php:613 ../../boot.php:1508 +msgid "Change profile photo" msgstr "" -#: ../../mod/message.php:396 -msgid "" -"No secure communications available. You <strong>may</strong> be able to " -"respond from the sender's profile page." +#: ../../mod/profiles.php:614 ../../boot.php:1515 +msgid "Create New Profile" msgstr "" -#: ../../mod/message.php:400 -msgid "Send Reply" +#: ../../mod/profiles.php:625 ../../boot.php:1529 +msgid "Profile Image" msgstr "" -#: ../../mod/allfriends.php:34 -#, php-format -msgid "Friends of %s" +#: ../../mod/profiles.php:628 ../../boot.php:1532 +msgid "visible to everybody" msgstr "" -#: ../../mod/allfriends.php:40 -msgid "No friends to display." +#: ../../mod/profiles.php:629 ../../boot.php:1533 +msgid "Edit visibility" msgstr "" -#: ../../mod/admin.php:55 +#: ../../mod/admin.php:48 msgid "Theme settings updated." msgstr "" -#: ../../mod/admin.php:96 ../../mod/admin.php:421 +#: ../../mod/admin.php:83 ../../mod/admin.php:374 msgid "Site" msgstr "" -#: ../../mod/admin.php:97 ../../mod/admin.php:657 ../../mod/admin.php:669 +#: ../../mod/admin.php:84 ../../mod/admin.php:607 ../../mod/admin.php:619 msgid "Users" msgstr "" -#: ../../mod/admin.php:98 ../../mod/admin.php:751 ../../mod/admin.php:793 +#: ../../mod/admin.php:85 ../../mod/admin.php:701 ../../mod/admin.php:743 msgid "Plugins" msgstr "" -#: ../../mod/admin.php:99 ../../mod/admin.php:956 ../../mod/admin.php:992 +#: ../../mod/admin.php:86 ../../mod/admin.php:906 ../../mod/admin.php:942 msgid "Themes" msgstr "" -#: ../../mod/admin.php:100 +#: ../../mod/admin.php:87 msgid "DB updates" msgstr "" -#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1079 +#: ../../mod/admin.php:101 ../../mod/admin.php:108 ../../mod/admin.php:1029 msgid "Logs" msgstr "" -#: ../../mod/admin.php:120 ../../include/nav.php:146 -msgid "Admin" -msgstr "" - -#: ../../mod/admin.php:121 +#: ../../mod/admin.php:107 msgid "Plugin Features" msgstr "" -#: ../../mod/admin.php:123 +#: ../../mod/admin.php:109 msgid "User registrations waiting for confirmation" msgstr "" -#: ../../mod/admin.php:183 ../../mod/admin.php:639 -msgid "Normal Account" -msgstr "" - -#: ../../mod/admin.php:184 ../../mod/admin.php:640 -msgid "Soapbox Account" -msgstr "" - -#: ../../mod/admin.php:185 ../../mod/admin.php:641 -msgid "Community/Celebrity Account" -msgstr "" - -#: ../../mod/admin.php:186 ../../mod/admin.php:642 -msgid "Automatic Friend Account" -msgstr "" - -#: ../../mod/admin.php:187 -msgid "Blog Account" -msgstr "" - -#: ../../mod/admin.php:188 -msgid "Private Forum" -msgstr "" - -#: ../../mod/admin.php:207 +#: ../../mod/admin.php:180 msgid "Message queues" msgstr "" -#: ../../mod/admin.php:212 ../../mod/admin.php:420 ../../mod/admin.php:656 -#: ../../mod/admin.php:750 ../../mod/admin.php:792 ../../mod/admin.php:955 -#: ../../mod/admin.php:991 ../../mod/admin.php:1078 +#: ../../mod/admin.php:185 ../../mod/admin.php:373 ../../mod/admin.php:606 +#: ../../mod/admin.php:700 ../../mod/admin.php:742 ../../mod/admin.php:905 +#: ../../mod/admin.php:941 ../../mod/admin.php:1028 msgid "Administration" msgstr "" -#: ../../mod/admin.php:213 +#: ../../mod/admin.php:186 msgid "Summary" msgstr "" -#: ../../mod/admin.php:215 +#: ../../mod/admin.php:188 msgid "Registered users" msgstr "" -#: ../../mod/admin.php:217 +#: ../../mod/admin.php:190 msgid "Pending registrations" msgstr "" -#: ../../mod/admin.php:218 +#: ../../mod/admin.php:191 msgid "Version" msgstr "" -#: ../../mod/admin.php:220 +#: ../../mod/admin.php:193 msgid "Active plugins" msgstr "" -#: ../../mod/admin.php:359 +#: ../../mod/admin.php:315 msgid "Site settings updated." msgstr "" -#: ../../mod/admin.php:407 +#: ../../mod/admin.php:361 msgid "Closed" msgstr "" -#: ../../mod/admin.php:408 +#: ../../mod/admin.php:362 msgid "Requires approval" msgstr "" -#: ../../mod/admin.php:409 +#: ../../mod/admin.php:363 msgid "Open" msgstr "" -#: ../../mod/admin.php:413 +#: ../../mod/admin.php:367 msgid "No SSL policy, links will track page SSL state" msgstr "" -#: ../../mod/admin.php:414 +#: ../../mod/admin.php:368 msgid "Force all links to use SSL" msgstr "" -#: ../../mod/admin.php:415 -msgid "Self-signed certificate, use SSL for local links only (discouraged)" +#: ../../mod/admin.php:376 ../../mod/register.php:166 +msgid "Registration" msgstr "" -#: ../../mod/admin.php:424 +#: ../../mod/admin.php:377 msgid "File upload" msgstr "" -#: ../../mod/admin.php:425 +#: ../../mod/admin.php:378 msgid "Policies" msgstr "" -#: ../../mod/admin.php:426 +#: ../../mod/admin.php:379 msgid "Advanced" msgstr "" -#: ../../mod/admin.php:430 ../../addon/statusnet/statusnet.php:558 +#: ../../mod/admin.php:383 msgid "Site name" msgstr "" -#: ../../mod/admin.php:431 +#: ../../mod/admin.php:384 msgid "Banner/Logo" msgstr "" -#: ../../mod/admin.php:432 +#: ../../mod/admin.php:385 msgid "System language" msgstr "" -#: ../../mod/admin.php:433 +#: ../../mod/admin.php:386 msgid "System theme" msgstr "" -#: ../../mod/admin.php:433 +#: ../../mod/admin.php:386 msgid "" "Default system theme - may be over-ridden by user profiles - <a href='#' " "id='cnftheme'>change theme settings</a>" msgstr "" -#: ../../mod/admin.php:434 +#: ../../mod/admin.php:387 msgid "SSL link policy" msgstr "" -#: ../../mod/admin.php:434 +#: ../../mod/admin.php:387 msgid "Determines whether generated links should be forced to use SSL" msgstr "" -#: ../../mod/admin.php:435 +#: ../../mod/admin.php:388 msgid "Maximum image size" msgstr "" -#: ../../mod/admin.php:435 +#: ../../mod/admin.php:388 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "" -#: ../../mod/admin.php:437 +#: ../../mod/admin.php:389 msgid "Register policy" msgstr "" -#: ../../mod/admin.php:438 +#: ../../mod/admin.php:390 msgid "Register text" msgstr "" -#: ../../mod/admin.php:438 +#: ../../mod/admin.php:390 msgid "Will be displayed prominently on the registration page." msgstr "" -#: ../../mod/admin.php:439 +#: ../../mod/admin.php:391 msgid "Accounts abandoned after x days" msgstr "" -#: ../../mod/admin.php:439 +#: ../../mod/admin.php:391 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: ../../mod/admin.php:440 +#: ../../mod/admin.php:392 msgid "Allowed friend domains" msgstr "" -#: ../../mod/admin.php:440 +#: ../../mod/admin.php:392 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "" -#: ../../mod/admin.php:441 +#: ../../mod/admin.php:393 msgid "Allowed email domains" msgstr "" -#: ../../mod/admin.php:441 +#: ../../mod/admin.php:393 msgid "" "Comma separated list of domains which are allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains" msgstr "" -#: ../../mod/admin.php:442 +#: ../../mod/admin.php:394 msgid "Block public" msgstr "" -#: ../../mod/admin.php:442 +#: ../../mod/admin.php:394 msgid "" "Check to block public access to all otherwise public personal pages on this " "site unless you are currently logged in." msgstr "" -#: ../../mod/admin.php:443 +#: ../../mod/admin.php:395 msgid "Force publish" msgstr "" -#: ../../mod/admin.php:443 +#: ../../mod/admin.php:395 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "" -#: ../../mod/admin.php:444 +#: ../../mod/admin.php:396 msgid "Global directory update URL" msgstr "" -#: ../../mod/admin.php:444 +#: ../../mod/admin.php:396 msgid "" "URL to update the global directory. If this is not set, the global directory " "is completely unavailable to the application." msgstr "" -#: ../../mod/admin.php:446 -msgid "Block multiple registrations" -msgstr "" - -#: ../../mod/admin.php:446 -msgid "Disallow users to register additional accounts for use as pages." -msgstr "" - -#: ../../mod/admin.php:447 -msgid "OpenID support" -msgstr "" - -#: ../../mod/admin.php:447 -msgid "OpenID support for registration and logins." -msgstr "" - -#: ../../mod/admin.php:448 -msgid "Fullname check" -msgstr "" - -#: ../../mod/admin.php:448 -msgid "" -"Force users to register with a space between firstname and lastname in Full " -"name, as an antispam measure" -msgstr "" - -#: ../../mod/admin.php:449 -msgid "UTF-8 Regular expressions" -msgstr "" - -#: ../../mod/admin.php:449 -msgid "Use PHP UTF8 regular expressions" -msgstr "" - -#: ../../mod/admin.php:450 +#: ../../mod/admin.php:398 msgid "Show Community Page" msgstr "" -#: ../../mod/admin.php:450 +#: ../../mod/admin.php:398 msgid "" "Display a Community page showing all recent public postings on this site." msgstr "" -#: ../../mod/admin.php:451 -msgid "Enable OStatus support" -msgstr "" - -#: ../../mod/admin.php:451 -msgid "" -"Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All " -"communications in OStatus are public, so privacy warnings will be " -"occasionally displayed." -msgstr "" - -#: ../../mod/admin.php:452 -msgid "Enable Diaspora support" -msgstr "" - -#: ../../mod/admin.php:452 -msgid "Provide built-in Diaspora network compatibility." -msgstr "" - -#: ../../mod/admin.php:453 -msgid "Only allow Friendica contacts" -msgstr "" - -#: ../../mod/admin.php:453 -msgid "" -"All contacts must use Friendica protocols. All other built-in communication " -"protocols disabled." -msgstr "" - -#: ../../mod/admin.php:454 -msgid "Verify SSL" -msgstr "" - -#: ../../mod/admin.php:454 -msgid "" -"If you wish, you can turn on strict certificate checking. This will mean you " -"cannot connect (at all) to self-signed SSL sites." -msgstr "" - -#: ../../mod/admin.php:455 +#: ../../mod/admin.php:399 msgid "Proxy user" msgstr "" -#: ../../mod/admin.php:456 +#: ../../mod/admin.php:400 msgid "Proxy URL" msgstr "" -#: ../../mod/admin.php:457 +#: ../../mod/admin.php:401 msgid "Network timeout" msgstr "" -#: ../../mod/admin.php:457 +#: ../../mod/admin.php:401 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "" -#: ../../mod/admin.php:458 +#: ../../mod/admin.php:402 msgid "Delivery interval" msgstr "" -#: ../../mod/admin.php:458 +#: ../../mod/admin.php:402 msgid "" "Delay background delivery processes by this many seconds to reduce system " "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " "for large dedicated servers." msgstr "" -#: ../../mod/admin.php:459 +#: ../../mod/admin.php:403 msgid "Poll interval" msgstr "" -#: ../../mod/admin.php:459 +#: ../../mod/admin.php:403 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "" -#: ../../mod/admin.php:460 +#: ../../mod/admin.php:404 msgid "Maximum Load Average" msgstr "" -#: ../../mod/admin.php:460 +#: ../../mod/admin.php:404 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "" -#: ../../mod/admin.php:474 +#: ../../mod/admin.php:420 msgid "Update has been marked successful" msgstr "" -#: ../../mod/admin.php:484 +#: ../../mod/admin.php:430 #, php-format msgid "Executing %s failed. Check system logs." msgstr "" -#: ../../mod/admin.php:487 +#: ../../mod/admin.php:433 #, php-format msgid "Update %s was successfully applied." msgstr "" -#: ../../mod/admin.php:491 +#: ../../mod/admin.php:437 #, php-format msgid "Update %s did not return a status. Unknown if it succeeded." msgstr "" -#: ../../mod/admin.php:494 +#: ../../mod/admin.php:440 #, php-format msgid "Update function %s could not be found." msgstr "" -#: ../../mod/admin.php:509 +#: ../../mod/admin.php:455 msgid "No failed updates." msgstr "" -#: ../../mod/admin.php:513 +#: ../../mod/admin.php:459 msgid "Failed Updates" msgstr "" -#: ../../mod/admin.php:514 -msgid "" -"This does not include updates prior to 1139, which did not return a status." -msgstr "" - -#: ../../mod/admin.php:515 +#: ../../mod/admin.php:461 msgid "Mark success (if update was manually applied)" msgstr "" -#: ../../mod/admin.php:516 +#: ../../mod/admin.php:462 msgid "Attempt to execute this update step automatically" msgstr "" -#: ../../mod/admin.php:541 +#: ../../mod/admin.php:488 #, php-format msgid "%s user blocked/unblocked" msgid_plural "%s users blocked/unblocked" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:548 +#: ../../mod/admin.php:495 #, php-format msgid "%s user deleted" msgid_plural "%s users deleted" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:587 +#: ../../mod/admin.php:526 +msgid "Account not found" +msgstr "" + +#: ../../mod/admin.php:537 #, php-format msgid "User '%s' deleted" msgstr "" -#: ../../mod/admin.php:595 +#: ../../mod/admin.php:546 #, php-format msgid "User '%s' unblocked" msgstr "" -#: ../../mod/admin.php:595 +#: ../../mod/admin.php:546 #, php-format msgid "User '%s' blocked" msgstr "" -#: ../../mod/admin.php:659 +#: ../../mod/admin.php:589 +msgid "Normal Account" +msgstr "" + +#: ../../mod/admin.php:590 +msgid "Soapbox Account" +msgstr "" + +#: ../../mod/admin.php:591 +msgid "Community/Celebrity Account" +msgstr "" + +#: ../../mod/admin.php:592 +msgid "Automatic Friend Account" +msgstr "" + +#: ../../mod/admin.php:609 msgid "select all" msgstr "" -#: ../../mod/admin.php:660 +#: ../../mod/admin.php:610 msgid "User registrations waiting for confirm" msgstr "" -#: ../../mod/admin.php:661 +#: ../../mod/admin.php:611 msgid "Request date" msgstr "" -#: ../../mod/admin.php:661 ../../mod/admin.php:670 -#: ../../include/contact_selectors.php:79 -msgid "Email" +#: ../../mod/admin.php:611 ../../mod/admin.php:620 ../../mod/settings.php:597 +#: ../../mod/settings.php:623 ../../mod/crepair.php:148 +msgid "Name" msgstr "" -#: ../../mod/admin.php:662 +#: ../../mod/admin.php:612 msgid "No registrations." msgstr "" -#: ../../mod/admin.php:664 +#: ../../mod/admin.php:613 ../../mod/intro.php:11 ../../mod/intro.php:98 +#: ../../mod/notifications.php:157 ../../mod/notifications.php:204 +msgid "Approve" +msgstr "" + +#: ../../mod/admin.php:614 msgid "Deny" msgstr "" -#: ../../mod/admin.php:670 +#: ../../mod/admin.php:616 ../../mod/connections.php:278 +#: ../../mod/connections.php:408 ../../mod/intro.php:14 ../../mod/intro.php:99 +msgid "Block" +msgstr "" + +#: ../../mod/admin.php:617 ../../mod/connections.php:278 +#: ../../mod/connections.php:408 +msgid "Unblock" +msgstr "" + +#: ../../mod/admin.php:620 msgid "Register date" msgstr "" -#: ../../mod/admin.php:670 +#: ../../mod/admin.php:620 msgid "Last login" msgstr "" -#: ../../mod/admin.php:670 +#: ../../mod/admin.php:620 msgid "Last item" msgstr "" -#: ../../mod/admin.php:670 +#: ../../mod/admin.php:620 msgid "Account" msgstr "" -#: ../../mod/admin.php:672 +#: ../../mod/admin.php:622 msgid "" "Selected users will be deleted!\\n\\nEverything these users had posted on " "this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:673 +#: ../../mod/admin.php:623 msgid "" "The user {0} will be deleted!\\n\\nEverything this user has posted on this " "site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:714 +#: ../../mod/admin.php:664 #, php-format msgid "Plugin %s disabled." msgstr "" -#: ../../mod/admin.php:718 +#: ../../mod/admin.php:668 #, php-format msgid "Plugin %s enabled." msgstr "" -#: ../../mod/admin.php:728 ../../mod/admin.php:926 +#: ../../mod/admin.php:678 ../../mod/admin.php:876 msgid "Disable" msgstr "" -#: ../../mod/admin.php:730 ../../mod/admin.php:928 +#: ../../mod/admin.php:680 ../../mod/admin.php:878 msgid "Enable" msgstr "" -#: ../../mod/admin.php:752 ../../mod/admin.php:957 +#: ../../mod/admin.php:702 ../../mod/admin.php:907 msgid "Toggle" msgstr "" -#: ../../mod/admin.php:760 ../../mod/admin.php:967 +#: ../../mod/admin.php:710 ../../mod/admin.php:917 msgid "Author: " msgstr "" -#: ../../mod/admin.php:761 ../../mod/admin.php:968 +#: ../../mod/admin.php:711 ../../mod/admin.php:918 msgid "Maintainer: " msgstr "" -#: ../../mod/admin.php:890 +#: ../../mod/admin.php:840 msgid "No themes found." msgstr "" -#: ../../mod/admin.php:949 +#: ../../mod/admin.php:899 msgid "Screenshot" msgstr "" -#: ../../mod/admin.php:997 +#: ../../mod/admin.php:947 msgid "[Experimental]" msgstr "" -#: ../../mod/admin.php:998 +#: ../../mod/admin.php:948 msgid "[Unsupported]" msgstr "" -#: ../../mod/admin.php:1025 +#: ../../mod/admin.php:975 msgid "Log settings updated." msgstr "" -#: ../../mod/admin.php:1081 +#: ../../mod/admin.php:1031 msgid "Clear" msgstr "" -#: ../../mod/admin.php:1087 +#: ../../mod/admin.php:1037 msgid "Debugging" msgstr "" -#: ../../mod/admin.php:1088 +#: ../../mod/admin.php:1038 msgid "Log file" msgstr "" -#: ../../mod/admin.php:1088 +#: ../../mod/admin.php:1038 msgid "" "Must be writable by web server. Relative to your Friendica top-level " "directory." msgstr "" -#: ../../mod/admin.php:1089 +#: ../../mod/admin.php:1039 msgid "Log level" msgstr "" -#: ../../mod/admin.php:1139 -msgid "Close" -msgstr "" - -#: ../../mod/admin.php:1145 -msgid "FTP Host" -msgstr "" - -#: ../../mod/admin.php:1146 -msgid "FTP Path" -msgstr "" - -#: ../../mod/admin.php:1147 -msgid "FTP User" -msgstr "" - -#: ../../mod/admin.php:1148 -msgid "FTP Password" -msgstr "" - -#: ../../mod/profile.php:21 ../../boot.php:1029 -msgid "Requested profile is not available." -msgstr "" - -#: ../../mod/profile.php:141 ../../mod/display.php:75 -msgid "Access to this profile has been restricted." -msgstr "" - -#: ../../mod/profile.php:166 -msgid "Tips for New Members" -msgstr "" - -#: ../../mod/ping.php:185 -msgid "{0} wants to be your friend" +#: ../../mod/poke.php:193 +msgid "Poke/Prod" msgstr "" -#: ../../mod/ping.php:190 -msgid "{0} sent you a message" +#: ../../mod/poke.php:194 +msgid "poke, prod or do other things to somebody" msgstr "" -#: ../../mod/ping.php:195 -msgid "{0} requested registration" +#: ../../mod/poke.php:195 +msgid "Recipient" msgstr "" -#: ../../mod/ping.php:201 -#, php-format -msgid "{0} commented %s's post" +#: ../../mod/poke.php:196 +msgid "Choose what you wish to do to recipient" msgstr "" -#: ../../mod/ping.php:206 -#, php-format -msgid "{0} liked %s's post" +#: ../../mod/poke.php:199 +msgid "Make this post private" msgstr "" -#: ../../mod/ping.php:211 +#: ../../mod/allfriends.php:35 #, php-format -msgid "{0} disliked %s's post" +msgid "Friends of %s" msgstr "" -#: ../../mod/ping.php:216 -#, php-format -msgid "{0} is now friends with %s" +#: ../../mod/allfriends.php:41 +msgid "No friends to display." msgstr "" -#: ../../mod/ping.php:221 -msgid "{0} posted" +#: ../../mod/setup.php:123 +msgid "Friendica Red Communications Server - Setup" msgstr "" -#: ../../mod/ping.php:226 -#, php-format -msgid "{0} tagged %s's post with #%s" -msgstr "" - -#: ../../mod/ping.php:232 -msgid "{0} mentioned you in a post" +#: ../../mod/setup.php:129 +msgid "Could not connect to database." msgstr "" -#: ../../mod/nogroup.php:58 -msgid "Contacts who are not members of a group" +#: ../../mod/setup.php:133 +msgid "Could not create table." msgstr "" -#: ../../mod/openid.php:24 -msgid "OpenID protocol error. No ID returned." +#: ../../mod/setup.php:139 +msgid "Your Friendica site database has been installed." msgstr "" -#: ../../mod/openid.php:53 +#: ../../mod/setup.php:144 msgid "" -"Account not found and OpenID registration is not permitted on this site." +"You may need to import the file \"install/database.sql\" manually using " +"phpmyadmin or mysql." msgstr "" -#: ../../mod/openid.php:93 ../../include/auth.php:99 -#: ../../include/auth.php:162 -msgid "Login failed." -msgstr "" - -#: ../../mod/follow.php:27 -msgid "Contact added" +#: ../../mod/setup.php:145 ../../mod/setup.php:212 ../../mod/setup.php:528 +msgid "Please see the file \"install/INSTALL.txt\"." msgstr "" -#: ../../mod/common.php:42 -msgid "Common Friends" -msgstr "" - -#: ../../mod/common.php:78 -msgid "No contacts in common." -msgstr "" - -#: ../../mod/share.php:28 ../../include/bb2diaspora.php:226 -msgid "link" -msgstr "" - -#: ../../mod/display.php:135 -msgid "Item has been removed." -msgstr "" - -#: ../../mod/apps.php:4 -msgid "Applications" -msgstr "" - -#: ../../mod/apps.php:7 -msgid "No installed applications." -msgstr "" - -#: ../../mod/search.php:83 ../../include/text.php:649 -#: ../../include/text.php:650 ../../include/nav.php:91 -msgid "Search" -msgstr "" - -#: ../../mod/profiles.php:21 ../../mod/profiles.php:410 -#: ../../mod/profiles.php:524 ../../mod/dfrn_confirm.php:62 -msgid "Profile not found." -msgstr "" - -#: ../../mod/profiles.php:31 -msgid "Profile Name is required." -msgstr "" - -#: ../../mod/profiles.php:155 -msgid "Marital Status" -msgstr "" - -#: ../../mod/profiles.php:159 -msgid "Romantic Partner" -msgstr "" - -#: ../../mod/profiles.php:163 -msgid "Likes" -msgstr "" - -#: ../../mod/profiles.php:167 -msgid "Dislikes" -msgstr "" - -#: ../../mod/profiles.php:171 -msgid "Work/Employment" -msgstr "" - -#: ../../mod/profiles.php:174 -msgid "Religion" -msgstr "" - -#: ../../mod/profiles.php:178 -msgid "Political Views" -msgstr "" - -#: ../../mod/profiles.php:182 -msgid "Gender" -msgstr "" - -#: ../../mod/profiles.php:186 -msgid "Sexual Preference" -msgstr "" - -#: ../../mod/profiles.php:190 -msgid "Homepage" -msgstr "" - -#: ../../mod/profiles.php:194 -msgid "Interests" -msgstr "" - -#: ../../mod/profiles.php:198 -msgid "Address" -msgstr "" - -#: ../../mod/profiles.php:205 ../../addon/dav/layout.fnk.php:310 -msgid "Location" -msgstr "" - -#: ../../mod/profiles.php:288 -msgid "Profile updated." -msgstr "" - -#: ../../mod/profiles.php:355 -msgid " and " -msgstr "" - -#: ../../mod/profiles.php:363 -msgid "public profile" -msgstr "" - -#: ../../mod/profiles.php:366 -#, php-format -msgid "%1$s changed %2$s to “%3$s”" -msgstr "" - -#: ../../mod/profiles.php:367 -#, php-format -msgid " - Visit %1$s's %2$s" -msgstr "" - -#: ../../mod/profiles.php:370 -#, php-format -msgid "%1$s has an updated %2$s, changing %3$s." -msgstr "" - -#: ../../mod/profiles.php:429 -msgid "Profile deleted." -msgstr "" - -#: ../../mod/profiles.php:447 ../../mod/profiles.php:481 -msgid "Profile-" -msgstr "" - -#: ../../mod/profiles.php:466 ../../mod/profiles.php:508 -msgid "New profile created." -msgstr "" - -#: ../../mod/profiles.php:487 -msgid "Profile unavailable to clone." -msgstr "" - -#: ../../mod/profiles.php:545 -msgid "Hide your contact/friend list from viewers of this profile?" -msgstr "" - -#: ../../mod/profiles.php:568 -msgid "Edit Profile Details" -msgstr "" - -#: ../../mod/profiles.php:570 -msgid "View this profile" -msgstr "" - -#: ../../mod/profiles.php:571 -msgid "Create a new profile using these settings" -msgstr "" - -#: ../../mod/profiles.php:572 -msgid "Clone this profile" -msgstr "" - -#: ../../mod/profiles.php:573 -msgid "Delete this profile" -msgstr "" - -#: ../../mod/profiles.php:574 -msgid "Profile Name:" -msgstr "" - -#: ../../mod/profiles.php:575 -msgid "Your Full Name:" -msgstr "" - -#: ../../mod/profiles.php:576 -msgid "Title/Description:" -msgstr "" - -#: ../../mod/profiles.php:577 -msgid "Your Gender:" -msgstr "" - -#: ../../mod/profiles.php:578 -#, php-format -msgid "Birthday (%s):" -msgstr "" - -#: ../../mod/profiles.php:579 -msgid "Street Address:" -msgstr "" - -#: ../../mod/profiles.php:580 -msgid "Locality/City:" -msgstr "" - -#: ../../mod/profiles.php:581 -msgid "Postal/Zip Code:" -msgstr "" - -#: ../../mod/profiles.php:582 -msgid "Country:" -msgstr "" - -#: ../../mod/profiles.php:583 -msgid "Region/State:" -msgstr "" - -#: ../../mod/profiles.php:584 -msgid "<span class=\"heart\">♥</span> Marital Status:" -msgstr "" - -#: ../../mod/profiles.php:585 -msgid "Who: (if applicable)" -msgstr "" - -#: ../../mod/profiles.php:586 -msgid "Examples: cathy123, Cathy Williams, cathy@example.com" -msgstr "" - -#: ../../mod/profiles.php:587 -msgid "Since [date]:" -msgstr "" - -#: ../../mod/profiles.php:588 ../../include/profile_advanced.php:46 -msgid "Sexual Preference:" -msgstr "" - -#: ../../mod/profiles.php:589 -msgid "Homepage URL:" -msgstr "" - -#: ../../mod/profiles.php:590 ../../include/profile_advanced.php:50 -msgid "Hometown:" -msgstr "" - -#: ../../mod/profiles.php:591 ../../include/profile_advanced.php:54 -msgid "Political Views:" -msgstr "" - -#: ../../mod/profiles.php:592 -msgid "Religious Views:" -msgstr "" - -#: ../../mod/profiles.php:593 -msgid "Public Keywords:" -msgstr "" - -#: ../../mod/profiles.php:594 -msgid "Private Keywords:" -msgstr "" - -#: ../../mod/profiles.php:595 ../../include/profile_advanced.php:62 -msgid "Likes:" -msgstr "" - -#: ../../mod/profiles.php:596 ../../include/profile_advanced.php:64 -msgid "Dislikes:" -msgstr "" - -#: ../../mod/profiles.php:597 -msgid "Example: fishing photography software" -msgstr "" - -#: ../../mod/profiles.php:598 -msgid "(Used for suggesting potential friends, can be seen by others)" -msgstr "" - -#: ../../mod/profiles.php:599 -msgid "(Used for searching profiles, never shown to others)" -msgstr "" - -#: ../../mod/profiles.php:600 -msgid "Tell us about yourself..." -msgstr "" - -#: ../../mod/profiles.php:601 -msgid "Hobbies/Interests" -msgstr "" - -#: ../../mod/profiles.php:602 -msgid "Contact information and Social Networks" -msgstr "" - -#: ../../mod/profiles.php:603 -msgid "Musical interests" -msgstr "" - -#: ../../mod/profiles.php:604 -msgid "Books, literature" -msgstr "" - -#: ../../mod/profiles.php:605 -msgid "Television" -msgstr "" - -#: ../../mod/profiles.php:606 -msgid "Film/dance/culture/entertainment" +#: ../../mod/setup.php:209 +msgid "System check" msgstr "" -#: ../../mod/profiles.php:607 -msgid "Love/romance" +#: ../../mod/setup.php:213 ../../mod/events.php:348 +msgid "Next" msgstr "" -#: ../../mod/profiles.php:608 -msgid "Work/employment" +#: ../../mod/setup.php:214 +msgid "Check again" msgstr "" -#: ../../mod/profiles.php:609 -msgid "School/education" +#: ../../mod/setup.php:235 +msgid "Database connection" msgstr "" -#: ../../mod/profiles.php:614 +#: ../../mod/setup.php:236 msgid "" -"This is your <strong>public</strong> profile.<br />It <strong>may</strong> " -"be visible to anybody using the internet." -msgstr "" - -#: ../../mod/profiles.php:624 ../../mod/directory.php:109 -msgid "Age: " -msgstr "" - -#: ../../mod/profiles.php:663 -msgid "Edit/Manage Profiles" -msgstr "" - -#: ../../mod/profiles.php:664 ../../boot.php:1138 -msgid "Change profile photo" -msgstr "" - -#: ../../mod/profiles.php:665 ../../boot.php:1139 -msgid "Create New Profile" -msgstr "" - -#: ../../mod/profiles.php:676 ../../boot.php:1149 -msgid "Profile Image" -msgstr "" - -#: ../../mod/profiles.php:678 ../../boot.php:1152 -msgid "visible to everybody" -msgstr "" - -#: ../../mod/profiles.php:679 ../../boot.php:1153 -msgid "Edit visibility" -msgstr "" - -#: ../../mod/filer.php:29 ../../include/conversation.php:951 -msgid "Save to Folder:" -msgstr "" - -#: ../../mod/filer.php:29 -msgid "- select -" -msgstr "" - -#: ../../mod/tagger.php:103 ../../include/conversation.php:138 -#, php-format -msgid "%1$s tagged %2$s's %3$s with %4$s" -msgstr "" - -#: ../../mod/delegate.php:95 -msgid "No potential page delegates located." -msgstr "" - -#: ../../mod/delegate.php:121 -msgid "Delegate Page Management" +"In order to install Friendica we need to know how to connect to your " +"database." msgstr "" -#: ../../mod/delegate.php:123 +#: ../../mod/setup.php:237 msgid "" -"Delegates are able to manage all aspects of this account/page except for " -"basic account settings. Please do not delegate your personal account to " -"anybody that you do not trust completely." -msgstr "" - -#: ../../mod/delegate.php:124 -msgid "Existing Page Managers" -msgstr "" - -#: ../../mod/delegate.php:126 -msgid "Existing Page Delegates" -msgstr "" - -#: ../../mod/delegate.php:128 -msgid "Potential Delegates" -msgstr "" - -#: ../../mod/delegate.php:131 -msgid "Add" -msgstr "" - -#: ../../mod/delegate.php:132 -msgid "No entries." -msgstr "" - -#: ../../mod/babel.php:17 -msgid "Source (bbcode) text:" -msgstr "" - -#: ../../mod/babel.php:25 -msgid "Source input: " -msgstr "" - -#: ../../mod/babel.php:29 -msgid "bb2html: " -msgstr "" - -#: ../../mod/babel.php:33 -msgid "bb2html2bb: " -msgstr "" - -#: ../../mod/babel.php:37 -msgid "bb2md: " -msgstr "" - -#: ../../mod/babel.php:41 -msgid "bb2md2html: " -msgstr "" - -#: ../../mod/babel.php:45 -msgid "bb2dia2bb: " -msgstr "" - -#: ../../mod/babel.php:49 -msgid "bb2md2html2bb: " -msgstr "" - -#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:626 -#: ../../include/contact_widgets.php:34 -msgid "Friend Suggestions" +"Please contact your hosting provider or site administrator if you have " +"questions about these settings." msgstr "" -#: ../../mod/suggest.php:44 +#: ../../mod/setup.php:238 msgid "" -"No suggestions available. If this is a new site, please try again in 24 " -"hours." -msgstr "" - -#: ../../mod/suggest.php:61 -msgid "Ignore/Hide" -msgstr "" - -#: ../../mod/directory.php:47 ../../view/theme/diabook/theme.php:624 -msgid "Global Directory" -msgstr "" - -#: ../../mod/directory.php:55 -msgid "Find on this site" -msgstr "" - -#: ../../mod/directory.php:58 -msgid "Site Directory" +"The database you specify below should already exist. If it does not, please " +"create it before continuing." msgstr "" -#: ../../mod/directory.php:112 -msgid "Gender: " +#: ../../mod/setup.php:242 +msgid "Database Server Name" msgstr "" -#: ../../mod/directory.php:134 ../../include/profile_advanced.php:17 -#: ../../boot.php:1174 -msgid "Gender:" +#: ../../mod/setup.php:243 +msgid "Database Login Name" msgstr "" -#: ../../mod/directory.php:136 ../../include/profile_advanced.php:37 -#: ../../boot.php:1177 -msgid "Status:" +#: ../../mod/setup.php:244 +msgid "Database Login Password" msgstr "" -#: ../../mod/directory.php:138 ../../include/profile_advanced.php:48 -#: ../../boot.php:1179 -msgid "Homepage:" +#: ../../mod/setup.php:245 +msgid "Database Name" msgstr "" -#: ../../mod/directory.php:140 ../../include/profile_advanced.php:58 -msgid "About:" +#: ../../mod/setup.php:247 ../../mod/setup.php:287 +msgid "Site administrator email address" msgstr "" -#: ../../mod/directory.php:178 -msgid "No entries (some entries may be hidden)." +#: ../../mod/setup.php:247 ../../mod/setup.php:287 +msgid "" +"Your account email address must match this in order to use the web admin " +"panel." msgstr "" -#: ../../mod/invite.php:35 -#, php-format -msgid "%s : Not a valid email address." +#: ../../mod/setup.php:248 ../../mod/setup.php:289 +msgid "Website URL" msgstr "" -#: ../../mod/invite.php:59 -msgid "Please join us on Friendica" +#: ../../mod/setup.php:248 ../../mod/setup.php:289 +msgid "Please use SSL (https) URL if available." msgstr "" -#: ../../mod/invite.php:69 -#, php-format -msgid "%s : Message delivery failed." +#: ../../mod/setup.php:251 ../../mod/setup.php:292 +msgid "Please select a default timezone for your website" msgstr "" -#: ../../mod/invite.php:73 -#, php-format -msgid "%d message sent." -msgid_plural "%d messages sent." -msgstr[0] "" -msgstr[1] "" - -#: ../../mod/invite.php:92 -msgid "You have no more invitations available" +#: ../../mod/setup.php:277 +msgid "Site settings" msgstr "" -#: ../../mod/invite.php:100 -#, php-format -msgid "" -"Visit %s for a list of public sites that you can join. Friendica members on " -"other sites can all connect with each other, as well as with members of many " -"other social networks." +#: ../../mod/setup.php:332 +msgid "Could not find a command line version of PHP in the web server PATH." msgstr "" -#: ../../mod/invite.php:102 -#, php-format +#: ../../mod/setup.php:333 msgid "" -"To accept this invitation, please visit and register at %s or any other " -"public Friendica website." +"If you don't have a command line version of PHP installed on server, you " +"will not be able to run background polling via cron. See <a href='http://" +"friendica.com/node/27'>'Activating scheduled tasks'</a>" msgstr "" -#: ../../mod/invite.php:103 -#, php-format -msgid "" -"Friendica sites all inter-connect to create a huge privacy-enhanced social " -"web that is owned and controlled by its members. They can also connect with " -"many traditional social networks. See %s for a list of alternate Friendica " -"sites you can join." +#: ../../mod/setup.php:337 +msgid "PHP executable path" msgstr "" -#: ../../mod/invite.php:106 +#: ../../mod/setup.php:337 msgid "" -"Our apologies. This system is not currently configured to connect with other " -"public sites or invite members." -msgstr "" - -#: ../../mod/invite.php:111 -msgid "Send invitations" +"Enter full path to php executable. You can leave this blank to continue the " +"installation." msgstr "" -#: ../../mod/invite.php:112 -msgid "Enter email addresses, one per line:" +#: ../../mod/setup.php:342 +msgid "Command line PHP" msgstr "" -#: ../../mod/invite.php:114 +#: ../../mod/setup.php:351 msgid "" -"You are cordially invited to join me and other close friends on Friendica - " -"and help us to create a better social web." +"The command line version of PHP on your system does not have " +"\"register_argc_argv\" enabled." msgstr "" -#: ../../mod/invite.php:116 -msgid "You will need to supply this invitation code: $invite_code" +#: ../../mod/setup.php:352 +msgid "This is required for message delivery to work." msgstr "" -#: ../../mod/invite.php:116 -msgid "" -"Once you have registered, please connect with me via my profile page at:" +#: ../../mod/setup.php:354 +msgid "PHP register_argc_argv" msgstr "" -#: ../../mod/invite.php:118 +#: ../../mod/setup.php:375 msgid "" -"For more information about the Friendica project and why we feel it is " -"important, please visit http://friendica.com" +"Error: the \"openssl_pkey_new\" function on this system is not able to " +"generate encryption keys" msgstr "" -#: ../../mod/dfrn_confirm.php:119 +#: ../../mod/setup.php:376 msgid "" -"This may occasionally happen if contact was requested by both persons and it " -"has already been approved." -msgstr "" - -#: ../../mod/dfrn_confirm.php:237 -msgid "Response from remote site was not understood." -msgstr "" - -#: ../../mod/dfrn_confirm.php:246 -msgid "Unexpected response from remote site: " -msgstr "" - -#: ../../mod/dfrn_confirm.php:254 -msgid "Confirmation completed successfully." -msgstr "" - -#: ../../mod/dfrn_confirm.php:256 ../../mod/dfrn_confirm.php:270 -#: ../../mod/dfrn_confirm.php:277 -msgid "Remote site reported: " -msgstr "" - -#: ../../mod/dfrn_confirm.php:268 -msgid "Temporary failure. Please wait and try again." +"If running under Windows, please see \"http://www.php.net/manual/en/openssl." +"installation.php\"." msgstr "" -#: ../../mod/dfrn_confirm.php:275 -msgid "Introduction failed or was revoked." +#: ../../mod/setup.php:378 +msgid "Generate encryption keys" msgstr "" -#: ../../mod/dfrn_confirm.php:420 -msgid "Unable to set contact photo." +#: ../../mod/setup.php:385 +msgid "libCurl PHP module" msgstr "" -#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:577 -#: ../../include/conversation.php:101 -#, php-format -msgid "%1$s is now friends with %2$s" +#: ../../mod/setup.php:386 +msgid "GD graphics PHP module" msgstr "" -#: ../../mod/dfrn_confirm.php:562 -#, php-format -msgid "No user record found for '%s' " +#: ../../mod/setup.php:387 +msgid "OpenSSL PHP module" msgstr "" -#: ../../mod/dfrn_confirm.php:572 -msgid "Our site encryption key is apparently messed up." +#: ../../mod/setup.php:388 +msgid "mysqli PHP module" msgstr "" -#: ../../mod/dfrn_confirm.php:583 -msgid "Empty site URL was provided or URL could not be decrypted by us." +#: ../../mod/setup.php:389 +msgid "mb_string PHP module" msgstr "" -#: ../../mod/dfrn_confirm.php:604 -msgid "Contact record was not found for you on our site." +#: ../../mod/setup.php:390 +msgid "mcrypt PHP module" msgstr "" -#: ../../mod/dfrn_confirm.php:618 -#, php-format -msgid "Site public key not available in contact record for URL %s." +#: ../../mod/setup.php:395 ../../mod/setup.php:397 +msgid "Apache mod_rewrite module" msgstr "" -#: ../../mod/dfrn_confirm.php:638 +#: ../../mod/setup.php:395 msgid "" -"The ID provided by your system is a duplicate on our system. It should work " -"if you try again." -msgstr "" - -#: ../../mod/dfrn_confirm.php:649 -msgid "Unable to set your contact credentials on our system." -msgstr "" - -#: ../../mod/dfrn_confirm.php:716 -msgid "Unable to update your contact profile details on our system" -msgstr "" - -#: ../../mod/dfrn_confirm.php:750 -#, php-format -msgid "Connection accepted at %s" -msgstr "" - -#: ../../mod/dfrn_confirm.php:799 -#, php-format -msgid "%1$s has joined %2$s" -msgstr "" - -#: ../../addon/fromgplus/fromgplus.php:29 -msgid "Google+ Import Settings" -msgstr "" - -#: ../../addon/fromgplus/fromgplus.php:32 -msgid "Enable Google+ Import" +"Error: Apache webserver mod-rewrite module is required but not installed." msgstr "" -#: ../../addon/fromgplus/fromgplus.php:35 -msgid "Google Account ID" +#: ../../mod/setup.php:401 ../../mod/setup.php:404 +msgid "proc_open" msgstr "" -#: ../../addon/fromgplus/fromgplus.php:55 -msgid "Google+ Import Settings saved." +#: ../../mod/setup.php:401 +msgid "" +"Error: proc_open is required but is either not installed or has been " +"disabled in php.ini" msgstr "" -#: ../../addon/facebook/facebook.php:523 -msgid "Facebook disabled" +#: ../../mod/setup.php:409 +msgid "Error: libCURL PHP module required but not installed." msgstr "" -#: ../../addon/facebook/facebook.php:528 -msgid "Updating contacts" +#: ../../mod/setup.php:413 +msgid "" +"Error: GD graphics PHP module with JPEG support required but not installed." msgstr "" -#: ../../addon/facebook/facebook.php:551 -msgid "Facebook API key is missing." +#: ../../mod/setup.php:417 +msgid "Error: openssl PHP module required but not installed." msgstr "" -#: ../../addon/facebook/facebook.php:558 -msgid "Facebook Connect" +#: ../../mod/setup.php:421 +msgid "Error: mysqli PHP module required but not installed." msgstr "" -#: ../../addon/facebook/facebook.php:564 -msgid "Install Facebook connector for this account." +#: ../../mod/setup.php:425 +msgid "Error: mb_string PHP module required but not installed." msgstr "" -#: ../../addon/facebook/facebook.php:571 -msgid "Remove Facebook connector" +#: ../../mod/setup.php:429 +msgid "Error: mcrypt PHP module required but not installed." msgstr "" -#: ../../addon/facebook/facebook.php:576 +#: ../../mod/setup.php:445 msgid "" -"Re-authenticate [This is necessary whenever your Facebook password is " -"changed.]" -msgstr "" - -#: ../../addon/facebook/facebook.php:583 -msgid "Post to Facebook by default" +"The web installer needs to be able to create a file called \".htconfig.php\" " +"in the top folder of your web server and it is unable to do so." msgstr "" -#: ../../addon/facebook/facebook.php:589 +#: ../../mod/setup.php:446 msgid "" -"Facebook friend linking has been disabled on this site. The following " -"settings will have no effect." +"This is most often a permission setting, as the web server may not be able " +"to write files in your folder - even if you can." msgstr "" -#: ../../addon/facebook/facebook.php:593 +#: ../../mod/setup.php:447 msgid "" -"Facebook friend linking has been disabled on this site. If you disable it, " -"you will be unable to re-enable it." -msgstr "" - -#: ../../addon/facebook/facebook.php:596 -msgid "Link all your Facebook friends and conversations on this website" +"At the end of this procedure, we will give you a text to save in a file " +"named .htconfig.php in your Friendica top folder." msgstr "" -#: ../../addon/facebook/facebook.php:598 +#: ../../mod/setup.php:448 msgid "" -"Facebook conversations consist of your <em>profile wall</em> and your friend " -"<em>stream</em>." +"You can alternatively skip this procedure and perform a manual installation. " +"Please see the file \"install/INSTALL.txt\" for instructions." msgstr "" -#: ../../addon/facebook/facebook.php:599 -msgid "On this website, your Facebook friend stream is only visible to you." +#: ../../mod/setup.php:451 +msgid ".htconfig.php is writable" msgstr "" -#: ../../addon/facebook/facebook.php:600 +#: ../../mod/setup.php:461 msgid "" -"The following settings determine the privacy of your Facebook profile wall " -"on this website." +"Friendica uses the Smarty3 template engine to render its web views. Smarty3 " +"compiles templates to PHP to speed up rendering." msgstr "" -#: ../../addon/facebook/facebook.php:604 +#: ../../mod/setup.php:462 msgid "" -"On this website your Facebook profile wall conversations will only be " -"visible to you" -msgstr "" - -#: ../../addon/facebook/facebook.php:609 -msgid "Do not import your Facebook profile wall conversations" -msgstr "" - -#: ../../addon/facebook/facebook.php:611 -msgid "" -"If you choose to link conversations and leave both of these boxes unchecked, " -"your Facebook profile wall will be merged with your profile wall on this " -"website and your privacy settings on this website will be used to determine " -"who may see the conversations." -msgstr "" - -#: ../../addon/facebook/facebook.php:616 -msgid "Comma separated applications to ignore" -msgstr "" - -#: ../../addon/facebook/facebook.php:700 -msgid "Problems with Facebook Real-Time Updates" -msgstr "" - -#: ../../addon/facebook/facebook.php:729 -msgid "Facebook Connector Settings" -msgstr "" - -#: ../../addon/facebook/facebook.php:744 -msgid "Facebook API Key" +"In order to store these compiled templates, the web server needs to have " +"write access to the directory view/tpl/smarty3/ under the Friendica top " +"level folder." msgstr "" -#: ../../addon/facebook/facebook.php:754 +#: ../../mod/setup.php:463 msgid "" -"Error: it appears that you have specified the App-ID and -Secret in your ." -"htconfig.php file. As long as they are specified there, they cannot be set " -"using this form.<br><br>" +"Please ensure that the user that your web server runs as (e.g. www-data) has " +"write access to this folder." msgstr "" -#: ../../addon/facebook/facebook.php:759 +#: ../../mod/setup.php:464 msgid "" -"Error: the given API Key seems to be incorrect (the application access token " -"could not be retrieved)." +"Note: as a security measure, you should give the web server write access to " +"view/tpl/smarty3/ only--not the template files (.tpl) that it contains." msgstr "" -#: ../../addon/facebook/facebook.php:761 -msgid "The given API Key seems to work correctly." +#: ../../mod/setup.php:467 +msgid "view/tpl/smarty3 is writable" msgstr "" -#: ../../addon/facebook/facebook.php:763 +#: ../../mod/setup.php:479 msgid "" -"The correctness of the API Key could not be detected. Something strange's " -"going on." -msgstr "" - -#: ../../addon/facebook/facebook.php:766 -msgid "App-ID / API-Key" -msgstr "" - -#: ../../addon/facebook/facebook.php:767 -msgid "Application secret" +"Url rewrite in .htaccess is not working. Check your server configuration." msgstr "" -#: ../../addon/facebook/facebook.php:768 -#, php-format -msgid "Polling Interval in minutes (minimum %1$s minutes)" +#: ../../mod/setup.php:481 +msgid "Url rewrite is working" msgstr "" -#: ../../addon/facebook/facebook.php:769 +#: ../../mod/setup.php:491 msgid "" -"Synchronize comments (no comments on Facebook are missed, at the cost of " -"increased system load)" -msgstr "" - -#: ../../addon/facebook/facebook.php:773 -msgid "Real-Time Updates" -msgstr "" - -#: ../../addon/facebook/facebook.php:777 -msgid "Real-Time Updates are activated." -msgstr "" - -#: ../../addon/facebook/facebook.php:778 -msgid "Deactivate Real-Time Updates" -msgstr "" - -#: ../../addon/facebook/facebook.php:780 -msgid "Real-Time Updates not activated." -msgstr "" - -#: ../../addon/facebook/facebook.php:780 -msgid "Activate Real-Time Updates" +"The database configuration file \".htconfig.php\" could not be written. " +"Please use the enclosed text to create a configuration file in your web " +"server root." msgstr "" -#: ../../addon/facebook/facebook.php:799 ../../addon/dav/layout.fnk.php:360 -msgid "The new values have been saved." +#: ../../mod/setup.php:515 +msgid "Errors encountered creating database tables." msgstr "" -#: ../../addon/facebook/facebook.php:823 -msgid "Post to Facebook" +#: ../../mod/setup.php:526 +msgid "<h1>What next</h1>" msgstr "" -#: ../../addon/facebook/facebook.php:921 +#: ../../mod/setup.php:527 msgid "" -"Post to Facebook cancelled because of multi-network access permission " -"conflict." -msgstr "" - -#: ../../addon/facebook/facebook.php:1141 -msgid "View on Friendica" +"IMPORTANT: You will need to [manually] setup a scheduled task for the poller." msgstr "" -#: ../../addon/facebook/facebook.php:1174 -msgid "Facebook post failed. Queued for retry." +#: ../../mod/api.php:76 ../../mod/api.php:102 +msgid "Authorize application connection" msgstr "" -#: ../../addon/facebook/facebook.php:1214 -msgid "Your Facebook connection became invalid. Please Re-authenticate." +#: ../../mod/api.php:77 +msgid "Return to your app and insert this Securty Code:" msgstr "" -#: ../../addon/facebook/facebook.php:1215 -msgid "Facebook connection became invalid" +#: ../../mod/api.php:89 +msgid "Please login to continue." msgstr "" -#: ../../addon/facebook/facebook.php:1216 -#, php-format +#: ../../mod/api.php:104 msgid "" -"Hi %1$s,\n" -"\n" -"The connection between your accounts on %2$s and Facebook became invalid. " -"This usually happens after you change your Facebook-password. To enable the " -"connection again, you have to %3$sre-authenticate the Facebook-connector%4$s." -msgstr "" - -#: ../../addon/snautofollow/snautofollow.php:32 -msgid "StatusNet AutoFollow settings updated." -msgstr "" - -#: ../../addon/snautofollow/snautofollow.php:56 -msgid "StatusNet AutoFollow Settings" -msgstr "" - -#: ../../addon/snautofollow/snautofollow.php:58 -msgid "Automatically follow any StatusNet followers/mentioners" +"Do you want to authorize this application to access your posts and contacts, " +"and/or create new posts for you?" msgstr "" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:184 -msgid "Lifetime of the cache (in hours)" +#: ../../mod/apps.php:8 +msgid "No installed applications." msgstr "" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:189 -msgid "Cache Statistics" +#: ../../mod/apps.php:13 +msgid "Applications" msgstr "" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:192 -msgid "Number of items" +#: ../../mod/attach.php:9 +msgid "Item not available." msgstr "" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:194 -msgid "Size of the cache" +#: ../../mod/viewconnections.php:28 ../../mod/community.php:18 +#: ../../mod/directory.php:23 ../../mod/display.php:7 ../../mod/photos.php:554 +#: ../../mod/search.php:80 +msgid "Public access denied." msgstr "" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:196 -msgid "Delete the whole cache" +#: ../../mod/viewconnections.php:57 +msgid "No connections." msgstr "" -#: ../../addon/widgets/widget_like.php:58 -#, php-format -msgid "%d person likes this" -msgid_plural "%d people like this" -msgstr[0] "" -msgstr[1] "" - -#: ../../addon/widgets/widget_like.php:61 +#: ../../mod/viewconnections.php:69 ../../mod/nogroup.php:40 #, php-format -msgid "%d person doesn't like this" -msgid_plural "%d people don't like this" -msgstr[0] "" -msgstr[1] "" - -#: ../../addon/widgets/widget_friendheader.php:40 -msgid "Get added to this list!" -msgstr "" - -#: ../../addon/widgets/widgets.php:56 -msgid "Generate new key" -msgstr "" - -#: ../../addon/widgets/widgets.php:59 -msgid "Widgets key" -msgstr "" - -#: ../../addon/widgets/widgets.php:61 -msgid "Widgets available" -msgstr "" - -#: ../../addon/widgets/widget_friends.php:40 -msgid "Connect on Friendica!" -msgstr "" - -#: ../../addon/yourls/yourls.php:55 -msgid "YourLS Settings" -msgstr "" - -#: ../../addon/yourls/yourls.php:57 -msgid "URL: http://" -msgstr "" - -#: ../../addon/yourls/yourls.php:62 -msgid "Username:" -msgstr "" - -#: ../../addon/yourls/yourls.php:67 -msgid "Password:" -msgstr "" - -#: ../../addon/yourls/yourls.php:72 -msgid "Use SSL " -msgstr "" - -#: ../../addon/yourls/yourls.php:92 -msgid "yourls Settings saved." -msgstr "" - -#: ../../addon/ljpost/ljpost.php:39 -msgid "Post to LiveJournal" -msgstr "" - -#: ../../addon/ljpost/ljpost.php:70 -msgid "LiveJournal Post Settings" +msgid "Visit %s's profile [%s]" msgstr "" -#: ../../addon/ljpost/ljpost.php:72 -msgid "Enable LiveJournal Post Plugin" +#: ../../mod/viewconnections.php:83 +msgid "View Connnections" msgstr "" -#: ../../addon/ljpost/ljpost.php:77 -msgid "LiveJournal username" +#: ../../mod/channel.php:8 ../../mod/profile.php:8 ../../boot.php:1405 +msgid "Requested profile is not available." msgstr "" -#: ../../addon/ljpost/ljpost.php:82 -msgid "LiveJournal password" +#: ../../mod/subthread.php:105 +#, php-format +msgid "%1$s is following %2$s's %3$s" msgstr "" -#: ../../addon/ljpost/ljpost.php:87 -msgid "Post to LiveJournal by default" +#: ../../mod/chanview.php:74 ../../mod/wall_upload.php:35 +#: ../../mod/magic.php:59 ../../mod/page.php:21 +msgid "Channel not found." msgstr "" -#: ../../addon/nsfw/nsfw.php:47 -msgid "Not Safe For Work (General Purpose Content Filter) settings" +#: ../../mod/chanview.php:90 +msgid "toggle full screen mode" msgstr "" -#: ../../addon/nsfw/nsfw.php:49 +#: ../../mod/suggest.php:41 msgid "" -"This plugin looks in posts for the words/text you specify below, and " -"collapses any content containing those keywords so it is not displayed at " -"inappropriate times, such as sexual innuendo that may be improper in a work " -"setting. It is polite and recommended to tag any content containing nudity " -"with #NSFW. This filter can also match any other word/text you specify, and " -"can thereby be used as a general purpose content filter." +"No suggestions available. If this is a new site, please try again in 24 " +"hours." msgstr "" -#: ../../addon/nsfw/nsfw.php:50 -msgid "Enable Content filter" +#: ../../mod/suggest.php:58 +msgid "Ignore/Hide" msgstr "" -#: ../../addon/nsfw/nsfw.php:53 -msgid "Comma separated list of keywords to hide" +#: ../../mod/common.php:10 +msgid "No channel." msgstr "" -#: ../../addon/nsfw/nsfw.php:58 -msgid "Use /expression/ to provide regular expressions" +#: ../../mod/common.php:47 +msgid "Common connections" msgstr "" -#: ../../addon/nsfw/nsfw.php:74 -msgid "NSFW Settings saved." +#: ../../mod/common.php:52 +msgid "No connections in common." msgstr "" -#: ../../addon/nsfw/nsfw.php:121 +#: ../../mod/tagger.php:95 #, php-format -msgid "%s - Click to open/close" -msgstr "" - -#: ../../addon/page/page.php:61 ../../addon/page/page.php:91 -msgid "Forums" -msgstr "" - -#: ../../addon/page/page.php:129 -msgid "Forums:" -msgstr "" - -#: ../../addon/page/page.php:165 -msgid "Page settings updated." -msgstr "" - -#: ../../addon/page/page.php:194 -msgid "Page Settings" -msgstr "" - -#: ../../addon/page/page.php:196 -msgid "How many forums to display on sidebar without paging" -msgstr "" - -#: ../../addon/page/page.php:199 -msgid "Randomise Page/Forum list" -msgstr "" - -#: ../../addon/page/page.php:202 -msgid "Show pages/forums on profile page" -msgstr "" - -#: ../../addon/planets/planets.php:150 -msgid "Planets Settings" -msgstr "" - -#: ../../addon/planets/planets.php:152 -msgid "Enable Planets Plugin" -msgstr "" - -#: ../../addon/communityhome/communityhome.php:28 -#: ../../addon/communityhome/communityhome.php:34 -#: ../../addon/communityhome/twillingham/communityhome.php:28 -#: ../../addon/communityhome/twillingham/communityhome.php:34 -#: ../../include/nav.php:64 ../../boot.php:885 -msgid "Login" -msgstr "" - -#: ../../addon/communityhome/communityhome.php:29 -#: ../../addon/communityhome/twillingham/communityhome.php:29 -msgid "OpenID" -msgstr "" - -#: ../../addon/communityhome/communityhome.php:38 -#: ../../addon/communityhome/twillingham/communityhome.php:38 -msgid "Latest users" -msgstr "" - -#: ../../addon/communityhome/communityhome.php:81 -#: ../../addon/communityhome/twillingham/communityhome.php:81 -msgid "Most active users" -msgstr "" - -#: ../../addon/communityhome/communityhome.php:98 -msgid "Latest photos" -msgstr "" - -#: ../../addon/communityhome/communityhome.php:133 -msgid "Latest likes" -msgstr "" - -#: ../../addon/communityhome/communityhome.php:155 -#: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1319 -#: ../../include/conversation.php:45 ../../include/conversation.php:118 -msgid "event" -msgstr "" - -#: ../../addon/dav/common/wdcal_configuration.php:126 -msgid "U.S. Time Format (mm/dd/YYYY)" -msgstr "" - -#: ../../addon/dav/common/wdcal_configuration.php:205 -msgid "German Time Format (dd.mm.YYYY)" -msgstr "" - -#: ../../addon/dav/common/calendar.fnk.php:517 -#: ../../addon/dav/common/calendar.fnk.php:533 -#: ../../addon/dav/layout.fnk.php:200 -msgid "Error" -msgstr "" - -#: ../../addon/dav/common/calendar.fnk.php:568 -#: ../../addon/dav/common/calendar.fnk.php:637 -#: ../../addon/dav/common/calendar.fnk.php:664 -#: ../../addon/dav/layout.fnk.php:231 -msgid "No access" -msgstr "" - -#: ../../addon/dav/layout.fnk.php:119 -msgid "New event" -msgstr "" - -#: ../../addon/dav/layout.fnk.php:123 -msgid "Today" -msgstr "" - -#: ../../addon/dav/layout.fnk.php:132 -msgid "Day" -msgstr "" - -#: ../../addon/dav/layout.fnk.php:139 -msgid "Week" -msgstr "" - -#: ../../addon/dav/layout.fnk.php:146 -msgid "Month" -msgstr "" - -#: ../../addon/dav/layout.fnk.php:151 -msgid "Reload" -msgstr "" - -#: ../../addon/dav/layout.fnk.php:162 -msgid "Date" -msgstr "" - -#: ../../addon/dav/layout.fnk.php:224 -msgid "Not found" -msgstr "" - -#: ../../addon/dav/layout.fnk.php:292 ../../addon/dav/layout.fnk.php:365 -msgid "Go back to the calendar" -msgstr "" - -#: ../../addon/dav/layout.fnk.php:300 -msgid "Starts" -msgstr "" - -#: ../../addon/dav/layout.fnk.php:305 -msgid "Ends" -msgstr "" - -#: ../../addon/dav/layout.fnk.php:312 -msgid "Description" -msgstr "" - -#: ../../addon/dav/layout.fnk.php:315 -msgid "Notification" -msgstr "" - -#: ../../addon/dav/layout.fnk.php:324 -msgid "Minutes" -msgstr "" - -#: ../../addon/dav/layout.fnk.php:327 -msgid "Hours" -msgstr "" - -#: ../../addon/dav/layout.fnk.php:330 -msgid "Days" -msgstr "" - -#: ../../addon/dav/layout.fnk.php:331 -msgid "before" -msgstr "" - -#: ../../addon/dav/layout.fnk.php:367 -msgid "Calendar Settings" -msgstr "" - -#: ../../addon/dav/layout.fnk.php:373 -msgid "Date format" -msgstr "" - -#: ../../addon/dav/layout.fnk.php:382 -msgid "Time zone" -msgstr "" - -#: ../../addon/dav/layout.fnk.php:387 -msgid "Limitations" -msgstr "" - -#: ../../addon/dav/layout.fnk.php:391 -msgid "Warning" -msgstr "" - -#: ../../addon/dav/layout.fnk.php:395 -msgid "Synchronization (iPhone, Thunderbird Lightning, Android, ...)" -msgstr "" - -#: ../../addon/dav/layout.fnk.php:402 -msgid "Synchronizing this calendar with the iPhone" -msgstr "" - -#: ../../addon/dav/layout.fnk.php:413 -msgid "Synchronizing your Friendica-Contacts with the iPhone" -msgstr "" - -#: ../../addon/dav/dav_carddav_backend_friendica_community.inc.php:37 -msgid "Friendica-Contacts" -msgstr "" - -#: ../../addon/dav/dav_carddav_backend_friendica_community.inc.php:38 -msgid "Your Friendica-Contacts" -msgstr "" - -#: ../../addon/dav/main.php:244 -msgid "Calendar" -msgstr "" - -#: ../../addon/dav/main.php:247 -msgid "Extended calendar with CalDAV-support" -msgstr "" - -#: ../../addon/dav/main.php:263 -msgid "The database tables have been installed." -msgstr "" - -#: ../../addon/dav/main.php:264 -msgid "An error occurred during the installation." -msgstr "" - -#: ../../addon/dav/main.php:280 -msgid "No system-wide settings yet." -msgstr "" - -#: ../../addon/dav/main.php:283 -msgid "Database status" -msgstr "" - -#: ../../addon/dav/main.php:286 -msgid "Installed" -msgstr "" - -#: ../../addon/dav/main.php:289 -msgid "Upgrade needed" -msgstr "" - -#: ../../addon/dav/main.php:289 -msgid "Upgrade" -msgstr "" - -#: ../../addon/dav/main.php:292 -msgid "Not installed" -msgstr "" - -#: ../../addon/dav/main.php:292 -msgid "Install" -msgstr "" - -#: ../../addon/dav/main.php:297 -msgid "Troubleshooting" -msgstr "" - -#: ../../addon/dav/main.php:298 -msgid "Manual creation of the database tables:" +msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "" -#: ../../addon/dav/main.php:299 -msgid "Show SQL-statements" +#: ../../mod/community.php:23 +msgid "Not available." msgstr "" -#: ../../addon/dav/calendar.friendica.fnk.php:151 -msgid "Private Calendar" +#: ../../mod/community.php:32 +msgid "Community" msgstr "" -#: ../../addon/dav/calendar.friendica.fnk.php:158 -msgid "Friendica Events: Mine" +#: ../../mod/community.php:63 ../../mod/community.php:88 +#: ../../mod/search.php:255 +msgid "No results." msgstr "" -#: ../../addon/dav/calendar.friendica.fnk.php:161 -msgid "Friendica Events: Contacts" +#: ../../mod/post.php:101 +msgid "" +"Remote authentication blocked. You are logged into this site locally. Please " +"logout and retry." msgstr "" -#: ../../addon/uhremotestorage/uhremotestorage.php:84 +#: ../../mod/post.php:110 #, php-format -msgid "" -"Allow to use your friendica id (%s) to connecto to external unhosted-enabled " -"storage (like ownCloud). See <a href=\"http://www.w3.org/community/unhosted/" -"wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>" +msgid "Welcome %s. Remote authentication successful." msgstr "" -#: ../../addon/uhremotestorage/uhremotestorage.php:85 -msgid "Template URL (with {category})" +#: ../../mod/connections.php:59 +msgid "Could not access contact record." msgstr "" -#: ../../addon/uhremotestorage/uhremotestorage.php:86 -msgid "OAuth end-point" +#: ../../mod/connections.php:73 +msgid "Could not locate selected profile." msgstr "" -#: ../../addon/uhremotestorage/uhremotestorage.php:87 -msgid "Api" +#: ../../mod/connections.php:112 ../../mod/intro.php:29 +msgid "Connection updated." msgstr "" -#: ../../addon/membersince/membersince.php:18 -msgid "Member since:" +#: ../../mod/connections.php:114 +msgid "Failed to update connection record." msgstr "" -#: ../../addon/tictac/tictac.php:20 -msgid "Three Dimensional Tic-Tac-Toe" +#: ../../mod/connections.php:167 +msgid "Could not access address book record." msgstr "" -#: ../../addon/tictac/tictac.php:53 -msgid "3D Tic-Tac-Toe" +#: ../../mod/connections.php:181 +msgid "Refresh failed - channel is currently unavailable." msgstr "" -#: ../../addon/tictac/tictac.php:58 -msgid "New game" +#: ../../mod/connections.php:188 +msgid "Channel has been unblocked" msgstr "" -#: ../../addon/tictac/tictac.php:59 -msgid "New game with handicap" +#: ../../mod/connections.php:189 +msgid "Channel has been blocked" msgstr "" -#: ../../addon/tictac/tictac.php:60 -msgid "" -"Three dimensional tic-tac-toe is just like the traditional game except that " -"it is played on multiple levels simultaneously. " +#: ../../mod/connections.php:191 ../../mod/connections.php:201 +#: ../../mod/connections.php:211 ../../mod/connections.php:221 +#: ../../mod/connections.php:234 +msgid "Unable to set address book parameters." msgstr "" -#: ../../addon/tictac/tictac.php:61 -msgid "" -"In this case there are three levels. You win by getting three in a row on " -"any level, as well as up, down, and diagonally across the different levels." +#: ../../mod/connections.php:198 +msgid "Channel has been unignored" msgstr "" -#: ../../addon/tictac/tictac.php:63 -msgid "" -"The handicap game disables the center position on the middle level because " -"the player claiming this square often has an unfair advantage." +#: ../../mod/connections.php:199 +msgid "Channel has been ignored" msgstr "" -#: ../../addon/tictac/tictac.php:182 -msgid "You go first..." +#: ../../mod/connections.php:208 +msgid "Channel has been unarchived" msgstr "" -#: ../../addon/tictac/tictac.php:187 -msgid "I'm going first this time..." +#: ../../mod/connections.php:209 +msgid "Channel has been archived" msgstr "" -#: ../../addon/tictac/tictac.php:193 -msgid "You won!" +#: ../../mod/connections.php:218 +msgid "Channel has been unhidden" msgstr "" -#: ../../addon/tictac/tictac.php:199 ../../addon/tictac/tictac.php:224 -msgid "\"Cat\" game!" +#: ../../mod/connections.php:219 +msgid "Channel has been hidden" msgstr "" -#: ../../addon/tictac/tictac.php:222 -msgid "I won!" +#: ../../mod/connections.php:231 +msgid "Channel has been approved" msgstr "" -#: ../../addon/randplace/randplace.php:169 -msgid "Randplace Settings" +#: ../../mod/connections.php:232 +msgid "Channel has been unapproved" msgstr "" -#: ../../addon/randplace/randplace.php:171 -msgid "Enable Randplace Plugin" +#: ../../mod/connections.php:247 +msgid "Contact has been removed." msgstr "" -#: ../../addon/dwpost/dwpost.php:39 -msgid "Post to Dreamwidth" +#: ../../mod/connections.php:267 +#, php-format +msgid "View %s's profile" msgstr "" -#: ../../addon/dwpost/dwpost.php:70 -msgid "Dreamwidth Post Settings" +#: ../../mod/connections.php:271 +msgid "Refresh Permissions" msgstr "" -#: ../../addon/dwpost/dwpost.php:72 -msgid "Enable dreamwidth Post Plugin" +#: ../../mod/connections.php:274 +msgid "Fetch updated permissions" msgstr "" -#: ../../addon/dwpost/dwpost.php:77 -msgid "dreamwidth username" +#: ../../mod/connections.php:281 +msgid "Block or Unblock this connection" msgstr "" -#: ../../addon/dwpost/dwpost.php:82 -msgid "dreamwidth password" +#: ../../mod/connections.php:285 ../../mod/connections.php:409 +msgid "Unignore" msgstr "" -#: ../../addon/dwpost/dwpost.php:87 -msgid "Post to dreamwidth by default" +#: ../../mod/connections.php:285 ../../mod/connections.php:409 +#: ../../mod/intro.php:17 ../../mod/intro.php:100 +#: ../../mod/notifications.php:51 ../../mod/notifications.php:160 +#: ../../mod/notifications.php:206 +msgid "Ignore" msgstr "" -#: ../../addon/drpost/drpost.php:35 -msgid "Post to Drupal" +#: ../../mod/connections.php:288 +msgid "Ignore or Unignore this connection" msgstr "" -#: ../../addon/drpost/drpost.php:72 -msgid "Drupal Post Settings" +#: ../../mod/connections.php:291 +msgid "Unarchive" msgstr "" -#: ../../addon/drpost/drpost.php:74 -msgid "Enable Drupal Post Plugin" +#: ../../mod/connections.php:291 +msgid "Archive" msgstr "" -#: ../../addon/drpost/drpost.php:79 -msgid "Drupal username" +#: ../../mod/connections.php:294 +msgid "Archive or Unarchive this connection" msgstr "" -#: ../../addon/drpost/drpost.php:84 -msgid "Drupal password" +#: ../../mod/connections.php:297 +msgid "Unhide" msgstr "" -#: ../../addon/drpost/drpost.php:89 -msgid "Post Type - article,page,or blog" +#: ../../mod/connections.php:297 +msgid "Hide" msgstr "" -#: ../../addon/drpost/drpost.php:94 -msgid "Drupal site URL" +#: ../../mod/connections.php:300 +msgid "Hide or Unhide this connection" msgstr "" -#: ../../addon/drpost/drpost.php:99 -msgid "Drupal site uses clean URLS" +#: ../../mod/connections.php:307 +msgid "Delete this connection" msgstr "" -#: ../../addon/drpost/drpost.php:104 -msgid "Post to Drupal by default" +#: ../../mod/connections.php:334 ../../mod/network.php:375 +msgid "Me" msgstr "" -#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:201 -#: ../../addon/blogger/blogger.php:172 ../../addon/posterous/posterous.php:189 -msgid "Post from Friendica" +#: ../../mod/connections.php:336 ../../mod/network.php:376 +msgid "Best Friends" msgstr "" -#: ../../addon/startpage/startpage.php:83 -msgid "Startpage Settings" +#: ../../mod/connections.php:338 ../../mod/network.php:379 +msgid "Former Friends" msgstr "" -#: ../../addon/startpage/startpage.php:85 -msgid "Home page to load after login - leave blank for profile wall" +#: ../../mod/connections.php:339 ../../mod/network.php:380 +msgid "Acquaintances" msgstr "" -#: ../../addon/startpage/startpage.php:88 -msgid "Examples: "network" or "notifications/system"" +#: ../../mod/connections.php:340 +msgid "Unknown" msgstr "" -#: ../../addon/geonames/geonames.php:143 -msgid "Geonames settings updated." +#: ../../mod/connections.php:350 ../../mod/connections.php:370 +msgid "Approve this connection" msgstr "" -#: ../../addon/geonames/geonames.php:179 -msgid "Geonames Settings" +#: ../../mod/connections.php:350 +msgid "Accept connection to allow communication" msgstr "" -#: ../../addon/geonames/geonames.php:181 -msgid "Enable Geonames Plugin" +#: ../../mod/connections.php:358 +msgid "Automatic Permissions Settings" msgstr "" -#: ../../addon/public_server/public_server.php:126 -#: ../../addon/testdrive/testdrive.php:94 +#: ../../mod/connections.php:358 #, php-format -msgid "Your account on %s will expire in a few days." -msgstr "" - -#: ../../addon/public_server/public_server.php:127 -msgid "Your Friendica account is about to expire." +msgid "Connections: settings for %s" msgstr "" -#: ../../addon/public_server/public_server.php:128 -#, php-format +#: ../../mod/connections.php:362 msgid "" -"Hi %1$s,\n" -"\n" -"Your account on %2$s will expire in less than five days. You may keep your " -"account by logging in at least once every 30 days" -msgstr "" - -#: ../../addon/js_upload/js_upload.php:43 -msgid "Upload a file" +"When receiving a channel introduction, any permissions provided here will be " +"applied to the new connection automatically and the introduction approved. " +"Leave this page if you do not wish to use this feature." msgstr "" -#: ../../addon/js_upload/js_upload.php:44 -msgid "Drop files here to upload" +#: ../../mod/connections.php:364 +msgid "Slide to adjust your degree of friendship" msgstr "" -#: ../../addon/js_upload/js_upload.php:46 -msgid "Failed" +#: ../../mod/connections.php:371 +msgid "Connection has no permissions!" msgstr "" -#: ../../addon/js_upload/js_upload.php:297 -msgid "No files were uploaded." -msgstr "" - -#: ../../addon/js_upload/js_upload.php:303 -msgid "Uploaded file is empty" -msgstr "" - -#: ../../addon/js_upload/js_upload.php:326 -msgid "File has an invalid extension, it should be one of " -msgstr "" - -#: ../../addon/js_upload/js_upload.php:337 -msgid "Upload was cancelled, or server error encountered" -msgstr "" - -#: ../../addon/oembed.old/oembed.php:30 -msgid "OEmbed settings updated" -msgstr "" - -#: ../../addon/oembed.old/oembed.php:43 -msgid "Use OEmbed for YouTube videos" -msgstr "" - -#: ../../addon/oembed.old/oembed.php:71 -msgid "URL to embed:" -msgstr "" - -#: ../../addon/impressum/impressum.php:36 -msgid "Impressum" -msgstr "" - -#: ../../addon/impressum/impressum.php:49 -#: ../../addon/impressum/impressum.php:51 -#: ../../addon/impressum/impressum.php:83 -msgid "Site Owner" -msgstr "" - -#: ../../addon/impressum/impressum.php:49 -#: ../../addon/impressum/impressum.php:87 -msgid "Email Address" -msgstr "" - -#: ../../addon/impressum/impressum.php:54 -#: ../../addon/impressum/impressum.php:85 -msgid "Postal Address" +#: ../../mod/connections.php:373 +msgid "Profile Visibility" msgstr "" -#: ../../addon/impressum/impressum.php:60 +#: ../../mod/connections.php:374 +#, php-format msgid "" -"The impressum addon needs to be configured!<br />Please add at least the " -"<tt>owner</tt> variable to your config file. For other variables please " -"refer to the README file of the addon." -msgstr "" - -#: ../../addon/impressum/impressum.php:83 -msgid "The page operators name." -msgstr "" - -#: ../../addon/impressum/impressum.php:84 -msgid "Site Owners Profile" -msgstr "" - -#: ../../addon/impressum/impressum.php:84 -msgid "Profile address of the operator." -msgstr "" - -#: ../../addon/impressum/impressum.php:85 -msgid "How to contact the operator via snail mail. You can use BBCode here." +"Please choose the profile you would like to display to %s when viewing your " +"profile securely." msgstr "" -#: ../../addon/impressum/impressum.php:86 -msgid "Notes" +#: ../../mod/connections.php:375 +msgid "Contact Information / Notes" msgstr "" -#: ../../addon/impressum/impressum.php:86 -msgid "" -"Additional notes that are displayed beneath the contact information. You can " -"use BBCode here." +#: ../../mod/connections.php:376 +msgid "Edit contact notes" msgstr "" -#: ../../addon/impressum/impressum.php:87 -msgid "How to contact the operator via email. (will be displayed obfuscated)" +#: ../../mod/connections.php:378 +msgid "Their Settings" msgstr "" -#: ../../addon/impressum/impressum.php:88 -msgid "Footer note" +#: ../../mod/connections.php:379 +msgid "My Settings" msgstr "" -#: ../../addon/impressum/impressum.php:88 -msgid "Text for the footer. You can use BBCode here." +#: ../../mod/connections.php:381 +msgid "Forum Members" msgstr "" -#: ../../addon/buglink/buglink.php:15 -msgid "Report Bug" +#: ../../mod/connections.php:382 +msgid "Soapbox" msgstr "" -#: ../../addon/notimeline/notimeline.php:32 -msgid "No Timeline settings updated." +#: ../../mod/connections.php:383 +msgid "Full Sharing" msgstr "" -#: ../../addon/notimeline/notimeline.php:56 -msgid "No Timeline Settings" +#: ../../mod/connections.php:384 +msgid "Cautious Sharing" msgstr "" -#: ../../addon/notimeline/notimeline.php:58 -msgid "Disable Archive selector on profile wall" +#: ../../mod/connections.php:385 +msgid "Follow Only" msgstr "" -#: ../../addon/blockem/blockem.php:51 -msgid "\"Blockem\" Settings" +#: ../../mod/connections.php:386 ../../mod/photos.php:756 +#: ../../mod/photos.php:1088 +msgid "Permissions" msgstr "" -#: ../../addon/blockem/blockem.php:53 -msgid "Comma separated profile URLS to block" +#: ../../mod/connections.php:387 +msgid "Advanced Permissions" msgstr "" -#: ../../addon/blockem/blockem.php:70 -msgid "BLOCKEM Settings saved." +#: ../../mod/connections.php:388 +msgid "Quick Links" msgstr "" -#: ../../addon/blockem/blockem.php:105 +#: ../../mod/connections.php:392 #, php-format -msgid "Blocked %s - Click to open/close" -msgstr "" - -#: ../../addon/blockem/blockem.php:160 -msgid "Unblock Author" +msgid "Visit %s's profile - %s" msgstr "" -#: ../../addon/blockem/blockem.php:162 -msgid "Block Author" -msgstr "" - -#: ../../addon/blockem/blockem.php:194 -msgid "blockem settings updated" -msgstr "" - -#: ../../addon/qcomment/qcomment.php:51 -msgid ":-)" -msgstr "" - -#: ../../addon/qcomment/qcomment.php:51 -msgid ":-(" -msgstr "" - -#: ../../addon/qcomment/qcomment.php:51 -msgid "lol" -msgstr "" - -#: ../../addon/qcomment/qcomment.php:54 -msgid "Quick Comment Settings" -msgstr "" - -#: ../../addon/qcomment/qcomment.php:56 -msgid "" -"Quick comments are found near comment boxes, sometimes hidden. Click them to " -"provide simple replies." +#: ../../mod/connections.php:393 +msgid "Block/Unblock contact" msgstr "" -#: ../../addon/qcomment/qcomment.php:57 -msgid "Enter quick comments, one per line" +#: ../../mod/connections.php:394 +msgid "Ignore contact" msgstr "" -#: ../../addon/qcomment/qcomment.php:75 -msgid "Quick Comment settings saved." +#: ../../mod/connections.php:395 +msgid "Repair URL settings" msgstr "" -#: ../../addon/openstreetmap/openstreetmap.php:71 -msgid "Tile Server URL" +#: ../../mod/connections.php:396 +msgid "View conversations" msgstr "" -#: ../../addon/openstreetmap/openstreetmap.php:71 -msgid "" -"A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank" -"\">public tile servers</a>" +#: ../../mod/connections.php:398 +msgid "Delete contact" msgstr "" -#: ../../addon/openstreetmap/openstreetmap.php:72 -msgid "Default zoom" +#: ../../mod/connections.php:401 +msgid "Last update:" msgstr "" -#: ../../addon/openstreetmap/openstreetmap.php:72 -msgid "The default zoom level. (1:world, 18:highest)" +#: ../../mod/connections.php:403 +msgid "Update public posts" msgstr "" -#: ../../addon/libertree/libertree.php:36 -msgid "Post to libertree" +#: ../../mod/connections.php:405 +msgid "Update now" msgstr "" -#: ../../addon/libertree/libertree.php:67 -msgid "libertree Post Settings" +#: ../../mod/connections.php:410 +msgid "Currently blocked" msgstr "" -#: ../../addon/libertree/libertree.php:69 -msgid "Enable Libertree Post Plugin" +#: ../../mod/connections.php:411 +msgid "Currently ignored" msgstr "" -#: ../../addon/libertree/libertree.php:74 -msgid "Libertree API token" +#: ../../mod/connections.php:412 +msgid "Currently archived" msgstr "" -#: ../../addon/libertree/libertree.php:79 -msgid "Libertree site URL" +#: ../../mod/connections.php:413 +msgid "Currently pending" msgstr "" -#: ../../addon/libertree/libertree.php:84 -msgid "Post to Libertree by default" +#: ../../mod/connections.php:414 ../../mod/intro.php:95 +#: ../../mod/notifications.php:153 ../../mod/notifications.php:200 +msgid "Hide this contact from others" msgstr "" -#: ../../addon/mathjax/mathjax.php:37 +#: ../../mod/connections.php:414 msgid "" -"The MathJax addon renders mathematical formulae written using the LaTeX " -"syntax surrounded by the usual $$ or an eqnarray block in the postings of " -"your wall,network tab and private mail." +"Replies/likes to your public posts <strong>may</strong> still be visible" msgstr "" -#: ../../addon/mathjax/mathjax.php:38 -msgid "Use the MathJax renderer" +#: ../../mod/connections.php:450 ../../mod/connections.php:521 +msgid "Blocked" msgstr "" -#: ../../addon/mathjax/mathjax.php:74 -msgid "MathJax Base URL" +#: ../../mod/connections.php:455 ../../mod/connections.php:528 +msgid "Ignored" msgstr "" -#: ../../addon/mathjax/mathjax.php:74 -msgid "" -"The URL for the javascript file that should be included to use MathJax. Can " -"be either the MathJax CDN or another installation of MathJax." +#: ../../mod/connections.php:460 ../../mod/connections.php:542 +msgid "Hidden" msgstr "" -#: ../../addon/editplain/editplain.php:46 -msgid "Editplain settings updated." +#: ../../mod/connections.php:465 ../../mod/connections.php:535 +msgid "Archived" msgstr "" -#: ../../addon/editplain/editplain.php:76 -msgid "Editplain Settings" +#: ../../mod/connections.php:470 ../../mod/network.php:311 +msgid "New" msgstr "" -#: ../../addon/editplain/editplain.php:78 -msgid "Disable richtext status editor" +#: ../../mod/connections.php:475 +msgid "All" msgstr "" -#: ../../addon/gravatar/gravatar.php:71 -msgid "generic profile image" +#: ../../mod/connections.php:496 +msgid "Suggestions" msgstr "" -#: ../../addon/gravatar/gravatar.php:72 -msgid "random geometric pattern" +#: ../../mod/connections.php:499 +msgid "Suggest new connections" msgstr "" -#: ../../addon/gravatar/gravatar.php:73 -msgid "monster face" +#: ../../mod/connections.php:505 +msgid "Show pending (new) connections" msgstr "" -#: ../../addon/gravatar/gravatar.php:74 -msgid "computer generated face" +#: ../../mod/connections.php:508 +msgid "All Connections" msgstr "" -#: ../../addon/gravatar/gravatar.php:75 -msgid "retro arcade style face" +#: ../../mod/connections.php:511 +msgid "Show all connections" msgstr "" -#: ../../addon/gravatar/gravatar.php:87 -msgid "Default avatar image" +#: ../../mod/connections.php:514 +msgid "Unblocked" msgstr "" -#: ../../addon/gravatar/gravatar.php:87 -msgid "Select default avatar image if none was found at Gravatar. See README" +#: ../../mod/connections.php:517 +msgid "Only show unblocked connections" msgstr "" -#: ../../addon/gravatar/gravatar.php:88 -msgid "Rating of images" +#: ../../mod/connections.php:524 +msgid "Only show blocked connections" msgstr "" -#: ../../addon/gravatar/gravatar.php:88 -msgid "Select the appropriate avatar rating for your site. See README" +#: ../../mod/connections.php:531 +msgid "Only show ignored connections" msgstr "" -#: ../../addon/gravatar/gravatar.php:102 -msgid "Gravatar settings updated." +#: ../../mod/connections.php:538 +msgid "Only show archived connections" msgstr "" -#: ../../addon/testdrive/testdrive.php:95 -msgid "Your Friendica test account is about to expire." +#: ../../mod/connections.php:545 +msgid "Only show hidden connections" msgstr "" -#: ../../addon/testdrive/testdrive.php:96 +#: ../../mod/connections.php:587 #, php-format -msgid "" -"Hi %1$s,\n" -"\n" -"Your test account on %2$s will expire in less than five days. We hope you " -"enjoyed this test drive and use this opportunity to find a permanent " -"Friendica website for your integrated social communications. A list of " -"public sites is available at http://dir.friendica.com/siteinfo - and for " -"more information on setting up your own Friendica server please see the " -"Friendica project website at http://friendica.com." -msgstr "" - -#: ../../addon/pageheader/pageheader.php:50 -msgid "\"pageheader\" Settings" -msgstr "" - -#: ../../addon/pageheader/pageheader.php:68 -msgid "pageheader Settings saved." +msgid "%1$s [%2$s]" msgstr "" -#: ../../addon/ijpost/ijpost.php:39 -msgid "Post to Insanejournal" +#: ../../mod/connections.php:588 ../../mod/nogroup.php:41 +msgid "Edit contact" msgstr "" -#: ../../addon/ijpost/ijpost.php:70 -msgid "InsaneJournal Post Settings" +#: ../../mod/connections.php:614 +msgid "Search your connections" msgstr "" -#: ../../addon/ijpost/ijpost.php:72 -msgid "Enable InsaneJournal Post Plugin" +#: ../../mod/connections.php:615 +msgid "Finding: " msgstr "" -#: ../../addon/ijpost/ijpost.php:77 -msgid "InsaneJournal username" +#: ../../mod/settings.php:43 +msgid "Account settings" msgstr "" -#: ../../addon/ijpost/ijpost.php:82 -msgid "InsaneJournal password" +#: ../../mod/settings.php:49 +msgid "Channel settings" msgstr "" -#: ../../addon/ijpost/ijpost.php:87 -msgid "Post to InsaneJournal by default" +#: ../../mod/settings.php:55 +msgid "Additional features" msgstr "" -#: ../../addon/viewsrc/viewsrc.php:37 -msgid "View Source" +#: ../../mod/settings.php:61 +msgid "Feature settings" msgstr "" -#: ../../addon/statusnet/statusnet.php:134 -msgid "Post to StatusNet" +#: ../../mod/settings.php:67 +msgid "Display settings" msgstr "" -#: ../../addon/statusnet/statusnet.php:176 -msgid "" -"Please contact your site administrator.<br />The provided API URL is not " -"valid." +#: ../../mod/settings.php:73 +msgid "Connected apps" msgstr "" -#: ../../addon/statusnet/statusnet.php:204 -msgid "We could not contact the StatusNet API with the Path you entered." +#: ../../mod/settings.php:79 +msgid "Export channel" msgstr "" -#: ../../addon/statusnet/statusnet.php:232 -msgid "StatusNet settings updated." +#: ../../mod/settings.php:91 +msgid "Automatic Permissions (Advanced)" msgstr "" -#: ../../addon/statusnet/statusnet.php:257 -msgid "StatusNet Posting Settings" +#: ../../mod/settings.php:146 +msgid "Missing some important data!" msgstr "" -#: ../../addon/statusnet/statusnet.php:271 -msgid "Globally Available StatusNet OAuthKeys" +#: ../../mod/settings.php:149 ../../mod/settings.php:621 +msgid "Update" msgstr "" -#: ../../addon/statusnet/statusnet.php:272 -msgid "" -"There are preconfigured OAuth key pairs for some StatusNet servers " -"available. If you are useing one of them, please use these credentials. If " -"not feel free to connect to any other StatusNet instance (see below)." +#: ../../mod/settings.php:259 +msgid "Passwords do not match. Password unchanged." msgstr "" -#: ../../addon/statusnet/statusnet.php:280 -msgid "Provide your own OAuth Credentials" +#: ../../mod/settings.php:263 +msgid "Empty passwords are not allowed. Password unchanged." msgstr "" -#: ../../addon/statusnet/statusnet.php:281 -msgid "" -"No consumer key pair for StatusNet found. Register your Friendica Account as " -"an desktop client on your StatusNet account, copy the consumer key pair here " -"and enter the API base root.<br />Before you register your own OAuth key " -"pair ask the administrator if there is already a key pair for this Friendica " -"installation at your favorited StatusNet installation." +#: ../../mod/settings.php:276 +msgid "Password changed." msgstr "" -#: ../../addon/statusnet/statusnet.php:283 -msgid "OAuth Consumer Key" +#: ../../mod/settings.php:278 +msgid "Password update failed. Please try again." msgstr "" -#: ../../addon/statusnet/statusnet.php:286 -msgid "OAuth Consumer Secret" +#: ../../mod/settings.php:292 +msgid "Not valid email." msgstr "" -#: ../../addon/statusnet/statusnet.php:289 -msgid "Base API Path (remember the trailing /)" +#: ../../mod/settings.php:295 +msgid "Protected email. Cannot change to that email." msgstr "" -#: ../../addon/statusnet/statusnet.php:310 -msgid "" -"To connect to your StatusNet account click the button below to get a " -"security code from StatusNet which you have to copy into the input box below " -"and submit the form. Only your <strong>public</strong> posts will be posted " -"to StatusNet." +#: ../../mod/settings.php:304 +msgid "System failure storing new email. Please try again." msgstr "" -#: ../../addon/statusnet/statusnet.php:311 -msgid "Log in with StatusNet" +#: ../../mod/settings.php:529 +msgid "Settings updated." msgstr "" -#: ../../addon/statusnet/statusnet.php:313 -msgid "Copy the security code from StatusNet here" +#: ../../mod/settings.php:594 ../../mod/settings.php:620 +#: ../../mod/settings.php:656 +msgid "Add application" msgstr "" -#: ../../addon/statusnet/statusnet.php:319 -msgid "Cancel Connection Process" +#: ../../mod/settings.php:596 ../../mod/settings.php:622 +#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/fbrowser.php:81 +#: ../../mod/fbrowser.php:116 +msgid "Cancel" msgstr "" -#: ../../addon/statusnet/statusnet.php:321 -msgid "Current StatusNet API is" +#: ../../mod/settings.php:598 ../../mod/settings.php:624 +msgid "Consumer Key" msgstr "" -#: ../../addon/statusnet/statusnet.php:322 -msgid "Cancel StatusNet Connection" +#: ../../mod/settings.php:599 ../../mod/settings.php:625 +msgid "Consumer Secret" msgstr "" -#: ../../addon/statusnet/statusnet.php:333 ../../addon/twitter/twitter.php:189 -msgid "Currently connected to: " +#: ../../mod/settings.php:600 ../../mod/settings.php:626 +msgid "Redirect" msgstr "" -#: ../../addon/statusnet/statusnet.php:334 -msgid "" -"If enabled all your <strong>public</strong> postings can be posted to the " -"associated StatusNet account. You can choose to do so by default (here) or " -"for every posting separately in the posting options when writing the entry." +#: ../../mod/settings.php:601 ../../mod/settings.php:627 +msgid "Icon url" msgstr "" -#: ../../addon/statusnet/statusnet.php:336 -msgid "" -"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile " -"details from unknown viewers?</em>) the link potentially included in public " -"postings relayed to StatusNet will lead the visitor to a blank page " -"informing the visitor that the access to your profile has been restricted." +#: ../../mod/settings.php:612 +msgid "You can't edit this application." msgstr "" -#: ../../addon/statusnet/statusnet.php:339 -msgid "Allow posting to StatusNet" +#: ../../mod/settings.php:655 +msgid "Connected Apps" msgstr "" -#: ../../addon/statusnet/statusnet.php:342 -msgid "Send public postings to StatusNet by default" +#: ../../mod/settings.php:659 +msgid "Client key starts with" msgstr "" -#: ../../addon/statusnet/statusnet.php:345 -msgid "Send linked #-tags and @-names to StatusNet" +#: ../../mod/settings.php:660 +msgid "No name" msgstr "" -#: ../../addon/statusnet/statusnet.php:350 ../../addon/twitter/twitter.php:206 -msgid "Clear OAuth configuration" +#: ../../mod/settings.php:661 +msgid "Remove authorization" msgstr "" -#: ../../addon/statusnet/statusnet.php:559 -msgid "API URL" +#: ../../mod/settings.php:672 +msgid "No feature settings configured" msgstr "" -#: ../../addon/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php:19 -msgid "Infinite Improbability Drive" +#: ../../mod/settings.php:680 +msgid "Feature Settings" msgstr "" -#: ../../addon/tumblr/tumblr.php:36 -msgid "Post to Tumblr" +#: ../../mod/settings.php:703 +msgid "Account Settings" msgstr "" -#: ../../addon/tumblr/tumblr.php:67 -msgid "Tumblr Post Settings" +#: ../../mod/settings.php:704 +msgid "Password Settings" msgstr "" -#: ../../addon/tumblr/tumblr.php:69 -msgid "Enable Tumblr Post Plugin" +#: ../../mod/settings.php:705 +msgid "New Password:" msgstr "" -#: ../../addon/tumblr/tumblr.php:74 -msgid "Tumblr login" +#: ../../mod/settings.php:706 +msgid "Confirm:" msgstr "" -#: ../../addon/tumblr/tumblr.php:79 -msgid "Tumblr password" +#: ../../mod/settings.php:706 +msgid "Leave password fields blank unless changing" msgstr "" -#: ../../addon/tumblr/tumblr.php:84 -msgid "Post to Tumblr by default" +#: ../../mod/settings.php:708 ../../mod/settings.php:1005 +msgid "Email Address:" msgstr "" -#: ../../addon/numfriends/numfriends.php:46 -msgid "Numfriends settings updated." +#: ../../mod/settings.php:709 +msgid "Remove Account" msgstr "" -#: ../../addon/numfriends/numfriends.php:77 -msgid "Numfriends Settings" +#: ../../mod/settings.php:710 +msgid "Warning: This action is permanent and cannot be reversed." msgstr "" -#: ../../addon/numfriends/numfriends.php:79 -msgid "How many contacts to display on profile sidebar" +#: ../../mod/settings.php:727 +msgid "Off" msgstr "" -#: ../../addon/gnot/gnot.php:48 -msgid "Gnot settings updated." +#: ../../mod/settings.php:727 +msgid "On" msgstr "" -#: ../../addon/gnot/gnot.php:79 -msgid "Gnot Settings" +#: ../../mod/settings.php:734 +msgid "Additional Features" msgstr "" -#: ../../addon/gnot/gnot.php:81 -msgid "" -"Allows threading of email comment notifications on Gmail and anonymising the " -"subject line." +#: ../../mod/settings.php:758 +msgid "Connector Settings" msgstr "" -#: ../../addon/gnot/gnot.php:82 -msgid "Enable this plugin/addon?" +#: ../../mod/settings.php:788 +msgid "No special theme for mobile devices" msgstr "" -#: ../../addon/gnot/gnot.php:97 -#, php-format -msgid "[Friendica:Notify] Comment to conversation #%d" +#: ../../mod/settings.php:828 +msgid "Display Settings" msgstr "" -#: ../../addon/wppost/wppost.php:42 -msgid "Post to Wordpress" +#: ../../mod/settings.php:834 +msgid "Display Theme:" msgstr "" -#: ../../addon/wppost/wppost.php:76 -msgid "WordPress Post Settings" +#: ../../mod/settings.php:835 +msgid "Mobile Theme:" msgstr "" -#: ../../addon/wppost/wppost.php:78 -msgid "Enable WordPress Post Plugin" +#: ../../mod/settings.php:836 +msgid "Update browser every xx seconds" msgstr "" -#: ../../addon/wppost/wppost.php:83 -msgid "WordPress username" +#: ../../mod/settings.php:836 +msgid "Minimum of 10 seconds, no maximum" msgstr "" -#: ../../addon/wppost/wppost.php:88 -msgid "WordPress password" +#: ../../mod/settings.php:837 +msgid "Maximum number of conversations to load at any time:" msgstr "" -#: ../../addon/wppost/wppost.php:93 -msgid "WordPress API URL" +#: ../../mod/settings.php:837 +msgid "Maximum of 100 items" msgstr "" -#: ../../addon/wppost/wppost.php:98 -msgid "Post to WordPress by default" +#: ../../mod/settings.php:838 +msgid "Don't show emoticons" msgstr "" -#: ../../addon/wppost/wppost.php:103 -msgid "Provide a backlink to the Friendica post" +#: ../../mod/settings.php:874 +msgid "Nobody except yourself" msgstr "" -#: ../../addon/wppost/wppost.php:207 -msgid "Read the original post and comment stream on Friendica" +#: ../../mod/settings.php:875 +msgid "Only those you specifically allow" msgstr "" -#: ../../addon/showmore/showmore.php:38 -msgid "\"Show more\" Settings" +#: ../../mod/settings.php:876 +msgid "Anybody in your address book" msgstr "" -#: ../../addon/showmore/showmore.php:41 -msgid "Enable Show More" +#: ../../mod/settings.php:877 +msgid "Anybody on this website" msgstr "" -#: ../../addon/showmore/showmore.php:44 -msgid "Cutting posts after how much characters" +#: ../../mod/settings.php:878 +msgid "Anybody in this network" msgstr "" -#: ../../addon/showmore/showmore.php:65 -msgid "Show More Settings saved." +#: ../../mod/settings.php:879 +msgid "Anybody on the internet" msgstr "" -#: ../../addon/piwik/piwik.php:79 -msgid "" -"This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> " -"analytics tool." +#: ../../mod/settings.php:951 +msgid "Publish your default profile in the network directory" msgstr "" -#: ../../addon/piwik/piwik.php:82 -#, php-format -msgid "" -"If you do not want that your visits are logged this way you <a href='%s'>can " -"set a cookie to prevent Piwik from tracking further visits of the site</a> " -"(opt-out)." +#: ../../mod/settings.php:956 +msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: ../../addon/piwik/piwik.php:90 -msgid "Piwik Base URL" +#: ../../mod/settings.php:965 +msgid "Your channel address is" msgstr "" -#: ../../addon/piwik/piwik.php:90 -msgid "" -"Absolute path to your Piwik installation. (without protocol (http/s), with " -"trailing slash)" +#: ../../mod/settings.php:976 +msgid "Automatically expire posts after this many days:" msgstr "" -#: ../../addon/piwik/piwik.php:91 -msgid "Site ID" +#: ../../mod/settings.php:976 +msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "" -#: ../../addon/piwik/piwik.php:92 -msgid "Show opt-out cookie link?" +#: ../../mod/settings.php:977 +msgid "Advanced expiration settings" msgstr "" -#: ../../addon/piwik/piwik.php:93 -msgid "Asynchronous tracking" +#: ../../mod/settings.php:978 +msgid "Advanced Expiration" msgstr "" -#: ../../addon/twitter/twitter.php:73 -msgid "Post to Twitter" +#: ../../mod/settings.php:979 +msgid "Expire posts:" msgstr "" -#: ../../addon/twitter/twitter.php:122 -msgid "Twitter settings updated." +#: ../../mod/settings.php:981 +msgid "Expire starred posts:" msgstr "" -#: ../../addon/twitter/twitter.php:146 -msgid "Twitter Posting Settings" +#: ../../mod/settings.php:982 +msgid "Expire photos:" msgstr "" -#: ../../addon/twitter/twitter.php:153 -msgid "" -"No consumer key pair for Twitter found. Please contact your site " -"administrator." +#: ../../mod/settings.php:983 +msgid "Only expire posts by others:" msgstr "" -#: ../../addon/twitter/twitter.php:172 -msgid "" -"At this Friendica instance the Twitter plugin was enabled but you have not " -"yet connected your account to your Twitter account. To do so click the " -"button below to get a PIN from Twitter which you have to copy into the input " -"box below and submit the form. Only your <strong>public</strong> posts will " -"be posted to Twitter." +#: ../../mod/settings.php:994 +msgid "Channel Settings" msgstr "" -#: ../../addon/twitter/twitter.php:173 -msgid "Log in with Twitter" +#: ../../mod/settings.php:1003 +msgid "Basic Settings" msgstr "" -#: ../../addon/twitter/twitter.php:175 -msgid "Copy the PIN from Twitter here" +#: ../../mod/settings.php:1006 +msgid "Your Timezone:" msgstr "" -#: ../../addon/twitter/twitter.php:190 -msgid "" -"If enabled all your <strong>public</strong> postings can be posted to the " -"associated Twitter account. You can choose to do so by default (here) or for " -"every posting separately in the posting options when writing the entry." +#: ../../mod/settings.php:1007 +msgid "Default Post Location:" msgstr "" -#: ../../addon/twitter/twitter.php:192 -msgid "" -"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile " -"details from unknown viewers?</em>) the link potentially included in public " -"postings relayed to Twitter will lead the visitor to a blank page informing " -"the visitor that the access to your profile has been restricted." +#: ../../mod/settings.php:1008 +msgid "Use Browser Location:" msgstr "" -#: ../../addon/twitter/twitter.php:195 -msgid "Allow posting to Twitter" +#: ../../mod/settings.php:1011 +msgid "Security and Privacy Settings" msgstr "" -#: ../../addon/twitter/twitter.php:198 -msgid "Send public postings to Twitter by default" +#: ../../mod/settings.php:1015 +msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../addon/twitter/twitter.php:201 -msgid "Send linked #-tags and @-names to Twitter" +#: ../../mod/settings.php:1015 +msgid "May reduce spam activity" msgstr "" -#: ../../addon/twitter/twitter.php:389 -msgid "Consumer key" +#: ../../mod/settings.php:1016 +msgid "Default Post Permissions" msgstr "" -#: ../../addon/twitter/twitter.php:390 -msgid "Consumer secret" +#: ../../mod/settings.php:1017 +msgid "(click to open/close)" msgstr "" -#: ../../addon/irc/irc.php:44 -msgid "IRC Settings" +#: ../../mod/settings.php:1030 +msgid "Maximum private messages per day from unknown people:" msgstr "" -#: ../../addon/irc/irc.php:46 -msgid "Channel(s) to auto connect (comma separated)" +#: ../../mod/settings.php:1030 +msgid "Useful to reduce spamming" msgstr "" -#: ../../addon/irc/irc.php:51 -msgid "Popular Channels (comma separated)" +#: ../../mod/settings.php:1033 +msgid "Notification Settings" msgstr "" -#: ../../addon/irc/irc.php:69 -msgid "IRC settings saved." +#: ../../mod/settings.php:1034 +msgid "By default post a status message when:" msgstr "" -#: ../../addon/irc/irc.php:74 -msgid "IRC Chatroom" +#: ../../mod/settings.php:1035 +msgid "accepting a friend request" msgstr "" -#: ../../addon/irc/irc.php:96 -msgid "Popular Channels" +#: ../../mod/settings.php:1036 +msgid "joining a forum/community" msgstr "" -#: ../../addon/blogger/blogger.php:42 -msgid "Post to blogger" +#: ../../mod/settings.php:1037 +msgid "making an <em>interesting</em> profile change" msgstr "" -#: ../../addon/blogger/blogger.php:74 -msgid "Blogger Post Settings" +#: ../../mod/settings.php:1038 +msgid "Send a notification email when:" msgstr "" -#: ../../addon/blogger/blogger.php:76 -msgid "Enable Blogger Post Plugin" +#: ../../mod/settings.php:1039 +msgid "You receive an introduction" msgstr "" -#: ../../addon/blogger/blogger.php:81 -msgid "Blogger username" +#: ../../mod/settings.php:1040 +msgid "Your introductions are confirmed" msgstr "" -#: ../../addon/blogger/blogger.php:86 -msgid "Blogger password" +#: ../../mod/settings.php:1041 +msgid "Someone writes on your profile wall" msgstr "" -#: ../../addon/blogger/blogger.php:91 -msgid "Blogger API URL" +#: ../../mod/settings.php:1042 +msgid "Someone writes a followup comment" msgstr "" -#: ../../addon/blogger/blogger.php:96 -msgid "Post to Blogger by default" +#: ../../mod/settings.php:1043 +msgid "You receive a private message" msgstr "" -#: ../../addon/posterous/posterous.php:37 -msgid "Post to Posterous" +#: ../../mod/settings.php:1044 +msgid "You receive a friend suggestion" msgstr "" -#: ../../addon/posterous/posterous.php:70 -msgid "Posterous Post Settings" +#: ../../mod/settings.php:1045 +msgid "You are tagged in a post" msgstr "" -#: ../../addon/posterous/posterous.php:72 -msgid "Enable Posterous Post Plugin" +#: ../../mod/settings.php:1046 +msgid "You are poked/prodded/etc. in a post" msgstr "" -#: ../../addon/posterous/posterous.php:77 -msgid "Posterous login" +#: ../../mod/settings.php:1049 +msgid "Advanced Account/Page Type Settings" msgstr "" -#: ../../addon/posterous/posterous.php:82 -msgid "Posterous password" +#: ../../mod/settings.php:1050 +msgid "Change the behaviour of this account for special situations" msgstr "" -#: ../../addon/posterous/posterous.php:87 -msgid "Posterous site ID" +#: ../../mod/tagrm.php:41 +msgid "Tag removed" msgstr "" -#: ../../addon/posterous/posterous.php:92 -msgid "Posterous API token" +#: ../../mod/tagrm.php:79 +msgid "Remove Item Tag" msgstr "" -#: ../../addon/posterous/posterous.php:97 -msgid "Post to Posterous by default" +#: ../../mod/tagrm.php:81 +msgid "Select a tag to remove: " msgstr "" -#: ../../view/theme/cleanzero/config.php:82 -#: ../../view/theme/diabook/config.php:192 -#: ../../view/theme/quattro/config.php:54 ../../view/theme/dispy/config.php:72 -msgid "Theme settings" +#: ../../mod/tagrm.php:93 ../../mod/delegate.php:130 +msgid "Remove" msgstr "" -#: ../../view/theme/cleanzero/config.php:83 -msgid "Set resize level for images in posts and comments (width and height)" +#: ../../mod/crepair.php:102 +msgid "Contact settings applied." msgstr "" -#: ../../view/theme/cleanzero/config.php:84 -#: ../../view/theme/diabook/config.php:193 -#: ../../view/theme/dispy/config.php:73 -msgid "Set font-size for posts and comments" +#: ../../mod/crepair.php:104 +msgid "Contact update failed." msgstr "" -#: ../../view/theme/cleanzero/config.php:85 -msgid "Set theme width" +#: ../../mod/crepair.php:129 ../../mod/fsuggest.php:20 +#: ../../mod/fsuggest.php:92 +msgid "Contact not found." msgstr "" -#: ../../view/theme/cleanzero/config.php:86 -#: ../../view/theme/quattro/config.php:56 -msgid "Color scheme" +#: ../../mod/crepair.php:135 +msgid "Repair Contact Settings" msgstr "" -#: ../../view/theme/diabook/theme.php:127 ../../include/nav.php:49 -#: ../../include/nav.php:115 -msgid "Your posts and conversations" +#: ../../mod/crepair.php:137 +msgid "" +"<strong>WARNING: This is highly advanced</strong> and if you enter incorrect " +"information your communications with this contact may stop working." msgstr "" -#: ../../view/theme/diabook/theme.php:128 ../../include/nav.php:50 -msgid "Your profile page" +#: ../../mod/crepair.php:138 +msgid "" +"Please use your browser 'Back' button <strong>now</strong> if you are " +"uncertain what to do on this page." msgstr "" -#: ../../view/theme/diabook/theme.php:129 -msgid "Your contacts" +#: ../../mod/crepair.php:144 +msgid "Return to contact editor" msgstr "" -#: ../../view/theme/diabook/theme.php:130 ../../include/nav.php:51 -msgid "Your photos" +#: ../../mod/crepair.php:149 +msgid "Account Nickname" msgstr "" -#: ../../view/theme/diabook/theme.php:131 ../../include/nav.php:52 -msgid "Your events" +#: ../../mod/crepair.php:150 +msgid "@Tagname - overrides Name/Nickname" msgstr "" -#: ../../view/theme/diabook/theme.php:132 ../../include/nav.php:53 -msgid "Personal notes" +#: ../../mod/crepair.php:151 +msgid "Account URL" msgstr "" -#: ../../view/theme/diabook/theme.php:132 ../../include/nav.php:53 -msgid "Your personal photos" +#: ../../mod/crepair.php:152 +msgid "Friend Request URL" msgstr "" -#: ../../view/theme/diabook/theme.php:134 -#: ../../view/theme/diabook/theme.php:643 -#: ../../view/theme/diabook/theme.php:747 -#: ../../view/theme/diabook/config.php:201 -msgid "Community Pages" +#: ../../mod/crepair.php:153 +msgid "Friend Confirm URL" msgstr "" -#: ../../view/theme/diabook/theme.php:490 -#: ../../view/theme/diabook/theme.php:749 -#: ../../view/theme/diabook/config.php:203 -msgid "Community Profiles" +#: ../../mod/crepair.php:154 +msgid "Notification Endpoint URL" msgstr "" -#: ../../view/theme/diabook/theme.php:511 -#: ../../view/theme/diabook/theme.php:754 -#: ../../view/theme/diabook/config.php:208 -msgid "Last users" +#: ../../mod/crepair.php:155 +msgid "Poll/Feed URL" msgstr "" -#: ../../view/theme/diabook/theme.php:540 -#: ../../view/theme/diabook/theme.php:756 -#: ../../view/theme/diabook/config.php:210 -msgid "Last likes" +#: ../../mod/crepair.php:156 +msgid "New photo from this URL" msgstr "" -#: ../../view/theme/diabook/theme.php:585 -#: ../../view/theme/diabook/theme.php:755 -#: ../../view/theme/diabook/config.php:209 -msgid "Last photos" +#: ../../mod/delegate.php:95 +msgid "No potential page delegates located." msgstr "" -#: ../../view/theme/diabook/theme.php:622 -#: ../../view/theme/diabook/theme.php:752 -#: ../../view/theme/diabook/config.php:206 -msgid "Find Friends" +#: ../../mod/delegate.php:121 +msgid "Delegate Page Management" msgstr "" -#: ../../view/theme/diabook/theme.php:623 -msgid "Local Directory" +#: ../../mod/delegate.php:123 +msgid "" +"Delegates are able to manage all aspects of this account/page except for " +"basic account settings. Please do not delegate your personal account to " +"anybody that you do not trust completely." msgstr "" -#: ../../view/theme/diabook/theme.php:625 ../../include/contact_widgets.php:35 -msgid "Similar Interests" +#: ../../mod/delegate.php:124 +msgid "Existing Page Managers" msgstr "" -#: ../../view/theme/diabook/theme.php:627 ../../include/contact_widgets.php:37 -msgid "Invite Friends" +#: ../../mod/delegate.php:126 +msgid "Existing Page Delegates" msgstr "" -#: ../../view/theme/diabook/theme.php:678 -#: ../../view/theme/diabook/theme.php:748 -#: ../../view/theme/diabook/config.php:202 -msgid "Earth Layers" +#: ../../mod/delegate.php:128 +msgid "Potential Delegates" msgstr "" -#: ../../view/theme/diabook/theme.php:683 -msgid "Set zoomfactor for Earth Layers" +#: ../../mod/delegate.php:131 +msgid "Add" msgstr "" -#: ../../view/theme/diabook/theme.php:684 -#: ../../view/theme/diabook/config.php:199 -msgid "Set longitude (X) for Earth Layers" +#: ../../mod/delegate.php:132 +msgid "No entries." msgstr "" -#: ../../view/theme/diabook/theme.php:685 -#: ../../view/theme/diabook/config.php:200 -msgid "Set latitude (Y) for Earth Layers" +#: ../../mod/directory.php:106 +msgid "Gender: " msgstr "" -#: ../../view/theme/diabook/theme.php:698 -#: ../../view/theme/diabook/theme.php:750 -#: ../../view/theme/diabook/config.php:204 -msgid "Help or @NewHere ?" +#: ../../mod/directory.php:161 +msgid "Finding:" msgstr "" -#: ../../view/theme/diabook/theme.php:705 -#: ../../view/theme/diabook/theme.php:751 -#: ../../view/theme/diabook/config.php:205 -msgid "Connect Services" +#: ../../mod/directory.php:169 +msgid "more" msgstr "" -#: ../../view/theme/diabook/theme.php:712 -#: ../../view/theme/diabook/theme.php:753 -msgid "Last Tweets" +#: ../../mod/directory.php:169 +msgid "back" msgstr "" -#: ../../view/theme/diabook/theme.php:715 -#: ../../view/theme/diabook/config.php:197 -msgid "Set twitter search term" +#: ../../mod/directory.php:176 +msgid "No entries (some entries may be hidden)." msgstr "" -#: ../../view/theme/diabook/theme.php:735 -#: ../../view/theme/diabook/theme.php:736 -#: ../../view/theme/diabook/theme.php:737 -#: ../../view/theme/diabook/theme.php:738 -#: ../../view/theme/diabook/theme.php:739 -#: ../../view/theme/diabook/theme.php:740 -#: ../../view/theme/diabook/theme.php:741 -#: ../../view/theme/diabook/theme.php:742 -#: ../../view/theme/diabook/theme.php:743 -#: ../../view/theme/diabook/theme.php:744 ../../include/acl_selectors.php:288 -msgid "don't show" +#: ../../mod/dirfind.php:26 +msgid "People Search" msgstr "" -#: ../../view/theme/diabook/theme.php:735 -#: ../../view/theme/diabook/theme.php:736 -#: ../../view/theme/diabook/theme.php:737 -#: ../../view/theme/diabook/theme.php:738 -#: ../../view/theme/diabook/theme.php:739 -#: ../../view/theme/diabook/theme.php:740 -#: ../../view/theme/diabook/theme.php:741 -#: ../../view/theme/diabook/theme.php:742 -#: ../../view/theme/diabook/theme.php:743 -#: ../../view/theme/diabook/theme.php:744 ../../include/acl_selectors.php:287 -msgid "show" +#: ../../mod/dirfind.php:60 ../../mod/match.php:65 +msgid "No matches" msgstr "" -#: ../../view/theme/diabook/theme.php:745 -msgid "Show/hide boxes at right-hand column:" +#: ../../mod/update_channel.php:43 ../../mod/update_community.php:18 +#: ../../mod/update_network.php:23 ../../mod/update_display.php:25 +msgid "[Embedded content - reload page to view]" msgstr "" -#: ../../view/theme/diabook/config.php:194 -#: ../../view/theme/dispy/config.php:74 -msgid "Set line-height for posts and comments" +#: ../../mod/dirsearch.php:21 +msgid "This site is not a directory server" msgstr "" -#: ../../view/theme/diabook/config.php:195 -msgid "Set resolution for middle column" +#: ../../mod/editpost.php:17 ../../mod/editpost.php:27 +msgid "Item not found" msgstr "" -#: ../../view/theme/diabook/config.php:196 -msgid "Set color scheme" +#: ../../mod/editpost.php:36 +msgid "Edit post" msgstr "" -#: ../../view/theme/diabook/config.php:198 -msgid "Set zoomfactor for Earth Layer" +#: ../../mod/editpost.php:69 +msgid "Insert YouTube video" msgstr "" -#: ../../view/theme/diabook/config.php:207 -msgid "Last tweets" +#: ../../mod/editpost.php:70 +msgid "Insert Vorbis [.ogg] video" msgstr "" -#: ../../view/theme/quattro/config.php:55 -msgid "Alignment" +#: ../../mod/editpost.php:71 +msgid "Insert Vorbis [.ogg] audio" msgstr "" -#: ../../view/theme/quattro/config.php:55 -msgid "Left" +#: ../../mod/events.php:66 +msgid "Event title and start time are required." msgstr "" -#: ../../view/theme/quattro/config.php:55 -msgid "Center" +#: ../../mod/events.php:279 +msgid "l, F j" msgstr "" -#: ../../view/theme/dispy/config.php:75 -msgid "Set colour scheme" +#: ../../mod/events.php:301 +msgid "Edit event" msgstr "" -#: ../../include/profile_advanced.php:22 -msgid "j F, Y" +#: ../../mod/events.php:346 +msgid "Create New Event" msgstr "" -#: ../../include/profile_advanced.php:23 -msgid "j F" +#: ../../mod/events.php:347 +msgid "Previous" msgstr "" -#: ../../include/profile_advanced.php:30 -msgid "Birthday:" +#: ../../mod/events.php:422 +msgid "hour:minute" msgstr "" -#: ../../include/profile_advanced.php:34 -msgid "Age:" +#: ../../mod/events.php:432 +msgid "Event details" msgstr "" -#: ../../include/profile_advanced.php:43 +#: ../../mod/events.php:433 #, php-format -msgid "for %1$d %2$s" -msgstr "" - -#: ../../include/profile_advanced.php:52 -msgid "Tags:" -msgstr "" - -#: ../../include/profile_advanced.php:56 -msgid "Religion:" -msgstr "" - -#: ../../include/profile_advanced.php:60 -msgid "Hobbies/Interests:" -msgstr "" - -#: ../../include/profile_advanced.php:67 -msgid "Contact information and Social Networks:" -msgstr "" - -#: ../../include/profile_advanced.php:69 -msgid "Musical interests:" -msgstr "" - -#: ../../include/profile_advanced.php:71 -msgid "Books, literature:" -msgstr "" - -#: ../../include/profile_advanced.php:73 -msgid "Television:" -msgstr "" - -#: ../../include/profile_advanced.php:75 -msgid "Film/dance/culture/entertainment:" -msgstr "" - -#: ../../include/profile_advanced.php:77 -msgid "Love/Romance:" -msgstr "" - -#: ../../include/profile_advanced.php:79 -msgid "Work/employment:" -msgstr "" - -#: ../../include/profile_advanced.php:81 -msgid "School/education:" -msgstr "" - -#: ../../include/contact_selectors.php:32 -msgid "Unknown | Not categorised" -msgstr "" - -#: ../../include/contact_selectors.php:33 -msgid "Block immediately" -msgstr "" - -#: ../../include/contact_selectors.php:34 -msgid "Shady, spammer, self-marketer" -msgstr "" - -#: ../../include/contact_selectors.php:35 -msgid "Known to me, but no opinion" -msgstr "" - -#: ../../include/contact_selectors.php:36 -msgid "OK, probably harmless" -msgstr "" - -#: ../../include/contact_selectors.php:37 -msgid "Reputable, has my trust" -msgstr "" - -#: ../../include/contact_selectors.php:56 -msgid "Frequently" -msgstr "" - -#: ../../include/contact_selectors.php:57 -msgid "Hourly" -msgstr "" - -#: ../../include/contact_selectors.php:58 -msgid "Twice daily" +msgid "Format is %s %s. Starting date and Title are required." msgstr "" -#: ../../include/contact_selectors.php:59 -msgid "Daily" +#: ../../mod/events.php:435 +msgid "Event Starts:" msgstr "" -#: ../../include/contact_selectors.php:60 -msgid "Weekly" +#: ../../mod/events.php:435 ../../mod/events.php:449 +msgid "Required" msgstr "" -#: ../../include/contact_selectors.php:61 -msgid "Monthly" +#: ../../mod/events.php:438 +msgid "Finish date/time is not known or not relevant" msgstr "" -#: ../../include/contact_selectors.php:77 -msgid "OStatus" +#: ../../mod/events.php:440 +msgid "Event Finishes:" msgstr "" -#: ../../include/contact_selectors.php:78 -msgid "RSS/Atom" +#: ../../mod/events.php:443 +msgid "Adjust for viewer timezone" msgstr "" -#: ../../include/contact_selectors.php:82 -msgid "Zot!" +#: ../../mod/events.php:445 +msgid "Description:" msgstr "" -#: ../../include/contact_selectors.php:83 -msgid "LinkedIn" +#: ../../mod/events.php:449 +msgid "Title:" msgstr "" -#: ../../include/contact_selectors.php:84 -msgid "XMPP/IM" +#: ../../mod/events.php:451 +msgid "Share this event" msgstr "" -#: ../../include/contact_selectors.php:85 -msgid "MySpace" +#: ../../mod/siteinfo.php:51 +#, php-format +msgid "Version %s" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Male" +#: ../../mod/siteinfo.php:65 +msgid "Installed plugins/addons/apps:" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Female" +#: ../../mod/siteinfo.php:78 +msgid "No installed plugins/addons/apps" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Currently Male" +#: ../../mod/siteinfo.php:81 +msgid "Red" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Currently Female" +#: ../../mod/siteinfo.php:82 +msgid "" +"This is Red - another decentralized, distributed communications project by " +"the folks at Friendica." msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Mostly Male" +#: ../../mod/siteinfo.php:84 +msgid "Running at web location" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Mostly Female" +#: ../../mod/siteinfo.php:85 +msgid "" +"Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn " +"more about the Friendica and/or Red project." msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Transgender" +#: ../../mod/siteinfo.php:86 +msgid "Bug reports and issues: please visit" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Intersex" +#: ../../mod/siteinfo.php:89 +msgid "" +"Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - " +"dot com" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Transsexual" +#: ../../mod/fbrowser.php:113 +msgid "Files" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Hermaphrodite" +#: ../../mod/filer.php:35 +msgid "- select -" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Neuter" +#: ../../mod/wall_upload.php:41 ../../mod/item.php:995 +msgid "Wall Photos" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Non-specific" +#: ../../mod/follow.php:24 +msgid "Channel added" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Other" +#: ../../mod/fsuggest.php:63 +msgid "Friend suggestion sent." msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Undecided" +#: ../../mod/fsuggest.php:97 +msgid "Suggest Friends" msgstr "" -#: ../../include/profile_selectors.php:23 -msgid "Males" +#: ../../mod/fsuggest.php:99 +#, php-format +msgid "Suggest a friend for %s" msgstr "" -#: ../../include/profile_selectors.php:23 -msgid "Females" +#: ../../mod/zfinger.php:23 +msgid "invalid target signature" msgstr "" -#: ../../include/profile_selectors.php:23 -msgid "Gay" +#: ../../mod/group.php:25 +msgid "Collection created." msgstr "" -#: ../../include/profile_selectors.php:23 -msgid "Lesbian" +#: ../../mod/group.php:31 +msgid "Could not create collection." msgstr "" -#: ../../include/profile_selectors.php:23 -msgid "No Preference" +#: ../../mod/group.php:43 ../../mod/group.php:141 +msgid "Collection not found." msgstr "" -#: ../../include/profile_selectors.php:23 -msgid "Bisexual" +#: ../../mod/group.php:56 +msgid "Collection name changed." msgstr "" -#: ../../include/profile_selectors.php:23 -msgid "Autosexual" +#: ../../mod/group.php:70 ../../mod/like.php:54 ../../mod/profperm.php:28 +#: ../../index.php:328 +msgid "Permission denied" msgstr "" -#: ../../include/profile_selectors.php:23 -msgid "Abstinent" +#: ../../mod/group.php:88 +msgid "Create a collection of connections." msgstr "" -#: ../../include/profile_selectors.php:23 -msgid "Virgin" +#: ../../mod/group.php:89 ../../mod/group.php:182 +msgid "Collection Name: " msgstr "" -#: ../../include/profile_selectors.php:23 -msgid "Deviant" +#: ../../mod/group.php:108 +msgid "Collection removed." msgstr "" -#: ../../include/profile_selectors.php:23 -msgid "Fetish" -msgstr "" - -#: ../../include/profile_selectors.php:23 -msgid "Oodles" -msgstr "" - -#: ../../include/profile_selectors.php:23 -msgid "Nonsexual" +#: ../../mod/group.php:110 +msgid "Unable to remove collection." msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Single" +#: ../../mod/group.php:181 +msgid "Collection Editor" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Lonely" +#: ../../mod/group.php:194 +msgid "Members" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Available" +#: ../../mod/group.php:196 +msgid "All Connected Channels" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Unavailable" +#: ../../mod/group.php:229 +msgid "Click on a channel to add or remove." msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Has crush" +#: ../../mod/hcard.php:10 +msgid "No profile" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Infatuated" +#: ../../mod/help.php:30 +msgid "Help:" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Dating" +#: ../../mod/help.php:38 ../../index.php:215 +msgid "Not Found" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Unfaithful" +#: ../../mod/help.php:41 ../../index.php:218 +msgid "Page not found." msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Sex Addict" +#: ../../mod/home.php:31 +#, php-format +msgid "Welcome to %s" msgstr "" -#: ../../include/profile_selectors.php:42 ../../include/user.php:278 -#: ../../include/user.php:283 -msgid "Friends" +#: ../../mod/rmagic.php:56 +msgid "Remote Authentication" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Friends/Benefits" +#: ../../mod/rmagic.php:57 +msgid "Enter your channel address (e.g. channel@example.com)" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Casual" +#: ../../mod/rmagic.php:58 +msgid "Authenticate" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Engaged" +#: ../../mod/import.php:31 +msgid "Nothing to import." msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Married" +#: ../../mod/import.php:53 +msgid "Unable to download data from old server" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Imaginarily married" +#: ../../mod/import.php:59 +msgid "Imported file is empty." msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Partners" +#: ../../mod/import.php:82 +msgid "" +"Cannot create a duplicate channel identifier on this system. Import failed." msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Cohabiting" +#: ../../mod/import.php:100 +msgid "Channel clone failed. Import failed." msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Common law" +#: ../../mod/import.php:110 +msgid "Cloned channel not found. Import failed." msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Happy" +#: ../../mod/import.php:319 +msgid "Import completed." msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Not looking" +#: ../../mod/import.php:328 +msgid "Import Channel" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Swinger" +#: ../../mod/import.php:329 +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. Only identity and connections/relationships will be " +"imported. Importation of content is not yet available." msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Betrayed" +#: ../../mod/import.php:330 +msgid "File to Upload" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Separated" +#: ../../mod/import.php:331 +msgid "Or provide the old server/hub details" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Unstable" +#: ../../mod/import.php:332 +msgid "Your old identity address (xyz@example.com)" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Divorced" +#: ../../mod/import.php:333 +msgid "Your old login email address" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Imaginarily divorced" +#: ../../mod/import.php:334 +msgid "Your old login password" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Widowed" +#: ../../mod/import.php:335 +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 " +"able to post from either location, but only one can be marked as the primary " +"location for files, photos, and media." msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Uncertain" +#: ../../mod/import.php:336 +msgid "Make this hub my primary location" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "It's complicated" +#: ../../mod/xchan.php:25 +msgid "Not found." msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Don't care" +#: ../../mod/intro.php:31 +msgid "Connection update failed." msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Ask me" +#: ../../mod/intro.php:56 +msgid "Introductions and Connection Requests" msgstr "" -#: ../../include/event.php:20 ../../include/bb2diaspora.php:393 -msgid "Starts:" +#: ../../mod/intro.php:67 +msgid "No pending introductions." msgstr "" -#: ../../include/event.php:30 ../../include/bb2diaspora.php:401 -msgid "Finishes:" +#: ../../mod/intro.php:72 +msgid "System error. Please try again later." msgstr "" -#: ../../include/delivery.php:456 ../../include/notifier.php:678 -msgid "(no subject)" +#: ../../mod/intro.php:96 ../../mod/notifications.php:154 +#: ../../mod/notifications.php:201 +msgid "Post a new friend activity" msgstr "" -#: ../../include/delivery.php:463 ../../include/enotify.php:26 -#: ../../include/notifier.php:685 -msgid "noreply" +#: ../../mod/intro.php:96 ../../mod/notifications.php:154 +#: ../../mod/notifications.php:201 +msgid "if applicable" msgstr "" -#: ../../include/Scrape.php:572 -msgid " on Last.fm" +#: ../../mod/intro.php:101 ../../mod/notifications.php:35 +#: ../../mod/notifications.php:161 ../../mod/notifications.php:207 +msgid "Discard" msgstr "" -#: ../../include/text.php:243 -msgid "prev" +#: ../../mod/invite.php:25 +msgid "Total invitation limit exceeded." msgstr "" -#: ../../include/text.php:245 -msgid "first" +#: ../../mod/invite.php:47 +#, php-format +msgid "%s : Not a valid email address." msgstr "" -#: ../../include/text.php:274 -msgid "last" +#: ../../mod/invite.php:71 +msgid "Please join us on Friendica" msgstr "" -#: ../../include/text.php:277 -msgid "next" +#: ../../mod/invite.php:82 +msgid "Invitation limit exceeded. Please contact your site administrator." msgstr "" -#: ../../include/text.php:568 -msgid "No contacts" +#: ../../mod/invite.php:87 +#, php-format +msgid "%s : Message delivery failed." msgstr "" -#: ../../include/text.php:577 +#: ../../mod/invite.php:91 #, php-format -msgid "%d Contact" -msgid_plural "%d Contacts" +msgid "%d message sent." +msgid_plural "%d messages sent." msgstr[0] "" msgstr[1] "" -#: ../../include/text.php:839 -msgid "Monday" -msgstr "" - -#: ../../include/text.php:839 -msgid "Tuesday" -msgstr "" - -#: ../../include/text.php:839 -msgid "Wednesday" -msgstr "" - -#: ../../include/text.php:839 -msgid "Thursday" -msgstr "" - -#: ../../include/text.php:839 -msgid "Friday" -msgstr "" - -#: ../../include/text.php:839 -msgid "Saturday" -msgstr "" - -#: ../../include/text.php:839 -msgid "Sunday" +#: ../../mod/invite.php:110 +msgid "You have no more invitations available" msgstr "" -#: ../../include/text.php:843 -msgid "January" +#: ../../mod/invite.php:118 +#, php-format +msgid "" +"Visit %s for a list of public sites that you can join. Friendica members on " +"other sites can all connect with each other, as well as with members of many " +"other social networks." msgstr "" -#: ../../include/text.php:843 -msgid "February" +#: ../../mod/invite.php:120 +#, php-format +msgid "" +"To accept this invitation, please visit and register at %s or any other " +"public Friendica website." msgstr "" -#: ../../include/text.php:843 -msgid "March" +#: ../../mod/invite.php:121 +#, php-format +msgid "" +"Friendica sites all inter-connect to create a huge privacy-enhanced social " +"web that is owned and controlled by its members. They can also connect with " +"many traditional social networks. See %s for a list of alternate Friendica " +"sites you can join." msgstr "" -#: ../../include/text.php:843 -msgid "April" +#: ../../mod/invite.php:124 +msgid "" +"Our apologies. This system is not currently configured to connect with other " +"public sites or invite members." msgstr "" -#: ../../include/text.php:843 -msgid "May" +#: ../../mod/invite.php:130 +msgid "Send invitations" msgstr "" -#: ../../include/text.php:843 -msgid "June" +#: ../../mod/invite.php:131 +msgid "Enter email addresses, one per line:" msgstr "" -#: ../../include/text.php:843 -msgid "July" +#: ../../mod/invite.php:132 ../../mod/message.php:283 +#: ../../mod/message.php:414 +msgid "Your message:" msgstr "" -#: ../../include/text.php:843 -msgid "August" +#: ../../mod/invite.php:133 +msgid "" +"You are cordially invited to join me and other close friends on Friendica - " +"and help us to create a better social web." msgstr "" -#: ../../include/text.php:843 -msgid "September" +#: ../../mod/invite.php:135 +msgid "You will need to supply this invitation code: $invite_code" msgstr "" -#: ../../include/text.php:843 -msgid "October" +#: ../../mod/invite.php:135 +msgid "" +"Once you have registered, please connect with me via my profile page at:" msgstr "" -#: ../../include/text.php:843 -msgid "November" +#: ../../mod/invite.php:137 +msgid "" +"For more information about the Friendica project and why we feel it is " +"important, please visit http://friendica.com" msgstr "" -#: ../../include/text.php:843 -msgid "December" +#: ../../mod/item.php:120 +msgid "Unable to locate original post." msgstr "" -#: ../../include/text.php:929 -msgid "bytes" +#: ../../mod/item.php:281 +msgid "Empty post discarded." msgstr "" -#: ../../include/text.php:949 ../../include/text.php:964 -msgid "remove" +#: ../../mod/item.php:726 +msgid "System error. Post not saved." msgstr "" -#: ../../include/text.php:949 ../../include/text.php:964 -msgid "[remove]" +#: ../../mod/lockview.php:34 +msgid "Remote privacy information not available." msgstr "" -#: ../../include/text.php:952 -msgid "Categories:" +#: ../../mod/lockview.php:43 +msgid "Visible to:" msgstr "" -#: ../../include/text.php:967 -msgid "Filed under:" +#: ../../mod/lostpass.php:15 +msgid "No valid account found." msgstr "" -#: ../../include/text.php:983 ../../include/text.php:995 -msgid "Click to open/close" +#: ../../mod/lostpass.php:29 +msgid "Password reset request issued. Check your email." msgstr "" -#: ../../include/text.php:1101 ../../include/user.php:236 -msgid "default" +#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:102 +#, php-format +msgid "Site Member (%s)" msgstr "" -#: ../../include/text.php:1113 -msgid "Select an alternate language" +#: ../../mod/lostpass.php:40 +#, php-format +msgid "Password reset requested at %s" msgstr "" -#: ../../include/text.php:1323 -msgid "activity" +#: ../../mod/lostpass.php:63 +msgid "" +"Request could not be verified. (You may have previously submitted it.) " +"Password reset failed." msgstr "" -#: ../../include/text.php:1325 -msgid "comment" +#: ../../mod/lostpass.php:85 ../../boot.php:1243 +msgid "Password Reset" msgstr "" -#: ../../include/text.php:1326 -msgid "post" +#: ../../mod/lostpass.php:86 +msgid "Your password has been reset as requested." msgstr "" -#: ../../include/text.php:1481 -msgid "Item filed" +#: ../../mod/lostpass.php:87 +msgid "Your new password is" msgstr "" -#: ../../include/diaspora.php:660 -msgid "Sharing notification from Diaspora network" +#: ../../mod/lostpass.php:88 +msgid "Save or copy your new password - and then" msgstr "" -#: ../../include/diaspora.php:2152 -msgid "Attachments:" +#: ../../mod/lostpass.php:89 +msgid "click here to login" msgstr "" -#: ../../include/network.php:842 -msgid "view full size" +#: ../../mod/lostpass.php:90 +msgid "" +"Your password may be changed from the <em>Settings</em> page after " +"successful login." msgstr "" -#: ../../include/oembed.php:135 -msgid "Embedded content" +#: ../../mod/lostpass.php:107 +#, php-format +msgid "Your password has changed at %s" msgstr "" -#: ../../include/oembed.php:144 -msgid "Embedding disabled" +#: ../../mod/lostpass.php:122 +msgid "Forgot your Password?" msgstr "" -#: ../../include/group.php:25 +#: ../../mod/lostpass.php:123 msgid "" -"A deleted group with this name was revived. Existing item permissions " -"<strong>may</strong> apply to this group and any future members. If this is " -"not what you intended, please create another group with a different name." +"Enter your email address and submit to have your password reset. Then check " +"your email for further instructions." msgstr "" -#: ../../include/group.php:176 -msgid "Default privacy group for new contacts" +#: ../../mod/lostpass.php:124 +msgid "Email Address" msgstr "" -#: ../../include/group.php:195 -msgid "Everybody" +#: ../../mod/lostpass.php:125 +msgid "Reset" msgstr "" -#: ../../include/group.php:218 -msgid "edit" +#: ../../mod/manage.php:59 +msgid "Create a new channel" msgstr "" -#: ../../include/group.php:240 -msgid "Edit group" +#: ../../mod/manage.php:64 +msgid "Channel Manager" msgstr "" -#: ../../include/group.php:241 -msgid "Create a new group" +#: ../../mod/manage.php:65 +msgid "Current Channel" msgstr "" -#: ../../include/group.php:242 -msgid "Contacts not in any group" +#: ../../mod/manage.php:67 +msgid "Attach to one of your channels by selecting it." msgstr "" -#: ../../include/nav.php:46 ../../boot.php:884 -msgid "Logout" +#: ../../mod/manage.php:68 +msgid "Default Channel" msgstr "" -#: ../../include/nav.php:46 -msgid "End this session" +#: ../../mod/manage.php:69 +msgid "Make Default" msgstr "" -#: ../../include/nav.php:49 ../../boot.php:1574 -msgid "Status" +#: ../../mod/match.php:12 +msgid "Profile Match" msgstr "" -#: ../../include/nav.php:64 -msgid "Sign in" +#: ../../mod/match.php:20 +msgid "No keywords to match. Please add keywords to your default profile." msgstr "" -#: ../../include/nav.php:77 -msgid "Home Page" +#: ../../mod/match.php:57 +msgid "is interested in:" msgstr "" -#: ../../include/nav.php:81 -msgid "Create an account" +#: ../../mod/message.php:45 +msgid "Unable to lookup recipient." msgstr "" -#: ../../include/nav.php:86 -msgid "Help and documentation" +#: ../../mod/message.php:53 +msgid "Unable to communicate with requested channel." msgstr "" -#: ../../include/nav.php:89 -msgid "Apps" +#: ../../mod/message.php:60 +msgid "Cannot verify requested channel." msgstr "" -#: ../../include/nav.php:89 -msgid "Addon applications, utilities, games" +#: ../../mod/message.php:86 +msgid "Selected channel has private message restrictions. Send failed." msgstr "" -#: ../../include/nav.php:91 -msgid "Search site content" +#: ../../mod/message.php:204 ../../mod/notifications.php:100 +msgid "Messages" msgstr "" -#: ../../include/nav.php:101 -msgid "Conversations on this site" +#: ../../mod/message.php:215 +msgid "Message deleted." msgstr "" -#: ../../include/nav.php:103 -msgid "Directory" +#: ../../mod/message.php:222 +msgid "Conversation removed." msgstr "" -#: ../../include/nav.php:103 -msgid "People directory" +#: ../../mod/message.php:273 +msgid "Send Private Message" msgstr "" -#: ../../include/nav.php:113 -msgid "Conversations from your friends" +#: ../../mod/message.php:274 ../../mod/message.php:409 +msgid "To:" msgstr "" -#: ../../include/nav.php:121 -msgid "Friend Requests" +#: ../../mod/message.php:279 ../../mod/message.php:411 +msgid "Subject:" msgstr "" -#: ../../include/nav.php:123 -msgid "See all notifications" +#: ../../mod/message.php:307 +msgid "No messages." msgstr "" -#: ../../include/nav.php:124 -msgid "Mark all system notifications seen" +#: ../../mod/message.php:323 ../../mod/message.php:380 +msgid "Delete message" msgstr "" -#: ../../include/nav.php:128 -msgid "Private mail" +#: ../../mod/message.php:325 +msgid "D, d M Y - g:i A" msgstr "" -#: ../../include/nav.php:129 -msgid "Inbox" +#: ../../mod/message.php:344 +msgid "Message not found." msgstr "" -#: ../../include/nav.php:130 -msgid "Outbox" +#: ../../mod/message.php:402 +msgid "Delete conversation" msgstr "" -#: ../../include/nav.php:134 -msgid "Manage" +#: ../../mod/message.php:404 +msgid "" +"No secure communications available. You <strong>may</strong> be able to " +"respond from the sender's profile page." msgstr "" -#: ../../include/nav.php:134 -msgid "Manage other pages" +#: ../../mod/message.php:408 +msgid "Send Reply" msgstr "" -#: ../../include/nav.php:138 ../../boot.php:1132 -msgid "Profiles" +#: ../../mod/mood.php:130 +msgid "Mood" msgstr "" -#: ../../include/nav.php:138 ../../boot.php:1132 -msgid "Manage/edit profiles" +#: ../../mod/mood.php:131 +msgid "Set your current mood and tell your friends" msgstr "" -#: ../../include/nav.php:139 -msgid "Manage/edit friends and contacts" +#: ../../mod/network.php:154 ../../mod/search.php:20 +msgid "Remove term" msgstr "" -#: ../../include/nav.php:146 -msgid "Site setup and configuration" +#: ../../mod/network.php:292 +msgid "Commented Order" msgstr "" -#: ../../include/nav.php:170 -msgid "Nothing new here" +#: ../../mod/network.php:295 +msgid "Sort by Comment Date" msgstr "" -#: ../../include/contact_widgets.php:6 -msgid "Add New Contact" +#: ../../mod/network.php:298 +msgid "Posted Order" msgstr "" -#: ../../include/contact_widgets.php:7 -msgid "Enter address or web location" +#: ../../mod/network.php:301 +msgid "Sort by Post Date" msgstr "" -#: ../../include/contact_widgets.php:8 -msgid "Example: bob@example.com, http://example.com/barbara" +#: ../../mod/network.php:305 ../../mod/notifications.php:85 +msgid "Personal" msgstr "" -#: ../../include/contact_widgets.php:23 -#, php-format -msgid "%d invitation available" -msgid_plural "%d invitations available" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/contact_widgets.php:29 -msgid "Find People" +#: ../../mod/network.php:308 +msgid "Posts that mention or involve you" msgstr "" -#: ../../include/contact_widgets.php:30 -msgid "Enter name or interest" +#: ../../mod/network.php:314 +msgid "Activity Stream - by date" msgstr "" -#: ../../include/contact_widgets.php:31 -msgid "Connect/Follow" +#: ../../mod/network.php:321 +msgid "Starred" msgstr "" -#: ../../include/contact_widgets.php:32 -msgid "Examples: Robert Morgenstein, Fishing" +#: ../../mod/network.php:324 +msgid "Favourite Posts" msgstr "" -#: ../../include/contact_widgets.php:36 -msgid "Random Profile" +#: ../../mod/network.php:331 +msgid "Spam" msgstr "" -#: ../../include/contact_widgets.php:68 -msgid "Networks" +#: ../../mod/network.php:334 +msgid "Posts flagged as SPAM" msgstr "" -#: ../../include/contact_widgets.php:71 -msgid "All Networks" +#: ../../mod/network.php:374 +msgid "Refresh" msgstr "" -#: ../../include/contact_widgets.php:98 -msgid "Saved Folders" +#: ../../mod/network.php:378 +msgid "Co-workers" msgstr "" -#: ../../include/contact_widgets.php:101 ../../include/contact_widgets.php:129 -msgid "Everything" +#: ../../mod/network.php:381 +msgid "Everybody" msgstr "" -#: ../../include/contact_widgets.php:126 -msgid "Categories" +#: ../../mod/network.php:395 +msgid "Search Results For:" msgstr "" -#: ../../include/auth.php:36 -msgid "Logged out." +#: ../../mod/network.php:440 +msgid "No such group" msgstr "" -#: ../../include/auth.php:115 -msgid "" -"We encountered a problem while logging in with the OpenID you provided. " -"Please check the correct spelling of the ID." +#: ../../mod/network.php:451 +msgid "Group is empty" msgstr "" -#: ../../include/auth.php:115 -msgid "The error message was:" +#: ../../mod/network.php:455 +msgid "Group: " msgstr "" -#: ../../include/datetime.php:43 ../../include/datetime.php:45 -msgid "Miscellaneous" +#: ../../mod/network.php:465 +msgid "Contact: " msgstr "" -#: ../../include/datetime.php:131 ../../include/datetime.php:263 -msgid "year" +#: ../../mod/network.php:468 +msgid "Invalid contact." msgstr "" -#: ../../include/datetime.php:136 ../../include/datetime.php:264 -msgid "month" +#: ../../mod/new_channel.php:107 +msgid "Add a Channel" msgstr "" -#: ../../include/datetime.php:141 ../../include/datetime.php:266 -msgid "day" +#: ../../mod/new_channel.php:108 +msgid "" +"A channel is your own collection of related web pages. A channel can be used " +"to hold social network profiles, blogs, conversation groups and forums, " +"celebrity pages, and much more. You may create as many channels as your " +"service provider allows." msgstr "" -#: ../../include/datetime.php:254 -msgid "never" +#: ../../mod/new_channel.php:110 +msgid "Channel Name" msgstr "" -#: ../../include/datetime.php:260 -msgid "less than a second ago" +#: ../../mod/new_channel.php:111 +msgid "" +"Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation " +"Group\" " msgstr "" -#: ../../include/datetime.php:263 -msgid "years" +#: ../../mod/new_channel.php:112 +msgid "Choose a short nickname" msgstr "" -#: ../../include/datetime.php:264 -msgid "months" +#: ../../mod/new_channel.php:113 +msgid "" +"Your nickname will be used to create an easily remembered channel address " +"(like an email address) which you can share with others." msgstr "" -#: ../../include/datetime.php:265 -msgid "week" +#: ../../mod/new_channel.php:114 +msgid "" +"Or <a href=\"import\">import an existing channel</a> from another location" msgstr "" -#: ../../include/datetime.php:265 -msgid "weeks" +#: ../../mod/new_channel.php:117 +msgid "Create" msgstr "" -#: ../../include/datetime.php:266 -msgid "days" +#: ../../mod/nogroup.php:58 +msgid "Contacts who are not members of a group" msgstr "" -#: ../../include/datetime.php:267 -msgid "hour" +#: ../../mod/notifications.php:26 +msgid "Invalid request identifier." msgstr "" -#: ../../include/datetime.php:267 -msgid "hours" +#: ../../mod/notifications.php:75 +msgid "System" msgstr "" -#: ../../include/datetime.php:268 -msgid "minute" +#: ../../mod/notifications.php:80 +msgid "Network" msgstr "" -#: ../../include/datetime.php:268 -msgid "minutes" +#: ../../mod/notifications.php:95 +msgid "Introductions" msgstr "" -#: ../../include/datetime.php:269 -msgid "second" +#: ../../mod/notifications.php:119 +msgid "Show Ignored Requests" msgstr "" -#: ../../include/datetime.php:269 -msgid "seconds" +#: ../../mod/notifications.php:119 +msgid "Hide Ignored Requests" msgstr "" -#: ../../include/datetime.php:278 -#, php-format -msgid "%1$d %2$s ago" +#: ../../mod/notifications.php:145 ../../mod/notifications.php:191 +msgid "Notification type: " msgstr "" -#: ../../include/datetime.php:450 ../../include/items.php:1460 -#, php-format -msgid "%s's birthday" +#: ../../mod/notifications.php:146 +msgid "Friend Suggestion" msgstr "" -#: ../../include/datetime.php:451 ../../include/items.php:1461 +#: ../../mod/notifications.php:148 #, php-format -msgid "Happy Birthday %s" -msgstr "" - -#: ../../include/onepoll.php:399 -msgid "From: " +msgid "suggested by %s" msgstr "" -#: ../../include/bbcode.php:225 ../../include/bbcode.php:245 -msgid "$1 wrote:" +#: ../../mod/notifications.php:177 +msgid "Claims to be known to you: " msgstr "" -#: ../../include/bbcode.php:260 ../../include/bbcode.php:337 -msgid "Image/photo" +#: ../../mod/notifications.php:177 +msgid "yes" msgstr "" -#: ../../include/dba.php:41 -#, php-format -msgid "Cannot locate DNS info for database server '%s'" +#: ../../mod/notifications.php:177 +msgid "no" msgstr "" -#: ../../include/message.php:15 ../../include/message.php:171 -msgid "[no subject]" +#: ../../mod/notifications.php:184 +msgid "Approve as: " msgstr "" -#: ../../include/acl_selectors.php:286 -msgid "Visible to everybody" +#: ../../mod/notifications.php:185 +msgid "Friend" msgstr "" -#: ../../include/enotify.php:14 -msgid "Friendica Notification" +#: ../../mod/notifications.php:186 +msgid "Sharer" msgstr "" -#: ../../include/enotify.php:17 -msgid "Thank You," +#: ../../mod/notifications.php:186 +msgid "Fan/Admirer" msgstr "" -#: ../../include/enotify.php:19 -#, php-format -msgid "%s Administrator" +#: ../../mod/notifications.php:192 +msgid "Friend/Connect Request" msgstr "" -#: ../../include/enotify.php:38 -#, php-format -msgid "%s <!item_type!>" +#: ../../mod/notifications.php:192 +msgid "New Follower" msgstr "" -#: ../../include/enotify.php:42 -#, php-format -msgid "[Friendica:Notify] New mail received at %s" +#: ../../mod/notifications.php:213 +msgid "No introductions." msgstr "" -#: ../../include/enotify.php:44 +#: ../../mod/notifications.php:253 ../../mod/notifications.php:378 +#: ../../mod/notifications.php:465 #, php-format -msgid "%1$s sent you a new private message at %2$s." +msgid "%s liked %s's post" msgstr "" -#: ../../include/enotify.php:45 +#: ../../mod/notifications.php:262 ../../mod/notifications.php:387 +#: ../../mod/notifications.php:474 #, php-format -msgid "%1$s sent you %2$s." -msgstr "" - -#: ../../include/enotify.php:45 -msgid "a private message" +msgid "%s disliked %s's post" msgstr "" -#: ../../include/enotify.php:46 +#: ../../mod/notifications.php:276 ../../mod/notifications.php:401 +#: ../../mod/notifications.php:488 #, php-format -msgid "Please visit %s to view and/or reply to your private messages." +msgid "%s is now friends with %s" msgstr "" -#: ../../include/enotify.php:87 +#: ../../mod/notifications.php:283 ../../mod/notifications.php:408 #, php-format -msgid "%1$s commented on [url=%2$s]a %3$s[/url]" +msgid "%s created a new post" msgstr "" -#: ../../include/enotify.php:94 +#: ../../mod/notifications.php:284 ../../mod/notifications.php:409 +#: ../../mod/notifications.php:497 #, php-format -msgid "%1$s commented on [url=%2$s]%3$s's %4$s[/url]" +msgid "%s commented on %s's post" msgstr "" -#: ../../include/enotify.php:102 -#, php-format -msgid "%1$s commented on [url=%2$s]your %3$s[/url]" +#: ../../mod/notifications.php:298 +msgid "No more network notifications." msgstr "" -#: ../../include/enotify.php:112 -#, php-format -msgid "[Friendica:Notify] Comment to conversation #%1$d by %2$s" +#: ../../mod/notifications.php:302 +msgid "Network Notifications" msgstr "" -#: ../../include/enotify.php:113 -#, php-format -msgid "%s commented on an item/conversation you have been following." +#: ../../mod/notifications.php:328 ../../mod/notify.php:54 +msgid "No more system notifications." msgstr "" -#: ../../include/enotify.php:116 ../../include/enotify.php:131 -#: ../../include/enotify.php:144 ../../include/enotify.php:157 -#, php-format -msgid "Please visit %s to view and/or reply to the conversation." +#: ../../mod/notifications.php:332 ../../mod/notify.php:58 +msgid "System Notifications" msgstr "" -#: ../../include/enotify.php:123 -#, php-format -msgid "[Friendica:Notify] %s posted to your profile wall" +#: ../../mod/notifications.php:423 +msgid "No more personal notifications." msgstr "" -#: ../../include/enotify.php:125 -#, php-format -msgid "%1$s posted to your profile wall at %2$s" +#: ../../mod/notifications.php:427 +msgid "Personal Notifications" msgstr "" -#: ../../include/enotify.php:127 -#, php-format -msgid "%1$s posted to [url=%2s]your wall[/url]" +#: ../../mod/notifications.php:504 +msgid "No more home notifications." msgstr "" -#: ../../include/enotify.php:138 -#, php-format -msgid "[Friendica:Notify] %s tagged you" +#: ../../mod/notifications.php:508 +msgid "Home Notifications" msgstr "" -#: ../../include/enotify.php:139 -#, php-format -msgid "%1$s tagged you at %2$s" +#: ../../mod/oexchange.php:22 +msgid "Post successful." msgstr "" -#: ../../include/enotify.php:140 -#, php-format -msgid "%1$s [url=%2$s]tagged you[/url]." +#: ../../mod/profile.php:101 +msgid "Access to this profile has been restricted." msgstr "" -#: ../../include/enotify.php:151 -#, php-format -msgid "[Friendica:Notify] %s tagged your post" +#: ../../mod/page.php:9 +msgid "Invalid item." msgstr "" -#: ../../include/enotify.php:152 -#, php-format -msgid "%1$s tagged your post at %2$s" +#: ../../mod/photos.php:81 +msgid "Page owner information could not be retrieved." msgstr "" -#: ../../include/enotify.php:153 -#, php-format -msgid "%1$s tagged [url=%2$s]your post[/url]" +#: ../../mod/photos.php:101 +msgid "Album not found." msgstr "" -#: ../../include/enotify.php:164 -msgid "[Friendica:Notify] Introduction received" +#: ../../mod/photos.php:123 ../../mod/photos.php:813 +msgid "Delete Album" msgstr "" -#: ../../include/enotify.php:165 -#, php-format -msgid "You've received an introduction from '%1$s' at %2$s" +#: ../../mod/photos.php:163 ../../mod/photos.php:1093 +msgid "Delete Photo" msgstr "" -#: ../../include/enotify.php:166 +#: ../../mod/photos.php:490 #, php-format -msgid "You've received [url=%1$s]an introduction[/url] from %2$s." +msgid "%1$s was tagged in %2$s by %3$s" msgstr "" -#: ../../include/enotify.php:169 ../../include/enotify.php:187 -#, php-format -msgid "You may visit their profile at %s" +#: ../../mod/photos.php:490 +msgid "a photo" msgstr "" -#: ../../include/enotify.php:171 -#, php-format -msgid "Please visit %s to approve or reject the introduction." +#: ../../mod/photos.php:564 +msgid "No photos selected" msgstr "" -#: ../../include/enotify.php:178 -msgid "[Friendica:Notify] Friend suggestion received" +#: ../../mod/photos.php:666 +msgid "Access to this item is restricted." msgstr "" -#: ../../include/enotify.php:179 -#, php-format -msgid "You've received a friend suggestion from '%1$s' at %2$s" +#: ../../mod/photos.php:699 ../../mod/photos.php:797 ../../mod/photos.php:819 +#: ../../mod/photos.php:1298 ../../mod/photos.php:1310 +msgid "Contact Photos" msgstr "" -#: ../../include/enotify.php:180 +#: ../../mod/photos.php:730 #, php-format -msgid "You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s." -msgstr "" - -#: ../../include/enotify.php:185 -msgid "Name:" -msgstr "" - -#: ../../include/enotify.php:186 -msgid "Photo:" +msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." msgstr "" -#: ../../include/enotify.php:189 +#: ../../mod/photos.php:733 #, php-format -msgid "Please visit %s to approve or reject the suggestion." +msgid "You have used %1$.2f Mbytes of photo storage." msgstr "" -#: ../../include/follow.php:32 -msgid "Connect URL missing." +#: ../../mod/photos.php:748 +msgid "Upload Photos" msgstr "" -#: ../../include/follow.php:59 -msgid "" -"This site is not configured to allow communications with other networks." +#: ../../mod/photos.php:752 ../../mod/photos.php:808 +msgid "New album name: " msgstr "" -#: ../../include/follow.php:60 ../../include/follow.php:80 -msgid "No compatible communication protocols or feeds were discovered." +#: ../../mod/photos.php:753 +msgid "or existing album name: " msgstr "" -#: ../../include/follow.php:78 -msgid "The profile address specified does not provide adequate information." +#: ../../mod/photos.php:754 +msgid "Do not show a status post for this upload" msgstr "" -#: ../../include/follow.php:82 -msgid "An author or name was not found." +#: ../../mod/photos.php:823 +msgid "Edit Album" msgstr "" -#: ../../include/follow.php:84 -msgid "No browser URL could be matched to this address." +#: ../../mod/photos.php:829 +msgid "Show Newest First" msgstr "" -#: ../../include/follow.php:86 -msgid "" -"Unable to match @-style Identity Address with a known protocol or email " -"contact." +#: ../../mod/photos.php:831 +msgid "Show Oldest First" msgstr "" -#: ../../include/follow.php:87 -msgid "Use mailto: in front of address to force email check." +#: ../../mod/photos.php:864 ../../mod/photos.php:1340 +msgid "View Photo" msgstr "" -#: ../../include/follow.php:93 -msgid "" -"The profile address specified belongs to a network which has been disabled " -"on this site." +#: ../../mod/photos.php:899 +msgid "Permission denied. Access to this item may be restricted." msgstr "" -#: ../../include/follow.php:103 -msgid "" -"Limited profile. This person will be unable to receive direct/personal " -"notifications from you." +#: ../../mod/photos.php:901 +msgid "Photo not available" msgstr "" -#: ../../include/follow.php:205 -msgid "Unable to retrieve contact information." +#: ../../mod/photos.php:957 +msgid "View photo" msgstr "" -#: ../../include/follow.php:259 -msgid "following" +#: ../../mod/photos.php:957 +msgid "Edit photo" msgstr "" -#: ../../include/items.php:2890 -msgid "A new person is sharing with you at " +#: ../../mod/photos.php:958 +msgid "Use as profile photo" msgstr "" -#: ../../include/items.php:2890 -msgid "You have a new follower at " +#: ../../mod/photos.php:986 +msgid "View Full Size" msgstr "" -#: ../../include/items.php:3522 -msgid "Archives" +#: ../../mod/photos.php:1054 +msgid "Tags: " msgstr "" -#: ../../include/bb2diaspora.php:226 ../../include/bb2diaspora.php:236 -#: ../../include/bb2diaspora.php:237 -msgid "image/photo" +#: ../../mod/photos.php:1057 +msgid "[Remove any tag]" msgstr "" -#: ../../include/user.php:38 -msgid "An invitation is required." +#: ../../mod/photos.php:1078 +msgid "Rotate CW (right)" msgstr "" -#: ../../include/user.php:43 -msgid "Invitation could not be verified." +#: ../../mod/photos.php:1079 +msgid "Rotate CCW (left)" msgstr "" -#: ../../include/user.php:51 -msgid "Invalid OpenID url" +#: ../../mod/photos.php:1081 +msgid "New album name" msgstr "" -#: ../../include/user.php:66 -msgid "Please enter the required information." +#: ../../mod/photos.php:1084 +msgid "Caption" msgstr "" -#: ../../include/user.php:80 -msgid "Please use a shorter name." +#: ../../mod/photos.php:1086 +msgid "Add a Tag" msgstr "" -#: ../../include/user.php:82 -msgid "Name too short." +#: ../../mod/photos.php:1090 +msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "" -#: ../../include/user.php:97 -msgid "That doesn't appear to be your full (First Last) name." +#: ../../mod/photos.php:1346 +msgid "View Album" msgstr "" -#: ../../include/user.php:102 -msgid "Your email domain is not among those allowed on this site." +#: ../../mod/photos.php:1355 +msgid "Recent Photos" msgstr "" -#: ../../include/user.php:105 -msgid "Not a valid email address." +#: ../../mod/ping.php:160 +msgid "sent you a private message" msgstr "" -#: ../../include/user.php:115 -msgid "Cannot use that email." +#: ../../mod/ping.php:218 +msgid "added your channel" msgstr "" -#: ../../include/user.php:121 -msgid "" -"Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and " -"must also begin with a letter." +#: ../../mod/ping.php:230 ../../boot.php:1595 ../../boot.php:1675 +msgid "g A l F d" msgstr "" -#: ../../include/user.php:127 ../../include/user.php:225 -msgid "Nickname is already registered. Please choose another." +#: ../../mod/ping.php:252 ../../boot.php:1641 ../../boot.php:1716 +msgid "[today]" msgstr "" -#: ../../include/user.php:137 -msgid "" -"Nickname was once registered here and may not be re-used. Please choose " -"another." +#: ../../mod/ping.php:262 +msgid "posted an event" msgstr "" -#: ../../include/user.php:153 -msgid "SERIOUS ERROR: Generation of security keys failed." +#: ../../mod/profperm.php:34 ../../mod/profperm.php:64 +msgid "Invalid profile identifier." msgstr "" -#: ../../include/user.php:211 -msgid "An error occurred during registration. Please try again." +#: ../../mod/profperm.php:110 +msgid "Profile Visibility Editor" msgstr "" -#: ../../include/user.php:246 -msgid "An error occurred creating your default profile. Please try again." +#: ../../mod/profperm.php:114 +msgid "Click on a contact to add or remove." msgstr "" -#: ../../include/security.php:21 -msgid "Welcome " +#: ../../mod/profperm.php:123 +msgid "Visible To" msgstr "" -#: ../../include/security.php:22 -msgid "Please upload a profile photo." +#: ../../mod/profperm.php:139 +msgid "All Contacts (with secure profile access)" msgstr "" -#: ../../include/security.php:25 -msgid "Welcome back " +#: ../../mod/register.php:35 +msgid "Maximum daily site registrations exceeded. Please try again tomorrow." msgstr "" -#: ../../include/security.php:329 +#: ../../mod/register.php:41 msgid "" -"The form security token was not correct. This probably happened because the " -"form has been opened for too long (>3 hours) before submitting it." -msgstr "" - -#: ../../include/Contact.php:111 -msgid "stopped following" -msgstr "" - -#: ../../include/Contact.php:218 ../../include/conversation.php:842 -msgid "View Status" -msgstr "" - -#: ../../include/Contact.php:219 ../../include/conversation.php:843 -msgid "View Profile" -msgstr "" - -#: ../../include/Contact.php:220 ../../include/conversation.php:844 -msgid "View Photos" -msgstr "" - -#: ../../include/Contact.php:221 ../../include/Contact.php:234 -#: ../../include/conversation.php:845 -msgid "Network Posts" -msgstr "" - -#: ../../include/Contact.php:222 ../../include/Contact.php:234 -#: ../../include/conversation.php:846 -msgid "Edit Contact" -msgstr "" - -#: ../../include/Contact.php:223 ../../include/Contact.php:234 -#: ../../include/conversation.php:847 -msgid "Send PM" -msgstr "" - -#: ../../include/conversation.php:163 -msgid "post/item" -msgstr "" - -#: ../../include/conversation.php:164 -#, php-format -msgid "%1$s marked %2$s's %3$s as favorite" +"Please indicate acceptance of the Terms of Service. Registration failed." msgstr "" -#: ../../include/conversation.php:750 -msgid "Delete Selected Items" -msgstr "" - -#: ../../include/conversation.php:905 -#, php-format -msgid "%s likes this." +#: ../../mod/register.php:91 +msgid "" +"Registration successful. Please check your email for validation instructions." msgstr "" -#: ../../include/conversation.php:905 -#, php-format -msgid "%s doesn't like this." +#: ../../mod/register.php:97 +msgid "Your registration is pending approval by the site owner." msgstr "" -#: ../../include/conversation.php:909 -#, php-format -msgid "<span %1$s>%2$d people</span> like this." +#: ../../mod/register.php:100 +msgid "Your registration can not be processed." msgstr "" -#: ../../include/conversation.php:911 -#, php-format -msgid "<span %1$s>%2$d people</span> don't like this." +#: ../../mod/register.php:135 +msgid "" +"This site has exceeded the number of allowed daily account registrations. " +"Please try again tomorrow." msgstr "" -#: ../../include/conversation.php:917 -msgid "and" +#: ../../mod/register.php:146 +msgid "Terms of Service" msgstr "" -#: ../../include/conversation.php:920 +#: ../../mod/register.php:152 #, php-format -msgid ", and %d other people" +msgid "I accept the %s for this website" msgstr "" -#: ../../include/conversation.php:921 +#: ../../mod/register.php:154 #, php-format -msgid "%s like this." +msgid "I am over 13 years of age and accept the %s for this website" msgstr "" -#: ../../include/conversation.php:921 -#, php-format -msgid "%s don't like this." +#: ../../mod/register.php:169 +msgid "Membership on this site is by invitation only." msgstr "" -#: ../../include/conversation.php:946 -msgid "Visible to <strong>everybody</strong>" +#: ../../mod/register.php:170 +msgid "Please enter your invitation code" msgstr "" -#: ../../include/conversation.php:948 -msgid "Please enter a video link/URL:" +#: ../../mod/register.php:173 +msgid "Your email address" msgstr "" -#: ../../include/conversation.php:949 -msgid "Please enter an audio link/URL:" +#: ../../mod/register.php:174 +msgid "Choose a password" msgstr "" -#: ../../include/conversation.php:950 -msgid "Tag term:" +#: ../../mod/register.php:175 +msgid "Please re-enter your password" msgstr "" -#: ../../include/conversation.php:952 -msgid "Where are you right now?" -msgstr "" - -#: ../../include/conversation.php:995 -msgid "upload photo" -msgstr "" - -#: ../../include/conversation.php:997 -msgid "attach file" +#: ../../mod/regmod.php:12 +msgid "Please login." msgstr "" -#: ../../include/conversation.php:999 -msgid "web link" +#: ../../mod/removeme.php:45 ../../mod/removeme.php:48 +msgid "Remove My Account" msgstr "" -#: ../../include/conversation.php:1000 -msgid "Insert video link" +#: ../../mod/removeme.php:46 +msgid "" +"This will completely remove your account. Once this has been done it is not " +"recoverable." msgstr "" -#: ../../include/conversation.php:1001 -msgid "video link" +#: ../../mod/removeme.php:47 +msgid "Please enter your password for verification:" msgstr "" -#: ../../include/conversation.php:1002 -msgid "Insert audio link" +#: ../../view/theme/redbasic/php/config.php:133 +msgid "Theme settings" msgstr "" -#: ../../include/conversation.php:1003 -msgid "audio link" +#: ../../view/theme/redbasic/php/config.php:134 +msgid "Set font-size for posts and comments" msgstr "" -#: ../../include/conversation.php:1005 -msgid "set location" +#: ../../view/theme/redbasic/php/config.php:135 +msgid "Set line-height for posts and comments" msgstr "" -#: ../../include/conversation.php:1007 -msgid "clear location" +#: ../../view/theme/redbasic/php/config.php:136 +msgid "Set colour scheme" msgstr "" -#: ../../include/conversation.php:1014 -msgid "permissions" +#: ../../view/theme/redbasic/php/config.php:137 +msgid "Draw shadows" msgstr "" -#: ../../include/plugin.php:388 ../../include/plugin.php:390 -msgid "Click here to upgrade." +#: ../../view/theme/redbasic/php/config.php:138 +msgid "Navigation bar colour" msgstr "" -#: ../../include/plugin.php:396 -msgid "This action exceeds the limits set by your subscription plan." +#: ../../view/theme/redbasic/php/config.php:139 +msgid "Display style" msgstr "" -#: ../../include/plugin.php:401 -msgid "This action is not available under your subscription plan." +#: ../../view/theme/redbasic/php/config.php:140 +msgid "Display colour of links - hex value, do not include the #" msgstr "" -#: ../../boot.php:563 -msgid "Delete this item?" +#: ../../view/theme/redbasic/php/config.php:141 +msgid "Icons" msgstr "" -#: ../../boot.php:566 -msgid "show fewer" +#: ../../view/theme/redbasic/php/config.php:142 +msgid "Shiny style" msgstr "" -#: ../../boot.php:761 +#: ../../boot.php:1067 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../boot.php:763 +#: ../../boot.php:1070 #, php-format msgid "Update Error at %s" msgstr "" -#: ../../boot.php:863 +#: ../../boot.php:1207 msgid "Create a New Account" msgstr "" -#: ../../boot.php:887 -msgid "Nickname or Email address: " +#: ../../boot.php:1236 +msgid "Password" msgstr "" -#: ../../boot.php:888 -msgid "Password: " +#: ../../boot.php:1237 +msgid "Remember me" msgstr "" -#: ../../boot.php:891 -msgid "Or login using OpenID: " +#: ../../boot.php:1242 +msgid "Forgot your password?" msgstr "" -#: ../../boot.php:897 -msgid "Forgot your password?" +#: ../../boot.php:1359 +msgid "Requested channel is not available." msgstr "" -#: ../../boot.php:1064 -msgid "Edit profile" +#: ../../boot.php:1371 +msgid " Sorry, you don't have the permission to view this profile. " msgstr "" -#: ../../boot.php:1124 -msgid "Message" +#: ../../boot.php:1514 +msgid "Profiles" msgstr "" -#: ../../boot.php:1240 ../../boot.php:1319 -msgid "g A l F d" +#: ../../boot.php:1514 +msgid "Manage/edit profiles" msgstr "" -#: ../../boot.php:1241 ../../boot.php:1320 -msgid "F d" +#: ../../boot.php:1518 +msgid "Edit Profile" msgstr "" -#: ../../boot.php:1286 ../../boot.php:1360 -msgid "[today]" +#: ../../boot.php:1596 ../../boot.php:1676 +msgid "F d" msgstr "" -#: ../../boot.php:1298 +#: ../../boot.php:1653 msgid "Birthday Reminders" msgstr "" -#: ../../boot.php:1299 +#: ../../boot.php:1654 msgid "Birthdays this week:" msgstr "" -#: ../../boot.php:1353 +#: ../../boot.php:1709 msgid "[No description]" msgstr "" -#: ../../boot.php:1371 +#: ../../boot.php:1727 msgid "Event Reminders" msgstr "" -#: ../../boot.php:1372 +#: ../../boot.php:1728 msgid "Events this week:" msgstr "" -#: ../../boot.php:1577 +#: ../../boot.php:1925 +msgid "Status" +msgstr "" + +#: ../../boot.php:1928 msgid "Status Messages and Posts" msgstr "" -#: ../../boot.php:1583 +#: ../../boot.php:1935 msgid "Profile Details" msgstr "" -#: ../../boot.php:1598 +#: ../../boot.php:1952 msgid "Events and Calendar" msgstr "" -#: ../../boot.php:1604 -msgid "Only You Can See This" +#: ../../boot.php:2131 +msgid "toggle mobile" msgstr "" diff --git a/util/run_xgettext.sh b/util/run_xgettext.sh index 6ea603c83..891c04657 100755 --- a/util/run_xgettext.sh +++ b/util/run_xgettext.sh @@ -1,37 +1,81 @@ #!/bin/bash FULLPATH=$(dirname $(readlink -f "$0")) -cd "$FULLPATH/../view/en/" + +ADDONMODE= +ADDONNAME= +if [ "$1" == "--addon" -o "$1" == "-a" ] +then + ADDONMODE=1 + if [ -z $2 ]; then echo -e "ERROR: missing addon name\n\nrun_xgettext.sh -a <addonname>"; exit 1; fi + ADDONNAME=$2 + if [ ! -d "$FULLPATH/../addon/$ADDONNAME" ]; then echo "ERROR: addon '$ADDONNAME' not found"; exit 2; fi +fi + +if [ $ADDONMODE ] +then + cd "$FULLPATH/../addon/$ADDONNAME" + mkdir -p "$FULLPATH/../addon/$ADDONNAME/lang/C" + OUTFILE="$FULLPATH/../addon/$ADDONNAME/lang/C/messages.po" + FINDSTARTDIR="." + FINDOPTS= +else + cd "$FULLPATH/../view/en/" + OUTFILE="$FULLPATH/messages.po" + FINDSTARTDIR="../../" + # skip addon folder + FINDOPTS="-wholename */addon -prune -o" +fi + F9KVERSION=$(sed -n "s/.*'FRIENDICA_VERSION'.*'\([0-9.]*\)'.*/\1/p" ../../boot.php); echo "Friendica version $F9KVERSION" OPTS= -OUTFILE="$FULLPATH/messages.po" -if [ "" != "$1" ] -then - OUTFILE="$(readlink -f ${FULLPATH}/$1)" - if [ -e "$OUTFILE" ] - then - echo "join extracted strings" - OPTS="-j" - fi -fi + +#if [ "" != "$1" ] +#then +# OUTFILE="$(readlink -f ${FULLPATH}/$1)" +# if [ -e "$OUTFILE" ] +# then +# echo "join extracted strings" +# OPTS="-j" +# fi +#fi KEYWORDS="-k -kt -ktt:1,2" echo "extract strings to $OUTFILE.." -find ../../ -name "*.php" | xargs xgettext $KEYWORDS $OPTS -o "$OUTFILE" --from-code=UTF-8 -echo "setup base info.." -sed -i "s/SOME DESCRIPTIVE TITLE./FRIENDICA Distributed Social Network/g" "$OUTFILE" -sed -i "s/YEAR THE PACKAGE'S COPYRIGHT HOLDER/2010, 2011 the Friendica Project/g" "$OUTFILE" -sed -i "s/FIRST AUTHOR <EMAIL@ADDRESS>, YEAR./Mike Macgirvin, 2010/g" "$OUTFILE" -sed -i "s/PACKAGE VERSION/$F9KVERSION/g" "$OUTFILE" -sed -i "s/PACKAGE/Friendica/g" "$OUTFILE" -sed -i "s/CHARSET/UTF-8/g" "$OUTFILE" -sed -i "s/^\"Plural-Forms/#\"Plural-Forms/g" "$OUTFILE" +echo "extract strings to $OUTFILE.." +rm "$OUTFILE"; touch "$OUTFILE" +for f in $(find "$FINDSTARTDIR" $FINDOPTS -name "*.php" -type f) +do + if [ ! -d "$f" ] + then + xgettext $KEYWORDS $OPTS -j -o "$OUTFILE" --from-code=UTF-8 "$f" > /dev/null 2>&1 + fi +done +echo "setup base info.." +if [ $ADDONMODE ] +then + sed -i "s/SOME DESCRIPTIVE TITLE./ADDON $ADDONNAME/g" "$OUTFILE" + sed -i "s/YEAR THE PACKAGE'S COPYRIGHT HOLDER//g" "$OUTFILE" + sed -i "s/FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.//g" "$OUTFILE" + sed -i "s/PACKAGE VERSION//g" "$OUTFILE" + sed -i "s/PACKAGE/Friendica $ADDONNAME addon/g" "$OUTFILE" + sed -i "s/CHARSET/UTF-8/g" "$OUTFILE" + sed -i "s/^\"Plural-Forms/#\"Plural-Forms/g" "$OUTFILE" +else + sed -i "s/SOME DESCRIPTIVE TITLE./Red Communications Project/g" "$OUTFILE" + sed -i "s/YEAR THE PACKAGE'S COPYRIGHT HOLDER/2013 the Friendica Project/g" "$OUTFILE" + sed -i "s/FIRST AUTHOR <EMAIL@ADDRESS>, YEAR./Mike Macgirvin, 2013/g" "$OUTFILE" + sed -i "s/PACKAGE VERSION/$F9KVERSION/g" "$OUTFILE" + sed -i "s/PACKAGE/Red/g" "$OUTFILE" + sed -i "s/CHARSET/UTF-8/g" "$OUTFILE" + sed -i "s/^\"Plural-Forms/#\"Plural-Forms/g" "$OUTFILE" +fi echo "done." diff --git a/util/typo.php b/util/typo.php index c4d038ce8..fac60e8ec 100644 --- a/util/typo.php +++ b/util/typo.php @@ -38,8 +38,8 @@ } } - if(x($a->config,'php_path')) - $phpath = $a->config['php_path']; + if(x($a->config,'system') && x($a->config['system'],'php_path')) + $phpath = $a->config['system']['php_path']; else $phpath = 'php'; diff --git a/version.inc b/version.inc index 4a94d04b9..60f2e885b 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-03-06.244 +2013-03-13.251 diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index b20b1434e..03a956a0e 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1090,7 +1090,8 @@ footer { } .wall-item-content img { - max-width: 95% !important; + max-height: 95% !important; + max-width: 95% !important; /* box-shadow: 8px 8px 8px #666; can't really have this because of smileys */ } @@ -2257,37 +2258,11 @@ aside input[type='text'] { } - -#profile-jot-desc { - /*float: left;*/ - width: 480px; - color: #FF0000; - margin-top: 10px; - margin-bottom: 10px; -} - -#character-counter { - float: right; - font-size: 120%; -} - -#character-counter.grey { - color: #888888; -} - -#character-counter.orange { - color: orange; -} -#character-counter.red { - color: red; -} - -#profile-jot-banner-end { - /* clear: both; */ +#profile-jot-wrapper { + margin-top: 25px; } - #settings-default-perms-menu { margin-top: 15px; margin-bottom: 15px; @@ -3777,3 +3752,6 @@ ul.menu-popup { } .profile-match-connect { margin-top: 5px; } + +.reshared-content { margin-left: 30px; } +.shared_header img { margin-right: 10px; }
\ No newline at end of file diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index e4fb00b7a..700a815cf 100644 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -74,24 +74,6 @@ function initEditor(cb){ $('#profile-jot-desc').html(' '); } - //Character count - - if(textlen <= 140) { - $('#character-counter').removeClass('red'); - $('#character-counter').removeClass('orange'); - $('#character-counter').addClass('grey'); - } - if((textlen > 140) && (textlen <= 420)) { - $('#character-counter').removeClass('grey'); - $('#character-counter').removeClass('red'); - $('#character-counter').addClass('orange'); - } - if(textlen > 420) { - $('#character-counter').removeClass('grey'); - $('#character-counter').removeClass('orange'); - $('#character-counter').addClass('red'); - } - $('#character-counter').text(textlen); }); ed.onInit.add(function(ed) { diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 84b6df679..a50d40eca 100644 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -1,10 +1,5 @@ <div id="profile-jot-wrapper" > - <div id="profile-jot-banner-wrapper"> - <div id="profile-jot-desc" > </div> - <div id="character-counter" class="grey"></div> - </div> - <div id="profile-jot-banner-end"></div> <form id="profile-jot-form" action="$action" method="post" > <input type="hidden" name="type" value="$ptyp" /> diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl index eccc3660a..a2e305df5 100644 --- a/view/tpl/photo_albums.tpl +++ b/view/tpl/photo_albums.tpl @@ -3,7 +3,7 @@ {{ if $albums }} <ul> {{ for $albums as $al }} -<li><a href="$baseurl/photos/$nick/$al.bin2hex">$al.album</a></li> +<li><a href="$baseurl/photos/$nick/album/$al.bin2hex">$al.album</a></li> {{ endfor }} </ul> {{ endif }} diff --git a/view/tpl/smarty3/jot-header.tpl b/view/tpl/smarty3/jot-header.tpl index c20c7c10d..cce83e30b 100644 --- a/view/tpl/smarty3/jot-header.tpl +++ b/view/tpl/smarty3/jot-header.tpl @@ -79,24 +79,6 @@ function initEditor(cb){ $('#profile-jot-desc').html(' '); } - //Character count - - if(textlen <= 140) { - $('#character-counter').removeClass('red'); - $('#character-counter').removeClass('orange'); - $('#character-counter').addClass('grey'); - } - if((textlen > 140) && (textlen <= 420)) { - $('#character-counter').removeClass('grey'); - $('#character-counter').removeClass('red'); - $('#character-counter').addClass('orange'); - } - if(textlen > 420) { - $('#character-counter').removeClass('grey'); - $('#character-counter').removeClass('orange'); - $('#character-counter').addClass('red'); - } - $('#character-counter').text(textlen); }); ed.onInit.add(function(ed) { diff --git a/view/tpl/smarty3/jot.tpl b/view/tpl/smarty3/jot.tpl index 2def156b2..4f52cff20 100644 --- a/view/tpl/smarty3/jot.tpl +++ b/view/tpl/smarty3/jot.tpl @@ -5,11 +5,6 @@ *}} <div id="profile-jot-wrapper" > - <div id="profile-jot-banner-wrapper"> - <div id="profile-jot-desc" > </div> - <div id="character-counter" class="grey"></div> - </div> - <div id="profile-jot-banner-end"></div> <form id="profile-jot-form" action="{{$action}}" method="post" > <input type="hidden" name="type" value="{{$ptyp}}" /> diff --git a/view/tpl/smarty3/photo_albums.tpl b/view/tpl/smarty3/photo_albums.tpl index 8a31e030c..b74c73fd3 100644 --- a/view/tpl/smarty3/photo_albums.tpl +++ b/view/tpl/smarty3/photo_albums.tpl @@ -8,7 +8,7 @@ {{if $albums}} <ul> {{foreach $albums as $al}} -<li><a href="{{$baseurl}}/photos/{{$nick}}/{{$al.bin2hex}}">{{$al.album}}</a></li> +<li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}">{{$al.album}}</a></li> {{/foreach}} </ul> {{/if}} |