mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Merge remote branch 'upstream/master'

Browse source
This commit is contained in:
zottel 2012-05-02 08:11:52 +02:00
commit 6000e7f30d
20 changed files with 397 additions and 263 deletions
Download patch file Download diff file Expand all files Collapse all files

4
boot.php
View file

@ -9,9 +9,9 @@ require_once('include/nav.php');
require_once('include/cache.php'); require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '2.3.1328' ); define ( 'FRIENDICA_VERSION', '2.3.1329' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1141 ); define ( 'DB_UPDATE_VERSION', 1142 );
define ( 'EOL', "<br />\r\n" ); define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );

2
database.sql
View file

@ -384,11 +384,13 @@ CREATE TABLE IF NOT EXISTS `glink` (
`cid` int(11) NOT NULL, `cid` int(11) NOT NULL,
`uid` int(11) NOT NULL, `uid` int(11) NOT NULL,
`gcid` int(11) NOT NULL, `gcid` int(11) NOT NULL,
`zcid` int(11) NOT NULL,
`updated` datetime NOT NULL, `updated` datetime NOT NULL,
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
KEY `cid` (`cid`), KEY `cid` (`cid`),
KEY `uid` (`uid`), KEY `uid` (`uid`),
KEY `gcid` (`gcid`), KEY `gcid` (`gcid`),
KEY `zcid` (`zcid`),
KEY `updated` (`updated`) KEY `updated` (`updated`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8; ) ENGINE=MyISAM DEFAULT CHARSET=utf8;

BIN
images/smiley-thumbsup.gif
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Before After
Before After

2
include/Scrape.php
View file

@ -282,7 +282,7 @@ function scrape_feed($url) {
} }
} }
if(! $basename) if(! $basename)
$basename = substr($url,0,strrpos($url,'/')) . '/'; $basename = implode('/', array_slice(explode('/',$url),0,3)) . '/';
$items = $dom->getElementsByTagName('link'); $items = $dom->getElementsByTagName('link');

44
include/contact_widgets.php
View file

@ -133,3 +133,47 @@ function categories_widget($baseurl,$selected = '') {
)); ));
} }
function common_friends_visitor_widget($profile_uid) {
$a = get_app();
if(local_user() == $profile_uid)
return;
$cid = $zcid = 0;
if(can_write_wall($a,$profile_uid))
$cid = local_user();
else {
if(get_my_url()) {
$r = q("select id from gcontact where nurl = '%s' limit 1",
dbesc(normalise_link(get_my_url()))
);
if(count($r))
$zcid = $r[0]['id'];
}
}
if($cid == 0 && $zcid == 0)
return;
require_once('include/socgraph.php');
if($cid)
$t = count_common_friends($profile_uid,$cid);
else
$t = count_common_friends($profile_uid,$cid);
if(! $t)
return;
if($cid)
$r = common_friends($profile_uid,$cid,5);
else
$r = common_friends_zcid($profile_uid,$zcid);
return replace_macros(get_markup_template('remote_friends_common.tpl'), array(
'$desc' => sprintf( tt("%d friend in common", "%d friends in common", $t), $t),
'$items' => $r
));
};

4
include/enotify.php
View file

@ -402,8 +402,8 @@ class enotify {
*/ */
static public function send($params) { static public function send($params) {
$fromName = email_header_encode($params['fromName'],'UTF-8'); $fromName = email_header_encode(html_entity_decode($params['fromName'],ENT_QUOTES,'UTF-8'),'UTF-8');
$messageSubject = email_header_encode($params['messageSubject'],'UTF-8'); $messageSubject = email_header_encode(html_entity_decode($params['messageSubject'],ENT_QUOTES,'UTF-8'),'UTF-8');
// generate a mime boundary // generate a mime boundary
$mimeBoundary =rand(0,9)."-" $mimeBoundary =rand(0,9)."-"

11
include/gprobe.php
View file

@ -2,6 +2,7 @@
require_once("boot.php"); require_once("boot.php");
require_once('include/Scrape.php'); require_once('include/Scrape.php');
require_once('include/socgraph.php');
function gprobe_run($argv, $argc){ function gprobe_run($argv, $argc){
global $a, $db; global $a, $db;
@ -36,11 +37,9 @@ function gprobe_run($argv, $argc){
dbesc(normalise_link($url)) dbesc(normalise_link($url))
); );
if(count($r)) if(! count($r)) {
return;
$arr = probe_url($url); $arr = probe_url($url);
if(count($arr) && x($arr,'network') && $arr['network'] === NETWORK_DFRN) { if(count($arr) && x($arr,'network') && $arr['network'] === NETWORK_DFRN) {
q("insert into `gcontact` (`name`,`url`,`nurl`,`photo`) q("insert into `gcontact` (`name`,`url`,`nurl`,`photo`)
values ( '%s', '%s', '%s', '%s') ", values ( '%s', '%s', '%s', '%s') ",
@ -50,6 +49,12 @@ function gprobe_run($argv, $argc){
dbesc($arr['photo']) dbesc($arr['photo'])
); );
} }
$r = q("select * from gcontact where nurl = '%s' limit 1",
dbesc(normalise_link($url))
);
}
if(count($r))
poco_load(0,0,$r[0]['id'], str_replace('/profile/','/poco/',$r[0]['url']));
return; return;
} }

2
include/onepoll.php
View file

@ -506,7 +506,7 @@ function onepoll_run($argv, $argc){
} }
if(count($r)) { if(count($r)) {
if(! $r[0]['total']) { if(! $r[0]['total']) {
poco_load($contact['id'],$importer_uid,$contact['poco']); poco_load($contact['id'],$importer_uid,0,$contact['poco']);
} }
} }

79
include/socgraph.php
View file

@ -20,7 +20,7 @@ require_once('include/datetime.php');
function poco_load($cid,$uid = 0,$url = null) { function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
$a = get_app(); $a = get_app();
if($cid) { if($cid) {
@ -53,7 +53,6 @@ function poco_load($cid,$uid = 0,$url = null) {
if(($a->get_curl_code() > 299) || (! $s)) if(($a->get_curl_code() > 299) || (! $s))
return; return;
$j = json_decode($s); $j = json_decode($s);
logger('poco_load: json: ' . print_r($j,true),LOGGER_DATA); logger('poco_load: json: ' . print_r($j,true),LOGGER_DATA);
@ -81,7 +80,6 @@ function poco_load($cid,$uid = 0,$url = null) {
$connect_url = str_replace('acct:' , '', $url->value); $connect_url = str_replace('acct:' , '', $url->value);
continue; continue;
} }
} }
foreach($entry->photos as $photo) { foreach($entry->photos as $photo) {
if($photo->type == 'profile') { if($photo->type == 'profile') {
@ -128,34 +126,38 @@ function poco_load($cid,$uid = 0,$url = null) {
if(! $gcid) if(! $gcid)
return; return;
$r = q("select * from glink where `cid` = %d and `uid` = %d and `gcid` = %d limit 1", $r = q("select * from glink where `cid` = %d and `uid` = %d and `gcid` = %d and `zcid` = %d limit 1",
intval($cid),
intval($uid),
intval($gcid)
);
if(! count($r)) {
q("insert into glink ( `cid`,`uid`,`gcid`,`updated`) values (%d,%d,%d,'%s') ",
intval($cid), intval($cid),
intval($uid), intval($uid),
intval($gcid), intval($gcid),
intval($zcid)
);
if(! count($r)) {
q("insert into glink ( `cid`,`uid`,`gcid`,`zcid`, `updated`) values (%d,%d,%d,%d, '%s') ",
intval($cid),
intval($uid),
intval($gcid),
intval($zcid),
dbesc(datetime_convert()) dbesc(datetime_convert())
); );
} }
else { else {
q("update glink set updated = '%s' where `cid` = %d and `uid` = %d and `gcid` = %d limit 1", q("update glink set updated = '%s' where `cid` = %d and `uid` = %d and `gcid` = %d and zcid = %d limit 1",
dbesc(datetime_convert()), dbesc(datetime_convert()),
intval($cid), intval($cid),
intval($uid), intval($uid),
intval($gcid) intval($gcid),
intval($zcid)
); );
} }
} }
logger("poco_load: loaded $total entries",LOGGER_DEBUG); 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", q("delete from glink where `cid` = %d and `uid` = %d and `zcid` = %d and `updated` < UTC_TIMESTAMP - INTERVAL 2 DAY",
intval($cid), intval($cid),
intval($uid) intval($uid),
intval($zcid)
); );
} }
@ -180,23 +182,58 @@ function count_common_friends($uid,$cid) {
} }
function common_friends($uid,$cid) { function common_friends($uid,$cid,$limit=9999) {
$r = q("SELECT `gcontact`.* $r = q("SELECT `gcontact`.*
FROM `glink` left join `gcontact` on `glink`.`gcid` = `gcontact`.`id` FROM `glink` left join `gcontact` on `glink`.`gcid` = `gcontact`.`id`
where `glink`.`cid` = %d and `glink`.`uid` = %d where `glink`.`cid` = %d and `glink`.`uid` = %d
and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and id != %d ) and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and id != %d )
order by `gcontact`.`name` asc ", order by `gcontact`.`name` asc limit 0, %d",
intval($cid), intval($cid),
intval($uid), intval($uid),
intval($uid), intval($uid),
intval($cid) intval($cid),
intval($limit)
); );
return $r; return $r;
} }
function count_common_friends_zcid($uid,$zcid) {
$r = q("SELECT count(*) as `total`
FROM `glink` left join `gcontact` on `glink`.`gcid` = `gcontact`.`id`
where `glink`.`zcid` = %d
and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 ) ",
intval($zcid),
intval($uid)
);
if(count($r))
return $r[0]['total'];
return 0;
}
function common_friends_zcid($uid,$zcid,$limit = 6) {
$r = q("SELECT `gcontact`.*
FROM `glink` left join `gcontact` on `glink`.`gcid` = `gcontact`.`id`
where `glink`.`zcid` = %d
and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 )
order by `gcontact`.`name` asc limit 0, %d",
intval($zcid),
intval($uid),
intval($limit)
);
return $r;
}
function count_all_friends($uid,$cid) { function count_all_friends($uid,$cid) {
$r = q("SELECT count(*) as `total` $r = q("SELECT count(*) as `total`
@ -254,7 +291,7 @@ function suggestion_query($uid, $start = 0, $limit = 80) {
$r2 = q("SELECT gcontact.* from gcontact $r2 = q("SELECT gcontact.* from gcontact
left join glink on glink.gcid = gcontact.id left join glink on glink.gcid = gcontact.id
where glink.uid = 0 and glink.cid = 0 and not gcontact.nurl in ( select nurl from contact where uid = %d ) where glink.uid = 0 and glink.cid = 0 and glink.zcid = 0 and not gcontact.nurl in ( select nurl from contact where uid = %d )
and not gcontact.name in ( select name from contact where uid = %d ) and not gcontact.name in ( select name from contact where uid = %d )
and not gcontact.id in ( select gcid from gcign 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 ",
@ -276,7 +313,7 @@ function update_suggestions() {
$done = array(); $done = array();
poco_load(0,0,$a->get_baseurl() . '/poco'); poco_load(0,0,0,$a->get_baseurl() . '/poco');
$done[] = $a->get_baseurl() . '/poco'; $done[] = $a->get_baseurl() . '/poco';
@ -288,7 +325,7 @@ function update_suggestions() {
foreach($j->entries as $entry) { foreach($j->entries as $entry) {
$url = $entry->url . '/poco'; $url = $entry->url . '/poco';
if(! in_array($url,$done)) if(! in_array($url,$done))
poco_load(0,0,$entry->url . '/poco'); poco_load(0,0,0,$entry->url . '/poco');
} }
} }
} }
@ -302,7 +339,7 @@ function update_suggestions() {
foreach($r as $rr) { foreach($r as $rr) {
$base = substr($rr['poco'],0,strrpos($rr['poco'],'/')); $base = substr($rr['poco'],0,strrpos($rr['poco'],'/'));
if(! in_array($base,$done)) if(! in_array($base,$done))
poco_load(0,0,$base); poco_load(0,0,0,$base);
} }
} }
} }

4
mod/profile.php
View file

@ -143,6 +143,10 @@ function profile_content(&$a, $update = 0) {
return $o; return $o;
} }
$o .= common_friends_visitor_widget($a->profile['profile_uid']);
if(x($_SESSION,'new_member') && $_SESSION['new_member'] && $is_owner) if(x($_SESSION,'new_member') && $_SESSION['new_member'] && $is_owner)
$o .= '<a href="newmember" id="newmember-tips" style="font-size: 1.2em;"><b>' . t('Tips for New Members') . '</b></a>' . EOL; $o .= '<a href="newmember" id="newmember-tips" style="font-size: 1.2em;"><b>' . t('Tips for New Members') . '</b></a>' . EOL;

11
update.php
View file

@ -1,6 +1,6 @@
<?php <?php
define( 'UPDATE_VERSION' , 1141 ); define( 'UPDATE_VERSION' , 1142 );
/** /**
* *
@ -1230,3 +1230,12 @@ function update_1140() {
return UPDATE_FAILED ; return UPDATE_FAILED ;
return UPDATE_SUCCESS ; return UPDATE_SUCCESS ;
} }
function update_1141() {
$r = q("alter table glink add zcid int(11) not null after gcid, add index(zcid) ");
if(! $r)
return UPDATE_FAILED ;
return UPDATE_SUCCESS ;
}

418
util/messages.po
View file

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2.3.1328\n" "Project-Id-Version: 2.3.1329\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-04-30 10:00-0700\n" "POT-Creation-Date: 2012-05-01 10:00-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -39,8 +39,8 @@ msgstr ""
#: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:865 #: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:865
#: ../../mod/editpost.php:10 ../../mod/install.php:171 #: ../../mod/editpost.php:10 ../../mod/install.php:171
#: ../../mod/notifications.php:66 ../../mod/contacts.php:125 #: ../../mod/notifications.php:66 ../../mod/contacts.php:125
#: ../../mod/settings.php:104 ../../mod/settings.php:519 #: ../../mod/settings.php:104 ../../mod/settings.php:521
#: ../../mod/settings.php:524 ../../mod/manage.php:86 ../../mod/network.php:6 #: ../../mod/settings.php:526 ../../mod/manage.php:86 ../../mod/network.php:6
#: ../../mod/notes.php:20 ../../mod/wallmessage.php:9 #: ../../mod/notes.php:20 ../../mod/wallmessage.php:9
#: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
#: ../../mod/wallmessage.php:103 ../../mod/attach.php:33 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33
@ -56,7 +56,7 @@ msgstr ""
#: ../../mod/delegate.php:6 ../../mod/suggest.php:28 ../../mod/invite.php:13 #: ../../mod/delegate.php:6 ../../mod/suggest.php:28 ../../mod/invite.php:13
#: ../../mod/invite.php:81 ../../mod/dfrn_confirm.php:53 #: ../../mod/invite.php:81 ../../mod/dfrn_confirm.php:53
#: ../../addon/facebook/facebook.php:485 ../../include/items.php:3187 #: ../../addon/facebook/facebook.php:485 ../../include/items.php:3187
#: ../../index.php:309 #: ../../index.php:306
msgid "Permission denied." msgid "Permission denied."
msgstr "" msgstr ""
@ -85,8 +85,8 @@ msgstr ""
msgid "Return to contact editor" msgid "Return to contact editor"
msgstr "" msgstr ""
#: ../../mod/crepair.php:148 ../../mod/settings.php:539 #: ../../mod/crepair.php:148 ../../mod/settings.php:541
#: ../../mod/settings.php:565 ../../mod/admin.php:638 ../../mod/admin.php:647 #: ../../mod/settings.php:567 ../../mod/admin.php:638 ../../mod/admin.php:647
msgid "Name" msgid "Name"
msgstr "" msgstr ""
@ -128,8 +128,8 @@ msgstr ""
#: ../../mod/photos.php:1273 ../../mod/photos.php:1304 #: ../../mod/photos.php:1273 ../../mod/photos.php:1304
#: ../../mod/install.php:251 ../../mod/install.php:289 #: ../../mod/install.php:251 ../../mod/install.php:289
#: ../../mod/localtime.php:45 ../../mod/contacts.php:322 #: ../../mod/localtime.php:45 ../../mod/contacts.php:322
#: ../../mod/settings.php:537 ../../mod/settings.php:683 #: ../../mod/settings.php:539 ../../mod/settings.php:685
#: ../../mod/settings.php:744 ../../mod/settings.php:935 #: ../../mod/settings.php:746 ../../mod/settings.php:940
#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:400 #: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:400
#: ../../mod/admin.php:635 ../../mod/admin.php:771 ../../mod/admin.php:970 #: ../../mod/admin.php:635 ../../mod/admin.php:771 ../../mod/admin.php:970
#: ../../mod/admin.php:1057 ../../mod/profiles.php:534 #: ../../mod/admin.php:1057 ../../mod/profiles.php:534
@ -173,11 +173,11 @@ msgstr ""
msgid "Help" msgid "Help"
msgstr "" msgstr ""
#: ../../mod/help.php:38 ../../index.php:228 #: ../../mod/help.php:38 ../../index.php:225
msgid "Not Found" msgid "Not Found"
msgstr "" msgstr ""
#: ../../mod/help.php:41 ../../index.php:231 #: ../../mod/help.php:41 ../../index.php:228
msgid "Page not found." msgid "Page not found."
msgstr "" msgstr ""
@ -219,7 +219,7 @@ msgstr ""
msgid "link to source" msgid "link to source"
msgstr "" msgstr ""
#: ../../mod/events.php:296 ../../view/theme/diabook/theme.php:255 #: ../../mod/events.php:296 ../../view/theme/diabook/theme.php:274
#: ../../include/nav.php:52 ../../boot.php:1493 #: ../../include/nav.php:52 ../../boot.php:1493
msgid "Events" msgid "Events"
msgstr "" msgstr ""
@ -279,8 +279,8 @@ msgid "Share this event"
msgstr "" msgstr ""
#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
#: ../../mod/dfrn_request.php:818 ../../mod/settings.php:538 #: ../../mod/dfrn_request.php:818 ../../mod/settings.php:540
#: ../../mod/settings.php:564 ../../addon/js_upload/js_upload.php:45 #: ../../mod/settings.php:566 ../../addon/js_upload/js_upload.php:45
msgid "Cancel" msgid "Cancel"
msgstr "" msgstr ""
@ -324,23 +324,23 @@ msgid ""
msgstr "" msgstr ""
#: ../../mod/api.php:105 ../../mod/dfrn_request.php:806 #: ../../mod/api.php:105 ../../mod/dfrn_request.php:806
#: ../../mod/settings.php:849 ../../mod/settings.php:855 #: ../../mod/settings.php:854 ../../mod/settings.php:860
#: ../../mod/settings.php:863 ../../mod/settings.php:867 #: ../../mod/settings.php:868 ../../mod/settings.php:872
#: ../../mod/settings.php:872 ../../mod/settings.php:878 #: ../../mod/settings.php:877 ../../mod/settings.php:883
#: ../../mod/settings.php:884 ../../mod/settings.php:890 #: ../../mod/settings.php:889 ../../mod/settings.php:895
#: ../../mod/settings.php:926 ../../mod/settings.php:927 #: ../../mod/settings.php:931 ../../mod/settings.php:932
#: ../../mod/settings.php:928 ../../mod/settings.php:929 #: ../../mod/settings.php:933 ../../mod/settings.php:934
#: ../../mod/register.php:532 ../../mod/profiles.php:511 #: ../../mod/register.php:532 ../../mod/profiles.php:511
msgid "Yes" msgid "Yes"
msgstr "" msgstr ""
#: ../../mod/api.php:106 ../../mod/dfrn_request.php:807 #: ../../mod/api.php:106 ../../mod/dfrn_request.php:807
#: ../../mod/settings.php:849 ../../mod/settings.php:855 #: ../../mod/settings.php:854 ../../mod/settings.php:860
#: ../../mod/settings.php:863 ../../mod/settings.php:867 #: ../../mod/settings.php:868 ../../mod/settings.php:872
#: ../../mod/settings.php:872 ../../mod/settings.php:878 #: ../../mod/settings.php:877 ../../mod/settings.php:883
#: ../../mod/settings.php:884 ../../mod/settings.php:890 #: ../../mod/settings.php:889 ../../mod/settings.php:895
#: ../../mod/settings.php:926 ../../mod/settings.php:927 #: ../../mod/settings.php:931 ../../mod/settings.php:932
#: ../../mod/settings.php:928 ../../mod/settings.php:929 #: ../../mod/settings.php:933 ../../mod/settings.php:934
#: ../../mod/register.php:533 ../../mod/profiles.php:512 #: ../../mod/register.php:533 ../../mod/profiles.php:512
msgid "No" msgid "No"
msgstr "" msgstr ""
@ -352,7 +352,7 @@ msgstr ""
#: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:879 #: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:879
#: ../../mod/photos.php:950 ../../mod/photos.php:965 ../../mod/photos.php:1382 #: ../../mod/photos.php:950 ../../mod/photos.php:965 ../../mod/photos.php:1382
#: ../../mod/photos.php:1394 ../../addon/communityhome/communityhome.php:110 #: ../../mod/photos.php:1394 ../../addon/communityhome/communityhome.php:110
#: ../../view/theme/diabook/theme.php:135 #: ../../view/theme/diabook/theme.php:155
msgid "Contact Photos" msgid "Contact Photos"
msgstr "" msgstr ""
@ -375,7 +375,7 @@ msgstr ""
#: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174 #: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174
#: ../../mod/profile_photo.php:252 ../../mod/profile_photo.php:261 #: ../../mod/profile_photo.php:252 ../../mod/profile_photo.php:261
#: ../../addon/communityhome/communityhome.php:111 #: ../../addon/communityhome/communityhome.php:111
#: ../../view/theme/diabook/theme.php:136 #: ../../view/theme/diabook/theme.php:156
msgid "Profile Photos" msgid "Profile Photos"
msgstr "" msgstr ""
@ -397,7 +397,7 @@ msgstr ""
#: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70 #: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70
#: ../../addon/communityhome/communityhome.php:163 #: ../../addon/communityhome/communityhome.php:163
#: ../../view/theme/diabook/theme.php:107 ../../include/text.php:1304 #: ../../view/theme/diabook/theme.php:127 ../../include/text.php:1304
#: ../../include/diaspora.php:1654 ../../include/conversation.php:53 #: ../../include/diaspora.php:1654 ../../include/conversation.php:53
#: ../../include/conversation.php:126 #: ../../include/conversation.php:126
msgid "photo" msgid "photo"
@ -554,8 +554,8 @@ msgstr ""
msgid "Preview" msgid "Preview"
msgstr "" msgstr ""
#: ../../mod/photos.php:1331 ../../mod/settings.php:600 #: ../../mod/photos.php:1331 ../../mod/settings.php:602
#: ../../mod/settings.php:681 ../../mod/group.php:168 ../../mod/admin.php:642 #: ../../mod/settings.php:683 ../../mod/group.php:168 ../../mod/admin.php:642
#: ../../include/conversation.php:318 ../../include/conversation.php:584 #: ../../include/conversation.php:318 ../../include/conversation.php:584
msgid "Delete" msgid "Delete"
msgstr "" msgstr ""
@ -572,7 +572,7 @@ msgstr ""
msgid "Not available." msgid "Not available."
msgstr "" msgstr ""
#: ../../mod/community.php:30 ../../view/theme/diabook/theme.php:257 #: ../../mod/community.php:30 ../../view/theme/diabook/theme.php:276
#: ../../include/nav.php:101 #: ../../include/nav.php:101
msgid "Community" msgid "Community"
msgstr "" msgstr ""
@ -581,35 +581,35 @@ msgstr ""
msgid "No results." msgid "No results."
msgstr "" msgstr ""
#: ../../mod/friendica.php:47 #: ../../mod/friendica.php:55
msgid "This is Friendica, version" msgid "This is Friendica, version"
msgstr "" msgstr ""
#: ../../mod/friendica.php:48 #: ../../mod/friendica.php:56
msgid "running at web location" msgid "running at web location"
msgstr "" msgstr ""
#: ../../mod/friendica.php:50 #: ../../mod/friendica.php:58
msgid "" msgid ""
"Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn " "Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn "
"more about the Friendica project." "more about the Friendica project."
msgstr "" msgstr ""
#: ../../mod/friendica.php:52 #: ../../mod/friendica.php:60
msgid "Bug reports and issues: please visit" msgid "Bug reports and issues: please visit"
msgstr "" msgstr ""
#: ../../mod/friendica.php:53 #: ../../mod/friendica.php:61
msgid "" msgid ""
"Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - " "Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - "
"dot com" "dot com"
msgstr "" msgstr ""
#: ../../mod/friendica.php:58 #: ../../mod/friendica.php:75
msgid "Installed plugins/addons/apps:" msgid "Installed plugins/addons/apps:"
msgstr "" msgstr ""
#: ../../mod/friendica.php:71 #: ../../mod/friendica.php:88
msgid "No installed plugins/addons/apps" msgid "No installed plugins/addons/apps"
msgstr "" msgstr ""
@ -625,7 +625,7 @@ msgstr ""
msgid "Post to Email" msgid "Post to Email"
msgstr "" msgstr ""
#: ../../mod/editpost.php:95 ../../mod/settings.php:599 #: ../../mod/editpost.php:95 ../../mod/settings.php:601
#: ../../include/conversation.php:571 #: ../../include/conversation.php:571
msgid "Edit" msgid "Edit"
msgstr "" msgstr ""
@ -855,7 +855,7 @@ msgstr ""
msgid "StatusNet/Federated Social Web" msgid "StatusNet/Federated Social Web"
msgstr "" msgstr ""
#: ../../mod/dfrn_request.php:812 ../../mod/settings.php:634 #: ../../mod/dfrn_request.php:812 ../../mod/settings.php:636
#: ../../include/contact_selectors.php:80 #: ../../include/contact_selectors.php:80
msgid "Diaspora" msgid "Diaspora"
msgstr "" msgstr ""
@ -1214,7 +1214,7 @@ msgstr ""
msgid "Personal" msgid "Personal"
msgstr "" msgstr ""
#: ../../mod/notifications.php:90 ../../view/theme/diabook/theme.php:251 #: ../../mod/notifications.php:90 ../../view/theme/diabook/theme.php:270
#: ../../include/nav.php:77 ../../include/nav.php:115 #: ../../include/nav.php:77 ../../include/nav.php:115
msgid "Home" msgid "Home"
msgstr "" msgstr ""
@ -1655,7 +1655,7 @@ msgstr ""
msgid "Edit contact" msgid "Edit contact"
msgstr "" msgstr ""
#: ../../mod/contacts.php:544 ../../view/theme/diabook/theme.php:253 #: ../../mod/contacts.php:544 ../../view/theme/diabook/theme.php:272
#: ../../include/nav.php:139 #: ../../include/nav.php:139
msgid "Contacts" msgid "Contacts"
msgstr "" msgstr ""
@ -1688,7 +1688,7 @@ msgstr ""
#: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107 #: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107
#: ../../mod/register.php:388 ../../mod/register.php:442 #: ../../mod/register.php:388 ../../mod/register.php:442
#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:756 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:742
#: ../../addon/facebook/facebook.php:658 #: ../../addon/facebook/facebook.php:658
#: ../../addon/facebook/facebook.php:1148 #: ../../addon/facebook/facebook.php:1148
#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2716 #: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2716
@ -1783,7 +1783,7 @@ msgstr ""
msgid "Missing some important data!" msgid "Missing some important data!"
msgstr "" msgstr ""
#: ../../mod/settings.php:134 ../../mod/settings.php:563 #: ../../mod/settings.php:134 ../../mod/settings.php:565
msgid "Update" msgid "Update"
msgstr "" msgstr ""
@ -1811,23 +1811,23 @@ msgstr ""
msgid "Password update failed. Please try again." msgid "Password update failed. Please try again."
msgstr "" msgstr ""
#: ../../mod/settings.php:384 #: ../../mod/settings.php:385
msgid " Please use a shorter name." msgid " Please use a shorter name."
msgstr "" msgstr ""
#: ../../mod/settings.php:386 #: ../../mod/settings.php:387
msgid " Name too short." msgid " Name too short."
msgstr "" msgstr ""
#: ../../mod/settings.php:392 #: ../../mod/settings.php:393
msgid " Not valid email." msgid " Not valid email."
msgstr "" msgstr ""
#: ../../mod/settings.php:394 #: ../../mod/settings.php:395
msgid " Cannot change to that email." msgid " Cannot change to that email."
msgstr "" msgstr ""
#: ../../mod/settings.php:466 ../../addon/facebook/facebook.php:470 #: ../../mod/settings.php:468 ../../addon/facebook/facebook.php:470
#: ../../addon/impressum/impressum.php:77 #: ../../addon/impressum/impressum.php:77
#: ../../addon/openstreetmap/openstreetmap.php:80 #: ../../addon/openstreetmap/openstreetmap.php:80
#: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105 #: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105
@ -1835,405 +1835,409 @@ msgstr ""
msgid "Settings updated." msgid "Settings updated."
msgstr "" msgstr ""
#: ../../mod/settings.php:536 ../../mod/settings.php:562 #: ../../mod/settings.php:538 ../../mod/settings.php:564
#: ../../mod/settings.php:598 #: ../../mod/settings.php:600
msgid "Add application" msgid "Add application"
msgstr "" msgstr ""
#: ../../mod/settings.php:540 ../../mod/settings.php:566 #: ../../mod/settings.php:542 ../../mod/settings.php:568
#: ../../addon/statusnet/statusnet.php:547 #: ../../addon/statusnet/statusnet.php:547
msgid "Consumer Key" msgid "Consumer Key"
msgstr "" msgstr ""
#: ../../mod/settings.php:541 ../../mod/settings.php:567 #: ../../mod/settings.php:543 ../../mod/settings.php:569
#: ../../addon/statusnet/statusnet.php:546 #: ../../addon/statusnet/statusnet.php:546
msgid "Consumer Secret" msgid "Consumer Secret"
msgstr "" msgstr ""
#: ../../mod/settings.php:542 ../../mod/settings.php:568 #: ../../mod/settings.php:544 ../../mod/settings.php:570
msgid "Redirect" msgid "Redirect"
msgstr "" msgstr ""
#: ../../mod/settings.php:543 ../../mod/settings.php:569 #: ../../mod/settings.php:545 ../../mod/settings.php:571
msgid "Icon url" msgid "Icon url"
msgstr "" msgstr ""
#: ../../mod/settings.php:554 #: ../../mod/settings.php:556
msgid "You can't edit this application." msgid "You can't edit this application."
msgstr "" msgstr ""
#: ../../mod/settings.php:597 #: ../../mod/settings.php:599
msgid "Connected Apps" msgid "Connected Apps"
msgstr "" msgstr ""
#: ../../mod/settings.php:601 #: ../../mod/settings.php:603
msgid "Client key starts with" msgid "Client key starts with"
msgstr "" msgstr ""
#: ../../mod/settings.php:602 #: ../../mod/settings.php:604
msgid "No name" msgid "No name"
msgstr "" msgstr ""
#: ../../mod/settings.php:603 #: ../../mod/settings.php:605
msgid "Remove authorization" msgid "Remove authorization"
msgstr "" msgstr ""
#: ../../mod/settings.php:614 #: ../../mod/settings.php:616
msgid "No Plugin settings configured" msgid "No Plugin settings configured"
msgstr "" msgstr ""
#: ../../mod/settings.php:622 ../../addon/widgets/widgets.php:123 #: ../../mod/settings.php:624 ../../addon/widgets/widgets.php:123
msgid "Plugin Settings" msgid "Plugin Settings"
msgstr "" msgstr ""
#: ../../mod/settings.php:634 ../../mod/settings.php:635 #: ../../mod/settings.php:636 ../../mod/settings.php:637
#, php-format #, php-format
msgid "Built-in support for %s connectivity is %s" msgid "Built-in support for %s connectivity is %s"
msgstr "" msgstr ""
#: ../../mod/settings.php:634 ../../mod/settings.php:635 #: ../../mod/settings.php:636 ../../mod/settings.php:637
msgid "enabled" msgid "enabled"
msgstr "" msgstr ""
#: ../../mod/settings.php:634 ../../mod/settings.php:635 #: ../../mod/settings.php:636 ../../mod/settings.php:637
msgid "disabled" msgid "disabled"
msgstr "" msgstr ""
#: ../../mod/settings.php:635 #: ../../mod/settings.php:637
msgid "StatusNet" msgid "StatusNet"
msgstr "" msgstr ""
#: ../../mod/settings.php:665 #: ../../mod/settings.php:667
msgid "Connector Settings" msgid "Connector Settings"
msgstr "" msgstr ""
#: ../../mod/settings.php:670 #: ../../mod/settings.php:672
msgid "Email/Mailbox Setup" msgid "Email/Mailbox Setup"
msgstr "" msgstr ""
#: ../../mod/settings.php:671 #: ../../mod/settings.php:673
msgid "" msgid ""
"If you wish to communicate with email contacts using this service " "If you wish to communicate with email contacts using this service "
"(optional), please specify how to connect to your mailbox." "(optional), please specify how to connect to your mailbox."
msgstr "" msgstr ""
#: ../../mod/settings.php:672 #: ../../mod/settings.php:674
msgid "Last successful email check:" msgid "Last successful email check:"
msgstr "" msgstr ""
#: ../../mod/settings.php:673 #: ../../mod/settings.php:675
msgid "Email access is disabled on this site." msgid "Email access is disabled on this site."
msgstr "" msgstr ""
#: ../../mod/settings.php:674 #: ../../mod/settings.php:676
msgid "IMAP server name:" msgid "IMAP server name:"
msgstr "" msgstr ""
#: ../../mod/settings.php:675 #: ../../mod/settings.php:677
msgid "IMAP port:" msgid "IMAP port:"
msgstr "" msgstr ""
#: ../../mod/settings.php:676 #: ../../mod/settings.php:678
msgid "Security:" msgid "Security:"
msgstr "" msgstr ""
#: ../../mod/settings.php:676 ../../mod/settings.php:681 #: ../../mod/settings.php:678 ../../mod/settings.php:683
msgid "None" msgid "None"
msgstr "" msgstr ""
#: ../../mod/settings.php:677 #: ../../mod/settings.php:679
msgid "Email login name:" msgid "Email login name:"
msgstr "" msgstr ""
#: ../../mod/settings.php:678 #: ../../mod/settings.php:680
msgid "Email password:" msgid "Email password:"
msgstr "" msgstr ""
#: ../../mod/settings.php:679 #: ../../mod/settings.php:681
msgid "Reply-to address:" msgid "Reply-to address:"
msgstr "" msgstr ""
#: ../../mod/settings.php:680 #: ../../mod/settings.php:682
msgid "Send public posts to all email contacts:" msgid "Send public posts to all email contacts:"
msgstr "" msgstr ""
#: ../../mod/settings.php:681 #: ../../mod/settings.php:683
msgid "Action after import:" msgid "Action after import:"
msgstr "" msgstr ""
#: ../../mod/settings.php:681 #: ../../mod/settings.php:683
msgid "Mark as seen" msgid "Mark as seen"
msgstr "" msgstr ""
#: ../../mod/settings.php:681 #: ../../mod/settings.php:683
msgid "Move to folder" msgid "Move to folder"
msgstr "" msgstr ""
#: ../../mod/settings.php:682 #: ../../mod/settings.php:684
msgid "Move to folder:" msgid "Move to folder:"
msgstr "" msgstr ""
#: ../../mod/settings.php:742 #: ../../mod/settings.php:744
msgid "Display Settings" msgid "Display Settings"
msgstr "" msgstr ""
#: ../../mod/settings.php:748 #: ../../mod/settings.php:750
msgid "Display Theme:" msgid "Display Theme:"
msgstr "" msgstr ""
#: ../../mod/settings.php:749 #: ../../mod/settings.php:751
msgid "Update browser every xx seconds" msgid "Update browser every xx seconds"
msgstr "" msgstr ""
#: ../../mod/settings.php:749 #: ../../mod/settings.php:751
msgid "Minimum of 10 seconds, no maximum" msgid "Minimum of 10 seconds, no maximum"
msgstr "" msgstr ""
#: ../../mod/settings.php:750 #: ../../mod/settings.php:752
msgid "Number of items to display on the network page:" msgid "Number of items to display on the network page:"
msgstr "" msgstr ""
#: ../../mod/settings.php:750 #: ../../mod/settings.php:752
msgid "Maximum of 100 items" msgid "Maximum of 100 items"
msgstr "" msgstr ""
#: ../../mod/settings.php:751 #: ../../mod/settings.php:753
msgid "Don't show emoticons" msgid "Don't show emoticons"
msgstr "" msgstr ""
#: ../../mod/settings.php:816 ../../mod/admin.php:180 ../../mod/admin.php:616 #: ../../mod/settings.php:821 ../../mod/admin.php:180 ../../mod/admin.php:616
msgid "Normal Account" msgid "Normal Account"
msgstr "" msgstr ""
#: ../../mod/settings.php:817 #: ../../mod/settings.php:822
msgid "This account is a normal personal profile" msgid "This account is a normal personal profile"
msgstr "" msgstr ""
#: ../../mod/settings.php:820 ../../mod/admin.php:181 ../../mod/admin.php:617 #: ../../mod/settings.php:825 ../../mod/admin.php:181 ../../mod/admin.php:617
msgid "Soapbox Account" msgid "Soapbox Account"
msgstr "" msgstr ""
#: ../../mod/settings.php:821 #: ../../mod/settings.php:826
msgid "Automatically approve all connection/friend requests as read-only fans" msgid "Automatically approve all connection/friend requests as read-only fans"
msgstr "" msgstr ""
#: ../../mod/settings.php:824 ../../mod/admin.php:182 ../../mod/admin.php:618 #: ../../mod/settings.php:829 ../../mod/admin.php:182 ../../mod/admin.php:618
msgid "Community/Celebrity Account" msgid "Community/Celebrity Account"
msgstr "" msgstr ""
#: ../../mod/settings.php:825 #: ../../mod/settings.php:830
msgid "Automatically approve all connection/friend requests as read-write fans" msgid "Automatically approve all connection/friend requests as read-write fans"
msgstr "" msgstr ""
#: ../../mod/settings.php:828 ../../mod/admin.php:183 ../../mod/admin.php:619 #: ../../mod/settings.php:833 ../../mod/admin.php:183 ../../mod/admin.php:619
msgid "Automatic Friend Account" msgid "Automatic Friend Account"
msgstr "" msgstr ""
#: ../../mod/settings.php:829 #: ../../mod/settings.php:834
msgid "Automatically approve all connection/friend requests as friends" msgid "Automatically approve all connection/friend requests as friends"
msgstr "" msgstr ""
#: ../../mod/settings.php:839 #: ../../mod/settings.php:844
msgid "OpenID:" msgid "OpenID:"
msgstr "" msgstr ""
#: ../../mod/settings.php:839 #: ../../mod/settings.php:844
msgid "(Optional) Allow this OpenID to login to this account." msgid "(Optional) Allow this OpenID to login to this account."
msgstr "" msgstr ""
#: ../../mod/settings.php:849 #: ../../mod/settings.php:854
msgid "Publish your default profile in your local site directory?" msgid "Publish your default profile in your local site directory?"
msgstr "" msgstr ""
#: ../../mod/settings.php:855 #: ../../mod/settings.php:860
msgid "Publish your default profile in the global social directory?" msgid "Publish your default profile in the global social directory?"
msgstr "" msgstr ""
#: ../../mod/settings.php:863 #: ../../mod/settings.php:868
msgid "Hide your contact/friend list from viewers of your default profile?" msgid "Hide your contact/friend list from viewers of your default profile?"
msgstr "" msgstr ""
#: ../../mod/settings.php:867 #: ../../mod/settings.php:872
msgid "Hide your profile details from unknown viewers?" msgid "Hide your profile details from unknown viewers?"
msgstr "" msgstr ""
#: ../../mod/settings.php:872 #: ../../mod/settings.php:877
msgid "Allow friends to post to your profile page?" msgid "Allow friends to post to your profile page?"
msgstr "" msgstr ""
#: ../../mod/settings.php:878 #: ../../mod/settings.php:883
msgid "Allow friends to tag your posts?" msgid "Allow friends to tag your posts?"
msgstr "" msgstr ""
#: ../../mod/settings.php:884 #: ../../mod/settings.php:889
msgid "Allow us to suggest you as a potential friend to new members?" msgid "Allow us to suggest you as a potential friend to new members?"
msgstr "" msgstr ""
#: ../../mod/settings.php:890 #: ../../mod/settings.php:895
msgid "Permit unknown people to send you private mail?" msgid "Permit unknown people to send you private mail?"
msgstr "" msgstr ""
#: ../../mod/settings.php:901 #: ../../mod/settings.php:906
msgid "Profile is <strong>not published</strong>." msgid "Profile is <strong>not published</strong>."
msgstr "" msgstr ""
#: ../../mod/settings.php:907 ../../mod/profile_photo.php:211 #: ../../mod/settings.php:912 ../../mod/profile_photo.php:211
msgid "or" msgid "or"
msgstr "" msgstr ""
#: ../../mod/settings.php:912 #: ../../mod/settings.php:917
msgid "Your Identity Address is" msgid "Your Identity Address is"
msgstr "" msgstr ""
#: ../../mod/settings.php:923 #: ../../mod/settings.php:928
msgid "Automatically expire posts after this many days:" msgid "Automatically expire posts after this many days:"
msgstr "" msgstr ""
#: ../../mod/settings.php:923 #: ../../mod/settings.php:928
msgid "If empty, posts will not expire. Expired posts will be deleted" msgid "If empty, posts will not expire. Expired posts will be deleted"
msgstr "" msgstr ""
#: ../../mod/settings.php:924 #: ../../mod/settings.php:929
msgid "Advanced expiration settings" msgid "Advanced expiration settings"
msgstr "" msgstr ""
#: ../../mod/settings.php:925 #: ../../mod/settings.php:930
msgid "Advanced Expiration" msgid "Advanced Expiration"
msgstr "" msgstr ""
#: ../../mod/settings.php:926 #: ../../mod/settings.php:931
msgid "Expire posts:" msgid "Expire posts:"
msgstr "" msgstr ""
#: ../../mod/settings.php:927 #: ../../mod/settings.php:932
msgid "Expire personal notes:" msgid "Expire personal notes:"
msgstr "" msgstr ""
#: ../../mod/settings.php:928 #: ../../mod/settings.php:933
msgid "Expire starred posts:" msgid "Expire starred posts:"
msgstr "" msgstr ""
#: ../../mod/settings.php:929 #: ../../mod/settings.php:934
msgid "Expire photos:" msgid "Expire photos:"
msgstr "" msgstr ""
#: ../../mod/settings.php:933 #: ../../mod/settings.php:938
msgid "Account Settings" msgid "Account Settings"
msgstr "" msgstr ""
#: ../../mod/settings.php:942 #: ../../mod/settings.php:947
msgid "Password Settings" msgid "Password Settings"
msgstr "" msgstr ""
#: ../../mod/settings.php:943 #: ../../mod/settings.php:948
msgid "New Password:" msgid "New Password:"
msgstr "" msgstr ""
#: ../../mod/settings.php:944 #: ../../mod/settings.php:949
msgid "Confirm:" msgid "Confirm:"
msgstr "" msgstr ""
#: ../../mod/settings.php:944 #: ../../mod/settings.php:949
msgid "Leave password fields blank unless changing" msgid "Leave password fields blank unless changing"
msgstr "" msgstr ""
#: ../../mod/settings.php:948 #: ../../mod/settings.php:953
msgid "Basic Settings" msgid "Basic Settings"
msgstr "" msgstr ""
#: ../../mod/settings.php:949 ../../include/profile_advanced.php:15 #: ../../mod/settings.php:954 ../../include/profile_advanced.php:15
msgid "Full Name:" msgid "Full Name:"
msgstr "" msgstr ""
#: ../../mod/settings.php:950 #: ../../mod/settings.php:955
msgid "Email Address:" msgid "Email Address:"
msgstr "" msgstr ""
#: ../../mod/settings.php:951 #: ../../mod/settings.php:956
msgid "Your Timezone:" msgid "Your Timezone:"
msgstr "" msgstr ""
#: ../../mod/settings.php:952 #: ../../mod/settings.php:957
msgid "Default Post Location:" msgid "Default Post Location:"
msgstr "" msgstr ""
#: ../../mod/settings.php:953 #: ../../mod/settings.php:958
msgid "Use Browser Location:" msgid "Use Browser Location:"
msgstr "" msgstr ""
#: ../../mod/settings.php:956 #: ../../mod/settings.php:961
msgid "Security and Privacy Settings" msgid "Security and Privacy Settings"
msgstr "" msgstr ""
#: ../../mod/settings.php:958 #: ../../mod/settings.php:963
msgid "Maximum Friend Requests/Day:" msgid "Maximum Friend Requests/Day:"
msgstr "" msgstr ""
#: ../../mod/settings.php:958 ../../mod/settings.php:973 #: ../../mod/settings.php:963 ../../mod/settings.php:978
msgid "(to prevent spam abuse)" msgid "(to prevent spam abuse)"
msgstr "" msgstr ""
#: ../../mod/settings.php:959 #: ../../mod/settings.php:964
msgid "Default Post Permissions" msgid "Default Post Permissions"
msgstr "" msgstr ""
#: ../../mod/settings.php:960 #: ../../mod/settings.php:965
msgid "(click to open/close)" msgid "(click to open/close)"
msgstr "" msgstr ""
#: ../../mod/settings.php:973 #: ../../mod/settings.php:978
msgid "Maximum private messages per day from unknown people:" msgid "Maximum private messages per day from unknown people:"
msgstr "" msgstr ""
#: ../../mod/settings.php:976 #: ../../mod/settings.php:981
msgid "Notification Settings" msgid "Notification Settings"
msgstr "" msgstr ""
#: ../../mod/settings.php:977 #: ../../mod/settings.php:982
msgid "By default post a status message when:" msgid "By default post a status message when:"
msgstr "" msgstr ""
#: ../../mod/settings.php:978 #: ../../mod/settings.php:983
msgid "accepting a friend request" msgid "accepting a friend request"
msgstr "" msgstr ""
#: ../../mod/settings.php:979
msgid "making an <em>interesting</em> profile change"
msgstr ""
#: ../../mod/settings.php:980
msgid "Send a notification email when:"
msgstr ""
#: ../../mod/settings.php:981
msgid "You receive an introduction"
msgstr ""
#: ../../mod/settings.php:982
msgid "Your introductions are confirmed"
msgstr ""
#: ../../mod/settings.php:983
msgid "Someone writes on your profile wall"
msgstr ""
#: ../../mod/settings.php:984 #: ../../mod/settings.php:984
msgid "Someone writes a followup comment" msgid "joining a forum/community"
msgstr "" msgstr ""
#: ../../mod/settings.php:985 #: ../../mod/settings.php:985
msgid "You receive a private message" msgid "making an <em>interesting</em> profile change"
msgstr "" msgstr ""
#: ../../mod/settings.php:986 #: ../../mod/settings.php:986
msgid "You receive a friend suggestion" msgid "Send a notification email when:"
msgstr "" msgstr ""
#: ../../mod/settings.php:987 #: ../../mod/settings.php:987
msgid "You are tagged in a post" msgid "You receive an introduction"
msgstr ""
#: ../../mod/settings.php:988
msgid "Your introductions are confirmed"
msgstr ""
#: ../../mod/settings.php:989
msgid "Someone writes on your profile wall"
msgstr "" msgstr ""
#: ../../mod/settings.php:990 #: ../../mod/settings.php:990
msgid "Someone writes a followup comment"
msgstr ""
#: ../../mod/settings.php:991
msgid "You receive a private message"
msgstr ""
#: ../../mod/settings.php:992
msgid "You receive a friend suggestion"
msgstr ""
#: ../../mod/settings.php:993
msgid "You are tagged in a post"
msgstr ""
#: ../../mod/settings.php:996
msgid "Advanced Page Settings" msgid "Advanced Page Settings"
msgstr "" msgstr ""
@ -2556,7 +2560,7 @@ msgstr ""
msgid "Group name changed." msgid "Group name changed."
msgstr "" msgstr ""
#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:308 #: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:305
msgid "Permission denied" msgid "Permission denied"
msgstr "" msgstr ""
@ -2596,7 +2600,7 @@ msgstr ""
msgid "Profile Visibility Editor" msgid "Profile Visibility Editor"
msgstr "" msgstr ""
#: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:252 #: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:271
#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74
#: ../../include/nav.php:50 ../../boot.php:1478 #: ../../include/nav.php:50 ../../boot.php:1478
msgid "Profile" msgid "Profile"
@ -2782,8 +2786,8 @@ msgstr ""
#: ../../addon/facebook/facebook.php:1542 #: ../../addon/facebook/facebook.php:1542
#: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:158
#: ../../addon/communityhome/communityhome.php:167 #: ../../addon/communityhome/communityhome.php:167
#: ../../view/theme/diabook/theme.php:102 #: ../../view/theme/diabook/theme.php:122
#: ../../view/theme/diabook/theme.php:111 ../../include/diaspora.php:1654 #: ../../view/theme/diabook/theme.php:131 ../../include/diaspora.php:1654
#: ../../include/conversation.php:48 ../../include/conversation.php:57 #: ../../include/conversation.php:48 ../../include/conversation.php:57
#: ../../include/conversation.php:121 ../../include/conversation.php:130 #: ../../include/conversation.php:121 ../../include/conversation.php:130
msgid "status" msgid "status"
@ -2791,7 +2795,7 @@ msgstr ""
#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1546 #: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1546
#: ../../addon/communityhome/communityhome.php:172 #: ../../addon/communityhome/communityhome.php:172
#: ../../view/theme/diabook/theme.php:116 ../../include/diaspora.php:1670 #: ../../view/theme/diabook/theme.php:136 ../../include/diaspora.php:1670
#: ../../include/conversation.php:65 #: ../../include/conversation.php:65
#, php-format #, php-format
msgid "%1$s likes %2$s's %3$s" msgid "%1$s likes %2$s's %3$s"
@ -2812,7 +2816,7 @@ msgstr ""
msgid "Access denied." msgid "Access denied."
msgstr "" msgstr ""
#: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:254 #: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:273
#: ../../include/nav.php:51 ../../boot.php:1484 #: ../../include/nav.php:51 ../../boot.php:1484
msgid "Photos" msgid "Photos"
msgstr "" msgstr ""
@ -4043,7 +4047,7 @@ msgstr ""
msgid "No entries." msgid "No entries."
msgstr "" msgstr ""
#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:163 #: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:183
#: ../../include/contact_widgets.php:34 #: ../../include/contact_widgets.php:34
msgid "Friend Suggestions" msgid "Friend Suggestions"
msgstr "" msgstr ""
@ -4058,7 +4062,7 @@ msgstr ""
msgid "Ignore/Hide" msgid "Ignore/Hide"
msgstr "" msgstr ""
#: ../../mod/directory.php:47 ../../view/theme/diabook/theme.php:161 #: ../../mod/directory.php:47 ../../view/theme/diabook/theme.php:181
msgid "Global Directory" msgid "Global Directory"
msgstr "" msgstr ""
@ -4197,58 +4201,58 @@ msgstr ""
msgid "Unable to set contact photo." msgid "Unable to set contact photo."
msgstr "" msgstr ""
#: ../../mod/dfrn_confirm.php:488 #: ../../mod/dfrn_confirm.php:482 ../../include/diaspora.php:507
#, php-format
msgid "%1$s welcomes new member %2$s"
msgstr ""
#: ../../mod/dfrn_confirm.php:498 ../../include/diaspora.php:507
#: ../../include/conversation.php:101 #: ../../include/conversation.php:101
#, php-format #, php-format
msgid "%1$s is now friends with %2$s" msgid "%1$s is now friends with %2$s"
msgstr "" msgstr ""
#: ../../mod/dfrn_confirm.php:572 #: ../../mod/dfrn_confirm.php:554
#, php-format #, php-format
msgid "No user record found for '%s' " msgid "No user record found for '%s' "
msgstr "" msgstr ""
#: ../../mod/dfrn_confirm.php:582 #: ../../mod/dfrn_confirm.php:564
msgid "Our site encryption key is apparently messed up." msgid "Our site encryption key is apparently messed up."
msgstr "" msgstr ""
#: ../../mod/dfrn_confirm.php:593 #: ../../mod/dfrn_confirm.php:575
msgid "Empty site URL was provided or URL could not be decrypted by us." msgid "Empty site URL was provided or URL could not be decrypted by us."
msgstr "" msgstr ""
#: ../../mod/dfrn_confirm.php:614 #: ../../mod/dfrn_confirm.php:596
msgid "Contact record was not found for you on our site." msgid "Contact record was not found for you on our site."
msgstr "" msgstr ""
#: ../../mod/dfrn_confirm.php:628 #: ../../mod/dfrn_confirm.php:610
#, php-format #, php-format
msgid "Site public key not available in contact record for URL %s." msgid "Site public key not available in contact record for URL %s."
msgstr "" msgstr ""
#: ../../mod/dfrn_confirm.php:648 #: ../../mod/dfrn_confirm.php:630
msgid "" msgid ""
"The ID provided by your system is a duplicate on our system. It should work " "The ID provided by your system is a duplicate on our system. It should work "
"if you try again." "if you try again."
msgstr "" msgstr ""
#: ../../mod/dfrn_confirm.php:659 #: ../../mod/dfrn_confirm.php:641
msgid "Unable to set your contact credentials on our system." msgid "Unable to set your contact credentials on our system."
msgstr "" msgstr ""
#: ../../mod/dfrn_confirm.php:724 #: ../../mod/dfrn_confirm.php:706
msgid "Unable to update your contact profile details on our system" msgid "Unable to update your contact profile details on our system"
msgstr "" msgstr ""
#: ../../mod/dfrn_confirm.php:754 #: ../../mod/dfrn_confirm.php:740
#, php-format #, php-format
msgid "Connection accepted at %s" msgid "Connection accepted at %s"
msgstr "" msgstr ""
#: ../../mod/dfrn_confirm.php:789
#, php-format
msgid "%1$s has joined %2$s"
msgstr ""
#: ../../addon/facebook/facebook.php:491 #: ../../addon/facebook/facebook.php:491
msgid "Facebook disabled" msgid "Facebook disabled"
msgstr "" msgstr ""
@ -4625,7 +4629,7 @@ msgid "Latest likes"
msgstr "" msgstr ""
#: ../../addon/communityhome/communityhome.php:155 #: ../../addon/communityhome/communityhome.php:155
#: ../../view/theme/diabook/theme.php:99 ../../include/text.php:1302 #: ../../view/theme/diabook/theme.php:119 ../../include/text.php:1302
#: ../../include/conversation.php:45 ../../include/conversation.php:118 #: ../../include/conversation.php:45 ../../include/conversation.php:118
msgid "event" msgid "event"
msgstr "" msgstr ""
@ -5546,72 +5550,76 @@ msgid "Color scheme"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:48 #: ../../view/theme/diabook/theme.php:48
msgid "Community Profiles"
msgstr ""
#: ../../view/theme/diabook/theme.php:68
msgid "Last users" msgid "Last users"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:77 #: ../../view/theme/diabook/theme.php:97
msgid "Last likes" msgid "Last likes"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:122 #: ../../view/theme/diabook/theme.php:142
msgid "Last photos" msgid "Last photos"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:159 #: ../../view/theme/diabook/theme.php:179
msgid "Find Friends" msgid "Find Friends"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:160 #: ../../view/theme/diabook/theme.php:180
msgid "Local Directory" msgid "Local Directory"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:162 ../../include/contact_widgets.php:35 #: ../../view/theme/diabook/theme.php:182 ../../include/contact_widgets.php:35
msgid "Similar Interests" msgid "Similar Interests"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:164 ../../include/contact_widgets.php:37 #: ../../view/theme/diabook/theme.php:184 ../../include/contact_widgets.php:37
msgid "Invite Friends" msgid "Invite Friends"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:180 #: ../../view/theme/diabook/theme.php:199
#: ../../view/theme/diabook/theme.php:258 #: ../../view/theme/diabook/theme.php:277
msgid "Community Pages" msgid "Community Pages"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:213 #: ../../view/theme/diabook/theme.php:232
msgid "Help or @NewHere ?" msgid "Help or @NewHere ?"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:219 #: ../../view/theme/diabook/theme.php:238
msgid "Connect Services" msgid "Connect Services"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:251 ../../include/nav.php:49 #: ../../view/theme/diabook/theme.php:270 ../../include/nav.php:49
#: ../../include/nav.php:115 #: ../../include/nav.php:115
msgid "Your posts and conversations" msgid "Your posts and conversations"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:252 ../../include/nav.php:50 #: ../../view/theme/diabook/theme.php:271 ../../include/nav.php:50
msgid "Your profile page" msgid "Your profile page"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:253 #: ../../view/theme/diabook/theme.php:272
msgid "Your contacts" msgid "Your contacts"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:254 ../../include/nav.php:51 #: ../../view/theme/diabook/theme.php:273 ../../include/nav.php:51
msgid "Your photos" msgid "Your photos"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:255 ../../include/nav.php:52 #: ../../view/theme/diabook/theme.php:274 ../../include/nav.php:52
msgid "Your events" msgid "Your events"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:256 ../../include/nav.php:53 #: ../../view/theme/diabook/theme.php:275 ../../include/nav.php:53
msgid "Personal notes" msgid "Personal notes"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:256 ../../include/nav.php:53 #: ../../view/theme/diabook/theme.php:275 ../../include/nav.php:53
msgid "Your personal photos" msgid "Your personal photos"
msgstr "" msgstr ""

21
view/remote_friends_common.tpl Normal file
View file

@ -0,0 +1,21 @@
<div id="remote-friends-in-common" class="bigwidget">
<div id="rfic-desc">$desc</div>
{{ if $items }}
{{ for $items as $item }}
<div class="profile-match-wrapper">
<div class="profile-match-photo">
<a href="$item.url">
<img src="$item.photo" width="80" height="80" alt="$item.name" title="$item.name" />
</a>
</div>
<div class="profile-match-break"></div>
<div class="profile-match-name">
<a href="$itemurl" title="$item.name">$item.name</a>
</div>
<div class="profile-match-end"></div>
</div>
{{ endfor }}
{{ endif }}
<div id="rfic-end" class="clear"></div>
</div>

6
view/theme/diabook/communityhome.tpl
View file

@ -53,9 +53,6 @@ $nv.search
{{ endif }} {{ endif }}
</div> </div>
<div id="twitter">
</div>
<div id="close_lastusers"> <div id="close_lastusers">
{{ if $lastusers_title }} {{ if $lastusers_title }}
<h3>$lastusers_title<a id="close_lastusers_icon" onClick="close_lastusers()" class="icon close_box" title="close"></a></h3> <h3>$lastusers_title<a id="close_lastusers_icon" onClick="close_lastusers()" class="icon close_box" title="close"></a></h3>
@ -97,3 +94,6 @@ $nv.search
</ul> </ul>
{{ endif }} {{ endif }}
</div> </div>
<div id="twitter">
</div>

3
view/theme/diabook/diabook-dark/style-network.css
View file

@ -1597,9 +1597,10 @@ transition: all 0.2s ease-in-out;
width: 99%; width: 99%;
font-size: 15px; font-size: 15px;
color: #eec; color: #eec;
border: 1px solid #444; border: 1px solid #eec;
padding: 0.3em; padding: 0.3em;
margin-bottom: 10px; margin-bottom: 10px;
background: #444
} }
.grey .grey
{ {

9
view/theme/diabook/diabook-dark/style.css
View file

@ -547,7 +547,7 @@ code {
float: right; float: right;
} }
.tool a { .tool a {
color: #3465a4; color: #88a9d2;
} }
.tool a:hover { .tool a:hover {
text-decoration: none; text-decoration: none;
@ -594,7 +594,7 @@ header #banner a:active,
header #banner a:visited, header #banner a:visited,
header #banner a:link, header #banner a:link,
header #banner a:hover { header #banner a:hover {
color: #2e2f2e; color: #eec;
text-decoration: none; text-decoration: none;
outline: none; outline: none;
vertical-align: middle; vertical-align: middle;
@ -806,7 +806,7 @@ nav .nav-menu-icon:hover {
} }
nav .nav-menu-icon.selected { nav .nav-menu-icon.selected {
background-color: #fff; background-color: #308dbf;
} }
nav .nav-menu-icon img { nav .nav-menu-icon img {
width: 22px; width: 22px;
@ -929,7 +929,7 @@ ul.menu-popup {
} }
ul.menu-popup a { ul.menu-popup a {
display: block; display: block;
color: #2e302e; color: #eec;
padding: 5px 10px; padding: 5px 10px;
text-decoration: none; text-decoration: none;
} }
@ -1923,6 +1923,7 @@ body .pageheader{
margin: 0 0 5px; margin: 0 0 5px;
width: 60%; width: 60%;
border: 1px solid #d2d2d2; border: 1px solid #d2d2d2;
background: #444;
} }
#profile-jot-form #jot-title:-webkit-input-placeholder { #profile-jot-form #jot-title:-webkit-input-placeholder {
font-weight: normal; font-weight: normal;

6
view/theme/diabook/theme.php
View file

@ -195,9 +195,9 @@ function diabook_community_info(){
//Community Page //Community Page
if(local_user()) { if(local_user()) {
$page = '<div id="page-sidebar-right_aside" > $page = '<div id="" >
<h3 style="margin-top:0px;">'.t("Community Pages").'<a id="close_pages_icon" onClick="close_pages()" class="icon close_box" title="close"></a></h3></div> <h3 style="margin-top:0px;">'.t("Community Pages").'<a id="close_pages_icon" onClick="close_pages()" class="icon close_box" title="close"></a></h3></div>
<div id="sidebar-page-list"><ul>'; <div id=""><ul style="margin-left: 7px;margin-top: 0px;padding-left: 0px;padding-top: 0px;">';
$pagelist = array(); $pagelist = array();
@ -218,7 +218,7 @@ function diabook_community_info(){
$contacts = $pageD; $contacts = $pageD;
foreach($contacts as $contact) { foreach($contacts as $contact) {
$page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" style="float: left; margin-right: 3px;" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" style="margin-top: 2px;" title="' . $contact['url'] . '" class="label" target="external-link">'. $page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" style="float: left; margin-right: 3px;" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" style="margin-top: 2px; word-wrap: break-word; width: 132px;" title="' . $contact['url'] . '" class="label" target="external-link">'.
$contact["name"]."</a></li>"; $contact["name"]."</a></li>";
} }
$page .= '</ul></div></div>'; $page .= '</ul></div></div>';

8
view/theme/dispy/light/style.css
View file

@ -2,10 +2,10 @@ article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display
audio,canvas,video,time{display:inline-block;*display:inline;*zoom:1;} audio,canvas,video,time{display:inline-block;*display:inline;*zoom:1;}
audio:not([controls]),[hidden]{display:none;} audio:not([controls]),[hidden]{display:none;}
html{font-size:100%;overflow-y:scroll;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;} html{font-size:100%;overflow-y:scroll;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;}
body{margin:0;font-size:16px;line-height:1.1em;font-family:sans-serif;color:#222;background-color:#e8e8e8;} body{margin:0;font-size:16px;line-height:1.1em;font-family:sans-serif;color:#111;background-color:#eee;}
button,input,select,textarea{font-family:sans-serif;color:#222;background-color:#e8e8e8;} button,input,select,textarea{font-family:sans-serif;color:#222;background-color:#eee;}
select{border:1px #555 dotted;padding:3px;margin:3px;color:#222;background:#e8e8e8;} select{border:1px #555 dotted;padding:3px;margin:3px;color:#222;background:#eee;}
option{padding:3px;color:#222;background:#e8e8e8;}option[selected="selected"]{color:#111;background:#cca;} option{padding:3px;color:#222;background:#eee;}option[selected="selected"]{color:#111;background:#cca;}
ul,ol{padding:0;} ul,ol{padding:0;}
:focus{outline:0;} :focus{outline:0;}
[disabled="disabled"]{background:#ddd;color:#333;} [disabled="disabled"]{background:#ddd;color:#333;}

12
view/theme/dispy/light/style.less
View file

@ -13,6 +13,8 @@
/* from html5boilerplate */ /* from html5boilerplate */
/* these are to tell browsers they should be displayed a certain way */ /* these are to tell browsers they should be displayed a certain way */
//@import "_base.less";
article, aside, details, figcaption, figure, footer, header, hgroup, nav, section { article, aside, details, figcaption, figure, footer, header, hgroup, nav, section {
display: block; } display: block; }
@ -44,25 +46,25 @@ body {
font-size: 16px; font-size: 16px;
line-height: 1.1em; line-height: 1.1em;
font-family: sans-serif; font-family: sans-serif;
color: #222; color: #111;
background-color: #e8e8e8; } background-color: #eee; }
button, input, select, textarea { button, input, select, textarea {
font-family: sans-serif; font-family: sans-serif;
color: #222; color: #222;
background-color: #e8e8e8; } background-color: #eee; }
select { select {
border: 1px #555 dotted; border: 1px #555 dotted;
padding: 3px; padding: 3px;
margin: 3px; margin: 3px;
color: #222; color: #222;
background: #e8e8e8; } background: #eee; }
option { option {
padding: 3px; padding: 3px;
color: #222; color: #222;
background: #e8e8e8; background: #eee;
&[selected="selected"] { &[selected="selected"] {
color: #111; color: #111;
background: #cca; } } background: #cca; } }