diff options
34 files changed, 2848 insertions, 2483 deletions
@@ -9,9 +9,9 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1193' ); +define ( 'FRIENDICA_VERSION', '2.3.1203' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); -define ( 'DB_UPDATE_VERSION', 1111 ); +define ( 'DB_UPDATE_VERSION', 1112 ); define ( 'EOL', "<br />\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); @@ -1036,6 +1036,8 @@ function get_birthdays() { if($r && count($r)) { $total = 0; $now = strtotime('now'); + $cids = array(); + $istoday = false; foreach($r as $rr) { if(strlen($rr['name'])) @@ -1052,6 +1054,13 @@ function get_birthdays() { foreach($r as $rr) { if(! strlen($rr['name'])) continue; + + // avoid duplicates + + if(in_array($rr['cid'],$cids)) + continue; + $cids[] = $rr['cid']; + $today = (((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) ? true : false); $sparkle = ''; $url = $rr['url']; diff --git a/database.sql b/database.sql index 894ea42d9..e96aff4b7 100644 --- a/database.sql +++ b/database.sql @@ -694,6 +694,7 @@ CREATE TABLE IF NOT EXISTS `gcontact` ( `url` CHAR( 255 ) NOT NULL , `nurl` CHAR( 255 ) NOT NULL , `photo` CHAR( 255 ) NOT NULL, +`connect` CHAR( 255 ) NOT NULL, INDEX ( `nurl` ) ) ENGINE = MyISAM DEFAULT CHARSET=utf8; diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index eb709e01d..0e001df35 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -173,9 +173,9 @@ function bb2diaspora($Text,$preserve_nl = false) { // html5 video and audio -// $Text = preg_replace("/\[video\](.*?)\[\/video\]/", '<video src="$1" controls="controls" width="425" height="350"><a href="$1">$1</a></video>', $Text); + $Text = preg_replace("/\[video\](.*?)\[\/video\]/", '$1', $Text); -// $Text = preg_replace("/\[audio\](.*?)\[\/audio\]/", '<audio src="$1" controls="controls"><a href="$1">$1</a></audio>', $Text); + $Text = preg_replace("/\[audio\](.*?)\[\/audio\]/", '$1', $Text); // $Text = preg_replace("/\[iframe\](.*?)\[\/iframe\]/", '<iframe src="$1" width="425" height="350"><a href="$1">$1</a></iframe>', $Text); diff --git a/include/bbcode.php b/include/bbcode.php index 15b2ebb0a..5218a06e8 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -11,6 +11,7 @@ function stripcode_br_cb($s) { function tryoembed($match){ $url = ((count($match)==2)?$match[1]:$match[2]); + logger("tryoembed: $url"); $o = oembed_fetch_url($url); @@ -180,22 +181,18 @@ function bbcode($Text,$preserve_nl = false) { $Text = preg_replace("/\[iframe\](.*?)\[\/iframe\]/ism", '<iframe src="$1" width="425" height="350"><a href="$1">$1</a></iframe>', $Text); - /*if (get_pconfig(local_user(), 'oembed', 'use_for_youtube' )==1){ - // use oembed for youtube links - $Text = preg_replace("/\[youtube\]/",'[embed]',$Text); - $Text = preg_replace("/\[\/youtube\]/",'[/embed]',$Text); - } else {*/ - // Youtube extensions - $Text = preg_replace_callback("/\[youtube\](https?:\/\/www.youtube.com\/watch\?v\=.*?)\[\/youtube\]/ism", 'tryoembed', $Text); - $Text = preg_replace_callback("/\[youtube\](https?:\/\/youtu.be\/.*?)\[\/youtube\]/ism",'tryoembed',$Text); + // Youtube extensions + $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); - $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/youtube\]/ism",'[youtube]$1[/youtube]',$Text); - $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/embed\/(.*?)\[\/youtube\]/ism",'[youtube]$1[/youtube]',$Text); - $Text = preg_replace("/\[youtube\]https?:\/\/youtu.be\/(.*?)\[\/youtube\]/ism",'[youtube]$1[/youtube]',$Text); + $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/youtube\]/ism",'[youtube]$1[/youtube]',$Text); + $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/embed\/(.*?)\[\/youtube\]/ism",'[youtube]$1[/youtube]',$Text); + $Text = preg_replace("/\[youtube\]https?:\/\/youtu.be\/(.*?)\[\/youtube\]/ism",'[youtube]$1[/youtube]',$Text); - $Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", '<iframe width="425" height="350" src="http://www.youtube.com/embed/$1" frameborder="0" ></iframe>', $Text); - //} + $Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", '<iframe width="425" height="350" src="http://www.youtube.com/embed/$1" frameborder="0" ></iframe>', $Text); + $Text = preg_replace_callback("/\[vimeo\](https?:\/\/player.vimeo.com\/video\/[0-9]+).*?\[\/vimeo\]/ism",'tryoembed',$Text); $Text = preg_replace_callback("/\[vimeo\](https?:\/\/vimeo.com\/[0-9]+).*?\[\/vimeo\]/ism",'tryoembed',$Text); diff --git a/include/conversation.php b/include/conversation.php index deced3cb8..fae57c565 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -294,7 +294,7 @@ function conversation(&$a, $items, $mode, $update) { $arr = array('item' => $item, 'output' => $tmp_item); call_hooks('display_item', $arr); - $threads[$threadsid]['id'] = $arr[$item['item_id']]; + $threads[$threadsid]['id'] = $item['item_id']; $threads[$threadsid]['html'] .= $arr['output']; } diff --git a/include/diaspora.php b/include/diaspora.php index 7f1e4a8e3..d1e975a89 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -69,7 +69,7 @@ function diaspora_dispatch($importer,$msg) { $ret = diaspora_retraction($importer,$xmlbase->retraction,$msg); } elseif($xmlbase->signed_retraction) { - $ret = diaspora_signed_retraction($importer,$xmlbase->retraction,$msg); + $ret = diaspora_signed_retraction($importer,$xmlbase->signed_retraction,$msg); } elseif($xmlbase->photo) { $ret = diaspora_photo($importer,$xmlbase->photo,$msg); @@ -188,6 +188,13 @@ function diaspora_msg_build($msg,$user,$contact,$prvkey,$pubkey,$public = false) logger('diaspora_msg_build: ' . $msg, LOGGER_DATA); + // without a public key nothing will work + + if(! $pubkey) { + logger('diaspora_msg_build: pubkey missing: contact id: ' . $contact['id']); + return ''; + } + $inner_aes_key = random_string(32); $b_inner_aes_key = base64_encode($inner_aes_key); $inner_iv = random_string(16); @@ -1562,6 +1569,7 @@ EOT; function diaspora_retraction($importer,$xml) { + $guid = notags(unxmlify($xml->guid)); $diaspora_handle = notags(unxmlify($xml->diaspora_handle)); $type = notags(unxmlify($xml->type)); @@ -1593,7 +1601,8 @@ function diaspora_retraction($importer,$xml) { // NOTREACHED } -function diaspora_signed_retraction($importer,$xml) { +function diaspora_signed_retraction($importer,$xml,$msg) { + $guid = notags(unxmlify($xml->target_guid)); $diaspora_handle = notags(unxmlify($xml->sender_handle)); @@ -1601,8 +1610,10 @@ function diaspora_signed_retraction($importer,$xml) { $sig = notags(unxmlify($xml->target_author_signature)); $contact = diaspora_get_contact_by_handle($importer['uid'],$diaspora_handle); - if(! $contact) + if(! $contact) { + logger('diaspora_signed_retraction: no contact'); return; + } // this may not yet work for comments. Need to see how the relaying works // and figure out who signs it. @@ -1621,7 +1632,7 @@ function diaspora_signed_retraction($importer,$xml) { if($type === 'StatusMessage') { $r = q("select * from item where guid = '%s' and uid = %d limit 1", - dbesc('guid'), + dbesc($guid), intval($importer['uid']) ); if(count($r)) { @@ -1633,6 +1644,8 @@ function diaspora_signed_retraction($importer,$xml) { } } } + else + logger('diaspora_signed_retraction: unknown type: ' . $type); return 202; // NOTREACHED @@ -1672,6 +1685,12 @@ function diaspora_profile($importer,$xml) { $birthday = datetime_convert('UTC','UTC',$birthday,'Y-m-d'); + // this is to prevent multiple birthday notifications in a single year + // if we already have a stored birthday and the 'm-d' part hasn't changed, preserve the entry, which will preserve the notify year + + if(substr($birthday,5) === substr($contact['bd'],5)) + $birthday = $contact['bd']; + $r = q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s', `photo` = '%s', `thumb` = '%s', `micro` = '%s', `avatar-date` = '%s' , `bd` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1", dbesc($name), dbesc(datetime_convert()), diff --git a/include/socgraph.php b/include/socgraph.php index 07dafe7f8..79d7340a4 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -40,17 +40,34 @@ function poco_load($cid,$uid = 0,$url = null) { if(! $url) return; - logger('poco_load: ' . $url, LOGGER_DATA); + $url = $url . (($uid) ? '/@me/@all?fields=displayName,urls,photos' : '?fields=displayName,urls,photos') ; - $s = fetch_url($url . '/@me/@all?fields=displayName,urls,photos'); + logger('poco_load: ' . $url, LOGGER_DEBUG); + + $s = fetch_url($url); + + logger('poco_load: returns ' . $s, LOGGER_DATA); + + logger('poco_load: return code: ' . $a->get_curl_code(), LOGGER_DEBUG); if(($a->get_curl_code() > 299) || (! $s)) return; + + $j = json_decode($s); + + logger('poco_load: json: ' . print_r($j,true),LOGGER_DATA); + + if(! isset($j->entry)) + return; + + $total = 0; foreach($j->entry as $entry) { + $total ++; $profile_url = ''; $profile_photo = ''; + $connect_url = ''; $name = ''; $name = $entry->displayName; @@ -58,13 +75,18 @@ function poco_load($cid,$uid = 0,$url = null) { foreach($entry->urls as $url) { if($url->type == 'profile') { $profile_url = $url->value; - break; + continue; + } + if($url->type == 'webfinger') { + $connect_url = str_replace('acct:' , '', $url->value); + continue; } + } foreach($entry->photos as $photo) { if($photo->type == 'profile') { $profile_photo = $photo->value; - break; + continue; } } @@ -79,21 +101,23 @@ function poco_load($cid,$uid = 0,$url = null) { $gcid = $x[0]['id']; if($x[0]['name'] != $name || $x[0]['photo'] != $profile_photo) { - q("update gcontact set `name` = '%s', `photo` = '%s' where - `nurl` = '%s' limit 1", + q("update gcontact set `name` = '%s', `photo` = '%s', `connect` = '%s' + where `nurl` = '%s' limit 1", dbesc($name), dbesc($profile_photo), + dbesc($connect_url), dbesc(normalise_link($profile_url)) ); } } else { - q("insert into `gcontact` (`name`,`url`,`nurl`,`photo`) - values ( '%s', '%s', '%s', '%s') ", + q("insert into `gcontact` (`name`,`url`,`nurl`,`photo`,`connect`) + values ( '%s', '%s', '%s', '%s','%s') ", dbesc($name), dbesc($profile_url), dbesc(normalise_link($profile_url)), - dbesc($profile_photo) + dbesc($profile_photo), + dbesc($connect_url) ); $x = q("select * from `gcontact` where `nurl` = '%s' limit 1", dbesc(normalise_link($profile_url)) @@ -127,6 +151,7 @@ function poco_load($cid,$uid = 0,$url = null) { } } + logger("poco_load: loaded $total entries",LOGGER_DEBUG); q("delete from glink where `cid` = %d and `uid` = %d and `updated` < UTC_TIMESTAMP - INTERVAL 2 DAY", intval($cid), @@ -222,20 +247,22 @@ function suggestion_query($uid, $start = 0, $limit = 40) { intval($limit) ); - if(count($r)) + if(count($r) && count($r) >= ($limit -1)) return $r; - $r = q("SELECT gcontact.* from gcontact + $r2 = q("SELECT gcontact.* from gcontact left join glink on glink.gcid = gcontact.id - where uid = 0 and cid = 0 and not gcontact.nurl in ( select nurl from contact where uid = %d) + where glink.uid = 0 and glink.cid = 0 and not gcontact.nurl in ( select nurl from contact where uid = %d) and not gcontact.id in ( select gcid from gcign where uid = %d ) - order by rand limit %d, %d ", + order by rand() limit %d, %d ", + intval($uid), intval($uid), intval($start), intval($limit) ); - return $r; + + return array_merge($r,$r2); } diff --git a/include/text.php b/include/text.php index 04d5dfced..d6b3ceeab 100644 --- a/include/text.php +++ b/include/text.php @@ -635,7 +635,7 @@ function search($s,$id='search-box',$url='/search',$save = false) { if(! function_exists('valid_email')) { function valid_email($x){ - if(preg_match('/^[_a-zA-Z0-9-]+(\.[_a-zA-Z0-9-]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+$/',$x)) + if(preg_match('/^[_a-zA-Z0-9\-\+]+(\.[_a-zA-Z0-9\-\+]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+$/',$x)) return true; return false; }} @@ -171,6 +171,9 @@ ACL.prototype.update_view = function(){ $('.profile-jot-net input').attr('disabled', 'disabled'); $('#profile-jot-desc').html(' '); } + $("#acl-list-content .acl-list-item").each(function(){ + $(this).removeClass("groupshow grouphide"); + }); $("#acl-list-content .acl-list-item").each(function(){ itemid = $(this).attr('id'); @@ -194,8 +197,17 @@ ACL.prototype.update_view = function(){ uclass="grouphide"; } - $(that.group_uids[id]).each(function(i,v){ - $("#c"+v).removeClass("groupshow grouphide").addClass(uclass); + $(that.group_uids[id]).each(function(i,v) { + if(uclass == "grouphide") + $("#c"+v).removeClass("groupshow"); + if(uclass != "") { + var cls = $("#c"+v).attr('class'); + if( cls == undefined) + return true; + var hiding = cls.indexOf('grouphide'); + if(hiding == -1) + $("#c"+v).addClass(uclass); + } }); break; diff --git a/js/main.js b/js/main.js index 3f84ae6c4..96c7fa642 100644 --- a/js/main.js +++ b/js/main.js @@ -241,26 +241,34 @@ $('.tread-wrapper',data).each(function() { var ident = $(this).attr('id'); + if($('#' + ident).length == 0 && profile_page == 1) { $('img',this).each(function() { $(this).attr('src',$(this).attr('dst')); }); $('#' + prev).after($(this)); } + else { + $('img',this).each(function() { + $(this).attr('src',$(this).attr('dst')); + }); + $('#' + ident).replaceWith($(this)); + } prev = ident; }); // reset vars for inserting individual items - prev = 'live-' + src; + /* prev = 'live-' + src; $('.wall-item-outside-wrapper',data).each(function() { var ident = $(this).attr('id'); - if($('#' + ident).length == 0) { - $('img',this).each(function() { - $(this).attr('src',$(this).attr('dst')); - }); - $('#' + prev).after($(this)); + + if($('#' + ident).length == 0 && prev != 'live-' + src) { + $('img',this).each(function() { + $(this).attr('src',$(this).attr('dst')); + }); + $('#' + prev).after($(this)); } else { $('#' + ident + ' ' + '.wall-item-ago').replaceWith($(this).find('.wall-item-ago')); @@ -275,7 +283,7 @@ } prev = ident; }); - + */ $('.like-rotator').hide(); if(commentBusy) { commentBusy = false; diff --git a/mod/acl.php b/mod/acl.php index 735c2c0b0..0fea6f7fc 100644 --- a/mod/acl.php +++ b/mod/acl.php @@ -60,8 +60,8 @@ function acl_init(&$a){ intval($count) ); - foreach($r as $g){ +// logger('acl: group: ' . $g['name'] . ' members: ' . $g['uids']); $groups[] = array( "type" => "g", "photo" => "images/default-group-mm.png", diff --git a/mod/admin.php b/mod/admin.php index 8ca89900c..e44404097 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -1,7 +1,7 @@ <?php /** - * Friendika admin + * Friendica admin */ require_once("include/remoteupdate.php"); @@ -277,7 +277,7 @@ function admin_page_site(&$a) { /* Banner */ $banner = get_config('system','banner'); if($banner == false) - $banner = '<a href="http://project.friendika.com"><img id="logo-img" src="images/friendika-32.png" alt="logo" /></a><span id="logo-text"><a href="http://project.friendika.com">Friendika</a></span>'; + $banner = '<a href="http://friendica.com"><img id="logo-img" src="images/friendica-32.png" alt="logo" /></a><span id="logo-text"><a href="http://friendica.com">Friendica</a></span>'; $banner = htmlspecialchars($banner); //echo "<pre>"; var_dump($lang_choices); die("</pre>"); @@ -325,7 +325,7 @@ function admin_page_site(&$a) { '$no_community_page' => array('no_community_page', t("Show Community Page"), !get_config('system','no_community_page'), "Display a Community page showing all recent public postings on this site."), '$ostatus_disabled' => array('ostatus_disabled', t("Enable OStatus support"), !get_config('system','ostatus_disable'), "Provide built-in OStatus \x28identi.ca, status.net, etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."), '$diaspora_enabled' => array('diaspora_enabled', t("Enable Diaspora support"), get_config('system','diaspora_enabled'), "Provide built-in Diaspora network compatibility."), - '$dfrn_only' => array('dfrn_only', t('Only allow Friendika contacts'), get_config('system','dfrn_only'), "All contacts must use Friendika protocols. All other built-in communication protocols disabled."), + '$dfrn_only' => array('dfrn_only', t('Only allow Friendica contacts'), get_config('system','dfrn_only'), "All contacts must use Friendica protocols. All other built-in communication protocols disabled."), '$verifyssl' => array('verifyssl', t("Verify SSL"), get_config('system','verifyssl'), "If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."), '$proxyuser' => array('proxyuser', t("Proxy user"), get_config('system','proxyuser'), ""), '$proxy' => array('proxy', t("Proxy URL"), get_config('system','proxy'), ""), @@ -657,7 +657,7 @@ function admin_page_logs(&$a){ // name, label, value, help string, extra data... '$debugging' => array('debugging', t("Debugging"),get_config('system','debugging'), ""), - '$logfile' => array('logfile', t("Log file"), get_config('system','logfile'), t("Must be writable by web server. Relative to your Friendika index.php.")), + '$logfile' => array('logfile', t("Log file"), get_config('system','logfile'), t("Must be writable by web server. Relative to your Friendica top-level directory.")), '$loglevel' => array('loglevel', t("Log level"), get_config('system','loglevel'), "", $log_choices), )); } diff --git a/mod/follow.php b/mod/follow.php index 2d643400a..f8964885e 100644 --- a/mod/follow.php +++ b/mod/follow.php @@ -2,7 +2,7 @@ require_once('Scrape.php'); -function follow_post(&$a) { +function follow_init(&$a) { if(! local_user()) { notice( t('Permission denied.') . EOL); @@ -10,7 +10,7 @@ function follow_post(&$a) { // NOTREACHED } - $url = $orig_url = notags(trim($_POST['url'])); + $url = $orig_url = notags(trim($_REQUEST['url'])); // remove ajax junk, e.g. Twitter @@ -22,6 +22,14 @@ function follow_post(&$a) { // NOTREACHED } + + if(! $url) { + notice( t('Connect URL missing.') . EOL); + goaway($_SESSION['return_url']); + // NOTREACHED + } + + $ret = probe_url($url); if($ret['network'] === NETWORK_DFRN) { @@ -202,7 +210,9 @@ function follow_post(&$a) { } } - goaway($a->get_baseurl() . '/contacts/' . $contact_id); -// goaway($_SESSION['return_url']); + if(strstr($_SESSION['return_url'],'contacts')) + goaway($a->get_baseurl() . '/contacts/' . $contact_id); + + goaway($_SESSION['return_url']); // NOTREACHED } diff --git a/mod/friendica.php b/mod/friendica.php index 9dd6b7383..ab92e31ed 100644 --- a/mod/friendica.php +++ b/mod/friendica.php @@ -43,9 +43,9 @@ function friendica_content(&$a) { $o .= t('This is Friendica, version') . ' ' . FRIENDICA_VERSION . ' '; $o .= t('running at web location') . ' ' . z_root() . '</p><p>'; - $o .= t('Please visit <a href="http://project.friendika.com">Project.Friendika.com</a> to learn more about the Friendica project.') . '</p><p>'; + $o .= t('Please visit <a href="http://friendica.com">Friendica.com</a> to learn more about the Friendica project.') . '</p><p>'; - $o .= t('Bug reports and issues: please visit') . ' ' . '<a href="http://bugs.friendika.com">Bugs.Friendika.com</a></p><p>'; + $o .= t('Bug reports and issues: please visit') . ' ' . '<a href="http://bugs.friendica.com">Bugs.Friendica.com</a></p><p>'; $o .= t('Suggestions, praise, donations, etc. - please email "Info" at Friendica - dot com') . '</p>'; $o .= '<p></p>'; diff --git a/mod/home.php b/mod/home.php index 225bd294d..0320c1b39 100644 --- a/mod/home.php +++ b/mod/home.php @@ -3,6 +3,9 @@ if(! function_exists('home_init')) { function home_init(&$a) { + $ret = array(); + call_hooks('home_init',$ret); + if(local_user() && ($a->user['nickname'])) goaway( $a->get_baseurl() . "/profile/" . $a->user['nickname'] ); diff --git a/mod/item.php b/mod/item.php index 95a27eb8e..f72b17fc1 100644 --- a/mod/item.php +++ b/mod/item.php @@ -398,9 +398,13 @@ function item_post(&$a) { continue; $basetag = str_replace('_',' ',substr($tag,1)); $body = str_replace($tag,'#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]',$body); - if(strlen($str_tags)) - $str_tags .= ','; - $str_tags .= '#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]'; + + $newtag = '#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]'; + if(! stristr($str_tags,$newtag)) { + if(strlen($str_tags)) + $str_tags .= ','; + $str_tags .= $newtag; + } continue; } if(strpos($tag,'@') === 0) { diff --git a/mod/match.php b/mod/match.php index c33bbd5c2..3645a419d 100644 --- a/mod/match.php +++ b/mod/match.php @@ -7,6 +7,8 @@ function match_content(&$a) { if(! local_user()) return; + $_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd; + $o .= '<h2>' . t('Profile Match') . '</h2>'; $r = q("SELECT `pub_keywords`, `prv_keywords` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1", @@ -41,14 +43,20 @@ function match_content(&$a) { } if(count($j->results)) { + + $tpl = get_markup_template('match.tpl'); foreach($j->results as $jj) { + $connlnk = $a->get_baseurl() . '/follow/?url=' . $jj->url; $o .= replace_macros($tpl,array( '$url' => $jj->url, '$name' => $jj->name, '$photo' => $jj->photo, + '$inttxt' => ' ' . t('is interested in:'), + '$conntxt' => t('Connect'), + '$connlnk' => $connlnk, '$tags' => $jj->tags )); } diff --git a/mod/network.php b/mod/network.php index e9e761c3f..57e120e86 100644 --- a/mod/network.php +++ b/mod/network.php @@ -301,7 +301,8 @@ function network_content(&$a, $update = 0) { } - $sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` $star_sql AND ( `contact-id` IN ( $contact_str ) OR `allow_gid` REGEXP '<" . intval($group) . ">' )) "; +// $sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` $star_sql AND ( `contact-id` IN ( $contact_str ) OR `allow_gid` REGEXP '<" . intval($group) . ">' )) "; + $sql_extra = " AND `item`.`parent` IN ( SELECT DISTINCT(`parent`) FROM `item` WHERE 1 $star_sql AND ( `contact-id` IN ( $contact_str ) OR `allow_gid` REGEXP '<" . intval($group) . ">' )) "; $o = '<h2>' . t('Group: ') . $r[0]['name'] . '</h2>' . $o; } elseif($cid) { @@ -398,10 +399,9 @@ function network_content(&$a, $update = 0) { $simple_update = (($update) ? " and `item`.`unseen` = 1 " : ''); if($nouveau) { - // "New Item View" - show all items unthreaded in reverse created date order - $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, + $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` @@ -414,7 +414,7 @@ function network_content(&$a, $update = 0) { ORDER BY `item`.`received` DESC $pager_sql ", intval($_SESSION['uid']) ); - + } else { diff --git a/mod/newmember.php b/mod/newmember.php index fc53e7112..60ca49757 100644 --- a/mod/newmember.php +++ b/mod/newmember.php @@ -3,7 +3,7 @@ function newmember_content(&$a) { - $o = '<h3>' . t('Welcome to Friendika') . '</h3>'; + $o = '<h3>' . t('Welcome to Friendica') . '</h3>'; $o .= '<h3>' . t('New Member Checklist') . '</h3>'; @@ -25,13 +25,13 @@ function newmember_content(&$a) { $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1); if(! $mail_disabled) - $o .= '<li>' . '<a href="settings">' . t('Enter your email access information on your Settings page if you wish to import and interact with friends or mailing lists from your email INBOX') . '</a></li>' . EOL; + $o .= '<li>' . '<a href="settings/connectors">' . t('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') . '</a></li>' . EOL; $o .= '<li>' . '<a href="profiles">' . t('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.') . '</a></li>' . EOL; $o .= '<li>' . '<a href="profiles">' . t('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.') . '</a></li>' . EOL; - $o .= '<li>' . '<a href="contacts">' . t('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>Connect</em> dialog.') . '</a></li>' . EOL; + $o .= '<li>' . '<a href="contacts">' . t('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.') . '</a></li>' . EOL; $o .= '<li>' . '<a href="directory">' . t('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.') . '</a></li>' . EOL; diff --git a/mod/poco.php b/mod/poco.php index dd8df6008..79cf820bc 100644 --- a/mod/poco.php +++ b/mod/poco.php @@ -125,8 +125,11 @@ function poco_init(&$a) { $entry['id'] = $rr['id']; if($fields_ret['displayName']) $entry['displayName'] = $rr['name']; - if($fields_ret['urls']) + if($fields_ret['urls']) { $entry['urls'] = array(array('value' => $rr['url'], 'type' => 'profile')); + if($rr['addr'] && ($rr['network'] !== NETWORK_MAIL)) + $entry['urls'][] = array('value' => 'acct:' . $rr['addr'], 'type' => 'webfinger'); + } if($fields_ret['preferredUsername']) $entry['preferredUsername'] = $rr['nick']; if($fields_ret['photos']) diff --git a/mod/profile.php b/mod/profile.php index a619703c6..946499895 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -38,7 +38,7 @@ function profile_init(&$a) { if(! $blocked) { $keywords = ((x($a->profile,'pub_keywords')) ? $a->profile['pub_keywords'] : ''); - $keywords = str_replace(array(',',' ',',,'),array(' ',',',','),$keywords); + $keywords = str_replace(array('#',',',' ',',,'),array('',' ',',',','),$keywords); if(strlen($keywords)) $a->page['htmlhead'] .= '<meta name="keywords" content="' . $keywords . '" />' . "\r\n" ; } diff --git a/mod/register.php b/mod/register.php index 0115ec0d5..89f561642 100644 --- a/mod/register.php +++ b/mod/register.php @@ -8,6 +8,15 @@ function register_post(&$a) { $verified = 0; $blocked = 1; + + $max_dailies = intval(get_config('system','max_daily_registrations')); + if($max_dailes) { + $r = q("select count(*) as total from user where register_date > UTC_TIMESTAMP - INTERVAL 1 day"); + if($r && $r[0]['total'] >= $max_dailies) { + return; + } + } + switch($a->config['register_policy']) { @@ -462,6 +471,16 @@ function register_content(&$a) { return; } + $max_dailies = intval(get_config('system','max_daily_registrations')); + if($max_dailes) { + $r = q("select count(*) as total from user where register_date > UTC_TIMESTAMP - INTERVAL 1 day"); + if($r && $r[0]['total'] >= $max_dailies) { + logger('max daily registrations exceeded.'); + notice( t('This site has exceeded the number of allowed daily account registrations. Please try again tomorrow.') . EOL); + return; + } + } + if(x($_SESSION,'theme')) unset($_SESSION['theme']); diff --git a/mod/suggest.php b/mod/suggest.php index aedf3fd46..b8ca423c5 100644 --- a/mod/suggest.php +++ b/mod/suggest.php @@ -29,6 +29,8 @@ function suggest_content(&$a) { return; } + $_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd; + $a->page['aside'] .= follow_widget(); $a->page['aside'] .= findpeople_widget(); @@ -39,19 +41,23 @@ function suggest_content(&$a) { $r = suggestion_query(local_user()); if(! count($r)) { - $o .= t('No suggestions. This works best when you have more than one contact/friend.'); + $o .= t('No suggestions available. If this is a new site, please try again in 24 hours.'); return $o; } $tpl = get_markup_template('suggest_friends.tpl'); foreach($r as $rr) { - + + $connlnk = $a->get_baseurl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']); + $o .= replace_macros($tpl,array( '$url' => $rr['url'], '$name' => $rr['name'], '$photo' => $rr['photo'], '$ignlnk' => $a->get_baseurl() . '/suggest?ignore=' . $rr['id'], + '$conntxt' => t('Connect'), + '$connlnk' => $connlnk, '$ignore' => t('Ignore/Hide') )); } diff --git a/update.php b/update.php index 61a9a80ed..9b5772af1 100644 --- a/update.php +++ b/update.php @@ -1,6 +1,6 @@ <?php -define( 'UPDATE_VERSION' , 1111 ); +define( 'UPDATE_VERSION' , 1112 ); /** * @@ -944,3 +944,7 @@ function update_1110() { } +function update_1111() { + q("ALTER TABLE `gcontact` ADD `connect` CHAR( 255 ) NOT NULL "); +} + diff --git a/util/messages.po b/util/messages.po index cd0502976..47f20e30e 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,154 +6,425 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2.3.1174\n" +"Project-Id-Version: 2.3.1194\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-23 16:07-0800\n" +"POT-Creation-Date: 2011-12-14 16:10+0100\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:27 -msgid "Post successful." +#: ../../index.php:221 ../../mod/help.php:38 +msgid "Not Found" 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]" +#: ../../index.php:224 ../../mod/help.php:41 +msgid "Page not found." msgstr "" -#: ../../mod/crepair.php:100 -msgid "Contact settings applied." +#: ../../index.php:287 ../../mod/profperm.php:19 ../../mod/group.php:67 +msgid "Permission denied" msgstr "" -#: ../../mod/crepair.php:102 -msgid "Contact update failed." +#: ../../index.php:288 ../../mod/manage.php:75 ../../mod/wall_upload.php:42 +#: ../../mod/follow.php:8 ../../mod/profile_photo.php:19 +#: ../../mod/profile_photo.php:137 ../../mod/profile_photo.php:148 +#: ../../mod/profile_photo.php:159 ../../mod/wall_attach.php:43 +#: ../../mod/suggest.php:28 ../../mod/regmod.php:111 ../../mod/profiles.php:7 +#: ../../mod/profiles.php:229 ../../mod/settings.php:43 +#: ../../mod/settings.php:48 ../../mod/settings.php:399 +#: ../../mod/photos.php:125 ../../mod/photos.php:860 ../../mod/display.php:111 +#: ../../mod/editpost.php:10 ../../mod/invite.php:13 ../../mod/invite.php:81 +#: ../../mod/contacts.php:117 ../../mod/register.php:27 +#: ../../mod/allfriends.php:9 ../../mod/install.php:102 +#: ../../mod/network.php:6 ../../mod/events.php:109 +#: ../../mod/notifications.php:62 ../../mod/crepair.php:113 +#: ../../mod/api.php:26 ../../mod/api.php:31 ../../mod/notes.php:20 +#: ../../mod/fsuggest.php:78 ../../mod/item.php:113 ../../mod/message.php:9 +#: ../../mod/message.php:46 ../../mod/dfrn_confirm.php:53 +#: ../../mod/viewcontacts.php:21 ../../mod/group.php:19 +#: ../../mod/attach.php:33 ../../mod/common.php:9 +#: ../../addon/facebook/facebook.php:333 ../../include/items.php:2986 +msgid "Permission denied." msgstr "" -#: ../../mod/crepair.php:113 ../../mod/wall_attach.php:43 -#: ../../mod/fsuggest.php:78 ../../mod/events.php:109 ../../mod/api.php:26 -#: ../../mod/api.php:31 ../../mod/photos.php:123 ../../mod/photos.php:858 -#: ../../mod/editpost.php:10 ../../mod/install.php:96 -#: ../../mod/notifications.php:62 ../../mod/contacts.php:115 -#: ../../mod/settings.php:41 ../../mod/settings.php:46 -#: ../../mod/settings.php:388 ../../mod/manage.php:75 ../../mod/network.php:6 -#: ../../mod/notes.php:20 ../../mod/attach.php:33 ../../mod/group.php:19 -#: ../../mod/viewcontacts.php:21 ../../mod/register.php:27 -#: ../../mod/regmod.php:111 ../../mod/item.php:113 -#: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:137 -#: ../../mod/profile_photo.php:148 ../../mod/profile_photo.php:159 -#: ../../mod/message.php:9 ../../mod/message.php:42 ../../mod/allfriends.php:9 -#: ../../mod/wall_upload.php:42 ../../mod/follow.php:8 ../../mod/common.php:9 -#: ../../mod/display.php:111 ../../mod/profiles.php:7 -#: ../../mod/profiles.php:229 ../../mod/suggest.php:28 ../../mod/invite.php:13 -#: ../../mod/invite.php:81 ../../mod/dfrn_confirm.php:53 -#: ../../addon/facebook/facebook.php:331 ../../include/items.php:2986 -#: ../../index.php:284 -msgid "Permission denied." +#: ../../boot.php:434 +msgid "Delete this item?" msgstr "" -#: ../../mod/crepair.php:127 ../../mod/fsuggest.php:20 -#: ../../mod/fsuggest.php:92 ../../mod/dfrn_confirm.php:114 -msgid "Contact not found." +#: ../../boot.php:435 ../../mod/photos.php:1204 ../../mod/photos.php:1243 +#: ../../mod/photos.php:1274 ../../include/conversation.php:484 +msgid "Comment" msgstr "" -#: ../../mod/crepair.php:133 -msgid "Repair Contact Settings" +#: ../../boot.php:436 ../../include/conversation.php:407 +msgid "show more" msgstr "" -#: ../../mod/crepair.php:135 -msgid "" -"<strong>WARNING: This is highly advanced</strong> and if you enter incorrect " -"information your communications with this contact may stop working." +#: ../../boot.php:437 +msgid "show fewer" msgstr "" -#: ../../mod/crepair.php:136 -msgid "" -"Please use your browser 'Back' button <strong>now</strong> if you are " -"uncertain what to do on this page." +#: ../../boot.php:680 +msgid "Create a New Account" msgstr "" -#: ../../mod/crepair.php:144 ../../mod/settings.php:434 -#: ../../mod/settings.php:460 ../../mod/admin.php:464 ../../mod/admin.php:473 -msgid "Name" +#: ../../boot.php:681 ../../mod/register.php:535 ../../include/nav.php:77 +msgid "Register" msgstr "" -#: ../../mod/crepair.php:145 -msgid "Account Nickname" +#: ../../boot.php:697 ../../include/nav.php:44 +msgid "Logout" msgstr "" -#: ../../mod/crepair.php:146 -msgid "@Tagname - overrides Name/Nickname" +#: ../../boot.php:698 ../../addon/communityhome/communityhome.php:28 +#: ../../addon/communityhome/communityhome.php:34 ../../include/nav.php:62 +msgid "Login" msgstr "" -#: ../../mod/crepair.php:147 -msgid "Account URL" +#: ../../boot.php:700 +msgid "Nickname or Email address: " msgstr "" -#: ../../mod/crepair.php:148 -msgid "Friend Request URL" +#: ../../boot.php:701 +msgid "Password: " msgstr "" -#: ../../mod/crepair.php:149 -msgid "Friend Confirm URL" +#: ../../boot.php:704 +msgid "OpenID: " msgstr "" -#: ../../mod/crepair.php:150 -msgid "Notification Endpoint URL" +#: ../../boot.php:710 +msgid "Forgot your password?" msgstr "" -#: ../../mod/crepair.php:151 -msgid "Poll/Feed URL" +#: ../../boot.php:711 ../../mod/lostpass.php:82 +msgid "Password Reset" msgstr "" -#: ../../mod/crepair.php:152 -msgid "New photo from this URL" +#: ../../boot.php:833 ../../mod/profile.php:10 ../../mod/hcard.php:10 +msgid "No profile" +msgstr "" + +#: ../../boot.php:857 +msgid "Edit profile" +msgstr "" + +#: ../../boot.php:908 ../../include/contact_widgets.php:9 +msgid "Connect" +msgstr "" + +#: ../../boot.php:918 ../../include/nav.php:129 +msgid "Profiles" +msgstr "" + +#: ../../boot.php:918 ../../include/nav.php:129 +msgid "Manage/edit profiles" +msgstr "" + +#: ../../boot.php:924 ../../mod/profiles.php:462 +msgid "Change profile photo" +msgstr "" + +#: ../../boot.php:925 ../../mod/profiles.php:463 +msgid "Create New Profile" +msgstr "" + +#: ../../boot.php:935 ../../mod/profiles.php:473 +msgid "Profile Image" +msgstr "" + +#: ../../boot.php:938 ../../mod/profiles.php:475 +msgid "visible to everybody" +msgstr "" + +#: ../../boot.php:939 ../../mod/profiles.php:476 +msgid "Edit visibility" +msgstr "" + +#: ../../boot.php:958 ../../mod/events.php:328 ../../include/event.php:37 +#: ../../include/bb2diaspora.php:251 +msgid "Location:" +msgstr "" + +#: ../../boot.php:960 ../../include/profile_advanced.php:17 +msgid "Gender:" +msgstr "" + +#: ../../boot.php:963 ../../include/profile_advanced.php:37 +msgid "Status:" +msgstr "" + +#: ../../boot.php:965 ../../include/profile_advanced.php:45 +msgid "Homepage:" +msgstr "" + +#: ../../boot.php:1024 ../../boot.php:1086 +msgid "g A l F d" +msgstr "" + +#: ../../boot.php:1025 ../../boot.php:1087 +msgid "F d" +msgstr "" + +#: ../../boot.php:1048 +msgid "Birthday Reminders" +msgstr "" + +#: ../../boot.php:1049 +msgid "Birthdays this week:" +msgstr "" + +#: ../../boot.php:1065 ../../boot.php:1129 +msgid "[today]" +msgstr "" + +#: ../../boot.php:1110 +msgid "Event Reminders" +msgstr "" + +#: ../../boot.php:1111 +msgid "Events this week:" +msgstr "" + +#: ../../boot.php:1123 +msgid "[No description]" +msgstr "" + +#: ../../boot.php:1300 ../../include/nav.php:47 +msgid "Status" +msgstr "" + +#: ../../boot.php:1305 ../../mod/profperm.php:103 +#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74 +#: ../../include/nav.php:48 +msgid "Profile" +msgstr "" + +#: ../../boot.php:1310 ../../include/nav.php:49 +msgid "Photos" +msgstr "" + +#: ../../boot.php:1318 ../../mod/events.php:117 ../../include/nav.php:50 +msgid "Events" +msgstr "" + +#: ../../boot.php:1323 ../../mod/notes.php:44 +msgid "Personal Notes" +msgstr "" + +#: ../../mod/manage.php:37 +#, php-format +msgid "Welcome back %s" +msgstr "" + +#: ../../mod/manage.php:87 +msgid "Manage Identities and/or Pages" +msgstr "" + +#: ../../mod/manage.php:90 +msgid "" +"(Toggle between different identities or community/group pages which share " +"your account details.)" msgstr "" +#: ../../mod/manage.php:92 +msgid "Select an identity to manage: " +msgstr "" + +#: ../../mod/manage.php:106 ../../mod/profiles.php:375 +#: ../../mod/settings.php:443 ../../mod/settings.php:582 +#: ../../mod/settings.php:763 ../../mod/photos.php:888 +#: ../../mod/photos.php:946 ../../mod/photos.php:1165 +#: ../../mod/photos.php:1205 ../../mod/photos.php:1244 +#: ../../mod/photos.php:1275 ../../mod/localtime.php:45 +#: ../../mod/invite.php:106 ../../mod/contacts.php:308 +#: ../../mod/install.php:143 ../../mod/events.php:333 #: ../../mod/crepair.php:162 ../../mod/fsuggest.php:107 -#: ../../mod/events.php:330 ../../mod/photos.php:886 ../../mod/photos.php:944 -#: ../../mod/photos.php:1163 ../../mod/photos.php:1203 -#: ../../mod/photos.php:1242 ../../mod/photos.php:1273 -#: ../../mod/install.php:137 ../../mod/localtime.php:45 -#: ../../mod/contacts.php:306 ../../mod/settings.php:432 -#: ../../mod/settings.php:571 ../../mod/settings.php:739 -#: ../../mod/manage.php:106 ../../mod/group.php:84 ../../mod/group.php:167 #: ../../mod/admin.php:296 ../../mod/admin.php:461 ../../mod/admin.php:587 -#: ../../mod/admin.php:652 ../../mod/profiles.php:375 ../../mod/invite.php:106 -#: ../../addon/facebook/facebook.php:404 ../../addon/nsfw/nsfw.php:53 -#: ../../addon/randplace/randplace.php:178 -#: ../../addon/impressum/impressum.php:69 ../../addon/oembed/oembed.php:41 +#: ../../mod/admin.php:652 ../../mod/group.php:84 ../../mod/group.php:167 +#: ../../addon/tumblr/tumblr.php:89 ../../addon/twitter/twitter.php:179 +#: ../../addon/twitter/twitter.php:202 ../../addon/twitter/twitter.php:299 #: ../../addon/statusnet/statusnet.php:282 #: ../../addon/statusnet/statusnet.php:296 #: ../../addon/statusnet/statusnet.php:322 #: ../../addon/statusnet/statusnet.php:329 #: ../../addon/statusnet/statusnet.php:351 -#: ../../addon/statusnet/statusnet.php:486 ../../addon/tumblr/tumblr.php:89 -#: ../../addon/wppost/wppost.php:101 ../../addon/piwik/piwik.php:81 -#: ../../addon/twitter/twitter.php:179 ../../addon/twitter/twitter.php:202 -#: ../../addon/twitter/twitter.php:299 ../../addon/posterous/posterous.php:89 -#: ../../include/conversation.php:479 +#: ../../addon/statusnet/statusnet.php:486 ../../addon/oembed/oembed.php:41 +#: ../../addon/uhremotestorage/uhremotestorage.php:58 +#: ../../addon/impressum/impressum.php:69 +#: ../../addon/facebook/facebook.php:412 ../../addon/nsfw/nsfw.php:53 +#: ../../addon/posterous/posterous.php:89 +#: ../../addon/randplace/randplace.php:178 +#: ../../addon/jabberchat/jabberchat.php:85 ../../addon/piwik/piwik.php:81 +#: ../../addon/wppost/wppost.php:101 ../../include/conversation.php:485 msgid "Submit" msgstr "" -#: ../../mod/help.php:30 -msgid "Help:" +#: ../../mod/dirfind.php:23 +msgid "People Search" msgstr "" -#: ../../mod/help.php:34 ../../include/nav.php:82 -msgid "Help" +#: ../../mod/dirfind.php:57 ../../mod/match.php:57 +msgid "No matches" msgstr "" -#: ../../mod/help.php:38 ../../index.php:217 -msgid "Not Found" +#: ../../mod/wall_upload.php:56 ../../mod/profile_photo.php:113 +#, php-format +msgid "Image exceeds size limit of %d" msgstr "" -#: ../../mod/help.php:41 ../../index.php:220 -msgid "Page not found." +#: ../../mod/wall_upload.php:65 ../../mod/profile_photo.php:122 +#: ../../mod/photos.php:649 +msgid "Unable to process image." +msgstr "" + +#: ../../mod/wall_upload.php:81 ../../mod/wall_upload.php:90 +#: ../../mod/wall_upload.php:97 ../../mod/item.php:311 +#: ../../include/message.php:143 +msgid "Wall Photos" +msgstr "" + +#: ../../mod/wall_upload.php:84 ../../mod/profile_photo.php:251 +#: ../../mod/photos.php:669 +msgid "Image upload failed." +msgstr "" + +#: ../../mod/profile.php:105 ../../mod/display.php:66 +msgid "Access to this profile has been restricted." +msgstr "" + +#: ../../mod/profile.php:125 +msgid "Tips for New Members" +msgstr "" + +#: ../../mod/follow.php:20 ../../mod/dfrn_request.php:370 +msgid "Disallowed profile URL." +msgstr "" + +#: ../../mod/follow.php:39 +msgid "" +"This site is not configured to allow communications with other networks." +msgstr "" + +#: ../../mod/follow.php:40 ../../mod/follow.php:50 +msgid "No compatible communication protocols or feeds were discovered." +msgstr "" + +#: ../../mod/follow.php:48 +msgid "The profile address specified does not provide adequate information." +msgstr "" + +#: ../../mod/follow.php:52 +msgid "An author or name was not found." +msgstr "" + +#: ../../mod/follow.php:54 +msgid "No browser URL could be matched to this address." +msgstr "" + +#: ../../mod/follow.php:61 +msgid "" +"The profile address specified belongs to a network which has been disabled " +"on this site." +msgstr "" + +#: ../../mod/follow.php:66 +msgid "" +"Limited profile. This person will be unable to receive direct/personal " +"notifications from you." +msgstr "" + +#: ../../mod/follow.php:136 +msgid "Unable to retrieve contact information." +msgstr "" + +#: ../../mod/follow.php:182 +msgid "following" +msgstr "" + +#: ../../mod/profile_photo.php:28 +msgid "Image uploaded but image cropping failed." +msgstr "" + +#: ../../mod/profile_photo.php:58 ../../mod/profile_photo.php:65 +#: ../../mod/profile_photo.php:72 ../../mod/profile_photo.php:170 +#: ../../mod/profile_photo.php:246 ../../mod/profile_photo.php:255 +#: ../../mod/photos.php:146 ../../mod/photos.php:593 ../../mod/photos.php:938 +#: ../../mod/photos.php:953 ../../mod/register.php:318 +#: ../../mod/register.php:325 ../../mod/register.php:332 +#: ../../addon/communityhome/communityhome.php:111 +msgid "Profile Photos" +msgstr "" + +#: ../../mod/profile_photo.php:61 ../../mod/profile_photo.php:68 +#: ../../mod/profile_photo.php:75 ../../mod/profile_photo.php:258 +#, php-format +msgid "Image size reduction [%s] failed." +msgstr "" + +#: ../../mod/profile_photo.php:89 +msgid "" +"Shift-reload the page or clear browser cache if the new photo does not " +"display immediately." +msgstr "" + +#: ../../mod/profile_photo.php:99 +msgid "Unable to process image" +msgstr "" + +#: ../../mod/profile_photo.php:203 +msgid "Upload File:" +msgstr "" + +#: ../../mod/profile_photo.php:204 +msgid "Upload Profile Photo" +msgstr "" + +#: ../../mod/profile_photo.php:205 +msgid "Upload" +msgstr "" + +#: ../../mod/profile_photo.php:206 ../../mod/settings.php:734 +msgid "or" +msgstr "" + +#: ../../mod/profile_photo.php:206 +msgid "skip this step" +msgstr "" + +#: ../../mod/profile_photo.php:206 +msgid "select a photo from your photo albums" +msgstr "" + +#: ../../mod/profile_photo.php:219 +msgid "Crop Image" +msgstr "" + +#: ../../mod/profile_photo.php:220 +msgid "Please adjust the image cropping for optimum viewing." +msgstr "" + +#: ../../mod/profile_photo.php:221 +msgid "Done Editing" +msgstr "" + +#: ../../mod/profile_photo.php:249 +msgid "Image uploaded successfully." +msgstr "" + +#: ../../mod/home.php:23 ../../addon/communityhome/communityhome.php:179 +#, php-format +msgid "Welcome to %s" +msgstr "" + +#: ../../mod/update_community.php:18 ../../mod/update_network.php:22 +#: ../../mod/update_profile.php:41 ../../mod/update_notes.php:41 +msgid "[Embedded content - reload page to view]" msgstr "" #: ../../mod/wall_attach.php:57 @@ -165,862 +436,997 @@ msgstr "" msgid "File upload failed." msgstr "" -#: ../../mod/fsuggest.php:63 -msgid "Friend suggestion sent." +#: ../../mod/suggest.php:36 ../../include/contact_widgets.php:35 +msgid "Friend Suggestions" msgstr "" -#: ../../mod/fsuggest.php:97 -msgid "Suggest Friends" +#: ../../mod/suggest.php:42 +msgid "" +"No suggestions. This works best when you have more than one contact/friend." msgstr "" -#: ../../mod/fsuggest.php:99 +#: ../../mod/suggest.php:55 +msgid "Ignore/Hide" +msgstr "" + +#: ../../mod/regmod.php:52 ../../mod/register.php:369 #, php-format -msgid "Suggest a friend for %s" +msgid "Registration details for %s" msgstr "" -#: ../../mod/events.php:61 -msgid "Event description and start time are required." +#: ../../mod/regmod.php:54 ../../mod/register.php:371 +#: ../../mod/register.php:425 ../../mod/dfrn_request.php:583 +#: ../../mod/lostpass.php:44 ../../mod/lostpass.php:106 +#: ../../mod/dfrn_confirm.php:703 ../../include/items.php:1833 +#: ../../include/items.php:2208 ../../include/items.php:2534 +msgid "Administrator" msgstr "" -#: ../../mod/events.php:117 ../../include/nav.php:50 ../../boot.php:1302 -msgid "Events" +#: ../../mod/regmod.php:61 +msgid "Account approved." msgstr "" -#: ../../mod/events.php:207 -msgid "Create New Event" +#: ../../mod/regmod.php:93 +#, php-format +msgid "Registration revoked for %s" msgstr "" -#: ../../mod/events.php:210 -msgid "Previous" +#: ../../mod/regmod.php:105 +msgid "Please login." msgstr "" -#: ../../mod/events.php:213 -msgid "Next" +#: ../../mod/profiles.php:21 ../../mod/profiles.php:239 +#: ../../mod/profiles.php:344 ../../mod/dfrn_confirm.php:62 +msgid "Profile not found." msgstr "" -#: ../../mod/events.php:220 -msgid "l, F j" +#: ../../mod/profiles.php:28 +msgid "Profile Name is required." msgstr "" -#: ../../mod/events.php:232 -msgid "Edit event" +#: ../../mod/profiles.php:198 +msgid "Profile updated." msgstr "" -#: ../../mod/events.php:234 ../../include/text.php:857 -msgid "link to source" +#: ../../mod/profiles.php:256 +msgid "Profile deleted." msgstr "" -#: ../../mod/events.php:302 -msgid "hour:minute" +#: ../../mod/profiles.php:272 ../../mod/profiles.php:303 +msgid "Profile-" msgstr "" -#: ../../mod/events.php:311 -msgid "Event details" +#: ../../mod/profiles.php:291 ../../mod/profiles.php:330 +msgid "New profile created." msgstr "" -#: ../../mod/events.php:312 -#, php-format -msgid "Format is %s %s. Starting date and Description are required." +#: ../../mod/profiles.php:309 +msgid "Profile unavailable to clone." msgstr "" -#: ../../mod/events.php:313 -msgid "Event Starts:" +#: ../../mod/profiles.php:356 +msgid "Hide your contact/friend list from viewers of this profile?" msgstr "" -#: ../../mod/events.php:316 -msgid "Finish date/time is not known or not relevant" +#: ../../mod/profiles.php:357 ../../mod/settings.php:671 +#: ../../mod/settings.php:677 ../../mod/settings.php:685 +#: ../../mod/settings.php:689 ../../mod/settings.php:694 +#: ../../mod/settings.php:700 ../../mod/settings.php:706 +#: ../../mod/settings.php:753 ../../mod/settings.php:754 +#: ../../mod/settings.php:755 ../../mod/settings.php:756 +#: ../../mod/register.php:505 ../../mod/dfrn_request.php:675 +#: ../../mod/api.php:105 +msgid "Yes" msgstr "" -#: ../../mod/events.php:318 -msgid "Event Finishes:" +#: ../../mod/profiles.php:358 ../../mod/settings.php:671 +#: ../../mod/settings.php:677 ../../mod/settings.php:685 +#: ../../mod/settings.php:689 ../../mod/settings.php:694 +#: ../../mod/settings.php:700 ../../mod/settings.php:706 +#: ../../mod/settings.php:753 ../../mod/settings.php:754 +#: ../../mod/settings.php:755 ../../mod/settings.php:756 +#: ../../mod/register.php:506 ../../mod/dfrn_request.php:676 +#: ../../mod/api.php:106 +msgid "No" msgstr "" -#: ../../mod/events.php:321 -msgid "Adjust for viewer timezone" +#: ../../mod/profiles.php:374 +msgid "Edit Profile Details" msgstr "" -#: ../../mod/events.php:323 -msgid "Description:" +#: ../../mod/profiles.php:376 +msgid "View this profile" msgstr "" -#: ../../mod/events.php:325 ../../include/event.php:37 -#: ../../include/bb2diaspora.php:249 ../../boot.php:942 -msgid "Location:" +#: ../../mod/profiles.php:377 +msgid "Create a new profile using these settings" msgstr "" -#: ../../mod/events.php:327 -msgid "Share this event" +#: ../../mod/profiles.php:378 +msgid "Clone this profile" msgstr "" -#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 -#: ../../mod/dfrn_request.php:655 ../../mod/settings.php:433 -#: ../../mod/settings.php:459 ../../addon/js_upload/js_upload.php:45 -msgid "Cancel" +#: ../../mod/profiles.php:379 +msgid "Delete this profile" msgstr "" -#: ../../mod/tagrm.php:41 -msgid "Tag removed" +#: ../../mod/profiles.php:380 +msgid "Profile Name:" msgstr "" -#: ../../mod/tagrm.php:79 -msgid "Remove Item Tag" +#: ../../mod/profiles.php:381 +msgid "Your Full Name:" msgstr "" -#: ../../mod/tagrm.php:81 -msgid "Select a tag to remove: " +#: ../../mod/profiles.php:382 +msgid "Title/Description:" msgstr "" -#: ../../mod/tagrm.php:93 -msgid "Remove" +#: ../../mod/profiles.php:383 +msgid "Your Gender:" msgstr "" -#: ../../mod/dfrn_poll.php:90 ../../mod/dfrn_poll.php:516 +#: ../../mod/profiles.php:384 #, php-format -msgid "%s welcomes %s" +msgid "Birthday (%s):" msgstr "" -#: ../../mod/api.php:76 ../../mod/api.php:102 -msgid "Authorize application connection" +#: ../../mod/profiles.php:385 +msgid "Street Address:" msgstr "" -#: ../../mod/api.php:77 -msgid "Return to your app and insert this Securty Code:" +#: ../../mod/profiles.php:386 +msgid "Locality/City:" msgstr "" -#: ../../mod/api.php:89 -msgid "Please login to continue." +#: ../../mod/profiles.php:387 +msgid "Postal/Zip Code:" 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?" +#: ../../mod/profiles.php:388 +msgid "Country:" msgstr "" -#: ../../mod/api.php:105 ../../mod/dfrn_request.php:645 -#: ../../mod/settings.php:653 ../../mod/settings.php:659 -#: ../../mod/settings.php:667 ../../mod/settings.php:671 -#: ../../mod/settings.php:676 ../../mod/settings.php:682 -#: ../../mod/settings.php:729 ../../mod/settings.php:730 -#: ../../mod/settings.php:731 ../../mod/settings.php:732 -#: ../../mod/register.php:500 ../../mod/profiles.php:357 -msgid "Yes" +#: ../../mod/profiles.php:389 +msgid "Region/State:" msgstr "" -#: ../../mod/api.php:106 ../../mod/dfrn_request.php:646 -#: ../../mod/settings.php:653 ../../mod/settings.php:659 -#: ../../mod/settings.php:667 ../../mod/settings.php:671 -#: ../../mod/settings.php:676 ../../mod/settings.php:682 -#: ../../mod/settings.php:729 ../../mod/settings.php:730 -#: ../../mod/settings.php:731 ../../mod/settings.php:732 -#: ../../mod/register.php:501 ../../mod/profiles.php:358 -msgid "No" +#: ../../mod/profiles.php:390 +msgid "<span class=\"heart\">♥</span> Marital Status:" msgstr "" -#: ../../mod/photos.php:42 -msgid "Photo Albums" +#: ../../mod/profiles.php:391 +msgid "Who: (if applicable)" msgstr "" -#: ../../mod/photos.php:50 ../../mod/photos.php:144 ../../mod/photos.php:866 -#: ../../mod/photos.php:936 ../../mod/photos.php:951 ../../mod/photos.php:1351 -#: ../../mod/photos.php:1363 ../../addon/communityhome/communityhome.php:110 -msgid "Contact Photos" +#: ../../mod/profiles.php:392 +msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "" -#: ../../mod/photos.php:62 ../../mod/settings.php:9 -msgid "everybody" +#: ../../mod/profiles.php:393 ../../include/profile_advanced.php:43 +msgid "Sexual Preference:" msgstr "" -#: ../../mod/photos.php:133 -msgid "Contact information unavailable" +#: ../../mod/profiles.php:394 +msgid "Homepage URL:" msgstr "" -#: ../../mod/photos.php:144 ../../mod/photos.php:591 ../../mod/photos.php:936 -#: ../../mod/photos.php:951 ../../mod/register.php:318 -#: ../../mod/register.php:325 ../../mod/register.php:332 -#: ../../mod/profile_photo.php:58 ../../mod/profile_photo.php:65 -#: ../../mod/profile_photo.php:72 ../../mod/profile_photo.php:170 -#: ../../mod/profile_photo.php:246 ../../mod/profile_photo.php:255 -#: ../../addon/communityhome/communityhome.php:111 -msgid "Profile Photos" +#: ../../mod/profiles.php:395 ../../include/profile_advanced.php:47 +msgid "Political Views:" msgstr "" -#: ../../mod/photos.php:154 -msgid "Album not found." +#: ../../mod/profiles.php:396 +msgid "Religious Views:" msgstr "" -#: ../../mod/photos.php:172 ../../mod/photos.php:945 -msgid "Delete Album" +#: ../../mod/profiles.php:397 +msgid "Public Keywords:" msgstr "" -#: ../../mod/photos.php:235 ../../mod/photos.php:1164 -msgid "Delete Photo" +#: ../../mod/profiles.php:398 +msgid "Private Keywords:" msgstr "" -#: ../../mod/photos.php:522 -msgid "was tagged in a" +#: ../../mod/profiles.php:399 +msgid "Example: fishing photography software" msgstr "" -#: ../../mod/photos.php:522 ../../mod/like.php:127 ../../mod/tagger.php:70 -#: ../../addon/communityhome/communityhome.php:163 -#: ../../include/diaspora.php:1213 ../../include/conversation.php:31 -#: ../../include/conversation.php:104 -msgid "photo" +#: ../../mod/profiles.php:400 +msgid "(Used for suggesting potential friends, can be seen by others)" msgstr "" -#: ../../mod/photos.php:522 -msgid "by" +#: ../../mod/profiles.php:401 +msgid "(Used for searching profiles, never shown to others)" msgstr "" -#: ../../mod/photos.php:625 ../../addon/js_upload/js_upload.php:312 -msgid "Image exceeds size limit of " +#: ../../mod/profiles.php:402 +msgid "Tell us about yourself..." msgstr "" -#: ../../mod/photos.php:633 -msgid "Image file is empty." +#: ../../mod/profiles.php:403 +msgid "Hobbies/Interests" msgstr "" -#: ../../mod/photos.php:647 ../../mod/profile_photo.php:122 -#: ../../mod/wall_upload.php:65 -msgid "Unable to process image." +#: ../../mod/profiles.php:404 +msgid "Contact information and Social Networks" msgstr "" -#: ../../mod/photos.php:667 ../../mod/profile_photo.php:251 -#: ../../mod/wall_upload.php:84 -msgid "Image upload failed." +#: ../../mod/profiles.php:405 +msgid "Musical interests" msgstr "" -#: ../../mod/photos.php:752 ../../mod/community.php:16 -#: ../../mod/dfrn_request.php:594 ../../mod/viewcontacts.php:16 -#: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:31 -msgid "Public access denied." +#: ../../mod/profiles.php:406 +msgid "Books, literature" msgstr "" -#: ../../mod/photos.php:762 -msgid "No photos selected" +#: ../../mod/profiles.php:407 +msgid "Television" msgstr "" -#: ../../mod/photos.php:839 -msgid "Access to this item is restricted." +#: ../../mod/profiles.php:408 +msgid "Film/dance/culture/entertainment" msgstr "" -#: ../../mod/photos.php:893 -msgid "Upload Photos" +#: ../../mod/profiles.php:409 +msgid "Love/romance" msgstr "" -#: ../../mod/photos.php:896 ../../mod/photos.php:940 -msgid "New album name: " +#: ../../mod/profiles.php:410 +msgid "Work/employment" msgstr "" -#: ../../mod/photos.php:897 -msgid "or existing album name: " +#: ../../mod/profiles.php:411 +msgid "School/education" msgstr "" -#: ../../mod/photos.php:898 -msgid "Do not show a status post for this upload" +#: ../../mod/profiles.php:416 +msgid "" +"This is your <strong>public</strong> profile.<br />It <strong>may</strong> " +"be visible to anybody using the internet." msgstr "" -#: ../../mod/photos.php:900 ../../mod/photos.php:1159 -msgid "Permissions" +#: ../../mod/profiles.php:426 ../../mod/directory.php:122 +msgid "Age: " msgstr "" -#: ../../mod/photos.php:955 -msgid "Edit Album" +#: ../../mod/profiles.php:461 +msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/photos.php:965 ../../mod/photos.php:1381 -msgid "View Photo" +#: ../../mod/notice.php:15 ../../mod/display.php:28 ../../mod/display.php:115 +#: ../../mod/viewsrc.php:15 ../../mod/admin.php:111 ../../mod/admin.php:502 +#: ../../include/items.php:2898 +msgid "Item not found." msgstr "" -#: ../../mod/photos.php:1000 -msgid "Permission denied. Access to this item may be restricted." +#: ../../mod/settings.php:11 ../../mod/photos.php:64 +msgid "everybody" msgstr "" -#: ../../mod/photos.php:1002 -msgid "Photo not available" +#: ../../mod/settings.php:69 +msgid "Missing some important data!" msgstr "" -#: ../../mod/photos.php:1052 -msgid "View photo" +#: ../../mod/settings.php:72 ../../mod/settings.php:469 ../../mod/admin.php:62 +msgid "Update" msgstr "" -#: ../../mod/photos.php:1052 -msgid "Edit photo" +#: ../../mod/settings.php:167 +msgid "Failed to connect with email account using the settings provided." msgstr "" -#: ../../mod/photos.php:1053 -msgid "Use as profile photo" +#: ../../mod/settings.php:172 +msgid "Email settings updated." msgstr "" -#: ../../mod/photos.php:1059 ../../include/conversation.php:414 -msgid "Private Message" +#: ../../mod/settings.php:190 +msgid "Passwords do not match. Password unchanged." msgstr "" -#: ../../mod/photos.php:1070 -msgid "View Full Size" +#: ../../mod/settings.php:195 +msgid "Empty passwords are not allowed. Password unchanged." msgstr "" -#: ../../mod/photos.php:1138 -msgid "Tags: " +#: ../../mod/settings.php:206 +msgid "Password changed." msgstr "" -#: ../../mod/photos.php:1141 -msgid "[Remove any tag]" +#: ../../mod/settings.php:208 +msgid "Password update failed. Please try again." msgstr "" -#: ../../mod/photos.php:1152 -msgid "New album name" +#: ../../mod/settings.php:268 +msgid " Please use a shorter name." msgstr "" -#: ../../mod/photos.php:1155 -msgid "Caption" +#: ../../mod/settings.php:270 +msgid " Name too short." msgstr "" -#: ../../mod/photos.php:1157 -msgid "Add a Tag" +#: ../../mod/settings.php:276 +msgid " Not valid email." msgstr "" -#: ../../mod/photos.php:1161 -msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" +#: ../../mod/settings.php:278 +msgid " Cannot change to that email." msgstr "" -#: ../../mod/photos.php:1181 ../../include/conversation.php:461 -msgid "I like this (toggle)" +#: ../../mod/settings.php:346 ../../addon/twitter/twitter.php:294 +#: ../../addon/impressum/impressum.php:64 +#: ../../addon/facebook/facebook.php:322 ../../addon/piwik/piwik.php:94 +msgid "Settings updated." msgstr "" -#: ../../mod/photos.php:1182 ../../include/conversation.php:462 -msgid "I don't like this (toggle)" +#: ../../mod/settings.php:405 ../../include/nav.php:128 +msgid "Account settings" msgstr "" -#: ../../mod/photos.php:1183 ../../include/conversation.php:852 -msgid "Share" +#: ../../mod/settings.php:410 +msgid "Connector settings" msgstr "" -#: ../../mod/photos.php:1184 ../../mod/editpost.php:99 -#: ../../mod/message.php:137 ../../mod/message.php:270 -#: ../../include/conversation.php:288 ../../include/conversation.php:616 -#: ../../include/conversation.php:861 -msgid "Please wait" +#: ../../mod/settings.php:415 +msgid "Plugin settings" msgstr "" -#: ../../mod/photos.php:1200 ../../mod/photos.php:1239 -#: ../../mod/photos.php:1270 ../../include/conversation.php:476 -msgid "This is you" +#: ../../mod/settings.php:420 +msgid "Connections" msgstr "" -#: ../../mod/photos.php:1202 ../../mod/photos.php:1241 -#: ../../mod/photos.php:1272 ../../include/conversation.php:478 -#: ../../boot.php:420 -msgid "Comment" +#: ../../mod/settings.php:425 +msgid "Export personal data" +msgstr "" + +#: ../../mod/settings.php:442 ../../mod/settings.php:468 +#: ../../mod/settings.php:501 +msgid "Add application" +msgstr "" + +#: ../../mod/settings.php:444 ../../mod/settings.php:470 +#: ../../mod/dfrn_request.php:685 ../../mod/tagrm.php:11 +#: ../../mod/tagrm.php:94 ../../addon/js_upload/js_upload.php:45 +msgid "Cancel" +msgstr "" + +#: ../../mod/settings.php:445 ../../mod/settings.php:471 +#: ../../mod/crepair.php:144 ../../mod/admin.php:464 ../../mod/admin.php:473 +msgid "Name" +msgstr "" + +#: ../../mod/settings.php:446 ../../mod/settings.php:472 +#: ../../addon/statusnet/statusnet.php:480 +msgid "Consumer Key" +msgstr "" + +#: ../../mod/settings.php:447 ../../mod/settings.php:473 +#: ../../addon/statusnet/statusnet.php:479 +msgid "Consumer Secret" +msgstr "" + +#: ../../mod/settings.php:448 ../../mod/settings.php:474 +msgid "Redirect" msgstr "" -#: ../../mod/photos.php:1300 ../../mod/settings.php:492 -#: ../../mod/group.php:154 ../../mod/admin.php:468 -#: ../../include/conversation.php:248 ../../include/conversation.php:499 +#: ../../mod/settings.php:449 ../../mod/settings.php:475 +msgid "Icon url" +msgstr "" + +#: ../../mod/settings.php:460 +msgid "You can't edit this application." +msgstr "" + +#: ../../mod/settings.php:500 +msgid "Connected Apps" +msgstr "" + +#: ../../mod/settings.php:502 ../../mod/editpost.php:90 +#: ../../include/conversation.php:492 +msgid "Edit" +msgstr "" + +#: ../../mod/settings.php:503 ../../mod/photos.php:1302 +#: ../../mod/admin.php:468 ../../mod/group.php:154 +#: ../../include/conversation.php:251 ../../include/conversation.php:505 msgid "Delete" msgstr "" -#: ../../mod/photos.php:1368 -msgid "Recent Photos" +#: ../../mod/settings.php:504 +msgid "Client key starts with" msgstr "" -#: ../../mod/photos.php:1372 -msgid "Upload New Photos" +#: ../../mod/settings.php:505 +msgid "No name" msgstr "" -#: ../../mod/photos.php:1385 -msgid "View Album" +#: ../../mod/settings.php:506 +msgid "Remove authorization" msgstr "" -#: ../../mod/community.php:21 -msgid "Not available." +#: ../../mod/settings.php:518 +msgid "No Plugin settings configured" msgstr "" -#: ../../mod/community.php:30 ../../include/nav.php:97 -msgid "Community" +#: ../../mod/settings.php:525 ../../addon/widgets/widgets.php:122 +msgid "Plugin Settings" msgstr "" -#: ../../mod/community.php:60 ../../mod/search.php:125 -msgid "No results." +#: ../../mod/settings.php:538 ../../mod/settings.php:539 +#, php-format +msgid "Built-in support for %s connectivity is %s" msgstr "" -#: ../../mod/community.php:87 -msgid "" -"Shared content is covered by the <a href=\"http://creativecommons.org/" -"licenses/by/3.0/\">Creative Commons Attribution 3.0</a> license." +#: ../../mod/settings.php:538 ../../mod/dfrn_request.php:681 +#: ../../include/contact_selectors.php:78 +msgid "Diaspora" msgstr "" -#: ../../mod/friendica.php:43 -msgid "This is Friendica, version" +#: ../../mod/settings.php:538 ../../mod/settings.php:539 +msgid "enabled" msgstr "" -#: ../../mod/friendica.php:44 -msgid "running at web location" +#: ../../mod/settings.php:538 ../../mod/settings.php:539 +msgid "disabled" msgstr "" -#: ../../mod/friendica.php:46 -msgid "" -"Please visit <a href=\"http://project.friendika.com\">Project.Friendika.com</" -"a> to learn more about the Friendica project." +#: ../../mod/settings.php:539 +msgid "StatusNet" msgstr "" -#: ../../mod/friendica.php:48 -msgid "Bug reports and issues: please visit" +#: ../../mod/settings.php:565 +msgid "Connector Settings" msgstr "" -#: ../../mod/friendica.php:49 +#: ../../mod/settings.php:571 +msgid "Email/Mailbox Setup" +msgstr "" + +#: ../../mod/settings.php:572 msgid "" -"Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - " -"dot com" +"If you wish to communicate with email contacts using this service " +"(optional), please specify how to connect to your mailbox." msgstr "" -#: ../../mod/friendica.php:54 -msgid "Installed plugins/addons/apps" +#: ../../mod/settings.php:573 +msgid "Last successful email check:" msgstr "" -#: ../../mod/friendica.php:62 -msgid "No installed plugins/addons/apps" +#: ../../mod/settings.php:574 +msgid "Email access is disabled on this site." msgstr "" -#: ../../mod/editpost.php:17 ../../mod/editpost.php:27 -msgid "Item not found" +#: ../../mod/settings.php:575 +msgid "IMAP server name:" msgstr "" -#: ../../mod/editpost.php:32 -msgid "Edit post" +#: ../../mod/settings.php:576 +msgid "IMAP port:" msgstr "" -#: ../../mod/editpost.php:75 ../../include/conversation.php:838 -msgid "Post to Email" +#: ../../mod/settings.php:577 +msgid "Security:" msgstr "" -#: ../../mod/editpost.php:90 ../../mod/settings.php:491 -#: ../../include/conversation.php:486 -msgid "Edit" +#: ../../mod/settings.php:577 +msgid "None" msgstr "" -#: ../../mod/editpost.php:91 ../../mod/message.php:135 -#: ../../mod/message.php:268 ../../include/conversation.php:853 -msgid "Upload photo" +#: ../../mod/settings.php:578 +msgid "Email login name:" msgstr "" -#: ../../mod/editpost.php:92 ../../include/conversation.php:854 -msgid "Attach file" +#: ../../mod/settings.php:579 +msgid "Email password:" msgstr "" -#: ../../mod/editpost.php:93 ../../mod/message.php:136 -#: ../../mod/message.php:269 ../../include/conversation.php:855 -msgid "Insert web link" +#: ../../mod/settings.php:580 +msgid "Reply-to address:" msgstr "" -#: ../../mod/editpost.php:94 -msgid "Insert YouTube video" +#: ../../mod/settings.php:581 +msgid "Send public posts to all email contacts:" msgstr "" -#: ../../mod/editpost.php:95 -msgid "Insert Vorbis [.ogg] video" +#: ../../mod/settings.php:638 ../../mod/admin.php:126 ../../mod/admin.php:443 +msgid "Normal Account" msgstr "" -#: ../../mod/editpost.php:96 -msgid "Insert Vorbis [.ogg] audio" +#: ../../mod/settings.php:639 +msgid "This account is a normal personal profile" msgstr "" -#: ../../mod/editpost.php:97 ../../include/conversation.php:858 -msgid "Set your location" +#: ../../mod/settings.php:642 ../../mod/admin.php:127 ../../mod/admin.php:444 +msgid "Soapbox Account" msgstr "" -#: ../../mod/editpost.php:98 ../../include/conversation.php:859 -msgid "Clear browser location" +#: ../../mod/settings.php:643 +msgid "Automatically approve all connection/friend requests as read-only fans" msgstr "" -#: ../../mod/editpost.php:100 ../../include/conversation.php:862 -msgid "Permission settings" +#: ../../mod/settings.php:646 ../../mod/admin.php:128 ../../mod/admin.php:445 +msgid "Community/Celebrity Account" msgstr "" -#: ../../mod/editpost.php:108 ../../include/conversation.php:870 -msgid "CC: email addresses" +#: ../../mod/settings.php:647 +msgid "Automatically approve all connection/friend requests as read-write fans" msgstr "" -#: ../../mod/editpost.php:109 ../../include/conversation.php:871 -msgid "Public post" +#: ../../mod/settings.php:650 ../../mod/admin.php:129 ../../mod/admin.php:446 +msgid "Automatic Friend Account" msgstr "" -#: ../../mod/editpost.php:111 ../../include/conversation.php:873 -msgid "Example: bob@example.com, mary@example.com" +#: ../../mod/settings.php:651 +msgid "Automatically approve all connection/friend requests as friends" msgstr "" -#: ../../mod/dfrn_request.php:92 -msgid "This introduction has already been accepted." +#: ../../mod/settings.php:661 +msgid "OpenID:" msgstr "" -#: ../../mod/dfrn_request.php:116 ../../mod/dfrn_request.php:351 -msgid "Profile location is not valid or does not contain profile information." +#: ../../mod/settings.php:661 +msgid "(Optional) Allow this OpenID to login to this account." msgstr "" -#: ../../mod/dfrn_request.php:121 ../../mod/dfrn_request.php:356 -msgid "Warning: profile location has no identifiable owner name." +#: ../../mod/settings.php:671 +msgid "Publish your default profile in your local site directory?" msgstr "" -#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:358 -msgid "Warning: profile location has no profile photo." +#: ../../mod/settings.php:677 +msgid "Publish your default profile in the global social directory?" msgstr "" -#: ../../mod/dfrn_request.php:126 ../../mod/dfrn_request.php:361 -#, 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/settings.php:685 +msgid "Hide your contact/friend list from viewers of your default profile?" +msgstr "" -#: ../../mod/dfrn_request.php:167 -msgid "Introduction complete." +#: ../../mod/settings.php:689 +msgid "Hide your profile details from unknown viewers?" msgstr "" -#: ../../mod/dfrn_request.php:191 -msgid "Unrecoverable protocol error." +#: ../../mod/settings.php:694 +msgid "Allow friends to post to your profile page?" msgstr "" -#: ../../mod/dfrn_request.php:219 -msgid "Profile unavailable." +#: ../../mod/settings.php:700 +msgid "Allow friends to tag your posts?" msgstr "" -#: ../../mod/dfrn_request.php:244 -#, php-format -msgid "%s has received too many connection requests today." +#: ../../mod/settings.php:706 +msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: ../../mod/dfrn_request.php:245 -msgid "Spam protection measures have been invoked." +#: ../../mod/settings.php:715 +msgid "Profile is <strong>not published</strong>." msgstr "" -#: ../../mod/dfrn_request.php:246 -msgid "Friends are advised to please try again in 24 hours." +#: ../../mod/settings.php:739 +msgid "Your Identity Address is" msgstr "" -#: ../../mod/dfrn_request.php:276 -msgid "Invalid locator" +#: ../../mod/settings.php:750 +msgid "Automatically expire posts after days:" msgstr "" -#: ../../mod/dfrn_request.php:296 -msgid "Unable to resolve your name at the provided location." +#: ../../mod/settings.php:750 +msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "" -#: ../../mod/dfrn_request.php:309 -msgid "You have already introduced yourself here." +#: ../../mod/settings.php:751 +msgid "Advanced expiration settings" msgstr "" -#: ../../mod/dfrn_request.php:313 -#, php-format -msgid "Apparently you are already friends with %s." +#: ../../mod/settings.php:752 +msgid "Advanced Expiration" msgstr "" -#: ../../mod/dfrn_request.php:334 -msgid "Invalid profile URL." +#: ../../mod/settings.php:753 +msgid "Expire posts:" msgstr "" -#: ../../mod/dfrn_request.php:340 ../../mod/follow.php:20 -msgid "Disallowed profile URL." +#: ../../mod/settings.php:754 +msgid "Expire personal notes:" msgstr "" -#: ../../mod/dfrn_request.php:409 ../../mod/contacts.php:99 -msgid "Failed to update contact record." +#: ../../mod/settings.php:755 +msgid "Expire starred posts:" msgstr "" -#: ../../mod/dfrn_request.php:430 -msgid "Your introduction has been sent." +#: ../../mod/settings.php:756 +msgid "Expire photos:" msgstr "" -#: ../../mod/dfrn_request.php:483 -msgid "Please login to confirm introduction." +#: ../../mod/settings.php:761 +msgid "Account Settings" msgstr "" -#: ../../mod/dfrn_request.php:497 -msgid "" -"Incorrect identity currently logged in. Please login to <strong>this</" -"strong> profile." +#: ../../mod/settings.php:769 +msgid "Password Settings" msgstr "" -#: ../../mod/dfrn_request.php:509 -#, php-format -msgid "Welcome home %s." +#: ../../mod/settings.php:770 +msgid "New Password:" msgstr "" -#: ../../mod/dfrn_request.php:510 -#, php-format -msgid "Please confirm your introduction/connection request to %s." +#: ../../mod/settings.php:771 +msgid "Confirm:" msgstr "" -#: ../../mod/dfrn_request.php:511 -msgid "Confirm" +#: ../../mod/settings.php:771 +msgid "Leave password fields blank unless changing" msgstr "" -#: ../../mod/dfrn_request.php:544 ../../include/items.php:2525 -msgid "[Name Withheld]" +#: ../../mod/settings.php:775 +msgid "Basic Settings" msgstr "" -#: ../../mod/dfrn_request.php:551 -msgid "Introduction received at " +#: ../../mod/settings.php:776 ../../include/profile_advanced.php:15 +msgid "Full Name:" msgstr "" -#: ../../mod/dfrn_request.php:553 ../../mod/lostpass.php:44 -#: ../../mod/lostpass.php:106 ../../mod/register.php:371 -#: ../../mod/register.php:425 ../../mod/regmod.php:54 -#: ../../mod/dfrn_confirm.php:703 ../../include/items.php:1833 -#: ../../include/items.php:2208 ../../include/items.php:2534 -msgid "Administrator" +#: ../../mod/settings.php:777 +msgid "Email Address:" msgstr "" -#: ../../mod/dfrn_request.php:635 -#, php-format -msgid "" -"Diaspora members: Please do not use this form. Instead, enter \"%s\" into " -"your Diaspora search bar." +#: ../../mod/settings.php:778 +msgid "Your Timezone:" msgstr "" -#: ../../mod/dfrn_request.php:638 -msgid "" -"Please enter your 'Identity Address' from one of the following supported " -"social networks:" +#: ../../mod/settings.php:779 +msgid "Default Post Location:" msgstr "" -#: ../../mod/dfrn_request.php:641 -msgid "Friend/Connection Request" +#: ../../mod/settings.php:780 +msgid "Use Browser Location:" msgstr "" -#: ../../mod/dfrn_request.php:642 -msgid "" -"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, " -"testuser@identi.ca" +#: ../../mod/settings.php:781 +msgid "Display Theme:" msgstr "" -#: ../../mod/dfrn_request.php:643 -msgid "Please answer the following:" +#: ../../mod/settings.php:782 +msgid "Update browser every xx seconds" msgstr "" -#: ../../mod/dfrn_request.php:644 -#, php-format -msgid "Does %s know you?" +#: ../../mod/settings.php:782 +msgid "Minimum of 10 seconds, no maximum" msgstr "" -#: ../../mod/dfrn_request.php:647 -msgid "Add a personal note:" +#: ../../mod/settings.php:784 +msgid "Security and Privacy Settings" msgstr "" -#: ../../mod/dfrn_request.php:649 ../../include/contact_selectors.php:78 -msgid "Friendica" +#: ../../mod/settings.php:786 +msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../mod/dfrn_request.php:650 -msgid "StatusNet/Federated Social Web" +#: ../../mod/settings.php:786 +msgid "(to prevent spam abuse)" msgstr "" -#: ../../mod/dfrn_request.php:651 ../../mod/settings.php:527 -#: ../../include/contact_selectors.php:78 -msgid "Diaspora" +#: ../../mod/settings.php:787 +msgid "Default Post Permissions" msgstr "" -#: ../../mod/dfrn_request.php:652 -msgid "- please share from your own site as noted above" +#: ../../mod/settings.php:788 +msgid "(click to open/close)" msgstr "" -#: ../../mod/dfrn_request.php:653 -msgid "Your Identity Address:" +#: ../../mod/settings.php:803 +msgid "Notification Settings" msgstr "" -#: ../../mod/dfrn_request.php:654 -msgid "Submit Request" +#: ../../mod/settings.php:804 +msgid "Send a notification email when:" msgstr "" -#: ../../mod/install.php:34 -msgid "Could not create/connect to database." +#: ../../mod/settings.php:805 +msgid "You receive an introduction" msgstr "" -#: ../../mod/install.php:39 -msgid "Connected to database." +#: ../../mod/settings.php:806 +msgid "Your introductions are confirmed" msgstr "" -#: ../../mod/install.php:75 -msgid "Proceed with Installation" +#: ../../mod/settings.php:807 +msgid "Someone writes on your profile wall" msgstr "" -#: ../../mod/install.php:77 -msgid "Your Friendika site database has been installed." +#: ../../mod/settings.php:808 +msgid "Someone writes a followup comment" msgstr "" -#: ../../mod/install.php:78 -msgid "" -"IMPORTANT: You will need to [manually] setup a scheduled task for the poller." +#: ../../mod/settings.php:809 +msgid "You receive a private message" msgstr "" -#: ../../mod/install.php:79 ../../mod/install.php:89 ../../mod/install.php:207 -msgid "Please see the file \"INSTALL.txt\"." +#: ../../mod/settings.php:813 +msgid "Advanced Page Settings" msgstr "" -#: ../../mod/install.php:81 -msgid "Proceed to registration" +#: ../../mod/search.php:13 ../../mod/network.php:92 +msgid "Saved Searches" msgstr "" -#: ../../mod/install.php:87 -msgid "Database import failed." +#: ../../mod/search.php:16 ../../mod/network.php:83 +msgid "Remove term" msgstr "" -#: ../../mod/install.php:88 -msgid "" -"You may need to import the file \"database.sql\" manually using phpmyadmin " -"or mysql." +#: ../../mod/search.php:71 ../../mod/photos.php:754 ../../mod/display.php:7 +#: ../../mod/dfrn_request.php:624 ../../mod/directory.php:31 +#: ../../mod/viewcontacts.php:16 ../../mod/community.php:16 +msgid "Public access denied." msgstr "" -#: ../../mod/install.php:101 -msgid "Welcome to Friendika." +#: ../../mod/search.php:83 +msgid "Search This Site" msgstr "" -#: ../../mod/install.php:124 -msgid "Friendika Social Network" +#: ../../mod/search.php:118 ../../mod/community.php:60 +msgid "No results." msgstr "" -#: ../../mod/install.php:125 -msgid "Installation" +#: ../../mod/photos.php:42 +msgid "Photo Albums" msgstr "" -#: ../../mod/install.php:126 -msgid "" -"In order to install Friendika we need to know how to connect to your " -"database." +#: ../../mod/photos.php:50 ../../mod/photos.php:146 ../../mod/photos.php:868 +#: ../../mod/photos.php:938 ../../mod/photos.php:953 ../../mod/photos.php:1353 +#: ../../mod/photos.php:1365 ../../addon/communityhome/communityhome.php:110 +msgid "Contact Photos" msgstr "" -#: ../../mod/install.php:127 -msgid "" -"Please contact your hosting provider or site administrator if you have " -"questions about these settings." +#: ../../mod/photos.php:135 +msgid "Contact information unavailable" msgstr "" -#: ../../mod/install.php:128 -msgid "" -"The database you specify below should already exist. If it does not, please " -"create it before continuing." +#: ../../mod/photos.php:156 +msgid "Album not found." msgstr "" -#: ../../mod/install.php:129 -msgid "Database Server Name" +#: ../../mod/photos.php:174 ../../mod/photos.php:947 +msgid "Delete Album" msgstr "" -#: ../../mod/install.php:130 -msgid "Database Login Name" +#: ../../mod/photos.php:237 ../../mod/photos.php:1166 +msgid "Delete Photo" msgstr "" -#: ../../mod/install.php:131 -msgid "Database Login Password" +#: ../../mod/photos.php:524 +msgid "was tagged in a" msgstr "" -#: ../../mod/install.php:132 -msgid "Database Name" +#: ../../mod/photos.php:524 ../../mod/tagger.php:70 ../../mod/like.php:127 +#: ../../addon/communityhome/communityhome.php:163 +#: ../../include/conversation.php:31 ../../include/conversation.php:104 +#: ../../include/diaspora.php:1481 +msgid "photo" msgstr "" -#: ../../mod/install.php:133 -msgid "Please select a default timezone for your website" +#: ../../mod/photos.php:524 +msgid "by" msgstr "" -#: ../../mod/install.php:134 -msgid "" -"Site administrator email address. Your account email address must match this " -"in order to use the web admin panel." +#: ../../mod/photos.php:627 ../../addon/js_upload/js_upload.php:312 +msgid "Image exceeds size limit of " msgstr "" -#: ../../mod/install.php:153 -msgid "Could not find a command line version of PHP in the web server PATH." +#: ../../mod/photos.php:635 +msgid "Image file is empty." msgstr "" -#: ../../mod/install.php:154 -msgid "" -"This is required. Please adjust the configuration file .htconfig.php " -"accordingly." +#: ../../mod/photos.php:764 +msgid "No photos selected" msgstr "" -#: ../../mod/install.php:161 -msgid "" -"The command line version of PHP on your system does not have " -"\"register_argc_argv\" enabled." +#: ../../mod/photos.php:841 +msgid "Access to this item is restricted." msgstr "" -#: ../../mod/install.php:162 -msgid "This is required for message delivery to work." +#: ../../mod/photos.php:895 +msgid "Upload Photos" msgstr "" -#: ../../mod/install.php:184 -msgid "" -"Error: the \"openssl_pkey_new\" function on this system is not able to " -"generate encryption keys" +#: ../../mod/photos.php:898 ../../mod/photos.php:942 +msgid "New album name: " msgstr "" -#: ../../mod/install.php:185 -msgid "" -"If running under Windows, please see \"http://www.php.net/manual/en/openssl." -"installation.php\"." +#: ../../mod/photos.php:899 +msgid "or existing album name: " +msgstr "" + +#: ../../mod/photos.php:900 +msgid "Do not show a status post for this upload" +msgstr "" + +#: ../../mod/photos.php:902 ../../mod/photos.php:1161 +msgid "Permissions" +msgstr "" + +#: ../../mod/photos.php:957 +msgid "Edit Album" +msgstr "" + +#: ../../mod/photos.php:967 ../../mod/photos.php:1383 +msgid "View Photo" +msgstr "" + +#: ../../mod/photos.php:1002 +msgid "Permission denied. Access to this item may be restricted." +msgstr "" + +#: ../../mod/photos.php:1004 +msgid "Photo not available" +msgstr "" + +#: ../../mod/photos.php:1054 +msgid "View photo" +msgstr "" + +#: ../../mod/photos.php:1054 +msgid "Edit photo" +msgstr "" + +#: ../../mod/photos.php:1055 +msgid "Use as profile photo" +msgstr "" + +#: ../../mod/photos.php:1061 ../../include/conversation.php:420 +msgid "Private Message" +msgstr "" + +#: ../../mod/photos.php:1072 +msgid "View Full Size" +msgstr "" + +#: ../../mod/photos.php:1140 +msgid "Tags: " +msgstr "" + +#: ../../mod/photos.php:1143 +msgid "[Remove any tag]" +msgstr "" + +#: ../../mod/photos.php:1154 +msgid "New album name" msgstr "" -#: ../../mod/install.php:194 +#: ../../mod/photos.php:1157 +msgid "Caption" +msgstr "" + +#: ../../mod/photos.php:1159 +msgid "Add a Tag" +msgstr "" + +#: ../../mod/photos.php:1163 +msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" +msgstr "" + +#: ../../mod/photos.php:1183 ../../include/conversation.php:467 +msgid "I like this (toggle)" +msgstr "" + +#: ../../mod/photos.php:1184 ../../include/conversation.php:468 +msgid "I don't like this (toggle)" +msgstr "" + +#: ../../mod/photos.php:1185 ../../include/conversation.php:857 +msgid "Share" +msgstr "" + +#: ../../mod/photos.php:1186 ../../mod/editpost.php:99 +#: ../../mod/message.php:155 ../../mod/message.php:296 +#: ../../include/conversation.php:291 ../../include/conversation.php:626 +#: ../../include/conversation.php:866 +msgid "Please wait" +msgstr "" + +#: ../../mod/photos.php:1202 ../../mod/photos.php:1241 +#: ../../mod/photos.php:1272 ../../include/conversation.php:482 +msgid "This is you" +msgstr "" + +#: ../../mod/photos.php:1370 +msgid "Recent Photos" +msgstr "" + +#: ../../mod/photos.php:1374 +msgid "Upload New Photos" +msgstr "" + +#: ../../mod/photos.php:1387 +msgid "View Album" +msgstr "" + +#: ../../mod/newmember.php:6 +msgid "Welcome to Friendika" +msgstr "" + +#: ../../mod/newmember.php:8 +msgid "New Member Checklist" +msgstr "" + +#: ../../mod/newmember.php:12 msgid "" -"Error: Apache webserver mod-rewrite module is required but not installed." +"We would like to offer some tips and links to help make your experience " +"enjoyable. Click any item to visit the relevant page." msgstr "" -#: ../../mod/install.php:196 -msgid "Error: libCURL PHP module required but not installed." +#: ../../mod/newmember.php:16 +msgid "" +"On your <em>Settings</em> page - change your initial password. Also make a " +"note of your Identity Address. This will be useful in making friends." msgstr "" -#: ../../mod/install.php:198 +#: ../../mod/newmember.php:18 msgid "" -"Error: GD graphics PHP module with JPEG support required but not installed." +"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." msgstr "" -#: ../../mod/install.php:200 -msgid "Error: openssl PHP module required but not installed." +#: ../../mod/newmember.php:20 +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." msgstr "" -#: ../../mod/install.php:202 -msgid "Error: mysqli PHP module required but not installed." +#: ../../mod/newmember.php:23 +msgid "" +"Authorise the Facebook Connector if you currently have a Facebook account " +"and we will (optionally) import all your Facebook friends and conversations." msgstr "" -#: ../../mod/install.php:204 -msgid "Error: mb_string PHP module required but not installed." +#: ../../mod/newmember.php:28 +msgid "" +"Enter your email access information on your Settings page if you wish to " +"import and interact with friends or mailing lists from your email INBOX" msgstr "" -#: ../../mod/install.php:216 +#: ../../mod/newmember.php:30 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." +"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." msgstr "" -#: ../../mod/install.php:217 +#: ../../mod/newmember.php:32 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." +"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." msgstr "" -#: ../../mod/install.php:218 +#: ../../mod/newmember.php:34 msgid "" -"Please check with your site documentation or support people to see if this " -"situation can be corrected." +"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>Connect</em> dialog." msgstr "" -#: ../../mod/install.php:219 +#: ../../mod/newmember.php:36 msgid "" -"If not, you may be required to perform a manual installation. Please see the " -"file \"INSTALL.txt\" for instructions." +"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." msgstr "" -#: ../../mod/install.php:228 +#: ../../mod/newmember.php:38 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." +"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." msgstr "" -#: ../../mod/install.php:243 -msgid "Errors encountered creating database tables." +#: ../../mod/newmember.php:40 +msgid "" +"Our <strong>help</strong> pages may be consulted for detail on other program " +"features and resources." msgstr "" #: ../../mod/localtime.php:12 ../../include/event.php:11 -#: ../../include/bb2diaspora.php:227 +#: ../../include/bb2diaspora.php:229 msgid "l F d, Y \\@ g:i A" msgstr "" @@ -1053,165 +1459,175 @@ msgstr "" msgid "Please select your timezone:" msgstr "" -#: ../../mod/match.php:10 -msgid "Profile Match" +#: ../../mod/display.php:108 +msgid "Item has been removed." msgstr "" -#: ../../mod/match.php:18 -msgid "No keywords to match. Please add keywords to your default profile." +#: ../../mod/editpost.php:17 ../../mod/editpost.php:27 +msgid "Item not found" msgstr "" -#: ../../mod/match.php:57 ../../mod/dirfind.php:57 -msgid "No matches" +#: ../../mod/editpost.php:32 +msgid "Edit post" msgstr "" -#: ../../mod/lockview.php:39 -msgid "Remote privacy information not available." +#: ../../mod/editpost.php:75 ../../include/conversation.php:843 +msgid "Post to Email" msgstr "" -#: ../../mod/lockview.php:43 -msgid "Visible to:" +#: ../../mod/editpost.php:91 ../../mod/message.php:153 +#: ../../mod/message.php:294 ../../include/conversation.php:858 +msgid "Upload photo" msgstr "" -#: ../../mod/home.php:23 ../../addon/communityhome/communityhome.php:179 -#, php-format -msgid "Welcome to %s" +#: ../../mod/editpost.php:92 ../../include/conversation.php:859 +msgid "Attach file" msgstr "" -#: ../../mod/notifications.php:26 -msgid "Invalid request identifier." +#: ../../mod/editpost.php:93 ../../mod/message.php:154 +#: ../../mod/message.php:295 ../../include/conversation.php:860 +msgid "Insert web link" msgstr "" -#: ../../mod/notifications.php:35 ../../mod/notifications.php:144 -#: ../../mod/notifications.php:188 -msgid "Discard" +#: ../../mod/editpost.php:94 +msgid "Insert YouTube video" msgstr "" -#: ../../mod/notifications.php:47 ../../mod/notifications.php:143 -#: ../../mod/notifications.php:187 ../../mod/contacts.php:289 -#: ../../mod/contacts.php:332 -msgid "Ignore" +#: ../../mod/editpost.php:95 +msgid "Insert Vorbis [.ogg] video" msgstr "" -#: ../../mod/notifications.php:71 ../../include/nav.php:109 -msgid "Network" +#: ../../mod/editpost.php:96 +msgid "Insert Vorbis [.ogg] audio" msgstr "" -#: ../../mod/notifications.php:76 ../../include/nav.php:73 -#: ../../include/nav.php:111 -msgid "Home" +#: ../../mod/editpost.php:97 ../../include/conversation.php:863 +msgid "Set your location" msgstr "" -#: ../../mod/notifications.php:81 ../../include/nav.php:117 -msgid "Introductions" +#: ../../mod/editpost.php:98 ../../include/conversation.php:864 +msgid "Clear browser location" msgstr "" -#: ../../mod/notifications.php:86 ../../mod/message.php:72 -#: ../../include/nav.php:122 -msgid "Messages" +#: ../../mod/editpost.php:100 ../../include/conversation.php:867 +msgid "Permission settings" msgstr "" -#: ../../mod/notifications.php:105 -msgid "Show Ignored Requests" +#: ../../mod/editpost.php:108 ../../include/conversation.php:875 +msgid "CC: email addresses" msgstr "" -#: ../../mod/notifications.php:105 -msgid "Hide Ignored Requests" +#: ../../mod/editpost.php:109 ../../include/conversation.php:876 +msgid "Public post" msgstr "" -#: ../../mod/notifications.php:131 ../../mod/notifications.php:174 -msgid "Notification type: " +#: ../../mod/editpost.php:111 ../../include/conversation.php:878 +msgid "Example: bob@example.com, mary@example.com" msgstr "" -#: ../../mod/notifications.php:132 -msgid "Friend Suggestion" +#: ../../mod/invite.php:35 +#, php-format +msgid "%s : Not a valid email address." msgstr "" -#: ../../mod/notifications.php:134 +#: ../../mod/invite.php:59 #, php-format -msgid "suggested by %s" +msgid "Please join my network on %s" msgstr "" -#: ../../mod/notifications.php:140 ../../mod/notifications.php:185 -#: ../../mod/admin.php:466 -msgid "Approve" +#: ../../mod/invite.php:69 +#, php-format +msgid "%s : Message delivery failed." msgstr "" -#: ../../mod/notifications.php:160 -msgid "Claims to be known to you: " +#: ../../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" msgstr "" -#: ../../mod/notifications.php:160 -msgid "yes" +#: ../../mod/invite.php:99 +msgid "Send invitations" msgstr "" -#: ../../mod/notifications.php:160 -msgid "no" +#: ../../mod/invite.php:100 +msgid "Enter email addresses, one per line:" msgstr "" -#: ../../mod/notifications.php:167 -msgid "Approve as: " +#: ../../mod/invite.php:101 ../../mod/message.php:150 +#: ../../mod/message.php:291 +msgid "Your message:" msgstr "" -#: ../../mod/notifications.php:168 -msgid "Friend" +#: ../../mod/invite.php:102 +#, php-format +msgid "Please join my social network on %s" msgstr "" -#: ../../mod/notifications.php:169 -msgid "Sharer" +#: ../../mod/invite.php:103 +msgid "To accept this invitation, please visit:" msgstr "" -#: ../../mod/notifications.php:169 -msgid "Fan/Admirer" +#: ../../mod/invite.php:104 +msgid "You will need to supply this invitation code: $invite_code" msgstr "" -#: ../../mod/notifications.php:175 -msgid "Friend/Connect Request" +#: ../../mod/invite.php:104 +msgid "" +"Once you have registered, please connect with me via my profile page at:" msgstr "" -#: ../../mod/notifications.php:175 -msgid "New Follower" +#: ../../mod/ping.php:158 +msgid "{0} wants to be your friend" msgstr "" -#: ../../mod/notifications.php:194 -msgid "No notifications." +#: ../../mod/ping.php:163 +msgid "{0} sent you a message" msgstr "" -#: ../../mod/notifications.php:197 ../../mod/notifications.php:283 -#: ../../mod/notifications.php:359 ../../include/nav.php:118 -msgid "Notifications" +#: ../../mod/ping.php:168 +msgid "{0} requested registration" msgstr "" -#: ../../mod/notifications.php:234 ../../mod/notifications.php:316 +#: ../../mod/ping.php:174 #, php-format -msgid "%s liked %s's post" +msgid "{0} commented %s's post" msgstr "" -#: ../../mod/notifications.php:243 ../../mod/notifications.php:325 +#: ../../mod/ping.php:179 #, php-format -msgid "%s disliked %s's post" +msgid "{0} liked %s's post" msgstr "" -#: ../../mod/notifications.php:257 ../../mod/notifications.php:339 +#: ../../mod/ping.php:184 #, php-format -msgid "%s is now friends with %s" +msgid "{0} disliked %s's post" msgstr "" -#: ../../mod/notifications.php:264 +#: ../../mod/ping.php:189 #, php-format -msgid "%s created a new post" +msgid "{0} is now friends with %s" msgstr "" -#: ../../mod/notifications.php:265 ../../mod/notifications.php:348 +#: ../../mod/ping.php:194 +msgid "{0} posted" +msgstr "" + +#: ../../mod/ping.php:199 #, php-format -msgid "%s commented on %s's post" +msgid "{0} tagged %s's post with #%s" msgstr "" -#: ../../mod/notifications.php:279 ../../mod/notifications.php:355 -msgid "Nothing new!" +#: ../../mod/ping.php:204 +msgid "{0} mentioned you in a post" msgstr "" -#: ../../mod/contacts.php:62 ../../mod/contacts.php:133 +#: ../../mod/contacts.php:62 ../../mod/contacts.php:135 msgid "Could not access contact record." msgstr "" @@ -1219,1115 +1635,1132 @@ msgstr "" msgid "Could not locate selected profile." msgstr "" -#: ../../mod/contacts.php:97 +#: ../../mod/contacts.php:99 msgid "Contact updated." msgstr "" -#: ../../mod/contacts.php:155 +#: ../../mod/contacts.php:101 ../../mod/dfrn_request.php:439 +msgid "Failed to update contact record." +msgstr "" + +#: ../../mod/contacts.php:157 msgid "Contact has been blocked" msgstr "" -#: ../../mod/contacts.php:155 +#: ../../mod/contacts.php:157 msgid "Contact has been unblocked" msgstr "" -#: ../../mod/contacts.php:169 +#: ../../mod/contacts.php:171 msgid "Contact has been ignored" msgstr "" -#: ../../mod/contacts.php:169 +#: ../../mod/contacts.php:171 msgid "Contact has been unignored" msgstr "" -#: ../../mod/contacts.php:190 +#: ../../mod/contacts.php:192 msgid "stopped following" msgstr "" -#: ../../mod/contacts.php:211 +#: ../../mod/contacts.php:213 msgid "Contact has been removed." msgstr "" -#: ../../mod/contacts.php:232 +#: ../../mod/contacts.php:234 #, php-format msgid "You are mutual friends with %s" msgstr "" -#: ../../mod/contacts.php:236 +#: ../../mod/contacts.php:238 #, php-format msgid "You are sharing with %s" msgstr "" -#: ../../mod/contacts.php:241 +#: ../../mod/contacts.php:243 #, php-format msgid "%s is sharing with you" msgstr "" -#: ../../mod/contacts.php:258 +#: ../../mod/contacts.php:260 msgid "Private communications are not available for this contact." msgstr "" -#: ../../mod/contacts.php:261 +#: ../../mod/contacts.php:263 msgid "Never" msgstr "" -#: ../../mod/contacts.php:265 +#: ../../mod/contacts.php:267 msgid "(Update was successful)" msgstr "" -#: ../../mod/contacts.php:265 +#: ../../mod/contacts.php:267 msgid "(Update was not successful)" msgstr "" -#: ../../mod/contacts.php:267 +#: ../../mod/contacts.php:269 msgid "Suggest friends" msgstr "" -#: ../../mod/contacts.php:271 +#: ../../mod/contacts.php:273 #, php-format msgid "Network type: %s" msgstr "" -#: ../../mod/contacts.php:274 +#: ../../mod/contacts.php:276 #, php-format msgid "%d contact in common" msgid_plural "%d contacts in common" msgstr[0] "" msgstr[1] "" -#: ../../mod/contacts.php:279 +#: ../../mod/contacts.php:281 msgid "View all contacts" msgstr "" -#: ../../mod/contacts.php:284 ../../mod/contacts.php:331 +#: ../../mod/contacts.php:286 ../../mod/contacts.php:333 #: ../../mod/admin.php:470 msgid "Unblock" msgstr "" -#: ../../mod/contacts.php:284 ../../mod/contacts.php:331 +#: ../../mod/contacts.php:286 ../../mod/contacts.php:333 #: ../../mod/admin.php:469 msgid "Block" msgstr "" -#: ../../mod/contacts.php:289 ../../mod/contacts.php:332 +#: ../../mod/contacts.php:291 ../../mod/contacts.php:334 msgid "Unignore" msgstr "" -#: ../../mod/contacts.php:294 +#: ../../mod/contacts.php:291 ../../mod/contacts.php:334 +#: ../../mod/notifications.php:47 ../../mod/notifications.php:148 +#: ../../mod/notifications.php:192 +msgid "Ignore" +msgstr "" + +#: ../../mod/contacts.php:296 msgid "Repair" msgstr "" -#: ../../mod/contacts.php:304 +#: ../../mod/contacts.php:306 msgid "Contact Editor" msgstr "" -#: ../../mod/contacts.php:307 +#: ../../mod/contacts.php:309 msgid "Profile Visibility" msgstr "" -#: ../../mod/contacts.php:308 +#: ../../mod/contacts.php:310 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "" -#: ../../mod/contacts.php:309 +#: ../../mod/contacts.php:311 msgid "Contact Information / Notes" msgstr "" -#: ../../mod/contacts.php:310 +#: ../../mod/contacts.php:312 msgid "Edit contact notes" msgstr "" -#: ../../mod/contacts.php:315 ../../mod/contacts.php:430 +#: ../../mod/contacts.php:317 ../../mod/contacts.php:433 #: ../../mod/viewcontacts.php:61 #, php-format msgid "Visit %s's profile [%s]" msgstr "" -#: ../../mod/contacts.php:316 +#: ../../mod/contacts.php:318 msgid "Block/Unblock contact" msgstr "" -#: ../../mod/contacts.php:317 +#: ../../mod/contacts.php:319 msgid "Ignore contact" msgstr "" -#: ../../mod/contacts.php:318 +#: ../../mod/contacts.php:320 msgid "Repair URL settings" msgstr "" -#: ../../mod/contacts.php:319 +#: ../../mod/contacts.php:321 msgid "View conversations" msgstr "" -#: ../../mod/contacts.php:321 +#: ../../mod/contacts.php:323 msgid "Delete contact" msgstr "" -#: ../../mod/contacts.php:325 +#: ../../mod/contacts.php:327 msgid "Last update:" msgstr "" -#: ../../mod/contacts.php:326 +#: ../../mod/contacts.php:328 msgid "Update public posts" msgstr "" -#: ../../mod/contacts.php:328 ../../mod/admin.php:701 +#: ../../mod/contacts.php:330 ../../mod/admin.php:701 msgid "Update now" msgstr "" -#: ../../mod/contacts.php:335 +#: ../../mod/contacts.php:337 msgid "Currently blocked" msgstr "" -#: ../../mod/contacts.php:336 +#: ../../mod/contacts.php:338 msgid "Currently ignored" msgstr "" -#: ../../mod/contacts.php:364 ../../include/nav.php:130 +#: ../../mod/contacts.php:339 +msgid "Hide this contact from others" +msgstr "" + +#: ../../mod/contacts.php:339 +msgid "" +"Replies/likes to your public posts <strong>may</strong> still be visible" +msgstr "" + +#: ../../mod/contacts.php:367 ../../include/nav.php:130 msgid "Contacts" msgstr "" -#: ../../mod/contacts.php:366 +#: ../../mod/contacts.php:369 msgid "Show Blocked Connections" msgstr "" -#: ../../mod/contacts.php:366 +#: ../../mod/contacts.php:369 msgid "Hide Blocked Connections" msgstr "" -#: ../../mod/contacts.php:368 +#: ../../mod/contacts.php:371 msgid "Search your contacts" msgstr "" -#: ../../mod/contacts.php:369 ../../mod/directory.php:65 +#: ../../mod/contacts.php:372 ../../mod/directory.php:65 msgid "Finding: " msgstr "" -#: ../../mod/contacts.php:370 ../../mod/directory.php:67 +#: ../../mod/contacts.php:373 ../../mod/directory.php:67 #: ../../include/contact_widgets.php:34 msgid "Find" msgstr "" -#: ../../mod/contacts.php:406 +#: ../../mod/contacts.php:409 msgid "Mutual Friendship" msgstr "" -#: ../../mod/contacts.php:410 +#: ../../mod/contacts.php:413 msgid "is a fan of yours" msgstr "" -#: ../../mod/contacts.php:414 +#: ../../mod/contacts.php:417 msgid "you are a fan of" msgstr "" -#: ../../mod/contacts.php:431 ../../include/Contact.php:129 -#: ../../include/conversation.php:717 +#: ../../mod/contacts.php:434 ../../include/Contact.php:129 +#: ../../include/conversation.php:722 msgid "Edit contact" msgstr "" -#: ../../mod/lostpass.php:16 -msgid "No valid account found." +#: ../../mod/lockview.php:39 +msgid "Remote privacy information not available." msgstr "" -#: ../../mod/lostpass.php:31 -msgid "Password reset request issued. Check your email." +#: ../../mod/lockview.php:43 +msgid "Visible to:" msgstr "" -#: ../../mod/lostpass.php:42 -#, php-format -msgid "Password reset requested at %s" +#: ../../mod/register.php:53 +msgid "An invitation is required." msgstr "" -#: ../../mod/lostpass.php:64 -msgid "" -"Request could not be verified. (You may have previously submitted it.) " -"Password reset failed." +#: ../../mod/register.php:58 +msgid "Invitation could not be verified." msgstr "" -#: ../../mod/lostpass.php:82 ../../boot.php:695 -msgid "Password Reset" +#: ../../mod/register.php:66 +msgid "Invalid OpenID url" msgstr "" -#: ../../mod/lostpass.php:83 -msgid "Your password has been reset as requested." +#: ../../mod/register.php:81 +msgid "Please enter the required information." msgstr "" -#: ../../mod/lostpass.php:84 -msgid "Your new password is" +#: ../../mod/register.php:95 +msgid "Please use a shorter name." msgstr "" -#: ../../mod/lostpass.php:85 -msgid "Save or copy your new password - and then" +#: ../../mod/register.php:97 +msgid "Name too short." msgstr "" -#: ../../mod/lostpass.php:86 -msgid "click here to login" +#: ../../mod/register.php:112 +msgid "That doesn't appear to be your full (First Last) name." msgstr "" -#: ../../mod/lostpass.php:87 -msgid "" -"Your password may be changed from the <em>Settings</em> page after " -"successful login." +#: ../../mod/register.php:117 +msgid "Your email domain is not among those allowed on this site." msgstr "" -#: ../../mod/lostpass.php:118 -msgid "Forgot your Password?" +#: ../../mod/register.php:120 +msgid "Not a valid email address." msgstr "" -#: ../../mod/lostpass.php:119 -msgid "" -"Enter your email address and submit to have your password reset. Then check " -"your email for further instructions." +#: ../../mod/register.php:130 +msgid "Cannot use that email." msgstr "" -#: ../../mod/lostpass.php:120 -msgid "Nickname or Email: " +#: ../../mod/register.php:136 +msgid "" +"Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and " +"must also begin with a letter." msgstr "" -#: ../../mod/lostpass.php:121 -msgid "Reset" +#: ../../mod/register.php:142 ../../mod/register.php:243 +msgid "Nickname is already registered. Please choose another." msgstr "" -#: ../../mod/settings.php:67 -msgid "Missing some important data!" +#: ../../mod/register.php:161 +msgid "SERIOUS ERROR: Generation of security keys failed." msgstr "" -#: ../../mod/settings.php:70 ../../mod/settings.php:458 ../../mod/admin.php:62 -msgid "Update" +#: ../../mod/register.php:229 +msgid "An error occurred during registration. Please try again." msgstr "" -#: ../../mod/settings.php:165 -msgid "Failed to connect with email account using the settings provided." +#: ../../mod/register.php:265 +msgid "An error occurred creating your default profile. Please try again." msgstr "" -#: ../../mod/settings.php:170 -msgid "Email settings updated." +#: ../../mod/register.php:377 +msgid "" +"Registration successful. Please check your email for further instructions." msgstr "" -#: ../../mod/settings.php:188 -msgid "Passwords do not match. Password unchanged." +#: ../../mod/register.php:381 +msgid "Failed to send email message. Here is the message that failed." msgstr "" -#: ../../mod/settings.php:193 -msgid "Empty passwords are not allowed. Password unchanged." +#: ../../mod/register.php:386 +msgid "Your registration can not be processed." msgstr "" -#: ../../mod/settings.php:204 -msgid "Password changed." +#: ../../mod/register.php:423 +#, php-format +msgid "Registration request at %s" msgstr "" -#: ../../mod/settings.php:206 -msgid "Password update failed. Please try again." +#: ../../mod/register.php:432 +msgid "Your registration is pending approval by the site owner." msgstr "" -#: ../../mod/settings.php:260 -msgid " Please use a shorter name." +#: ../../mod/register.php:486 +msgid "" +"You may (optionally) fill in this form via OpenID by supplying your OpenID " +"and clicking 'Register'." msgstr "" -#: ../../mod/settings.php:262 -msgid " Name too short." +#: ../../mod/register.php:487 +msgid "" +"If you are not familiar with OpenID, please leave that field blank and fill " +"in the rest of the items." msgstr "" -#: ../../mod/settings.php:268 -msgid " Not valid email." +#: ../../mod/register.php:488 +msgid "Your OpenID (optional): " msgstr "" -#: ../../mod/settings.php:270 -msgid " Cannot change to that email." +#: ../../mod/register.php:502 +msgid "Include your profile in member directory?" msgstr "" -#: ../../mod/settings.php:335 ../../addon/facebook/facebook.php:320 -#: ../../addon/impressum/impressum.php:64 ../../addon/piwik/piwik.php:94 -#: ../../addon/twitter/twitter.php:294 -msgid "Settings updated." +#: ../../mod/register.php:517 +msgid "Membership on this site is by invitation only." msgstr "" -#: ../../mod/settings.php:394 ../../include/nav.php:128 -msgid "Account settings" +#: ../../mod/register.php:518 +msgid "Your invitation ID: " msgstr "" -#: ../../mod/settings.php:399 -msgid "Connector settings" +#: ../../mod/register.php:521 ../../mod/admin.php:297 +msgid "Registration" msgstr "" -#: ../../mod/settings.php:404 -msgid "Plugin settings" +#: ../../mod/register.php:529 +msgid "Your Full Name (e.g. Joe Smith): " msgstr "" -#: ../../mod/settings.php:409 -msgid "Connections" +#: ../../mod/register.php:530 +msgid "Your Email Address: " msgstr "" -#: ../../mod/settings.php:414 -msgid "Export personal data" +#: ../../mod/register.php:531 +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>'." msgstr "" -#: ../../mod/settings.php:431 ../../mod/settings.php:457 -#: ../../mod/settings.php:490 -msgid "Add application" +#: ../../mod/register.php:532 +msgid "Choose a nickname: " msgstr "" -#: ../../mod/settings.php:435 ../../mod/settings.php:461 -#: ../../addon/statusnet/statusnet.php:480 -msgid "Consumer Key" +#: ../../mod/oexchange.php:27 +msgid "Post successful." msgstr "" -#: ../../mod/settings.php:436 ../../mod/settings.php:462 -#: ../../addon/statusnet/statusnet.php:479 -msgid "Consumer Secret" +#: ../../mod/allfriends.php:34 +#, php-format +msgid "Friends of %s" msgstr "" -#: ../../mod/settings.php:437 ../../mod/settings.php:463 -msgid "Redirect" +#: ../../mod/allfriends.php:40 +msgid "No friends to display." msgstr "" -#: ../../mod/settings.php:438 ../../mod/settings.php:464 -msgid "Icon url" +#: ../../mod/help.php:30 +msgid "Help:" msgstr "" -#: ../../mod/settings.php:449 -msgid "You can't edit this application." +#: ../../mod/help.php:34 ../../include/nav.php:82 +msgid "Help" msgstr "" -#: ../../mod/settings.php:489 -msgid "Connected Apps" +#: ../../mod/install.php:34 +msgid "Could not create/connect to database." msgstr "" -#: ../../mod/settings.php:493 -msgid "Client key starts with" +#: ../../mod/install.php:39 +msgid "Connected to database." msgstr "" -#: ../../mod/settings.php:494 -msgid "No name" +#: ../../mod/install.php:81 +msgid "Proceed with Installation" msgstr "" -#: ../../mod/settings.php:495 -msgid "Remove authorization" +#: ../../mod/install.php:83 +msgid "Your Friendica site database has been installed." msgstr "" -#: ../../mod/settings.php:507 -msgid "No Plugin settings configured" +#: ../../mod/install.php:84 +msgid "" +"IMPORTANT: You will need to [manually] setup a scheduled task for the poller." msgstr "" -#: ../../mod/settings.php:514 ../../addon/widgets/widgets.php:122 -msgid "Plugin Settings" +#: ../../mod/install.php:85 ../../mod/install.php:95 ../../mod/install.php:213 +msgid "Please see the file \"INSTALL.txt\"." msgstr "" -#: ../../mod/settings.php:527 ../../mod/settings.php:528 -#, php-format -msgid "Built-in support for %s connectivity is %s" +#: ../../mod/install.php:87 +msgid "Proceed to registration" msgstr "" -#: ../../mod/settings.php:527 ../../mod/settings.php:528 -msgid "enabled" +#: ../../mod/install.php:93 +msgid "Database import failed." msgstr "" -#: ../../mod/settings.php:527 ../../mod/settings.php:528 -msgid "disabled" +#: ../../mod/install.php:94 +msgid "" +"You may need to import the file \"database.sql\" manually using phpmyadmin " +"or mysql." msgstr "" -#: ../../mod/settings.php:528 -msgid "StatusNet" +#: ../../mod/install.php:107 +msgid "Welcome to Friendica." msgstr "" -#: ../../mod/settings.php:554 -msgid "Connector Settings" +#: ../../mod/install.php:130 +msgid "Friendica Social Communications Server" msgstr "" -#: ../../mod/settings.php:560 -msgid "Email/Mailbox Setup" +#: ../../mod/install.php:131 +msgid "Installation" msgstr "" -#: ../../mod/settings.php:561 +#: ../../mod/install.php:132 msgid "" -"If you wish to communicate with email contacts using this service " -"(optional), please specify how to connect to your mailbox." -msgstr "" - -#: ../../mod/settings.php:562 -msgid "Last successful email check:" -msgstr "" - -#: ../../mod/settings.php:563 -msgid "Email access is disabled on this site." +"In order to install Friendica we need to know how to connect to your " +"database." msgstr "" -#: ../../mod/settings.php:564 -msgid "IMAP server name:" +#: ../../mod/install.php:133 +msgid "" +"Please contact your hosting provider or site administrator if you have " +"questions about these settings." msgstr "" -#: ../../mod/settings.php:565 -msgid "IMAP port:" +#: ../../mod/install.php:134 +msgid "" +"The database you specify below should already exist. If it does not, please " +"create it before continuing." msgstr "" -#: ../../mod/settings.php:566 -msgid "Security:" +#: ../../mod/install.php:135 +msgid "Database Server Name" msgstr "" -#: ../../mod/settings.php:566 -msgid "None" +#: ../../mod/install.php:136 +msgid "Database Login Name" msgstr "" -#: ../../mod/settings.php:567 -msgid "Email login name:" +#: ../../mod/install.php:137 +msgid "Database Login Password" msgstr "" -#: ../../mod/settings.php:568 -msgid "Email password:" +#: ../../mod/install.php:138 +msgid "Database Name" msgstr "" -#: ../../mod/settings.php:569 -msgid "Reply-to address:" +#: ../../mod/install.php:139 +msgid "Please select a default timezone for your website" msgstr "" -#: ../../mod/settings.php:570 -msgid "Send public posts to all email contacts:" +#: ../../mod/install.php:140 +msgid "" +"Site administrator email address. Your account email address must match this " +"in order to use the web admin panel." msgstr "" -#: ../../mod/settings.php:620 ../../mod/admin.php:126 ../../mod/admin.php:443 -msgid "Normal Account" +#: ../../mod/install.php:159 +msgid "Could not find a command line version of PHP in the web server PATH." msgstr "" -#: ../../mod/settings.php:621 -msgid "This account is a normal personal profile" +#: ../../mod/install.php:160 +msgid "" +"This is required. Please adjust the configuration file .htconfig.php " +"accordingly." msgstr "" -#: ../../mod/settings.php:624 ../../mod/admin.php:127 ../../mod/admin.php:444 -msgid "Soapbox Account" +#: ../../mod/install.php:167 +msgid "" +"The command line version of PHP on your system does not have " +"\"register_argc_argv\" enabled." msgstr "" -#: ../../mod/settings.php:625 -msgid "Automatically approve all connection/friend requests as read-only fans" +#: ../../mod/install.php:168 +msgid "This is required for message delivery to work." msgstr "" -#: ../../mod/settings.php:628 ../../mod/admin.php:128 ../../mod/admin.php:445 -msgid "Community/Celebrity Account" +#: ../../mod/install.php:190 +msgid "" +"Error: the \"openssl_pkey_new\" function on this system is not able to " +"generate encryption keys" msgstr "" -#: ../../mod/settings.php:629 -msgid "Automatically approve all connection/friend requests as read-write fans" +#: ../../mod/install.php:191 +msgid "" +"If running under Windows, please see \"http://www.php.net/manual/en/openssl." +"installation.php\"." msgstr "" -#: ../../mod/settings.php:632 ../../mod/admin.php:129 ../../mod/admin.php:446 -msgid "Automatic Friend Account" +#: ../../mod/install.php:200 +msgid "" +"Error: Apache webserver mod-rewrite module is required but not installed." msgstr "" -#: ../../mod/settings.php:633 -msgid "Automatically approve all connection/friend requests as friends" +#: ../../mod/install.php:202 +msgid "Error: libCURL PHP module required but not installed." msgstr "" -#: ../../mod/settings.php:643 -msgid "OpenID:" +#: ../../mod/install.php:204 +msgid "" +"Error: GD graphics PHP module with JPEG support required but not installed." msgstr "" -#: ../../mod/settings.php:643 -msgid "(Optional) Allow this OpenID to login to this account." +#: ../../mod/install.php:206 +msgid "Error: openssl PHP module required but not installed." msgstr "" -#: ../../mod/settings.php:653 -msgid "Publish your default profile in your local site directory?" +#: ../../mod/install.php:208 +msgid "Error: mysqli PHP module required but not installed." msgstr "" -#: ../../mod/settings.php:659 -msgid "Publish your default profile in the global social directory?" +#: ../../mod/install.php:210 +msgid "Error: mb_string PHP module required but not installed." msgstr "" -#: ../../mod/settings.php:667 -msgid "Hide your contact/friend list from viewers of your default profile?" +#: ../../mod/install.php:222 +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." msgstr "" -#: ../../mod/settings.php:671 -msgid "Hide your profile details from unknown viewers?" +#: ../../mod/install.php:223 +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." msgstr "" -#: ../../mod/settings.php:676 -msgid "Allow friends to post to your profile page?" +#: ../../mod/install.php:224 +msgid "" +"Please check with your site documentation or support people to see if this " +"situation can be corrected." msgstr "" -#: ../../mod/settings.php:682 -msgid "Allow friends to tag your posts?" +#: ../../mod/install.php:225 +msgid "" +"If not, you may be required to perform a manual installation. Please see the " +"file \"INSTALL.txt\" for instructions." msgstr "" -#: ../../mod/settings.php:691 -msgid "Profile is <strong>not published</strong>." +#: ../../mod/install.php:234 +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." msgstr "" -#: ../../mod/settings.php:710 ../../mod/profile_photo.php:206 -msgid "or" +#: ../../mod/install.php:249 +msgid "Errors encountered creating database tables." msgstr "" -#: ../../mod/settings.php:715 -msgid "Your Identity Address is" +#: ../../mod/network.php:93 ../../include/group.php:216 +msgid "add" msgstr "" -#: ../../mod/settings.php:726 -msgid "Automatically expire posts after days:" +#: ../../mod/network.php:166 +msgid "Commented Order" msgstr "" -#: ../../mod/settings.php:726 -msgid "If empty, posts will not expire. Expired posts will be deleted" +#: ../../mod/network.php:171 +msgid "Posted Order" msgstr "" -#: ../../mod/settings.php:727 -msgid "Advanced expiration settings" +#: ../../mod/network.php:177 ../../mod/notifications.php:76 +msgid "Personal" msgstr "" -#: ../../mod/settings.php:728 -msgid "Advanced Expiration" +#: ../../mod/network.php:182 +msgid "New" msgstr "" -#: ../../mod/settings.php:729 -msgid "Expire posts:" +#: ../../mod/network.php:187 +msgid "Starred" msgstr "" -#: ../../mod/settings.php:730 -msgid "Expire personal notes:" +#: ../../mod/network.php:192 +msgid "Bookmarks" msgstr "" -#: ../../mod/settings.php:731 -msgid "Expire starred posts:" -msgstr "" +#: ../../mod/network.php:240 +#, 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/settings.php:732 -msgid "Expire photos:" +#: ../../mod/network.php:243 +msgid "Private messages to this group are at risk of public disclosure." msgstr "" -#: ../../mod/settings.php:737 -msgid "Account Settings" +#: ../../mod/network.php:289 +msgid "No such group" msgstr "" -#: ../../mod/settings.php:745 -msgid "Password Settings" +#: ../../mod/network.php:300 +msgid "Group is empty" msgstr "" -#: ../../mod/settings.php:746 -msgid "New Password:" +#: ../../mod/network.php:305 +msgid "Group: " msgstr "" -#: ../../mod/settings.php:747 -msgid "Confirm:" +#: ../../mod/network.php:315 +msgid "Contact: " msgstr "" -#: ../../mod/settings.php:747 -msgid "Leave password fields blank unless changing" +#: ../../mod/network.php:317 +msgid "Private messages to this person are at risk of public disclosure." msgstr "" -#: ../../mod/settings.php:751 -msgid "Basic Settings" +#: ../../mod/network.php:322 +msgid "Invalid contact." msgstr "" -#: ../../mod/settings.php:752 ../../include/profile_advanced.php:15 -msgid "Full Name:" +#: ../../mod/profperm.php:25 ../../mod/profperm.php:55 +msgid "Invalid profile identifier." msgstr "" -#: ../../mod/settings.php:753 -msgid "Email Address:" +#: ../../mod/profperm.php:101 +msgid "Profile Visibility Editor" msgstr "" -#: ../../mod/settings.php:754 -msgid "Your Timezone:" +#: ../../mod/profperm.php:105 ../../mod/group.php:164 +msgid "Click on a contact to add or remove." msgstr "" -#: ../../mod/settings.php:755 -msgid "Default Post Location:" +#: ../../mod/profperm.php:114 +msgid "Visible To" msgstr "" -#: ../../mod/settings.php:756 -msgid "Use Browser Location:" +#: ../../mod/profperm.php:130 +msgid "All Contacts (with secure profile access)" msgstr "" -#: ../../mod/settings.php:757 -msgid "Display Theme:" +#: ../../mod/events.php:61 +msgid "Event description and start time are required." msgstr "" -#: ../../mod/settings.php:761 -msgid "Security and Privacy Settings" +#: ../../mod/events.php:207 +msgid "Create New Event" msgstr "" -#: ../../mod/settings.php:763 -msgid "Maximum Friend Requests/Day:" +#: ../../mod/events.php:210 +msgid "Previous" msgstr "" -#: ../../mod/settings.php:763 -msgid "(to prevent spam abuse)" +#: ../../mod/events.php:213 +msgid "Next" msgstr "" -#: ../../mod/settings.php:764 -msgid "Default Post Permissions" +#: ../../mod/events.php:220 +msgid "l, F j" msgstr "" -#: ../../mod/settings.php:765 -msgid "(click to open/close)" +#: ../../mod/events.php:235 +msgid "Edit event" msgstr "" -#: ../../mod/settings.php:780 -msgid "Notification Settings" +#: ../../mod/events.php:237 ../../include/text.php:861 +msgid "link to source" msgstr "" -#: ../../mod/settings.php:781 -msgid "Send a notification email when:" +#: ../../mod/events.php:305 +msgid "hour:minute" msgstr "" -#: ../../mod/settings.php:782 -msgid "You receive an introduction" +#: ../../mod/events.php:314 +msgid "Event details" msgstr "" -#: ../../mod/settings.php:783 -msgid "Your introductions are confirmed" +#: ../../mod/events.php:315 +#, php-format +msgid "Format is %s %s. Starting date and Description are required." msgstr "" -#: ../../mod/settings.php:784 -msgid "Someone writes on your profile wall" +#: ../../mod/events.php:316 +msgid "Event Starts:" msgstr "" -#: ../../mod/settings.php:785 -msgid "Someone writes a followup comment" +#: ../../mod/events.php:319 +msgid "Finish date/time is not known or not relevant" msgstr "" -#: ../../mod/settings.php:786 -msgid "You receive a private message" +#: ../../mod/events.php:321 +msgid "Event Finishes:" msgstr "" -#: ../../mod/settings.php:790 -msgid "Advanced Page Settings" +#: ../../mod/events.php:324 +msgid "Adjust for viewer timezone" msgstr "" -#: ../../mod/manage.php:37 -#, php-format -msgid "Welcome back %s" +#: ../../mod/events.php:326 +msgid "Description:" msgstr "" -#: ../../mod/manage.php:87 -msgid "Manage Identities and/or Pages" +#: ../../mod/events.php:330 +msgid "Share this event" msgstr "" -#: ../../mod/manage.php:90 -msgid "" -"(Toggle between different identities or community/group pages which share " -"your account details.)" +#: ../../mod/notifications.php:26 +msgid "Invalid request identifier." msgstr "" -#: ../../mod/manage.php:92 -msgid "Select an identity to manage: " +#: ../../mod/notifications.php:35 ../../mod/notifications.php:149 +#: ../../mod/notifications.php:193 +msgid "Discard" msgstr "" -#: ../../mod/network.php:83 ../../mod/search.php:16 -msgid "Remove term" +#: ../../mod/notifications.php:71 ../../include/nav.php:109 +msgid "Network" msgstr "" -#: ../../mod/network.php:92 ../../mod/search.php:13 -msgid "Saved Searches" +#: ../../mod/notifications.php:81 ../../include/nav.php:73 +#: ../../include/nav.php:111 +msgid "Home" msgstr "" -#: ../../mod/network.php:93 ../../include/group.php:214 -msgid "add" +#: ../../mod/notifications.php:86 ../../include/nav.php:117 +msgid "Introductions" msgstr "" -#: ../../mod/network.php:157 -msgid "Commented Order" +#: ../../mod/notifications.php:91 ../../mod/message.php:76 +#: ../../include/nav.php:122 +msgid "Messages" msgstr "" -#: ../../mod/network.php:162 -msgid "Posted Order" +#: ../../mod/notifications.php:110 +msgid "Show Ignored Requests" msgstr "" -#: ../../mod/network.php:168 -msgid "New" +#: ../../mod/notifications.php:110 +msgid "Hide Ignored Requests" msgstr "" -#: ../../mod/network.php:173 -msgid "Starred" +#: ../../mod/notifications.php:136 ../../mod/notifications.php:179 +msgid "Notification type: " msgstr "" -#: ../../mod/network.php:178 -msgid "Bookmarks" +#: ../../mod/notifications.php:137 +msgid "Friend Suggestion" msgstr "" -#: ../../mod/network.php:225 +#: ../../mod/notifications.php:139 #, 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:228 -msgid "Private messages to this group are at risk of public disclosure." -msgstr "" - -#: ../../mod/network.php:301 -msgid "No such group" -msgstr "" - -#: ../../mod/network.php:312 -msgid "Group is empty" +msgid "suggested by %s" msgstr "" -#: ../../mod/network.php:317 -msgid "Group: " +#: ../../mod/notifications.php:145 ../../mod/notifications.php:190 +#: ../../mod/admin.php:466 +msgid "Approve" msgstr "" -#: ../../mod/network.php:327 -msgid "Contact: " +#: ../../mod/notifications.php:165 +msgid "Claims to be known to you: " msgstr "" -#: ../../mod/network.php:329 -msgid "Private messages to this person are at risk of public disclosure." +#: ../../mod/notifications.php:165 +msgid "yes" msgstr "" -#: ../../mod/network.php:334 -msgid "Invalid contact." +#: ../../mod/notifications.php:165 +msgid "no" msgstr "" -#: ../../mod/notes.php:44 ../../boot.php:1307 -msgid "Personal Notes" +#: ../../mod/notifications.php:172 +msgid "Approve as: " msgstr "" -#: ../../mod/notes.php:63 ../../include/text.php:628 -msgid "Save" +#: ../../mod/notifications.php:173 +msgid "Friend" msgstr "" -#: ../../mod/newmember.php:6 -msgid "Welcome to Friendika" +#: ../../mod/notifications.php:174 +msgid "Sharer" msgstr "" -#: ../../mod/newmember.php:8 -msgid "New Member Checklist" +#: ../../mod/notifications.php:174 +msgid "Fan/Admirer" 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." +#: ../../mod/notifications.php:180 +msgid "Friend/Connect Request" msgstr "" -#: ../../mod/newmember.php:16 -msgid "" -"On your <em>Settings</em> page - change your initial password. Also make a " -"note of your Identity Address. This will be useful in making friends." +#: ../../mod/notifications.php:180 +msgid "New Follower" msgstr "" -#: ../../mod/newmember.php:18 -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." +#: ../../mod/notifications.php:199 +msgid "No introductions." msgstr "" -#: ../../mod/newmember.php:20 -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." +#: ../../mod/notifications.php:202 ../../mod/notifications.php:288 +#: ../../mod/notifications.php:383 ../../mod/notifications.php:464 +#: ../../include/nav.php:118 +msgid "Notifications" msgstr "" -#: ../../mod/newmember.php:23 -msgid "" -"Authorise the Facebook Connector if you currently have a Facebook account " -"and we will (optionally) import all your Facebook friends and conversations." +#: ../../mod/notifications.php:239 ../../mod/notifications.php:334 +#: ../../mod/notifications.php:421 +#, php-format +msgid "%s liked %s's post" msgstr "" -#: ../../mod/newmember.php:28 -msgid "" -"Enter your email access information on your Settings page if you wish to " -"import and interact with friends or mailing lists from your email INBOX" +#: ../../mod/notifications.php:248 ../../mod/notifications.php:343 +#: ../../mod/notifications.php:430 +#, php-format +msgid "%s disliked %s's post" msgstr "" -#: ../../mod/newmember.php:30 -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." +#: ../../mod/notifications.php:262 ../../mod/notifications.php:357 +#: ../../mod/notifications.php:444 +#, php-format +msgid "%s is now friends with %s" msgstr "" -#: ../../mod/newmember.php:32 -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." +#: ../../mod/notifications.php:269 ../../mod/notifications.php:364 +#, php-format +msgid "%s created a new post" msgstr "" -#: ../../mod/newmember.php:34 -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>Connect</em> dialog." +#: ../../mod/notifications.php:270 ../../mod/notifications.php:365 +#: ../../mod/notifications.php:453 +#, php-format +msgid "%s commented on %s's post" msgstr "" -#: ../../mod/newmember.php:36 -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." +#: ../../mod/notifications.php:284 +msgid "No more network notifications." msgstr "" -#: ../../mod/newmember.php:38 -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." +#: ../../mod/notifications.php:379 +msgid "No more personal notifications." msgstr "" -#: ../../mod/newmember.php:40 -msgid "" -"Our <strong>help</strong> pages may be consulted for detail on other program " -"features and resources." +#: ../../mod/notifications.php:460 +msgid "No more home notifications." msgstr "" -#: ../../mod/attach.php:8 -msgid "Item not available." +#: ../../mod/crepair.php:100 +msgid "Contact settings applied." msgstr "" -#: ../../mod/attach.php:20 -msgid "Item was not found." +#: ../../mod/crepair.php:102 +msgid "Contact update failed." msgstr "" -#: ../../mod/group.php:27 -msgid "Group created." +#: ../../mod/crepair.php:127 ../../mod/fsuggest.php:20 +#: ../../mod/fsuggest.php:92 ../../mod/dfrn_confirm.php:114 +msgid "Contact not found." msgstr "" -#: ../../mod/group.php:33 -msgid "Could not create group." +#: ../../mod/crepair.php:133 +msgid "Repair Contact Settings" msgstr "" -#: ../../mod/group.php:43 ../../mod/group.php:123 -msgid "Group not found." +#: ../../mod/crepair.php:135 +msgid "" +"<strong>WARNING: This is highly advanced</strong> and if you enter incorrect " +"information your communications with this contact may stop working." msgstr "" -#: ../../mod/group.php:56 -msgid "Group name changed." +#: ../../mod/crepair.php:136 +msgid "" +"Please use your browser 'Back' button <strong>now</strong> if you are " +"uncertain what to do on this page." msgstr "" -#: ../../mod/group.php:67 ../../mod/profperm.php:19 ../../index.php:283 -msgid "Permission denied" +#: ../../mod/crepair.php:145 +msgid "Account Nickname" msgstr "" -#: ../../mod/group.php:82 -msgid "Create a group of contacts/friends." +#: ../../mod/crepair.php:146 +msgid "@Tagname - overrides Name/Nickname" msgstr "" -#: ../../mod/group.php:83 ../../mod/group.php:166 -msgid "Group Name: " +#: ../../mod/crepair.php:147 +msgid "Account URL" msgstr "" -#: ../../mod/group.php:98 -msgid "Group removed." +#: ../../mod/crepair.php:148 +msgid "Friend Request URL" msgstr "" -#: ../../mod/group.php:100 -msgid "Unable to remove group." +#: ../../mod/crepair.php:149 +msgid "Friend Confirm URL" msgstr "" -#: ../../mod/group.php:164 ../../mod/profperm.php:105 -msgid "Click on a contact to add or remove." +#: ../../mod/crepair.php:150 +msgid "Notification Endpoint URL" msgstr "" -#: ../../mod/group.php:165 -msgid "Group Editor" +#: ../../mod/crepair.php:151 +msgid "Poll/Feed URL" msgstr "" -#: ../../mod/group.php:179 -msgid "Members" +#: ../../mod/crepair.php:152 +msgid "New photo from this URL" msgstr "" -#: ../../mod/group.php:194 -msgid "All Contacts" +#: ../../mod/dfrn_request.php:92 +msgid "This introduction has already been accepted." msgstr "" -#: ../../mod/profperm.php:25 ../../mod/profperm.php:55 -msgid "Invalid profile identifier." +#: ../../mod/dfrn_request.php:116 ../../mod/dfrn_request.php:381 +msgid "Profile location is not valid or does not contain profile information." msgstr "" -#: ../../mod/profperm.php:101 -msgid "Profile Visibility Editor" +#: ../../mod/dfrn_request.php:121 ../../mod/dfrn_request.php:386 +msgid "Warning: profile location has no identifiable owner name." msgstr "" -#: ../../mod/profperm.php:103 ../../include/profile_advanced.php:7 -#: ../../include/profile_advanced.php:74 ../../include/nav.php:48 -#: ../../boot.php:1289 -msgid "Profile" +#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:388 +msgid "Warning: profile location has no profile photo." msgstr "" -#: ../../mod/profperm.php:114 -msgid "Visible To" -msgstr "" +#: ../../mod/dfrn_request.php:126 ../../mod/dfrn_request.php:391 +#, 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/profperm.php:130 -msgid "All Contacts (with secure profile access)" +#: ../../mod/dfrn_request.php:167 +msgid "Introduction complete." msgstr "" -#: ../../mod/viewcontacts.php:25 ../../include/text.php:567 -msgid "View Contacts" +#: ../../mod/dfrn_request.php:191 +msgid "Unrecoverable protocol error." msgstr "" -#: ../../mod/viewcontacts.php:40 -msgid "No contacts." +#: ../../mod/dfrn_request.php:219 +msgid "Profile unavailable." msgstr "" -#: ../../mod/register.php:53 -msgid "An invitation is required." +#: ../../mod/dfrn_request.php:244 +#, php-format +msgid "%s has received too many connection requests today." msgstr "" -#: ../../mod/register.php:58 -msgid "Invitation could not be verified." +#: ../../mod/dfrn_request.php:245 +msgid "Spam protection measures have been invoked." msgstr "" -#: ../../mod/register.php:66 -msgid "Invalid OpenID url" +#: ../../mod/dfrn_request.php:246 +msgid "Friends are advised to please try again in 24 hours." msgstr "" -#: ../../mod/register.php:81 -msgid "Please enter the required information." +#: ../../mod/dfrn_request.php:306 +msgid "Invalid locator" msgstr "" -#: ../../mod/register.php:95 -msgid "Please use a shorter name." +#: ../../mod/dfrn_request.php:326 +msgid "Unable to resolve your name at the provided location." msgstr "" -#: ../../mod/register.php:97 -msgid "Name too short." +#: ../../mod/dfrn_request.php:339 +msgid "You have already introduced yourself here." msgstr "" -#: ../../mod/register.php:112 -msgid "That doesn't appear to be your full (First Last) name." +#: ../../mod/dfrn_request.php:343 +#, php-format +msgid "Apparently you are already friends with %s." msgstr "" -#: ../../mod/register.php:117 -msgid "Your email domain is not among those allowed on this site." +#: ../../mod/dfrn_request.php:364 +msgid "Invalid profile URL." msgstr "" -#: ../../mod/register.php:120 -msgid "Not a valid email address." +#: ../../mod/dfrn_request.php:460 +msgid "Your introduction has been sent." msgstr "" -#: ../../mod/register.php:130 -msgid "Cannot use that email." +#: ../../mod/dfrn_request.php:513 +msgid "Please login to confirm introduction." msgstr "" -#: ../../mod/register.php:136 +#: ../../mod/dfrn_request.php:527 msgid "" -"Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and " -"must also begin with a letter." +"Incorrect identity currently logged in. Please login to <strong>this</" +"strong> profile." msgstr "" -#: ../../mod/register.php:142 ../../mod/register.php:243 -msgid "Nickname is already registered. Please choose another." +#: ../../mod/dfrn_request.php:539 +#, php-format +msgid "Welcome home %s." msgstr "" -#: ../../mod/register.php:161 -msgid "SERIOUS ERROR: Generation of security keys failed." +#: ../../mod/dfrn_request.php:540 +#, php-format +msgid "Please confirm your introduction/connection request to %s." msgstr "" -#: ../../mod/register.php:229 -msgid "An error occurred during registration. Please try again." +#: ../../mod/dfrn_request.php:541 +msgid "Confirm" msgstr "" -#: ../../mod/register.php:265 -msgid "An error occurred creating your default profile. Please try again." +#: ../../mod/dfrn_request.php:574 ../../include/items.php:2525 +msgid "[Name Withheld]" msgstr "" -#: ../../mod/register.php:369 ../../mod/regmod.php:52 -#, php-format -msgid "Registration details for %s" +#: ../../mod/dfrn_request.php:581 +msgid "Introduction received at " msgstr "" -#: ../../mod/register.php:377 +#: ../../mod/dfrn_request.php:665 +#, php-format msgid "" -"Registration successful. Please check your email for further instructions." -msgstr "" - -#: ../../mod/register.php:381 -msgid "Failed to send email message. Here is the message that failed." -msgstr "" - -#: ../../mod/register.php:386 -msgid "Your registration can not be processed." +"Diaspora members: Please do not use this form. Instead, enter \"%s\" into " +"your Diaspora search bar." msgstr "" -#: ../../mod/register.php:423 -#, php-format -msgid "Registration request at %s" +#: ../../mod/dfrn_request.php:668 +msgid "" +"Please enter your 'Identity Address' from one of the following supported " +"social networks:" msgstr "" -#: ../../mod/register.php:432 -msgid "Your registration is pending approval by the site owner." +#: ../../mod/dfrn_request.php:671 +msgid "Friend/Connection Request" msgstr "" -#: ../../mod/register.php:481 +#: ../../mod/dfrn_request.php:672 msgid "" -"You may (optionally) fill in this form via OpenID by supplying your OpenID " -"and clicking 'Register'." +"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, " +"testuser@identi.ca" msgstr "" -#: ../../mod/register.php:482 -msgid "" -"If you are not familiar with OpenID, please leave that field blank and fill " -"in the rest of the items." +#: ../../mod/dfrn_request.php:673 +msgid "Please answer the following:" msgstr "" -#: ../../mod/register.php:483 -msgid "Your OpenID (optional): " +#: ../../mod/dfrn_request.php:674 +#, php-format +msgid "Does %s know you?" msgstr "" -#: ../../mod/register.php:497 -msgid "Include your profile in member directory?" +#: ../../mod/dfrn_request.php:677 +msgid "Add a personal note:" msgstr "" -#: ../../mod/register.php:512 -msgid "Membership on this site is by invitation only." +#: ../../mod/dfrn_request.php:679 ../../include/contact_selectors.php:78 +msgid "Friendica" msgstr "" -#: ../../mod/register.php:513 -msgid "Your invitation ID: " +#: ../../mod/dfrn_request.php:680 +msgid "StatusNet/Federated Social Web" msgstr "" -#: ../../mod/register.php:516 ../../mod/admin.php:297 -msgid "Registration" +#: ../../mod/dfrn_request.php:682 +msgid "- please share from your own site as noted above" msgstr "" -#: ../../mod/register.php:524 -msgid "Your Full Name (e.g. Joe Smith): " +#: ../../mod/dfrn_request.php:683 +msgid "Your Identity Address:" msgstr "" -#: ../../mod/register.php:525 -msgid "Your Email Address: " +#: ../../mod/dfrn_request.php:684 +msgid "Submit Request" msgstr "" -#: ../../mod/register.php:526 -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/api.php:76 ../../mod/api.php:102 +msgid "Authorize application connection" msgstr "" -#: ../../mod/register.php:527 -msgid "Choose a nickname: " +#: ../../mod/api.php:77 +msgid "Return to your app and insert this Securty Code:" msgstr "" -#: ../../mod/register.php:530 ../../include/nav.php:77 ../../boot.php:665 -msgid "Register" +#: ../../mod/api.php:89 +msgid "Please login to continue." msgstr "" -#: ../../mod/dirfind.php:23 -msgid "People Search" +#: ../../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?" msgstr "" -#: ../../mod/like.php:127 ../../mod/tagger.php:70 -#: ../../addon/facebook/facebook.php:1024 +#: ../../mod/tagger.php:70 ../../mod/like.php:127 +#: ../../addon/facebook/facebook.php:1056 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 -#: ../../include/diaspora.php:1213 ../../include/conversation.php:26 -#: ../../include/conversation.php:35 ../../include/conversation.php:99 -#: ../../include/conversation.php:108 +#: ../../include/conversation.php:26 ../../include/conversation.php:35 +#: ../../include/conversation.php:99 ../../include/conversation.php:108 +#: ../../include/diaspora.php:1481 msgid "status" msgstr "" -#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1028 +#: ../../mod/tagger.php:103 ../../include/conversation.php:116 +#, php-format +msgid "%1$s tagged %2$s's %3$s with %4$s" +msgstr "" + +#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1060 #: ../../addon/communityhome/communityhome.php:172 -#: ../../include/diaspora.php:1229 ../../include/conversation.php:43 +#: ../../include/conversation.php:43 ../../include/diaspora.php:1497 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "" @@ -2337,154 +2770,95 @@ msgstr "" msgid "%1$s doesn't like %2$s's %3$s" msgstr "" -#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:111 -#: ../../mod/admin.php:502 ../../mod/display.php:28 ../../mod/display.php:115 -#: ../../include/items.php:2898 -msgid "Item not found." -msgstr "" - -#: ../../mod/viewsrc.php:7 -msgid "Access denied." -msgstr "" - -#: ../../mod/regmod.php:61 -msgid "Account approved." -msgstr "" - -#: ../../mod/regmod.php:93 -#, php-format -msgid "Registration revoked for %s" -msgstr "" - -#: ../../mod/regmod.php:105 -msgid "Please login." -msgstr "" - -#: ../../mod/item.php:84 -msgid "Unable to locate original post." -msgstr "" - -#: ../../mod/item.php:199 -msgid "Empty post discarded." -msgstr "" - -#: ../../mod/item.php:299 ../../mod/wall_upload.php:81 -#: ../../mod/wall_upload.php:90 ../../mod/wall_upload.php:97 -#: ../../include/message.php:82 -msgid "Wall Photos" -msgstr "" - -#: ../../mod/item.php:675 ../../mod/item.php:720 ../../mod/item.php:764 -#: ../../mod/item.php:807 ../../include/items.php:1835 -#: ../../include/items.php:2162 ../../include/items.php:2209 -#: ../../include/items.php:2321 ../../include/items.php:2367 -msgid "noreply" -msgstr "" - -#: ../../mod/item.php:719 ../../mod/item.php:806 ../../include/items.php:2366 -msgid "Administrator@" +#: ../../mod/lostpass.php:16 +msgid "No valid account found." msgstr "" -#: ../../mod/item.php:722 ../../include/items.php:2211 -#: ../../include/items.php:2369 -#, php-format -msgid "%s commented on an item at %s" +#: ../../mod/lostpass.php:31 +msgid "Password reset request issued. Check your email." msgstr "" -#: ../../mod/item.php:809 +#: ../../mod/lostpass.php:42 #, php-format -msgid "%s posted to your profile wall at %s" -msgstr "" - -#: ../../mod/item.php:843 -msgid "System error. Post not saved." +msgid "Password reset requested at %s" msgstr "" -#: ../../mod/item.php:868 -#, php-format +#: ../../mod/lostpass.php:64 msgid "" -"This message was sent to you by %s, a member of the Friendica social network." -msgstr "" - -#: ../../mod/item.php:870 -#, php-format -msgid "You may visit them online at %s" +"Request could not be verified. (You may have previously submitted it.) " +"Password reset failed." msgstr "" -#: ../../mod/item.php:871 -msgid "" -"Please contact the sender by replying to this post if you do not wish to " -"receive these messages." +#: ../../mod/lostpass.php:83 +msgid "Your password has been reset as requested." msgstr "" -#: ../../mod/item.php:873 -#, php-format -msgid "%s posted an update." +#: ../../mod/lostpass.php:84 +msgid "Your new password is" msgstr "" -#: ../../mod/profile_photo.php:28 -msgid "Image uploaded but image cropping failed." +#: ../../mod/lostpass.php:85 +msgid "Save or copy your new password - and then" msgstr "" -#: ../../mod/profile_photo.php:61 ../../mod/profile_photo.php:68 -#: ../../mod/profile_photo.php:75 ../../mod/profile_photo.php:258 -#, php-format -msgid "Image size reduction [%s] failed." +#: ../../mod/lostpass.php:86 +msgid "click here to login" msgstr "" -#: ../../mod/profile_photo.php:89 +#: ../../mod/lostpass.php:87 msgid "" -"Shift-reload the page or clear browser cache if the new photo does not " -"display immediately." -msgstr "" - -#: ../../mod/profile_photo.php:99 -msgid "Unable to process image" +"Your password may be changed from the <em>Settings</em> page after " +"successful login." msgstr "" -#: ../../mod/profile_photo.php:113 ../../mod/wall_upload.php:56 -#, php-format -msgid "Image exceeds size limit of %d" +#: ../../mod/lostpass.php:118 +msgid "Forgot your Password?" msgstr "" -#: ../../mod/profile_photo.php:203 -msgid "Upload File:" +#: ../../mod/lostpass.php:119 +msgid "" +"Enter your email address and submit to have your password reset. Then check " +"your email for further instructions." msgstr "" -#: ../../mod/profile_photo.php:204 -msgid "Upload Profile Photo" +#: ../../mod/lostpass.php:120 +msgid "Nickname or Email: " msgstr "" -#: ../../mod/profile_photo.php:205 -msgid "Upload" +#: ../../mod/lostpass.php:121 +msgid "Reset" msgstr "" -#: ../../mod/profile_photo.php:206 -msgid "skip this step" +#: ../../mod/friendica.php:43 +msgid "This is Friendica, version" msgstr "" -#: ../../mod/profile_photo.php:206 -msgid "select a photo from your photo albums" +#: ../../mod/friendica.php:44 +msgid "running at web location" msgstr "" -#: ../../mod/profile_photo.php:219 -msgid "Crop Image" +#: ../../mod/friendica.php:46 +msgid "" +"Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn " +"more about the Friendica project." msgstr "" -#: ../../mod/profile_photo.php:220 -msgid "Please adjust the image cropping for optimum viewing." +#: ../../mod/friendica.php:48 +msgid "Bug reports and issues: please visit" msgstr "" -#: ../../mod/profile_photo.php:221 -msgid "Done Editing" +#: ../../mod/friendica.php:49 +msgid "" +"Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - " +"dot com" msgstr "" -#: ../../mod/profile_photo.php:249 -msgid "Image uploaded successfully." +#: ../../mod/friendica.php:54 +msgid "Installed plugins/addons/apps" msgstr "" -#: ../../mod/hcard.php:10 ../../mod/profile.php:10 ../../boot.php:817 -msgid "No profile" +#: ../../mod/friendica.php:62 +msgid "No installed plugins/addons/apps" msgstr "" #: ../../mod/removeme.php:42 ../../mod/removeme.php:45 @@ -2501,94 +2875,61 @@ msgstr "" msgid "Please enter your password for verification:" msgstr "" -#: ../../mod/message.php:23 -msgid "No recipient selected." -msgstr "" - -#: ../../mod/message.php:26 -msgid "Unable to locate contact information." -msgstr "" - -#: ../../mod/message.php:29 -msgid "Message could not be sent." -msgstr "" - -#: ../../mod/message.php:31 -msgid "Message sent." -msgstr "" - -#: ../../mod/message.php:51 -msgid "Inbox" -msgstr "" - -#: ../../mod/message.php:56 -msgid "Outbox" -msgstr "" - -#: ../../mod/message.php:61 -msgid "New Message" -msgstr "" - -#: ../../mod/message.php:87 -msgid "Message deleted." -msgstr "" - -#: ../../mod/message.php:103 -msgid "Conversation removed." +#: ../../mod/apps.php:4 +msgid "Applications" msgstr "" -#: ../../mod/message.php:119 ../../include/conversation.php:805 -msgid "Please enter a link URL:" +#: ../../mod/apps.php:7 +msgid "No installed applications." msgstr "" -#: ../../mod/message.php:127 -msgid "Send Private Message" +#: ../../mod/notes.php:63 ../../include/text.php:631 +msgid "Save" msgstr "" -#: ../../mod/message.php:128 ../../mod/message.php:261 -msgid "To:" +#: ../../mod/fsuggest.php:63 +msgid "Friend suggestion sent." msgstr "" -#: ../../mod/message.php:129 ../../mod/message.php:262 -msgid "Subject:" +#: ../../mod/fsuggest.php:97 +msgid "Suggest Friends" msgstr "" -#: ../../mod/message.php:132 ../../mod/message.php:265 -#: ../../mod/invite.php:101 -msgid "Your message:" +#: ../../mod/fsuggest.php:99 +#, php-format +msgid "Suggest a friend for %s" msgstr "" -#: ../../mod/message.php:170 -msgid "No messages." +#: ../../mod/viewsrc.php:7 +msgid "Access denied." msgstr "" -#: ../../mod/message.php:183 -msgid "Delete conversation" +#: ../../mod/directory.php:49 +msgid "Global Directory" msgstr "" -#: ../../mod/message.php:186 -msgid "D, d M Y - g:i A" +#: ../../mod/directory.php:55 +msgid "Normal site view" msgstr "" -#: ../../mod/message.php:213 -msgid "Message not available." +#: ../../mod/directory.php:57 +msgid "Admin - View all site entries" msgstr "" -#: ../../mod/message.php:250 -msgid "Delete message" +#: ../../mod/directory.php:63 +msgid "Find on this site" msgstr "" -#: ../../mod/message.php:260 -msgid "Send Reply" +#: ../../mod/directory.php:66 +msgid "Site Directory" msgstr "" -#: ../../mod/allfriends.php:34 -#, php-format -msgid "Friends of %s" +#: ../../mod/directory.php:125 +msgid "Gender: " msgstr "" -#: ../../mod/allfriends.php:40 -msgid "No friends to display." +#: ../../mod/directory.php:151 +msgid "No entries (some entries may be hidden)." msgstr "" #: ../../mod/admin.php:59 ../../mod/admin.php:295 @@ -2926,711 +3267,556 @@ msgstr "" msgid "FTP Password" msgstr "" -#: ../../mod/profile.php:105 ../../mod/display.php:66 -msgid "Access to this profile has been restricted." -msgstr "" - -#: ../../mod/profile.php:127 -msgid "Tips for New Members" +#: ../../mod/item.php:84 +msgid "Unable to locate original post." msgstr "" -#: ../../mod/ping.php:146 -msgid "{0} wants to be your friend" +#: ../../mod/item.php:199 +msgid "Empty post discarded." msgstr "" -#: ../../mod/ping.php:151 -msgid "{0} sent you a message" +#: ../../mod/item.php:687 ../../mod/item.php:732 ../../mod/item.php:776 +#: ../../mod/item.php:819 ../../include/items.php:1835 +#: ../../include/items.php:2162 ../../include/items.php:2209 +#: ../../include/items.php:2321 ../../include/items.php:2367 +msgid "noreply" msgstr "" -#: ../../mod/ping.php:156 -msgid "{0} requested registration" +#: ../../mod/item.php:731 ../../mod/item.php:818 ../../include/items.php:2366 +msgid "Administrator@" msgstr "" -#: ../../mod/ping.php:162 +#: ../../mod/item.php:734 ../../include/items.php:2211 +#: ../../include/items.php:2369 #, php-format -msgid "{0} commented %s's post" +msgid "%s commented on an item at %s" msgstr "" -#: ../../mod/ping.php:167 +#: ../../mod/item.php:821 #, php-format -msgid "{0} liked %s's post" +msgid "%s posted to your profile wall at %s" msgstr "" -#: ../../mod/ping.php:172 -#, php-format -msgid "{0} disliked %s's post" +#: ../../mod/item.php:855 +msgid "System error. Post not saved." msgstr "" -#: ../../mod/ping.php:177 +#: ../../mod/item.php:880 #, php-format -msgid "{0} is now friends with %s" -msgstr "" - -#: ../../mod/ping.php:182 -msgid "{0} posted" +msgid "" +"This message was sent to you by %s, a member of the Friendica social network." msgstr "" -#: ../../mod/ping.php:187 +#: ../../mod/item.php:882 #, php-format -msgid "{0} tagged %s's post with #%s" -msgstr "" - -#: ../../mod/openid.php:63 ../../mod/openid.php:123 ../../include/auth.php:122 -#: ../../include/auth.php:147 ../../include/auth.php:201 -msgid "Login failed." -msgstr "" - -#: ../../mod/openid.php:79 ../../include/auth.php:217 -msgid "Welcome " -msgstr "" - -#: ../../mod/openid.php:80 ../../include/auth.php:218 -msgid "Please upload a profile photo." -msgstr "" - -#: ../../mod/openid.php:83 ../../include/auth.php:221 -msgid "Welcome back " +msgid "You may visit them online at %s" msgstr "" -#: ../../mod/follow.php:39 +#: ../../mod/item.php:883 msgid "" -"This site is not configured to allow communications with other networks." -msgstr "" - -#: ../../mod/follow.php:40 ../../mod/follow.php:50 -msgid "No compatible communication protocols or feeds were discovered." +"Please contact the sender by replying to this post if you do not wish to " +"receive these messages." msgstr "" -#: ../../mod/follow.php:48 -msgid "The profile address specified does not provide adequate information." +#: ../../mod/item.php:885 +#, php-format +msgid "%s posted an update." msgstr "" -#: ../../mod/follow.php:52 -msgid "An author or name was not found." +#: ../../mod/tagrm.php:41 +msgid "Tag removed" msgstr "" -#: ../../mod/follow.php:54 -msgid "No browser URL could be matched to this address." +#: ../../mod/tagrm.php:79 +msgid "Remove Item Tag" msgstr "" -#: ../../mod/follow.php:61 -msgid "" -"The profile address specified belongs to a network which has been disabled " -"on this site." +#: ../../mod/tagrm.php:81 +msgid "Select a tag to remove: " msgstr "" -#: ../../mod/follow.php:66 -msgid "" -"Limited profile. This person will be unable to receive direct/personal " -"notifications from you." +#: ../../mod/tagrm.php:93 +msgid "Remove" msgstr "" -#: ../../mod/follow.php:133 -msgid "Unable to retrieve contact information." +#: ../../mod/message.php:23 +msgid "No recipient selected." msgstr "" -#: ../../mod/follow.php:179 -msgid "following" +#: ../../mod/message.php:26 +msgid "Unable to locate contact information." msgstr "" -#: ../../mod/common.php:34 -msgid "Common Friends" +#: ../../mod/message.php:29 +msgid "Message could not be sent." msgstr "" -#: ../../mod/common.php:42 -msgid "No friends in common." +#: ../../mod/message.php:32 +msgid "Message collection failure." msgstr "" -#: ../../mod/display.php:108 -msgid "Item has been removed." +#: ../../mod/message.php:35 +msgid "Message sent." msgstr "" -#: ../../mod/apps.php:4 -msgid "Applications" +#: ../../mod/message.php:55 +msgid "Inbox" msgstr "" -#: ../../mod/apps.php:7 -msgid "No installed applications." +#: ../../mod/message.php:60 +msgid "Outbox" msgstr "" -#: ../../mod/search.php:83 -msgid "Search This Site" +#: ../../mod/message.php:65 +msgid "New Message" msgstr "" -#: ../../mod/profiles.php:21 ../../mod/profiles.php:239 -#: ../../mod/profiles.php:344 ../../mod/dfrn_confirm.php:62 -msgid "Profile not found." +#: ../../mod/message.php:91 +msgid "Message deleted." msgstr "" -#: ../../mod/profiles.php:28 -msgid "Profile Name is required." +#: ../../mod/message.php:121 +msgid "Conversation removed." msgstr "" -#: ../../mod/profiles.php:198 -msgid "Profile updated." +#: ../../mod/message.php:137 ../../include/conversation.php:810 +msgid "Please enter a link URL:" msgstr "" -#: ../../mod/profiles.php:256 -msgid "Profile deleted." +#: ../../mod/message.php:145 +msgid "Send Private Message" msgstr "" -#: ../../mod/profiles.php:272 ../../mod/profiles.php:303 -msgid "Profile-" +#: ../../mod/message.php:146 ../../mod/message.php:287 +msgid "To:" msgstr "" -#: ../../mod/profiles.php:291 ../../mod/profiles.php:330 -msgid "New profile created." +#: ../../mod/message.php:147 ../../mod/message.php:288 +msgid "Subject:" msgstr "" -#: ../../mod/profiles.php:309 -msgid "Profile unavailable to clone." +#: ../../mod/message.php:188 +msgid "No messages." msgstr "" -#: ../../mod/profiles.php:356 -msgid "Hide your contact/friend list from viewers of this profile?" +#: ../../mod/message.php:201 +msgid "Delete conversation" msgstr "" -#: ../../mod/profiles.php:374 -msgid "Edit Profile Details" +#: ../../mod/message.php:204 +msgid "D, d M Y - g:i A" msgstr "" -#: ../../mod/profiles.php:376 -msgid "View this profile" +#: ../../mod/message.php:239 +msgid "Message not available." msgstr "" -#: ../../mod/profiles.php:377 -msgid "Create a new profile using these settings" +#: ../../mod/message.php:276 +msgid "Delete message" msgstr "" -#: ../../mod/profiles.php:378 -msgid "Clone this profile" +#: ../../mod/message.php:286 +msgid "Send Reply" msgstr "" -#: ../../mod/profiles.php:379 -msgid "Delete this profile" +#: ../../mod/dfrn_confirm.php:234 +msgid "Response from remote site was not understood." msgstr "" -#: ../../mod/profiles.php:380 -msgid "Profile Name:" +#: ../../mod/dfrn_confirm.php:243 +msgid "Unexpected response from remote site: " msgstr "" -#: ../../mod/profiles.php:381 -msgid "Your Full Name:" +#: ../../mod/dfrn_confirm.php:251 +msgid "Confirmation completed successfully." msgstr "" -#: ../../mod/profiles.php:382 -msgid "Title/Description:" +#: ../../mod/dfrn_confirm.php:253 ../../mod/dfrn_confirm.php:267 +#: ../../mod/dfrn_confirm.php:274 +msgid "Remote site reported: " msgstr "" -#: ../../mod/profiles.php:383 -msgid "Your Gender:" +#: ../../mod/dfrn_confirm.php:265 +msgid "Temporary failure. Please wait and try again." msgstr "" -#: ../../mod/profiles.php:384 -#, php-format -msgid "Birthday (%s):" +#: ../../mod/dfrn_confirm.php:272 +msgid "Introduction failed or was revoked." msgstr "" -#: ../../mod/profiles.php:385 -msgid "Street Address:" +#: ../../mod/dfrn_confirm.php:409 +msgid "Unable to set contact photo." msgstr "" -#: ../../mod/profiles.php:386 -msgid "Locality/City:" +#: ../../mod/dfrn_confirm.php:459 ../../include/conversation.php:79 +#: ../../include/diaspora.php:488 +#, php-format +msgid "%1$s is now friends with %2$s" msgstr "" -#: ../../mod/profiles.php:387 -msgid "Postal/Zip Code:" +#: ../../mod/dfrn_confirm.php:530 +#, php-format +msgid "No user record found for '%s' " msgstr "" -#: ../../mod/profiles.php:388 -msgid "Country:" +#: ../../mod/dfrn_confirm.php:540 +msgid "Our site encryption key is apparently messed up." msgstr "" -#: ../../mod/profiles.php:389 -msgid "Region/State:" +#: ../../mod/dfrn_confirm.php:551 +msgid "Empty site URL was provided or URL could not be decrypted by us." msgstr "" -#: ../../mod/profiles.php:390 -msgid "<span class=\"heart\">♥</span> Marital Status:" +#: ../../mod/dfrn_confirm.php:572 +msgid "Contact record was not found for you on our site." msgstr "" -#: ../../mod/profiles.php:391 -msgid "Who: (if applicable)" +#: ../../mod/dfrn_confirm.php:586 +#, php-format +msgid "Site public key not available in contact record for URL %s." msgstr "" -#: ../../mod/profiles.php:392 -msgid "Examples: cathy123, Cathy Williams, cathy@example.com" +#: ../../mod/dfrn_confirm.php:606 +msgid "" +"The ID provided by your system is a duplicate on our system. It should work " +"if you try again." msgstr "" -#: ../../mod/profiles.php:393 ../../include/profile_advanced.php:43 -msgid "Sexual Preference:" +#: ../../mod/dfrn_confirm.php:617 +msgid "Unable to set your contact credentials on our system." msgstr "" -#: ../../mod/profiles.php:394 -msgid "Homepage URL:" +#: ../../mod/dfrn_confirm.php:671 +msgid "Unable to update your contact profile details on our system" msgstr "" -#: ../../mod/profiles.php:395 ../../include/profile_advanced.php:47 -msgid "Political Views:" +#: ../../mod/dfrn_confirm.php:701 +#, php-format +msgid "Connection accepted at %s" msgstr "" -#: ../../mod/profiles.php:396 -msgid "Religious Views:" +#: ../../mod/openid.php:63 ../../mod/openid.php:123 ../../include/auth.php:122 +#: ../../include/auth.php:147 ../../include/auth.php:201 +msgid "Login failed." msgstr "" -#: ../../mod/profiles.php:397 -msgid "Public Keywords:" +#: ../../mod/openid.php:79 ../../include/auth.php:217 +msgid "Welcome " msgstr "" -#: ../../mod/profiles.php:398 -msgid "Private Keywords:" +#: ../../mod/openid.php:80 ../../include/auth.php:218 +msgid "Please upload a profile photo." msgstr "" -#: ../../mod/profiles.php:399 -msgid "Example: fishing photography software" +#: ../../mod/openid.php:83 ../../include/auth.php:221 +msgid "Welcome back " msgstr "" -#: ../../mod/profiles.php:400 -msgid "(Used for suggesting potential friends, can be seen by others)" +#: ../../mod/dfrn_poll.php:90 ../../mod/dfrn_poll.php:516 +#, php-format +msgid "%s welcomes %s" msgstr "" -#: ../../mod/profiles.php:401 -msgid "(Used for searching profiles, never shown to others)" +#: ../../mod/viewcontacts.php:25 ../../include/text.php:570 +msgid "View Contacts" msgstr "" -#: ../../mod/profiles.php:402 -msgid "Tell us about yourself..." +#: ../../mod/viewcontacts.php:40 +msgid "No contacts." msgstr "" -#: ../../mod/profiles.php:403 -msgid "Hobbies/Interests" +#: ../../mod/group.php:27 +msgid "Group created." msgstr "" -#: ../../mod/profiles.php:404 -msgid "Contact information and Social Networks" +#: ../../mod/group.php:33 +msgid "Could not create group." msgstr "" -#: ../../mod/profiles.php:405 -msgid "Musical interests" +#: ../../mod/group.php:43 ../../mod/group.php:123 +msgid "Group not found." msgstr "" -#: ../../mod/profiles.php:406 -msgid "Books, literature" +#: ../../mod/group.php:56 +msgid "Group name changed." msgstr "" -#: ../../mod/profiles.php:407 -msgid "Television" +#: ../../mod/group.php:82 +msgid "Create a group of contacts/friends." msgstr "" -#: ../../mod/profiles.php:408 -msgid "Film/dance/culture/entertainment" +#: ../../mod/group.php:83 ../../mod/group.php:166 +msgid "Group Name: " msgstr "" -#: ../../mod/profiles.php:409 -msgid "Love/romance" +#: ../../mod/group.php:98 +msgid "Group removed." msgstr "" -#: ../../mod/profiles.php:410 -msgid "Work/employment" +#: ../../mod/group.php:100 +msgid "Unable to remove group." msgstr "" -#: ../../mod/profiles.php:411 -msgid "School/education" +#: ../../mod/group.php:165 +msgid "Group Editor" msgstr "" -#: ../../mod/profiles.php:416 -msgid "" -"This is your <strong>public</strong> profile.<br />It <strong>may</strong> " -"be visible to anybody using the internet." +#: ../../mod/group.php:179 +msgid "Members" msgstr "" -#: ../../mod/profiles.php:426 ../../mod/directory.php:122 -msgid "Age: " +#: ../../mod/group.php:194 +msgid "All Contacts" msgstr "" -#: ../../mod/profiles.php:461 -msgid "Edit/Manage Profiles" +#: ../../mod/attach.php:8 +msgid "Item not available." msgstr "" -#: ../../mod/profiles.php:462 ../../boot.php:908 -msgid "Change profile photo" +#: ../../mod/attach.php:20 +msgid "Item was not found." msgstr "" -#: ../../mod/profiles.php:463 ../../boot.php:909 -msgid "Create New Profile" +#: ../../mod/common.php:34 +msgid "Common Friends" msgstr "" -#: ../../mod/profiles.php:473 ../../boot.php:919 -msgid "Profile Image" +#: ../../mod/common.php:42 +msgid "No friends in common." msgstr "" -#: ../../mod/profiles.php:475 ../../boot.php:922 -msgid "visible to everybody" +#: ../../mod/match.php:10 +msgid "Profile Match" msgstr "" -#: ../../mod/profiles.php:476 ../../boot.php:923 -msgid "Edit visibility" +#: ../../mod/match.php:18 +msgid "No keywords to match. Please add keywords to your default profile." msgstr "" -#: ../../mod/tagger.php:103 ../../include/conversation.php:116 -#, php-format -msgid "%1$s tagged %2$s's %3$s with %4$s" +#: ../../mod/community.php:21 +msgid "Not available." msgstr "" -#: ../../mod/suggest.php:36 ../../include/contact_widgets.php:35 -msgid "Friend Suggestions" +#: ../../mod/community.php:30 ../../include/nav.php:97 +msgid "Community" msgstr "" -#: ../../mod/suggest.php:42 +#: ../../mod/community.php:87 msgid "" -"No suggestions. This works best when you have more than one contact/friend." -msgstr "" - -#: ../../mod/suggest.php:55 -msgid "Ignore/Hide" -msgstr "" - -#: ../../mod/directory.php:49 -msgid "Global Directory" -msgstr "" - -#: ../../mod/directory.php:55 -msgid "Normal site view" -msgstr "" - -#: ../../mod/directory.php:57 -msgid "Admin - View all site entries" -msgstr "" - -#: ../../mod/directory.php:63 -msgid "Find on this site" -msgstr "" - -#: ../../mod/directory.php:66 -msgid "Site Directory" -msgstr "" - -#: ../../mod/directory.php:125 -msgid "Gender: " +"Shared content is covered by the <a href=\"http://creativecommons.org/" +"licenses/by/3.0/\">Creative Commons Attribution 3.0</a> license." msgstr "" -#: ../../mod/directory.php:151 -msgid "No entries (some entries may be hidden)." +#: ../../addon/tumblr/tumblr.php:35 +msgid "Post to Tumblr" msgstr "" -#: ../../mod/invite.php:35 -#, php-format -msgid "%s : Not a valid email address." +#: ../../addon/tumblr/tumblr.php:66 +msgid "Tumblr Post Settings" msgstr "" -#: ../../mod/invite.php:59 -#, php-format -msgid "Please join my network on %s" +#: ../../addon/tumblr/tumblr.php:68 +msgid "Enable Tumblr Post Plugin" msgstr "" -#: ../../mod/invite.php:69 -#, php-format -msgid "%s : Message delivery failed." +#: ../../addon/tumblr/tumblr.php:73 +msgid "Tumblr login" 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" +#: ../../addon/tumblr/tumblr.php:78 +msgid "Tumblr password" msgstr "" -#: ../../mod/invite.php:99 -msgid "Send invitations" +#: ../../addon/tumblr/tumblr.php:83 +msgid "Post to Tumblr by default" msgstr "" -#: ../../mod/invite.php:100 -msgid "Enter email addresses, one per line:" +#: ../../addon/tumblr/tumblr.php:174 ../../addon/posterous/posterous.php:172 +#: ../../addon/wppost/wppost.php:171 +msgid "Post from Friendica" msgstr "" -#: ../../mod/invite.php:102 -#, php-format -msgid "Please join my social network on %s" +#: ../../addon/twitter/twitter.php:78 +msgid "Post to Twitter" msgstr "" -#: ../../mod/invite.php:103 -msgid "To accept this invitation, please visit:" +#: ../../addon/twitter/twitter.php:123 +msgid "Twitter settings updated." msgstr "" -#: ../../mod/invite.php:104 -msgid "You will need to supply this invitation code: $invite_code" +#: ../../addon/twitter/twitter.php:145 +msgid "Twitter Posting Settings" msgstr "" -#: ../../mod/invite.php:104 +#: ../../addon/twitter/twitter.php:152 msgid "" -"Once you have registered, please connect with me via my profile page at:" -msgstr "" - -#: ../../mod/dfrn_confirm.php:234 -msgid "Response from remote site was not understood." -msgstr "" - -#: ../../mod/dfrn_confirm.php:243 -msgid "Unexpected response from remote site: " -msgstr "" - -#: ../../mod/dfrn_confirm.php:251 -msgid "Confirmation completed successfully." -msgstr "" - -#: ../../mod/dfrn_confirm.php:253 ../../mod/dfrn_confirm.php:267 -#: ../../mod/dfrn_confirm.php:274 -msgid "Remote site reported: " -msgstr "" - -#: ../../mod/dfrn_confirm.php:265 -msgid "Temporary failure. Please wait and try again." -msgstr "" - -#: ../../mod/dfrn_confirm.php:272 -msgid "Introduction failed or was revoked." -msgstr "" - -#: ../../mod/dfrn_confirm.php:409 -msgid "Unable to set contact photo." -msgstr "" - -#: ../../mod/dfrn_confirm.php:459 ../../include/diaspora.php:479 -#: ../../include/conversation.php:79 -#, php-format -msgid "%1$s is now friends with %2$s" -msgstr "" - -#: ../../mod/dfrn_confirm.php:530 -#, php-format -msgid "No user record found for '%s' " +"No consumer key pair for Twitter found. Please contact your site " +"administrator." msgstr "" -#: ../../mod/dfrn_confirm.php:540 -msgid "Our site encryption key is apparently messed up." +#: ../../addon/twitter/twitter.php:171 +msgid "" +"At this Friendika 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." msgstr "" -#: ../../mod/dfrn_confirm.php:551 -msgid "Empty site URL was provided or URL could not be decrypted by us." +#: ../../addon/twitter/twitter.php:172 +msgid "Log in with Twitter" msgstr "" -#: ../../mod/dfrn_confirm.php:572 -msgid "Contact record was not found for you on our site." +#: ../../addon/twitter/twitter.php:174 +msgid "Copy the PIN from Twitter here" msgstr "" -#: ../../mod/dfrn_confirm.php:586 -#, php-format -msgid "Site public key not available in contact record for URL %s." +#: ../../addon/twitter/twitter.php:188 ../../addon/statusnet/statusnet.php:337 +msgid "Currently connected to: " msgstr "" -#: ../../mod/dfrn_confirm.php:606 +#: ../../addon/twitter/twitter.php:189 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:617 -msgid "Unable to set your contact credentials on our system." -msgstr "" - -#: ../../mod/dfrn_confirm.php:671 -msgid "Unable to update your contact profile details on our system" -msgstr "" - -#: ../../mod/dfrn_confirm.php:701 -#, php-format -msgid "Connection accepted at %s" +"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." msgstr "" -#: ../../addon/facebook/facebook.php:337 -msgid "Facebook disabled" +#: ../../addon/twitter/twitter.php:191 +msgid "Allow posting to Twitter" msgstr "" -#: ../../addon/facebook/facebook.php:342 -msgid "Updating contacts" +#: ../../addon/twitter/twitter.php:194 +msgid "Send public postings to Twitter by default" msgstr "" -#: ../../addon/facebook/facebook.php:351 -msgid "Facebook API key is missing." +#: ../../addon/twitter/twitter.php:199 ../../addon/statusnet/statusnet.php:348 +msgid "Clear OAuth configuration" msgstr "" -#: ../../addon/facebook/facebook.php:358 -msgid "Facebook Connect" +#: ../../addon/twitter/twitter.php:301 +msgid "Consumer key" msgstr "" -#: ../../addon/facebook/facebook.php:364 -msgid "Install Facebook connector for this account." +#: ../../addon/twitter/twitter.php:302 +msgid "Consumer secret" msgstr "" -#: ../../addon/facebook/facebook.php:371 -msgid "Remove Facebook connector" +#: ../../addon/statusnet/statusnet.php:141 +msgid "Post to StatusNet" msgstr "" -#: ../../addon/facebook/facebook.php:376 +#: ../../addon/statusnet/statusnet.php:183 msgid "" -"Re-authenticate [This is necessary whenever your Facebook password is " -"changed.]" -msgstr "" - -#: ../../addon/facebook/facebook.php:383 -msgid "Post to Facebook by default" +"Please contact your site administrator.<br />The provided API URL is not " +"valid." msgstr "" -#: ../../addon/facebook/facebook.php:387 -msgid "Link all your Facebook friends and conversations on this website" +#: ../../addon/statusnet/statusnet.php:211 +msgid "We could not contact the StatusNet API with the Path you entered." msgstr "" -#: ../../addon/facebook/facebook.php:389 -msgid "" -"Facebook conversations consist of your <em>profile wall</em> and your friend " -"<em>stream</em>." +#: ../../addon/statusnet/statusnet.php:238 +msgid "StatusNet settings updated." msgstr "" -#: ../../addon/facebook/facebook.php:390 -msgid "On this website, your Facebook friend stream is only visible to you." +#: ../../addon/statusnet/statusnet.php:261 +msgid "StatusNet Posting Settings" msgstr "" -#: ../../addon/facebook/facebook.php:391 -msgid "" -"The following settings determine the privacy of your Facebook profile wall " -"on this website." +#: ../../addon/statusnet/statusnet.php:275 +msgid "Globally Available StatusNet OAuthKeys" msgstr "" -#: ../../addon/facebook/facebook.php:395 +#: ../../addon/statusnet/statusnet.php:276 msgid "" -"On this website your Facebook profile wall conversations will only be " -"visible to you" +"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)." msgstr "" -#: ../../addon/facebook/facebook.php:400 -msgid "Do not import your Facebook profile wall conversations" +#: ../../addon/statusnet/statusnet.php:284 +msgid "Provide your own OAuth Credentials" msgstr "" -#: ../../addon/facebook/facebook.php:402 +#: ../../addon/statusnet/statusnet.php:285 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." +"No consumer key pair for StatusNet found. Register your Friendika 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 Friendika " +"installation at your favorited StatusNet installation." msgstr "" -#: ../../addon/facebook/facebook.php:469 -#: ../../include/contact_selectors.php:78 -msgid "Facebook" +#: ../../addon/statusnet/statusnet.php:287 +msgid "OAuth Consumer Key" msgstr "" -#: ../../addon/facebook/facebook.php:470 -msgid "Facebook Connector Settings" +#: ../../addon/statusnet/statusnet.php:290 +msgid "OAuth Consumer Secret" msgstr "" -#: ../../addon/facebook/facebook.php:484 -msgid "Post to Facebook" +#: ../../addon/statusnet/statusnet.php:293 +msgid "Base API Path (remember the trailing /)" msgstr "" -#: ../../addon/facebook/facebook.php:561 +#: ../../addon/statusnet/statusnet.php:314 msgid "" -"Post to Facebook cancelled because of multi-network access permission " -"conflict." -msgstr "" - -#: ../../addon/facebook/facebook.php:624 -msgid "Image: " -msgstr "" - -#: ../../addon/facebook/facebook.php:700 -msgid "View on Friendika" -msgstr "" - -#: ../../addon/facebook/facebook.php:724 -msgid "Facebook post failed. Queued for retry." -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 -#, php-format -msgid "%d person doesn't like this" -msgid_plural "%d people don't like this" -msgstr[0] "" -msgstr[1] "" - -#: ../../addon/widgets/widgets.php:55 -msgid "Generate new key" -msgstr "" - -#: ../../addon/widgets/widgets.php:58 -msgid "Widgets key" -msgstr "" - -#: ../../addon/widgets/widgets.php:60 -msgid "Widgets available" -msgstr "" - -#: ../../addon/widgets/widget_friends.php:40 -msgid "Connect on Friendika!" +"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." msgstr "" -#: ../../addon/nsfw/nsfw.php:47 -msgid "\"Not Safe For Work\" Settings" +#: ../../addon/statusnet/statusnet.php:315 +msgid "Log in with StatusNet" msgstr "" -#: ../../addon/nsfw/nsfw.php:49 -msgid "Comma separated words to treat as NSFW" +#: ../../addon/statusnet/statusnet.php:317 +msgid "Copy the security code from StatusNet here" msgstr "" -#: ../../addon/nsfw/nsfw.php:66 -msgid "NSFW Settings saved." +#: ../../addon/statusnet/statusnet.php:323 +msgid "Cancel Connection Process" msgstr "" -#: ../../addon/nsfw/nsfw.php:102 -#, php-format -msgid "%s - Click to open/close" +#: ../../addon/statusnet/statusnet.php:325 +msgid "Current StatusNet API is" msgstr "" -#: ../../addon/communityhome/communityhome.php:28 -#: ../../addon/communityhome/communityhome.php:34 ../../include/nav.php:62 -#: ../../boot.php:682 -msgid "Login" +#: ../../addon/statusnet/statusnet.php:326 +msgid "Cancel StatusNet Connection" msgstr "" -#: ../../addon/communityhome/communityhome.php:29 -msgid "OpenID" +#: ../../addon/statusnet/statusnet.php:338 +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." msgstr "" -#: ../../addon/communityhome/communityhome.php:38 -msgid "Last users" +#: ../../addon/statusnet/statusnet.php:340 +msgid "Allow posting to StatusNet" msgstr "" -#: ../../addon/communityhome/communityhome.php:81 -msgid "Most active users" +#: ../../addon/statusnet/statusnet.php:343 +msgid "Send public postings to StatusNet by default" msgstr "" -#: ../../addon/communityhome/communityhome.php:98 -msgid "Last photos" +#: ../../addon/statusnet/statusnet.php:478 +msgid "API URL" msgstr "" -#: ../../addon/communityhome/communityhome.php:133 -msgid "Last likes" +#: ../../addon/oembed/oembed.php:30 +msgid "OEmbed settings updated" msgstr "" -#: ../../addon/communityhome/communityhome.php:155 -#: ../../include/conversation.php:23 ../../include/conversation.php:96 -msgid "event" +#: ../../addon/oembed/oembed.php:43 +msgid "Use OEmbed for YouTube videos" msgstr "" -#: ../../addon/membersince/membersince.php:17 -#, php-format -msgid " - Member since: %s" +#: ../../addon/oembed/oembed.php:71 +msgid "URL to embed:" msgstr "" #: ../../addon/tictac/tictac.php:20 @@ -3687,40 +3873,15 @@ msgstr "" msgid "I won!" msgstr "" -#: ../../addon/randplace/randplace.php:170 -msgid "Randplace Settings" -msgstr "" - -#: ../../addon/randplace/randplace.php:172 -msgid "Enable Randplace Plugin" -msgstr "" - -#: ../../addon/js_upload/js_upload.php:43 -msgid "Upload a file" -msgstr "" - -#: ../../addon/js_upload/js_upload.php:44 -msgid "Drop files here to upload" -msgstr "" - -#: ../../addon/js_upload/js_upload.php:46 -msgid "Failed" -msgstr "" - -#: ../../addon/js_upload/js_upload.php:294 -msgid "No files were uploaded." -msgstr "" - -#: ../../addon/js_upload/js_upload.php:300 -msgid "Uploaded file is empty" -msgstr "" - -#: ../../addon/js_upload/js_upload.php:323 -msgid "File has an invalid extension, it should be one of " +#: ../../addon/uhremotestorage/uhremotestorage.php:56 +#, php-format +msgid "" +"Allow to use your friendika id (%s) to connecto to external unhosted-enabled " +"storage (like ownCloud)" msgstr "" -#: ../../addon/js_upload/js_upload.php:334 -msgid "Upload was cancelled, or server error encountered" +#: ../../addon/uhremotestorage/uhremotestorage.php:57 +msgid "Unhosted DAV storage url" msgstr "" #: ../../addon/impressum/impressum.php:25 @@ -3758,371 +3919,326 @@ msgstr "" msgid "Notes" msgstr "" -#: ../../addon/buglink/buglink.php:15 -msgid "Report Bug" -msgstr "" - -#: ../../addon/oembed/oembed.php:30 -msgid "OEmbed settings updated" +#: ../../addon/facebook/facebook.php:339 +msgid "Facebook disabled" msgstr "" -#: ../../addon/oembed/oembed.php:43 -msgid "Use OEmbed for YouTube videos" +#: ../../addon/facebook/facebook.php:344 +msgid "Updating contacts" msgstr "" -#: ../../addon/oembed/oembed.php:71 -msgid "URL to embed:" +#: ../../addon/facebook/facebook.php:353 +msgid "Facebook API key is missing." msgstr "" -#: ../../addon/statusnet/statusnet.php:141 -msgid "Post to StatusNet" +#: ../../addon/facebook/facebook.php:360 +msgid "Facebook Connect" msgstr "" -#: ../../addon/statusnet/statusnet.php:183 -msgid "" -"Please contact your site administrator.<br />The provided API URL is not " -"valid." +#: ../../addon/facebook/facebook.php:366 +msgid "Install Facebook connector for this account." msgstr "" -#: ../../addon/statusnet/statusnet.php:211 -msgid "We could not contact the StatusNet API with the Path you entered." +#: ../../addon/facebook/facebook.php:373 +msgid "Remove Facebook connector" msgstr "" -#: ../../addon/statusnet/statusnet.php:238 -msgid "StatusNet settings updated." +#: ../../addon/facebook/facebook.php:378 +msgid "" +"Re-authenticate [This is necessary whenever your Facebook password is " +"changed.]" msgstr "" -#: ../../addon/statusnet/statusnet.php:261 -msgid "StatusNet Posting Settings" +#: ../../addon/facebook/facebook.php:385 +msgid "Post to Facebook by default" msgstr "" -#: ../../addon/statusnet/statusnet.php:275 -msgid "Globally Available StatusNet OAuthKeys" +#: ../../addon/facebook/facebook.php:389 +msgid "Link all your Facebook friends and conversations on this website" msgstr "" -#: ../../addon/statusnet/statusnet.php:276 +#: ../../addon/facebook/facebook.php:391 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)." +"Facebook conversations consist of your <em>profile wall</em> and your friend " +"<em>stream</em>." msgstr "" -#: ../../addon/statusnet/statusnet.php:284 -msgid "Provide your own OAuth Credentials" +#: ../../addon/facebook/facebook.php:392 +msgid "On this website, your Facebook friend stream is only visible to you." msgstr "" -#: ../../addon/statusnet/statusnet.php:285 +#: ../../addon/facebook/facebook.php:393 msgid "" -"No consumer key pair for StatusNet found. Register your Friendika 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 Friendika " -"installation at your favorited StatusNet installation." -msgstr "" - -#: ../../addon/statusnet/statusnet.php:287 -msgid "OAuth Consumer Key" -msgstr "" - -#: ../../addon/statusnet/statusnet.php:290 -msgid "OAuth Consumer Secret" -msgstr "" - -#: ../../addon/statusnet/statusnet.php:293 -msgid "Base API Path (remember the trailing /)" +"The following settings determine the privacy of your Facebook profile wall " +"on this website." msgstr "" -#: ../../addon/statusnet/statusnet.php:314 +#: ../../addon/facebook/facebook.php:397 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." -msgstr "" - -#: ../../addon/statusnet/statusnet.php:315 -msgid "Log in with StatusNet" -msgstr "" - -#: ../../addon/statusnet/statusnet.php:317 -msgid "Copy the security code from StatusNet here" -msgstr "" - -#: ../../addon/statusnet/statusnet.php:323 -msgid "Cancel Connection Process" -msgstr "" - -#: ../../addon/statusnet/statusnet.php:325 -msgid "Current StatusNet API is" -msgstr "" - -#: ../../addon/statusnet/statusnet.php:326 -msgid "Cancel StatusNet Connection" +"On this website your Facebook profile wall conversations will only be " +"visible to you" msgstr "" -#: ../../addon/statusnet/statusnet.php:337 ../../addon/twitter/twitter.php:188 -msgid "Currently connected to: " +#: ../../addon/facebook/facebook.php:402 +msgid "Do not import your Facebook profile wall conversations" msgstr "" -#: ../../addon/statusnet/statusnet.php:338 +#: ../../addon/facebook/facebook.php:404 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." +"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/statusnet/statusnet.php:340 -msgid "Allow posting to StatusNet" +#: ../../addon/facebook/facebook.php:409 +msgid "Comma separated applications to ignore" msgstr "" -#: ../../addon/statusnet/statusnet.php:343 -msgid "Send public postings to StatusNet by default" +#: ../../addon/facebook/facebook.php:477 +#: ../../include/contact_selectors.php:78 +msgid "Facebook" msgstr "" -#: ../../addon/statusnet/statusnet.php:348 ../../addon/twitter/twitter.php:199 -msgid "Clear OAuth configuration" +#: ../../addon/facebook/facebook.php:478 +msgid "Facebook Connector Settings" msgstr "" -#: ../../addon/statusnet/statusnet.php:478 -msgid "API URL" +#: ../../addon/facebook/facebook.php:492 +msgid "Post to Facebook" msgstr "" -#: ../../addon/tumblr/tumblr.php:35 -msgid "Post to Tumblr" +#: ../../addon/facebook/facebook.php:569 +msgid "" +"Post to Facebook cancelled because of multi-network access permission " +"conflict." msgstr "" -#: ../../addon/tumblr/tumblr.php:66 -msgid "Tumblr Post Settings" +#: ../../addon/facebook/facebook.php:632 +msgid "Image: " msgstr "" -#: ../../addon/tumblr/tumblr.php:68 -msgid "Enable Tumblr Post Plugin" +#: ../../addon/facebook/facebook.php:708 +msgid "View on Friendika" msgstr "" -#: ../../addon/tumblr/tumblr.php:73 -msgid "Tumblr login" +#: ../../addon/facebook/facebook.php:732 +msgid "Facebook post failed. Queued for retry." msgstr "" -#: ../../addon/tumblr/tumblr.php:78 -msgid "Tumblr password" +#: ../../addon/facebook/facebook.php:965 +msgid "link" msgstr "" -#: ../../addon/tumblr/tumblr.php:83 -msgid "Post to Tumblr by default" +#: ../../addon/widgets/widgets.php:55 +msgid "Generate new key" msgstr "" -#: ../../addon/tumblr/tumblr.php:174 ../../addon/wppost/wppost.php:171 -#: ../../addon/posterous/posterous.php:172 -msgid "Post from Friendica" +#: ../../addon/widgets/widgets.php:58 +msgid "Widgets key" msgstr "" -#: ../../addon/wppost/wppost.php:41 -msgid "Post to Wordpress" +#: ../../addon/widgets/widgets.php:60 +msgid "Widgets available" msgstr "" -#: ../../addon/wppost/wppost.php:73 -msgid "WordPress Post Settings" +#: ../../addon/widgets/widget_friends.php:40 +msgid "Connect on Friendika!" msgstr "" -#: ../../addon/wppost/wppost.php:75 -msgid "Enable WordPress Post Plugin" -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/wppost/wppost.php:80 -msgid "WordPress username" -msgstr "" +#: ../../addon/widgets/widget_like.php:61 +#, php-format +msgid "%d person doesn't like this" +msgid_plural "%d people don't like this" +msgstr[0] "" +msgstr[1] "" -#: ../../addon/wppost/wppost.php:85 -msgid "WordPress password" +#: ../../addon/buglink/buglink.php:15 +msgid "Report Bug" msgstr "" -#: ../../addon/wppost/wppost.php:90 -msgid "WordPress API URL" +#: ../../addon/nsfw/nsfw.php:47 +msgid "\"Not Safe For Work\" Settings" msgstr "" -#: ../../addon/wppost/wppost.php:95 -msgid "Post to WordPress by default" +#: ../../addon/nsfw/nsfw.php:49 +msgid "Comma separated words to treat as NSFW" msgstr "" -#: ../../addon/piwik/piwik.php:70 -msgid "" -"This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> " -"analytics tool." +#: ../../addon/nsfw/nsfw.php:66 +msgid "NSFW Settings saved." msgstr "" -#: ../../addon/piwik/piwik.php:73 +#: ../../addon/nsfw/nsfw.php:102 #, 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)." -msgstr "" - -#: ../../addon/piwik/piwik.php:82 -msgid "Piwik Base URL" +msgid "%s - Click to open/close" msgstr "" -#: ../../addon/piwik/piwik.php:83 -msgid "Site ID" +#: ../../addon/communityhome/communityhome.php:29 +msgid "OpenID" msgstr "" -#: ../../addon/piwik/piwik.php:84 -msgid "Show opt-out cookie link?" +#: ../../addon/communityhome/communityhome.php:38 +msgid "Last users" msgstr "" -#: ../../addon/twitter/twitter.php:78 -msgid "Post to Twitter" +#: ../../addon/communityhome/communityhome.php:81 +msgid "Most active users" msgstr "" -#: ../../addon/twitter/twitter.php:123 -msgid "Twitter settings updated." +#: ../../addon/communityhome/communityhome.php:98 +msgid "Last photos" msgstr "" -#: ../../addon/twitter/twitter.php:145 -msgid "Twitter Posting Settings" +#: ../../addon/communityhome/communityhome.php:133 +msgid "Last likes" msgstr "" -#: ../../addon/twitter/twitter.php:152 -msgid "" -"No consumer key pair for Twitter found. Please contact your site " -"administrator." +#: ../../addon/communityhome/communityhome.php:155 +#: ../../include/conversation.php:23 ../../include/conversation.php:96 +msgid "event" msgstr "" -#: ../../addon/twitter/twitter.php:171 -msgid "" -"At this Friendika 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." +#: ../../addon/membersince/membersince.php:17 +#, php-format +msgid " - Member since: %s" msgstr "" -#: ../../addon/twitter/twitter.php:172 -msgid "Log in with Twitter" +#: ../../addon/posterous/posterous.php:35 +msgid "Post to Posterous" msgstr "" -#: ../../addon/twitter/twitter.php:174 -msgid "Copy the PIN from Twitter here" +#: ../../addon/posterous/posterous.php:66 +msgid "Posterous Post Settings" msgstr "" -#: ../../addon/twitter/twitter.php:189 -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." +#: ../../addon/posterous/posterous.php:68 +msgid "Enable Posterous Post Plugin" msgstr "" -#: ../../addon/twitter/twitter.php:191 -msgid "Allow posting to Twitter" +#: ../../addon/posterous/posterous.php:73 +msgid "Posterous login" msgstr "" -#: ../../addon/twitter/twitter.php:194 -msgid "Send public postings to Twitter by default" +#: ../../addon/posterous/posterous.php:78 +msgid "Posterous password" msgstr "" -#: ../../addon/twitter/twitter.php:301 -msgid "Consumer key" +#: ../../addon/posterous/posterous.php:83 +msgid "Post to Posterous by default" msgstr "" -#: ../../addon/twitter/twitter.php:302 -msgid "Consumer secret" +#: ../../addon/randplace/randplace.php:170 +msgid "Randplace Settings" msgstr "" -#: ../../addon/posterous/posterous.php:35 -msgid "Post to Posterous" +#: ../../addon/randplace/randplace.php:172 +msgid "Enable Randplace Plugin" msgstr "" -#: ../../addon/posterous/posterous.php:66 -msgid "Posterous Post Settings" +#: ../../addon/jabberchat/jabberchat.php:81 +msgid "Chat Settings" msgstr "" -#: ../../addon/posterous/posterous.php:68 -msgid "Enable Posterous Post Plugin" +#: ../../addon/jabberchat/jabberchat.php:89 +msgid "JabberID" msgstr "" -#: ../../addon/posterous/posterous.php:73 -msgid "Posterous login" +#: ../../addon/jabberchat/jabberchat.php:90 +msgid "Password" msgstr "" -#: ../../addon/posterous/posterous.php:78 -msgid "Posterous password" +#: ../../addon/piwik/piwik.php:70 +msgid "" +"This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> " +"analytics tool." msgstr "" -#: ../../addon/posterous/posterous.php:83 -msgid "Post to Posterous by default" +#: ../../addon/piwik/piwik.php:73 +#, 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)." msgstr "" -#: ../../include/profile_advanced.php:17 ../../boot.php:944 -msgid "Gender:" +#: ../../addon/piwik/piwik.php:82 +msgid "Piwik Base URL" msgstr "" -#: ../../include/profile_advanced.php:22 -msgid "j F, Y" +#: ../../addon/piwik/piwik.php:83 +msgid "Site ID" msgstr "" -#: ../../include/profile_advanced.php:23 -msgid "j F" +#: ../../addon/piwik/piwik.php:84 +msgid "Show opt-out cookie link?" msgstr "" -#: ../../include/profile_advanced.php:30 ../../include/datetime.php:421 -#: ../../include/items.php:1280 -msgid "Birthday:" +#: ../../addon/js_upload/js_upload.php:43 +msgid "Upload a file" msgstr "" -#: ../../include/profile_advanced.php:34 -msgid "Age:" +#: ../../addon/js_upload/js_upload.php:44 +msgid "Drop files here to upload" msgstr "" -#: ../../include/profile_advanced.php:37 ../../boot.php:947 -msgid "Status:" +#: ../../addon/js_upload/js_upload.php:46 +msgid "Failed" msgstr "" -#: ../../include/profile_advanced.php:45 ../../boot.php:949 -msgid "Homepage:" +#: ../../addon/js_upload/js_upload.php:294 +msgid "No files were uploaded." msgstr "" -#: ../../include/profile_advanced.php:49 -msgid "Religion:" +#: ../../addon/js_upload/js_upload.php:300 +msgid "Uploaded file is empty" msgstr "" -#: ../../include/profile_advanced.php:51 -msgid "About:" +#: ../../addon/js_upload/js_upload.php:323 +msgid "File has an invalid extension, it should be one of " msgstr "" -#: ../../include/profile_advanced.php:53 -msgid "Hobbies/Interests:" +#: ../../addon/js_upload/js_upload.php:334 +msgid "Upload was cancelled, or server error encountered" msgstr "" -#: ../../include/profile_advanced.php:55 -msgid "Contact information and Social Networks:" +#: ../../addon/wppost/wppost.php:41 +msgid "Post to Wordpress" msgstr "" -#: ../../include/profile_advanced.php:57 -msgid "Musical interests:" +#: ../../addon/wppost/wppost.php:73 +msgid "WordPress Post Settings" msgstr "" -#: ../../include/profile_advanced.php:59 -msgid "Books, literature:" +#: ../../addon/wppost/wppost.php:75 +msgid "Enable WordPress Post Plugin" msgstr "" -#: ../../include/profile_advanced.php:61 -msgid "Television:" +#: ../../addon/wppost/wppost.php:80 +msgid "WordPress username" msgstr "" -#: ../../include/profile_advanced.php:63 -msgid "Film/dance/culture/entertainment:" +#: ../../addon/wppost/wppost.php:85 +msgid "WordPress password" msgstr "" -#: ../../include/profile_advanced.php:65 -msgid "Love/Romance:" +#: ../../addon/wppost/wppost.php:90 +msgid "WordPress API URL" msgstr "" -#: ../../include/profile_advanced.php:67 -msgid "Work/employment:" +#: ../../addon/wppost/wppost.php:95 +msgid "Post to WordPress by default" msgstr "" -#: ../../include/profile_advanced.php:69 -msgid "School/education:" +#: ../../include/notifier.php:628 ../../include/delivery.php:415 +msgid "(no subject)" msgstr "" #: ../../include/contact_selectors.php:32 @@ -4397,16 +4513,191 @@ msgstr "" msgid "Ask me" msgstr "" -#: ../../include/event.php:17 ../../include/bb2diaspora.php:233 +#: ../../include/event.php:17 ../../include/bb2diaspora.php:235 msgid "Starts:" msgstr "" -#: ../../include/event.php:27 ../../include/bb2diaspora.php:241 +#: ../../include/event.php:27 ../../include/bb2diaspora.php:243 msgid "Finishes:" msgstr "" -#: ../../include/delivery.php:415 ../../include/notifier.php:628 -msgid "(no subject)" +#: ../../include/acl_selectors.php:279 +msgid "Visible to everybody" +msgstr "" + +#: ../../include/acl_selectors.php:280 +msgid "show" +msgstr "" + +#: ../../include/acl_selectors.php:281 +msgid "don't show" +msgstr "" + +#: ../../include/auth.php:27 +msgid "Logged out." +msgstr "" + +#: ../../include/bbcode.php:165 ../../include/bbcode.php:228 +msgid "Image/photo" +msgstr "" + +#: ../../include/poller.php:459 +msgid "From: " +msgstr "" + +#: ../../include/Contact.php:125 ../../include/conversation.php:718 +msgid "View status" +msgstr "" + +#: ../../include/Contact.php:126 ../../include/conversation.php:719 +msgid "View profile" +msgstr "" + +#: ../../include/Contact.php:127 ../../include/conversation.php:720 +msgid "View photos" +msgstr "" + +#: ../../include/Contact.php:128 ../../include/Contact.php:141 +#: ../../include/conversation.php:721 +msgid "View recent" +msgstr "" + +#: ../../include/Contact.php:130 ../../include/Contact.php:141 +#: ../../include/conversation.php:723 +msgid "Send PM" +msgstr "" + +#: ../../include/datetime.php:44 ../../include/datetime.php:46 +msgid "Miscellaneous" +msgstr "" + +#: ../../include/datetime.php:105 ../../include/datetime.php:237 +msgid "year" +msgstr "" + +#: ../../include/datetime.php:110 ../../include/datetime.php:238 +msgid "month" +msgstr "" + +#: ../../include/datetime.php:115 ../../include/datetime.php:240 +msgid "day" +msgstr "" + +#: ../../include/datetime.php:228 +msgid "never" +msgstr "" + +#: ../../include/datetime.php:234 +msgid "less than a second ago" +msgstr "" + +#: ../../include/datetime.php:237 +msgid "years" +msgstr "" + +#: ../../include/datetime.php:238 +msgid "months" +msgstr "" + +#: ../../include/datetime.php:239 +msgid "week" +msgstr "" + +#: ../../include/datetime.php:239 +msgid "weeks" +msgstr "" + +#: ../../include/datetime.php:240 +msgid "days" +msgstr "" + +#: ../../include/datetime.php:241 +msgid "hour" +msgstr "" + +#: ../../include/datetime.php:241 +msgid "hours" +msgstr "" + +#: ../../include/datetime.php:242 +msgid "minute" +msgstr "" + +#: ../../include/datetime.php:242 +msgid "minutes" +msgstr "" + +#: ../../include/datetime.php:243 +msgid "second" +msgstr "" + +#: ../../include/datetime.php:243 +msgid "seconds" +msgstr "" + +#: ../../include/datetime.php:250 +msgid " ago" +msgstr "" + +#: ../../include/datetime.php:421 ../../include/profile_advanced.php:30 +#: ../../include/items.php:1280 +msgid "Birthday:" +msgstr "" + +#: ../../include/profile_advanced.php:22 +msgid "j F, Y" +msgstr "" + +#: ../../include/profile_advanced.php:23 +msgid "j F" +msgstr "" + +#: ../../include/profile_advanced.php:34 +msgid "Age:" +msgstr "" + +#: ../../include/profile_advanced.php:49 +msgid "Religion:" +msgstr "" + +#: ../../include/profile_advanced.php:51 +msgid "About:" +msgstr "" + +#: ../../include/profile_advanced.php:53 +msgid "Hobbies/Interests:" +msgstr "" + +#: ../../include/profile_advanced.php:55 +msgid "Contact information and Social Networks:" +msgstr "" + +#: ../../include/profile_advanced.php:57 +msgid "Musical interests:" +msgstr "" + +#: ../../include/profile_advanced.php:59 +msgid "Books, literature:" +msgstr "" + +#: ../../include/profile_advanced.php:61 +msgid "Television:" +msgstr "" + +#: ../../include/profile_advanced.php:63 +msgid "Film/dance/culture/entertainment:" +msgstr "" + +#: ../../include/profile_advanced.php:65 +msgid "Love/Romance:" +msgstr "" + +#: ../../include/profile_advanced.php:67 +msgid "Work/employment:" +msgstr "" + +#: ../../include/profile_advanced.php:69 +msgid "School/education:" msgstr "" #: ../../include/text.php:232 @@ -4425,165 +4716,113 @@ msgstr "" msgid "next" msgstr "" -#: ../../include/text.php:546 +#: ../../include/text.php:549 msgid "No contacts" msgstr "" -#: ../../include/text.php:555 +#: ../../include/text.php:558 #, php-format msgid "%d Contact" msgid_plural "%d Contacts" msgstr[0] "" msgstr[1] "" -#: ../../include/text.php:626 ../../include/nav.php:87 +#: ../../include/text.php:629 ../../include/nav.php:87 msgid "Search" msgstr "" -#: ../../include/text.php:709 +#: ../../include/text.php:713 msgid "Monday" msgstr "" -#: ../../include/text.php:709 +#: ../../include/text.php:713 msgid "Tuesday" msgstr "" -#: ../../include/text.php:709 +#: ../../include/text.php:713 msgid "Wednesday" msgstr "" -#: ../../include/text.php:709 +#: ../../include/text.php:713 msgid "Thursday" msgstr "" -#: ../../include/text.php:709 +#: ../../include/text.php:713 msgid "Friday" msgstr "" -#: ../../include/text.php:709 +#: ../../include/text.php:713 msgid "Saturday" msgstr "" -#: ../../include/text.php:709 +#: ../../include/text.php:713 msgid "Sunday" msgstr "" -#: ../../include/text.php:713 +#: ../../include/text.php:717 msgid "January" msgstr "" -#: ../../include/text.php:713 +#: ../../include/text.php:717 msgid "February" msgstr "" -#: ../../include/text.php:713 +#: ../../include/text.php:717 msgid "March" msgstr "" -#: ../../include/text.php:713 +#: ../../include/text.php:717 msgid "April" msgstr "" -#: ../../include/text.php:713 +#: ../../include/text.php:717 msgid "May" msgstr "" -#: ../../include/text.php:713 +#: ../../include/text.php:717 msgid "June" msgstr "" -#: ../../include/text.php:713 +#: ../../include/text.php:717 msgid "July" msgstr "" -#: ../../include/text.php:713 +#: ../../include/text.php:717 msgid "August" msgstr "" -#: ../../include/text.php:713 +#: ../../include/text.php:717 msgid "September" msgstr "" -#: ../../include/text.php:713 +#: ../../include/text.php:717 msgid "October" msgstr "" -#: ../../include/text.php:713 +#: ../../include/text.php:717 msgid "November" msgstr "" -#: ../../include/text.php:713 +#: ../../include/text.php:717 msgid "December" msgstr "" -#: ../../include/text.php:783 +#: ../../include/text.php:787 msgid "bytes" msgstr "" -#: ../../include/text.php:875 +#: ../../include/text.php:879 msgid "Select an alternate language" msgstr "" -#: ../../include/text.php:887 +#: ../../include/text.php:891 msgid "default" msgstr "" -#: ../../include/diaspora.php:546 -msgid "Sharing notification from Diaspora network" -msgstr "" - -#: ../../include/diaspora.php:1529 -msgid "Attachments:" -msgstr "" - -#: ../../include/diaspora.php:1712 -#, php-format -msgid "[Relayed] Comment authored by %s from network %s" -msgstr "" - -#: ../../include/oembed.php:128 -msgid "Embedded content" -msgstr "" - -#: ../../include/oembed.php:137 -msgid "Embedding disabled" -msgstr "" - -#: ../../include/group.php:25 -msgid "" -"A deleted group with this name was revived. Existing item permissions " -"<strong>may</strong> apply to this group and any future members. If this is " -"not what you intended, please create another group with a different name." -msgstr "" - -#: ../../include/group.php:168 -msgid "Everybody" -msgstr "" - -#: ../../include/group.php:190 -msgid "edit" -msgstr "" - -#: ../../include/group.php:211 -msgid "Groups" -msgstr "" - -#: ../../include/group.php:212 -msgid "Create a new group" -msgstr "" - -#: ../../include/nav.php:44 ../../boot.php:681 -msgid "Logout" -msgstr "" - #: ../../include/nav.php:44 msgid "End this session" msgstr "" -#: ../../include/nav.php:47 ../../boot.php:1284 -msgid "Status" -msgstr "" - #: ../../include/nav.php:47 ../../include/nav.php:111 msgid "Your posts and conversations" msgstr "" @@ -4592,10 +4831,6 @@ msgstr "" msgid "Your profile page" msgstr "" -#: ../../include/nav.php:49 ../../boot.php:1294 -msgid "Photos" -msgstr "" - #: ../../include/nav.php:49 msgid "Your photos" msgstr "" @@ -4672,14 +4907,6 @@ msgstr "" msgid "Manage other pages" msgstr "" -#: ../../include/nav.php:129 ../../boot.php:902 -msgid "Profiles" -msgstr "" - -#: ../../include/nav.php:129 ../../boot.php:902 -msgid "Manage/edit profiles" -msgstr "" - #: ../../include/nav.php:130 msgid "Manage/edit friends and contacts" msgstr "" @@ -4696,417 +4923,275 @@ msgstr "" msgid "Nothing new here" msgstr "" -#: ../../include/contact_widgets.php:6 -msgid "Add New Contact" -msgstr "" - -#: ../../include/contact_widgets.php:7 -msgid "Enter address or web location" -msgstr "" - -#: ../../include/contact_widgets.php:8 -msgid "Example: bob@example.com, http://example.com/barbara" -msgstr "" - -#: ../../include/contact_widgets.php:9 ../../boot.php:892 -msgid "Connect" -msgstr "" - -#: ../../include/contact_widgets.php:18 -msgid "Invite Friends" -msgstr "" - -#: ../../include/contact_widgets.php:24 -#, php-format -msgid "%d invitation available" -msgid_plural "%d invitations available" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/contact_widgets.php:30 -msgid "Find People" -msgstr "" - -#: ../../include/contact_widgets.php:31 -msgid "Enter name or interest" -msgstr "" - -#: ../../include/contact_widgets.php:32 -msgid "Connect/Follow" -msgstr "" - -#: ../../include/contact_widgets.php:33 -msgid "Examples: Robert Morgenstein, Fishing" -msgstr "" - -#: ../../include/contact_widgets.php:36 -msgid "Similar Interests" -msgstr "" - -#: ../../include/auth.php:27 -msgid "Logged out." -msgstr "" - -#: ../../include/datetime.php:44 ../../include/datetime.php:46 -msgid "Miscellaneous" -msgstr "" - -#: ../../include/datetime.php:105 ../../include/datetime.php:237 -msgid "year" -msgstr "" - -#: ../../include/datetime.php:110 ../../include/datetime.php:238 -msgid "month" -msgstr "" - -#: ../../include/datetime.php:115 ../../include/datetime.php:240 -msgid "day" -msgstr "" - -#: ../../include/datetime.php:228 -msgid "never" -msgstr "" - -#: ../../include/datetime.php:234 -msgid "less than a second ago" -msgstr "" - -#: ../../include/datetime.php:237 -msgid "years" -msgstr "" - -#: ../../include/datetime.php:238 -msgid "months" -msgstr "" - -#: ../../include/datetime.php:239 -msgid "week" -msgstr "" - -#: ../../include/datetime.php:239 -msgid "weeks" -msgstr "" - -#: ../../include/datetime.php:240 -msgid "days" -msgstr "" - -#: ../../include/datetime.php:241 -msgid "hour" -msgstr "" - -#: ../../include/datetime.php:241 -msgid "hours" -msgstr "" - -#: ../../include/datetime.php:242 -msgid "minute" -msgstr "" - -#: ../../include/datetime.php:242 -msgid "minutes" -msgstr "" - -#: ../../include/datetime.php:243 -msgid "second" -msgstr "" - -#: ../../include/datetime.php:243 -msgid "seconds" -msgstr "" - -#: ../../include/datetime.php:250 -msgid " ago" -msgstr "" - -#: ../../include/poller.php:457 -msgid "From: " -msgstr "" - -#: ../../include/bbcode.php:147 -msgid "Image/photo" -msgstr "" - -#: ../../include/dba.php:31 -#, php-format -msgid "Cannot locate DNS info for database server '%s'" -msgstr "" - -#: ../../include/message.php:13 -msgid "[no subject]" -msgstr "" - -#: ../../include/acl_selectors.php:279 -msgid "Visible to everybody" -msgstr "" - -#: ../../include/acl_selectors.php:280 -msgid "show" -msgstr "" - -#: ../../include/acl_selectors.php:281 -msgid "don't show" -msgstr "" - -#: ../../include/items.php:1895 -msgid "New mail received at " -msgstr "" - -#: ../../include/items.php:2532 -msgid "A new person is sharing with you at " -msgstr "" - -#: ../../include/items.php:2532 -msgid "You have a new follower at " -msgstr "" - -#: ../../include/bb2diaspora.php:51 -msgid "view full size" -msgstr "" - -#: ../../include/bb2diaspora.php:102 -msgid "image/photo" -msgstr "" - -#: ../../include/Contact.php:125 ../../include/conversation.php:713 -msgid "View status" -msgstr "" - -#: ../../include/Contact.php:126 ../../include/conversation.php:714 -msgid "View profile" -msgstr "" - -#: ../../include/Contact.php:127 ../../include/conversation.php:715 -msgid "View photos" -msgstr "" - -#: ../../include/Contact.php:128 ../../include/Contact.php:141 -#: ../../include/conversation.php:716 -msgid "View recent" -msgstr "" - -#: ../../include/Contact.php:130 ../../include/Contact.php:141 -#: ../../include/conversation.php:718 -msgid "Send PM" -msgstr "" - -#: ../../include/conversation.php:247 ../../include/conversation.php:498 +#: ../../include/conversation.php:250 ../../include/conversation.php:504 msgid "Select" msgstr "" -#: ../../include/conversation.php:262 ../../include/conversation.php:588 -#: ../../include/conversation.php:589 +#: ../../include/conversation.php:265 ../../include/conversation.php:598 +#: ../../include/conversation.php:599 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: ../../include/conversation.php:271 ../../include/conversation.php:600 +#: ../../include/conversation.php:274 ../../include/conversation.php:610 #, php-format msgid "%s from %s" msgstr "" -#: ../../include/conversation.php:287 +#: ../../include/conversation.php:290 msgid "View in context" msgstr "" -#: ../../include/conversation.php:398 +#: ../../include/conversation.php:404 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:401 ../../boot.php:421 -msgid "show more" -msgstr "" - -#: ../../include/conversation.php:461 +#: ../../include/conversation.php:467 msgid "like" msgstr "" -#: ../../include/conversation.php:462 +#: ../../include/conversation.php:468 msgid "dislike" msgstr "" -#: ../../include/conversation.php:464 +#: ../../include/conversation.php:470 msgid "Share this" msgstr "" -#: ../../include/conversation.php:464 +#: ../../include/conversation.php:470 msgid "share" msgstr "" -#: ../../include/conversation.php:508 +#: ../../include/conversation.php:514 msgid "add star" msgstr "" -#: ../../include/conversation.php:509 +#: ../../include/conversation.php:515 msgid "remove star" msgstr "" -#: ../../include/conversation.php:510 +#: ../../include/conversation.php:516 msgid "toggle star status" msgstr "" -#: ../../include/conversation.php:513 +#: ../../include/conversation.php:519 msgid "starred" msgstr "" -#: ../../include/conversation.php:514 +#: ../../include/conversation.php:520 msgid "add tag" msgstr "" -#: ../../include/conversation.php:590 +#: ../../include/conversation.php:600 msgid "to" msgstr "" -#: ../../include/conversation.php:591 +#: ../../include/conversation.php:601 msgid "Wall-to-Wall" msgstr "" -#: ../../include/conversation.php:592 +#: ../../include/conversation.php:602 msgid "via Wall-To-Wall:" msgstr "" -#: ../../include/conversation.php:638 +#: ../../include/conversation.php:643 msgid "Delete Selected Items" msgstr "" -#: ../../include/conversation.php:768 +#: ../../include/conversation.php:773 #, php-format msgid "%s likes this." msgstr "" -#: ../../include/conversation.php:768 +#: ../../include/conversation.php:773 #, php-format msgid "%s doesn't like this." msgstr "" -#: ../../include/conversation.php:772 +#: ../../include/conversation.php:777 #, php-format msgid "<span %1$s>%2$d people</span> like this." msgstr "" -#: ../../include/conversation.php:774 +#: ../../include/conversation.php:779 #, php-format msgid "<span %1$s>%2$d people</span> don't like this." msgstr "" -#: ../../include/conversation.php:780 +#: ../../include/conversation.php:785 msgid "and" msgstr "" -#: ../../include/conversation.php:783 +#: ../../include/conversation.php:788 #, php-format msgid ", and %d other people" msgstr "" -#: ../../include/conversation.php:784 +#: ../../include/conversation.php:789 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:784 +#: ../../include/conversation.php:789 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:804 +#: ../../include/conversation.php:809 msgid "Visible to <strong>everybody</strong>" msgstr "" -#: ../../include/conversation.php:806 +#: ../../include/conversation.php:811 msgid "Please enter a video link/URL:" msgstr "" -#: ../../include/conversation.php:807 +#: ../../include/conversation.php:812 msgid "Please enter an audio link/URL:" msgstr "" -#: ../../include/conversation.php:808 +#: ../../include/conversation.php:813 msgid "Tag term:" msgstr "" -#: ../../include/conversation.php:809 +#: ../../include/conversation.php:814 msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:810 +#: ../../include/conversation.php:815 msgid "Enter a title for this item" msgstr "" -#: ../../include/conversation.php:856 +#: ../../include/conversation.php:861 msgid "Insert video link" msgstr "" -#: ../../include/conversation.php:857 +#: ../../include/conversation.php:862 msgid "Insert audio link" msgstr "" -#: ../../include/conversation.php:860 +#: ../../include/conversation.php:865 msgid "Set title" msgstr "" -#: ../../boot.php:419 -msgid "Delete this item?" +#: ../../include/bb2diaspora.php:53 +msgid "view full size" msgstr "" -#: ../../boot.php:422 -msgid "show fewer" +#: ../../include/bb2diaspora.php:104 +msgid "image/photo" msgstr "" -#: ../../boot.php:664 -msgid "Create a New Account" +#: ../../include/dba.php:33 +#, php-format +msgid "Cannot locate DNS info for database server '%s'" msgstr "" -#: ../../boot.php:684 -msgid "Nickname or Email address: " +#: ../../include/contact_widgets.php:6 +msgid "Add New Contact" msgstr "" -#: ../../boot.php:685 -msgid "Password: " +#: ../../include/contact_widgets.php:7 +msgid "Enter address or web location" msgstr "" -#: ../../boot.php:688 -msgid "OpenID: " +#: ../../include/contact_widgets.php:8 +msgid "Example: bob@example.com, http://example.com/barbara" msgstr "" -#: ../../boot.php:694 -msgid "Forgot your password?" +#: ../../include/contact_widgets.php:18 +msgid "Invite Friends" msgstr "" -#: ../../boot.php:841 -msgid "Edit profile" +#: ../../include/contact_widgets.php:24 +#, php-format +msgid "%d invitation available" +msgid_plural "%d invitations available" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/contact_widgets.php:30 +msgid "Find People" msgstr "" -#: ../../boot.php:1008 ../../boot.php:1070 -msgid "g A l F d" +#: ../../include/contact_widgets.php:31 +msgid "Enter name or interest" msgstr "" -#: ../../boot.php:1009 ../../boot.php:1071 -msgid "F d" +#: ../../include/contact_widgets.php:32 +msgid "Connect/Follow" msgstr "" -#: ../../boot.php:1032 -msgid "Birthday Reminders" +#: ../../include/contact_widgets.php:33 +msgid "Examples: Robert Morgenstein, Fishing" msgstr "" -#: ../../boot.php:1033 -msgid "Birthdays this week:" +#: ../../include/contact_widgets.php:36 +msgid "Similar Interests" msgstr "" -#: ../../boot.php:1049 ../../boot.php:1113 -msgid "[today]" +#: ../../include/items.php:1895 +msgid "New mail received at " msgstr "" -#: ../../boot.php:1094 -msgid "Event Reminders" +#: ../../include/items.php:2532 +msgid "A new person is sharing with you at " msgstr "" -#: ../../boot.php:1095 -msgid "Events this week:" +#: ../../include/items.php:2532 +msgid "You have a new follower at " msgstr "" -#: ../../boot.php:1107 -msgid "[No description]" +#: ../../include/message.php:14 +msgid "[no subject]" +msgstr "" + +#: ../../include/group.php:25 +msgid "" +"A deleted group with this name was revived. Existing item permissions " +"<strong>may</strong> apply to this group and any future members. If this is " +"not what you intended, please create another group with a different name." +msgstr "" + +#: ../../include/group.php:168 +msgid "Everybody" +msgstr "" + +#: ../../include/group.php:191 +msgid "edit" +msgstr "" + +#: ../../include/group.php:212 +msgid "Groups" +msgstr "" + +#: ../../include/group.php:213 +msgid "Edit group" +msgstr "" + +#: ../../include/group.php:214 +msgid "Create a new group" +msgstr "" + +#: ../../include/diaspora.php:555 +msgid "Sharing notification from Diaspora network" +msgstr "" + +#: ../../include/diaspora.php:1798 +msgid "Attachments:" +msgstr "" + +#: ../../include/diaspora.php:1981 +#, php-format +msgid "[Relayed] Comment authored by %s from network %s" +msgstr "" + +#: ../../include/oembed.php:128 +msgid "Embedded content" +msgstr "" + +#: ../../include/oembed.php:137 +msgid "Embedding disabled" msgstr "" diff --git a/view/match.tpl b/view/match.tpl index 330245a2a..5f2fc7a30 100644 --- a/view/match.tpl +++ b/view/match.tpl @@ -9,4 +9,8 @@ <a href="$url" title="$name[$tags]">$name</a> </div> <div class="profile-match-end"></div> + {{ if $connlnk }} + <div class="profile-match-connect"><a href="$connlnk" title="$conntxt">$conntxt</a></div> + {{ endif }} + </div>
\ No newline at end of file diff --git a/view/poco_entry_xml.tpl b/view/poco_entry_xml.tpl index 8d5515152..4d84cee41 100644 --- a/view/poco_entry_xml.tpl +++ b/view/poco_entry_xml.tpl @@ -2,6 +2,6 @@ {{ if $entry.id }}<id>$entry.id</id>{{ endif }} {{ if $entry.displayName }}<displayName>$entry.displayName</displayName>{{ endif }} {{ if $entry.preferredUsername }}<preferredUsername>$entry.preferredUsername</preferredUsername>{{ endif }} -{{ if $entry.urls }}<urls><value>$entry.urls.value</value><type>$entry.urls.type</type></urls>{{ endif }} -{{ if $entry.photos }}<photos><value>$entry.photos.value</value><type>$entry.photos.type</type></photos>{{ endif }} +{{ if $entry.urls }}{{ for $entry.urls as $url }}<urls><value>$url.value</value><type>$url.type</type></urls>{{ endfor }}{{ endif }} +{{ if $entry.photos }}{{ for $entry.photos as $photo }}<photos><value>$photo.value</value><type>$photo.type</type></photos>{{ endfor }}{{ endif }} </entry> diff --git a/view/suggest_friends.tpl b/view/suggest_friends.tpl index 8e6056494..e97b5e8cc 100644 --- a/view/suggest_friends.tpl +++ b/view/suggest_friends.tpl @@ -10,4 +10,7 @@ <a href="$url" title="$name">$name</a> </div> <div class="profile-match-end"></div> + {{ if $connlnk }} + <div class="profile-match-connect"><a href="$connlnk" title="$conntxt">$conntxt</a></div> + {{ endif }} </div>
\ No newline at end of file diff --git a/view/theme/darkzero/theme.php b/view/theme/darkzero/theme.php index 338f40cbf..5d63583f4 100644 --- a/view/theme/darkzero/theme.php +++ b/view/theme/darkzero/theme.php @@ -2,3 +2,48 @@ $a->theme_info = array( 'extends' => 'duepuntozero', ); + +$a->page['htmlhead'] .= <<< EOT +<script> +$(document).ready(function() { + +$('.group-edit-icon').hover( + function() { + $(this).addClass('icon'); $(this).removeClass('iconspacer');}, + function() { + $(this).removeClass('icon'); $(this).addClass('iconspacer');} + ); + +$('.sidebar-group-element').hover( + function() { + id = $(this).attr('id'); + $('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');}, + + function() { + id = $(this).attr('id'); + $('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');} + ); + + +$('.savedsearchdrop').hover( + function() { + $(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');}, + function() { + $(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');} + ); + +$('.savedsearchterm').hover( + function() { + id = $(this).attr('id'); + $('#drop-' + id).addClass('icon'); $('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');}, + + function() { + id = $(this).attr('id'); + $('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');} + ); + +}); + + +</script> +EOT; diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 1127f1145..c6582d068 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -2383,6 +2383,11 @@ aside input[type='text'] { clear: both; } +.profile-match-connect { + text-align: center; + font-weight: bold; +} + .profile-match-wrapper { float: left; padding: 10px; diff --git a/view/theme/greenzero/theme.php b/view/theme/greenzero/theme.php index 338f40cbf..5d63583f4 100644 --- a/view/theme/greenzero/theme.php +++ b/view/theme/greenzero/theme.php @@ -2,3 +2,48 @@ $a->theme_info = array( 'extends' => 'duepuntozero', ); + +$a->page['htmlhead'] .= <<< EOT +<script> +$(document).ready(function() { + +$('.group-edit-icon').hover( + function() { + $(this).addClass('icon'); $(this).removeClass('iconspacer');}, + function() { + $(this).removeClass('icon'); $(this).addClass('iconspacer');} + ); + +$('.sidebar-group-element').hover( + function() { + id = $(this).attr('id'); + $('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');}, + + function() { + id = $(this).attr('id'); + $('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');} + ); + + +$('.savedsearchdrop').hover( + function() { + $(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');}, + function() { + $(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');} + ); + +$('.savedsearchterm').hover( + function() { + id = $(this).attr('id'); + $('#drop-' + id).addClass('icon'); $('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');}, + + function() { + id = $(this).attr('id'); + $('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');} + ); + +}); + + +</script> +EOT; diff --git a/view/theme/purplezero/style.css b/view/theme/purplezero/style.css index f624fadac..f0d5b96b9 100644 --- a/view/theme/purplezero/style.css +++ b/view/theme/purplezero/style.css @@ -1,6 +1,6 @@ @import url('../duepuntozero/style.css'); -a, a:visited { color: #7433af; text-decoration: none; } +a, a:link, a:visited { color: #7433af; text-decoration: none; } a:hover {text-decoration: underline; } diff --git a/view/theme/purplezero/theme.php b/view/theme/purplezero/theme.php index 338f40cbf..5d63583f4 100644 --- a/view/theme/purplezero/theme.php +++ b/view/theme/purplezero/theme.php @@ -2,3 +2,48 @@ $a->theme_info = array( 'extends' => 'duepuntozero', ); + +$a->page['htmlhead'] .= <<< EOT +<script> +$(document).ready(function() { + +$('.group-edit-icon').hover( + function() { + $(this).addClass('icon'); $(this).removeClass('iconspacer');}, + function() { + $(this).removeClass('icon'); $(this).addClass('iconspacer');} + ); + +$('.sidebar-group-element').hover( + function() { + id = $(this).attr('id'); + $('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');}, + + function() { + id = $(this).attr('id'); + $('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');} + ); + + +$('.savedsearchdrop').hover( + function() { + $(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');}, + function() { + $(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');} + ); + +$('.savedsearchterm').hover( + function() { + id = $(this).attr('id'); + $('#drop-' + id).addClass('icon'); $('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');}, + + function() { + id = $(this).attr('id'); + $('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');} + ); + +}); + + +</script> +EOT; diff --git a/view/theme/testbubble/match.tpl b/view/theme/testbubble/match.tpl index 49c3c81e4..244b243ec 100644 --- a/view/theme/testbubble/match.tpl +++ b/view/theme/testbubble/match.tpl @@ -4,7 +4,10 @@ <img src="$photo" alt="$name" /> </a> </div> - <span><a href="$url">$name</a> is interested in:<br />$tags</span> + <span><a href="$url">$name</a>$inttxt<br />$tags</span> <div class="profile-match-break"></div> + {{ if $connlnk }} + <div class="profile-match-connect"><a href="$connlnk" title="$conntxt">$conntxt</a></div> + {{ endif }} <div class="profile-match-end"></div> </div>
\ No newline at end of file |