This commit is contained in:
friendica 2012-09-30 02:08:56 -07:00
commit 84199e6e71
58 changed files with 29249 additions and 8519 deletions

View file

@ -350,6 +350,8 @@ if(! class_exists('App')) {
public $plugins; public $plugins;
public $apps = array(); public $apps = array();
public $identities; public $identities;
public $is_mobile;
public $is_tablet;
public $nav_sel; public $nav_sel;
@ -491,6 +493,14 @@ if(! class_exists('App')) {
if($this->pager['start'] < 0) if($this->pager['start'] < 0)
$this->pager['start'] = 0; $this->pager['start'] = 0;
$this->pager['total'] = 0; $this->pager['total'] = 0;
/**
* Detect mobile devices
*/
$mobile_detect = new Mobile_Detect();
$this->is_mobile = $mobile_detect->isMobile();
$this->is_tablet = $mobile_detect->isTablet();
} }
function get_baseurl($ssl = false) { function get_baseurl($ssl = false) {
@ -1288,14 +1298,14 @@ if(! function_exists('get_birthdays')) {
$a = get_app(); $a = get_app();
$o = ''; $o = '';
if(! local_user()) if(! local_user() || $a->is_mobile || $a->is_tablet)
return $o; return $o;
$mobile_detect = new Mobile_Detect(); // $mobile_detect = new Mobile_Detect();
$is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet(); // $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
if($is_mobile) // if($is_mobile)
return $o; // return $o;
$bd_format = t('g A l F d') ; // 8 AM Friday January 18 $bd_format = t('g A l F d') ; // 8 AM Friday January 18
$bd_short = t('F d'); $bd_short = t('F d');
@ -1373,15 +1383,15 @@ if(! function_exists('get_events')) {
$a = get_app(); $a = get_app();
if(! local_user()) if(! local_user() || $a->is_mobile || $a->is_tablet)
return $o; return $o;
$mobile_detect = new Mobile_Detect(); // $mobile_detect = new Mobile_Detect();
$is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet(); // $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
if($is_mobile) // if($is_mobile)
return $o; // return $o;
$bd_format = t('g A l F d') ; // 8 AM Friday January 18 $bd_format = t('g A l F d') ; // 8 AM Friday January 18
$bd_short = t('F d'); $bd_short = t('F d');
@ -1507,8 +1517,9 @@ if(! function_exists('current_theme')) {
$a = get_app(); $a = get_app();
$mobile_detect = new Mobile_Detect(); // $mobile_detect = new Mobile_Detect();
$is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet(); // $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
$is_mobile = $a->is_mobile || $a->is_tablet;
if($is_mobile) { if($is_mobile) {
if(isset($_SESSION['show-mobile']) && !$_SESSION['show-mobile']) { if(isset($_SESSION['show-mobile']) && !$_SESSION['show-mobile']) {

View file

@ -458,10 +458,10 @@ function probe_url($url, $mode = PROBE_NORMAL) {
$poll = 'email ' . random_string(); $poll = 'email ' . random_string();
$priority = 0; $priority = 0;
$x = email_msg_meta($mbox,$msgs[0]); $x = email_msg_meta($mbox,$msgs[0]);
if(stristr($x->from,$orig_url)) if(stristr($x[0]->from,$orig_url))
$adr = imap_rfc822_parse_adrlist($x->from,''); $adr = imap_rfc822_parse_adrlist($x[0]->from,'');
elseif(stristr($x->to,$orig_url)) elseif(stristr($x[0]->to,$orig_url))
$adr = imap_rfc822_parse_adrlist($x->to,''); $adr = imap_rfc822_parse_adrlist($x[0]->to,'');
if(isset($adr)) { if(isset($adr)) {
foreach($adr as $feadr) { foreach($adr as $feadr) {
if((strcasecmp($feadr->mailbox,$name) == 0) if((strcasecmp($feadr->mailbox,$name) == 0)
@ -554,6 +554,13 @@ function probe_url($url, $mode = PROBE_NORMAL) {
logger('probe_url: scrape_vcard: ' . print_r($vcard,true), LOGGER_DATA); logger('probe_url: scrape_vcard: ' . print_r($vcard,true), LOGGER_DATA);
} }
if($diaspora && $addr) {
// Diaspora returns the name as the nick. As the nick will never be updated,
// let's use the Diaspora nickname (the first part of the handle) as the nick instead
$addr_parts = explode('@', $addr);
$vcard['nick'] = $addr_parts[0];
}
if($twitter) { if($twitter) {
logger('twitter: setup'); logger('twitter: setup');
$tid = basename($url); $tid = basename($url);

View file

@ -141,6 +141,17 @@ function diaspora_get_contact_by_handle($uid,$handle) {
); );
if($r && count($r)) if($r && count($r))
return $r[0]; return $r[0];
$handle_parts = explode("@", $handle);
$nurl_sql = '%%://' . $handle_parts[1] . '%%/profile/' . $handle_parts[0];
$r = q("SELECT * FROM contact WHERE network = '%s' AND uid = %d AND nurl LIKE '%s' LIMIT 1",
dbesc(NETWORK_DFRN),
intval($uid),
dbesc($nurl_sql)
);
if($r && count($r))
return $r[0];
return false; return false;
} }
@ -1949,7 +1960,7 @@ function diaspora_signed_retraction($importer,$xml,$msg) {
$contact = diaspora_get_contact_by_handle($importer['uid'],$diaspora_handle); $contact = diaspora_get_contact_by_handle($importer['uid'],$diaspora_handle);
if(! $contact) { if(! $contact) {
logger('diaspora_signed_retraction: no contact'); logger('diaspora_signed_retraction: no contact ' . $diaspora_handle . ' for ' . $importer['uid']);
return; return;
} }

View file

@ -48,8 +48,8 @@ function construct_mailbox_name($mailacct) {
function email_msg_meta($mbox,$uid) { function email_msg_meta($mbox,$uid) {
$ret = (($mbox && $uid) ? @imap_fetch_overview($mbox,$uid,FT_UID) : array(array())); $ret = (($mbox && $uid) ? @imap_fetch_overview($mbox,$uid,FT_UID) : array(array())); // POSSIBLE CLEANUP --> array(array()) is probably redundant now
return ((count($ret)) ? $ret[0] : array()); return ((count($ret)) ? $ret : array());
} }
function email_msg_headers($mbox,$uid) { function email_msg_headers($mbox,$uid) {

View file

@ -40,7 +40,7 @@ function group_add($uid,$name) {
function group_rmv($uid,$name) { function group_rmv($uid,$name) {
$ret = false; $ret = false;
if(x($uid) && x($name)) { if(x($uid) && x($name)) {
$r = q("SELECT * FROM `group` WHERE `uid` = %d AND `name` = '%s' LIMIT 1", $r = q("SELECT id FROM `group` WHERE `uid` = %d AND `name` = '%s' LIMIT 1",
intval($uid), intval($uid),
dbesc($name) dbesc($name)
); );
@ -49,6 +49,37 @@ function group_rmv($uid,$name) {
if(! $group_id) if(! $group_id)
return false; return false;
// remove group from default posting lists
$r = q("SELECT def_gid, allow_gid, deny_gid FROM user WHERE uid = %d LIMIT 1",
intval($uid)
);
if($r) {
$user_info = $r[0];
$change = false;
if($user_info['def_gid'] == $group_id) {
$user_info['def_gid'] = 0;
$change = true;
}
if(strpos($user_info['allow_gid'], '<' . $group_id . '>') !== false) {
$user_info['allow_gid'] = str_replace('<' . $group_id . '>', '', $user_info['allow_gid']);
$change = true;
}
if(strpos($user_info['deny_gid'], '<' . $group_id . '>') !== false) {
$user_info['deny_gid'] = str_replace('<' . $group_id . '>', '', $user_info['deny_gid']);
$change = true;
}
if($change) {
q("UPDATE user SET def_gid = %d, allow_gid = '%s', deny_gid = '%s' WHERE uid = %d",
intval($user_info['def_gid']),
dbesc($user_info['allow_gid']),
dbesc($user_info['deny_gid']),
intval($uid)
);
}
}
// remove all members // remove all members
$r = q("DELETE FROM `group_member` WHERE `uid` = %d AND `gid` = %d ", $r = q("DELETE FROM `group_member` WHERE `uid` = %d AND `gid` = %d ",
intval($uid), intval($uid),
@ -103,7 +134,7 @@ function group_add_member($uid,$name,$member,$gid = 0) {
if((! $gid) || (! $uid) || (! $member)) if((! $gid) || (! $uid) || (! $member))
return false; return false;
$r = q("SELECT * FROM `group_member` WHERE `uid` = %d AND `id` = %d AND `contact-id` = %d LIMIT 1", $r = q("SELECT * FROM `group_member` WHERE `uid` = %d AND `gid` = %d AND `contact-id` = %d LIMIT 1",
intval($uid), intval($uid),
intval($gid), intval($gid),
intval($member) intval($member)

View file

@ -291,36 +291,17 @@ function onepoll_run($argv, $argc){
if(count($msgs)) { if(count($msgs)) {
logger("Mail: Parsing ".count($msgs)." mails for ".$mailconf[0]['user'], LOGGER_DEBUG); logger("Mail: Parsing ".count($msgs)." mails for ".$mailconf[0]['user'], LOGGER_DEBUG);
foreach($msgs as $msg_uid) { $metas = email_msg_meta($mbox,implode(',',$msgs));
$msgs = array_combine($msgs, $metas);
foreach($msgs as $msg_uid => $meta) {
logger("Mail: Parsing mail ".$msg_uid, LOGGER_DATA); logger("Mail: Parsing mail ".$msg_uid, LOGGER_DATA);
$datarray = array(); $datarray = array();
$meta = email_msg_meta($mbox,$msg_uid); // $meta = email_msg_meta($mbox,$msg_uid);
$headers = email_msg_headers($mbox,$msg_uid); // $headers = email_msg_headers($mbox,$msg_uid);
// look for a 'references' header and try and match with a parent item we have locally.
$raw_refs = ((x($headers,'references')) ? str_replace("\t",'',$headers['references']) : '');
$datarray['uri'] = msgid2iri(trim($meta->message_id,'<>')); $datarray['uri'] = msgid2iri(trim($meta->message_id,'<>'));
if($raw_refs) {
$refs_arr = explode(' ', $raw_refs);
if(count($refs_arr)) {
for($x = 0; $x < count($refs_arr); $x ++)
$refs_arr[$x] = "'" . msgid2iri(str_replace(array('<','>',' '),array('','',''),dbesc($refs_arr[$x]))) . "'";
}
$qstr = implode(',',$refs_arr);
$r = q("SELECT `uri` , `parent-uri` FROM `item` WHERE `uri` IN ( $qstr ) AND `uid` = %d LIMIT 1",
intval($importer_uid)
);
if(count($r))
$datarray['parent-uri'] = $r[0]['uri'];
}
if(! x($datarray,'parent-uri'))
$datarray['parent-uri'] = $datarray['uri'];
// Have we seen it before? // Have we seen it before?
$r = q("SELECT * FROM `item` WHERE `uid` = %d AND `uri` = '%s' LIMIT 1", $r = q("SELECT * FROM `item` WHERE `uid` = %d AND `uri` = '%s' LIMIT 1",
intval($importer_uid), intval($importer_uid),
@ -328,15 +309,16 @@ function onepoll_run($argv, $argc){
); );
if(count($r)) { if(count($r)) {
// logger("Mail: Seen before ".$msg_uid); logger("Mail: Seen before ".$msg_uid." for ".$mailconf[0]['user']);
if($meta->deleted && ! $r[0]['deleted']) { if($meta->deleted && ! $r[0]['deleted']) {
q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `id` = %d LIMIT 1", q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `id` = %d LIMIT 1",
dbesc(datetime_convert()), dbesc(datetime_convert()),
intval($r[0]['id']) intval($r[0]['id'])
); );
} }
switch ($mailconf[0]['action']) { /*switch ($mailconf[0]['action']) {
case 0: case 0:
logger("Mail: Seen before ".$msg_uid." for ".$mailconf[0]['user'].". Doing nothing.", LOGGER_DEBUG);
break; break;
case 1: case 1:
logger("Mail: Deleting ".$msg_uid." for ".$mailconf[0]['user']); logger("Mail: Deleting ".$msg_uid." for ".$mailconf[0]['user']);
@ -352,10 +334,38 @@ function onepoll_run($argv, $argc){
if ($mailconf[0]['movetofolder'] != "") if ($mailconf[0]['movetofolder'] != "")
imap_mail_move($mbox, $msg_uid, $mailconf[0]['movetofolder'], FT_UID); imap_mail_move($mbox, $msg_uid, $mailconf[0]['movetofolder'], FT_UID);
break; break;
} }*/
continue; continue;
} }
// look for a 'references' or an 'in-reply-to' header and try to match with a parent item we have locally.
// $raw_refs = ((x($headers,'references')) ? str_replace("\t",'',$headers['references']) : '');
$raw_refs = ((property_exists($meta,'references')) ? str_replace("\t",'',$meta->references) : '');
if(! trim($raw_refs))
$raw_refs = ((property_exists($meta,'in_reply_to')) ? str_replace("\t",'',$meta->in_reply_to) : '');
$raw_refs = trim($raw_refs); // Don't allow a blank reference in $refs_arr
if($raw_refs) {
$refs_arr = explode(' ', $raw_refs);
if(count($refs_arr)) {
for($x = 0; $x < count($refs_arr); $x ++)
$refs_arr[$x] = "'" . msgid2iri(str_replace(array('<','>',' '),array('','',''),dbesc($refs_arr[$x]))) . "'";
}
$qstr = implode(',',$refs_arr);
$r = q("SELECT `uri` , `parent-uri` FROM `item` WHERE `uri` IN ( $qstr ) AND `uid` = %d LIMIT 1",
intval($importer_uid)
);
if(count($r))
$datarray['parent-uri'] = $r[0]['parent-uri']; // Set the parent as the top-level item
// $datarray['parent-uri'] = $r[0]['uri'];
}
if(! x($datarray,'parent-uri'))
$datarray['parent-uri'] = $datarray['uri'];
// Decoding the header // Decoding the header
$subject = imap_mime_header_decode($meta->subject); $subject = imap_mime_header_decode($meta->subject);
$datarray['title'] = ""; $datarray['title'] = "";
@ -421,6 +431,7 @@ function onepoll_run($argv, $argc){
); );
switch ($mailconf[0]['action']) { switch ($mailconf[0]['action']) {
case 0: case 0:
logger("Mail: Seen before ".$msg_uid." for ".$mailconf[0]['user'].". Doing nothing.", LOGGER_DEBUG);
break; break;
case 1: case 1:
logger("Mail: Deleting ".$msg_uid." for ".$mailconf[0]['user']); logger("Mail: Deleting ".$msg_uid." for ".$mailconf[0]['user']);

View file

@ -214,7 +214,7 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) {
$gs .= '|<' . intval($g) . '>'; $gs .= '|<' . intval($g) . '>';
} }
$sql = sprintf( /*$sql = sprintf(
" AND ( allow_cid = '' OR allow_cid REGEXP '<%d>' ) " AND ( allow_cid = '' OR allow_cid REGEXP '<%d>' )
AND ( deny_cid = '' OR NOT deny_cid REGEXP '<%d>' ) AND ( deny_cid = '' OR NOT deny_cid REGEXP '<%d>' )
AND ( allow_gid = '' OR allow_gid REGEXP '%s' ) AND ( allow_gid = '' OR allow_gid REGEXP '%s' )
@ -224,6 +224,16 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) {
intval($remote_user), intval($remote_user),
dbesc($gs), dbesc($gs),
dbesc($gs) dbesc($gs)
);*/
$sql = sprintf(
" AND ( NOT (deny_cid REGEXP '<%d>' OR deny_gid REGEXP '%s')
AND ( allow_cid REGEXP '<%d>' OR allow_gid REGEXP '%s' OR ( allow_cid = '' AND allow_gid = '') )
)
",
intval($remote_user),
dbesc($gs),
intval($remote_user),
dbesc($gs)
); );
} }
} }

View file

@ -366,6 +366,19 @@ if($a->module != 'install') {
$a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array('$stylesheet' => current_theme_url())); $a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array('$stylesheet' => current_theme_url()));
if($a->is_mobile || $a->is_tablet) {
if(isset($_SESSION['show-mobile']) && !$_SESSION['show-mobile']) {
$link = $a->get_baseurl() . '/toggle_mobile?address=' . curPageURL();
}
else {
$link = $a->get_baseurl() . '/toggle_mobile?off=1&address=' . curPageURL();
}
$a->page['footer'] = replace_macros(get_markup_template("toggle_mobile_footer.tpl"), array(
'$toggle_link' => $link,
'$toggle_text' => t('toggle mobile')
));
}
$page = $a->page; $page = $a->page;
$profile = $a->profile; $profile = $a->profile;

View file

@ -994,7 +994,25 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) {
intval($tagcid), intval($tagcid),
intval($profile_uid) intval($profile_uid)
); );
} elseif(strstr($name,'_') || strstr($name,' ')) { //no id else {
$newname = str_replace('_',' ',$name);
//select someone from this user's contacts by name
$r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
dbesc($newname),
intval($profile_uid)
);
if(! $r) {
//select someone by attag or nick and the name passed in
$r = q("SELECT * FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1",
dbesc($name),
dbesc($name),
intval($profile_uid)
);
}
}
/* } elseif(strstr($name,'_') || strstr($name,' ')) { //no id
//get the real name //get the real name
$newname = str_replace('_',' ',$name); $newname = str_replace('_',' ',$name);
//select someone from this user's contacts by name //select someone from this user's contacts by name
@ -1009,7 +1027,7 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) {
dbesc($name), dbesc($name),
intval($profile_uid) intval($profile_uid)
); );
} }*/
//$r is set, if someone could be selected //$r is set, if someone could be selected
if(count($r)) { if(count($r)) {
$profile = $r[0]['url']; $profile = $r[0]['url'];

View file

@ -28,11 +28,6 @@ function lockview_content(&$a) {
killme(); killme();
$allowed_users = expand_acl($item['allow_cid']);
$allowed_groups = expand_acl($item['allow_gid']);
$deny_users = expand_acl($item['deny_cid']);
$deny_groups = expand_acl($item['deny_gid']);
if(($item['private'] == 1) && (! strlen($item['allow_cid'])) && (! strlen($item['allow_gid'])) if(($item['private'] == 1) && (! strlen($item['allow_cid'])) && (! strlen($item['allow_gid']))
&& (! strlen($item['deny_cid'])) && (! strlen($item['deny_gid']))) { && (! strlen($item['deny_cid'])) && (! strlen($item['deny_gid']))) {
@ -40,6 +35,11 @@ function lockview_content(&$a) {
killme(); killme();
} }
$allowed_users = expand_acl($item['allow_cid']);
$allowed_groups = expand_acl($item['allow_gid']);
$deny_users = expand_acl($item['deny_cid']);
$deny_groups = expand_acl($item['deny_gid']);
$o = t('Visible to:') . '<br />'; $o = t('Visible to:') . '<br />';
$l = array(); $l = array();

View file

@ -18,13 +18,92 @@ function network_init(&$a) {
} }
} }
// convert query string to array and remove first element (wich is friendica args) // convert query string to array and remove first element (which is friendica args)
$query_array = array(); $query_array = array();
parse_str($a->query_string, $query_array); parse_str($a->query_string, $query_array);
array_shift($query_array); array_shift($query_array);
// fetch last used tab and redirect if needed // fetch last used network view and redirect if needed
$sel_tabs = network_query_get_sel_tab($a); if(! $is_a_date_query) {
$sel_tabs = network_query_get_sel_tab($a);
$sel_nets = network_query_get_sel_net();
$sel_groups = network_query_get_sel_group($a);
$last_sel_tabs = get_pconfig(local_user(), 'network.view','tab.selected');
$last_sel_nets = get_pconfig(local_user(), 'network.view', 'net.selected');
$last_sel_groups = get_pconfig(local_user(), 'network.view', 'group.selected');
$remember_tab = ($sel_tabs[0] === 'active' && is_array($last_sel_tabs) && $last_sel_tabs[0] !== 'active');
$remember_net = ($sel_nets === false && $last_sel_nets && $last_sel_nets !== 'all');
$remember_group = ($sel_groups === false && $last_sel_groups && $last_sel_groups != 0);
$net_baseurl = '/network';
$net_args = array();
if($remember_group) {
$net_baseurl .= '/' . $last_sel_groups; // Note that the group number must come before the "/new" tab selection
}
else if($sel_groups !== false) {
$net_baseurl .= '/' . $sel_groups;
}
if($remember_tab) {
// redirect if current selected tab is '/network' and
// last selected tab is _not_ '/network?f=&order=comment'.
// and this isn't a date query
$tab_baseurls = array(
'', //all
'', //postord
'', //conv
'/new', //new
'', //starred
'', //bookmarked
'', //spam
);
$tab_args = array(
'f=&order=comment', //all
'f=&order=post', //postord
'f=&conv=1', //conv
'', //new
'f=&star=1', //starred
'f=&bmark=1', //bookmarked
'f=&spam=1', //spam
);
$k = array_search('active', $last_sel_tabs);
$net_baseurl .= $tab_baseurls[$k];
// parse out tab queries
$dest_qa = array();
$dest_qs = $tab_args[$k];
parse_str( $dest_qs, $dest_qa);
$net_args = array_merge($net_args, $dest_qa);
}
else if($sel_tabs[4] === 'active') {
// The '/new' tab is selected
$net_baseurl .= '/new';
}
if($remember_net) {
$net_args['nets'] = $last_sel_nets;
}
if($remember_tab || $remember_net || $remember_group) {
$net_args = array_merge($query_array, $net_args);
$net_queries = build_querystring($net_args);
// groups filter is in form of "network/nnn". Add it to $dest_url, if it's possible
//if ($a->argc==2 && is_numeric($a->argv[1]) && strpos($net_baseurl, "/",1)===false){
// $net_baseurl .= "/".$a->argv[1];
//}
$redir_url = ($net_queries ? $net_baseurl."?".$net_queries : $net_baseurl);
goaway($a->get_baseurl() . $redir_url);
}
}
/* $sel_tabs = network_query_get_sel_tab($a);
$last_sel_tabs = get_pconfig(local_user(), 'network.view','tab.selected'); $last_sel_tabs = get_pconfig(local_user(), 'network.view','tab.selected');
if (is_array($last_sel_tabs)){ if (is_array($last_sel_tabs)){
$tab_urls = array( $tab_urls = array(
@ -58,9 +137,14 @@ function network_init(&$a) {
goaway($a->get_baseurl() . $dest_url."?".$dest_qs); goaway($a->get_baseurl() . $dest_url."?".$dest_qs);
} }
} }*/
if(x($_GET['nets']) && $_GET['nets'] === 'all')
unset($_GET['nets']);
$group_id = (($a->argc > 1 && intval($a->argv[1])) ? intval($a->argv[1]) : 0); $group_id = (($a->argc > 1 && intval($a->argv[1])) ? intval($a->argv[1]) : 0);
set_pconfig(local_user(), 'network.view', 'group.selected', $group_id);
require_once('include/group.php'); require_once('include/group.php');
require_once('include/contact_widgets.php'); require_once('include/contact_widgets.php');
@ -97,7 +181,7 @@ function network_init(&$a) {
$a->page['content'] .= '<h2>' . t('Search Results For:') . ' ' . $search . '</h2>'; $a->page['content'] .= '<h2>' . t('Search Results For:') . ' ' . $search . '</h2>';
} }
$a->page['aside'] .= group_side('network','network',true,$group_id); $a->page['aside'] .= group_side('network/0','network',true,$group_id);
$a->page['aside'] .= posted_date_widget($a->get_baseurl() . '/network',local_user(),false); $a->page['aside'] .= posted_date_widget($a->get_baseurl() . '/network',local_user(),false);
$a->page['aside'] .= networks_widget($a->get_baseurl(true) . '/network',(x($_GET, 'nets') ? $_GET['nets'] : '')); $a->page['aside'] .= networks_widget($a->get_baseurl(true) . '/network',(x($_GET, 'nets') ? $_GET['nets'] : ''));
$a->page['aside'] .= saved_searches($search); $a->page['aside'] .= saved_searches($search);
@ -225,6 +309,29 @@ function network_query_get_sel_tab($a) {
return array($no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active); return array($no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active);
} }
/**
* Return selected network from query
*/
function network_query_get_sel_net() {
$network = false;
if(x($_GET,'nets')) {
$network = $_GET['nets'];
}
return $network;
}
function network_query_get_sel_group($a) {
$group = false;
if($a->argc >= 2 && is_numeric($a->argv[1])) {
$group = $a->argv[1];
}
return $group;
}
function network_content(&$a, $update = 0) { function network_content(&$a, $update = 0) {
@ -381,6 +488,7 @@ function network_content(&$a, $update = 0) {
if(strlen($str)) if(strlen($str))
$def_acl = array('allow_cid' => $str); $def_acl = array('allow_cid' => $str);
} }
set_pconfig(local_user(), 'network.view', 'net.selected', ($nets ? $nets : 'all'));
if(! $update) { if(! $update) {
if($group) { if($group) {
@ -607,6 +715,7 @@ function network_content(&$a, $update = 0) {
intval($_SESSION['uid']) intval($_SESSION['uid'])
); );
$update_unseen = ' WHERE uid = ' . intval($_SESSION['uid']) . " AND unseen = 1 $sql_extra $sql_nets";
} }
else { else {
@ -673,6 +782,9 @@ function network_content(&$a, $update = 0) {
} else { } else {
$items = array(); $items = array();
} }
if($parents_str)
$update_unseen = ' WHERE uid = ' . intval(local_user()) . ' AND unseen = 1 AND parent IN ( ' . dbesc($parents_str) . ' )';
} }
@ -680,12 +792,15 @@ function network_content(&$a, $update = 0) {
// level which items you've seen and which you haven't. If you're looking // level which items you've seen and which you haven't. If you're looking
// at the top level network page just mark everything seen. // at the top level network page just mark everything seen.
if((! $group) && (! $cid) && (! $star)) { /* if((! $group) && (! $cid) && (! $star)) {
$r = q("UPDATE `item` SET `unseen` = 0 $r = q("UPDATE `item` SET `unseen` = 0
WHERE `unseen` = 1 AND `uid` = %d", WHERE `unseen` = 1 AND `uid` = %d",
intval(local_user()) intval(local_user())
); );
} }*/
if($update_unseen)
$r = q("UPDATE `item` SET `unseen` = 0 $update_unseen");
// Set this so that the conversation function can find out contact info for our wall-wall items // Set this so that the conversation function can find out contact info for our wall-wall items
$a->page_contact = $a->contact; $a->page_contact = $a->contact;
@ -695,7 +810,7 @@ function network_content(&$a, $update = 0) {
$o .= conversation($a,$items,$mode,$update); $o .= conversation($a,$items,$mode,$update);
if(! $update) { if(! $update) {
if(! get_pconfig(local_user(),'system','alt_pager')) { if(! get_pconfig(local_user(),'system','alt_pager')) {
$o .= paginate($a); $o .= paginate($a);
} }
else { else {

View file

@ -481,7 +481,25 @@ function photos_post(&$a) {
intval($profile_uid) intval($profile_uid)
); );
} }
elseif(strstr($name,'_') || strstr($name,' ')) { else {
$newname = str_replace('_',' ',$name);
//select someone from this user's contacts by name
$r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
dbesc($newname),
intval($page_owner_uid)
);
if(! $r) {
//select someone by attag or nick and the name passed in
$r = q("SELECT * FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1",
dbesc($name),
dbesc($name),
intval($page_owner_uid)
);
}
}
/* elseif(strstr($name,'_') || strstr($name,' ')) {
$newname = str_replace('_',' ',$name); $newname = str_replace('_',' ',$name);
$r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1", $r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
dbesc($newname), dbesc($newname),
@ -494,7 +512,7 @@ function photos_post(&$a) {
dbesc($name), dbesc($name),
intval($page_owner_uid) intval($page_owner_uid)
); );
} }*/
if(count($r)) { if(count($r)) {
$newname = $r[0]['name']; $newname = $r[0]['name'];
$profile = $r[0]['url']; $profile = $r[0]['url'];

View file

@ -101,7 +101,7 @@ function profiles_post(&$a) {
} }
else { else {
$newname = $lookup; $newname = $lookup;
if(strstr($lookup,' ')) { /* if(strstr($lookup,' ')) {
$r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1", $r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
dbesc($newname), dbesc($newname),
intval(local_user()) intval(local_user())
@ -112,6 +112,17 @@ function profiles_post(&$a) {
dbesc($lookup), dbesc($lookup),
intval(local_user()) intval(local_user())
); );
}*/
$r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
dbesc($newname),
intval(local_user())
);
if(! $r) {
$r = q("SELECT * FROM `contact` WHERE `nick` = '%s' AND `uid` = %d LIMIT 1",
dbesc($lookup),
intval(local_user())
);
} }
if(count($r)) { if(count($r)) {
$prf = $r[0]['url']; $prf = $r[0]['url'];

View file

@ -692,7 +692,7 @@ function settings_content(&$a) {
'$mail_pass' => array('mail_pass', t('Email password:'), '', ''), '$mail_pass' => array('mail_pass', t('Email password:'), '', ''),
'$mail_replyto' => array('mail_replyto', t('Reply-to address:'), '', 'Optional'), '$mail_replyto' => array('mail_replyto', t('Reply-to address:'), '', 'Optional'),
'$mail_pubmail' => array('mail_pubmail', t('Send public posts to all email contacts:'), $mail_pubmail, ''), '$mail_pubmail' => array('mail_pubmail', t('Send public posts to all email contacts:'), $mail_pubmail, ''),
'$mail_action' => array('mail_action', t('Action after import:'), $mail_action, '', array(0=>t('None'), 1=>t('Delete'), 2=>t('Mark as seen'), 3=>t('Move to folder'))), '$mail_action' => array('mail_action', t('Action after import:'), $mail_action, '', array(0=>t('None'), /*1=>t('Delete'),*/ 2=>t('Mark as seen'), 3=>t('Move to folder'))),
'$mail_movetofolder' => array('mail_movetofolder', t('Move to folder:'), $mail_movetofolder, ''), '$mail_movetofolder' => array('mail_movetofolder', t('Move to folder:'), $mail_movetofolder, ''),
'$submit' => t('Submit'), '$submit' => t('Submit'),

View file

@ -22,8 +22,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: friendica\n" "Project-Id-Version: friendica\n"
"Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
"POT-Creation-Date: 2012-09-25 10:00-0700\n" "POT-Creation-Date: 2012-09-27 10:00-0700\n"
"PO-Revision-Date: 2012-09-27 04:19+0000\n" "PO-Revision-Date: 2012-09-30 06:05+0000\n"
"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n" "Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n" "Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -73,7 +73,7 @@ msgstr "Konnte den Kontakt nicht aktualisieren."
#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510
#: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159 #: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159
#: ../../addon/fbpost/fbpost.php:165 #: ../../addon/fbpost/fbpost.php:165
#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3908 #: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3913
#: ../../index.php:317 #: ../../index.php:317
msgid "Permission denied." msgid "Permission denied."
msgstr "Zugriff verweigert." msgstr "Zugriff verweigert."
@ -163,7 +163,7 @@ msgstr "Neues Foto von dieser URL"
#: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93 #: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93
#: ../../addon/drpost/drpost.php:110 ../../addon/startpage/startpage.php:92 #: ../../addon/drpost/drpost.php:110 ../../addon/startpage/startpage.php:92
#: ../../addon/geonames/geonames.php:187 ../../addon/oembed.old/oembed.php:41 #: ../../addon/geonames/geonames.php:187 ../../addon/oembed.old/oembed.php:41
#: ../../addon/forumlist/forumlist.php:169 #: ../../addon/forumlist/forumlist.php:163
#: ../../addon/impressum/impressum.php:83 #: ../../addon/impressum/impressum.php:83
#: ../../addon/notimeline/notimeline.php:64 ../../addon/blockem/blockem.php:57 #: ../../addon/notimeline/notimeline.php:64 ../../addon/blockem/blockem.php:57
#: ../../addon/qcomment/qcomment.php:61 #: ../../addon/qcomment/qcomment.php:61
@ -191,7 +191,7 @@ msgstr "Neues Foto von dieser URL"
#: ../../view/theme/diabook/theme.php:757 #: ../../view/theme/diabook/theme.php:757
#: ../../view/theme/diabook/config.php:190 #: ../../view/theme/diabook/config.php:190
#: ../../view/theme/quattro/config.php:53 ../../view/theme/dispy/config.php:70 #: ../../view/theme/quattro/config.php:53 ../../view/theme/dispy/config.php:70
#: ../../include/conversation.php:607 ../../object/Item.php:559 #: ../../object/Item.php:560
msgid "Submit" msgid "Submit"
msgstr "Senden" msgstr "Senden"
@ -322,7 +322,7 @@ msgstr "Veranstaltung teilen"
#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:136 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:136
#: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544 #: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544
#: ../../mod/settings.php:570 ../../addon/js_upload/js_upload.php:45 #: ../../mod/settings.php:570 ../../addon/js_upload/js_upload.php:45
#: ../../include/conversation.php:1307 #: ../../include/conversation.php:935
msgid "Cancel" msgid "Cancel"
msgstr "Abbrechen" msgstr "Abbrechen"
@ -552,7 +552,7 @@ msgid "Use as profile photo"
msgstr "Als Profilbild verwenden" msgstr "Als Profilbild verwenden"
#: ../../mod/photos.php:1224 ../../mod/content.php:603 #: ../../mod/photos.php:1224 ../../mod/content.php:603
#: ../../include/conversation.php:436 ../../object/Item.php:103 #: ../../object/Item.php:103
msgid "Private Message" msgid "Private Message"
msgstr "Private Nachricht" msgstr "Private Nachricht"
@ -594,52 +594,49 @@ msgid ""
msgstr "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
#: ../../mod/photos.php:1356 ../../mod/content.php:667 #: ../../mod/photos.php:1356 ../../mod/content.php:667
#: ../../include/conversation.php:581 ../../object/Item.php:195 #: ../../object/Item.php:196
msgid "I like this (toggle)" msgid "I like this (toggle)"
msgstr "Ich mag das (toggle)" msgstr "Ich mag das (toggle)"
#: ../../mod/photos.php:1357 ../../mod/content.php:668 #: ../../mod/photos.php:1357 ../../mod/content.php:668
#: ../../include/conversation.php:582 ../../object/Item.php:196 #: ../../object/Item.php:197
msgid "I don't like this (toggle)" msgid "I don't like this (toggle)"
msgstr "Ich mag das nicht (toggle)" msgstr "Ich mag das nicht (toggle)"
#: ../../mod/photos.php:1358 ../../include/conversation.php:1268 #: ../../mod/photos.php:1358 ../../include/conversation.php:896
msgid "Share" msgid "Share"
msgstr "Teilen" msgstr "Teilen"
#: ../../mod/photos.php:1359 ../../mod/editpost.php:112 #: ../../mod/photos.php:1359 ../../mod/editpost.php:112
#: ../../mod/content.php:482 ../../mod/content.php:845 #: ../../mod/content.php:482 ../../mod/content.php:845
#: ../../mod/wallmessage.php:152 ../../mod/message.php:293 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293
#: ../../mod/message.php:481 ../../include/conversation.php:686 #: ../../mod/message.php:481 ../../include/conversation.php:570
#: ../../include/conversation.php:944 ../../include/conversation.php:1287 #: ../../include/conversation.php:915 ../../object/Item.php:258
#: ../../object/Item.php:257
msgid "Please wait" msgid "Please wait"
msgstr "Bitte warten" msgstr "Bitte warten"
#: ../../mod/photos.php:1375 ../../mod/photos.php:1416 #: ../../mod/photos.php:1375 ../../mod/photos.php:1416
#: ../../mod/photos.php:1448 ../../mod/content.php:690 #: ../../mod/photos.php:1448 ../../mod/content.php:690
#: ../../include/conversation.php:604 ../../object/Item.php:556 #: ../../object/Item.php:557
msgid "This is you" msgid "This is you"
msgstr "Das bist du" msgstr "Das bist du"
#: ../../mod/photos.php:1377 ../../mod/photos.php:1418 #: ../../mod/photos.php:1377 ../../mod/photos.php:1418
#: ../../mod/photos.php:1450 ../../mod/content.php:692 #: ../../mod/photos.php:1450 ../../mod/content.php:692 ../../boot.php:574
#: ../../include/conversation.php:606 ../../boot.php:574 #: ../../object/Item.php:559
#: ../../object/Item.php:558
msgid "Comment" msgid "Comment"
msgstr "Kommentar" msgstr "Kommentar"
#: ../../mod/photos.php:1379 ../../mod/editpost.php:133 #: ../../mod/photos.php:1379 ../../mod/editpost.php:133
#: ../../mod/content.php:702 ../../include/conversation.php:616 #: ../../mod/content.php:702 ../../include/conversation.php:933
#: ../../include/conversation.php:1305 ../../object/Item.php:568 #: ../../object/Item.php:569
msgid "Preview" msgid "Preview"
msgstr "Vorschau" msgstr "Vorschau"
#: ../../mod/photos.php:1479 ../../mod/content.php:439 #: ../../mod/photos.php:1479 ../../mod/content.php:439
#: ../../mod/content.php:723 ../../mod/settings.php:606 #: ../../mod/content.php:723 ../../mod/settings.php:606
#: ../../mod/settings.php:695 ../../mod/group.php:168 ../../mod/admin.php:696 #: ../../mod/settings.php:695 ../../mod/group.php:168 ../../mod/admin.php:696
#: ../../include/conversation.php:448 ../../include/conversation.php:889 #: ../../include/conversation.php:515 ../../object/Item.php:117
#: ../../object/Item.php:116
msgid "Delete" msgid "Delete"
msgstr "Löschen" msgstr "Löschen"
@ -705,29 +702,28 @@ msgstr "Beitrag nicht gefunden"
msgid "Edit post" msgid "Edit post"
msgstr "Beitrag bearbeiten" msgstr "Beitrag bearbeiten"
#: ../../mod/editpost.php:88 ../../include/conversation.php:1254 #: ../../mod/editpost.php:88 ../../include/conversation.php:882
msgid "Post to Email" msgid "Post to Email"
msgstr "An E-Mail senden" msgstr "An E-Mail senden"
#: ../../mod/editpost.php:103 ../../mod/content.php:710 #: ../../mod/editpost.php:103 ../../mod/content.php:710
#: ../../mod/settings.php:605 ../../include/conversation.php:441 #: ../../mod/settings.php:605 ../../object/Item.php:107
#: ../../object/Item.php:107
msgid "Edit" msgid "Edit"
msgstr "Bearbeiten" msgstr "Bearbeiten"
#: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150 #: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150
#: ../../mod/message.php:291 ../../mod/message.php:478 #: ../../mod/message.php:291 ../../mod/message.php:478
#: ../../include/conversation.php:1269 #: ../../include/conversation.php:897
msgid "Upload photo" msgid "Upload photo"
msgstr "Foto hochladen" msgstr "Foto hochladen"
#: ../../mod/editpost.php:105 ../../include/conversation.php:1271 #: ../../mod/editpost.php:105 ../../include/conversation.php:899
msgid "Attach file" msgid "Attach file"
msgstr "Datei anhängen" msgstr "Datei anhängen"
#: ../../mod/editpost.php:106 ../../mod/wallmessage.php:151 #: ../../mod/editpost.php:106 ../../mod/wallmessage.php:151
#: ../../mod/message.php:292 ../../mod/message.php:479 #: ../../mod/message.php:292 ../../mod/message.php:479
#: ../../include/conversation.php:1273 #: ../../include/conversation.php:901
msgid "Insert web link" msgid "Insert web link"
msgstr "einen Link einfügen" msgstr "einen Link einfügen"
@ -743,35 +739,35 @@ msgstr "Vorbis [.ogg] Video einfügen"
msgid "Insert Vorbis [.ogg] audio" msgid "Insert Vorbis [.ogg] audio"
msgstr "Vorbis [.ogg] Audio einfügen" msgstr "Vorbis [.ogg] Audio einfügen"
#: ../../mod/editpost.php:110 ../../include/conversation.php:1279 #: ../../mod/editpost.php:110 ../../include/conversation.php:907
msgid "Set your location" msgid "Set your location"
msgstr "Deinen Standort festlegen" msgstr "Deinen Standort festlegen"
#: ../../mod/editpost.php:111 ../../include/conversation.php:1281 #: ../../mod/editpost.php:111 ../../include/conversation.php:909
msgid "Clear browser location" msgid "Clear browser location"
msgstr "Browser-Standort leeren" msgstr "Browser-Standort leeren"
#: ../../mod/editpost.php:113 ../../include/conversation.php:1288 #: ../../mod/editpost.php:113 ../../include/conversation.php:916
msgid "Permission settings" msgid "Permission settings"
msgstr "Berechtigungseinstellungen" msgstr "Berechtigungseinstellungen"
#: ../../mod/editpost.php:121 ../../include/conversation.php:1297 #: ../../mod/editpost.php:121 ../../include/conversation.php:925
msgid "CC: email addresses" msgid "CC: email addresses"
msgstr "Cc:-E-Mail-Addressen" msgstr "Cc:-E-Mail-Addressen"
#: ../../mod/editpost.php:122 ../../include/conversation.php:1298 #: ../../mod/editpost.php:122 ../../include/conversation.php:926
msgid "Public post" msgid "Public post"
msgstr "Öffentlicher Beitrag" msgstr "Öffentlicher Beitrag"
#: ../../mod/editpost.php:125 ../../include/conversation.php:1284 #: ../../mod/editpost.php:125 ../../include/conversation.php:912
msgid "Set title" msgid "Set title"
msgstr "Titel setzen" msgstr "Titel setzen"
#: ../../mod/editpost.php:127 ../../include/conversation.php:1286 #: ../../mod/editpost.php:127 ../../include/conversation.php:914
msgid "Categories (comma-separated list)" msgid "Categories (comma-separated list)"
msgstr "Kategorien (kommasepariert)" msgstr "Kategorien (kommasepariert)"
#: ../../mod/editpost.php:128 ../../include/conversation.php:1300 #: ../../mod/editpost.php:128 ../../include/conversation.php:928
msgid "Example: bob@example.com, mary@example.com" msgid "Example: bob@example.com, mary@example.com"
msgstr "Z.B.: bob@example.com, mary@example.com" msgstr "Z.B.: bob@example.com, mary@example.com"
@ -892,7 +888,7 @@ msgstr "Bitte bestätige deine Kontaktanfrage bei %s."
msgid "Confirm" msgid "Confirm"
msgstr "Bestätigen" msgstr "Bestätigen"
#: ../../mod/dfrn_request.php:715 ../../include/items.php:3287 #: ../../mod/dfrn_request.php:715 ../../include/items.php:3292
msgid "[Name Withheld]" msgid "[Name Withheld]"
msgstr "[Name unterdrückt]" msgstr "[Name unterdrückt]"
@ -1314,32 +1310,28 @@ msgid "Group: "
msgstr "Gruppe: " msgstr "Gruppe: "
#: ../../mod/content.php:438 ../../mod/content.php:722 #: ../../mod/content.php:438 ../../mod/content.php:722
#: ../../include/conversation.php:447 ../../include/conversation.php:888 #: ../../include/conversation.php:514 ../../object/Item.php:116
#: ../../object/Item.php:115
msgid "Select" msgid "Select"
msgstr "Auswählen" msgstr "Auswählen"
#: ../../mod/content.php:455 ../../mod/content.php:815 #: ../../mod/content.php:455 ../../mod/content.php:815
#: ../../mod/content.php:816 ../../include/conversation.php:654 #: ../../mod/content.php:816 ../../include/conversation.php:533
#: ../../include/conversation.php:655 ../../include/conversation.php:907 #: ../../object/Item.php:227 ../../object/Item.php:228
#: ../../object/Item.php:226 ../../object/Item.php:227
#, php-format #, php-format
msgid "View %s's profile @ %s" msgid "View %s's profile @ %s"
msgstr "Das Profil von %s auf %s betrachten." msgstr "Das Profil von %s auf %s betrachten."
#: ../../mod/content.php:465 ../../mod/content.php:827 #: ../../mod/content.php:465 ../../mod/content.php:827
#: ../../include/conversation.php:668 ../../include/conversation.php:927 #: ../../include/conversation.php:553 ../../object/Item.php:240
#: ../../object/Item.php:239
#, php-format #, php-format
msgid "%s from %s" msgid "%s from %s"
msgstr "%s von %s" msgstr "%s von %s"
#: ../../mod/content.php:480 ../../include/conversation.php:942 #: ../../mod/content.php:480 ../../include/conversation.php:568
msgid "View in context" msgid "View in context"
msgstr "Im Zusammenhang betrachten" msgstr "Im Zusammenhang betrachten"
#: ../../mod/content.php:586 ../../include/conversation.php:695 #: ../../mod/content.php:586 ../../object/Item.php:277
#: ../../object/Item.php:276
#, php-format #, php-format
msgid "%d comment" msgid "%d comment"
msgid_plural "%d comments" msgid_plural "%d comments"
@ -1347,8 +1339,7 @@ msgstr[0] "%d Kommentar"
msgstr[1] "%d Kommentare" msgstr[1] "%d Kommentare"
#: ../../mod/content.php:588 ../../include/text.php:1443 #: ../../mod/content.php:588 ../../include/text.php:1443
#: ../../include/conversation.php:697 ../../object/Item.php:278 #: ../../object/Item.php:279 ../../object/Item.php:292
#: ../../object/Item.php:291
msgid "comment" msgid "comment"
msgid_plural "comments" msgid_plural "comments"
msgstr[0] "" msgstr[0] ""
@ -1356,113 +1347,92 @@ msgstr[1] "Kommentar"
#: ../../mod/content.php:589 ../../addon/page/page.php:76 #: ../../mod/content.php:589 ../../addon/page/page.php:76
#: ../../addon/page/page.php:110 ../../addon/showmore/showmore.php:119 #: ../../addon/page/page.php:110 ../../addon/showmore/showmore.php:119
#: ../../include/contact_widgets.php:195 ../../include/conversation.php:698 #: ../../include/contact_widgets.php:195 ../../boot.php:575
#: ../../boot.php:575 ../../object/Item.php:279 #: ../../object/Item.php:280
msgid "show more" msgid "show more"
msgstr "mehr anzeigen" msgstr "mehr anzeigen"
#: ../../mod/content.php:667 ../../include/conversation.php:581 #: ../../mod/content.php:667 ../../object/Item.php:196
#: ../../object/Item.php:195
msgid "like" msgid "like"
msgstr "mag ich" msgstr "mag ich"
#: ../../mod/content.php:668 ../../include/conversation.php:582 #: ../../mod/content.php:668 ../../object/Item.php:197
#: ../../object/Item.php:196
msgid "dislike" msgid "dislike"
msgstr "mag ich nicht" msgstr "mag ich nicht"
#: ../../mod/content.php:670 ../../include/conversation.php:584 #: ../../mod/content.php:670 ../../object/Item.php:199
#: ../../object/Item.php:198
msgid "Share this" msgid "Share this"
msgstr "Weitersagen" msgstr "Weitersagen"
#: ../../mod/content.php:670 ../../include/conversation.php:584 #: ../../mod/content.php:670 ../../object/Item.php:199
#: ../../object/Item.php:198
msgid "share" msgid "share"
msgstr "Teilen" msgstr "Teilen"
#: ../../mod/content.php:694 ../../include/conversation.php:608 #: ../../mod/content.php:694 ../../object/Item.php:561
#: ../../object/Item.php:560
msgid "Bold" msgid "Bold"
msgstr "Fett" msgstr "Fett"
#: ../../mod/content.php:695 ../../include/conversation.php:609 #: ../../mod/content.php:695 ../../object/Item.php:562
#: ../../object/Item.php:561
msgid "Italic" msgid "Italic"
msgstr "Kursiv" msgstr "Kursiv"
#: ../../mod/content.php:696 ../../include/conversation.php:610 #: ../../mod/content.php:696 ../../object/Item.php:563
#: ../../object/Item.php:562
msgid "Underline" msgid "Underline"
msgstr "Unterstrichen" msgstr "Unterstrichen"
#: ../../mod/content.php:697 ../../include/conversation.php:611 #: ../../mod/content.php:697 ../../object/Item.php:564
#: ../../object/Item.php:563
msgid "Quote" msgid "Quote"
msgstr "Zitat" msgstr "Zitat"
#: ../../mod/content.php:698 ../../include/conversation.php:612 #: ../../mod/content.php:698 ../../object/Item.php:565
#: ../../object/Item.php:564
msgid "Code" msgid "Code"
msgstr "Code" msgstr "Code"
#: ../../mod/content.php:699 ../../include/conversation.php:613 #: ../../mod/content.php:699 ../../object/Item.php:566
#: ../../object/Item.php:565
msgid "Image" msgid "Image"
msgstr "Bild" msgstr "Bild"
#: ../../mod/content.php:700 ../../include/conversation.php:614 #: ../../mod/content.php:700 ../../object/Item.php:567
#: ../../object/Item.php:566
msgid "Link" msgid "Link"
msgstr "Verweis" msgstr "Verweis"
#: ../../mod/content.php:701 ../../include/conversation.php:615 #: ../../mod/content.php:701 ../../object/Item.php:568
#: ../../object/Item.php:567
msgid "Video" msgid "Video"
msgstr "Video" msgstr "Video"
#: ../../mod/content.php:735 ../../include/conversation.php:545 #: ../../mod/content.php:735 ../../object/Item.php:180
#: ../../object/Item.php:179
msgid "add star" msgid "add star"
msgstr "markieren" msgstr "markieren"
#: ../../mod/content.php:736 ../../include/conversation.php:546 #: ../../mod/content.php:736 ../../object/Item.php:181
#: ../../object/Item.php:180
msgid "remove star" msgid "remove star"
msgstr "Markierung entfernen" msgstr "Markierung entfernen"
#: ../../mod/content.php:737 ../../include/conversation.php:547 #: ../../mod/content.php:737 ../../object/Item.php:182
#: ../../object/Item.php:181
msgid "toggle star status" msgid "toggle star status"
msgstr "Markierung umschalten" msgstr "Markierung umschalten"
#: ../../mod/content.php:740 ../../include/conversation.php:550 #: ../../mod/content.php:740 ../../object/Item.php:185
#: ../../object/Item.php:184
msgid "starred" msgid "starred"
msgstr "markiert" msgstr "markiert"
#: ../../mod/content.php:741 ../../include/conversation.php:551 #: ../../mod/content.php:741 ../../object/Item.php:186
#: ../../object/Item.php:185
msgid "add tag" msgid "add tag"
msgstr "Tag hinzufügen" msgstr "Tag hinzufügen"
#: ../../mod/content.php:745 ../../include/conversation.php:451 #: ../../mod/content.php:745 ../../object/Item.php:120
#: ../../object/Item.php:119
msgid "save to folder" msgid "save to folder"
msgstr "In Ordner speichern" msgstr "In Ordner speichern"
#: ../../mod/content.php:817 ../../include/conversation.php:656 #: ../../mod/content.php:817 ../../object/Item.php:229
#: ../../object/Item.php:228
msgid "to" msgid "to"
msgstr "zu" msgstr "zu"
#: ../../mod/content.php:818 ../../include/conversation.php:657 #: ../../mod/content.php:818 ../../object/Item.php:230
#: ../../object/Item.php:229
msgid "Wall-to-Wall" msgid "Wall-to-Wall"
msgstr "Wall-to-Wall" msgstr "Wall-to-Wall"
#: ../../mod/content.php:819 ../../include/conversation.php:658 #: ../../mod/content.php:819 ../../object/Item.php:231
#: ../../object/Item.php:230
msgid "via Wall-To-Wall:" msgid "via Wall-To-Wall:"
msgstr "via Wall-To-Wall:" msgstr "via Wall-To-Wall:"
@ -1980,7 +1950,7 @@ msgstr "Anfrage zum Zurücksetzen des Passworts auf %s erhalten"
#: ../../addon/facebook/facebook.php:702 #: ../../addon/facebook/facebook.php:702
#: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661 #: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661
#: ../../addon/public_server/public_server.php:62 #: ../../addon/public_server/public_server.php:62
#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3296 #: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3301
#: ../../boot.php:788 #: ../../boot.php:788
msgid "Administrator" msgid "Administrator"
msgstr "Administrator" msgstr "Administrator"
@ -2713,7 +2683,7 @@ msgstr "Kein Empfänger."
#: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131 #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131
#: ../../mod/message.php:242 ../../mod/message.php:250 #: ../../mod/message.php:242 ../../mod/message.php:250
#: ../../include/conversation.php:1205 ../../include/conversation.php:1222 #: ../../include/conversation.php:833 ../../include/conversation.php:850
msgid "Please enter a link URL:" msgid "Please enter a link URL:"
msgstr "Bitte gib die URL des Links ein:" msgstr "Bitte gib die URL des Links ein:"
@ -3139,7 +3109,7 @@ msgstr "%1$s mag %2$ss %3$s nicht"
#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
#: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:29 #: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:29
#: ../../mod/display.php:145 ../../include/items.php:3774 #: ../../mod/display.php:145 ../../include/items.php:3779
msgid "Item not found." msgid "Item not found."
msgstr "Beitrag nicht gefunden." msgstr "Beitrag nicht gefunden."
@ -4036,48 +4006,48 @@ msgstr "Der Zugriff zu diesem Profil wurde eingeschränkt."
msgid "Tips for New Members" msgid "Tips for New Members"
msgstr "Tipps für neue Nutzer" msgstr "Tipps für neue Nutzer"
#: ../../mod/ping.php:235 #: ../../mod/ping.php:238
msgid "{0} wants to be your friend" msgid "{0} wants to be your friend"
msgstr "{0} möchte mit dir in Kontakt treten" msgstr "{0} möchte mit dir in Kontakt treten"
#: ../../mod/ping.php:240 #: ../../mod/ping.php:243
msgid "{0} sent you a message" msgid "{0} sent you a message"
msgstr "{0} hat dir eine Nachricht geschickt" msgstr "{0} hat dir eine Nachricht geschickt"
#: ../../mod/ping.php:245 #: ../../mod/ping.php:248
msgid "{0} requested registration" msgid "{0} requested registration"
msgstr "{0} möchte sich registrieren" msgstr "{0} möchte sich registrieren"
#: ../../mod/ping.php:251 #: ../../mod/ping.php:254
#, php-format #, php-format
msgid "{0} commented %s's post" msgid "{0} commented %s's post"
msgstr "{0} kommentierte einen Beitrag von %s" msgstr "{0} kommentierte einen Beitrag von %s"
#: ../../mod/ping.php:256 #: ../../mod/ping.php:259
#, php-format #, php-format
msgid "{0} liked %s's post" msgid "{0} liked %s's post"
msgstr "{0} mag %ss Beitrag" msgstr "{0} mag %ss Beitrag"
#: ../../mod/ping.php:261 #: ../../mod/ping.php:264
#, php-format #, php-format
msgid "{0} disliked %s's post" msgid "{0} disliked %s's post"
msgstr "{0} mag %ss Beitrag nicht" msgstr "{0} mag %ss Beitrag nicht"
#: ../../mod/ping.php:266 #: ../../mod/ping.php:269
#, php-format #, php-format
msgid "{0} is now friends with %s" msgid "{0} is now friends with %s"
msgstr "{0} ist jetzt mit %s befreundet" msgstr "{0} ist jetzt mit %s befreundet"
#: ../../mod/ping.php:271 #: ../../mod/ping.php:274
msgid "{0} posted" msgid "{0} posted"
msgstr "{0} hat etwas veröffentlicht" msgstr "{0} hat etwas veröffentlicht"
#: ../../mod/ping.php:276 #: ../../mod/ping.php:279
#, php-format #, php-format
msgid "{0} tagged %s's post with #%s" msgid "{0} tagged %s's post with #%s"
msgstr "{0} hat %ss Beitrag mit dem Schlagwort #%s versehen" msgstr "{0} hat %ss Beitrag mit dem Schlagwort #%s versehen"
#: ../../mod/ping.php:282 #: ../../mod/ping.php:285
msgid "{0} mentioned you in a post" msgid "{0} mentioned you in a post"
msgstr "{0} hat dich in einem Beitrag erwähnt" msgstr "{0} hat dich in einem Beitrag erwähnt"
@ -4439,8 +4409,8 @@ msgstr "sichtbar für jeden"
msgid "Edit visibility" msgid "Edit visibility"
msgstr "Sichtbarkeit bearbeiten" msgstr "Sichtbarkeit bearbeiten"
#: ../../mod/filer.php:29 ../../include/conversation.php:1209 #: ../../mod/filer.php:29 ../../include/conversation.php:837
#: ../../include/conversation.php:1226 #: ../../include/conversation.php:854
msgid "Save to Folder:" msgid "Save to Folder:"
msgstr "In diesen Ordner verschieben:" msgstr "In diesen Ordner verschieben:"
@ -5303,11 +5273,11 @@ msgid "%s - Click to open/close"
msgstr "%s Zum Öffnen/Schließen klicken" msgstr "%s Zum Öffnen/Schließen klicken"
#: ../../addon/page/page.php:61 ../../addon/page/page.php:91 #: ../../addon/page/page.php:61 ../../addon/page/page.php:91
#: ../../addon/forumlist/forumlist.php:54 #: ../../addon/forumlist/forumlist.php:55
msgid "Forums" msgid "Forums"
msgstr "Foren" msgstr "Foren"
#: ../../addon/page/page.php:129 ../../addon/forumlist/forumlist.php:88 #: ../../addon/page/page.php:129 ../../addon/forumlist/forumlist.php:89
msgid "Forums:" msgid "Forums:"
msgstr "Foren:" msgstr "Foren:"
@ -5319,7 +5289,7 @@ msgstr "Seiteneinstellungen aktualisiert."
msgid "Page Settings" msgid "Page Settings"
msgstr "Seiteneinstellungen" msgstr "Seiteneinstellungen"
#: ../../addon/page/page.php:196 ../../addon/forumlist/forumlist.php:155 #: ../../addon/page/page.php:196
msgid "How many forums to display on sidebar without paging" msgid "How many forums to display on sidebar without paging"
msgstr "Wie viele Foren sollen in der Seitenleiste ohne Umblättern angezeigt werden" msgstr "Wie viele Foren sollen in der Seitenleiste ohne Umblättern angezeigt werden"
@ -6152,7 +6122,7 @@ msgstr "OEmbed für Youtube Videos verwenden"
msgid "URL to embed:" msgid "URL to embed:"
msgstr "URL zum Einbetten:" msgstr "URL zum Einbetten:"
#: ../../addon/forumlist/forumlist.php:57 #: ../../addon/forumlist/forumlist.php:58
msgid "show/hide" msgid "show/hide"
msgstr "anzeigen/verbergen" msgstr "anzeigen/verbergen"
@ -6160,21 +6130,21 @@ msgstr "anzeigen/verbergen"
msgid "No forum subscriptions" msgid "No forum subscriptions"
msgstr "Keine Foren-Mitgliedschaften." msgstr "Keine Foren-Mitgliedschaften."
#: ../../addon/forumlist/forumlist.php:124 #: ../../addon/forumlist/forumlist.php:125
msgid "Forumlist settings updated." msgid "Forumlist settings updated."
msgstr "Einstellungen zur Foren-Liste aktualisiert." msgstr "Einstellungen zur Foren-Liste aktualisiert."
#: ../../addon/forumlist/forumlist.php:153 #: ../../addon/forumlist/forumlist.php:150
msgid "Forumlist Settings" msgid "Forumlist Settings"
msgstr "Foren-Liste Einstellungen" msgstr "Foren-Liste Einstellungen"
#: ../../addon/forumlist/forumlist.php:158 #: ../../addon/forumlist/forumlist.php:152
msgid "Randomise Forumlist/Forum list" msgid "Randomise forum list"
msgstr "Zufällige Zusammenstellung der Foren-Liste" msgstr "Zufällige Zusammenstellung der Foren-Liste"
#: ../../addon/forumlist/forumlist.php:161 #: ../../addon/forumlist/forumlist.php:155
msgid "Show forumlists/forums on profile forumlist" msgid "Show forums on profile page"
msgstr "Liste der Foren deren Abonnement du bist in deinem Profil anzeigen:" msgstr "Zeige die Liste der Foren auf der Profilseite"
#: ../../addon/impressum/impressum.php:37 #: ../../addon/impressum/impressum.php:37
msgid "Impressum" msgid "Impressum"
@ -8156,12 +8126,12 @@ msgstr "Sekunden"
msgid "%1$d %2$s ago" msgid "%1$d %2$s ago"
msgstr "%1$d %2$s her" msgstr "%1$d %2$s her"
#: ../../include/datetime.php:472 ../../include/items.php:1683 #: ../../include/datetime.php:472 ../../include/items.php:1688
#, php-format #, php-format
msgid "%s's birthday" msgid "%s's birthday"
msgstr "%ss Geburtstag" msgstr "%ss Geburtstag"
#: ../../include/datetime.php:473 ../../include/items.php:1684 #: ../../include/datetime.php:473 ../../include/items.php:1689
#, php-format #, php-format
msgid "Happy Birthday %s" msgid "Happy Birthday %s"
msgstr "Herzlichen Glückwunsch %s" msgstr "Herzlichen Glückwunsch %s"
@ -8436,15 +8406,15 @@ msgstr "Konnte die Kontaktinformationen nicht empfangen."
msgid "following" msgid "following"
msgstr "folgen" msgstr "folgen"
#: ../../include/items.php:3294 #: ../../include/items.php:3299
msgid "A new person is sharing with you at " msgid "A new person is sharing with you at "
msgstr "Eine neue Person teilt mit dir auf " msgstr "Eine neue Person teilt mit dir auf "
#: ../../include/items.php:3294 #: ../../include/items.php:3299
msgid "You have a new follower at " msgid "You have a new follower at "
msgstr "Du hast einen neuen Kontakt auf " msgstr "Du hast einen neuen Kontakt auf "
#: ../../include/items.php:3975 #: ../../include/items.php:3980
msgid "Archives" msgid "Archives"
msgstr "Archiv" msgstr "Archiv"
@ -8538,34 +8508,34 @@ msgstr "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens wenn das
msgid "stopped following" msgid "stopped following"
msgstr "wird nicht mehr gefolgt" msgstr "wird nicht mehr gefolgt"
#: ../../include/Contact.php:220 ../../include/conversation.php:1106 #: ../../include/Contact.php:220 ../../include/conversation.php:734
msgid "Poke" msgid "Poke"
msgstr "Anstupsen" msgstr "Anstupsen"
#: ../../include/Contact.php:221 ../../include/conversation.php:1100 #: ../../include/Contact.php:221 ../../include/conversation.php:728
msgid "View Status" msgid "View Status"
msgstr "Pinnwand anschauen" msgstr "Pinnwand anschauen"
#: ../../include/Contact.php:222 ../../include/conversation.php:1101 #: ../../include/Contact.php:222 ../../include/conversation.php:729
msgid "View Profile" msgid "View Profile"
msgstr "Profil anschauen" msgstr "Profil anschauen"
#: ../../include/Contact.php:223 ../../include/conversation.php:1102 #: ../../include/Contact.php:223 ../../include/conversation.php:730
msgid "View Photos" msgid "View Photos"
msgstr "Bilder anschauen" msgstr "Bilder anschauen"
#: ../../include/Contact.php:224 ../../include/Contact.php:237 #: ../../include/Contact.php:224 ../../include/Contact.php:237
#: ../../include/conversation.php:1103 #: ../../include/conversation.php:731
msgid "Network Posts" msgid "Network Posts"
msgstr "Netzwerkbeiträge" msgstr "Netzwerkbeiträge"
#: ../../include/Contact.php:225 ../../include/Contact.php:237 #: ../../include/Contact.php:225 ../../include/Contact.php:237
#: ../../include/conversation.php:1104 #: ../../include/conversation.php:732
msgid "Edit Contact" msgid "Edit Contact"
msgstr "Kontakt bearbeiten" msgstr "Kontakt bearbeiten"
#: ../../include/Contact.php:226 ../../include/Contact.php:237 #: ../../include/Contact.php:226 ../../include/Contact.php:237
#: ../../include/conversation.php:1105 #: ../../include/conversation.php:733
msgid "Send PM" msgid "Send PM"
msgstr "Private Nachricht senden" msgstr "Private Nachricht senden"
@ -8583,120 +8553,118 @@ msgstr "Nachricht/Beitrag"
msgid "%1$s marked %2$s's %3$s as favorite" msgid "%1$s marked %2$s's %3$s as favorite"
msgstr "%1$s hat %2$s\\s %3$s als Favorit markiert" msgstr "%1$s hat %2$s\\s %3$s als Favorit markiert"
#: ../../include/conversation.php:645 ../../include/conversation.php:919 #: ../../include/conversation.php:545 ../../object/Item.php:218
#: ../../object/Item.php:217
msgid "Categories:" msgid "Categories:"
msgstr "Kategorien" msgstr "Kategorien"
#: ../../include/conversation.php:646 ../../include/conversation.php:920 #: ../../include/conversation.php:546 ../../object/Item.php:219
#: ../../object/Item.php:218
msgid "Filed under:" msgid "Filed under:"
msgstr "Abgelegt unter:" msgstr "Abgelegt unter:"
#: ../../include/conversation.php:1002 #: ../../include/conversation.php:630
msgid "remove" msgid "remove"
msgstr "löschen" msgstr "löschen"
#: ../../include/conversation.php:1006 #: ../../include/conversation.php:634
msgid "Delete Selected Items" msgid "Delete Selected Items"
msgstr "Lösche die markierten Beiträge" msgstr "Lösche die markierten Beiträge"
#: ../../include/conversation.php:1164 #: ../../include/conversation.php:792
#, php-format #, php-format
msgid "%s likes this." msgid "%s likes this."
msgstr "%s mag das." msgstr "%s mag das."
#: ../../include/conversation.php:1164 #: ../../include/conversation.php:792
#, php-format #, php-format
msgid "%s doesn't like this." msgid "%s doesn't like this."
msgstr "%s mag das nicht." msgstr "%s mag das nicht."
#: ../../include/conversation.php:1168 #: ../../include/conversation.php:796
#, php-format #, php-format
msgid "<span %1$s>%2$d people</span> like this." msgid "<span %1$s>%2$d people</span> like this."
msgstr "<span %1$s>%2$d Leute</span> mögen das." msgstr "<span %1$s>%2$d Leute</span> mögen das."
#: ../../include/conversation.php:1170 #: ../../include/conversation.php:798
#, php-format #, php-format
msgid "<span %1$s>%2$d people</span> don't like this." msgid "<span %1$s>%2$d people</span> don't like this."
msgstr "<span %1$s>%2$d Leute</span> mögen das nicht." msgstr "<span %1$s>%2$d Leute</span> mögen das nicht."
#: ../../include/conversation.php:1176 #: ../../include/conversation.php:804
msgid "and" msgid "and"
msgstr "und" msgstr "und"
#: ../../include/conversation.php:1179 #: ../../include/conversation.php:807
#, php-format #, php-format
msgid ", and %d other people" msgid ", and %d other people"
msgstr " und %d andere" msgstr " und %d andere"
#: ../../include/conversation.php:1180 #: ../../include/conversation.php:808
#, php-format #, php-format
msgid "%s like this." msgid "%s like this."
msgstr "%s mögen das." msgstr "%s mögen das."
#: ../../include/conversation.php:1180 #: ../../include/conversation.php:808
#, php-format #, php-format
msgid "%s don't like this." msgid "%s don't like this."
msgstr "%s mögen das nicht." msgstr "%s mögen das nicht."
#: ../../include/conversation.php:1204 ../../include/conversation.php:1221 #: ../../include/conversation.php:832 ../../include/conversation.php:849
msgid "Visible to <strong>everybody</strong>" msgid "Visible to <strong>everybody</strong>"
msgstr "Für <strong>jedermann</strong> sichtbar" msgstr "Für <strong>jedermann</strong> sichtbar"
#: ../../include/conversation.php:1206 ../../include/conversation.php:1223 #: ../../include/conversation.php:834 ../../include/conversation.php:851
msgid "Please enter a video link/URL:" msgid "Please enter a video link/URL:"
msgstr "Bitte Link/URL zum Video einfügen:" msgstr "Bitte Link/URL zum Video einfügen:"
#: ../../include/conversation.php:1207 ../../include/conversation.php:1224 #: ../../include/conversation.php:835 ../../include/conversation.php:852
msgid "Please enter an audio link/URL:" msgid "Please enter an audio link/URL:"
msgstr "Bitte Link/URL zum Audio einfügen:" msgstr "Bitte Link/URL zum Audio einfügen:"
#: ../../include/conversation.php:1208 ../../include/conversation.php:1225 #: ../../include/conversation.php:836 ../../include/conversation.php:853
msgid "Tag term:" msgid "Tag term:"
msgstr "Tag:" msgstr "Tag:"
#: ../../include/conversation.php:1210 ../../include/conversation.php:1227 #: ../../include/conversation.php:838 ../../include/conversation.php:855
msgid "Where are you right now?" msgid "Where are you right now?"
msgstr "Wo hältst du dich jetzt gerade auf?" msgstr "Wo hältst du dich jetzt gerade auf?"
#: ../../include/conversation.php:1270 #: ../../include/conversation.php:898
msgid "upload photo" msgid "upload photo"
msgstr "Bild hochladen" msgstr "Bild hochladen"
#: ../../include/conversation.php:1272 #: ../../include/conversation.php:900
msgid "attach file" msgid "attach file"
msgstr "Datei anhängen" msgstr "Datei anhängen"
#: ../../include/conversation.php:1274 #: ../../include/conversation.php:902
msgid "web link" msgid "web link"
msgstr "Weblink" msgstr "Weblink"
#: ../../include/conversation.php:1275 #: ../../include/conversation.php:903
msgid "Insert video link" msgid "Insert video link"
msgstr "Video-Adresse einfügen" msgstr "Video-Adresse einfügen"
#: ../../include/conversation.php:1276 #: ../../include/conversation.php:904
msgid "video link" msgid "video link"
msgstr "Video-Link" msgstr "Video-Link"
#: ../../include/conversation.php:1277 #: ../../include/conversation.php:905
msgid "Insert audio link" msgid "Insert audio link"
msgstr "Audio-Adresse einfügen" msgstr "Audio-Adresse einfügen"
#: ../../include/conversation.php:1278 #: ../../include/conversation.php:906
msgid "audio link" msgid "audio link"
msgstr "Audio-Link" msgstr "Audio-Link"
#: ../../include/conversation.php:1280 #: ../../include/conversation.php:908
msgid "set location" msgid "set location"
msgstr "Ort setzen" msgstr "Ort setzen"
#: ../../include/conversation.php:1282 #: ../../include/conversation.php:910
msgid "clear location" msgid "clear location"
msgstr "Ort löschen" msgstr "Ort löschen"
#: ../../include/conversation.php:1289 #: ../../include/conversation.php:917
msgid "permissions" msgid "permissions"
msgstr "Zugriffsrechte" msgstr "Zugriffsrechte"

View file

@ -1391,8 +1391,8 @@ $a->strings["show/hide"] = "anzeigen/verbergen";
$a->strings["No forum subscriptions"] = "Keine Foren-Mitgliedschaften."; $a->strings["No forum subscriptions"] = "Keine Foren-Mitgliedschaften.";
$a->strings["Forumlist settings updated."] = "Einstellungen zur Foren-Liste aktualisiert."; $a->strings["Forumlist settings updated."] = "Einstellungen zur Foren-Liste aktualisiert.";
$a->strings["Forumlist Settings"] = "Foren-Liste Einstellungen"; $a->strings["Forumlist Settings"] = "Foren-Liste Einstellungen";
$a->strings["Randomise Forumlist/Forum list"] = "Zufällige Zusammenstellung der Foren-Liste"; $a->strings["Randomise forum list"] = "Zufällige Zusammenstellung der Foren-Liste";
$a->strings["Show forumlists/forums on profile forumlist"] = "Liste der Foren deren Abonnement du bist in deinem Profil anzeigen:"; $a->strings["Show forums on profile page"] = "Zeige die Liste der Foren auf der Profilseite";
$a->strings["Impressum"] = "Impressum"; $a->strings["Impressum"] = "Impressum";
$a->strings["Site Owner"] = "Betreiber der Seite"; $a->strings["Site Owner"] = "Betreiber der Seite";
$a->strings["Email Address"] = "Email Adresse"; $a->strings["Email Address"] = "Email Adresse";

View file

@ -9,8 +9,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: friendica\n" "Project-Id-Version: friendica\n"
"Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
"POT-Creation-Date: 2012-09-26 10:00-0700\n" "POT-Creation-Date: 2012-09-27 10:00-0700\n"
"PO-Revision-Date: 2012-09-27 12:16+0000\n" "PO-Revision-Date: 2012-09-28 14:23+0000\n"
"Last-Translator: Olivier <olivier+transifex@migeot.org>\n" "Last-Translator: Olivier <olivier+transifex@migeot.org>\n"
"Language-Team: French (http://www.transifex.com/projects/p/friendica/language/fr/)\n" "Language-Team: French (http://www.transifex.com/projects/p/friendica/language/fr/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -60,7 +60,7 @@ msgstr "Impossible d'appliquer les réglages."
#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510
#: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159 #: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159
#: ../../addon/fbpost/fbpost.php:165 #: ../../addon/fbpost/fbpost.php:165
#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3908 #: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3913
#: ../../index.php:317 #: ../../index.php:317
msgid "Permission denied." msgid "Permission denied."
msgstr "Permission refusée." msgstr "Permission refusée."
@ -150,7 +150,7 @@ msgstr "Nouvelle photo depuis cette URL"
#: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93 #: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93
#: ../../addon/drpost/drpost.php:110 ../../addon/startpage/startpage.php:92 #: ../../addon/drpost/drpost.php:110 ../../addon/startpage/startpage.php:92
#: ../../addon/geonames/geonames.php:187 ../../addon/oembed.old/oembed.php:41 #: ../../addon/geonames/geonames.php:187 ../../addon/oembed.old/oembed.php:41
#: ../../addon/forumlist/forumlist.php:169 #: ../../addon/forumlist/forumlist.php:163
#: ../../addon/impressum/impressum.php:83 #: ../../addon/impressum/impressum.php:83
#: ../../addon/notimeline/notimeline.php:64 ../../addon/blockem/blockem.php:57 #: ../../addon/notimeline/notimeline.php:64 ../../addon/blockem/blockem.php:57
#: ../../addon/qcomment/qcomment.php:61 #: ../../addon/qcomment/qcomment.php:61
@ -875,7 +875,7 @@ msgstr "Merci de confirmer votre demande d'introduction auprès de %s."
msgid "Confirm" msgid "Confirm"
msgstr "Confirmer" msgstr "Confirmer"
#: ../../mod/dfrn_request.php:715 ../../include/items.php:3287 #: ../../mod/dfrn_request.php:715 ../../include/items.php:3292
msgid "[Name Withheld]" msgid "[Name Withheld]"
msgstr "[Nom non-publié]" msgstr "[Nom non-publié]"
@ -937,7 +937,7 @@ msgstr "Diaspora"
msgid "" msgid ""
" - please do not use this form. Instead, enter %s into your Diaspora search" " - please do not use this form. Instead, enter %s into your Diaspora search"
" bar." " bar."
msgstr " - merci de ne pas utiliser ce formulaire. Entrez plutôt %s dans votre barre de rechercher Diaspora." msgstr " - merci de ne pas utiliser ce formulaire. Entrez plutôt %s dans votre barre de recherche Diaspora."
#: ../../mod/dfrn_request.php:843 #: ../../mod/dfrn_request.php:843
msgid "Your Identity Address:" msgid "Your Identity Address:"
@ -1937,7 +1937,7 @@ msgstr "Requête de réinitialisation de mot de passe à %s"
#: ../../addon/facebook/facebook.php:702 #: ../../addon/facebook/facebook.php:702
#: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661 #: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661
#: ../../addon/public_server/public_server.php:62 #: ../../addon/public_server/public_server.php:62
#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3296 #: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3301
#: ../../boot.php:788 #: ../../boot.php:788
msgid "Administrator" msgid "Administrator"
msgstr "Administrateur" msgstr "Administrateur"
@ -2552,7 +2552,7 @@ msgstr "Retirer le terme"
#: ../../mod/network.php:146 ../../mod/search.php:13 #: ../../mod/network.php:146 ../../mod/search.php:13
msgid "Saved Searches" msgid "Saved Searches"
msgstr "Recherches sauvées" msgstr "Recherches"
#: ../../mod/network.php:147 ../../include/group.php:244 #: ../../mod/network.php:147 ../../include/group.php:244
msgid "add" msgid "add"
@ -3096,7 +3096,7 @@ msgstr "%1$s n'aime pas %3$s de %2$s"
#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
#: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:29 #: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:29
#: ../../mod/display.php:145 ../../include/items.php:3774 #: ../../mod/display.php:145 ../../include/items.php:3779
msgid "Item not found." msgid "Item not found."
msgstr "Élément introuvable." msgstr "Élément introuvable."
@ -5260,11 +5260,11 @@ msgid "%s - Click to open/close"
msgstr "%s - cliquer pour ouvrir/fermer" msgstr "%s - cliquer pour ouvrir/fermer"
#: ../../addon/page/page.php:61 ../../addon/page/page.php:91 #: ../../addon/page/page.php:61 ../../addon/page/page.php:91
#: ../../addon/forumlist/forumlist.php:54 #: ../../addon/forumlist/forumlist.php:55
msgid "Forums" msgid "Forums"
msgstr "Forums" msgstr "Forums"
#: ../../addon/page/page.php:129 ../../addon/forumlist/forumlist.php:88 #: ../../addon/page/page.php:129 ../../addon/forumlist/forumlist.php:89
msgid "Forums:" msgid "Forums:"
msgstr "Forums:" msgstr "Forums:"
@ -5276,7 +5276,7 @@ msgstr "Paramètres des pages mis à jour."
msgid "Page Settings" msgid "Page Settings"
msgstr "Paramètres des pages" msgstr "Paramètres des pages"
#: ../../addon/page/page.php:196 ../../addon/forumlist/forumlist.php:155 #: ../../addon/page/page.php:196
msgid "How many forums to display on sidebar without paging" msgid "How many forums to display on sidebar without paging"
msgstr "Nombre de forums à afficher sur la barre de côté sans changer de page" msgstr "Nombre de forums à afficher sur la barre de côté sans changer de page"
@ -6109,7 +6109,7 @@ msgstr "Utiliser OEmbed pour les vidéos Youtube"
msgid "URL to embed:" msgid "URL to embed:"
msgstr "URL à incorporer:" msgstr "URL à incorporer:"
#: ../../addon/forumlist/forumlist.php:57 #: ../../addon/forumlist/forumlist.php:58
msgid "show/hide" msgid "show/hide"
msgstr "Montrer/cacher" msgstr "Montrer/cacher"
@ -6117,20 +6117,20 @@ msgstr "Montrer/cacher"
msgid "No forum subscriptions" msgid "No forum subscriptions"
msgstr "Pas d'abonnement au forum" msgstr "Pas d'abonnement au forum"
#: ../../addon/forumlist/forumlist.php:124 #: ../../addon/forumlist/forumlist.php:125
msgid "Forumlist settings updated." msgid "Forumlist settings updated."
msgstr "Paramètres de la liste des forums mis à jour." msgstr "Paramètres de la liste des forums mis à jour."
#: ../../addon/forumlist/forumlist.php:153 #: ../../addon/forumlist/forumlist.php:150
msgid "Forumlist Settings" msgid "Forumlist Settings"
msgstr "Paramètres de la liste des forums" msgstr "Paramètres de la liste des forums"
#: ../../addon/forumlist/forumlist.php:158 #: ../../addon/forumlist/forumlist.php:152
msgid "Randomise Forumlist/Forum list" msgid "Randomise forum list"
msgstr "" msgstr ""
#: ../../addon/forumlist/forumlist.php:161 #: ../../addon/forumlist/forumlist.php:155
msgid "Show forumlists/forums on profile forumlist" msgid "Show forums on profile page"
msgstr "" msgstr ""
#: ../../addon/impressum/impressum.php:37 #: ../../addon/impressum/impressum.php:37
@ -7607,7 +7607,7 @@ msgstr "Plus récent"
#: ../../include/text.php:299 #: ../../include/text.php:299
msgid "older" msgid "older"
msgstr "Plus ancient" msgstr "Plus ancien"
#: ../../include/text.php:597 #: ../../include/text.php:597
msgid "No contacts" msgid "No contacts"
@ -8113,12 +8113,12 @@ msgstr "secondes"
msgid "%1$d %2$s ago" msgid "%1$d %2$s ago"
msgstr "%1$d %2$s auparavant" msgstr "%1$d %2$s auparavant"
#: ../../include/datetime.php:472 ../../include/items.php:1683 #: ../../include/datetime.php:472 ../../include/items.php:1688
#, php-format #, php-format
msgid "%s's birthday" msgid "%s's birthday"
msgstr "Anniversaire de %s's" msgstr "Anniversaire de %s's"
#: ../../include/datetime.php:473 ../../include/items.php:1684 #: ../../include/datetime.php:473 ../../include/items.php:1689
#, php-format #, php-format
msgid "Happy Birthday %s" msgid "Happy Birthday %s"
msgstr "Joyeux anniversaire, %s !" msgstr "Joyeux anniversaire, %s !"
@ -8393,15 +8393,15 @@ msgstr "Impossible de récupérer les informations du contact."
msgid "following" msgid "following"
msgstr "following" msgstr "following"
#: ../../include/items.php:3294 #: ../../include/items.php:3299
msgid "A new person is sharing with you at " msgid "A new person is sharing with you at "
msgstr "Une nouvelle personne partage avec vous à " msgstr "Une nouvelle personne partage avec vous à "
#: ../../include/items.php:3294 #: ../../include/items.php:3299
msgid "You have a new follower at " msgid "You have a new follower at "
msgstr "Vous avez un nouvel abonné à " msgstr "Vous avez un nouvel abonné à "
#: ../../include/items.php:3975 #: ../../include/items.php:3980
msgid "Archives" msgid "Archives"
msgstr "Archives" msgstr "Archives"

View file

@ -190,7 +190,7 @@ $a->strings["Add a personal note:"] = "Ajouter une note personnelle:";
$a->strings["Friendica"] = "Friendica"; $a->strings["Friendica"] = "Friendica";
$a->strings["StatusNet/Federated Social Web"] = "StatusNet/Federated Social Web"; $a->strings["StatusNet/Federated Social Web"] = "StatusNet/Federated Social Web";
$a->strings["Diaspora"] = "Diaspora"; $a->strings["Diaspora"] = "Diaspora";
$a->strings[" - please do not use this form. Instead, enter %s into your Diaspora search bar."] = " - merci de ne pas utiliser ce formulaire. Entrez plutôt %s dans votre barre de rechercher Diaspora."; $a->strings[" - please do not use this form. Instead, enter %s into your Diaspora search bar."] = " - merci de ne pas utiliser ce formulaire. Entrez plutôt %s dans votre barre de recherche Diaspora.";
$a->strings["Your Identity Address:"] = "Votre adresse d'identité:"; $a->strings["Your Identity Address:"] = "Votre adresse d'identité:";
$a->strings["Submit Request"] = "Envoyer la requête"; $a->strings["Submit Request"] = "Envoyer la requête";
$a->strings["Friendica Social Communications Server - Setup"] = "Serveur de communications sociales Friendica - Installation"; $a->strings["Friendica Social Communications Server - Setup"] = "Serveur de communications sociales Friendica - Installation";
@ -571,7 +571,7 @@ $a->strings["Toggle between different identities or community/group pages which
$a->strings["Select an identity to manage: "] = "Choisir une identité à gérer: "; $a->strings["Select an identity to manage: "] = "Choisir une identité à gérer: ";
$a->strings["Search Results For:"] = "Résultats pour:"; $a->strings["Search Results For:"] = "Résultats pour:";
$a->strings["Remove term"] = "Retirer le terme"; $a->strings["Remove term"] = "Retirer le terme";
$a->strings["Saved Searches"] = "Recherches sauvées"; $a->strings["Saved Searches"] = "Recherches";
$a->strings["add"] = "ajouter"; $a->strings["add"] = "ajouter";
$a->strings["Commented Order"] = "Dans l'ordre des commentaires"; $a->strings["Commented Order"] = "Dans l'ordre des commentaires";
$a->strings["Sort by Comment Date"] = "Trier par date de commentaire"; $a->strings["Sort by Comment Date"] = "Trier par date de commentaire";
@ -1391,8 +1391,8 @@ $a->strings["show/hide"] = "Montrer/cacher";
$a->strings["No forum subscriptions"] = "Pas d'abonnement au forum"; $a->strings["No forum subscriptions"] = "Pas d'abonnement au forum";
$a->strings["Forumlist settings updated."] = "Paramètres de la liste des forums mis à jour."; $a->strings["Forumlist settings updated."] = "Paramètres de la liste des forums mis à jour.";
$a->strings["Forumlist Settings"] = "Paramètres de la liste des forums"; $a->strings["Forumlist Settings"] = "Paramètres de la liste des forums";
$a->strings["Randomise Forumlist/Forum list"] = ""; $a->strings["Randomise forum list"] = "";
$a->strings["Show forumlists/forums on profile forumlist"] = ""; $a->strings["Show forums on profile page"] = "";
$a->strings["Impressum"] = "Impressum"; $a->strings["Impressum"] = "Impressum";
$a->strings["Site Owner"] = "Propriétaire du site"; $a->strings["Site Owner"] = "Propriétaire du site";
$a->strings["Email Address"] = "Adresse courriel"; $a->strings["Email Address"] = "Adresse courriel";
@ -1727,7 +1727,7 @@ $a->strings["first"] = "premier";
$a->strings["last"] = "dernier"; $a->strings["last"] = "dernier";
$a->strings["next"] = "suivant"; $a->strings["next"] = "suivant";
$a->strings["newer"] = "Plus récent"; $a->strings["newer"] = "Plus récent";
$a->strings["older"] = "Plus ancient"; $a->strings["older"] = "Plus ancien";
$a->strings["No contacts"] = "Aucun contact"; $a->strings["No contacts"] = "Aucun contact";
$a->strings["%d Contact"] = array( $a->strings["%d Contact"] = array(
0 => "%d contact", 0 => "%d contact",

View file

@ -1,14 +1,14 @@
Caro/a $myname, Ciao $[myname],
Hai un nuovo seguace a $sitename - '$requestor'. Un nuovo utente ha iniziato a seguirti su $[sitename] - '$[requestor]'.
Puoi visitare il suo profilo a $url. Puoi vedere il suo profilo su $[url].
Accedi al tuo sito per approvare o ignorare/cancellare la richiesta. Accedi sul tuo sito per approvare o ignorare la richiesta.
$siteurl $[siteurl]
Saluti, Saluti,
L'amministratore di $sitename L'amministratore di $[sitename]

View file

@ -1,23 +1,22 @@
Caro/a $username, Ciao $[username],
Grandi notizie... '$fn' a '$dfrn_url' ha accettato la tua richiesta di Ottime notizie... '$[fn]' di '$[dfrn_url]' ha accettato
di connessione a '$sitename'. la tua richiesta di connessione su '$[sitename]'.
Ora siete amici a vicenda e potete scambiarvi aggiornamenti di stato, foto e Adesso siete amici reciproci e potete scambiarvi aggiornamenti di stato, foto ed email
email senza restrizioni. senza restrizioni.
Visita la tua pagina 'Contatti' su $sitename se vuoi fare una qualsiasi modifica Vai nella pagina 'Contatti' di $[sitename] se vuoi effettuare
a questa relazione. qualche modifica riguardo questa relazione
$siteurl $[siteurl]
[Per esempio, puoi voler creare un profilo separato con informazioni che non [Ad esempio, potresti creare un profilo separato con le informazioni che non
sono disponibili al pubblico generico, e assegnarne i diritti di lettura a sono disponibili pubblicamente - ed permettere di vederlo a '$[fn]'].
'$fn'].
Sinceramente tuo, Saluti,
L'amministratore di $sitename l'amministratore di $[sitename]

View file

@ -1,22 +1,22 @@
Caro/a $username, Ciao $[username],
'$fn' a '$dfrn_url' ha accettato la tua richiesta di '$[fn]' di '$[dfrn_url]' ha accettato
connessione a '$sitename'. la tua richiesta di connessione a '$[sitename]'.
'$fn' ha scelto di accertarti come "fan", che limita alcune forme di '$[fn]' ha deciso di accettarti come "fan", il che restringe
comunicazione, come i messaggi privati e alcune interazioni con il profilo. alcune forme di comunicazione - come i messaggi privati e alcune
Se e' una celebrita' o una pagina di community, queste impostazioni interazioni. Se è la pagina di una persona famosa o di una comunità, queste impostazioni saranno
sono applicate automaticamente. applicate automaticamente.
'$fn' puo' decidere di estendere in una relazione piu' permissiva '$[fn]' potrebbe decidere di estendere questa relazione in una comunicazione bidirezionale o ancora più permissiva
nel futuro. .
Comincerai a rivecere gli aggiornamenti pubblici da '$fn', Inizierai a ricevere gli aggiornamenti di stato pubblici da '$[fn]',
che apparira' sulla tua pagina 'Rete' su che apparirà nella tua pagina 'Rete'
$siteurl $[siteurl]
Saluti, Saluti,
L'amministratore di $sitename l'amministratore di $[sitename]

View file

@ -1,34 +1,32 @@
Caro/a $username, Ciao $[username],
Su $[sitename] è stata ricevuta una richiesta di azzeramento di password per un account.
E' arrivata recentemente una richiesta di resettare la password del tuo Per confermare la richiesta, clicca sul link di verifica
account su $sitename. Per confermare questa richiesta, clicca sul link di qui in fondo oppure copialo nella barra degli indirizzi del tuo browser.
verifica qui sotto o incollalo nella barra dell'indirizzo del tuo browser web.
Se NON hai richiesto questa modifica, NON seguire il link e ignora e cancella Se NON hai richiesto l'azzeramento, NON seguire il link
questa mail. e ignora e/o cancella questa email.
La tua password non verrà cambiata finchè non verifichiame che hai richiesto tu La tua password non sarà modificata finché non avremo verificato che
la modifica. hai fatto questa richiesta.
Segui questo link per verificare la tua identità: Per verificare la tua identità clicca su:
$reset_link $[reset_link]
Riceverai un messaggio contenente la nuova password. Dopo la verifica riceverai un messaggio di risposta con la nuova password.
Potrai cambiare questa password dalla pagina delle impostazioni del tuo account Potrai cambiare la password dalla pagina delle impostazioni dopo aver effettuato l'accesso.
dopo aver effettuato l'accesso.
I dettagli d'accesso sono i seguenti: I dati di accesso sono i seguenti:
Sito: $siteurl Sito:»$[siteurl]
Nome: $email Nome utente:»$[email]
Saluti, Saluti,
L'amministratore di $sitename l'amministratore di $[sitename]

File diff suppressed because it is too large Load diff

View file

@ -1,20 +1,20 @@
Caro/a $username, Ciao $[username],
La tua password è stata cambiata come richiesto. Segnati questa informazione La tua password è cambiata come hai richiesto. Conserva queste
(o cambia immediatamente la password con qualcosa che ti ricorderai). informazioni (oppure cambia immediatamente la password con
qualcosa che ti è più facile ricordare).
I tui dati di accesso sono i seguenti: I tuoi dati di access sono i seguenti:
Sito: $siteurl Sito:»$[siteurl]
Nome: $email Nome utente:»$[email]
Password: $new_password Password:»$[new_password]
Puoi cambiare la password dalla pagina delle impostazioni del tuo profilo dopo Puoi cambiare la tua password dalla pagina delle impostazioni dopo aver effettuato l'accesso.
aver effetuato l'accesso.
Saluti, Saluti,
L'amministratore di $sitename l'amministratore di $[sitename]

View file

@ -1,22 +1,34 @@
Caro/a $username, Ciao $[username],
Grazie per la tua registrazione a $sitename. Il tuo account è stato creato. Grazie per aver effettuato la registrazione a $[sitename]. Il tuo account è stato creato.
I dati di accesso sono i seguenti: I dettagli di accesso sono i seguenti
Sito: $siteurl Sito:»$[siteurl]
Nome: $email Nome utente:»$[email]
Password: $password Password:»$[password]
Puoi cambiare la tua password dall pagina "Impostazioni" del tuo account dopo Puoi cambiare la tua password dalla pagina "Impostazioni" del tuo profilo dopo aver effettuato l'accesso
aver effettuato l'accesso. .
Prenditi un momento per rivedere le altre impostazioni dell'account su quella Prenditi un momento per dare un'occhiata alle altre impostazioni del tuo profilo nella stessa pagina.
pagina.
Grazie e benventuo su $sitename. Potrest voler aggiungere alcune informazioni di base a quelle predefinite del profilo
(nella pagina "Profilo") per rendere agli altri più facile trovarti.
Sinceramente, Noi raccomandiamo di impostare il tuo nome completo, di aggiungere una foto,
L'amministratore di $sitename di aggiungere alcune "parole chiavi" (molto utili per farsi nuovi amici) - e
magari il paese dove vivi; se non vuoi essere più dettagliato
di così.
Noi rispettiamo il tuo diritto alla privacy e nessuna di queste informazioni è indispensabile.
Se ancora non conosci nessuno qui, potrebbe esserti di aiuto
per farti nuovi e interessanti amici.
Grazie. Siamo contenti di darti il benvenuto su $[sitename]
Saluti,
l'amministratore di $[sitename]

View file

@ -1,23 +1,25 @@
E' stata ricevuta la richiesta di registrazione di un nuovo utente su Su $[sitename] è stata ricevuta una nuova richiesta di registrazione da parte di un utente che richiede
$sitename che richiede la tua approvazione. la tua approvazione.
I dettagli di login sono i seguenti:
Nome Completo: $username
Sito: $siteurl
Nome: $email
Per approvare la richiesta, visita il link: I tuoi dati di accesso sono i seguenti:
$siteurl/regmod/allow/$hash Nome completo:»$[username]
Sito:»$[siteurl]
Nome utente:»$[email]
Per rifiutare la richiesta e rimuovere l'account, visita: Per approvare questa richiesta clicca su:
$siteurl/regmod/deny/$hash
$[siteurl]/regmod/allow/$[hash]
Per negare la richiesta e rimuove il profilo, clicca su:
$[siteurl]/regmod/deny/$[hash]
Grazie. Grazie.

View file

@ -1,16 +1,17 @@
Caro/a $myname, Ciao $[myname],
Hai appena ricevuto una richiesta di connessione su $sitename Hai appena ricevuto una richiesta di connessione da $[sitename]
da '$requestor'.
Puoi visitare il suo profilo a $url. da '$[requestor]'.
Accedi al tuo sito per vedere la completa presentazione e approvare o Puoi visitare il suo profilo su $[url].
ignorare/cancellare la richiesta.
$siteurl Accedi al tuo sito per vedere la richiesta completa
e approva o ignora/annulla la richiesta.
$[siteurl]
Saluti, Saluti,
L'amministratore di $sitename l'amministratore di $[sitename]

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,14 @@
Kjære $[myname],
Du har en ny følgesvenn på $[sitename] - '$[requestor]'.
Du kan besøke profilen deres på $[url].
Vennligst logg inn på ditt sted for å godkjenne eller ignorere/avbryte forespørselen.
$[siteurl]
Med vennlig hilsen,
$[sitename] administrator

View file

@ -0,0 +1,22 @@
Kjære $[username],
Gode nyheter... '$[fn]' ved '$[dfrn_url]' har godtatt
din forespørsel om kobling hos '$[sitename]'.
Dere er nå gjensidige venner og kan utveksle statusoppdateringer, bilder og e-post
uten hindringer.
Vennligst besøk din side "Kontakter" ved $[sitename] hvis du ønsker å gjøre
noen endringer på denne forbindelsen.
$[siteurl]
[For eksempel, så kan du lage en egen profil med informasjon som ikke er
tilgjengelig for alle - og angi visningsrettigheter til '$[fn]'].
Med vennlig hilsen,
$[sitename] administrator

View file

@ -0,0 +1,22 @@
Kjære $[username],
'$[fn]' ved '$[dfrn_url]' har godtatt
din forespørsel om kobling ved $[sitename]'.
'$[fn]' har valgt å godta deg som "fan", som begrenser
noen typer kommunikasjon - slik som private meldinger og noen profilhandlinger.
Hvis dette er en kjendis- eller forumside, så ble disse innstillingene
angitt automatisk.
'$[fn]' kan velge å utvide dette til en to-veis eller mer åpen
forbindelse i fremtiden.
Du vil nå motta offentlige statusoppdateringer fra '$[fn]',
som vil vises på din "Nettverk"-side ved
$[siteurl]
Med vennlig hilsen,
$[sitename] administrator

View file

@ -0,0 +1,32 @@
Kjære $[username],
En forespørsel ble nylig mottatt hos $[sitename] om å tilbakestille din kontos
passord. For å godkjenne denne forespørselen, vennligst velg bekreftelseslenken
nedenfor eller lim den inn på adresselinjen i nettleseren din.
Hvis du IKKE har spurt om denne endringen, vennligst IKKE følg lenken
som er oppgitt og ignorer og/eller slett denne e-posten.
Passordet ditt vil ikke bli endret med mindre vi kan forsikre oss om at du
sendte denne forespørselen.
Følg denne lenken for å bekrefte din identitet:
$[reset_link]
Du vil da motta en oppfølgings melding med det nye passordet.
Du kan endre passordet på siden for dine kontoinnstillinger etter innlogging.
Innloggingsdetaljene er som følger:
Nettstedsadresse:»$[siteurl]
Brukernavn:»$[email]
Beste hilsen,
$[sitename] administrator

8765
view/nb-no/messages.po Normal file

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,20 @@
Kjære $[username],
Ditt passord har blitt endret som forespurt. Vennligst ta vare på denne
meldingen for sikkerhets skyld (eller bytt passordet ditt umiddelbart til
noe du husker).
Dine logg inn-detaljer er som følger:
Nettsted:»$[siteurl]
Brukernavn:»$[email]
Passord:»$[new_password]
Du kan endre dette passordet på din side for kontoinnstillinger etter innlogging.
Med vennlig hilsen,
$[sitename] administrator

View file

@ -0,0 +1,34 @@
Kjære $[username],
Takk for at du registrerte deg hos $[sitename]. Kontoen din er opprettet.
Innloggingsdetaljene er som følger:
Nettstedsadresse:»$[siteurl]
Brukernavn:»$[email]
Passord:»$[password]
Du kan endre passordet ditt på siden "Innstillinger" etter at du har logget
inn.
Vennligst bruk litt tid til å se over de andre kontoinnstillingene på den siden.
Du vil antakelig ønske å legge til litt grunnleggende informasjon til standardprofilen din
(på siden "Profiler") slik at folk lettere kan finne deg.
Vi anbefaler å oppgi fullt navn, legge til et profilbilde,
legge til noen "nøkkelord" for profilen (svært nyttig for å få nye venner) - og
kanskje hvilket land du bor i, hvis du ikke ønsker å være mer spesifikk
enn det.
Vi respekterer ditt privatliv fullt ut, og ingen av disse elementene er nødvendige.
Hvis du er ny og ikke kjenner noen her, så kan de hjelpe
deg å få noen nye og interessante venner.
Takk og velkommen til $[sitename].
Beste hilsen,
$[sitename] administrator

View file

@ -0,0 +1,25 @@
En ny forespørsel om brukerregistering ble mottatt hos $[sitename] og krever
din godkjenning.
Innloggingsdetaljene er som følger:
Fullt navn:»$[username]
Nettstedsadresse:»$[siteurl]
Brukernavn:»$[email]
For å godkjenne denne forespørselen, vennligst besøk følgende lenke:
$[siteurl]/regmod/allow/$[hash]
For å avslå denne forespørselen og fjerne kontoen, vennligst besøk:
$[siteurl]/regmod/deny/$[hash]
Mange takk.

View file

@ -0,0 +1,17 @@
Kjære $[myname],
Du har akkurat mottatt en kontaktforespørsel hos $[sitename]
fra '$[requestor]'.
Du kan besøke profilen på $[url].
Vennligst logg inn på ditt nettsted for å se hele introduksjonen
og godkjenne eller ignorere/avbryte forespørselen.
$[siteurl]
Beste hilsen,
$[siteurl] administrator

2006
view/nb-no/strings.php Normal file

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,11 @@
Hei,
jeg er $sitename.
Friendica-utviklerne slapp nylig oppdateringen $update,
men da jeg prøvde å installere den, gikk noe forferdelig galt.
Dette trenger å bli fikset raskt og jeg kan ikke gjøre det alene. Vennligst kontakt en
Friendica-utvikler hvis du ikke kan hjelpe meg på egenhånd. Databasen min er kanskje ugyldig.
Feilmeldingen er '$error'.
Jeg beklager,
din Friendica-tjener hos $siteurl

View file

@ -1,7 +1,7 @@
<div id="nets-sidebar" class="widget"> <div id="nets-sidebar" class="widget">
<h3>$title</h3> <h3>$title</h3>
<div id="nets-desc">$desc</div> <div id="nets-desc">$desc</div>
<a href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a> <a href="$base?nets=all" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a>
<ul class="nets-ul"> <ul class="nets-ul">
{{ for $nets as $net }} {{ for $nets as $net }}
<li><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li> <li><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -519,7 +519,7 @@ div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;}
.type-text{background-position:-60px 0px;} .type-text{background-position:-60px 0px;}
.type-unkn{background-position:-80px 0;} .type-unkn{background-position:-80px 0;}
.cc-license{margin-top:100px;font-size:0.7em;} .cc-license{margin-top:100px;font-size:0.7em;}
footer{display:block;clear:both;} footer{display:block;clear:both;text-align:center;}
#sectionfooter{margin:1em 0 1em 0;} #sectionfooter{margin:1em 0 1em 0;}
#profile-jot-text{height:20px;color:#eeeecc;background:#2e2f2e;border:1px solid #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;width:99.5%;} #profile-jot-text{height:20px;color:#eeeecc;background:#2e2f2e;border:1px solid #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;width:99.5%;}
#photo-edit-perms-select,#photos-upload-permissions-wrapper,#profile-jot-acl-wrapper{display:block !important;background:#2e2f2e;color:#eeeecc;} #photo-edit-perms-select,#photos-upload-permissions-wrapper,#profile-jot-acl-wrapper{display:block !important;background:#2e2f2e;color:#eeeecc;}

View file

@ -519,7 +519,7 @@ div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;}
.type-text{background-position:-60px 0px;} .type-text{background-position:-60px 0px;}
.type-unkn{background-position:-80px 0;} .type-unkn{background-position:-80px 0;}
.cc-license{margin-top:100px;font-size:0.7em;} .cc-license{margin-top:100px;font-size:0.7em;}
footer{display:block;clear:both;} footer{display:block;clear:both;text-align:center;}
#sectionfooter{margin:1em 0 1em 0;} #sectionfooter{margin:1em 0 1em 0;}
#profile-jot-text{height:20px;color:#666666;background:#cccccc;border:1px solid #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;width:99.5%;} #profile-jot-text{height:20px;color:#666666;background:#cccccc;border:1px solid #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;width:99.5%;}
#photo-edit-perms-select,#photos-upload-permissions-wrapper,#profile-jot-acl-wrapper{display:block !important;background:#eeeeec;color:#111111;} #photo-edit-perms-select,#photos-upload-permissions-wrapper,#profile-jot-acl-wrapper{display:block !important;background:#eeeeec;color:#111111;}

View file

@ -245,8 +245,9 @@ section {
/* footer */ /* footer */
footer { footer {
display: none; text-align: right;
padding-bottom: 1em;
padding-right: 3em;
} }
.birthday-today, .event-today { .birthday-today, .event-today {

View file

@ -10,6 +10,8 @@ Photo album display?
- Get "add contact" back on contacts page - Get "add contact" back on contacts page
- Allow creating a new private message
- Admin: access to more pages than summary? - Admin: access to more pages than summary?
- Find a way to show embedded videos at the normal size for tablets that can handle it - Find a way to show embedded videos at the normal size for tablets that can handle it

View file

@ -21,9 +21,7 @@
<section><?php if(x($page,'content')) echo $page['content']; ?> <section><?php if(x($page,'content')) echo $page['content']; ?>
</section> </section>
</div> </div>
<footer> <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
<a href="<?php echo $a->get_baseurl() ?>/toggle_mobile?off=1&address=<?php echo curPageURL() ?>">toggle mobile</a>
</footer>
<?php } else { ?> <?php } else { ?>
<div class='main-container'> <div class='main-container'>
@ -36,10 +34,7 @@
</div> </div>
<right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside> <right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside>
<?php if( ($a->module === 'contacts') && x($page,'aside')) echo $page['aside']; ?> <?php if( ($a->module === 'contacts') && x($page,'aside')) echo $page['aside']; ?>
<footer> <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
<a href="<?php echo $a->get_baseurl() ?>/toggle_mobile?off=1&address=<?php echo curPageURL() ?>">toggle mobile</a>
<?php if(x($page,'footer')) echo $page['footer']; ?>
</footer>
<!-- </div>--> <!-- </div>-->
</div> </div>
<?php } ?> <?php } ?>

View file

@ -185,7 +185,7 @@
var eSysmsg = $j(data).find('sysmsgs'); var eSysmsg = $j(data).find('sysmsgs');
eSysmsg.children("notice").each(function(){ eSysmsg.children("notice").each(function(){
text = $j(this).text(); text = $j(this).text();
$j.jGrowl(text, { sticky: false, theme: 'notice', life: 1500 }); $j.jGrowl(text, { sticky: false, theme: 'notice', life: 1000 });
}); });
eSysmsg.children("info").each(function(){ eSysmsg.children("info").each(function(){
text = $j(this).text(); text = $j(this).text();

File diff suppressed because one or more lines are too long

View file

@ -1402,6 +1402,13 @@ input#dfrn-url {
line-height: 23px; line-height: 23px;
} }
.wall-item-body iframe {
display: block;
clear: both;
margin-top: 1.5em;
margin-bottom: 1.5em;
}
.wall-item-body code { .wall-item-body code {
width: 260px; width: 260px;
overflow: hidden; overflow: hidden;

View file

@ -4,7 +4,7 @@
* Name: Frost--mobile version * Name: Frost--mobile version
* Description: Like frosted glass * Description: Like frosted glass
* Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0). * Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0).
* Version: Version 0.2.12 * Version: Version 0.2.13
* Author: Zach P <techcity@f.shmuz.in> * Author: Zach P <techcity@f.shmuz.in>
* Maintainer: Zach P <techcity@f.shmuz.in> * Maintainer: Zach P <techcity@f.shmuz.in>
*/ */

View file

@ -21,6 +21,7 @@
<section><?php if(x($page,'content')) echo $page['content']; ?> <section><?php if(x($page,'content')) echo $page['content']; ?>
</section> </section>
</div> </div>
<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
<?php } else { ?> <?php } else { ?>
<div class='main-container'> <div class='main-container'>

View file

@ -178,11 +178,11 @@
var eSysmsg = $j(data).find('sysmsgs'); var eSysmsg = $j(data).find('sysmsgs');
eSysmsg.children("notice").each(function(){ eSysmsg.children("notice").each(function(){
text = $j(this).text(); text = $j(this).text();
$j.jGrowl(text, { sticky: false, theme: 'notice', life: 2000 }); // originally: sticky: true, $j.jGrowl(text, { sticky: false, theme: 'notice', life: 3000 }); // originally: sticky: true,
}); });
eSysmsg.children("info").each(function(){ eSysmsg.children("info").each(function(){
text = $j(this).text(); text = $j(this).text();
$j.jGrowl(text, { sticky: false, theme: 'info', life: 1500 }); $j.jGrowl(text, { sticky: false, theme: 'info', life: 1000 });
}); });
}); });

File diff suppressed because one or more lines are too long

View file

@ -135,3 +135,9 @@ div.section-wrapper {
text-align: left; text-align: left;
font-size: 12px; font-size: 12px;
} }
footer {
text-align: center;
padding-top: 3em;
padding-bottom: 1em;
}

View file

@ -354,8 +354,8 @@ section {
/* footer */ /* footer */
footer { footer {
display: none; text-align: center;
padding-bottom: 1em;
} }
.birthday-today, .event-today { .birthday-today, .event-today {
@ -620,6 +620,10 @@ input#dfrn-url {
clear: both; clear: both;
} }
#croppa {
max-width: 510px;
}
.intro-wrapper { .intro-wrapper {
margin-top: 20px; margin-top: 20px;
} }
@ -1351,6 +1355,13 @@ input#dfrn-url {
line-height: 18px; line-height: 18px;
} }
.wall-item-body iframe {
display: block;
clear: both;
margin-top: 1.5em;
margin-bottom: 1.5em;
}
.wall-item-tools { .wall-item-tools {
clear: both; clear: both;
/* background-image: url("head.jpg"); /* background-image: url("head.jpg");
@ -3193,7 +3204,7 @@ aside input[type='text'] {
display: block; display: block;
margin-left: 50px; margin-left: 50px;
color: #666666; color: #666666;
clear: left;
} }
.field .onoff { .field .onoff {
@ -3291,6 +3302,10 @@ aside input[type='text'] {
#adminpage table tr:hover { background-color: #bbc7d7; } #adminpage table tr:hover { background-color: #bbc7d7; }
#adminpage .selectall { text-align: right; } #adminpage .selectall { text-align: right; }
#adminpage .screenshot img {
max-width: 550px;
}
/* /*
* UPDATE * UPDATE
*/ */

View file

@ -4,7 +4,7 @@
* Name: Frost * Name: Frost
* Description: Like frosted glass * Description: Like frosted glass
* Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0). * Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0).
* Version: Version 0.2.10 * Version: Version 0.2.11
* Author: Zach P <techcity@f.shmuz.in> * Author: Zach P <techcity@f.shmuz.in>
* Maintainer: Zach P <techcity@f.shmuz.in> * Maintainer: Zach P <techcity@f.shmuz.in>
*/ */

View file

@ -0,0 +1,2 @@
<a id="toggle_mobile_link" href="$toggle_link">$toggle_text</a>