diff --git a/boot.php b/boot.php index 02550deb1..44a8d8c32 100644 --- a/boot.php +++ b/boot.php @@ -9,9 +9,9 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1325' ); +define ( 'FRIENDICA_VERSION', '2.3.1328' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); -define ( 'DB_UPDATE_VERSION', 1139 ); +define ( 'DB_UPDATE_VERSION', 1141 ); define ( 'EOL', "
\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); @@ -73,6 +73,14 @@ define ( 'HOOK_HOOK', 0); define ( 'HOOK_FILE', 1); define ( 'HOOK_FUNCTION', 2); +/** + * DB update return values + */ + +define ( 'UPDATE_SUCCESS', 0); +define ( 'UPDATE_FAILED', 1); + + /** * * page/profile types @@ -193,6 +201,8 @@ define ( 'ACTIVITY_REQ_FRIEND', NAMESPACE_ACTIVITY_SCHEMA . 'request-friend' ); define ( 'ACTIVITY_UNFRIEND', NAMESPACE_ACTIVITY_SCHEMA . 'remove-friend' ); define ( 'ACTIVITY_FOLLOW', NAMESPACE_ACTIVITY_SCHEMA . 'follow' ); define ( 'ACTIVITY_UNFOLLOW', NAMESPACE_ACTIVITY_SCHEMA . 'stop-following' ); +define ( 'ACTIVITY_JOIN', NAMESPACE_ACTIVITY_SCHEMA . 'join' ); + define ( 'ACTIVITY_POST', NAMESPACE_ACTIVITY_SCHEMA . 'post' ); define ( 'ACTIVITY_UPDATE', NAMESPACE_ACTIVITY_SCHEMA . 'update' ); define ( 'ACTIVITY_TAG', NAMESPACE_ACTIVITY_SCHEMA . 'tag' ); @@ -205,6 +215,7 @@ define ( 'ACTIVITY_OBJ_PHOTO', NAMESPACE_ACTIVITY_SCHEMA . 'photo' ); define ( 'ACTIVITY_OBJ_P_PHOTO', NAMESPACE_ACTIVITY_SCHEMA . 'profile-photo' ); define ( 'ACTIVITY_OBJ_ALBUM', NAMESPACE_ACTIVITY_SCHEMA . 'photo-album' ); define ( 'ACTIVITY_OBJ_EVENT', NAMESPACE_ACTIVITY_SCHEMA . 'event' ); +define ( 'ACTIVITY_OBJ_GROUP', NAMESPACE_ACTIVITY_SCHEMA . 'group' ); define ( 'ACTIVITY_OBJ_TAGTERM', NAMESPACE_DFRN . '/tagterm' ); define ( 'ACTIVITY_OBJ_PROFILE', NAMESPACE_DFRN . '/profile' ); @@ -658,32 +669,29 @@ if(! function_exists('check_config')) { // call the specific update -// global $db; -// $db->excep(TRUE); -// try { -// $db->beginTransaction(); - $func = 'update_' . $x; - $func($a); -// $db->commit(); -// } catch(Exception $ex) { -// $db->rollback(); -// //send the administrator an e-mail -// $email_tpl = get_intltext_template("update_fail_eml.tpl"); -// $email_tpl = replace_macros($email_tpl, array( -// '$sitename' => $a->config['sitename'], -// '$siteurl' => $a->get_baseurl(), -// '$update' => $x, -// '$error' => $ex->getMessage())); -// $subject=sprintf(t('Update Error at %s'), $a->get_baseurl()); + $func = 'update_' . $x; + $retval = $func(); + if($retval) { + //send the administrator an e-mail + $email_tpl = get_intltext_template("update_fail_eml.tpl"); + $email_msg = replace_macros($email_tpl, array( + '$sitename' => $a->config['sitename'], + '$siteurl' => $a->get_baseurl(), + '$update' => $x, + '$error' => sprintf( t('Update %s failed. See error logs.'), $x) + )); + $subject=sprintf(t('Update Error at %s'), $a->get_baseurl()); -// mail($a->config['admin_email'], $subject, $text, -// 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n" -// . 'Content-type: text/plain; charset=UTF-8' . "\n" -// . 'Content-transfer-encoding: 8bit' ); -// //try the logger -// logger('update failed: '.$ex->getMessage().EOL); -// } -// $db->excep(FALSE); + mail($a->config['admin_email'], $subject, $email_msg, + 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n" + . 'Content-type: text/plain; charset=UTF-8' . "\n" + . 'Content-transfer-encoding: 8bit' ); + //try the logger + logger('CRITICAL: Update Failed: '. $x); + } + else + set_config('database','update_' . $x, 'success'); + } } set_config('system','build', DB_UPDATE_VERSION); @@ -725,9 +733,10 @@ if(! function_exists('check_config')) { foreach($installed as $i) { if(! in_array($i['name'],$plugins_arr)) { uninstall_plugin($i['name']); - } - else + } + else { $installed_arr[] = $i['name']; + } } } @@ -1463,16 +1472,19 @@ if(! function_exists('profile_tabs')){ 'label'=>t('Status'), 'url' => $url, 'sel' => ((!isset($tab)&&$a->argv[0]=='profile')?'active':''), + 'title' => t('Status Messages and Posts'), ), array( 'label' => t('Profile'), 'url' => $url.'/?tab=profile', 'sel' => ((isset($tab) && $tab=='profile')?'active':''), + 'title' => t('Profile Details'), ), array( 'label' => t('Photos'), 'url' => $a->get_baseurl() . '/photos/' . $nickname, 'sel' => ((!isset($tab)&&$a->argv[0]=='photos')?'active':''), + 'title' => t('Photo Albums'), ), ); @@ -1481,11 +1493,13 @@ if(! function_exists('profile_tabs')){ 'label' => t('Events'), 'url' => $a->get_baseurl() . '/events', 'sel' =>((!isset($tab)&&$a->argv[0]=='events')?'active':''), + 'title' => t('Events and Calendar'), ); $tabs[] = array( 'label' => t('Personal Notes'), 'url' => $a->get_baseurl() . '/notes', 'sel' =>((!isset($tab)&&$a->argv[0]=='notes')?'active':''), + 'title' => t('Only You Can See This'), ); } @@ -1505,6 +1519,12 @@ function get_my_url() { return false; } +function zrl_init(&$a) { + proc_run('php','include/gprobe.php',bin2hex(get_my_url())); + $arr = array('zrl' => get_my_url(), 'url' => $a->cmd); + call_hooks('zrl_init',$arr); +} + function zrl($s,$force = false) { if(! strlen($s)) return $s; diff --git a/database.sql b/database.sql index 78b26922b..16e3964b5 100644 --- a/database.sql +++ b/database.sql @@ -16,9 +16,11 @@ CREATE TABLE IF NOT EXISTS `addon` ( `name` char(255) NOT NULL, `version` char(255) NOT NULL, `installed` tinyint(1) NOT NULL DEFAULT '0', + `hidden` tinyint(1) NOT NULL DEFAULT '0', `timestamp` bigint(20) NOT NULL DEFAULT '0', `plugin_admin` tinyint(1) NOT NULL DEFAULT '0', - PRIMARY KEY (`id`) + PRIMARY KEY (`id`), + KEY `hidden` (`hidden`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -------------------------------------------------------- @@ -1019,6 +1021,7 @@ CREATE TABLE IF NOT EXISTS `user` ( `pwdreset` char(255) NOT NULL, `maxreq` int(11) NOT NULL DEFAULT '10', `expire` int(10) unsigned NOT NULL DEFAULT '0', + `account_removed` tinyint(1) NOT NULL DEFAULT '0', `account_expired` tinyint(1) NOT NULL DEFAULT '0', `account_expires_on` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `expire_notification_sent` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', @@ -1036,7 +1039,8 @@ CREATE TABLE IF NOT EXISTS `user` ( KEY `blocked` (`blocked`), KEY `verified` (`verified`), KEY `unkmail` (`unkmail`), - KEY `cntunkmail` (`cntunkmail`) + KEY `cntunkmail` (`cntunkmail`), + KEY `account_removed` (`account_removed`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -------------------------------------------------------- diff --git a/include/Contact.php b/include/Contact.php index 537850e00..2523fc023 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -51,6 +51,21 @@ function user_remove($uid) { function contact_remove($id) { + + $r = q("select uid from contact where id = %d limit 1", + intval($id) + ); + if((! count($r)) || (! intval($r[0]['uid']))) + return; + + $archive = get_pconfig($r[0]['uid'], 'system','archive_removed_contacts'); + if($archive) { + q("update contact set `archive` = 1, `network` = 'none', `writable` = 0 where id = %d limit 1", + intval($id) + ); + return; + } + q("DELETE FROM `contact` WHERE `id` = %d LIMIT 1", intval($id) ); diff --git a/include/api.php b/include/api.php index f9be68c3d..a693a32c8 100644 --- a/include/api.php +++ b/include/api.php @@ -380,7 +380,7 @@ $nick = $name; // Generating a random ID - if (!array_key_exists($nick, $usercache)) + if (is_null($usercache[$nick]) or !array_key_exists($nick, $usercache)) $usercache[$nick] = mt_rand(2000000, 2100000); $ret = array( diff --git a/include/dba.php b/include/dba.php index 44a663eac..c9f880241 100644 --- a/include/dba.php +++ b/include/dba.php @@ -75,22 +75,28 @@ class dba { if((! $this->db) || (! $this->connected)) return false; + $this->error = ''; + if($this->mysqli) $result = @$this->db->query($sql); else $result = @mysql_query($sql,$this->db); + if($this->mysqli) { + if($this->db->errno) + $this->error = $this->db->error; + } + elseif(mysql_errno($this->db)) + $this->error = mysql_error($this->db); + + if(strlen($this->error)) { + logger('dba: ' . $this->error); + } + if($this->debug) { $mesg = ''; - if($this->mysqli) { - if($this->db->errno) - logger('dba: ' . $this->db->error); - } - elseif(mysql_errno($this->db)) - logger('dba: ' . mysql_error($this->db)); - if($result === false) $mesg = 'false'; elseif($result === true) @@ -102,7 +108,9 @@ class dba { $mesg = mysql_num_rows($result) . ' results' . EOL; } - $str = 'SQL = ' . printable($sql) . EOL . 'SQL returned ' . $mesg . EOL; + $str = 'SQL = ' . printable($sql) . EOL . 'SQL returned ' . $mesg + . (($this->error) ? ' error: ' . $this->error : '') + . EOL; logger('dba: ' . $str ); } @@ -114,9 +122,9 @@ class dba { */ if($result === false) { - logger('dba: ' . printable($sql) . ' returned false.'); + logger('dba: ' . printable($sql) . ' returned false.' . "\n" . $this->error); if(file_exists('dbfail.out')) - file_put_contents('dbfail.out', datetime_convert() . "\n" . printable($sql) . ' returned false' . "\n", FILE_APPEND); + file_put_contents('dbfail.out', datetime_convert() . "\n" . printable($sql) . ' returned false' . "\n" . $this->error . "\n", FILE_APPEND); } if(($result === true) || ($result === false)) diff --git a/include/gprobe.php b/include/gprobe.php new file mode 100644 index 000000000..26254ad28 --- /dev/null +++ b/include/gprobe.php @@ -0,0 +1,60 @@ +set_baseurl(get_config('system','url')); + + load_hooks(); + + if($argc != 2) + return; + + $url = hex2bin($argv[1]); + + $r = q("select * from gcontact where nurl = '%s' limit 1", + dbesc(normalise_link($url)) + ); + + if(count($r)) + return; + + $arr = probe_url($url); + + if(count($arr) && x($arr,'network') && $arr['network'] === NETWORK_DFRN) { + q("insert into `gcontact` (`name`,`url`,`nurl`,`photo`) + values ( '%s', '%s', '%s', '%s') ", + dbesc($arr['name']), + dbesc($arr['url']), + dbesc(normalise_link($arr['url'])), + dbesc($arr['photo']) + ); + } + + return; +} + +if (array_search(__file__,get_included_files())===0){ + gprobe_run($argv,$argc); + killme(); +} diff --git a/include/items.php b/include/items.php index 07f62ece5..a1dcdb6d8 100644 --- a/include/items.php +++ b/include/items.php @@ -2227,10 +2227,10 @@ function local_delivery($importer,$data) { logger('local_delivery: received remote comment'); $is_like = false; // remote reply to our post. Import and then notify everybody else. + $datarray = get_atom_elements($feed,$item); - - $r = q("SELECT `id`, `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", + $r = q("SELECT `id`, `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", dbesc($item_id), intval($importer['importer_uid']) ); @@ -2266,14 +2266,22 @@ function local_delivery($importer,$data) { // return 0; // } + // our user with $importer['importer_uid'] is the owner + + $own = q("select name,url,thumb from contact where uid = %d and self = 1 limit 1", + intval($importer['importer_uid']) + ); + + $datarray['type'] = 'remote-comment'; $datarray['wall'] = 1; $datarray['parent-uri'] = $parent_uri; $datarray['uid'] = $importer['importer_uid']; - $datarray['owner-name'] = $r[0]['name']; - $datarray['owner-link'] = $r[0]['url']; - $datarray['owner-avatar'] = $r[0]['thumb']; + $datarray['owner-name'] = $own[0]['name']; + $datarray['owner-link'] = $own[0]['url']; + $datarray['owner-avatar'] = $own[0]['thumb']; $datarray['contact-id'] = $importer['id']; + if(($datarray['verb'] === ACTIVITY_LIKE) || ($datarray['verb'] === ACTIVITY_DISLIKE)) { $is_like = true; $datarray['type'] = 'activity'; @@ -2290,26 +2298,34 @@ function local_delivery($importer,$data) { } if(($datarray['verb'] === ACTIVITY_TAG) && ($datarray['object-type'] === ACTIVITY_OBJ_TAGTERM)) { - - + $xo = parse_xml_string($datarray['object'],false); $xt = parse_xml_string($datarray['target'],false); - if(($xt->type == ACTIVITY_OBJ_NOTE) && ($xt->id == $r[0]['uri'])) { + if(($xt->type == ACTIVITY_OBJ_NOTE) && ($xt->id)) { + + // fetch the parent item + + $tagp = q("select * from item where uri = '%s' and uid = %d limit 1", + dbesc($xt->id), + intval($importer['importer_uid']) + ); + if(! count($tagp)) + continue; // extract tag, if not duplicate, and this user allows tags, add to parent item if($xo->id && $xo->content) { $newtag = '#[url=' . $xo->id . ']'. $xo->content . '[/url]'; - - if(! (stristr($r[0]['tag'],$newtag))) { + if(! (stristr($tagp[0]['tag'],$newtag))) { $i = q("SELECT `blocktags` FROM `user` where `uid` = %d LIMIT 1", intval($importer['importer_uid']) ); - if(count($i) && ! ($i[0]['blocktags'])) { - q("UPDATE item SET tag = '%s' WHERE id = %d LIMIT 1", - dbesc($r[0]['tag'] . (strlen($r[0]['tag']) ? ',' : '') . $newtag), - intval($r[0]['id']) + if(count($i) && ! intval($i[0]['blocktags'])) { + q("UPDATE item SET tag = '%s', `edited` = '%s' WHERE id = %d LIMIT 1", + dbesc($tagp[0]['tag'] . (strlen($tagp[0]['tag']) ? ',' : '') . $newtag), + intval($tagp[0]['id']), + dbesc(datetime_convert()) ); } } diff --git a/include/onepoll.php b/include/onepoll.php new file mode 100644 index 000000000..51516d059 --- /dev/null +++ b/include/onepoll.php @@ -0,0 +1,519 @@ +set_baseurl(get_config('system','url')); + + load_hooks(); + + logger('onepoll: start'); + + $abandon_days = intval(get_config('system','account_abandon_days')); + if($abandon_days < 1) + $abandon_days = 0; + + + $manual_id = 0; + $generation = 0; + $hub_update = false; + $force = false; + $restart = false; + + if(($argc > 1) && (intval($argv[1]))) + $contact_id = intval($argv[1]); + + if(! $contact_id) { + logger('onepoll: no contact'); + return; + } + + $d = datetime_convert(); + + // Only poll from those with suitable relationships, + // and which have a polling address and ignore Diaspora since + // we are unable to match those posts with a Diaspora GUID and prevent duplicates. + + $abandon_sql = (($abandon_days) + ? sprintf(" AND `user`.`login_date` > UTC_TIMESTAMP() - INTERVAL %d DAY ", intval($abandon_days)) + : '' + ); + + $contacts = q("SELECT `contact`.* FROM `contact` + WHERE ( `rel` = %d OR `rel` = %d ) AND `poll` != '' + AND NOT `network` IN ( '%s', '%s' ) + AND `contact`.`id` = %d + AND `self` = 0 AND `contact`.`blocked` = 0 AND `contact`.`readonly` = 0 + AND `contact`.`archive` = 0 LIMIT 1", + intval(CONTACT_IS_SHARING), + intval(CONTACT_IS_FRIEND), + dbesc(NETWORK_DIASPORA), + dbesc(NETWORK_FACEBOOK), + intval($contact_id) + ); + + if(! count($contacts)) { + return; + } + + $contact = $contacts[0]; + + + $xml = false; + + $t = $contact['last-update']; + + if($contact['subhub']) { + $interval = get_config('system','pushpoll_frequency'); + $contact['priority'] = (($interval !== false) ? intval($interval) : 3); + $hub_update = false; + + if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 day")) + $hub_update = true; + } + else + $hub_update = false; + + + $importer_uid = $contact['uid']; + + $r = q("SELECT `contact`.*, `user`.`page-flags` FROM `contact` LEFT JOIN `user` on `contact`.`uid` = `user`.`uid` WHERE `user`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1", + intval($importer_uid) + ); + if(! count($r)) + return; + + $importer = $r[0]; + + logger("onepoll: poll: ({$contact['id']}) IMPORTER: {$importer['name']}, CONTACT: {$contact['name']}"); + + $last_update = (($contact['last-update'] === '0000-00-00 00:00:00') + ? datetime_convert('UTC','UTC','now - 7 days', ATOM_TIME) + : datetime_convert('UTC','UTC',$contact['last-update'], ATOM_TIME) + ); + + if($contact['network'] === NETWORK_DFRN) { + + $idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']); + if(intval($contact['duplex']) && $contact['dfrn-id']) + $idtosend = '0:' . $orig_id; + if(intval($contact['duplex']) && $contact['issued-id']) + $idtosend = '1:' . $orig_id; + + // they have permission to write to us. We already filtered this in the contact query. + $perm = 'rw'; + + $url = $contact['poll'] . '?dfrn_id=' . $idtosend + . '&dfrn_version=' . DFRN_PROTOCOL_VERSION + . '&type=data&last_update=' . $last_update + . '&perm=' . $perm ; + + $handshake_xml = fetch_url($url); + + logger('onepoll: handshake with url ' . $url . ' returns xml: ' . $handshake_xml, LOGGER_DATA); + + + if(! $handshake_xml) { + logger("poller: $url appears to be dead - marking for death "); + // dead connection - might be a transient event, or this might + // mean the software was uninstalled or the domain expired. + // Will keep trying for one month. + mark_for_death($contact); + + // set the last-update so we don't keep polling + $r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d LIMIT 1", + dbesc(datetime_convert()), + intval($contact['id']) + ); + + return; + } + + if(! strstr($handshake_xml,'status) == 1) { + logger("poller: $url replied status 1 - marking for death "); + + // we may not be friends anymore. Will keep trying for one month. + // set the last-update so we don't keep polling + + + $r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d LIMIT 1", + dbesc(datetime_convert()), + intval($contact['id']) + ); + mark_for_death($contact); + } + else { + if($contact['term-date'] != '0000-00-00 00:00:00') { + logger("poller: $url back from the dead - removing mark for death"); + unmark_for_death($contact); + } + } + + if((intval($res->status) != 0) || (! strlen($res->challenge)) || (! strlen($res->dfrn_id))) + return; + + if(((float) $res->dfrn_version > 2.21) && ($contact['poco'] == '')) { + q("update contact set poco = '%s' where id = %d limit 1", + dbesc(str_replace('/profile/','/poco/', $contact['url'])), + intval($contact['id']) + ); + } + + $postvars = array(); + + $sent_dfrn_id = hex2bin((string) $res->dfrn_id); + $challenge = hex2bin((string) $res->challenge); + + $final_dfrn_id = ''; + + if(($contact['duplex']) && strlen($contact['prvkey'])) { + openssl_private_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['prvkey']); + openssl_private_decrypt($challenge,$postvars['challenge'],$contact['prvkey']); + } + else { + openssl_public_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['pubkey']); + openssl_public_decrypt($challenge,$postvars['challenge'],$contact['pubkey']); + } + + $final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.')); + + if(strpos($final_dfrn_id,':') == 1) + $final_dfrn_id = substr($final_dfrn_id,2); + + if($final_dfrn_id != $orig_id) { + logger('poller: ID did not decode: ' . $contact['id'] . ' orig: ' . $orig_id . ' final: ' . $final_dfrn_id); + // did not decode properly - cannot trust this site + return; + } + + $postvars['dfrn_id'] = $idtosend; + $postvars['dfrn_version'] = DFRN_PROTOCOL_VERSION; + $postvars['perm'] = 'rw'; + + $xml = post_url($contact['poll'],$postvars); + + } + elseif(($contact['network'] === NETWORK_OSTATUS) + || ($contact['network'] === NETWORK_DIASPORA) + || ($contact['network'] === NETWORK_FEED) ) { + + // Upgrading DB fields from an older Friendica version + // Will only do this once per notify-enabled OStatus contact + // or if relationship changes + + $stat_writeable = ((($contact['notify']) && ($contact['rel'] == CONTACT_IS_FOLLOWER || $contact['rel'] == CONTACT_IS_FRIEND)) ? 1 : 0); + + if($stat_writeable != $contact['writable']) { + q("UPDATE `contact` SET `writable` = %d WHERE `id` = %d LIMIT 1", + intval($stat_writeable), + intval($contact['id']) + ); + } + + // Are we allowed to import from this person? + + if($contact['rel'] == CONTACT_IS_FOLLOWER || $contact['blocked'] || $contact['readonly']) + return; + + $xml = fetch_url($contact['poll']); + } + elseif($contact['network'] === NETWORK_MAIL || $contact['network'] === NETWORK_MAIL2) { + + logger("onepoll: mail: Fetching", LOGGER_DEBUG); + + $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1); + if($mail_disabled) + return; + + logger("onepoll: Mail: Enabled", LOGGER_DEBUG); + + $mbox = null; + $x = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1", + intval($importer_uid) + ); + $mailconf = q("SELECT * FROM `mailacct` WHERE `server` != '' AND `uid` = %d LIMIT 1", + intval($importer_uid) + ); + if(count($x) && count($mailconf)) { + $mailbox = construct_mailbox_name($mailconf[0]); + $password = ''; + openssl_private_decrypt(hex2bin($mailconf[0]['pass']),$password,$x[0]['prvkey']); + $mbox = email_connect($mailbox,$mailconf[0]['user'],$password); + unset($password); + logger("Mail: Connect"); + if($mbox) { + q("UPDATE `mailacct` SET `last_check` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1", + dbesc(datetime_convert()), + intval($mailconf[0]['id']), + intval($importer_uid) + ); + } + } + if($mbox) { + + $msgs = email_poll($mbox,$contact['addr']); + + if(count($msgs)) { + logger("Mail: Parsing ".count($msgs)." mails.", LOGGER_DEBUG); + + foreach($msgs as $msg_uid) { + logger("Mail: Parsing mail ".$msg_uid, LOGGER_DATA); + + $datarray = array(); + $meta = email_msg_meta($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,'<>')); + + 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? + $r = q("SELECT * FROM `item` WHERE `uid` = %d AND `uri` = '%s' LIMIT 1", + intval($importer_uid), + dbesc($datarray['uri']) + ); + + if(count($r)) { +// logger("Mail: Seen before ".$msg_uid); + if($meta->deleted && ! $r[0]['deleted']) { + q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `id` = %d LIMIT 1", + dbesc(datetime_convert()), + intval($r[0]['id']) + ); + } + switch ($mailconf[0]['action']) { + case 0: + break; + case 1: + logger("Mail: Deleting ".$msg_uid); + imap_delete($mbox, $msg_uid, FT_UID); + break; + case 2: + logger("Mail: Mark as seen ".$msg_uid); + imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID); + break; + case 3: + logger("Mail: Moving ".$msg_uid." to ".$mailconf[0]['movetofolder']); + imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID); + if ($mailconf[0]['movetofolder'] != "") + imap_mail_move($mbox, $msg_uid, $mailconf[0]['movetofolder'], FT_UID); + break; + } + continue; + } + + // Decoding the header + $subject = imap_mime_header_decode($meta->subject); + $datarray['title'] = ""; + foreach($subject as $subpart) + if ($subpart->charset != "default") + $datarray['title'] .= iconv($subpart->charset, 'UTF-8//IGNORE', $subpart->text); + else + $datarray['title'] .= $subpart->text; + + $datarray['title'] = notags(trim($datarray['title'])); + + //$datarray['title'] = notags(trim($meta->subject)); + $datarray['created'] = datetime_convert('UTC','UTC',$meta->date); + + // Is it reply? + $reply = ((substr(strtolower($datarray['title']), 0, 3) == "re:") or + (substr(strtolower($datarray['title']), 0, 3) == "re-") or + (raw_refs != "")); + + $r = email_get_msg($mbox,$msg_uid, $reply); + if(! $r) { + logger("Mail: can't fetch msg ".$msg_uid); + continue; + } + $datarray['body'] = escape_tags($r['body']); + + logger("Mail: Importing ".$msg_uid); + + // some mailing lists have the original author as 'from' - add this sender info to msg body. + // todo: adding a gravatar for the original author would be cool + + if(! stristr($meta->from,$contact['addr'])) { + $from = imap_mime_header_decode($meta->from); + $fromdecoded = ""; + foreach($from as $frompart) + if ($frompart->charset != "default") + $fromdecoded .= iconv($frompart->charset, 'UTF-8//IGNORE', $frompart->text); + else + $fromdecoded .= $frompart->text; + + $datarray['body'] = "[b]".t('From: ') . escape_tags($fromdecoded) . "[/b]\n\n" . $datarray['body']; + } + + $datarray['uid'] = $importer_uid; + $datarray['contact-id'] = $contact['id']; + if($datarray['parent-uri'] === $datarray['uri']) + $datarray['private'] = 1; + if(($contact['network'] === NETWORK_MAIL) && (! get_pconfig($importer_uid,'system','allow_public_email_replies'))) { + $datarray['private'] = 1; + $datarray['allow_cid'] = '<' . $contact['id'] . '>'; + } + $datarray['author-name'] = $contact['name']; + $datarray['author-link'] = 'mailbox'; + $datarray['author-avatar'] = $contact['photo']; + + $stored_item = item_store($datarray); + q("UPDATE `item` SET `last-child` = 0 WHERE `parent-uri` = '%s' AND `uid` = %d", + dbesc($datarray['parent-uri']), + intval($importer_uid) + ); + q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d LIMIT 1", + intval($stored_item) + ); + switch ($mailconf[0]['action']) { + case 0: + break; + case 1: + logger("Mail: Deleting ".$msg_uid); + imap_delete($mbox, $msg_uid, FT_UID); + break; + case 2: + logger("Mail: Mark as seen ".$msg_uid); + imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID); + break; + case 3: + logger("Mail: Moving ".$msg_uid." to ".$mailconf[0]['movetofolder']); + imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID); + if ($mailconf[0]['movetofolder'] != "") + imap_mail_move($mbox, $msg_uid, $mailconf[0]['movetofolder'], FT_UID); + break; + } + } + } + imap_close($mbox); + } + } + elseif($contact['network'] === NETWORK_FACEBOOK) { + // This is picked up by the Facebook plugin on a cron hook. + // Ignored here. + } + + if($xml) { + logger('poller: received xml : ' . $xml, LOGGER_DATA); + if(! strstr($xml,' UTC_TIMESTAMP() - INTERVAL 1 DAY", + intval($contact['id']) + ); + } + if(count($r)) { + if(! $r[0]['total']) { + poco_load($contact['id'],$importer_uid,$contact['poco']); + } + } + + return; +} + +if (array_search(__file__,get_included_files())===0){ + onepoll_run($argv,$argc); + killme(); +} diff --git a/include/plugin.php b/include/plugin.php index 8196e8756..4ff78a8b4 100644 --- a/include/plugin.php +++ b/include/plugin.php @@ -5,7 +5,7 @@ if (! function_exists('uninstall_plugin')){ function uninstall_plugin($plugin){ logger("Addons: uninstalling " . $plugin); - q("DELETE FROM `addon` WHERE `name` = '%s' LIMIT 1", + q("DELETE FROM `addon` WHERE `name` = '%s' ", dbesc($plugin) ); @@ -37,6 +37,16 @@ function install_plugin($plugin) { intval($t), $plugin_admin ); + + // we can add the following with the previous SQL + // once most site tables have been updated. + // This way the system won't fall over dead during the update. + + if(file_exists('addon/' . $plugin . '/.hidden')) { + q("update addon set hidden = 1 where name = '%s' limit 1", + dbesc($plugin) + ); + } return true; } else { diff --git a/include/poller.php b/include/poller.php index 499483d00..0a0e66b86 100644 --- a/include/poller.php +++ b/include/poller.php @@ -113,6 +113,8 @@ function poller_run($argv, $argc){ $force = true; } + $interval = ((get_config('system','delivery_interval') === false) ? 3 : intval(get_config('system','delivery_interval'))); + $sql_extra = (($manual_id) ? " AND `id` = $manual_id " : ""); reload_plugins(); @@ -136,6 +138,7 @@ function poller_run($argv, $argc){ AND NOT `network` IN ( '%s', '%s' ) $sql_extra AND `self` = 0 AND `contact`.`blocked` = 0 AND `contact`.`readonly` = 0 + AND `contact`.`archive` = 0 AND `user`.`account_expired` = 0 $abandon_sql ORDER BY RAND()", intval(CONTACT_IS_SHARING), intval(CONTACT_IS_FRIEND), @@ -224,440 +227,12 @@ function poller_run($argv, $argc){ continue; } - // Check to see if we are running out of memory - if so spawn a new process and kill this one - - $avail_memory = return_bytes(ini_get('memory_limit')); - $memused = memory_get_peak_usage(true); - if(intval($avail_memory)) { - if(($memused / $avail_memory) > 0.95) { - if($generation + 1 > 10) { - logger('poller: maximum number of spawns exceeded. Terminating.'); - killme(); - } - logger('poller: memory exceeded. ' . $memused . ' bytes used. Spawning new poll.'); - proc_run('php', 'include/poller.php', 'restart', (string) $generation + 1); - killme(); - } - } - - $importer_uid = $contact['uid']; - - $r = q("SELECT `contact`.*, `user`.`page-flags` FROM `contact` LEFT JOIN `user` on `contact`.`uid` = `user`.`uid` WHERE `user`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1", - intval($importer_uid) - ); - if(! count($r)) - continue; - - $importer = $r[0]; - - logger("poller: poll: ({$contact['id']}) IMPORTER: {$importer['name']}, CONTACT: {$contact['name']}"); - - $last_update = (($contact['last-update'] === '0000-00-00 00:00:00') - ? datetime_convert('UTC','UTC','now - 30 days', ATOM_TIME) - : datetime_convert('UTC','UTC',$contact['last-update'], ATOM_TIME) - ); - - if($contact['network'] === NETWORK_DFRN) { - - $idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']); - - if(intval($contact['duplex']) && $contact['dfrn-id']) - $idtosend = '0:' . $orig_id; - if(intval($contact['duplex']) && $contact['issued-id']) - $idtosend = '1:' . $orig_id; - - // they have permission to write to us. We already filtered this in the contact query. - $perm = 'rw'; - - $url = $contact['poll'] . '?dfrn_id=' . $idtosend - . '&dfrn_version=' . DFRN_PROTOCOL_VERSION - . '&type=data&last_update=' . $last_update - . '&perm=' . $perm ; - - $handshake_xml = fetch_url($url); - - logger('poller: handshake with url ' . $url . ' returns xml: ' . $handshake_xml, LOGGER_DATA); - - - if(! $handshake_xml) { - logger("poller: $url appears to be dead - marking for death "); - // dead connection - might be a transient event, or this might - // mean the software was uninstalled or the domain expired. - // Will keep trying for one month. - mark_for_death($contact); - - // set the last-update so we don't keep polling - - $r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d LIMIT 1", - dbesc(datetime_convert()), - intval($contact['id']) - ); - - continue; - } - - if(! strstr($handshake_xml,'status) == 1) { - logger("poller: $url replied status 1 - marking for death "); - - // we may not be friends anymore. Will keep trying for one month. - // set the last-update so we don't keep polling - - $r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d LIMIT 1", - dbesc(datetime_convert()), - intval($contact['id']) - ); - - mark_for_death($contact); - } - else { - if($contact['term-date'] != '0000-00-00 00:00:00') { - logger("poller: $url back from the dead - removing mark for death"); - unmark_for_death($contact); - } - } - - if((intval($res->status) != 0) || (! strlen($res->challenge)) || (! strlen($res->dfrn_id))) - continue; - - if(((float) $res->dfrn_version > 2.21) && ($contact['poco'] == '')) { - q("update contact set poco = '%s' where id = %d limit 1", - dbesc(str_replace('/profile/','/poco/', $contact['url'])), - intval($contact['id']) - ); - } - - $postvars = array(); - - $sent_dfrn_id = hex2bin((string) $res->dfrn_id); - $challenge = hex2bin((string) $res->challenge); - - $final_dfrn_id = ''; - - if(($contact['duplex']) && strlen($contact['prvkey'])) { - openssl_private_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['prvkey']); - openssl_private_decrypt($challenge,$postvars['challenge'],$contact['prvkey']); - } - else { - openssl_public_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['pubkey']); - openssl_public_decrypt($challenge,$postvars['challenge'],$contact['pubkey']); - } - - $final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.')); - - if(strpos($final_dfrn_id,':') == 1) - $final_dfrn_id = substr($final_dfrn_id,2); - - if($final_dfrn_id != $orig_id) { - logger('poller: ID did not decode: ' . $contact['id'] . ' orig: ' . $orig_id . ' final: ' . $final_dfrn_id); - // did not decode properly - cannot trust this site - continue; - } - - $postvars['dfrn_id'] = $idtosend; - $postvars['dfrn_version'] = DFRN_PROTOCOL_VERSION; - $postvars['perm'] = 'rw'; - - $xml = post_url($contact['poll'],$postvars); - } - elseif(($contact['network'] === NETWORK_OSTATUS) - || ($contact['network'] === NETWORK_DIASPORA) - || ($contact['network'] === NETWORK_FEED) ) { - - // Upgrading DB fields from an older Friendica version - // Will only do this once per notify-enabled OStatus contact - // or if relationship changes - - $stat_writeable = ((($contact['notify']) && ($contact['rel'] == CONTACT_IS_FOLLOWER || $contact['rel'] == CONTACT_IS_FRIEND)) ? 1 : 0); - - if($stat_writeable != $contact['writable']) { - q("UPDATE `contact` SET `writable` = %d WHERE `id` = %d LIMIT 1", - intval($stat_writeable), - intval($contact['id']) - ); - } - - // Are we allowed to import from this person? - - if($contact['rel'] == CONTACT_IS_FOLLOWER || $contact['blocked'] || $contact['readonly']) - continue; - - $xml = fetch_url($contact['poll']); - } - elseif($contact['network'] === NETWORK_MAIL || $contact['network'] === NETWORK_MAIL2) { - - logger("Mail: Fetching"); - - $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1); - if($mail_disabled) - continue; - - logger("Mail: Enabled"); - - $mbox = null; - $x = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1", - intval($importer_uid) - ); - $mailconf = q("SELECT * FROM `mailacct` WHERE `server` != '' AND `uid` = %d LIMIT 1", - intval($importer_uid) - ); - if(count($x) && count($mailconf)) { - $mailbox = construct_mailbox_name($mailconf[0]); - $password = ''; - openssl_private_decrypt(hex2bin($mailconf[0]['pass']),$password,$x[0]['prvkey']); - $mbox = email_connect($mailbox,$mailconf[0]['user'],$password); - unset($password); - logger("Mail: Connect"); - if($mbox) { - q("UPDATE `mailacct` SET `last_check` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1", - dbesc(datetime_convert()), - intval($mailconf[0]['id']), - intval($importer_uid) - ); - } - } - if($mbox) { - logger("Mail: mbox"); - - $msgs = email_poll($mbox,$contact['addr']); - - if(count($msgs)) { - logger("Mail: Parsing ".count($msgs)." mails."); - - foreach($msgs as $msg_uid) { - logger("Mail: Parsing mail ".$msg_uid); - - $datarray = array(); - $meta = email_msg_meta($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,'<>')); - - 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? - $r = q("SELECT * FROM `item` WHERE `uid` = %d AND `uri` = '%s' LIMIT 1", - intval($importer_uid), - dbesc($datarray['uri']) - ); - - if(count($r)) { - logger("Mail: Seen before ".$msg_uid); - if($meta->deleted && ! $r[0]['deleted']) { - q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `id` = %d LIMIT 1", - dbesc(datetime_convert()), - intval($r[0]['id']) - ); - } - switch ($mailconf[0]['action']) { - case 0: - break; - case 1: - logger("Mail: Deleting ".$msg_uid); - imap_delete($mbox, $msg_uid, FT_UID); - break; - case 2: - logger("Mail: Mark as seen ".$msg_uid); - imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID); - break; - case 3: - logger("Mail: Moving ".$msg_uid." to ".$mailconf[0]['movetofolder']); - imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID); - if ($mailconf[0]['movetofolder'] != "") - imap_mail_move($mbox, $msg_uid, $mailconf[0]['movetofolder'], FT_UID); - break; - } - continue; - } - - // Decoding the header - $subject = imap_mime_header_decode($meta->subject); - $datarray['title'] = ""; - foreach($subject as $subpart) - if ($subpart->charset != "default") - $datarray['title'] .= iconv($subpart->charset, 'UTF-8//IGNORE', $subpart->text); - else - $datarray['title'] .= $subpart->text; - - $datarray['title'] = notags(trim($datarray['title'])); - - //$datarray['title'] = notags(trim($meta->subject)); - $datarray['created'] = datetime_convert('UTC','UTC',$meta->date); - - // Is it reply? - $reply = ((substr(strtolower($datarray['title']), 0, 3) == "re:") or - (substr(strtolower($datarray['title']), 0, 3) == "re-") or - (raw_refs != "")); - - $r = email_get_msg($mbox,$msg_uid, $reply); - if(! $r) { - logger("Mail: can't fetch msg ".$msg_uid); - continue; - } - $datarray['body'] = escape_tags($r['body']); - - logger("Mail: Importing ".$msg_uid); - - // some mailing lists have the original author as 'from' - add this sender info to msg body. - // todo: adding a gravatar for the original author would be cool - - if(! stristr($meta->from,$contact['addr'])) { - $from = imap_mime_header_decode($meta->from); - $fromdecoded = ""; - foreach($from as $frompart) - if ($frompart->charset != "default") - $fromdecoded .= iconv($frompart->charset, 'UTF-8//IGNORE', $frompart->text); - else - $fromdecoded .= $frompart->text; - - $datarray['body'] = "[b]".t('From: ') . escape_tags($fromdecoded) . "[/b]\n\n" . $datarray['body']; - } - - $datarray['uid'] = $importer_uid; - $datarray['contact-id'] = $contact['id']; - if($datarray['parent-uri'] === $datarray['uri']) - $datarray['private'] = 1; - if(($contact['network'] === NETWORK_MAIL) && (! get_pconfig($importer_uid,'system','allow_public_email_replies'))) { - $datarray['private'] = 1; - $datarray['allow_cid'] = '<' . $contact['id'] . '>'; - } - $datarray['author-name'] = $contact['name']; - $datarray['author-link'] = 'mailbox'; - $datarray['author-avatar'] = $contact['photo']; - - $stored_item = item_store($datarray); - q("UPDATE `item` SET `last-child` = 0 WHERE `parent-uri` = '%s' AND `uid` = %d", - dbesc($datarray['parent-uri']), - intval($importer_uid) - ); - q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d LIMIT 1", - intval($stored_item) - ); - switch ($mailconf[0]['action']) { - case 0: - break; - case 1: - logger("Mail: Deleting ".$msg_uid); - imap_delete($mbox, $msg_uid, FT_UID); - break; - case 2: - logger("Mail: Mark as seen ".$msg_uid); - imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID); - break; - case 3: - logger("Mail: Moving ".$msg_uid." to ".$mailconf[0]['movetofolder']); - imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID); - if ($mailconf[0]['movetofolder'] != "") - imap_mail_move($mbox, $msg_uid, $mailconf[0]['movetofolder'], FT_UID); - break; - } - } - } - - imap_close($mbox); - } - } - elseif($contact['network'] === NETWORK_FACEBOOK) { - // This is picked up by the Facebook plugin on a cron hook. - // Ignored here. - } - - if($xml) { - logger('poller: received xml : ' . $xml, LOGGER_DATA); - - if(! strstr($xml,' UTC_TIMESTAMP() - INTERVAL 1 DAY", - intval($contact['id']) - ); - } - if(count($r)) { - if(! $r[0]['total']) { - poco_load($contact['id'],$importer_uid,$contact['poco']); - } - } - - // loop - next contact + proc_run('php','include/onepoll.php',$contact['id']); + if($interval) + @time_sleep_until(microtime(true) + (float) $interval); } } - return; } diff --git a/include/profile_selectors.php b/include/profile_selectors.php index a2cef959d..4700bb96f 100644 --- a/include/profile_selectors.php +++ b/include/profile_selectors.php @@ -7,8 +7,10 @@ function gender_selector($current="",$suffix="") { $o .= "'; return $o; @@ -20,8 +22,10 @@ function sexpref_selector($current="",$suffix="") { $o .= "'; return $o; @@ -34,8 +38,10 @@ function marital_selector($current="",$suffix="") { $o .= "'; return $o; diff --git a/index.php b/index.php index 442173eeb..a409f47b4 100644 --- a/index.php +++ b/index.php @@ -92,13 +92,10 @@ if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) { load_translation_table($lang); } -if(x($_GET,'zrl')) { +if((x($_GET,'zrl')) && (! $install)) { $_SESSION['my_url'] = $_GET['zrl']; $a->query_string = preg_replace('/[\?&]zrl=(.*?)([\?&]|$)/is','',$a->query_string); - if(! $install) { - $arr = array('zrl' => $_SESSION['my_url'], 'url' => $a->cmd); - call_hooks('zrl_init',$arr); - } + zrl_init($a); } /** diff --git a/js/main.js b/js/main.js index ac238bf6a..6a2632441 100644 --- a/js/main.js +++ b/js/main.js @@ -73,7 +73,16 @@ setupFieldRichtext(); /* popup menus */ + function close_last_popup_menu() { + if(last_popup_menu) { + last_popup_menu.hide(); + last_popup_button.removeClass("selected"); + last_popup_menu = null; + last_popup_button = null; + } + } $('a[rel^=#]').click(function(e){ + close_last_popup_menu(); menu = $( $(this).attr('rel') ); e.preventDefault(); e.stopPropagation(); @@ -90,12 +99,7 @@ return false; }); $('html').click(function() { - if(last_popup_menu) { - last_popup_menu.hide(); - last_popup_button.removeClass("selected"); - last_popup_menu = null; - last_popup_button = null; - } + close_last_popup_menu(); }); // fancyboxes diff --git a/mod/admin.php b/mod/admin.php index cdc45c8e3..b07ef851a 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -61,6 +61,9 @@ function admin_post(&$a){ case 'logs': admin_page_logs_post($a); break; + case 'dbsync': + admin_page_dbsync_post($a); + break; case 'update': admin_page_remoteupdate_post($a); break; @@ -94,7 +97,8 @@ function admin_content(&$a) { 'users' => Array($a->get_baseurl(true)."/admin/users/", t("Users") , "users"), 'plugins'=> Array($a->get_baseurl(true)."/admin/plugins/", t("Plugins") , "plugins"), 'themes' => Array($a->get_baseurl(true)."/admin/themes/", t("Themes") , "themes"), - 'update' => Array($a->get_baseurl(true)."/admin/update/", t("Update") , "update") + 'dbsync' => Array($a->get_baseurl(true)."/admin/dbsync/", t('DB updates'), "dbsync"), + 'update' => Array($a->get_baseurl(true)."/admin/update/", t("Software Update") , "update") ); /* get plugins admin page */ @@ -142,6 +146,9 @@ function admin_content(&$a) { case 'logs': $o = admin_page_logs($a); break; + case 'dbsync': + $o = admin_page_dbsync($a); + break; case 'update': $o = admin_page_remoteupdate($a); break; @@ -235,6 +242,7 @@ function admin_page_site_post(&$a){ $proxyuser = ((x($_POST,'proxyuser')) ? notags(trim($_POST['proxyuser'])) : ''); $proxy = ((x($_POST,'proxy')) ? notags(trim($_POST['proxy'])) : ''); $timeout = ((x($_POST,'timeout')) ? intval(trim($_POST['timeout'])) : 60); + $delivery_interval = ((x($_POST,'delivery_interval'))? intval(trim($_POST['delivery_interval'])) : 0); $dfrn_only = ((x($_POST,'dfrn_only')) ? True : False); $ostatus_disabled = !((x($_POST,'ostatus_disabled')) ? True : False); $diaspora_enabled = ((x($_POST,'diaspora_enabled')) ? True : False); @@ -281,7 +289,7 @@ function admin_page_site_post(&$a){ } } set_config('system','ssl_policy',$ssl_policy); - + set_config('system','delivery_interval',$delivery_interval); set_config('config','sitename',$sitename); if ($banner==""){ // don't know why, but del_config doesn't work... @@ -425,6 +433,7 @@ function admin_page_site(&$a) { '$proxyuser' => array('proxyuser', t("Proxy user"), get_config('system','proxyuser'), ""), '$proxy' => array('proxy', t("Proxy URL"), get_config('system','proxy'), ""), '$timeout' => array('timeout', t("Network timeout"), (x(get_config('system','curl_timeout'))?get_config('system','curl_timeout'):60), t("Value is in seconds. Set to 0 for unlimited (not recommended).")), + '$delivery_interval' => array('delivery_interval', t("Delivery interval"), (x(get_config('system','delivery_interval'))?get_config('system','delivery_interval'):2), t("Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers.")), '$form_security_token' => get_form_security_token("admin_site"), @@ -433,6 +442,62 @@ function admin_page_site(&$a) { } +function admin_page_dbsync(&$a) { + + $o = ''; + + if($a->argc > 3 && intval($a->argv[3]) && $a->argv[2] === 'mark') { + set_config('database', 'update_' . intval($a->argv[3]), 'success'); + info( t('Update has been marked successful') . EOL); + goaway($a->get_baseurl(true) . '/admin/dbsync'); + } + + if($a->argc > 2 && intval($a->argv[2])) { + require_once('update.php'); + $func = 'update_' . intval($a->argv[2]); + if(function_exists($func)) { + $retval = $func(); + if($retval === UPDATE_FAILED) { + $o .= sprintf( t('Executing %s failed. Check system logs.'), $func); + } + elseif($retval === UPDATE_SUCCESS) { + $o .= sprintf( t('Update %s was successfully applied.', $func)); + set_config('database',$func, 'success'); + } + else + $o .= sprintf( t('Update %s did not return a status. Unknown if it succeeded.'), $func); + } + else + $o .= sprintf( t('Update function %s could not be found.'), $func); + return $o; + } + + $failed = array(); + $r = q("select * from config where `cat` = 'database' "); + if(count($r)) { + foreach($r as $rr) { + $upd = intval(substr($rr['k'],7)); + if($upd < 1139 || $rr['v'] === 'success') + continue; + $failed[] = $upd; + } + } + if(! count($failed)) + return '

' . t('No failed updates.') . '

'; + + $o = replace_macros(get_markup_template('failed_updates.tpl'),array( + '$base' => $a->get_baseurl(true), + '$banner' => t('Failed Updates'), + '$desc' => t('This does not include updates prior to 1139, which did not return a status.'), + '$mark' => t('Mark success (if update was manually applied)'), + '$apply' => t('Attempt to execute this update step automatically'), + '$failed' => $failed + )); + + return $o; + +} + /** * Users admin page * @@ -977,7 +1042,6 @@ readable."); $size = 5000000; $seek = fseek($fp,0-$size,SEEK_END); if($seek === 0) { - fgets($fp); // throw away the first partial line $data = escape_tags(fread($fp,$size)); while(! feof($fp)) $data .= escape_tags(fread($fp,4096)); diff --git a/mod/contacts.php b/mod/contacts.php index 754350ae5..3b428914c 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -290,22 +290,26 @@ function contacts_content(&$a) { 'label' => (($contact['blocked']) ? t('Unblock') : t('Block') ), 'url' => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/block', 'sel' => '', + 'title' => t('Toggle Blocked status'), ), array( 'label' => (($contact['readonly']) ? t('Unignore') : t('Ignore') ), 'url' => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/ignore', 'sel' => '', + 'title' => t('Toggle Ignored status'), ), array( 'label' => (($contact['archive']) ? t('Unarchive') : t('Archive') ), 'url' => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/archive', 'sel' => '', + 'title' => t('Toggle Archive status'), ), array( 'label' => t('Repair'), 'url' => $a->get_baseurl(true) . '/crepair/' . $contact_id, 'sel' => '', + 'title' => t('Advanced Contact Settings'), ) ); $tab_tpl = get_markup_template('common_tabs.tpl'); @@ -403,40 +407,47 @@ function contacts_content(&$a) { 'label' => t('Suggestions'), 'url' => $a->get_baseurl(true) . '/suggest', 'sel' => '', + 'title' => t('Suggest potential friends'), ), array( 'label' => t('All Contacts'), 'url' => $a->get_baseurl(true) . '/contacts/all', 'sel' => ($all) ? 'active' : '', + 'title' => t('Show all contacts'), ), array( 'label' => t('Unblocked'), 'url' => $a->get_baseurl(true) . '/contacts', 'sel' => ((! $all) && (! $blocked) && (! $hidden) && (! $search) && (! $nets) && (! $ignored) && (! $archived)) ? 'active' : '', + 'title' => t('Only show unblocked contacts'), ), array( 'label' => t('Blocked'), 'url' => $a->get_baseurl(true) . '/contacts/blocked', 'sel' => ($blocked) ? 'active' : '', + 'title' => t('Only show blocked contacts'), ), array( 'label' => t('Ignored'), 'url' => $a->get_baseurl(true) . '/contacts/ignored', 'sel' => ($ignored) ? 'active' : '', + 'title' => t('Only show ignored contacts'), ), array( 'label' => t('Archived'), 'url' => $a->get_baseurl(true) . '/contacts/archived', 'sel' => ($archived) ? 'active' : '', + 'title' => t('Only show archived contacts'), ), array( 'label' => t('Hidden'), 'url' => $a->get_baseurl(true) . '/contacts/hidden', 'sel' => ($hidden) ? 'active' : '', + 'title' => t('Only show hidden contacts'), ), ); diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php index efb5be3a4..2b25095fd 100644 --- a/mod/dfrn_confirm.php +++ b/mod/dfrn_confirm.php @@ -207,7 +207,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { if($duplex == 1) $params['duplex'] = 1; - if($user['page-flags'] == PAGE_COMMUNITY) + if($user[0]['page-flags'] == PAGE_COMMUNITY) $params['page'] = 1; logger('dfrn_confirm: Confirm: posting data to ' . $dfrn_confirm . ': ' . print_r($params,true), LOGGER_DATA); @@ -434,7 +434,8 @@ function dfrn_confirm_post(&$a,$handsfree = null) { else $contact = null; - if(isset($new_relation) && $new_relation == CONTACT_IS_FRIEND) { + + if((isset($new_relation) && $new_relation == CONTACT_IS_FRIEND)) { if(($contact) && ($contact['network'] === NETWORK_DIASPORA)) { require_once('include/diaspora.php'); @@ -447,7 +448,8 @@ function dfrn_confirm_post(&$a,$handsfree = null) { $r = q("SELECT `hide-friends` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1", intval($uid) ); - if((count($r)) && ($activity) && (! $hidden)) { + + if((count($r)) && ($r[0]['hide-friends'] == 0) && ($activity) && (! $hidden)) { require_once('include/items.php'); @@ -468,12 +470,15 @@ function dfrn_confirm_post(&$a,$handsfree = null) { $arr['author-name'] = $arr['owner-name'] = $self[0]['name']; $arr['author-link'] = $arr['owner-link'] = $self[0]['url']; $arr['author-avatar'] = $arr['owner-avatar'] = $self[0]['thumb']; - $arr['verb'] = ACTIVITY_FRIEND; - $arr['object-type'] = ACTIVITY_OBJ_PERSON; - + $A = '[url=' . $self[0]['url'] . ']' . $self[0]['name'] . '[/url]'; + $APhoto = '[url=' . $self[0]['url'] . ']' . '[img]' . $self[0]['thumb'] . '[/img][/url]'; + $B = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]'; $BPhoto = '[url=' . $contact['url'] . ']' . '[img]' . $contact['thumb'] . '[/img][/url]'; + + $arr['verb'] = ACTIVITY_FRIEND; + $arr['object-type'] = ACTIVITY_OBJ_PERSON; $arr['body'] = sprintf( t('%1$s is now friends with %2$s'), $A, $B)."\n\n\n".$BPhoto; $arr['object'] = '' . ACTIVITY_OBJ_PERSON . '' . $contact['name'] . '' @@ -481,6 +486,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { $arr['object'] .= '' . xmlify('' . "\n"); $arr['object'] .= xmlify('' . "\n"); $arr['object'] .= '' . "\n"; + $arr['last-child'] = 1; $arr['allow_cid'] = $user[0]['allow_cid']; @@ -710,6 +716,10 @@ function dfrn_confirm_post(&$a,$handsfree = null) { WHERE `contact`.`id` = %d LIMIT 1", intval($dfrn_record) ); + + if(count($r)) + $combined = $r[0]; + if((count($r)) && ($r[0]['notify-flags'] & NOTIFY_CONFIRM)) { push_lang($r[0]['language']); @@ -738,6 +748,65 @@ function dfrn_confirm_post(&$a,$handsfree = null) { } pop_lang(); } + + // Send a new friend post if we are allowed to... + + if($page && intval(get_pconfig($local_uid,'system','post_joingroup'))) { + $r = q("SELECT `hide-friends` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1", + intval($local_uid) + ); + + if((count($r)) && ($r[0]['hide-friends'] == 0)) { + + require_once('include/items.php'); + + $self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1", + intval($local_uid) + ); + + if(count($self)) { + + $arr = array(); + $arr['uri'] = $arr['parent-uri'] = item_new_uri($a->get_hostname(), $local_uid); + $arr['uid'] = $local_uid; + $arr['contact-id'] = $self[0]['id']; + $arr['wall'] = 1; + $arr['type'] = 'wall'; + $arr['gravity'] = 0; + $arr['origin'] = 1; + $arr['author-name'] = $arr['owner-name'] = $self[0]['name']; + $arr['author-link'] = $arr['owner-link'] = $self[0]['url']; + $arr['author-avatar'] = $arr['owner-avatar'] = $self[0]['thumb']; + + $A = '[url=' . $self[0]['url'] . ']' . $self[0]['name'] . '[/url]'; + $APhoto = '[url=' . $self[0]['url'] . ']' . '[img]' . $self[0]['thumb'] . '[/img][/url]'; + + $B = '[url=' . $combined['url'] . ']' . $combined['name'] . '[/url]'; + $BPhoto = '[url=' . $combined['url'] . ']' . '[img]' . $combined['thumb'] . '[/img][/url]'; + + $arr['verb'] = ACTIVITY_JOIN; + $arr['object-type'] = ACTIVITY_OBJ_GROUP; + $arr['body'] = sprintf( t('%1$s has joined %2$s'), $A, $B)."\n\n\n" .$BPhoto; + $arr['object'] = '' . ACTIVITY_OBJ_GROUP . '' . $combined['name'] . '' + . '' . $combined['url'] . '/' . $combined['name'] . ''; + $arr['object'] .= '' . xmlify('' . "\n"); + $arr['object'] .= xmlify('' . "\n"); + $arr['object'] .= '' . "\n"; + + $arr['last-child'] = 1; + + $arr['allow_cid'] = $user[0]['allow_cid']; + $arr['allow_gid'] = $user[0]['allow_gid']; + $arr['deny_cid'] = $user[0]['deny_cid']; + $arr['deny_gid'] = $user[0]['deny_gid']; + + $i = item_store($arr); + if($i) + proc_run('php',"include/notifier.php","activity","$i"); + + } + } + } xml_status(0); // Success return; // NOTREACHED diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index 18798aa15..2169c494c 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -700,7 +700,8 @@ function dfrn_request_content(&$a) { 'node' => $r[0]['nickname'], 'dfrn_id' => $r[0]['issued-id'], 'intro_id' => $intro[0]['id'], - 'duplex' => (($r[0]['page-flags'] == PAGE_FREELOVE) ? 1 : 0) + 'duplex' => (($r[0]['page-flags'] == PAGE_FREELOVE) ? 1 : 0), + 'activity' => intval(get_pconfig($r[0]['uid'],'system','post_newfriend')) ); dfrn_confirm_post($a,$handsfree); } diff --git a/mod/friendica.php b/mod/friendica.php index 52a064224..28807b5b5 100644 --- a/mod/friendica.php +++ b/mod/friendica.php @@ -18,10 +18,18 @@ function friendica_init(&$a) { $admin = false; } + $visible_plugins = array(); + if(is_array($a->plugins) && count($a->plugins)) { + $r = q("select * from addon where hidden = 0"); + if(count($r)) + foreach($r as $rr) + $visible_plugins[] = $rr['name']; + } + $data = Array( 'version' => FRIENDICA_VERSION, 'url' => z_root(), - 'plugins' => $a->plugins, + 'plugins' => $visible_plugins, 'register_policy' => $register_policy[$a->config['register_policy']], 'admin' => $admin, 'site_name' => $a->config['sitename'], @@ -54,9 +62,18 @@ function friendica_content(&$a) { $o .= '

'; - if(count($a->plugins)) { + $visible_plugins = array(); + if(is_array($a->plugins) && count($a->plugins)) { + $r = q("select * from addon where hidden = 0"); + if(count($r)) + foreach($r as $rr) + $visible_plugins[] = $rr['name']; + } + + + if(count($visible_plugins)) { $o .= '

' . t('Installed plugins/addons/apps:') . '

'; - $sorted = $a->plugins; + $sorted = $visible_plugins; $s = ''; sort($sorted); foreach($sorted as $p) { diff --git a/mod/network.php b/mod/network.php index b12bd16da..5655f1bfa 100644 --- a/mod/network.php +++ b/mod/network.php @@ -171,37 +171,44 @@ function network_content(&$a, $update = 0) { 'label' => t('Commented Order'), 'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '?f=&cid=' . $_GET['cid'] : ''), 'sel'=>$all_active, + 'title'=> t('Sort by Comment Date'), ), array( 'label' => t('Posted Order'), 'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $a->cmd) . '?f=&order=post' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''), 'sel'=>$postord_active, + 'title' => t('Sort by Post Date'), ), array( 'label' => t('Personal'), 'url' => $a->get_baseurl(true) . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&conv=1', 'sel' => $conv_active, + 'title' => t('Posts that mention or involve you'), ), array( 'label' => t('New'), 'url' => $a->get_baseurl(true) . '/' . str_replace('/new', '', $a->cmd) . '/new' . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : ''), 'sel' => $new_active, + 'title' => t('Activity Stream - by date'), ), array( 'label' => t('Starred'), 'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&star=1', 'sel'=>$starred_active, + 'title' => t('Favourite Posts'), ), array( 'label' => t('Shared Links'), 'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&bmark=1', 'sel'=>$bookmarked_active, + 'title'=> t('Interesting Links'), ), // array( // 'label' => t('Spam'), // 'url'=>$a->get_baseurl(true) . '/network?f=&spam=1' // 'sel'=> $spam_active, +// 'title' => t('Posts flagged as SPAM'), // ), diff --git a/mod/profile.php b/mod/profile.php index de1e27248..e9d4ca344 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -32,6 +32,8 @@ function profile_init(&$a) { profile_load($a,$which,$profile); + $userblock = (($a->profile['hidewall'] && (! local_user()) && (! remote_user())) ? true : false); + if((x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY)) { $a->page['htmlhead'] .= ''; } @@ -41,8 +43,8 @@ function profile_init(&$a) { $delegate = ((strstr($a->profile['openid'],'://')) ? $a->profile['openid'] : 'http://' . $a->profile['openid']); $a->page['htmlhead'] .= '' . "\r\n"; } - - if(! $blocked) { + // site block + if((! $blocked) && (! $userblock)) { $keywords = ((x($a->profile,'pub_keywords')) ? $a->profile['pub_keywords'] : ''); $keywords = str_replace(array('#',',',' ',',,'),array('',' ',',',','),$keywords); if(strlen($keywords)) diff --git a/mod/profiles.php b/mod/profiles.php index 7a33a03e4..3a52c8fa5 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -139,21 +139,49 @@ function profiles_post(&$a) { $changes = array(); + $value = ''; if($is_default) { - if($marital != $orig[0]['marital']) $changes[] = '♥ ' . t('Marital Status'); - if($withchanged) $changes[] = '♥ ' . t('Romantic Partner'); - if($work != $orig[0]['work']) $changes[] = t('Work/Employment'); - if($religion != $orig[0]['religion']) $changes[] = t('Religion'); - if($politic != $orig[0]['politic']) $changes[] = t('Political Views'); - if($gender != $orig[0]['gender']) $changes[] = t('Gender'); - if($sexual != $orig[0]['sexual']) $changes[] = t('Sexual Preference'); - if($homepage != $orig[0]['homepage']) $changes[] = t('Homepage'); - if($interest != $orig[0]['interest']) $changes[] = t('Interests'); + if($marital != $orig[0]['marital']) { + $changes[] = '[color=#ff0000]♥[/color] ' . t('Marital Status'); + $value = $marital; + } + if($withchanged) { + $changes[] = '♥ ' . t('Romantic Partner'); + $value = strip_tags($with); + } + if($work != $orig[0]['work']) { + $changes[] = t('Work/Employment'); + } + if($religion != $orig[0]['religion']) { + $changes[] = t('Religion'); + $value = $religion; + } + if($politic != $orig[0]['politic']) { + $changes[] = t('Political Views'); + $value = $politic; + } + if($gender != $orig[0]['gender']) { + $changes[] = t('Gender'); + $value = $gender; + } + if($sexual != $orig[0]['sexual']) { + $changes[] = t('Sexual Preference'); + $value = $sexual; + } + if($homepage != $orig[0]['homepage']) { + $changes[] = t('Homepage'); + $value = $homepage; + } + if($interest != $orig[0]['interest']) { + $changes[] = t('Interests'); + $value = $interest; + } if($address != $orig[0]['address'] || $locality != $orig[0]['locality'] || $region != $orig[0]['region'] - || $country_name != $orig[0]['country_name']) - $changes[] = t('Location'); + || $country_name != $orig[0]['country-name']) { + $changes[] = t('Location'); + } - profile_activity($changes); + profile_activity($changes,$value); } @@ -245,7 +273,7 @@ function profiles_post(&$a) { } -function profile_activity($changed) { +function profile_activity($changed, $value) { $a = get_app(); if(! local_user() || ! is_array($changed) || ! count($changed)) @@ -289,7 +317,7 @@ function profile_activity($changed) { foreach($changed as $ch) { if(strlen($changes)) { if ($z == ($t - 1)) - $changes .= ' and '; + $changes .= t(' and '); else $changes .= ', '; } @@ -299,7 +327,15 @@ function profile_activity($changed) { $prof = '[url=' . $self[0]['url'] . '?tab=profile' . ']' . t('public profile') . '[/url]'; - $arr['body'] = sprintf( t('%1$s has an updated %2$s, changing %3$s.'), $A, $prof, $changes); + if($t == 1 && strlen($value)) { + $message = sprintf( t('%1$s changed %2$s to %3$s'), $A, $changes, $value); + $message .= "\n\n" . sprintf( t(' - Visit %1$s\'s %2$s'), $A, $prof); + } + else + $message = sprintf( t('%1$s has an updated %2$s, changing %3$s.'), $A, $prof, $changes); + + + $arr['body'] = $message; $arr['object'] = '' . ACTIVITY_OBJ_PROFILE . '' . $self[0]['name'] . '' . '' . $self[0]['url'] . '/' . $self[0]['name'] . ''; diff --git a/mod/settings.php b/mod/settings.php index 3072d3d65..5f5b2ab2e 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -352,6 +352,7 @@ function settings_post(&$a) { $hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0); $hidewall = (($_POST['hidewall'] == 1) ? 1: 0); $post_newfriend = (($_POST['post_newfriend'] == 1) ? 1: 0); + $post_joingroup = (($_POST['post_joingroup'] == 1) ? 1: 0); $post_profilechange = (($_POST['post_profilechange'] == 1) ? 1: 0); @@ -436,6 +437,7 @@ function settings_post(&$a) { set_pconfig(local_user(),'system','suggestme', $suggestme); set_pconfig(local_user(),'system','post_newfriend', $post_newfriend); + set_pconfig(local_user(),'system','post_joingroup', $post_joingroup); set_pconfig(local_user(),'system','post_profilechange', $post_profilechange); @@ -802,6 +804,9 @@ function settings_content(&$a) { $post_newfriend = get_pconfig(local_user(), 'system','post_newfriend'); $post_newfriend = (($post_newfriend===false)? '0': $post_newfriend); // default if not set: 0 + $post_joingroup = get_pconfig(local_user(), 'system','post_joingroup'); + $post_joingroup = (($post_joingroup===false)? '0': $post_joingroup); // default if not set: 0 + $post_profilechange = get_pconfig(local_user(), 'system','post_profilechange'); $post_profilechange = (($post_profilechange===false)? '0': $post_profilechange); // default if not set: 0 @@ -976,6 +981,7 @@ function settings_content(&$a) { '$h_not' => t('Notification Settings'), '$activity_options' => t('By default post a status message when:'), '$post_newfriend' => array('post_newfriend', t('accepting a friend request'), $post_newfriend, ''), + '$post_joingroup' => array('post_joingroup', t('joining a forum/community'), $post_joingroup, ''), '$post_profilechange' => array('post_profilechange', t('making an interesting profile change'), $post_profilechange, ''), '$lbl_not' => t('Send a notification email when:'), '$notify1' => array('notify1', t('You receive an introduction'), ($notify & NOTIFY_INTRO), NOTIFY_INTRO, ''), diff --git a/mod/tagger.php b/mod/tagger.php index 8ee499f5f..6212e2b9b 100644 --- a/mod/tagger.php +++ b/mod/tagger.php @@ -66,14 +66,14 @@ function tagger_content(&$a) { } $uri = item_new_uri($a->get_hostname(),$owner_uid); - + $xterm = xmlify($term); $post_type = (($item['resource-id']) ? t('photo') : t('status')); $targettype = (($item['resource-id']) ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE ); $link = xmlify('' . "\n") ; - $body = $item['body']; + $body = xmlify($item['body']); $target = <<< EOT @@ -95,8 +95,8 @@ EOT; 1 $tagid $tagid - $term - $term + $xterm + $xterm EOT; diff --git a/update.php b/update.php index 2758f5906..f793b89dd 100644 --- a/update.php +++ b/update.php @@ -1,6 +1,6 @@ \n" "Language-Team: LANGUAGE \n" @@ -52,10 +52,10 @@ msgstr "" #: ../../mod/message.php:90 ../../mod/allfriends.php:9 #: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:53 #: ../../mod/follow.php:8 ../../mod/common.php:9 ../../mod/display.php:138 -#: ../../mod/profiles.php:7 ../../mod/profiles.php:329 +#: ../../mod/profiles.php:7 ../../mod/profiles.php:365 #: ../../mod/delegate.php:6 ../../mod/suggest.php:28 ../../mod/invite.php:13 #: ../../mod/invite.php:81 ../../mod/dfrn_confirm.php:53 -#: ../../addon/facebook/facebook.php:484 ../../include/items.php:3171 +#: ../../addon/facebook/facebook.php:485 ../../include/items.php:3187 #: ../../index.php:309 msgid "Permission denied." msgstr "" @@ -86,7 +86,7 @@ msgid "Return to contact editor" msgstr "" #: ../../mod/crepair.php:148 ../../mod/settings.php:539 -#: ../../mod/settings.php:565 ../../mod/admin.php:573 ../../mod/admin.php:582 +#: ../../mod/settings.php:565 ../../mod/admin.php:638 ../../mod/admin.php:647 msgid "Name" msgstr "" @@ -127,15 +127,15 @@ msgstr "" #: ../../mod/photos.php:1193 ../../mod/photos.php:1233 #: ../../mod/photos.php:1273 ../../mod/photos.php:1304 #: ../../mod/install.php:251 ../../mod/install.php:289 -#: ../../mod/localtime.php:45 ../../mod/contacts.php:318 +#: ../../mod/localtime.php:45 ../../mod/contacts.php:322 #: ../../mod/settings.php:537 ../../mod/settings.php:683 #: ../../mod/settings.php:744 ../../mod/settings.php:935 -#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:392 -#: ../../mod/admin.php:570 ../../mod/admin.php:706 ../../mod/admin.php:905 -#: ../../mod/admin.php:993 ../../mod/profiles.php:498 ../../mod/invite.php:119 -#: ../../addon/facebook/facebook.php:574 ../../addon/yourls/yourls.php:76 -#: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:57 -#: ../../addon/planets/planets.php:158 +#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:400 +#: ../../mod/admin.php:635 ../../mod/admin.php:771 ../../mod/admin.php:970 +#: ../../mod/admin.php:1057 ../../mod/profiles.php:534 +#: ../../mod/invite.php:119 ../../addon/facebook/facebook.php:575 +#: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93 +#: ../../addon/nsfw/nsfw.php:57 ../../addon/planets/planets.php:158 #: ../../addon/uhremotestorage/uhremotestorage.php:89 #: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93 #: ../../addon/drpost/drpost.php:110 ../../addon/geonames/geonames.php:187 @@ -220,7 +220,7 @@ msgid "link to source" msgstr "" #: ../../mod/events.php:296 ../../view/theme/diabook/theme.php:255 -#: ../../include/nav.php:52 ../../boot.php:1481 +#: ../../include/nav.php:52 ../../boot.php:1493 msgid "Events" msgstr "" @@ -270,7 +270,7 @@ msgid "Description:" msgstr "" #: ../../mod/events.php:395 ../../include/event.php:37 -#: ../../include/bb2diaspora.php:260 ../../boot.php:1083 +#: ../../include/bb2diaspora.php:260 ../../boot.php:1092 msgid "Location:" msgstr "" @@ -279,7 +279,7 @@ msgid "Share this event" msgstr "" #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 -#: ../../mod/dfrn_request.php:817 ../../mod/settings.php:538 +#: ../../mod/dfrn_request.php:818 ../../mod/settings.php:538 #: ../../mod/settings.php:564 ../../addon/js_upload/js_upload.php:45 msgid "Cancel" msgstr "" @@ -323,29 +323,29 @@ msgid "" "and/or create new posts for you?" msgstr "" -#: ../../mod/api.php:105 ../../mod/dfrn_request.php:805 +#: ../../mod/api.php:105 ../../mod/dfrn_request.php:806 #: ../../mod/settings.php:849 ../../mod/settings.php:855 #: ../../mod/settings.php:863 ../../mod/settings.php:867 #: ../../mod/settings.php:872 ../../mod/settings.php:878 #: ../../mod/settings.php:884 ../../mod/settings.php:890 #: ../../mod/settings.php:926 ../../mod/settings.php:927 #: ../../mod/settings.php:928 ../../mod/settings.php:929 -#: ../../mod/register.php:532 ../../mod/profiles.php:475 +#: ../../mod/register.php:532 ../../mod/profiles.php:511 msgid "Yes" msgstr "" -#: ../../mod/api.php:106 ../../mod/dfrn_request.php:806 +#: ../../mod/api.php:106 ../../mod/dfrn_request.php:807 #: ../../mod/settings.php:849 ../../mod/settings.php:855 #: ../../mod/settings.php:863 ../../mod/settings.php:867 #: ../../mod/settings.php:872 ../../mod/settings.php:878 #: ../../mod/settings.php:884 ../../mod/settings.php:890 #: ../../mod/settings.php:926 ../../mod/settings.php:927 #: ../../mod/settings.php:928 ../../mod/settings.php:929 -#: ../../mod/register.php:533 ../../mod/profiles.php:476 +#: ../../mod/register.php:533 ../../mod/profiles.php:512 msgid "No" msgstr "" -#: ../../mod/photos.php:43 +#: ../../mod/photos.php:43 ../../boot.php:1487 msgid "Photo Albums" msgstr "" @@ -426,7 +426,7 @@ msgid "Image upload failed." msgstr "" #: ../../mod/photos.php:759 ../../mod/community.php:16 -#: ../../mod/dfrn_request.php:731 ../../mod/viewcontacts.php:17 +#: ../../mod/dfrn_request.php:732 ../../mod/viewcontacts.php:17 #: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:29 msgid "Public access denied." msgstr "" @@ -545,7 +545,7 @@ msgstr "" #: ../../mod/photos.php:1232 ../../mod/photos.php:1272 #: ../../mod/photos.php:1303 ../../include/conversation.php:554 -#: ../../boot.php:495 +#: ../../boot.php:506 msgid "Comment" msgstr "" @@ -555,7 +555,7 @@ msgid "Preview" msgstr "" #: ../../mod/photos.php:1331 ../../mod/settings.php:600 -#: ../../mod/settings.php:681 ../../mod/group.php:168 ../../mod/admin.php:577 +#: ../../mod/settings.php:681 ../../mod/group.php:168 ../../mod/admin.php:642 #: ../../include/conversation.php:318 ../../include/conversation.php:584 msgid "Delete" msgstr "" @@ -803,75 +803,75 @@ msgstr "" msgid "Confirm" msgstr "" -#: ../../mod/dfrn_request.php:688 ../../include/items.php:2691 +#: ../../mod/dfrn_request.php:688 ../../include/items.php:2707 msgid "[Name Withheld]" msgstr "" -#: ../../mod/dfrn_request.php:780 +#: ../../mod/dfrn_request.php:781 msgid "" "Please enter your 'Identity Address' from one of the following supported " "communications networks:" msgstr "" -#: ../../mod/dfrn_request.php:796 +#: ../../mod/dfrn_request.php:797 msgid "Connect as an email follower (Coming soon)" msgstr "" -#: ../../mod/dfrn_request.php:798 +#: ../../mod/dfrn_request.php:799 msgid "" "If you are not yet a member of the free social web, follow this link to find a public Friendica site " "and join us today." msgstr "" -#: ../../mod/dfrn_request.php:801 +#: ../../mod/dfrn_request.php:802 msgid "Friend/Connection Request" msgstr "" -#: ../../mod/dfrn_request.php:802 +#: ../../mod/dfrn_request.php:803 msgid "" "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, " "testuser@identi.ca" msgstr "" -#: ../../mod/dfrn_request.php:803 +#: ../../mod/dfrn_request.php:804 msgid "Please answer the following:" msgstr "" -#: ../../mod/dfrn_request.php:804 +#: ../../mod/dfrn_request.php:805 #, php-format msgid "Does %s know you?" msgstr "" -#: ../../mod/dfrn_request.php:807 +#: ../../mod/dfrn_request.php:808 msgid "Add a personal note:" msgstr "" -#: ../../mod/dfrn_request.php:809 ../../include/contact_selectors.php:76 +#: ../../mod/dfrn_request.php:810 ../../include/contact_selectors.php:76 msgid "Friendica" msgstr "" -#: ../../mod/dfrn_request.php:810 +#: ../../mod/dfrn_request.php:811 msgid "StatusNet/Federated Social Web" msgstr "" -#: ../../mod/dfrn_request.php:811 ../../mod/settings.php:634 +#: ../../mod/dfrn_request.php:812 ../../mod/settings.php:634 #: ../../include/contact_selectors.php:80 msgid "Diaspora" msgstr "" -#: ../../mod/dfrn_request.php:812 +#: ../../mod/dfrn_request.php:813 #, php-format msgid "" " - please do not use this form. Instead, enter %s into your Diaspora search " "bar." msgstr "" -#: ../../mod/dfrn_request.php:813 +#: ../../mod/dfrn_request.php:814 msgid "Your Identity Address:" msgstr "" -#: ../../mod/dfrn_request.php:816 +#: ../../mod/dfrn_request.php:817 msgid "Submit Request" msgstr "" @@ -1166,7 +1166,7 @@ msgid "is interested in:" msgstr "" #: ../../mod/match.php:58 ../../mod/suggest.php:59 -#: ../../include/contact_widgets.php:9 ../../boot.php:1027 +#: ../../include/contact_widgets.php:9 ../../boot.php:1036 msgid "Connect" msgstr "" @@ -1197,8 +1197,8 @@ msgid "Discard" msgstr "" #: ../../mod/notifications.php:51 ../../mod/notifications.php:160 -#: ../../mod/notifications.php:206 ../../mod/contacts.php:295 -#: ../../mod/contacts.php:344 +#: ../../mod/notifications.php:206 ../../mod/contacts.php:296 +#: ../../mod/contacts.php:348 msgid "Ignore" msgstr "" @@ -1210,7 +1210,7 @@ msgstr "" msgid "Network" msgstr "" -#: ../../mod/notifications.php:85 ../../mod/network.php:182 +#: ../../mod/notifications.php:85 ../../mod/network.php:184 msgid "Personal" msgstr "" @@ -1250,7 +1250,7 @@ msgid "suggested by %s" msgstr "" #: ../../mod/notifications.php:153 ../../mod/notifications.php:200 -#: ../../mod/contacts.php:350 +#: ../../mod/contacts.php:354 msgid "Hide this contact from others" msgstr "" @@ -1263,7 +1263,7 @@ msgid "if applicable" msgstr "" #: ../../mod/notifications.php:157 ../../mod/notifications.php:204 -#: ../../mod/admin.php:575 +#: ../../mod/admin.php:640 msgid "Approve" msgstr "" @@ -1463,168 +1463,212 @@ msgstr[1] "" msgid "View all contacts" msgstr "" -#: ../../mod/contacts.php:290 ../../mod/contacts.php:343 -#: ../../mod/admin.php:579 +#: ../../mod/contacts.php:290 ../../mod/contacts.php:347 +#: ../../mod/admin.php:644 msgid "Unblock" msgstr "" -#: ../../mod/contacts.php:290 ../../mod/contacts.php:343 -#: ../../mod/admin.php:578 +#: ../../mod/contacts.php:290 ../../mod/contacts.php:347 +#: ../../mod/admin.php:643 msgid "Block" msgstr "" -#: ../../mod/contacts.php:295 ../../mod/contacts.php:344 +#: ../../mod/contacts.php:293 +msgid "Toggle Blocked status" +msgstr "" + +#: ../../mod/contacts.php:296 ../../mod/contacts.php:348 msgid "Unignore" msgstr "" -#: ../../mod/contacts.php:301 +#: ../../mod/contacts.php:299 +msgid "Toggle Ignored status" +msgstr "" + +#: ../../mod/contacts.php:303 msgid "Unarchive" msgstr "" -#: ../../mod/contacts.php:301 +#: ../../mod/contacts.php:303 msgid "Archive" msgstr "" #: ../../mod/contacts.php:306 +msgid "Toggle Archive status" +msgstr "" + +#: ../../mod/contacts.php:309 msgid "Repair" msgstr "" -#: ../../mod/contacts.php:316 -msgid "Contact Editor" -msgstr "" - -#: ../../mod/contacts.php:319 -msgid "Profile Visibility" +#: ../../mod/contacts.php:312 +msgid "Advanced Contact Settings" msgstr "" #: ../../mod/contacts.php:320 +msgid "Contact Editor" +msgstr "" + +#: ../../mod/contacts.php:323 +msgid "Profile Visibility" +msgstr "" + +#: ../../mod/contacts.php:324 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "" -#: ../../mod/contacts.php:321 +#: ../../mod/contacts.php:325 msgid "Contact Information / Notes" msgstr "" -#: ../../mod/contacts.php:322 +#: ../../mod/contacts.php:326 msgid "Edit contact notes" msgstr "" -#: ../../mod/contacts.php:327 ../../mod/contacts.php:511 +#: ../../mod/contacts.php:331 ../../mod/contacts.php:522 #: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40 #, php-format msgid "Visit %s's profile [%s]" msgstr "" -#: ../../mod/contacts.php:328 +#: ../../mod/contacts.php:332 msgid "Block/Unblock contact" msgstr "" -#: ../../mod/contacts.php:329 +#: ../../mod/contacts.php:333 msgid "Ignore contact" msgstr "" -#: ../../mod/contacts.php:330 +#: ../../mod/contacts.php:334 msgid "Repair URL settings" msgstr "" -#: ../../mod/contacts.php:331 +#: ../../mod/contacts.php:335 msgid "View conversations" msgstr "" -#: ../../mod/contacts.php:333 +#: ../../mod/contacts.php:337 msgid "Delete contact" msgstr "" -#: ../../mod/contacts.php:337 +#: ../../mod/contacts.php:341 msgid "Last update:" msgstr "" -#: ../../mod/contacts.php:338 +#: ../../mod/contacts.php:342 msgid "Update public posts" msgstr "" -#: ../../mod/contacts.php:340 ../../mod/admin.php:1051 +#: ../../mod/contacts.php:344 ../../mod/admin.php:1115 msgid "Update now" msgstr "" -#: ../../mod/contacts.php:347 +#: ../../mod/contacts.php:351 msgid "Currently blocked" msgstr "" -#: ../../mod/contacts.php:348 +#: ../../mod/contacts.php:352 msgid "Currently ignored" msgstr "" -#: ../../mod/contacts.php:349 +#: ../../mod/contacts.php:353 msgid "Currently archived" msgstr "" -#: ../../mod/contacts.php:350 +#: ../../mod/contacts.php:354 msgid "" "Replies/likes to your public posts may still be visible" msgstr "" -#: ../../mod/contacts.php:403 +#: ../../mod/contacts.php:407 msgid "Suggestions" msgstr "" -#: ../../mod/contacts.php:408 ../../mod/group.php:191 +#: ../../mod/contacts.php:410 +msgid "Suggest potential friends" +msgstr "" + +#: ../../mod/contacts.php:413 ../../mod/group.php:191 msgid "All Contacts" msgstr "" -#: ../../mod/contacts.php:413 -msgid "Unblocked" +#: ../../mod/contacts.php:416 +msgid "Show all contacts" msgstr "" #: ../../mod/contacts.php:419 +msgid "Unblocked" +msgstr "" + +#: ../../mod/contacts.php:422 +msgid "Only show unblocked contacts" +msgstr "" + +#: ../../mod/contacts.php:426 msgid "Blocked" msgstr "" -#: ../../mod/contacts.php:425 +#: ../../mod/contacts.php:429 +msgid "Only show blocked contacts" +msgstr "" + +#: ../../mod/contacts.php:433 msgid "Ignored" msgstr "" -#: ../../mod/contacts.php:431 +#: ../../mod/contacts.php:436 +msgid "Only show ignored contacts" +msgstr "" + +#: ../../mod/contacts.php:440 msgid "Archived" msgstr "" -#: ../../mod/contacts.php:437 +#: ../../mod/contacts.php:443 +msgid "Only show archived contacts" +msgstr "" + +#: ../../mod/contacts.php:447 msgid "Hidden" msgstr "" -#: ../../mod/contacts.php:487 +#: ../../mod/contacts.php:450 +msgid "Only show hidden contacts" +msgstr "" + +#: ../../mod/contacts.php:498 msgid "Mutual Friendship" msgstr "" -#: ../../mod/contacts.php:491 +#: ../../mod/contacts.php:502 msgid "is a fan of yours" msgstr "" -#: ../../mod/contacts.php:495 +#: ../../mod/contacts.php:506 msgid "you are a fan of" msgstr "" -#: ../../mod/contacts.php:512 ../../mod/nogroup.php:41 +#: ../../mod/contacts.php:523 ../../mod/nogroup.php:41 msgid "Edit contact" msgstr "" -#: ../../mod/contacts.php:533 ../../view/theme/diabook/theme.php:253 +#: ../../mod/contacts.php:544 ../../view/theme/diabook/theme.php:253 #: ../../include/nav.php:139 msgid "Contacts" msgstr "" -#: ../../mod/contacts.php:537 +#: ../../mod/contacts.php:548 msgid "Search your contacts" msgstr "" -#: ../../mod/contacts.php:538 ../../mod/directory.php:57 +#: ../../mod/contacts.php:549 ../../mod/directory.php:57 msgid "Finding: " msgstr "" -#: ../../mod/contacts.php:539 ../../mod/directory.php:59 +#: ../../mod/contacts.php:550 ../../mod/directory.php:59 #: ../../include/contact_widgets.php:33 msgid "Find" msgstr "" @@ -1644,10 +1688,11 @@ msgstr "" #: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107 #: ../../mod/register.php:388 ../../mod/register.php:442 -#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:732 -#: ../../addon/facebook/facebook.php:650 -#: ../../addon/facebook/facebook.php:1139 -#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2700 +#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:756 +#: ../../addon/facebook/facebook.php:658 +#: ../../addon/facebook/facebook.php:1148 +#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2716 +#: ../../boot.php:686 msgid "Administrator" msgstr "" @@ -1657,7 +1702,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:83 ../../boot.php:809 +#: ../../mod/lostpass.php:83 ../../boot.php:818 msgid "Password Reset" msgstr "" @@ -1729,7 +1774,7 @@ msgstr "" msgid "Remove account" msgstr "" -#: ../../mod/settings.php:88 ../../mod/admin.php:665 ../../mod/admin.php:870 +#: ../../mod/settings.php:88 ../../mod/admin.php:730 ../../mod/admin.php:935 #: ../../addon/mathjax/mathjax.php:36 ../../include/nav.php:137 msgid "Settings" msgstr "" @@ -1739,7 +1784,6 @@ msgid "Missing some important data!" msgstr "" #: ../../mod/settings.php:134 ../../mod/settings.php:563 -#: ../../mod/admin.php:97 msgid "Update" msgstr "" @@ -1783,7 +1827,7 @@ msgstr "" msgid " Cannot change to that email." msgstr "" -#: ../../mod/settings.php:466 ../../addon/facebook/facebook.php:469 +#: ../../mod/settings.php:466 ../../addon/facebook/facebook.php:470 #: ../../addon/impressum/impressum.php:77 #: ../../addon/openstreetmap/openstreetmap.php:80 #: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105 @@ -1957,7 +2001,7 @@ msgstr "" msgid "Don't show emoticons" msgstr "" -#: ../../mod/settings.php:816 ../../mod/admin.php:173 ../../mod/admin.php:551 +#: ../../mod/settings.php:816 ../../mod/admin.php:180 ../../mod/admin.php:616 msgid "Normal Account" msgstr "" @@ -1965,7 +2009,7 @@ msgstr "" msgid "This account is a normal personal profile" msgstr "" -#: ../../mod/settings.php:820 ../../mod/admin.php:174 ../../mod/admin.php:552 +#: ../../mod/settings.php:820 ../../mod/admin.php:181 ../../mod/admin.php:617 msgid "Soapbox Account" msgstr "" @@ -1973,7 +2017,7 @@ msgstr "" msgid "Automatically approve all connection/friend requests as read-only fans" msgstr "" -#: ../../mod/settings.php:824 ../../mod/admin.php:175 ../../mod/admin.php:553 +#: ../../mod/settings.php:824 ../../mod/admin.php:182 ../../mod/admin.php:618 msgid "Community/Celebrity Account" msgstr "" @@ -1981,7 +2025,7 @@ msgstr "" msgid "Automatically approve all connection/friend requests as read-write fans" msgstr "" -#: ../../mod/settings.php:828 ../../mod/admin.php:176 ../../mod/admin.php:554 +#: ../../mod/settings.php:828 ../../mod/admin.php:183 ../../mod/admin.php:619 msgid "Automatic Friend Account" msgstr "" @@ -2227,23 +2271,47 @@ msgstr "" msgid "Commented Order" msgstr "" -#: ../../mod/network.php:176 +#: ../../mod/network.php:174 +msgid "Sort by Comment Date" +msgstr "" + +#: ../../mod/network.php:177 msgid "Posted Order" msgstr "" +#: ../../mod/network.php:180 +msgid "Sort by Post Date" +msgstr "" + #: ../../mod/network.php:187 +msgid "Posts that mention or involve you" +msgstr "" + +#: ../../mod/network.php:190 msgid "New" msgstr "" -#: ../../mod/network.php:192 +#: ../../mod/network.php:193 +msgid "Activity Stream - by date" +msgstr "" + +#: ../../mod/network.php:196 msgid "Starred" msgstr "" -#: ../../mod/network.php:197 +#: ../../mod/network.php:199 +msgid "Favourite Posts" +msgstr "" + +#: ../../mod/network.php:202 msgid "Shared Links" msgstr "" -#: ../../mod/network.php:274 +#: ../../mod/network.php:205 +msgid "Interesting Links" +msgstr "" + +#: ../../mod/network.php:281 #, php-format msgid "Warning: This group contains %s member from an insecure network." msgid_plural "" @@ -2251,40 +2319,40 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: ../../mod/network.php:277 +#: ../../mod/network.php:284 msgid "Private messages to this group are at risk of public disclosure." msgstr "" -#: ../../mod/network.php:322 +#: ../../mod/network.php:329 msgid "No such group" msgstr "" -#: ../../mod/network.php:333 +#: ../../mod/network.php:340 msgid "Group is empty" msgstr "" -#: ../../mod/network.php:337 +#: ../../mod/network.php:344 msgid "Group: " msgstr "" -#: ../../mod/network.php:347 +#: ../../mod/network.php:354 msgid "Contact: " msgstr "" -#: ../../mod/network.php:349 +#: ../../mod/network.php:356 msgid "Private messages to this person are at risk of public disclosure." msgstr "" -#: ../../mod/network.php:354 +#: ../../mod/network.php:361 msgid "Invalid contact." msgstr "" -#: ../../mod/notes.php:44 ../../boot.php:1486 +#: ../../mod/notes.php:44 ../../boot.php:1499 msgid "Personal Notes" msgstr "" #: ../../mod/notes.php:63 ../../mod/filer.php:30 -#: ../../addon/facebook/facebook.php:717 +#: ../../addon/facebook/facebook.php:726 #: ../../addon/privacy_image_cache/privacy_image_cache.php:147 #: ../../include/text.php:652 msgid "Save" @@ -2530,7 +2598,7 @@ msgstr "" #: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:252 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74 -#: ../../include/nav.php:50 ../../boot.php:1468 +#: ../../include/nav.php:50 ../../boot.php:1478 msgid "Profile" msgstr "" @@ -2679,7 +2747,7 @@ msgstr "" msgid "Your invitation ID: " msgstr "" -#: ../../mod/register.php:553 ../../mod/admin.php:393 +#: ../../mod/register.php:553 ../../mod/admin.php:401 msgid "Registration" msgstr "" @@ -2702,7 +2770,7 @@ msgstr "" msgid "Choose a nickname: " msgstr "" -#: ../../mod/register.php:567 ../../include/nav.php:81 ../../boot.php:775 +#: ../../mod/register.php:567 ../../include/nav.php:81 ../../boot.php:784 msgid "Register" msgstr "" @@ -2711,7 +2779,7 @@ msgid "People Search" msgstr "" #: ../../mod/like.php:127 ../../mod/tagger.php:70 -#: ../../addon/facebook/facebook.php:1533 +#: ../../addon/facebook/facebook.php:1542 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 #: ../../view/theme/diabook/theme.php:102 @@ -2721,7 +2789,7 @@ msgstr "" msgid "status" msgstr "" -#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1537 +#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1546 #: ../../addon/communityhome/communityhome.php:172 #: ../../view/theme/diabook/theme.php:116 ../../include/diaspora.php:1670 #: ../../include/conversation.php:65 @@ -2734,9 +2802,9 @@ msgstr "" msgid "%1$s doesn't like %2$s's %3$s" msgstr "" -#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:149 -#: ../../mod/admin.php:614 ../../mod/admin.php:813 ../../mod/display.php:37 -#: ../../mod/display.php:142 ../../include/items.php:3083 +#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:156 +#: ../../mod/admin.php:679 ../../mod/admin.php:878 ../../mod/display.php:37 +#: ../../mod/display.php:142 ../../include/items.php:3099 msgid "Item not found." msgstr "" @@ -2745,7 +2813,7 @@ msgid "Access denied." msgstr "" #: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:254 -#: ../../include/nav.php:51 ../../boot.php:1473 +#: ../../include/nav.php:51 ../../boot.php:1484 msgid "Photos" msgstr "" @@ -2966,489 +3034,553 @@ msgstr "" msgid "Theme settings updated." msgstr "" -#: ../../mod/admin.php:93 ../../mod/admin.php:391 +#: ../../mod/admin.php:96 ../../mod/admin.php:399 msgid "Site" msgstr "" -#: ../../mod/admin.php:94 ../../mod/admin.php:569 ../../mod/admin.php:581 +#: ../../mod/admin.php:97 ../../mod/admin.php:634 ../../mod/admin.php:646 msgid "Users" msgstr "" -#: ../../mod/admin.php:95 ../../mod/admin.php:663 ../../mod/admin.php:705 +#: ../../mod/admin.php:98 ../../mod/admin.php:728 ../../mod/admin.php:770 msgid "Plugins" msgstr "" -#: ../../mod/admin.php:96 ../../mod/admin.php:868 ../../mod/admin.php:904 +#: ../../mod/admin.php:99 ../../mod/admin.php:933 ../../mod/admin.php:969 msgid "Themes" msgstr "" -#: ../../mod/admin.php:111 ../../mod/admin.php:992 +#: ../../mod/admin.php:100 +msgid "DB updates" +msgstr "" + +#: ../../mod/admin.php:101 +msgid "Software Update" +msgstr "" + +#: ../../mod/admin.php:115 ../../mod/admin.php:1056 msgid "Logs" msgstr "" -#: ../../mod/admin.php:116 +#: ../../mod/admin.php:120 msgid "User registrations waiting for confirmation" msgstr "" -#: ../../mod/admin.php:188 ../../mod/admin.php:390 ../../mod/admin.php:568 -#: ../../mod/admin.php:662 ../../mod/admin.php:704 ../../mod/admin.php:867 -#: ../../mod/admin.php:903 ../../mod/admin.php:991 +#: ../../mod/admin.php:195 ../../mod/admin.php:398 ../../mod/admin.php:633 +#: ../../mod/admin.php:727 ../../mod/admin.php:769 ../../mod/admin.php:932 +#: ../../mod/admin.php:968 ../../mod/admin.php:1055 msgid "Administration" msgstr "" -#: ../../mod/admin.php:189 +#: ../../mod/admin.php:196 msgid "Summary" msgstr "" -#: ../../mod/admin.php:190 +#: ../../mod/admin.php:197 msgid "Registered users" msgstr "" -#: ../../mod/admin.php:192 +#: ../../mod/admin.php:199 msgid "Pending registrations" msgstr "" -#: ../../mod/admin.php:193 +#: ../../mod/admin.php:200 msgid "Version" msgstr "" -#: ../../mod/admin.php:195 +#: ../../mod/admin.php:202 msgid "Active plugins" msgstr "" -#: ../../mod/admin.php:329 +#: ../../mod/admin.php:337 msgid "Site settings updated." msgstr "" -#: ../../mod/admin.php:377 +#: ../../mod/admin.php:385 msgid "Closed" msgstr "" -#: ../../mod/admin.php:378 +#: ../../mod/admin.php:386 msgid "Requires approval" msgstr "" -#: ../../mod/admin.php:379 +#: ../../mod/admin.php:387 msgid "Open" msgstr "" -#: ../../mod/admin.php:383 +#: ../../mod/admin.php:391 msgid "No SSL policy, links will track page SSL state" msgstr "" -#: ../../mod/admin.php:384 +#: ../../mod/admin.php:392 msgid "Force all links to use SSL" msgstr "" -#: ../../mod/admin.php:385 +#: ../../mod/admin.php:393 msgid "Self-signed certificate, use SSL for local links only (discouraged)" msgstr "" -#: ../../mod/admin.php:394 +#: ../../mod/admin.php:402 msgid "File upload" msgstr "" -#: ../../mod/admin.php:395 +#: ../../mod/admin.php:403 msgid "Policies" msgstr "" -#: ../../mod/admin.php:396 +#: ../../mod/admin.php:404 msgid "Advanced" msgstr "" -#: ../../mod/admin.php:400 ../../addon/statusnet/statusnet.php:544 +#: ../../mod/admin.php:408 ../../addon/statusnet/statusnet.php:544 msgid "Site name" msgstr "" -#: ../../mod/admin.php:401 +#: ../../mod/admin.php:409 msgid "Banner/Logo" msgstr "" -#: ../../mod/admin.php:402 +#: ../../mod/admin.php:410 msgid "System language" msgstr "" -#: ../../mod/admin.php:403 +#: ../../mod/admin.php:411 msgid "System theme" msgstr "" -#: ../../mod/admin.php:403 +#: ../../mod/admin.php:411 msgid "" "Default system theme - may be over-ridden by user profiles - change theme settings" msgstr "" -#: ../../mod/admin.php:404 +#: ../../mod/admin.php:412 msgid "SSL link policy" msgstr "" -#: ../../mod/admin.php:404 +#: ../../mod/admin.php:412 msgid "Determines whether generated links should be forced to use SSL" msgstr "" -#: ../../mod/admin.php:405 +#: ../../mod/admin.php:413 msgid "Maximum image size" msgstr "" -#: ../../mod/admin.php:405 +#: ../../mod/admin.php:413 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "" -#: ../../mod/admin.php:407 +#: ../../mod/admin.php:415 msgid "Register policy" msgstr "" -#: ../../mod/admin.php:408 +#: ../../mod/admin.php:416 msgid "Register text" msgstr "" -#: ../../mod/admin.php:408 +#: ../../mod/admin.php:416 msgid "Will be displayed prominently on the registration page." msgstr "" -#: ../../mod/admin.php:409 +#: ../../mod/admin.php:417 msgid "Accounts abandoned after x days" msgstr "" -#: ../../mod/admin.php:409 +#: ../../mod/admin.php:417 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: ../../mod/admin.php:410 +#: ../../mod/admin.php:418 msgid "Allowed friend domains" msgstr "" -#: ../../mod/admin.php:410 +#: ../../mod/admin.php:418 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "" -#: ../../mod/admin.php:411 +#: ../../mod/admin.php:419 msgid "Allowed email domains" msgstr "" -#: ../../mod/admin.php:411 +#: ../../mod/admin.php:419 msgid "" "Comma separated list of domains which are allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains" msgstr "" -#: ../../mod/admin.php:412 +#: ../../mod/admin.php:420 msgid "Block public" msgstr "" -#: ../../mod/admin.php:412 +#: ../../mod/admin.php:420 msgid "" "Check to block public access to all otherwise public personal pages on this " "site unless you are currently logged in." msgstr "" -#: ../../mod/admin.php:413 +#: ../../mod/admin.php:421 msgid "Force publish" msgstr "" -#: ../../mod/admin.php:413 +#: ../../mod/admin.php:421 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "" -#: ../../mod/admin.php:414 +#: ../../mod/admin.php:422 msgid "Global directory update URL" msgstr "" -#: ../../mod/admin.php:414 +#: ../../mod/admin.php:422 msgid "" "URL to update the global directory. If this is not set, the global directory " "is completely unavailable to the application." msgstr "" -#: ../../mod/admin.php:416 +#: ../../mod/admin.php:424 msgid "Block multiple registrations" msgstr "" -#: ../../mod/admin.php:416 +#: ../../mod/admin.php:424 msgid "Disallow users to register additional accounts for use as pages." msgstr "" -#: ../../mod/admin.php:417 +#: ../../mod/admin.php:425 msgid "OpenID support" msgstr "" -#: ../../mod/admin.php:417 +#: ../../mod/admin.php:425 msgid "OpenID support for registration and logins." msgstr "" -#: ../../mod/admin.php:418 +#: ../../mod/admin.php:426 msgid "Fullname check" msgstr "" -#: ../../mod/admin.php:418 +#: ../../mod/admin.php:426 msgid "" "Force users to register with a space between firstname and lastname in Full " "name, as an antispam measure" msgstr "" -#: ../../mod/admin.php:419 +#: ../../mod/admin.php:427 msgid "UTF-8 Regular expressions" msgstr "" -#: ../../mod/admin.php:419 +#: ../../mod/admin.php:427 msgid "Use PHP UTF8 regular expressions" msgstr "" -#: ../../mod/admin.php:420 +#: ../../mod/admin.php:428 msgid "Show Community Page" msgstr "" -#: ../../mod/admin.php:420 +#: ../../mod/admin.php:428 msgid "" "Display a Community page showing all recent public postings on this site." msgstr "" -#: ../../mod/admin.php:421 +#: ../../mod/admin.php:429 msgid "Enable OStatus support" msgstr "" -#: ../../mod/admin.php:421 +#: ../../mod/admin.php:429 msgid "" "Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All " "communications in OStatus are public, so privacy warnings will be " "occasionally displayed." msgstr "" -#: ../../mod/admin.php:422 +#: ../../mod/admin.php:430 msgid "Enable Diaspora support" msgstr "" -#: ../../mod/admin.php:422 +#: ../../mod/admin.php:430 msgid "Provide built-in Diaspora network compatibility." msgstr "" -#: ../../mod/admin.php:423 +#: ../../mod/admin.php:431 msgid "Only allow Friendica contacts" msgstr "" -#: ../../mod/admin.php:423 +#: ../../mod/admin.php:431 msgid "" "All contacts must use Friendica protocols. All other built-in communication " "protocols disabled." msgstr "" -#: ../../mod/admin.php:424 +#: ../../mod/admin.php:432 msgid "Verify SSL" msgstr "" -#: ../../mod/admin.php:424 +#: ../../mod/admin.php:432 msgid "" "If you wish, you can turn on strict certificate checking. This will mean you " "cannot connect (at all) to self-signed SSL sites." msgstr "" -#: ../../mod/admin.php:425 +#: ../../mod/admin.php:433 msgid "Proxy user" msgstr "" -#: ../../mod/admin.php:426 +#: ../../mod/admin.php:434 msgid "Proxy URL" msgstr "" -#: ../../mod/admin.php:427 +#: ../../mod/admin.php:435 msgid "Network timeout" msgstr "" -#: ../../mod/admin.php:427 +#: ../../mod/admin.php:435 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "" -#: ../../mod/admin.php:453 +#: ../../mod/admin.php:436 +msgid "Delivery interval" +msgstr "" + +#: ../../mod/admin.php:436 +msgid "" +"Delay background delivery processes by this many seconds to reduce system " +"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " +"for large dedicated servers." +msgstr "" + +#: ../../mod/admin.php:451 +msgid "Update has been marked successful" +msgstr "" + +#: ../../mod/admin.php:461 +#, php-format +msgid "Executing %s failed. Check system logs." +msgstr "" + +#: ../../mod/admin.php:464 +#, php-format +msgid "Update %s was successfully applied." +msgstr "" + +#: ../../mod/admin.php:468 +#, php-format +msgid "Update %s did not return a status. Unknown if it succeeded." +msgstr "" + +#: ../../mod/admin.php:471 +#, php-format +msgid "Update function %s could not be found." +msgstr "" + +#: ../../mod/admin.php:486 +msgid "No failed updates." +msgstr "" + +#: ../../mod/admin.php:490 +msgid "Failed Updates" +msgstr "" + +#: ../../mod/admin.php:491 +msgid "" +"This does not include updates prior to 1139, which did not return a status." +msgstr "" + +#: ../../mod/admin.php:492 +msgid "Mark success (if update was manually applied)" +msgstr "" + +#: ../../mod/admin.php:493 +msgid "Attempt to execute this update step automatically" +msgstr "" + +#: ../../mod/admin.php:518 #, php-format msgid "%s user blocked/unblocked" msgid_plural "%s users blocked/unblocked" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:460 +#: ../../mod/admin.php:525 #, php-format msgid "%s user deleted" msgid_plural "%s users deleted" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:499 +#: ../../mod/admin.php:564 #, php-format msgid "User '%s' deleted" msgstr "" -#: ../../mod/admin.php:507 +#: ../../mod/admin.php:572 #, php-format msgid "User '%s' unblocked" msgstr "" -#: ../../mod/admin.php:507 +#: ../../mod/admin.php:572 #, php-format msgid "User '%s' blocked" msgstr "" -#: ../../mod/admin.php:571 +#: ../../mod/admin.php:636 msgid "select all" msgstr "" -#: ../../mod/admin.php:572 +#: ../../mod/admin.php:637 msgid "User registrations waiting for confirm" msgstr "" -#: ../../mod/admin.php:573 +#: ../../mod/admin.php:638 msgid "Request date" msgstr "" -#: ../../mod/admin.php:573 ../../mod/admin.php:582 +#: ../../mod/admin.php:638 ../../mod/admin.php:647 #: ../../include/contact_selectors.php:79 msgid "Email" msgstr "" -#: ../../mod/admin.php:574 +#: ../../mod/admin.php:639 msgid "No registrations." msgstr "" -#: ../../mod/admin.php:576 +#: ../../mod/admin.php:641 msgid "Deny" msgstr "" -#: ../../mod/admin.php:582 +#: ../../mod/admin.php:647 msgid "Register date" msgstr "" -#: ../../mod/admin.php:582 +#: ../../mod/admin.php:647 msgid "Last login" msgstr "" -#: ../../mod/admin.php:582 +#: ../../mod/admin.php:647 msgid "Last item" msgstr "" -#: ../../mod/admin.php:582 +#: ../../mod/admin.php:647 msgid "Account" msgstr "" -#: ../../mod/admin.php:584 +#: ../../mod/admin.php:649 msgid "" "Selected users will be deleted!\\n\\nEverything these users had posted on " "this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:585 +#: ../../mod/admin.php:650 msgid "" "The user {0} will be deleted!\\n\\nEverything this user has posted on this " "site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:626 +#: ../../mod/admin.php:691 #, php-format msgid "Plugin %s disabled." msgstr "" -#: ../../mod/admin.php:630 +#: ../../mod/admin.php:695 #, php-format msgid "Plugin %s enabled." msgstr "" -#: ../../mod/admin.php:640 ../../mod/admin.php:838 +#: ../../mod/admin.php:705 ../../mod/admin.php:903 msgid "Disable" msgstr "" -#: ../../mod/admin.php:642 ../../mod/admin.php:840 +#: ../../mod/admin.php:707 ../../mod/admin.php:905 msgid "Enable" msgstr "" -#: ../../mod/admin.php:664 ../../mod/admin.php:869 +#: ../../mod/admin.php:729 ../../mod/admin.php:934 msgid "Toggle" msgstr "" -#: ../../mod/admin.php:672 ../../mod/admin.php:879 +#: ../../mod/admin.php:737 ../../mod/admin.php:944 msgid "Author: " msgstr "" -#: ../../mod/admin.php:673 ../../mod/admin.php:880 +#: ../../mod/admin.php:738 ../../mod/admin.php:945 msgid "Maintainer: " msgstr "" -#: ../../mod/admin.php:802 +#: ../../mod/admin.php:867 msgid "No themes found." msgstr "" -#: ../../mod/admin.php:861 +#: ../../mod/admin.php:926 msgid "Screenshot" msgstr "" -#: ../../mod/admin.php:909 +#: ../../mod/admin.php:974 msgid "[Experimental]" msgstr "" -#: ../../mod/admin.php:910 +#: ../../mod/admin.php:975 msgid "[Unsupported]" msgstr "" -#: ../../mod/admin.php:937 +#: ../../mod/admin.php:1002 msgid "Log settings updated." msgstr "" -#: ../../mod/admin.php:994 +#: ../../mod/admin.php:1058 msgid "Clear" msgstr "" -#: ../../mod/admin.php:1000 +#: ../../mod/admin.php:1064 msgid "Debugging" msgstr "" -#: ../../mod/admin.php:1001 +#: ../../mod/admin.php:1065 msgid "Log file" msgstr "" -#: ../../mod/admin.php:1001 +#: ../../mod/admin.php:1065 msgid "" "Must be writable by web server. Relative to your Friendica top-level " "directory." msgstr "" -#: ../../mod/admin.php:1002 +#: ../../mod/admin.php:1066 msgid "Log level" msgstr "" -#: ../../mod/admin.php:1052 +#: ../../mod/admin.php:1116 msgid "Close" msgstr "" -#: ../../mod/admin.php:1058 +#: ../../mod/admin.php:1122 msgid "FTP Host" msgstr "" -#: ../../mod/admin.php:1059 +#: ../../mod/admin.php:1123 msgid "FTP Path" msgstr "" -#: ../../mod/admin.php:1060 +#: ../../mod/admin.php:1124 msgid "FTP User" msgstr "" -#: ../../mod/admin.php:1061 +#: ../../mod/admin.php:1125 msgid "FTP Password" msgstr "" -#: ../../mod/profile.php:21 ../../boot.php:940 +#: ../../mod/profile.php:21 ../../boot.php:949 msgid "Requested profile is not available." msgstr "" -#: ../../mod/profile.php:124 ../../mod/display.php:75 +#: ../../mod/profile.php:126 ../../mod/display.php:75 msgid "Access to this profile has been restricted." msgstr "" -#: ../../mod/profile.php:145 +#: ../../mod/profile.php:147 msgid "Tips for New Members" msgstr "" @@ -3584,8 +3716,8 @@ msgstr "" msgid "Search This Site" msgstr "" -#: ../../mod/profiles.php:21 ../../mod/profiles.php:339 -#: ../../mod/profiles.php:453 ../../mod/dfrn_confirm.php:62 +#: ../../mod/profiles.php:21 ../../mod/profiles.php:375 +#: ../../mod/profiles.php:489 ../../mod/dfrn_confirm.php:62 msgid "Profile not found." msgstr "" @@ -3593,259 +3725,273 @@ msgstr "" msgid "Profile Name is required." msgstr "" -#: ../../mod/profiles.php:143 +#: ../../mod/profiles.php:145 msgid "Marital Status" msgstr "" -#: ../../mod/profiles.php:144 +#: ../../mod/profiles.php:149 msgid "Romantic Partner" msgstr "" -#: ../../mod/profiles.php:145 +#: ../../mod/profiles.php:153 msgid "Work/Employment" msgstr "" -#: ../../mod/profiles.php:146 +#: ../../mod/profiles.php:156 msgid "Religion" msgstr "" -#: ../../mod/profiles.php:147 +#: ../../mod/profiles.php:160 msgid "Political Views" msgstr "" -#: ../../mod/profiles.php:148 +#: ../../mod/profiles.php:164 msgid "Gender" msgstr "" -#: ../../mod/profiles.php:149 +#: ../../mod/profiles.php:168 msgid "Sexual Preference" msgstr "" -#: ../../mod/profiles.php:150 +#: ../../mod/profiles.php:172 msgid "Homepage" msgstr "" -#: ../../mod/profiles.php:151 +#: ../../mod/profiles.php:176 msgid "Interests" msgstr "" -#: ../../mod/profiles.php:154 +#: ../../mod/profiles.php:181 msgid "Location" msgstr "" -#: ../../mod/profiles.php:225 +#: ../../mod/profiles.php:253 msgid "Profile updated." msgstr "" -#: ../../mod/profiles.php:300 +#: ../../mod/profiles.php:320 +msgid " and " +msgstr "" + +#: ../../mod/profiles.php:328 msgid "public profile" msgstr "" -#: ../../mod/profiles.php:302 +#: ../../mod/profiles.php:331 +#, php-format +msgid "%1$s changed %2$s to %3$s" +msgstr "" + +#: ../../mod/profiles.php:332 +#, php-format +msgid " - Visit %1$s's %2$s" +msgstr "" + +#: ../../mod/profiles.php:335 #, php-format msgid "%1$s has an updated %2$s, changing %3$s." msgstr "" -#: ../../mod/profiles.php:358 +#: ../../mod/profiles.php:394 msgid "Profile deleted." msgstr "" -#: ../../mod/profiles.php:376 ../../mod/profiles.php:410 +#: ../../mod/profiles.php:412 ../../mod/profiles.php:446 msgid "Profile-" msgstr "" -#: ../../mod/profiles.php:395 ../../mod/profiles.php:437 +#: ../../mod/profiles.php:431 ../../mod/profiles.php:473 msgid "New profile created." msgstr "" -#: ../../mod/profiles.php:416 +#: ../../mod/profiles.php:452 msgid "Profile unavailable to clone." msgstr "" -#: ../../mod/profiles.php:474 +#: ../../mod/profiles.php:510 msgid "Hide your contact/friend list from viewers of this profile?" msgstr "" -#: ../../mod/profiles.php:497 +#: ../../mod/profiles.php:533 msgid "Edit Profile Details" msgstr "" -#: ../../mod/profiles.php:499 +#: ../../mod/profiles.php:535 msgid "View this profile" msgstr "" -#: ../../mod/profiles.php:500 +#: ../../mod/profiles.php:536 msgid "Create a new profile using these settings" msgstr "" -#: ../../mod/profiles.php:501 +#: ../../mod/profiles.php:537 msgid "Clone this profile" msgstr "" -#: ../../mod/profiles.php:502 +#: ../../mod/profiles.php:538 msgid "Delete this profile" msgstr "" -#: ../../mod/profiles.php:503 +#: ../../mod/profiles.php:539 msgid "Profile Name:" msgstr "" -#: ../../mod/profiles.php:504 +#: ../../mod/profiles.php:540 msgid "Your Full Name:" msgstr "" -#: ../../mod/profiles.php:505 +#: ../../mod/profiles.php:541 msgid "Title/Description:" msgstr "" -#: ../../mod/profiles.php:506 +#: ../../mod/profiles.php:542 msgid "Your Gender:" msgstr "" -#: ../../mod/profiles.php:507 +#: ../../mod/profiles.php:543 #, php-format msgid "Birthday (%s):" msgstr "" -#: ../../mod/profiles.php:508 +#: ../../mod/profiles.php:544 msgid "Street Address:" msgstr "" -#: ../../mod/profiles.php:509 +#: ../../mod/profiles.php:545 msgid "Locality/City:" msgstr "" -#: ../../mod/profiles.php:510 +#: ../../mod/profiles.php:546 msgid "Postal/Zip Code:" msgstr "" -#: ../../mod/profiles.php:511 +#: ../../mod/profiles.php:547 msgid "Country:" msgstr "" -#: ../../mod/profiles.php:512 +#: ../../mod/profiles.php:548 msgid "Region/State:" msgstr "" -#: ../../mod/profiles.php:513 +#: ../../mod/profiles.php:549 msgid " Marital Status:" msgstr "" -#: ../../mod/profiles.php:514 +#: ../../mod/profiles.php:550 msgid "Who: (if applicable)" msgstr "" -#: ../../mod/profiles.php:515 +#: ../../mod/profiles.php:551 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "" -#: ../../mod/profiles.php:516 ../../include/profile_advanced.php:43 +#: ../../mod/profiles.php:552 ../../include/profile_advanced.php:43 msgid "Sexual Preference:" msgstr "" -#: ../../mod/profiles.php:517 +#: ../../mod/profiles.php:553 msgid "Homepage URL:" msgstr "" -#: ../../mod/profiles.php:518 ../../include/profile_advanced.php:49 +#: ../../mod/profiles.php:554 ../../include/profile_advanced.php:49 msgid "Political Views:" msgstr "" -#: ../../mod/profiles.php:519 +#: ../../mod/profiles.php:555 msgid "Religious Views:" msgstr "" -#: ../../mod/profiles.php:520 +#: ../../mod/profiles.php:556 msgid "Public Keywords:" msgstr "" -#: ../../mod/profiles.php:521 +#: ../../mod/profiles.php:557 msgid "Private Keywords:" msgstr "" -#: ../../mod/profiles.php:522 +#: ../../mod/profiles.php:558 msgid "Example: fishing photography software" msgstr "" -#: ../../mod/profiles.php:523 +#: ../../mod/profiles.php:559 msgid "(Used for suggesting potential friends, can be seen by others)" msgstr "" -#: ../../mod/profiles.php:524 +#: ../../mod/profiles.php:560 msgid "(Used for searching profiles, never shown to others)" msgstr "" -#: ../../mod/profiles.php:525 +#: ../../mod/profiles.php:561 msgid "Tell us about yourself..." msgstr "" -#: ../../mod/profiles.php:526 +#: ../../mod/profiles.php:562 msgid "Hobbies/Interests" msgstr "" -#: ../../mod/profiles.php:527 +#: ../../mod/profiles.php:563 msgid "Contact information and Social Networks" msgstr "" -#: ../../mod/profiles.php:528 +#: ../../mod/profiles.php:564 msgid "Musical interests" msgstr "" -#: ../../mod/profiles.php:529 +#: ../../mod/profiles.php:565 msgid "Books, literature" msgstr "" -#: ../../mod/profiles.php:530 +#: ../../mod/profiles.php:566 msgid "Television" msgstr "" -#: ../../mod/profiles.php:531 +#: ../../mod/profiles.php:567 msgid "Film/dance/culture/entertainment" msgstr "" -#: ../../mod/profiles.php:532 +#: ../../mod/profiles.php:568 msgid "Love/romance" msgstr "" -#: ../../mod/profiles.php:533 +#: ../../mod/profiles.php:569 msgid "Work/employment" msgstr "" -#: ../../mod/profiles.php:534 +#: ../../mod/profiles.php:570 msgid "School/education" msgstr "" -#: ../../mod/profiles.php:539 +#: ../../mod/profiles.php:575 msgid "" "This is your public profile.
It may " "be visible to anybody using the internet." msgstr "" -#: ../../mod/profiles.php:549 ../../mod/directory.php:111 +#: ../../mod/profiles.php:585 ../../mod/directory.php:111 msgid "Age: " msgstr "" -#: ../../mod/profiles.php:584 +#: ../../mod/profiles.php:620 msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/profiles.php:585 ../../boot.php:1049 +#: ../../mod/profiles.php:621 ../../boot.php:1058 msgid "Change profile photo" msgstr "" -#: ../../mod/profiles.php:586 ../../boot.php:1050 +#: ../../mod/profiles.php:622 ../../boot.php:1059 msgid "Create New Profile" msgstr "" -#: ../../mod/profiles.php:597 ../../boot.php:1060 +#: ../../mod/profiles.php:633 ../../boot.php:1069 msgid "Profile Image" msgstr "" -#: ../../mod/profiles.php:599 ../../boot.php:1063 +#: ../../mod/profiles.php:635 ../../boot.php:1072 msgid "visible to everybody" msgstr "" -#: ../../mod/profiles.php:600 ../../boot.php:1064 +#: ../../mod/profiles.php:636 ../../boot.php:1073 msgid "Edit visibility" msgstr "" @@ -4051,118 +4197,123 @@ msgstr "" msgid "Unable to set contact photo." msgstr "" -#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:507 +#: ../../mod/dfrn_confirm.php:488 +#, php-format +msgid "%1$s welcomes new member %2$s" +msgstr "" + +#: ../../mod/dfrn_confirm.php:498 ../../include/diaspora.php:507 #: ../../include/conversation.php:101 #, php-format msgid "%1$s is now friends with %2$s" msgstr "" -#: ../../mod/dfrn_confirm.php:548 +#: ../../mod/dfrn_confirm.php:572 #, php-format msgid "No user record found for '%s' " msgstr "" -#: ../../mod/dfrn_confirm.php:558 +#: ../../mod/dfrn_confirm.php:582 msgid "Our site encryption key is apparently messed up." msgstr "" -#: ../../mod/dfrn_confirm.php:569 +#: ../../mod/dfrn_confirm.php:593 msgid "Empty site URL was provided or URL could not be decrypted by us." msgstr "" -#: ../../mod/dfrn_confirm.php:590 +#: ../../mod/dfrn_confirm.php:614 msgid "Contact record was not found for you on our site." msgstr "" -#: ../../mod/dfrn_confirm.php:604 +#: ../../mod/dfrn_confirm.php:628 #, php-format msgid "Site public key not available in contact record for URL %s." msgstr "" -#: ../../mod/dfrn_confirm.php:624 +#: ../../mod/dfrn_confirm.php:648 msgid "" "The ID provided by your system is a duplicate on our system. It should work " "if you try again." msgstr "" -#: ../../mod/dfrn_confirm.php:635 +#: ../../mod/dfrn_confirm.php:659 msgid "Unable to set your contact credentials on our system." msgstr "" -#: ../../mod/dfrn_confirm.php:700 +#: ../../mod/dfrn_confirm.php:724 msgid "Unable to update your contact profile details on our system" msgstr "" -#: ../../mod/dfrn_confirm.php:730 +#: ../../mod/dfrn_confirm.php:754 #, php-format msgid "Connection accepted at %s" msgstr "" -#: ../../addon/facebook/facebook.php:490 +#: ../../addon/facebook/facebook.php:491 msgid "Facebook disabled" msgstr "" -#: ../../addon/facebook/facebook.php:495 +#: ../../addon/facebook/facebook.php:496 msgid "Updating contacts" msgstr "" -#: ../../addon/facebook/facebook.php:515 +#: ../../addon/facebook/facebook.php:516 msgid "Facebook API key is missing." msgstr "" -#: ../../addon/facebook/facebook.php:522 +#: ../../addon/facebook/facebook.php:523 msgid "Facebook Connect" msgstr "" -#: ../../addon/facebook/facebook.php:528 +#: ../../addon/facebook/facebook.php:529 msgid "Install Facebook connector for this account." msgstr "" -#: ../../addon/facebook/facebook.php:535 +#: ../../addon/facebook/facebook.php:536 msgid "Remove Facebook connector" msgstr "" -#: ../../addon/facebook/facebook.php:540 +#: ../../addon/facebook/facebook.php:541 msgid "" "Re-authenticate [This is necessary whenever your Facebook password is " "changed.]" msgstr "" -#: ../../addon/facebook/facebook.php:547 +#: ../../addon/facebook/facebook.php:548 msgid "Post to Facebook by default" msgstr "" -#: ../../addon/facebook/facebook.php:551 +#: ../../addon/facebook/facebook.php:552 msgid "Link all your Facebook friends and conversations on this website" msgstr "" -#: ../../addon/facebook/facebook.php:553 +#: ../../addon/facebook/facebook.php:554 msgid "" "Facebook conversations consist of your profile wall and your friend " "stream." msgstr "" -#: ../../addon/facebook/facebook.php:554 +#: ../../addon/facebook/facebook.php:555 msgid "On this website, your Facebook friend stream is only visible to you." msgstr "" -#: ../../addon/facebook/facebook.php:555 +#: ../../addon/facebook/facebook.php:556 msgid "" "The following settings determine the privacy of your Facebook profile wall " "on this website." msgstr "" -#: ../../addon/facebook/facebook.php:559 +#: ../../addon/facebook/facebook.php:560 msgid "" "On this website your Facebook profile wall conversations will only be " "visible to you" msgstr "" -#: ../../addon/facebook/facebook.php:564 +#: ../../addon/facebook/facebook.php:565 msgid "Do not import your Facebook profile wall conversations" msgstr "" -#: ../../addon/facebook/facebook.php:566 +#: ../../addon/facebook/facebook.php:567 msgid "" "If you choose to link conversations and leave both of these boxes unchecked, " "your Facebook profile wall will be merged with your profile wall on this " @@ -4170,120 +4321,120 @@ msgid "" "who may see the conversations." msgstr "" -#: ../../addon/facebook/facebook.php:571 +#: ../../addon/facebook/facebook.php:572 msgid "Comma separated applications to ignore" msgstr "" -#: ../../addon/facebook/facebook.php:648 +#: ../../addon/facebook/facebook.php:656 msgid "Problems with Facebook Real-Time Updates" msgstr "" -#: ../../addon/facebook/facebook.php:675 +#: ../../addon/facebook/facebook.php:684 #: ../../include/contact_selectors.php:81 msgid "Facebook" msgstr "" -#: ../../addon/facebook/facebook.php:676 +#: ../../addon/facebook/facebook.php:685 msgid "Facebook Connector Settings" msgstr "" -#: ../../addon/facebook/facebook.php:691 +#: ../../addon/facebook/facebook.php:700 msgid "Facebook API Key" msgstr "" -#: ../../addon/facebook/facebook.php:701 +#: ../../addon/facebook/facebook.php:710 msgid "" "Error: it appears that you have specified the App-ID and -Secret in your ." "htconfig.php file. As long as they are specified there, they cannot be set " "using this form.

" msgstr "" -#: ../../addon/facebook/facebook.php:706 +#: ../../addon/facebook/facebook.php:715 msgid "" "Error: the given API Key seems to be incorrect (the application access token " "could not be retrieved)." msgstr "" -#: ../../addon/facebook/facebook.php:708 +#: ../../addon/facebook/facebook.php:717 msgid "The given API Key seems to work correctly." msgstr "" -#: ../../addon/facebook/facebook.php:710 +#: ../../addon/facebook/facebook.php:719 msgid "" "The correctness of the API Key could not be detected. Somthing strange's " "going on." msgstr "" -#: ../../addon/facebook/facebook.php:713 +#: ../../addon/facebook/facebook.php:722 msgid "App-ID / API-Key" msgstr "" -#: ../../addon/facebook/facebook.php:714 +#: ../../addon/facebook/facebook.php:723 msgid "Application secret" msgstr "" -#: ../../addon/facebook/facebook.php:715 +#: ../../addon/facebook/facebook.php:724 #, php-format -msgid "Polling Interval (min. %1$s minutes)" +msgid "Polling Interval in minutes (minimum %1$s minutes)" msgstr "" -#: ../../addon/facebook/facebook.php:716 +#: ../../addon/facebook/facebook.php:725 msgid "" "Synchronize comments (no comments on Facebook are missed, at the cost of " "increased system load)" msgstr "" -#: ../../addon/facebook/facebook.php:720 +#: ../../addon/facebook/facebook.php:729 msgid "Real-Time Updates" msgstr "" -#: ../../addon/facebook/facebook.php:724 +#: ../../addon/facebook/facebook.php:733 msgid "Real-Time Updates are activated." msgstr "" -#: ../../addon/facebook/facebook.php:725 +#: ../../addon/facebook/facebook.php:734 msgid "Deactivate Real-Time Updates" msgstr "" -#: ../../addon/facebook/facebook.php:727 +#: ../../addon/facebook/facebook.php:736 msgid "Real-Time Updates not activated." msgstr "" -#: ../../addon/facebook/facebook.php:727 +#: ../../addon/facebook/facebook.php:736 msgid "Activate Real-Time Updates" msgstr "" -#: ../../addon/facebook/facebook.php:746 +#: ../../addon/facebook/facebook.php:755 msgid "The new values have been saved." msgstr "" -#: ../../addon/facebook/facebook.php:770 +#: ../../addon/facebook/facebook.php:779 msgid "Post to Facebook" msgstr "" -#: ../../addon/facebook/facebook.php:868 +#: ../../addon/facebook/facebook.php:877 msgid "" "Post to Facebook cancelled because of multi-network access permission " "conflict." msgstr "" -#: ../../addon/facebook/facebook.php:1088 +#: ../../addon/facebook/facebook.php:1097 msgid "View on Friendica" msgstr "" -#: ../../addon/facebook/facebook.php:1121 +#: ../../addon/facebook/facebook.php:1130 msgid "Facebook post failed. Queued for retry." msgstr "" -#: ../../addon/facebook/facebook.php:1161 +#: ../../addon/facebook/facebook.php:1170 msgid "Your Facebook connection became invalid. Please Re-authenticate." msgstr "" -#: ../../addon/facebook/facebook.php:1162 +#: ../../addon/facebook/facebook.php:1171 msgid "Facebook connection became invalid" msgstr "" -#: ../../addon/facebook/facebook.php:1163 +#: ../../addon/facebook/facebook.php:1172 #, php-format msgid "" "Hi %1$s,\n" @@ -4327,6 +4478,10 @@ msgid_plural "%d people don't like this" msgstr[0] "" msgstr[1] "" +#: ../../addon/widgets/widget_friendheader.php:40 +msgid "Get added to this list!" +msgstr "" + #: ../../addon/widgets/widgets.php:56 msgid "Generate new key" msgstr "" @@ -4442,7 +4597,7 @@ msgstr "" #: ../../addon/communityhome/communityhome.php:34 #: ../../addon/communityhome/twillingham/communityhome.php:28 #: ../../addon/communityhome/twillingham/communityhome.php:34 -#: ../../include/nav.php:64 ../../boot.php:796 +#: ../../include/nav.php:64 ../../boot.php:805 msgid "Login" msgstr "" @@ -5184,7 +5339,7 @@ msgid "Show More Settings saved." msgstr "" #: ../../addon/showmore/showmore.php:87 ../../include/conversation.php:466 -#: ../../boot.php:496 +#: ../../boot.php:507 msgid "show more" msgstr "" @@ -5488,7 +5643,7 @@ msgstr "" msgid "Set colour scheme" msgstr "" -#: ../../include/profile_advanced.php:17 ../../boot.php:1085 +#: ../../include/profile_advanced.php:17 ../../boot.php:1094 msgid "Gender:" msgstr "" @@ -5509,11 +5664,11 @@ msgstr "" msgid "Age:" msgstr "" -#: ../../include/profile_advanced.php:37 ../../boot.php:1088 +#: ../../include/profile_advanced.php:37 ../../boot.php:1097 msgid "Status:" msgstr "" -#: ../../include/profile_advanced.php:45 ../../boot.php:1090 +#: ../../include/profile_advanced.php:45 ../../boot.php:1099 msgid "Homepage:" msgstr "" @@ -5693,179 +5848,179 @@ msgstr "" msgid "Undecided" msgstr "" -#: ../../include/profile_selectors.php:19 +#: ../../include/profile_selectors.php:21 msgid "Males" msgstr "" -#: ../../include/profile_selectors.php:19 +#: ../../include/profile_selectors.php:21 msgid "Females" msgstr "" -#: ../../include/profile_selectors.php:19 +#: ../../include/profile_selectors.php:21 msgid "Gay" msgstr "" -#: ../../include/profile_selectors.php:19 +#: ../../include/profile_selectors.php:21 msgid "Lesbian" msgstr "" -#: ../../include/profile_selectors.php:19 +#: ../../include/profile_selectors.php:21 msgid "No Preference" msgstr "" -#: ../../include/profile_selectors.php:19 +#: ../../include/profile_selectors.php:21 msgid "Bisexual" msgstr "" -#: ../../include/profile_selectors.php:19 +#: ../../include/profile_selectors.php:21 msgid "Autosexual" msgstr "" -#: ../../include/profile_selectors.php:19 +#: ../../include/profile_selectors.php:21 msgid "Abstinent" msgstr "" -#: ../../include/profile_selectors.php:19 +#: ../../include/profile_selectors.php:21 msgid "Virgin" msgstr "" -#: ../../include/profile_selectors.php:19 +#: ../../include/profile_selectors.php:21 msgid "Deviant" msgstr "" -#: ../../include/profile_selectors.php:19 +#: ../../include/profile_selectors.php:21 msgid "Fetish" msgstr "" -#: ../../include/profile_selectors.php:19 +#: ../../include/profile_selectors.php:21 msgid "Oodles" msgstr "" -#: ../../include/profile_selectors.php:19 +#: ../../include/profile_selectors.php:21 msgid "Nonsexual" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Single" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Lonely" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Available" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Unavailable" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Has crush" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Infatuated" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Dating" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Unfaithful" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Sex Addict" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Friends" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Friends/Benefits" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Casual" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Engaged" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Married" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Imaginarily married" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Partners" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Cohabiting" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Common law" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Happy" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Not looking" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Swinger" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Betrayed" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Separated" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Unstable" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Divorced" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Imaginarily divorced" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Widowed" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Uncertain" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "It's complicated" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Don't care" msgstr "" -#: ../../include/profile_selectors.php:33 +#: ../../include/profile_selectors.php:37 msgid "Ask me" msgstr "" @@ -6097,7 +6252,7 @@ msgstr "" msgid "Contacts not in any group" msgstr "" -#: ../../include/nav.php:46 ../../boot.php:795 +#: ../../include/nav.php:46 ../../boot.php:804 msgid "Logout" msgstr "" @@ -6105,7 +6260,7 @@ msgstr "" msgid "End this session" msgstr "" -#: ../../include/nav.php:49 ../../boot.php:1463 +#: ../../include/nav.php:49 ../../boot.php:1472 msgid "Status" msgstr "" @@ -6185,11 +6340,11 @@ msgstr "" msgid "Manage other pages" msgstr "" -#: ../../include/nav.php:138 ../../boot.php:1043 +#: ../../include/nav.php:138 ../../boot.php:1052 msgid "Profiles" msgstr "" -#: ../../include/nav.php:138 ../../boot.php:1043 +#: ../../include/nav.php:138 ../../boot.php:1052 msgid "Manage/edit profiles" msgstr "" @@ -6355,7 +6510,7 @@ msgstr "" msgid "%1$d %2$s ago" msgstr "" -#: ../../include/poller.php:543 +#: ../../include/onepoll.php:402 msgid "From: " msgstr "" @@ -6576,11 +6731,11 @@ msgstr "" msgid "Please visit %s to approve or reject the suggestion." msgstr "" -#: ../../include/items.php:2698 +#: ../../include/items.php:2714 msgid "A new person is sharing with you at " msgstr "" -#: ../../include/items.php:2698 +#: ../../include/items.php:2714 msgid "You have a new follower at " msgstr "" @@ -6611,33 +6766,33 @@ msgid "" "form has been opened for too long (>3 hours) before submitting it." msgstr "" -#: ../../include/Contact.php:96 +#: ../../include/Contact.php:111 msgid "stopped following" msgstr "" -#: ../../include/Contact.php:188 ../../include/conversation.php:817 +#: ../../include/Contact.php:203 ../../include/conversation.php:817 msgid "View Status" msgstr "" -#: ../../include/Contact.php:189 ../../include/conversation.php:818 +#: ../../include/Contact.php:204 ../../include/conversation.php:818 msgid "View Profile" msgstr "" -#: ../../include/Contact.php:190 ../../include/conversation.php:819 +#: ../../include/Contact.php:205 ../../include/conversation.php:819 msgid "View Photos" msgstr "" -#: ../../include/Contact.php:191 ../../include/Contact.php:204 +#: ../../include/Contact.php:206 ../../include/Contact.php:219 #: ../../include/conversation.php:820 msgid "Network Posts" msgstr "" -#: ../../include/Contact.php:192 ../../include/Contact.php:204 +#: ../../include/Contact.php:207 ../../include/Contact.php:219 #: ../../include/conversation.php:821 msgid "Edit Contact" msgstr "" -#: ../../include/Contact.php:193 ../../include/Contact.php:204 +#: ../../include/Contact.php:208 ../../include/Contact.php:219 #: ../../include/conversation.php:822 msgid "Send PM" msgstr "" @@ -6864,70 +7019,96 @@ msgstr "" msgid "permissions" msgstr "" -#: ../../boot.php:494 +#: ../../boot.php:505 msgid "Delete this item?" msgstr "" -#: ../../boot.php:497 +#: ../../boot.php:508 msgid "show fewer" msgstr "" -#: ../../boot.php:774 +#: ../../boot.php:681 +#, php-format +msgid "Update %s failed. See error logs." +msgstr "" + +#: ../../boot.php:683 +#, php-format +msgid "Update Error at %s" +msgstr "" + +#: ../../boot.php:783 msgid "Create a New Account" msgstr "" -#: ../../boot.php:798 +#: ../../boot.php:807 msgid "Nickname or Email address: " msgstr "" -#: ../../boot.php:799 +#: ../../boot.php:808 msgid "Password: " msgstr "" -#: ../../boot.php:802 +#: ../../boot.php:811 msgid "Or login using OpenID: " msgstr "" -#: ../../boot.php:808 +#: ../../boot.php:817 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:975 +#: ../../boot.php:984 msgid "Edit profile" msgstr "" -#: ../../boot.php:1035 +#: ../../boot.php:1044 msgid "Message" msgstr "" -#: ../../boot.php:1151 ../../boot.php:1227 +#: ../../boot.php:1160 ../../boot.php:1236 msgid "g A l F d" msgstr "" -#: ../../boot.php:1152 ../../boot.php:1228 +#: ../../boot.php:1161 ../../boot.php:1237 msgid "F d" msgstr "" -#: ../../boot.php:1197 ../../boot.php:1268 +#: ../../boot.php:1206 ../../boot.php:1277 msgid "[today]" msgstr "" -#: ../../boot.php:1209 +#: ../../boot.php:1218 msgid "Birthday Reminders" msgstr "" -#: ../../boot.php:1210 +#: ../../boot.php:1219 msgid "Birthdays this week:" msgstr "" -#: ../../boot.php:1261 +#: ../../boot.php:1270 msgid "[No description]" msgstr "" -#: ../../boot.php:1279 +#: ../../boot.php:1288 msgid "Event Reminders" msgstr "" -#: ../../boot.php:1280 +#: ../../boot.php:1289 msgid "Events this week:" msgstr "" + +#: ../../boot.php:1475 +msgid "Status Messages and Posts" +msgstr "" + +#: ../../boot.php:1481 +msgid "Profile Details" +msgstr "" + +#: ../../boot.php:1496 +msgid "Events and Calendar" +msgstr "" + +#: ../../boot.php:1502 +msgid "Only You Can See This" +msgstr "" diff --git a/view/admin_aside.tpl b/view/admin_aside.tpl index 4bf7ce9d3..f25a1eb4b 100644 --- a/view/admin_aside.tpl +++ b/view/admin_aside.tpl @@ -16,10 +16,12 @@ + diff --git a/view/admin_site.tpl b/view/admin_site.tpl index 2b9db9f35..852a2c0bf 100644 --- a/view/admin_site.tpl +++ b/view/admin_site.tpl @@ -80,6 +80,7 @@ {{ inc field_input.tpl with $field=$proxy }}{{ endinc }} {{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }} {{ inc field_input.tpl with $field=$timeout }}{{ endinc }} + {{ inc field_input.tpl with $field=$delivery_interval }}{{ endinc }} {{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }}
diff --git a/view/common_tabs.tpl b/view/common_tabs.tpl index 146ad29fa..22c33d6b1 100644 --- a/view/common_tabs.tpl +++ b/view/common_tabs.tpl @@ -1,5 +1,5 @@ diff --git a/view/de/follow_notify_eml.tpl b/view/de/follow_notify_eml.tpl index d7259a240..a866a08a2 100644 --- a/view/de/follow_notify_eml.tpl +++ b/view/de/follow_notify_eml.tpl @@ -1,15 +1,14 @@ -Hallo $myname, +Hallo $[myname], -'$requestor' folgt dir jetzt auf $sitename. +Du hast einen neuen Anhänger auf $[sitename] - '$[requestor]'. -Du kannst das Profil unter $url abrufen. +Du kannst das Profil unter $[url] besuchen. -Bitte melde dich auf deiner Seite an um die Anfrage zu bestätigen, abzulehnen -oder zu ignorieren. +Bitte melde dich an um die Anfrage zu bestätigen oder sie zu ignorieren bzw. abzulehnen. -$siteurl +$[siteurl] -Grüße, - $sitename Administrator +beste Grüße, + $[sitename] Administrator \ No newline at end of file diff --git a/view/de/messages.po b/view/de/messages.po index 8dc3ec615..4082c70c2 100644 --- a/view/de/messages.po +++ b/view/de/messages.po @@ -19,8 +19,8 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" -"POT-Creation-Date: 2012-04-22 10:00-0700\n" -"PO-Revision-Date: 2012-04-23 18:48+0000\n" +"POT-Creation-Date: 2012-04-28 10:00-0700\n" +"PO-Revision-Date: 2012-04-30 06:31+0000\n" "Last-Translator: bavatar \n" "Language-Team: German (http://www.transifex.net/projects/p/friendica/language/de/)\n" "MIME-Version: 1.0\n" @@ -51,8 +51,8 @@ msgstr "Konnte den Kontakt nicht aktualisieren." #: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:865 #: ../../mod/editpost.php:10 ../../mod/install.php:171 #: ../../mod/notifications.php:66 ../../mod/contacts.php:125 -#: ../../mod/settings.php:99 ../../mod/settings.php:514 -#: ../../mod/settings.php:519 ../../mod/manage.php:86 ../../mod/network.php:6 +#: ../../mod/settings.php:104 ../../mod/settings.php:519 +#: ../../mod/settings.php:524 ../../mod/manage.php:86 ../../mod/network.php:6 #: ../../mod/notes.php:20 ../../mod/wallmessage.php:9 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33 @@ -62,7 +62,7 @@ msgstr "Konnte den Kontakt nicht aktualisieren." #: ../../mod/profile_photo.php:139 ../../mod/profile_photo.php:150 #: ../../mod/profile_photo.php:163 ../../mod/message.php:38 #: ../../mod/message.php:90 ../../mod/allfriends.php:9 -#: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:46 +#: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:53 #: ../../mod/follow.php:8 ../../mod/common.php:9 ../../mod/display.php:138 #: ../../mod/profiles.php:7 ../../mod/profiles.php:329 #: ../../mod/delegate.php:6 ../../mod/suggest.php:28 ../../mod/invite.php:13 @@ -97,8 +97,8 @@ msgstr "Bitte nutze den Zurück-Button deines Browsers jetzt, w msgid "Return to contact editor" msgstr "Zurück zum Kontakteditor" -#: ../../mod/crepair.php:148 ../../mod/settings.php:534 -#: ../../mod/settings.php:560 ../../mod/admin.php:573 ../../mod/admin.php:582 +#: ../../mod/crepair.php:148 ../../mod/settings.php:539 +#: ../../mod/settings.php:565 ../../mod/admin.php:575 ../../mod/admin.php:584 msgid "Name" msgstr "Name" @@ -139,19 +139,19 @@ msgstr "Neues Foto von dieser URL" #: ../../mod/photos.php:1193 ../../mod/photos.php:1233 #: ../../mod/photos.php:1273 ../../mod/photos.php:1304 #: ../../mod/install.php:251 ../../mod/install.php:289 -#: ../../mod/localtime.php:45 ../../mod/contacts.php:325 -#: ../../mod/settings.php:532 ../../mod/settings.php:678 -#: ../../mod/settings.php:739 ../../mod/settings.php:930 -#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:392 -#: ../../mod/admin.php:570 ../../mod/admin.php:706 ../../mod/admin.php:905 -#: ../../mod/admin.php:993 ../../mod/profiles.php:498 ../../mod/invite.php:119 +#: ../../mod/localtime.php:45 ../../mod/contacts.php:318 +#: ../../mod/settings.php:537 ../../mod/settings.php:683 +#: ../../mod/settings.php:744 ../../mod/settings.php:935 +#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:393 +#: ../../mod/admin.php:572 ../../mod/admin.php:708 ../../mod/admin.php:907 +#: ../../mod/admin.php:995 ../../mod/profiles.php:498 ../../mod/invite.php:119 #: ../../addon/facebook/facebook.php:574 ../../addon/yourls/yourls.php:76 #: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:57 #: ../../addon/planets/planets.php:158 #: ../../addon/uhremotestorage/uhremotestorage.php:89 #: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93 #: ../../addon/drpost/drpost.php:110 ../../addon/geonames/geonames.php:187 -#: ../../addon/oembed.old/oembed.php:41 ../../addon/impressum/impressum.php:80 +#: ../../addon/oembed.old/oembed.php:41 ../../addon/impressum/impressum.php:82 #: ../../addon/blockem/blockem.php:57 ../../addon/qcomment/qcomment.php:61 #: ../../addon/openstreetmap/openstreetmap.php:70 #: ../../addon/mathjax/mathjax.php:42 ../../addon/editplain/editplain.php:84 @@ -170,14 +170,10 @@ msgstr "Neues Foto von dieser URL" #: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:375 #: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102 #: ../../addon/posterous/posterous.php:90 -#: ../../view/theme/diabook/diabook-green/config.php:76 -#: ../../view/theme/diabook/diabook-red/config.php:76 -#: ../../view/theme/diabook/diabook-blue/config.php:76 -#: ../../view/theme/diabook/diabook-dark/config.php:76 -#: ../../view/theme/diabook/diabook-aerith/config.php:76 -#: ../../view/theme/diabook/diabook-pink/config.php:76 +#: ../../view/theme/cleanzero/config.php:71 #: ../../view/theme/diabook/config.php:91 -#: ../../view/theme/quattro/config.php:52 ../../include/conversation.php:555 +#: ../../view/theme/quattro/config.php:52 ../../view/theme/dispy/config.php:70 +#: ../../include/conversation.php:555 msgid "Submit" msgstr "Senden" @@ -235,15 +231,8 @@ msgstr "Veranstaltung bearbeiten" msgid "link to source" msgstr "Link zum Originalbeitrag" -#: ../../mod/events.php:296 -#: ../../view/theme/diabook/diabook-green/theme.php:233 -#: ../../view/theme/diabook/diabook-red/theme.php:231 -#: ../../view/theme/diabook/diabook-blue/theme.php:231 -#: ../../view/theme/diabook/theme.php:250 -#: ../../view/theme/diabook/diabook-dark/theme.php:233 -#: ../../view/theme/diabook/diabook-aerith/theme.php:233 -#: ../../view/theme/diabook/diabook-pink/theme.php:233 -#: ../../include/nav.php:52 ../../boot.php:1471 +#: ../../mod/events.php:296 ../../view/theme/diabook/theme.php:255 +#: ../../include/nav.php:52 ../../boot.php:1481 msgid "Events" msgstr "Veranstaltungen" @@ -302,8 +291,8 @@ msgid "Share this event" msgstr "Veranstaltung teilen" #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 -#: ../../mod/dfrn_request.php:752 ../../mod/settings.php:533 -#: ../../mod/settings.php:559 ../../addon/js_upload/js_upload.php:45 +#: ../../mod/dfrn_request.php:817 ../../mod/settings.php:538 +#: ../../mod/settings.php:564 ../../addon/js_upload/js_upload.php:45 msgid "Cancel" msgstr "Abbrechen" @@ -346,24 +335,24 @@ msgid "" " and/or create new posts for you?" msgstr "Möchtest du dieser Anwendung den Zugriff auf deine Beiträge und Kontakte, sowie das Erstellen neuer Beiträge in deinem Namen gestatten?" -#: ../../mod/api.php:105 ../../mod/dfrn_request.php:740 -#: ../../mod/settings.php:844 ../../mod/settings.php:850 -#: ../../mod/settings.php:858 ../../mod/settings.php:862 -#: ../../mod/settings.php:867 ../../mod/settings.php:873 -#: ../../mod/settings.php:879 ../../mod/settings.php:885 -#: ../../mod/settings.php:921 ../../mod/settings.php:922 -#: ../../mod/settings.php:923 ../../mod/settings.php:924 +#: ../../mod/api.php:105 ../../mod/dfrn_request.php:805 +#: ../../mod/settings.php:849 ../../mod/settings.php:855 +#: ../../mod/settings.php:863 ../../mod/settings.php:867 +#: ../../mod/settings.php:872 ../../mod/settings.php:878 +#: ../../mod/settings.php:884 ../../mod/settings.php:890 +#: ../../mod/settings.php:926 ../../mod/settings.php:927 +#: ../../mod/settings.php:928 ../../mod/settings.php:929 #: ../../mod/register.php:532 ../../mod/profiles.php:475 msgid "Yes" msgstr "Ja" -#: ../../mod/api.php:106 ../../mod/dfrn_request.php:741 -#: ../../mod/settings.php:844 ../../mod/settings.php:850 -#: ../../mod/settings.php:858 ../../mod/settings.php:862 -#: ../../mod/settings.php:867 ../../mod/settings.php:873 -#: ../../mod/settings.php:879 ../../mod/settings.php:885 -#: ../../mod/settings.php:921 ../../mod/settings.php:922 -#: ../../mod/settings.php:923 ../../mod/settings.php:924 +#: ../../mod/api.php:106 ../../mod/dfrn_request.php:806 +#: ../../mod/settings.php:849 ../../mod/settings.php:855 +#: ../../mod/settings.php:863 ../../mod/settings.php:867 +#: ../../mod/settings.php:872 ../../mod/settings.php:878 +#: ../../mod/settings.php:884 ../../mod/settings.php:890 +#: ../../mod/settings.php:926 ../../mod/settings.php:927 +#: ../../mod/settings.php:928 ../../mod/settings.php:929 #: ../../mod/register.php:533 ../../mod/profiles.php:476 msgid "No" msgstr "Nein" @@ -375,13 +364,7 @@ msgstr "Fotoalben" #: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:879 #: ../../mod/photos.php:950 ../../mod/photos.php:965 ../../mod/photos.php:1382 #: ../../mod/photos.php:1394 ../../addon/communityhome/communityhome.php:110 -#: ../../view/theme/diabook/diabook-green/theme.php:116 -#: ../../view/theme/diabook/diabook-red/theme.php:115 -#: ../../view/theme/diabook/diabook-blue/theme.php:115 -#: ../../view/theme/diabook/theme.php:130 -#: ../../view/theme/diabook/diabook-dark/theme.php:116 -#: ../../view/theme/diabook/diabook-aerith/theme.php:116 -#: ../../view/theme/diabook/diabook-pink/theme.php:116 +#: ../../view/theme/diabook/theme.php:135 msgid "Contact Photos" msgstr "Kontaktbilder" @@ -404,13 +387,7 @@ msgstr "Kontaktinformationen nicht verfügbar" #: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174 #: ../../mod/profile_photo.php:252 ../../mod/profile_photo.php:261 #: ../../addon/communityhome/communityhome.php:111 -#: ../../view/theme/diabook/diabook-green/theme.php:117 -#: ../../view/theme/diabook/diabook-red/theme.php:116 -#: ../../view/theme/diabook/diabook-blue/theme.php:116 -#: ../../view/theme/diabook/theme.php:131 -#: ../../view/theme/diabook/diabook-dark/theme.php:117 -#: ../../view/theme/diabook/diabook-aerith/theme.php:117 -#: ../../view/theme/diabook/diabook-pink/theme.php:117 +#: ../../view/theme/diabook/theme.php:136 msgid "Profile Photos" msgstr "Profilbilder" @@ -432,15 +409,9 @@ msgstr "wurde getaggt in einem" #: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70 #: ../../addon/communityhome/communityhome.php:163 -#: ../../view/theme/diabook/diabook-green/theme.php:88 -#: ../../view/theme/diabook/diabook-red/theme.php:87 -#: ../../view/theme/diabook/diabook-blue/theme.php:87 -#: ../../view/theme/diabook/theme.php:102 -#: ../../view/theme/diabook/diabook-dark/theme.php:88 -#: ../../view/theme/diabook/diabook-aerith/theme.php:88 -#: ../../view/theme/diabook/diabook-pink/theme.php:88 -#: ../../include/text.php:1304 ../../include/diaspora.php:1654 -#: ../../include/conversation.php:53 ../../include/conversation.php:126 +#: ../../view/theme/diabook/theme.php:107 ../../include/text.php:1304 +#: ../../include/diaspora.php:1654 ../../include/conversation.php:53 +#: ../../include/conversation.php:126 msgid "photo" msgstr "Foto" @@ -457,17 +428,17 @@ msgid "Image file is empty." msgstr "Bilddatei ist leer." #: ../../mod/photos.php:653 ../../mod/profile_photo.php:124 -#: ../../mod/wall_upload.php:69 +#: ../../mod/wall_upload.php:83 msgid "Unable to process image." msgstr "Konnte das Bild nicht bearbeiten." #: ../../mod/photos.php:673 ../../mod/profile_photo.php:257 -#: ../../mod/wall_upload.php:88 +#: ../../mod/wall_upload.php:102 msgid "Image upload failed." msgstr "Hochladen des Bildes gescheitert." #: ../../mod/photos.php:759 ../../mod/community.php:16 -#: ../../mod/dfrn_request.php:671 ../../mod/viewcontacts.php:17 +#: ../../mod/dfrn_request.php:731 ../../mod/viewcontacts.php:17 #: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:29 msgid "Public access denied." msgstr "Öffentlicher Zugriff verweigert." @@ -569,14 +540,14 @@ msgstr "Ich mag das (toggle)" msgid "I don't like this (toggle)" msgstr "Ich mag das nicht (toggle)" -#: ../../mod/photos.php:1213 ../../include/conversation.php:956 +#: ../../mod/photos.php:1213 ../../include/conversation.php:964 msgid "Share" msgstr "Teilen" #: ../../mod/photos.php:1214 ../../mod/editpost.php:104 #: ../../mod/wallmessage.php:145 ../../mod/message.php:188 -#: ../../mod/message.php:357 ../../include/conversation.php:361 -#: ../../include/conversation.php:698 ../../include/conversation.php:975 +#: ../../mod/message.php:380 ../../include/conversation.php:361 +#: ../../include/conversation.php:706 ../../include/conversation.php:983 msgid "Please wait" msgstr "Bitte warten" @@ -592,13 +563,13 @@ msgid "Comment" msgstr "Kommentar" #: ../../mod/photos.php:1234 ../../mod/editpost.php:125 -#: ../../include/conversation.php:556 ../../include/conversation.php:993 +#: ../../include/conversation.php:564 ../../include/conversation.php:1001 msgid "Preview" msgstr "Vorschau" -#: ../../mod/photos.php:1331 ../../mod/settings.php:595 -#: ../../mod/settings.php:676 ../../mod/group.php:168 ../../mod/admin.php:577 -#: ../../include/conversation.php:318 ../../include/conversation.php:576 +#: ../../mod/photos.php:1331 ../../mod/settings.php:600 +#: ../../mod/settings.php:681 ../../mod/group.php:168 ../../mod/admin.php:579 +#: ../../include/conversation.php:318 ../../include/conversation.php:584 msgid "Delete" msgstr "Löschen" @@ -614,19 +585,12 @@ msgstr "Neueste Fotos" msgid "Not available." msgstr "Nicht verfügbar." -#: ../../mod/community.php:30 -#: ../../view/theme/diabook/diabook-green/theme.php:235 -#: ../../view/theme/diabook/diabook-red/theme.php:233 -#: ../../view/theme/diabook/diabook-blue/theme.php:233 -#: ../../view/theme/diabook/theme.php:252 -#: ../../view/theme/diabook/diabook-dark/theme.php:235 -#: ../../view/theme/diabook/diabook-aerith/theme.php:235 -#: ../../view/theme/diabook/diabook-pink/theme.php:235 +#: ../../mod/community.php:30 ../../view/theme/diabook/theme.php:257 #: ../../include/nav.php:101 msgid "Community" msgstr "Gemeinschaft" -#: ../../mod/community.php:61 ../../mod/search.php:115 +#: ../../mod/community.php:61 ../../mod/search.php:128 msgid "No results." msgstr "Keine Ergebnisse." @@ -670,28 +634,28 @@ msgstr "Beitrag nicht gefunden" msgid "Edit post" msgstr "Beitrag bearbeiten" -#: ../../mod/editpost.php:80 ../../include/conversation.php:942 +#: ../../mod/editpost.php:80 ../../include/conversation.php:950 msgid "Post to Email" msgstr "An E-Mail senden" -#: ../../mod/editpost.php:95 ../../mod/settings.php:594 -#: ../../include/conversation.php:563 +#: ../../mod/editpost.php:95 ../../mod/settings.php:599 +#: ../../include/conversation.php:571 msgid "Edit" msgstr "Bearbeiten" #: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143 -#: ../../mod/message.php:186 ../../mod/message.php:355 -#: ../../include/conversation.php:957 +#: ../../mod/message.php:186 ../../mod/message.php:378 +#: ../../include/conversation.php:965 msgid "Upload photo" msgstr "Foto hochladen" -#: ../../mod/editpost.php:97 ../../include/conversation.php:959 +#: ../../mod/editpost.php:97 ../../include/conversation.php:967 msgid "Attach file" msgstr "Datei anhängen" #: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144 -#: ../../mod/message.php:187 ../../mod/message.php:356 -#: ../../include/conversation.php:961 +#: ../../mod/message.php:187 ../../mod/message.php:379 +#: ../../include/conversation.php:969 msgid "Insert web link" msgstr "einen Link einfügen" @@ -707,35 +671,35 @@ msgstr "Vorbis [.ogg] Video einfügen" msgid "Insert Vorbis [.ogg] audio" msgstr "Vorbis [.ogg] Audio einfügen" -#: ../../mod/editpost.php:102 ../../include/conversation.php:967 +#: ../../mod/editpost.php:102 ../../include/conversation.php:975 msgid "Set your location" msgstr "Deinen Standort festlegen" -#: ../../mod/editpost.php:103 ../../include/conversation.php:969 +#: ../../mod/editpost.php:103 ../../include/conversation.php:977 msgid "Clear browser location" msgstr "Browser-Standort leeren" -#: ../../mod/editpost.php:105 ../../include/conversation.php:976 +#: ../../mod/editpost.php:105 ../../include/conversation.php:984 msgid "Permission settings" msgstr "Berechtigungseinstellungen" -#: ../../mod/editpost.php:113 ../../include/conversation.php:985 +#: ../../mod/editpost.php:113 ../../include/conversation.php:993 msgid "CC: email addresses" msgstr "Cc:-E-Mail-Addressen" -#: ../../mod/editpost.php:114 ../../include/conversation.php:986 +#: ../../mod/editpost.php:114 ../../include/conversation.php:994 msgid "Public post" msgstr "Öffentlicher Beitrag" -#: ../../mod/editpost.php:117 ../../include/conversation.php:972 +#: ../../mod/editpost.php:117 ../../include/conversation.php:980 msgid "Set title" msgstr "Titel setzen" -#: ../../mod/editpost.php:119 ../../include/conversation.php:974 +#: ../../mod/editpost.php:119 ../../include/conversation.php:982 msgid "Categories (comma-separated list)" -msgstr "Kategorien (mit Komma separierte Liste)" +msgstr "Kategorien (kommasepariert)" -#: ../../mod/editpost.php:120 ../../include/conversation.php:988 +#: ../../mod/editpost.php:120 ../../include/conversation.php:996 msgid "Example: bob@example.com, mary@example.com" msgstr "Z.B.: bob@example.com, mary@example.com" @@ -743,19 +707,19 @@ msgstr "Z.B.: bob@example.com, mary@example.com" msgid "This introduction has already been accepted." msgstr "Diese Kontaktanfrage wurde bereits akzeptiert." -#: ../../mod/dfrn_request.php:117 ../../mod/dfrn_request.php:427 +#: ../../mod/dfrn_request.php:117 ../../mod/dfrn_request.php:487 msgid "Profile location is not valid or does not contain profile information." msgstr "Profiladresse ist ungültig oder stellt einige Profildaten nicht zur Verfügung." -#: ../../mod/dfrn_request.php:122 ../../mod/dfrn_request.php:432 +#: ../../mod/dfrn_request.php:122 ../../mod/dfrn_request.php:492 msgid "Warning: profile location has no identifiable owner name." msgstr "Warnung: Es konnte kein Name des Besitzers von der angegebenen Profiladresse gefunden werden." -#: ../../mod/dfrn_request.php:124 ../../mod/dfrn_request.php:434 +#: ../../mod/dfrn_request.php:124 ../../mod/dfrn_request.php:494 msgid "Warning: profile location has no profile photo." msgstr "Warnung: Es konnte kein Profilbild bei der angegebenen Profiladresse gefunden werden." -#: ../../mod/dfrn_request.php:127 ../../mod/dfrn_request.php:437 +#: ../../mod/dfrn_request.php:127 ../../mod/dfrn_request.php:497 #, php-format msgid "%d required parameter was not found at the given location" msgid_plural "%d required parameters were not found at the given location" @@ -799,128 +763,128 @@ msgstr "Ungültige E-Mail Adresse." msgid "This account has not been configured for email. Request failed." msgstr "Dieses Konto ist nicht für Email konfiguriert. Anfrage fehlgeschlagen." -#: ../../mod/dfrn_request.php:372 +#: ../../mod/dfrn_request.php:432 msgid "Unable to resolve your name at the provided location." msgstr "Konnte deinen Namen an der angegebenen Stelle nicht finden." -#: ../../mod/dfrn_request.php:385 +#: ../../mod/dfrn_request.php:445 msgid "You have already introduced yourself here." msgstr "Du hast dich hier bereits vorgestellt." -#: ../../mod/dfrn_request.php:389 +#: ../../mod/dfrn_request.php:449 #, php-format msgid "Apparently you are already friends with %s." msgstr "Es scheint so, als ob du bereits mit %s befreundet bist." -#: ../../mod/dfrn_request.php:410 +#: ../../mod/dfrn_request.php:470 msgid "Invalid profile URL." msgstr "Ungültige Profil-URL." -#: ../../mod/dfrn_request.php:416 ../../mod/follow.php:20 +#: ../../mod/dfrn_request.php:476 ../../mod/follow.php:20 msgid "Disallowed profile URL." msgstr "Nicht erlaubte Profil-URL." -#: ../../mod/dfrn_request.php:485 ../../mod/contacts.php:102 +#: ../../mod/dfrn_request.php:545 ../../mod/contacts.php:102 msgid "Failed to update contact record." msgstr "Aktualisierung der Kontaktdaten fehlgeschlagen." -#: ../../mod/dfrn_request.php:506 +#: ../../mod/dfrn_request.php:566 msgid "Your introduction has been sent." msgstr "Deine Kontaktanfrage wurde gesendet." -#: ../../mod/dfrn_request.php:559 +#: ../../mod/dfrn_request.php:619 msgid "Please login to confirm introduction." msgstr "Bitte melde dich an, um die Kontaktanfrage zu bestätigen." -#: ../../mod/dfrn_request.php:573 +#: ../../mod/dfrn_request.php:633 msgid "" "Incorrect identity currently logged in. Please login to " "this profile." msgstr "Momentan bist du mit einer anderen Identität angemeldet. Bitte melde Dich mit diesem Profil an." -#: ../../mod/dfrn_request.php:585 +#: ../../mod/dfrn_request.php:645 #, php-format msgid "Welcome home %s." msgstr "Willkommen zurück %s." -#: ../../mod/dfrn_request.php:586 +#: ../../mod/dfrn_request.php:646 #, php-format msgid "Please confirm your introduction/connection request to %s." msgstr "Bitte bestätige deine Kontaktanfrage bei %s." -#: ../../mod/dfrn_request.php:587 +#: ../../mod/dfrn_request.php:647 msgid "Confirm" msgstr "Bestätigen" -#: ../../mod/dfrn_request.php:628 ../../include/items.php:2691 +#: ../../mod/dfrn_request.php:688 ../../include/items.php:2691 msgid "[Name Withheld]" msgstr "[Name unterdrückt]" -#: ../../mod/dfrn_request.php:715 +#: ../../mod/dfrn_request.php:780 msgid "" "Please enter your 'Identity Address' from one of the following supported " "communications networks:" msgstr "Bitte gib die Adresse deines Profils in einem der unterstützten sozialen Netzwerke an:" -#: ../../mod/dfrn_request.php:731 +#: ../../mod/dfrn_request.php:796 msgid "Connect as an email follower (Coming soon)" msgstr "Als E-Mail-Kontakt verbinden (In Kürze verfügbar)" -#: ../../mod/dfrn_request.php:733 +#: ../../mod/dfrn_request.php:798 msgid "" "If you are not yet a member of the free social web, follow this link to find a public" " Friendica site and join us today." msgstr "Wenn du noch kein Mitglied dieses freien sozialen Netzwerks bist, folge diesem Link um einen öffentlichen Friendica-Server zu finden und beizutreten." -#: ../../mod/dfrn_request.php:736 +#: ../../mod/dfrn_request.php:801 msgid "Friend/Connection Request" msgstr "Freundschafts-/Kontaktanfrage" -#: ../../mod/dfrn_request.php:737 +#: ../../mod/dfrn_request.php:802 msgid "" "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, " "testuser@identi.ca" msgstr "Beispiele: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca" -#: ../../mod/dfrn_request.php:738 +#: ../../mod/dfrn_request.php:803 msgid "Please answer the following:" msgstr "Bitte beantworte Folgendes:" -#: ../../mod/dfrn_request.php:739 +#: ../../mod/dfrn_request.php:804 #, php-format msgid "Does %s know you?" msgstr "Kennt %s dich?" -#: ../../mod/dfrn_request.php:742 +#: ../../mod/dfrn_request.php:807 msgid "Add a personal note:" msgstr "Eine persönliche Notiz beifügen:" -#: ../../mod/dfrn_request.php:744 ../../include/contact_selectors.php:76 +#: ../../mod/dfrn_request.php:809 ../../include/contact_selectors.php:76 msgid "Friendica" msgstr "Friendica" -#: ../../mod/dfrn_request.php:745 +#: ../../mod/dfrn_request.php:810 msgid "StatusNet/Federated Social Web" msgstr "StatusNet/Federated Social Web" -#: ../../mod/dfrn_request.php:746 ../../mod/settings.php:629 +#: ../../mod/dfrn_request.php:811 ../../mod/settings.php:634 #: ../../include/contact_selectors.php:80 msgid "Diaspora" msgstr "Diaspora" -#: ../../mod/dfrn_request.php:747 +#: ../../mod/dfrn_request.php:812 #, php-format msgid "" " - please do not use this form. Instead, enter %s into your Diaspora search" " bar." msgstr " - bitte verwende dieses Formular nicht. Stattdessen suche nach %s in deiner Diaspora Suchleiste." -#: ../../mod/dfrn_request.php:748 +#: ../../mod/dfrn_request.php:813 msgid "Your Identity Address:" msgstr "Adresse deines Profils:" -#: ../../mod/dfrn_request.php:751 +#: ../../mod/dfrn_request.php:816 msgid "Submit Request" msgstr "Anfrage abschicken" @@ -1247,8 +1211,8 @@ msgid "Discard" msgstr "Verwerfen" #: ../../mod/notifications.php:51 ../../mod/notifications.php:160 -#: ../../mod/notifications.php:206 ../../mod/contacts.php:308 -#: ../../mod/contacts.php:351 +#: ../../mod/notifications.php:206 ../../mod/contacts.php:295 +#: ../../mod/contacts.php:344 msgid "Ignore" msgstr "Ignorieren" @@ -1264,14 +1228,7 @@ msgstr "Netzwerk" msgid "Personal" msgstr "Persönlich" -#: ../../mod/notifications.php:90 -#: ../../view/theme/diabook/diabook-green/theme.php:229 -#: ../../view/theme/diabook/diabook-red/theme.php:227 -#: ../../view/theme/diabook/diabook-blue/theme.php:227 -#: ../../view/theme/diabook/theme.php:246 -#: ../../view/theme/diabook/diabook-dark/theme.php:229 -#: ../../view/theme/diabook/diabook-aerith/theme.php:229 -#: ../../view/theme/diabook/diabook-pink/theme.php:229 +#: ../../mod/notifications.php:90 ../../view/theme/diabook/theme.php:251 #: ../../include/nav.php:77 ../../include/nav.php:115 msgid "Home" msgstr "Pinnwand" @@ -1307,7 +1264,7 @@ msgid "suggested by %s" msgstr "vorgeschlagen von %s" #: ../../mod/notifications.php:153 ../../mod/notifications.php:200 -#: ../../mod/contacts.php:356 +#: ../../mod/contacts.php:350 msgid "Hide this contact from others" msgstr "Verberge diesen Kontakt vor anderen" @@ -1320,7 +1277,7 @@ msgid "if applicable" msgstr "falls anwendbar" #: ../../mod/notifications.php:157 ../../mod/notifications.php:204 -#: ../../mod/admin.php:575 +#: ../../mod/admin.php:577 msgid "Approve" msgstr "Genehmigen" @@ -1457,218 +1414,231 @@ msgstr "Kontakt wurde ignoriert" msgid "Contact has been unignored" msgstr "Kontakt wird nicht mehr ignoriert" -#: ../../mod/contacts.php:200 -msgid "stopped following" -msgstr "wird nicht mehr gefolgt" +#: ../../mod/contacts.php:195 +msgid "Contact has been archived" +msgstr "Kontakt wurde archiviert" -#: ../../mod/contacts.php:221 +#: ../../mod/contacts.php:195 +msgid "Contact has been unarchived" +msgstr "Kontakt wurde aus dem Archiv geholt" + +#: ../../mod/contacts.php:208 msgid "Contact has been removed." msgstr "Kontakt wurde entfernt." -#: ../../mod/contacts.php:251 +#: ../../mod/contacts.php:238 #, php-format msgid "You are mutual friends with %s" msgstr "Du hast mit %s eine beidseitige Freundschaft" -#: ../../mod/contacts.php:255 +#: ../../mod/contacts.php:242 #, php-format msgid "You are sharing with %s" msgstr "Du teilst mit %s" -#: ../../mod/contacts.php:260 +#: ../../mod/contacts.php:247 #, php-format msgid "%s is sharing with you" msgstr "%s teilt mit Dir" -#: ../../mod/contacts.php:277 +#: ../../mod/contacts.php:264 msgid "Private communications are not available for this contact." msgstr "Private Kommunikation ist für diesen Kontakt nicht verfügbar." -#: ../../mod/contacts.php:280 +#: ../../mod/contacts.php:267 msgid "Never" msgstr "Niemals" -#: ../../mod/contacts.php:284 +#: ../../mod/contacts.php:271 msgid "(Update was successful)" msgstr "(Aktualisierung war erfolgreich)" -#: ../../mod/contacts.php:284 +#: ../../mod/contacts.php:271 msgid "(Update was not successful)" msgstr "(Aktualisierung war nicht erfolgreich)" -#: ../../mod/contacts.php:286 +#: ../../mod/contacts.php:273 msgid "Suggest friends" msgstr "Kontakte vorschlagen" -#: ../../mod/contacts.php:290 +#: ../../mod/contacts.php:277 #, php-format msgid "Network type: %s" msgstr "Netzwerk Typ: %s" -#: ../../mod/contacts.php:293 +#: ../../mod/contacts.php:280 #, php-format msgid "%d contact in common" msgid_plural "%d contacts in common" msgstr[0] "%d gemeinsamer Kontakt" msgstr[1] "%d gemeinsame Kontakte" -#: ../../mod/contacts.php:298 +#: ../../mod/contacts.php:285 msgid "View all contacts" msgstr "Alle Kontakte anzeigen" -#: ../../mod/contacts.php:303 ../../mod/contacts.php:350 -#: ../../mod/admin.php:579 +#: ../../mod/contacts.php:290 ../../mod/contacts.php:343 +#: ../../mod/admin.php:581 msgid "Unblock" msgstr "Entsperren" -#: ../../mod/contacts.php:303 ../../mod/contacts.php:350 -#: ../../mod/admin.php:578 +#: ../../mod/contacts.php:290 ../../mod/contacts.php:343 +#: ../../mod/admin.php:580 msgid "Block" msgstr "Sperren" -#: ../../mod/contacts.php:308 ../../mod/contacts.php:351 +#: ../../mod/contacts.php:295 ../../mod/contacts.php:344 msgid "Unignore" msgstr "Ignorieren aufheben" -#: ../../mod/contacts.php:313 +#: ../../mod/contacts.php:301 +msgid "Unarchive" +msgstr "Unarchivieren" + +#: ../../mod/contacts.php:301 +msgid "Archive" +msgstr "Archivieren" + +#: ../../mod/contacts.php:306 msgid "Repair" msgstr "Reparieren" -#: ../../mod/contacts.php:323 +#: ../../mod/contacts.php:316 msgid "Contact Editor" msgstr "Kontakt Editor" -#: ../../mod/contacts.php:326 +#: ../../mod/contacts.php:319 msgid "Profile Visibility" msgstr "Profil Anzeige" -#: ../../mod/contacts.php:327 +#: ../../mod/contacts.php:320 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "Bitte wähle eines deiner Profile das angezeigt werden soll, wenn %s dein Profil aufruft." -#: ../../mod/contacts.php:328 +#: ../../mod/contacts.php:321 msgid "Contact Information / Notes" msgstr "Kontakt Informationen / Notizen" -#: ../../mod/contacts.php:329 +#: ../../mod/contacts.php:322 msgid "Edit contact notes" msgstr "Notizen zum Kontakt bearbiten" -#: ../../mod/contacts.php:334 ../../mod/contacts.php:507 +#: ../../mod/contacts.php:327 ../../mod/contacts.php:511 #: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40 #, php-format msgid "Visit %s's profile [%s]" msgstr "Besuche %ss Profil [%s]" -#: ../../mod/contacts.php:335 +#: ../../mod/contacts.php:328 msgid "Block/Unblock contact" msgstr "Kontakt blockieren/freischalten" -#: ../../mod/contacts.php:336 +#: ../../mod/contacts.php:329 msgid "Ignore contact" msgstr "Ignoriere den Kontakt" -#: ../../mod/contacts.php:337 +#: ../../mod/contacts.php:330 msgid "Repair URL settings" msgstr "URL Einstellungen reparieren" -#: ../../mod/contacts.php:338 +#: ../../mod/contacts.php:331 msgid "View conversations" msgstr "Unterhaltungen anzeigen" -#: ../../mod/contacts.php:340 +#: ../../mod/contacts.php:333 msgid "Delete contact" msgstr "Lösche den Kontakt" -#: ../../mod/contacts.php:344 +#: ../../mod/contacts.php:337 msgid "Last update:" msgstr "letzte Aktualisierung:" -#: ../../mod/contacts.php:345 +#: ../../mod/contacts.php:338 msgid "Update public posts" msgstr "Öffentliche Beiträge aktualisieren" -#: ../../mod/contacts.php:347 ../../mod/admin.php:1051 +#: ../../mod/contacts.php:340 ../../mod/admin.php:1053 msgid "Update now" msgstr "Jetzt aktualisieren" -#: ../../mod/contacts.php:354 +#: ../../mod/contacts.php:347 msgid "Currently blocked" msgstr "Derzeit geblockt" -#: ../../mod/contacts.php:355 +#: ../../mod/contacts.php:348 msgid "Currently ignored" msgstr "Derzeit ignoriert" -#: ../../mod/contacts.php:356 +#: ../../mod/contacts.php:349 +msgid "Currently archived" +msgstr "Momentan archiviert" + +#: ../../mod/contacts.php:350 msgid "" "Replies/likes to your public posts may still be visible" msgstr "Antworten/Likes auf deine öffentlichen Beiträge könnten weiterhin sichtbar sein" -#: ../../mod/contacts.php:405 +#: ../../mod/contacts.php:403 msgid "Suggestions" msgstr "Kontaktvorschläge" -#: ../../mod/contacts.php:410 ../../mod/group.php:191 +#: ../../mod/contacts.php:408 ../../mod/group.php:191 msgid "All Contacts" msgstr "Alle Kontakte" -#: ../../mod/contacts.php:415 -msgid "Unblocked Contacts" -msgstr "Nicht blockierte Kontakte" +#: ../../mod/contacts.php:413 +msgid "Unblocked" +msgstr "Ungeblockt" -#: ../../mod/contacts.php:421 -msgid "Blocked Contacts" -msgstr "Blockierte Kontakte" +#: ../../mod/contacts.php:419 +msgid "Blocked" +msgstr "Geblockt" -#: ../../mod/contacts.php:427 -msgid "Ignored Contacts" -msgstr "Ignorierte Kontakte" +#: ../../mod/contacts.php:425 +msgid "Ignored" +msgstr "Ignoriert" -#: ../../mod/contacts.php:433 -msgid "Hidden Contacts" -msgstr "Verborgene Kontakte" +#: ../../mod/contacts.php:431 +msgid "Archived" +msgstr "Archiviert" -#: ../../mod/contacts.php:483 +#: ../../mod/contacts.php:437 +msgid "Hidden" +msgstr "Verborgen" + +#: ../../mod/contacts.php:487 msgid "Mutual Friendship" msgstr "Beidseitige Freundschaft" -#: ../../mod/contacts.php:487 +#: ../../mod/contacts.php:491 msgid "is a fan of yours" msgstr "ist ein Fan von dir" -#: ../../mod/contacts.php:491 +#: ../../mod/contacts.php:495 msgid "you are a fan of" msgstr "du bist Fan von" -#: ../../mod/contacts.php:508 ../../mod/nogroup.php:41 +#: ../../mod/contacts.php:512 ../../mod/nogroup.php:41 msgid "Edit contact" msgstr "Kontakt bearbeiten" -#: ../../mod/contacts.php:529 -#: ../../view/theme/diabook/diabook-green/theme.php:231 -#: ../../view/theme/diabook/diabook-red/theme.php:229 -#: ../../view/theme/diabook/diabook-blue/theme.php:229 -#: ../../view/theme/diabook/theme.php:248 -#: ../../view/theme/diabook/diabook-dark/theme.php:231 -#: ../../view/theme/diabook/diabook-aerith/theme.php:231 -#: ../../view/theme/diabook/diabook-pink/theme.php:231 +#: ../../mod/contacts.php:533 ../../view/theme/diabook/theme.php:253 #: ../../include/nav.php:139 msgid "Contacts" msgstr "Kontakte" -#: ../../mod/contacts.php:533 +#: ../../mod/contacts.php:537 msgid "Search your contacts" msgstr "Suche in deinen Kontakten" -#: ../../mod/contacts.php:534 ../../mod/directory.php:57 +#: ../../mod/contacts.php:538 ../../mod/directory.php:57 msgid "Finding: " msgstr "Funde: " -#: ../../mod/contacts.php:535 ../../mod/directory.php:59 +#: ../../mod/contacts.php:539 ../../mod/directory.php:59 #: ../../include/contact_widgets.php:33 msgid "Find" msgstr "Finde" @@ -1690,7 +1660,7 @@ msgstr "Anfrage zum Zurücksetzen des Passworts auf %s erhalten" #: ../../mod/register.php:388 ../../mod/register.php:442 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:732 #: ../../addon/facebook/facebook.php:650 -#: ../../addon/facebook/facebook.php:1136 +#: ../../addon/facebook/facebook.php:1139 #: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2700 msgid "Administrator" msgstr "Administrator" @@ -1769,468 +1739,472 @@ msgstr "Verbundene Programme" msgid "Export personal data" msgstr "Persönliche Daten exportieren" -#: ../../mod/settings.php:83 ../../mod/admin.php:665 ../../mod/admin.php:870 +#: ../../mod/settings.php:80 +msgid "Remove account" +msgstr "Account entfernen" + +#: ../../mod/settings.php:88 ../../mod/admin.php:667 ../../mod/admin.php:872 #: ../../addon/mathjax/mathjax.php:36 ../../include/nav.php:137 msgid "Settings" msgstr "Einstellungen" -#: ../../mod/settings.php:126 +#: ../../mod/settings.php:131 msgid "Missing some important data!" msgstr "Wichtige Daten fehlen!" -#: ../../mod/settings.php:129 ../../mod/settings.php:558 +#: ../../mod/settings.php:134 ../../mod/settings.php:563 #: ../../mod/admin.php:97 msgid "Update" msgstr "Aktualisierungen" -#: ../../mod/settings.php:234 +#: ../../mod/settings.php:239 msgid "Failed to connect with email account using the settings provided." msgstr "Konnte das Email Konto mit den angegebenen Einstellungen nicht erreichen." -#: ../../mod/settings.php:239 +#: ../../mod/settings.php:244 msgid "Email settings updated." msgstr "EMail Einstellungen bearbeitet." -#: ../../mod/settings.php:298 +#: ../../mod/settings.php:303 msgid "Passwords do not match. Password unchanged." msgstr "Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert." -#: ../../mod/settings.php:303 +#: ../../mod/settings.php:308 msgid "Empty passwords are not allowed. Password unchanged." msgstr "Leere Passwörter sind nicht erlaubt. Passwort bleibt unverändert." -#: ../../mod/settings.php:314 +#: ../../mod/settings.php:319 msgid "Password changed." msgstr "Passwort ändern." -#: ../../mod/settings.php:316 +#: ../../mod/settings.php:321 msgid "Password update failed. Please try again." msgstr "Aktualisierung des Passworts gescheitert, bitte versuche es noch einmal." -#: ../../mod/settings.php:379 +#: ../../mod/settings.php:384 msgid " Please use a shorter name." msgstr " Bitte verwende einen kürzeren Namen." -#: ../../mod/settings.php:381 +#: ../../mod/settings.php:386 msgid " Name too short." msgstr " Name ist zu kurz." -#: ../../mod/settings.php:387 +#: ../../mod/settings.php:392 msgid " Not valid email." msgstr " Keine gültige E-Mail." -#: ../../mod/settings.php:389 +#: ../../mod/settings.php:394 msgid " Cannot change to that email." msgstr "Ändern der E-Mail nicht möglich. " -#: ../../mod/settings.php:461 ../../addon/facebook/facebook.php:469 -#: ../../addon/impressum/impressum.php:75 +#: ../../mod/settings.php:466 ../../addon/facebook/facebook.php:469 +#: ../../addon/impressum/impressum.php:77 #: ../../addon/openstreetmap/openstreetmap.php:80 #: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105 #: ../../addon/twitter/twitter.php:370 msgid "Settings updated." msgstr "Einstellungen aktualisiert." -#: ../../mod/settings.php:531 ../../mod/settings.php:557 -#: ../../mod/settings.php:593 +#: ../../mod/settings.php:536 ../../mod/settings.php:562 +#: ../../mod/settings.php:598 msgid "Add application" msgstr "Programm hinzufügen" -#: ../../mod/settings.php:535 ../../mod/settings.php:561 +#: ../../mod/settings.php:540 ../../mod/settings.php:566 #: ../../addon/statusnet/statusnet.php:547 msgid "Consumer Key" msgstr "Consumer Key" -#: ../../mod/settings.php:536 ../../mod/settings.php:562 +#: ../../mod/settings.php:541 ../../mod/settings.php:567 #: ../../addon/statusnet/statusnet.php:546 msgid "Consumer Secret" msgstr "Consumer Secret" -#: ../../mod/settings.php:537 ../../mod/settings.php:563 +#: ../../mod/settings.php:542 ../../mod/settings.php:568 msgid "Redirect" msgstr "Umleiten" -#: ../../mod/settings.php:538 ../../mod/settings.php:564 +#: ../../mod/settings.php:543 ../../mod/settings.php:569 msgid "Icon url" msgstr "Icon URL" -#: ../../mod/settings.php:549 +#: ../../mod/settings.php:554 msgid "You can't edit this application." msgstr "Du kannst dieses Programm nicht bearbeiten." -#: ../../mod/settings.php:592 +#: ../../mod/settings.php:597 msgid "Connected Apps" msgstr "Verbundene Programme" -#: ../../mod/settings.php:596 +#: ../../mod/settings.php:601 msgid "Client key starts with" msgstr "Anwender Schlüssel beginnt mit" -#: ../../mod/settings.php:597 +#: ../../mod/settings.php:602 msgid "No name" msgstr "Kein Name" -#: ../../mod/settings.php:598 +#: ../../mod/settings.php:603 msgid "Remove authorization" msgstr "Autorisierung entziehen" -#: ../../mod/settings.php:609 +#: ../../mod/settings.php:614 msgid "No Plugin settings configured" msgstr "Keine Plugin-Einstellungen konfiguriert" -#: ../../mod/settings.php:617 ../../addon/widgets/widgets.php:123 +#: ../../mod/settings.php:622 ../../addon/widgets/widgets.php:123 msgid "Plugin Settings" msgstr "Plugin-Einstellungen" -#: ../../mod/settings.php:629 ../../mod/settings.php:630 +#: ../../mod/settings.php:634 ../../mod/settings.php:635 #, php-format msgid "Built-in support for %s connectivity is %s" msgstr "Eingebaute Unterstützung für Verbindungen zu %s ist %s" -#: ../../mod/settings.php:629 ../../mod/settings.php:630 +#: ../../mod/settings.php:634 ../../mod/settings.php:635 msgid "enabled" msgstr "eingeschaltet" -#: ../../mod/settings.php:629 ../../mod/settings.php:630 +#: ../../mod/settings.php:634 ../../mod/settings.php:635 msgid "disabled" msgstr "ausgeschaltet" -#: ../../mod/settings.php:630 +#: ../../mod/settings.php:635 msgid "StatusNet" msgstr "StatusNet" -#: ../../mod/settings.php:660 +#: ../../mod/settings.php:665 msgid "Connector Settings" msgstr "Verbindungs-Einstellungen" -#: ../../mod/settings.php:665 +#: ../../mod/settings.php:670 msgid "Email/Mailbox Setup" msgstr "E-Mail/Postfach-Einstellungen" -#: ../../mod/settings.php:666 +#: ../../mod/settings.php:671 msgid "" "If you wish to communicate with email contacts using this service " "(optional), please specify how to connect to your mailbox." msgstr "Wenn du mit E-Mail-Kontakten über diesen Service kommunizieren möchtest (optional), gib bitte die Einstellungen für dein Postfach an." -#: ../../mod/settings.php:667 +#: ../../mod/settings.php:672 msgid "Last successful email check:" msgstr "Letzter erfolgreicher Email Check" -#: ../../mod/settings.php:668 +#: ../../mod/settings.php:673 msgid "Email access is disabled on this site." msgstr "Zugriff auf E-Mails für diese Seite deaktiviert." -#: ../../mod/settings.php:669 +#: ../../mod/settings.php:674 msgid "IMAP server name:" msgstr "IMAP-Server-Name:" -#: ../../mod/settings.php:670 +#: ../../mod/settings.php:675 msgid "IMAP port:" msgstr "IMAP-Port:" -#: ../../mod/settings.php:671 +#: ../../mod/settings.php:676 msgid "Security:" msgstr "Sicherheit:" -#: ../../mod/settings.php:671 ../../mod/settings.php:676 +#: ../../mod/settings.php:676 ../../mod/settings.php:681 msgid "None" msgstr "Keine" -#: ../../mod/settings.php:672 +#: ../../mod/settings.php:677 msgid "Email login name:" msgstr "E-Mail-Login-Name:" -#: ../../mod/settings.php:673 +#: ../../mod/settings.php:678 msgid "Email password:" msgstr "E-Mail-Passwort:" -#: ../../mod/settings.php:674 +#: ../../mod/settings.php:679 msgid "Reply-to address:" msgstr "Reply-to Adresse:" -#: ../../mod/settings.php:675 +#: ../../mod/settings.php:680 msgid "Send public posts to all email contacts:" msgstr "Sende öffentliche Beiträge an alle E-Mail-Kontakte:" -#: ../../mod/settings.php:676 +#: ../../mod/settings.php:681 msgid "Action after import:" msgstr "Aktion nach Import:" -#: ../../mod/settings.php:676 +#: ../../mod/settings.php:681 msgid "Mark as seen" msgstr "Als gelesen markieren" -#: ../../mod/settings.php:676 +#: ../../mod/settings.php:681 msgid "Move to folder" msgstr "In einen Ordner verschieben" -#: ../../mod/settings.php:677 +#: ../../mod/settings.php:682 msgid "Move to folder:" msgstr "In diesen Ordner verschieben:" -#: ../../mod/settings.php:737 +#: ../../mod/settings.php:742 msgid "Display Settings" msgstr "Anzeige Einstellungen" -#: ../../mod/settings.php:743 +#: ../../mod/settings.php:748 msgid "Display Theme:" msgstr "Theme:" -#: ../../mod/settings.php:744 +#: ../../mod/settings.php:749 msgid "Update browser every xx seconds" msgstr "Browser alle xx Sekunden aktualisieren" -#: ../../mod/settings.php:744 +#: ../../mod/settings.php:749 msgid "Minimum of 10 seconds, no maximum" msgstr "Minimal 10 Sekunden, kein Maximum" -#: ../../mod/settings.php:745 +#: ../../mod/settings.php:750 msgid "Number of items to display on the network page:" msgstr "Zahl der Beiträge, welche pro Netzwerkseite angezeigt werden sollen: " -#: ../../mod/settings.php:745 +#: ../../mod/settings.php:750 msgid "Maximum of 100 items" msgstr "Maximal 100 Beiträge" -#: ../../mod/settings.php:746 +#: ../../mod/settings.php:751 msgid "Don't show emoticons" msgstr "Keine Smilies anzeigen" -#: ../../mod/settings.php:811 ../../mod/admin.php:173 ../../mod/admin.php:551 +#: ../../mod/settings.php:816 ../../mod/admin.php:173 ../../mod/admin.php:553 msgid "Normal Account" msgstr "Normaler Account" -#: ../../mod/settings.php:812 +#: ../../mod/settings.php:817 msgid "This account is a normal personal profile" msgstr "Dieser Account ist ein normales persönliches Profil" -#: ../../mod/settings.php:815 ../../mod/admin.php:174 ../../mod/admin.php:552 +#: ../../mod/settings.php:820 ../../mod/admin.php:174 ../../mod/admin.php:554 msgid "Soapbox Account" msgstr "Sandkasten-Account" -#: ../../mod/settings.php:816 +#: ../../mod/settings.php:821 msgid "Automatically approve all connection/friend requests as read-only fans" msgstr "Freundschaftsanfragen werden automatisch als Nurlese-Fans akzeptiert" -#: ../../mod/settings.php:819 ../../mod/admin.php:175 ../../mod/admin.php:553 +#: ../../mod/settings.php:824 ../../mod/admin.php:175 ../../mod/admin.php:555 msgid "Community/Celebrity Account" msgstr "Gemeinschafts/Promi-Account" -#: ../../mod/settings.php:820 +#: ../../mod/settings.php:825 msgid "" "Automatically approve all connection/friend requests as read-write fans" msgstr "Freundschaftsanfragen werden automatisch als Lese-und-Schreib-Fans akzeptiert" -#: ../../mod/settings.php:823 ../../mod/admin.php:176 ../../mod/admin.php:554 +#: ../../mod/settings.php:828 ../../mod/admin.php:176 ../../mod/admin.php:556 msgid "Automatic Friend Account" msgstr "Automatischer Freundesaccount" -#: ../../mod/settings.php:824 +#: ../../mod/settings.php:829 msgid "Automatically approve all connection/friend requests as friends" msgstr "Freundschaftsanfragen werden automatisch als Freund akzeptiert" -#: ../../mod/settings.php:834 +#: ../../mod/settings.php:839 msgid "OpenID:" msgstr "OpenID:" -#: ../../mod/settings.php:834 +#: ../../mod/settings.php:839 msgid "(Optional) Allow this OpenID to login to this account." msgstr "(Optional) Erlaube die Anmeldung für diesen Account mit dieser OpenID." -#: ../../mod/settings.php:844 +#: ../../mod/settings.php:849 msgid "Publish your default profile in your local site directory?" msgstr "Veröffentliche dein Standardprofil im Verzeichnis der lokalen Seite?" -#: ../../mod/settings.php:850 +#: ../../mod/settings.php:855 msgid "Publish your default profile in the global social directory?" msgstr "Veröffentliche dein Standardprofil im weltweiten Verzeichnis?" -#: ../../mod/settings.php:858 +#: ../../mod/settings.php:863 msgid "Hide your contact/friend list from viewers of your default profile?" msgstr "Liste der Kontakte vor Betrachtern des Standardprofils verbergen?" -#: ../../mod/settings.php:862 +#: ../../mod/settings.php:867 msgid "Hide your profile details from unknown viewers?" msgstr "Profil-Details vor unbekannten Betrachtern verbergen?" -#: ../../mod/settings.php:867 +#: ../../mod/settings.php:872 msgid "Allow friends to post to your profile page?" msgstr "Deinen Kontakten erlauben, auf deine Pinnwand zu schreiben?" -#: ../../mod/settings.php:873 +#: ../../mod/settings.php:878 msgid "Allow friends to tag your posts?" msgstr "Deinen Kontakten erlauben, deine Beiträge mit Schlagwörtern zu versehen?" -#: ../../mod/settings.php:879 +#: ../../mod/settings.php:884 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "Erlaube uns dich als potentiellen Kontakt für neue Mitglieder vorzuschlagen?" -#: ../../mod/settings.php:885 +#: ../../mod/settings.php:890 msgid "Permit unknown people to send you private mail?" msgstr "Erlaube es Unbekannten dir private Nachrichten zu schicken?" -#: ../../mod/settings.php:896 +#: ../../mod/settings.php:901 msgid "Profile is not published." msgstr "Profil ist nicht veröffentlicht." -#: ../../mod/settings.php:902 ../../mod/profile_photo.php:211 +#: ../../mod/settings.php:907 ../../mod/profile_photo.php:211 msgid "or" msgstr "oder" -#: ../../mod/settings.php:907 +#: ../../mod/settings.php:912 msgid "Your Identity Address is" msgstr "Die Adresse deines Profils lautet:" -#: ../../mod/settings.php:918 +#: ../../mod/settings.php:923 msgid "Automatically expire posts after this many days:" msgstr "Beiträge verfallen automatisch nach dieser Anzahl von Tagen" -#: ../../mod/settings.php:918 +#: ../../mod/settings.php:923 msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "Wenn leer verfallen Beiträge nie automatisch. Verfallene Beiträge werden gelöscht." -#: ../../mod/settings.php:919 +#: ../../mod/settings.php:924 msgid "Advanced expiration settings" msgstr "Erweiterte Verfallseinstellungen" -#: ../../mod/settings.php:920 +#: ../../mod/settings.php:925 msgid "Advanced Expiration" msgstr "Erweitertes Verfallen" -#: ../../mod/settings.php:921 +#: ../../mod/settings.php:926 msgid "Expire posts:" msgstr "Beiträge verfallen lassen:" -#: ../../mod/settings.php:922 +#: ../../mod/settings.php:927 msgid "Expire personal notes:" msgstr "Persönliche Notizen verfallen lassen:" -#: ../../mod/settings.php:923 +#: ../../mod/settings.php:928 msgid "Expire starred posts:" msgstr "Markierte Beiträge verfallen lassen:" -#: ../../mod/settings.php:924 +#: ../../mod/settings.php:929 msgid "Expire photos:" msgstr "Fotos verfallen lassen:" -#: ../../mod/settings.php:928 +#: ../../mod/settings.php:933 msgid "Account Settings" msgstr "Account-Einstellungen" -#: ../../mod/settings.php:937 +#: ../../mod/settings.php:942 msgid "Password Settings" msgstr "Passwort-Einstellungen" -#: ../../mod/settings.php:938 +#: ../../mod/settings.php:943 msgid "New Password:" msgstr "Neues Passwort:" -#: ../../mod/settings.php:939 +#: ../../mod/settings.php:944 msgid "Confirm:" msgstr "Bestätigen:" -#: ../../mod/settings.php:939 +#: ../../mod/settings.php:944 msgid "Leave password fields blank unless changing" msgstr "Lass die Passwort-Felder leer, außer du willst das Passwort ändern" -#: ../../mod/settings.php:943 +#: ../../mod/settings.php:948 msgid "Basic Settings" msgstr "Grundeinstellungen" -#: ../../mod/settings.php:944 ../../include/profile_advanced.php:15 +#: ../../mod/settings.php:949 ../../include/profile_advanced.php:15 msgid "Full Name:" msgstr "Kompletter Name:" -#: ../../mod/settings.php:945 +#: ../../mod/settings.php:950 msgid "Email Address:" msgstr "Emailadresse:" -#: ../../mod/settings.php:946 +#: ../../mod/settings.php:951 msgid "Your Timezone:" msgstr "Deine Zeitzone:" -#: ../../mod/settings.php:947 +#: ../../mod/settings.php:952 msgid "Default Post Location:" msgstr "Standardstandort:" -#: ../../mod/settings.php:948 +#: ../../mod/settings.php:953 msgid "Use Browser Location:" msgstr "Verwende den Standort des Browsers:" -#: ../../mod/settings.php:951 +#: ../../mod/settings.php:956 msgid "Security and Privacy Settings" msgstr "Sicherheits- und Privatsphäre-Einstellungen" -#: ../../mod/settings.php:953 +#: ../../mod/settings.php:958 msgid "Maximum Friend Requests/Day:" msgstr "Maximale Anzahl von Freundschaftsanfragen/Tag:" -#: ../../mod/settings.php:953 ../../mod/settings.php:968 +#: ../../mod/settings.php:958 ../../mod/settings.php:973 msgid "(to prevent spam abuse)" msgstr "(um SPAM zu vermeiden)" -#: ../../mod/settings.php:954 +#: ../../mod/settings.php:959 msgid "Default Post Permissions" msgstr "Standard-Zugriffsrechte für Beiträge" -#: ../../mod/settings.php:955 +#: ../../mod/settings.php:960 msgid "(click to open/close)" msgstr "(klicke zum öffnen/schließen)" -#: ../../mod/settings.php:968 +#: ../../mod/settings.php:973 msgid "Maximum private messages per day from unknown people:" msgstr "Maximale Anzahl von privaten Nachrichten, die dir unbekannte Personen pro Tag senden dürfen:" -#: ../../mod/settings.php:971 +#: ../../mod/settings.php:976 msgid "Notification Settings" msgstr "Benachrichtigungseinstellungen" -#: ../../mod/settings.php:972 +#: ../../mod/settings.php:977 msgid "By default post a status message when:" msgstr "Standardmäßig eine Status-Nachricht posten wenn:" -#: ../../mod/settings.php:973 +#: ../../mod/settings.php:978 msgid "accepting a friend request" msgstr "akzeptieren einer Freundschaftsanfrage" -#: ../../mod/settings.php:974 +#: ../../mod/settings.php:979 msgid "making an interesting profile change" msgstr "interessante Änderungen am Profil gemacht werden" -#: ../../mod/settings.php:975 +#: ../../mod/settings.php:980 msgid "Send a notification email when:" msgstr "Benachrichtigungs-E-Mail senden wenn:" -#: ../../mod/settings.php:976 +#: ../../mod/settings.php:981 msgid "You receive an introduction" msgstr "- du eine Kontaktanfrage erhältst" -#: ../../mod/settings.php:977 +#: ../../mod/settings.php:982 msgid "Your introductions are confirmed" msgstr "- eine deiner Kontaktanfragen akzeptiert wurde" -#: ../../mod/settings.php:978 +#: ../../mod/settings.php:983 msgid "Someone writes on your profile wall" msgstr "- jemand etwas auf deine Pinnwand schreibt" -#: ../../mod/settings.php:979 +#: ../../mod/settings.php:984 msgid "Someone writes a followup comment" msgstr "- jemand auch einen Kommentar verfasst" -#: ../../mod/settings.php:980 +#: ../../mod/settings.php:985 msgid "You receive a private message" msgstr "- du eine private Nachricht erhältst" -#: ../../mod/settings.php:981 +#: ../../mod/settings.php:986 msgid "You receive a friend suggestion" msgstr "- du eine Empfehlung erhältst" -#: ../../mod/settings.php:982 +#: ../../mod/settings.php:987 msgid "You are tagged in a post" msgstr "- du in einem Beitrag erwähnt wurdest" -#: ../../mod/settings.php:985 +#: ../../mod/settings.php:990 msgid "Advanced Page Settings" msgstr "Erweiterte Seiten-Einstellungen" @@ -2320,12 +2294,14 @@ msgstr "Private Nachrichten an diese Person könnten an die Öffentlichkeit gela msgid "Invalid contact." msgstr "Ungültiger Kontakt." -#: ../../mod/notes.php:44 ../../boot.php:1476 +#: ../../mod/notes.php:44 ../../boot.php:1486 msgid "Personal Notes" msgstr "Persönliche Notizen" #: ../../mod/notes.php:63 ../../mod/filer.php:30 -#: ../../addon/facebook/facebook.php:715 ../../include/text.php:652 +#: ../../addon/facebook/facebook.php:717 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:147 +#: ../../include/text.php:652 msgid "Save" msgstr "Speichern" @@ -2359,7 +2335,7 @@ msgid "No recipient." msgstr "Kein Empfänger." #: ../../mod/wallmessage.php:124 ../../mod/message.php:169 -#: ../../include/conversation.php:910 +#: ../../include/conversation.php:918 msgid "Please enter a link URL:" msgstr "Bitte gib die URL des Links ein:" @@ -2375,17 +2351,17 @@ msgid "" msgstr "Wenn du möchtest, dass %s dir antworten kann, überprüfe deine Privatsphären-Einstellungen und erlaube private Nachrichten von unbekannten Absendern." #: ../../mod/wallmessage.php:133 ../../mod/message.php:178 -#: ../../mod/message.php:347 +#: ../../mod/message.php:370 msgid "To:" msgstr "An:" #: ../../mod/wallmessage.php:134 ../../mod/message.php:179 -#: ../../mod/message.php:348 +#: ../../mod/message.php:371 msgid "Subject:" msgstr "Betreff:" #: ../../mod/wallmessage.php:140 ../../mod/message.php:183 -#: ../../mod/message.php:351 ../../mod/invite.php:113 +#: ../../mod/message.php:374 ../../mod/invite.php:113 msgid "Your message:" msgstr "Deine Nachricht:" @@ -2567,16 +2543,9 @@ msgstr "Ungültiger Profil-Bezeichner" msgid "Profile Visibility Editor" msgstr "Editor für die Profil-Sichtbarkeit" -#: ../../mod/profperm.php:103 -#: ../../view/theme/diabook/diabook-green/theme.php:230 -#: ../../view/theme/diabook/diabook-red/theme.php:228 -#: ../../view/theme/diabook/diabook-blue/theme.php:228 -#: ../../view/theme/diabook/theme.php:247 -#: ../../view/theme/diabook/diabook-dark/theme.php:230 -#: ../../view/theme/diabook/diabook-aerith/theme.php:230 -#: ../../view/theme/diabook/diabook-pink/theme.php:230 +#: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:252 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74 -#: ../../include/nav.php:50 ../../boot.php:1458 +#: ../../include/nav.php:50 ../../boot.php:1468 msgid "Profile" msgstr "Profil" @@ -2725,7 +2694,7 @@ msgstr "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung mögli msgid "Your invitation ID: " msgstr "ID deiner Einladung: " -#: ../../mod/register.php:553 ../../mod/admin.php:393 +#: ../../mod/register.php:553 ../../mod/admin.php:394 msgid "Registration" msgstr "Registrierung" @@ -2757,39 +2726,20 @@ msgid "People Search" msgstr "Personen Suche" #: ../../mod/like.php:127 ../../mod/tagger.php:70 -#: ../../addon/facebook/facebook.php:1655 +#: ../../addon/facebook/facebook.php:1533 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 -#: ../../view/theme/diabook/diabook-green/theme.php:83 -#: ../../view/theme/diabook/diabook-green/theme.php:92 -#: ../../view/theme/diabook/diabook-red/theme.php:82 -#: ../../view/theme/diabook/diabook-red/theme.php:91 -#: ../../view/theme/diabook/diabook-blue/theme.php:82 -#: ../../view/theme/diabook/diabook-blue/theme.php:91 -#: ../../view/theme/diabook/theme.php:97 -#: ../../view/theme/diabook/theme.php:106 -#: ../../view/theme/diabook/diabook-dark/theme.php:83 -#: ../../view/theme/diabook/diabook-dark/theme.php:92 -#: ../../view/theme/diabook/diabook-aerith/theme.php:83 -#: ../../view/theme/diabook/diabook-aerith/theme.php:92 -#: ../../view/theme/diabook/diabook-pink/theme.php:83 -#: ../../view/theme/diabook/diabook-pink/theme.php:92 -#: ../../include/diaspora.php:1654 ../../include/conversation.php:48 -#: ../../include/conversation.php:57 ../../include/conversation.php:121 -#: ../../include/conversation.php:130 +#: ../../view/theme/diabook/theme.php:102 +#: ../../view/theme/diabook/theme.php:111 ../../include/diaspora.php:1654 +#: ../../include/conversation.php:48 ../../include/conversation.php:57 +#: ../../include/conversation.php:121 ../../include/conversation.php:130 msgid "status" msgstr "Status" -#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1659 +#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1537 #: ../../addon/communityhome/communityhome.php:172 -#: ../../view/theme/diabook/diabook-green/theme.php:97 -#: ../../view/theme/diabook/diabook-red/theme.php:96 -#: ../../view/theme/diabook/diabook-blue/theme.php:96 -#: ../../view/theme/diabook/theme.php:111 -#: ../../view/theme/diabook/diabook-dark/theme.php:97 -#: ../../view/theme/diabook/diabook-aerith/theme.php:97 -#: ../../view/theme/diabook/diabook-pink/theme.php:97 -#: ../../include/diaspora.php:1670 ../../include/conversation.php:65 +#: ../../view/theme/diabook/theme.php:116 ../../include/diaspora.php:1670 +#: ../../include/conversation.php:65 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "%1$s mag %2$ss %3$s" @@ -2800,7 +2750,7 @@ msgid "%1$s doesn't like %2$s's %3$s" msgstr "%1$s mag %2$ss %3$s nicht" #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:149 -#: ../../mod/admin.php:614 ../../mod/admin.php:813 ../../mod/display.php:37 +#: ../../mod/admin.php:616 ../../mod/admin.php:815 ../../mod/display.php:37 #: ../../mod/display.php:142 ../../include/items.php:3083 msgid "Item not found." msgstr "Beitrag nicht gefunden." @@ -2809,15 +2759,8 @@ msgstr "Beitrag nicht gefunden." msgid "Access denied." msgstr "Zugriff verweigert." -#: ../../mod/fbrowser.php:23 -#: ../../view/theme/diabook/diabook-green/theme.php:232 -#: ../../view/theme/diabook/diabook-red/theme.php:230 -#: ../../view/theme/diabook/diabook-blue/theme.php:230 -#: ../../view/theme/diabook/theme.php:249 -#: ../../view/theme/diabook/diabook-dark/theme.php:232 -#: ../../view/theme/diabook/diabook-aerith/theme.php:232 -#: ../../view/theme/diabook/diabook-pink/theme.php:232 -#: ../../include/nav.php:51 ../../boot.php:1463 +#: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:254 +#: ../../include/nav.php:51 ../../boot.php:1473 msgid "Photos" msgstr "Bilder" @@ -2846,8 +2789,8 @@ msgstr "Konnte den Originalbeitrag nicht finden." msgid "Empty post discarded." msgstr "Leerer Beitrag wurde verworfen." -#: ../../mod/item.php:372 ../../mod/wall_upload.php:85 -#: ../../mod/wall_upload.php:94 ../../mod/wall_upload.php:101 +#: ../../mod/item.php:372 ../../mod/wall_upload.php:99 +#: ../../mod/wall_upload.php:108 ../../mod/wall_upload.php:115 #: ../../include/message.php:144 msgid "Wall Photos" msgstr "Pinnwand-Bilder" @@ -2899,7 +2842,7 @@ msgstr "Drücke Umschalt+Neu Laden oder leere den Browser-Cache, falls das neue msgid "Unable to process image" msgstr "Bild konnte nicht verarbeitet werden" -#: ../../mod/profile_photo.php:115 ../../mod/wall_upload.php:60 +#: ../../mod/profile_photo.php:115 ../../mod/wall_upload.php:74 #, php-format msgid "Image exceeds size limit of %d" msgstr "Bildgröße überschreitet das Limit von %d" @@ -2993,7 +2936,7 @@ msgstr "Du und %s" msgid "%s and You" msgstr "%s und Du" -#: ../../mod/message.php:242 ../../mod/message.php:340 +#: ../../mod/message.php:242 ../../mod/message.php:363 msgid "Delete conversation" msgstr "Unterhaltung löschen" @@ -3012,17 +2955,17 @@ msgstr[1] "%d Nachrichten" msgid "Message not available." msgstr "Nachricht nicht verfügbar." -#: ../../mod/message.php:324 +#: ../../mod/message.php:347 msgid "Delete message" msgstr "Nachricht löschen" -#: ../../mod/message.php:342 +#: ../../mod/message.php:365 msgid "" "No secure communications available. You may be able to " "respond from the sender's profile page." msgstr "Sichere Kommunikation ist nicht verfügbar. Eventuell kannst du auf der Profilseite des Absenders antworten." -#: ../../mod/message.php:346 +#: ../../mod/message.php:369 msgid "Send Reply" msgstr "Antwort senden" @@ -3039,23 +2982,23 @@ msgstr "Keine Freunde zum Anzeigen." msgid "Theme settings updated." msgstr "Themen Einstellungen aktualisiert." -#: ../../mod/admin.php:93 ../../mod/admin.php:391 +#: ../../mod/admin.php:93 ../../mod/admin.php:392 msgid "Site" msgstr "Seite" -#: ../../mod/admin.php:94 ../../mod/admin.php:569 ../../mod/admin.php:581 +#: ../../mod/admin.php:94 ../../mod/admin.php:571 ../../mod/admin.php:583 msgid "Users" msgstr "Nutzer" -#: ../../mod/admin.php:95 ../../mod/admin.php:663 ../../mod/admin.php:705 +#: ../../mod/admin.php:95 ../../mod/admin.php:665 ../../mod/admin.php:707 msgid "Plugins" msgstr "Plugins" -#: ../../mod/admin.php:96 ../../mod/admin.php:868 ../../mod/admin.php:904 +#: ../../mod/admin.php:96 ../../mod/admin.php:870 ../../mod/admin.php:906 msgid "Themes" msgstr "Themen" -#: ../../mod/admin.php:111 ../../mod/admin.php:992 +#: ../../mod/admin.php:111 ../../mod/admin.php:994 msgid "Logs" msgstr "Protokolle" @@ -3063,9 +3006,9 @@ msgstr "Protokolle" msgid "User registrations waiting for confirmation" msgstr "Nutzeranmeldungen die auf Bestätigung warten" -#: ../../mod/admin.php:188 ../../mod/admin.php:390 ../../mod/admin.php:568 -#: ../../mod/admin.php:662 ../../mod/admin.php:704 ../../mod/admin.php:867 -#: ../../mod/admin.php:903 ../../mod/admin.php:991 +#: ../../mod/admin.php:188 ../../mod/admin.php:391 ../../mod/admin.php:570 +#: ../../mod/admin.php:664 ../../mod/admin.php:706 ../../mod/admin.php:869 +#: ../../mod/admin.php:905 ../../mod/admin.php:993 msgid "Administration" msgstr "Administration" @@ -3089,427 +3032,438 @@ msgstr "Version" msgid "Active plugins" msgstr "Aktive Plugins" -#: ../../mod/admin.php:329 +#: ../../mod/admin.php:330 msgid "Site settings updated." msgstr "Seiteneinstellungen aktualisiert." -#: ../../mod/admin.php:377 +#: ../../mod/admin.php:378 msgid "Closed" msgstr "Geschlossen" -#: ../../mod/admin.php:378 +#: ../../mod/admin.php:379 msgid "Requires approval" msgstr "Bedarf der Zustimmung" -#: ../../mod/admin.php:379 +#: ../../mod/admin.php:380 msgid "Open" msgstr "Offen" -#: ../../mod/admin.php:383 +#: ../../mod/admin.php:384 msgid "No SSL policy, links will track page SSL state" msgstr "Keine SSL Richtlinie, Links werden das verwendete Protokoll beibehalten" -#: ../../mod/admin.php:384 +#: ../../mod/admin.php:385 msgid "Force all links to use SSL" msgstr "SSL für alle Links erzwingen" -#: ../../mod/admin.php:385 +#: ../../mod/admin.php:386 msgid "Self-signed certificate, use SSL for local links only (discouraged)" msgstr "Selbst-unterzeichnetes Zertifikat, SSL nur für lokale Links verwenden (nicht empfohlen)" -#: ../../mod/admin.php:394 +#: ../../mod/admin.php:395 msgid "File upload" msgstr "Datei hochladen" -#: ../../mod/admin.php:395 +#: ../../mod/admin.php:396 msgid "Policies" msgstr "Regeln" -#: ../../mod/admin.php:396 +#: ../../mod/admin.php:397 msgid "Advanced" msgstr "Erweitert" -#: ../../mod/admin.php:400 ../../addon/statusnet/statusnet.php:544 +#: ../../mod/admin.php:401 ../../addon/statusnet/statusnet.php:544 msgid "Site name" msgstr "Seitenname" -#: ../../mod/admin.php:401 +#: ../../mod/admin.php:402 msgid "Banner/Logo" msgstr "Banner/Logo" -#: ../../mod/admin.php:402 +#: ../../mod/admin.php:403 msgid "System language" msgstr "Systemsprache" -#: ../../mod/admin.php:403 +#: ../../mod/admin.php:404 msgid "System theme" msgstr "Systemweites Thema" -#: ../../mod/admin.php:403 +#: ../../mod/admin.php:404 msgid "" "Default system theme - may be over-ridden by user profiles - change theme settings" msgstr "Vorgabe für das System-Theme - kann von Benutzerprofilen überschrieben werden - Theme-Einstellungen ändern" -#: ../../mod/admin.php:404 +#: ../../mod/admin.php:405 msgid "SSL link policy" msgstr "Regeln für SSL Links" -#: ../../mod/admin.php:404 +#: ../../mod/admin.php:405 msgid "Determines whether generated links should be forced to use SSL" msgstr "Bestimmt, ob generierte Links SSL verwenden müssen" -#: ../../mod/admin.php:405 +#: ../../mod/admin.php:406 msgid "Maximum image size" msgstr "Maximale Größe von Bildern" -#: ../../mod/admin.php:405 +#: ../../mod/admin.php:406 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "Maximale Upload-Größe von Bildern in Bytes. Standard ist 0, d.h. ohne Limit." -#: ../../mod/admin.php:407 +#: ../../mod/admin.php:408 msgid "Register policy" msgstr "Registrierungsmethode" -#: ../../mod/admin.php:408 +#: ../../mod/admin.php:409 msgid "Register text" msgstr "Registrierungstext" -#: ../../mod/admin.php:408 +#: ../../mod/admin.php:409 msgid "Will be displayed prominently on the registration page." msgstr "Wird gut sichtbar auf der Registrierungs-Seite angezeigt." -#: ../../mod/admin.php:409 +#: ../../mod/admin.php:410 msgid "Accounts abandoned after x days" msgstr "Accounts gelten nach x Tagen als unbenutzt" -#: ../../mod/admin.php:409 +#: ../../mod/admin.php:410 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Accounts nicht mehr benutzt werden. 0 eingeben für kein Limit." -#: ../../mod/admin.php:410 +#: ../../mod/admin.php:411 msgid "Allowed friend domains" msgstr "Erlaubte Domains für Kontakte" -#: ../../mod/admin.php:410 +#: ../../mod/admin.php:411 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "Liste der Domains, die für Freundschaften erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben." -#: ../../mod/admin.php:411 +#: ../../mod/admin.php:412 msgid "Allowed email domains" msgstr "Erlaubte Domains für Emails" -#: ../../mod/admin.php:411 +#: ../../mod/admin.php:412 msgid "" "Comma separated list of domains which are allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains" msgstr "Liste der Domains, die für E-Mail-Adressen bei der Registrierung erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben." -#: ../../mod/admin.php:412 +#: ../../mod/admin.php:413 msgid "Block public" msgstr "Öffentlichen Zugriff blockieren" -#: ../../mod/admin.php:412 +#: ../../mod/admin.php:413 msgid "" "Check to block public access to all otherwise public personal pages on this " "site unless you are currently logged in." msgstr "Klicken, um öffentlichen Zugriff auf sonst öffentliche Profile zu blockieren, wenn man nicht eingeloggt ist." -#: ../../mod/admin.php:413 +#: ../../mod/admin.php:414 msgid "Force publish" msgstr "Erzwinge Veröffentlichung" -#: ../../mod/admin.php:413 +#: ../../mod/admin.php:414 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "Klicken, um Anzeige aller Profile dieses Servers im Verzeichnis zu erzwingen." -#: ../../mod/admin.php:414 +#: ../../mod/admin.php:415 msgid "Global directory update URL" msgstr "URL für Updates beim weltweiten Verzeichnis" -#: ../../mod/admin.php:414 +#: ../../mod/admin.php:415 msgid "" "URL to update the global directory. If this is not set, the global directory" " is completely unavailable to the application." msgstr "URL für Update des globalen Verzeichnisses. Wenn nichts eingetragen ist, bleibt das globale Verzeichnis unerreichbar." -#: ../../mod/admin.php:416 +#: ../../mod/admin.php:417 msgid "Block multiple registrations" msgstr "Unterbinde Mehrfachregistrierung" -#: ../../mod/admin.php:416 +#: ../../mod/admin.php:417 msgid "Disallow users to register additional accounts for use as pages." msgstr "Benutzern nicht erlauben, weitere Accounts als zusätzliche Profile anzulegen." -#: ../../mod/admin.php:417 +#: ../../mod/admin.php:418 msgid "OpenID support" msgstr "OpenID Unterstützung" -#: ../../mod/admin.php:417 +#: ../../mod/admin.php:418 msgid "OpenID support for registration and logins." msgstr "OpenID-Unterstützung für Registrierung und Login." -#: ../../mod/admin.php:418 +#: ../../mod/admin.php:419 msgid "Fullname check" msgstr "Namen auf Vollständigkeit überprüfen" -#: ../../mod/admin.php:418 +#: ../../mod/admin.php:419 msgid "" "Force users to register with a space between firstname and lastname in Full " "name, as an antispam measure" msgstr "Leerzeichen zwischen Vor- und Nachname im vollständigen Namen erzwingen, um SPAM zu vermeiden." -#: ../../mod/admin.php:419 +#: ../../mod/admin.php:420 msgid "UTF-8 Regular expressions" msgstr "UTF-8 Reguläre Ausdrücke" -#: ../../mod/admin.php:419 +#: ../../mod/admin.php:420 msgid "Use PHP UTF8 regular expressions" msgstr "PHP UTF8 Ausdrücke verwenden" -#: ../../mod/admin.php:420 +#: ../../mod/admin.php:421 msgid "Show Community Page" msgstr "Gemeinschaftsseite anzeigen" -#: ../../mod/admin.php:420 +#: ../../mod/admin.php:421 msgid "" "Display a Community page showing all recent public postings on this site." msgstr "Zeige die Gemeinschaftsseite mit allen öffentlichen Beiträgen auf diesem Server." -#: ../../mod/admin.php:421 +#: ../../mod/admin.php:422 msgid "Enable OStatus support" msgstr "OStatus Unterstützung aktivieren" -#: ../../mod/admin.php:421 +#: ../../mod/admin.php:422 msgid "" "Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All " "communications in OStatus are public, so privacy warnings will be " "occasionally displayed." msgstr "Biete die eingebaute OStatus (identi.ca, status.net, etc.) Unterstützung an. Jede Kommunikation in OStatus ist öffentlich, so Privatsphäre Warnungen werden bei Bedarf angezeigt." -#: ../../mod/admin.php:422 +#: ../../mod/admin.php:423 msgid "Enable Diaspora support" msgstr "Diaspora-Support aktivieren" -#: ../../mod/admin.php:422 +#: ../../mod/admin.php:423 msgid "Provide built-in Diaspora network compatibility." msgstr "Verwende die eingebaute Diaspora-Verknüpfung." -#: ../../mod/admin.php:423 +#: ../../mod/admin.php:424 msgid "Only allow Friendica contacts" msgstr "Nur Friendica-Kontakte erlauben" -#: ../../mod/admin.php:423 +#: ../../mod/admin.php:424 msgid "" "All contacts must use Friendica protocols. All other built-in communication " "protocols disabled." msgstr "Alle Kontakte müssen das Friendica Protokoll nutzen. Alle anderen Kommunikationsprotokolle werden deaktiviert." -#: ../../mod/admin.php:424 +#: ../../mod/admin.php:425 msgid "Verify SSL" msgstr "SSL Überprüfen" -#: ../../mod/admin.php:424 +#: ../../mod/admin.php:425 msgid "" "If you wish, you can turn on strict certificate checking. This will mean you" " cannot connect (at all) to self-signed SSL sites." msgstr "Wenn gewollt, kann man hier eine strenge Zertifikat Kontrolle einstellen. Das bedeutet, dass man zu keinen Seiten mit selbst unterzeichnetem SSL eine Verbindung herstellen kann." -#: ../../mod/admin.php:425 +#: ../../mod/admin.php:426 msgid "Proxy user" msgstr "Proxy Nutzer" -#: ../../mod/admin.php:426 +#: ../../mod/admin.php:427 msgid "Proxy URL" msgstr "Proxy URL" -#: ../../mod/admin.php:427 +#: ../../mod/admin.php:428 msgid "Network timeout" msgstr "Netzwerk Wartezeit" -#: ../../mod/admin.php:427 +#: ../../mod/admin.php:428 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "Der Wert ist in Sekunden. Setze 0 für unbegrenzt (nicht empfohlen)." -#: ../../mod/admin.php:453 +#: ../../mod/admin.php:429 +msgid "Delivery interval" +msgstr "Zustellungsintervall" + +#: ../../mod/admin.php:429 +msgid "" +"Delay background delivery processes by this many seconds to reduce system " +"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " +"for large dedicated servers." +msgstr "Verzögere im Hintergrund laufende Auslieferungsprozesse um die angegebene Anzahl an Sekunden um die Systemlast zu verringern. Empfehlungen: 4-5 für Shared-Hosts, 2-3 für VPS, 0-1 für große dedizierte Server." + +#: ../../mod/admin.php:455 #, php-format msgid "%s user blocked/unblocked" msgid_plural "%s users blocked/unblocked" msgstr[0] "%s Benutzer geblockt/freigegeben" msgstr[1] "%s Benutzer geblockt/freigegeben" -#: ../../mod/admin.php:460 +#: ../../mod/admin.php:462 #, php-format msgid "%s user deleted" msgid_plural "%s users deleted" msgstr[0] "%s Nutzer gelöscht" msgstr[1] "%s Nutzer gelöscht" -#: ../../mod/admin.php:499 +#: ../../mod/admin.php:501 #, php-format msgid "User '%s' deleted" msgstr "Nutzer '%s' gelöscht" -#: ../../mod/admin.php:507 +#: ../../mod/admin.php:509 #, php-format msgid "User '%s' unblocked" msgstr "Nutzer '%s' entsperrt" -#: ../../mod/admin.php:507 +#: ../../mod/admin.php:509 #, php-format msgid "User '%s' blocked" msgstr "Nutzer '%s' gesperrt" -#: ../../mod/admin.php:571 +#: ../../mod/admin.php:573 msgid "select all" msgstr "Alle auswählen" -#: ../../mod/admin.php:572 +#: ../../mod/admin.php:574 msgid "User registrations waiting for confirm" msgstr "Neuanmeldungen, die auf deine Bestätigung warten" -#: ../../mod/admin.php:573 +#: ../../mod/admin.php:575 msgid "Request date" msgstr "Anfrage Datum" -#: ../../mod/admin.php:573 ../../mod/admin.php:582 +#: ../../mod/admin.php:575 ../../mod/admin.php:584 #: ../../include/contact_selectors.php:79 msgid "Email" msgstr "Email" -#: ../../mod/admin.php:574 +#: ../../mod/admin.php:576 msgid "No registrations." msgstr "Keine Neuanmeldungen." -#: ../../mod/admin.php:576 +#: ../../mod/admin.php:578 msgid "Deny" msgstr "Verwehren" -#: ../../mod/admin.php:582 +#: ../../mod/admin.php:584 msgid "Register date" msgstr "Anmeldedatum" -#: ../../mod/admin.php:582 +#: ../../mod/admin.php:584 msgid "Last login" msgstr "Letzte Anmeldung" -#: ../../mod/admin.php:582 +#: ../../mod/admin.php:584 msgid "Last item" msgstr "Letzter Beitrag" -#: ../../mod/admin.php:582 +#: ../../mod/admin.php:584 msgid "Account" msgstr "Nutzerkonto" -#: ../../mod/admin.php:584 +#: ../../mod/admin.php:586 msgid "" "Selected users will be deleted!\\n\\nEverything these users had posted on " "this site will be permanently deleted!\\n\\nAre you sure?" msgstr "Die markierten Nutzer werden gelöscht!\\n\\nAlle Beiträge, die diese Nutzer auf dieser Seite veröffentlicht haben, werden permanent gelöscht!\\n\\nBist du sicher?" -#: ../../mod/admin.php:585 +#: ../../mod/admin.php:587 msgid "" "The user {0} will be deleted!\\n\\nEverything this user has posted on this " "site will be permanently deleted!\\n\\nAre you sure?" msgstr "Der Nutzer {0} wird gelöscht!\\n\\nAlles was dieser Nutzer auf dieser Seite veröffentlicht hat, wird permanent gelöscht!\\n\\nBist du sicher?" -#: ../../mod/admin.php:626 +#: ../../mod/admin.php:628 #, php-format msgid "Plugin %s disabled." msgstr "Plugin %s deaktiviert." -#: ../../mod/admin.php:630 +#: ../../mod/admin.php:632 #, php-format msgid "Plugin %s enabled." msgstr "Plugin %s aktiviert." -#: ../../mod/admin.php:640 ../../mod/admin.php:838 +#: ../../mod/admin.php:642 ../../mod/admin.php:840 msgid "Disable" msgstr "Ausschalten" -#: ../../mod/admin.php:642 ../../mod/admin.php:840 +#: ../../mod/admin.php:644 ../../mod/admin.php:842 msgid "Enable" msgstr "Einschalten" -#: ../../mod/admin.php:664 ../../mod/admin.php:869 +#: ../../mod/admin.php:666 ../../mod/admin.php:871 msgid "Toggle" msgstr "Umschalten" -#: ../../mod/admin.php:672 ../../mod/admin.php:879 +#: ../../mod/admin.php:674 ../../mod/admin.php:881 msgid "Author: " msgstr "Autor:" -#: ../../mod/admin.php:673 ../../mod/admin.php:880 +#: ../../mod/admin.php:675 ../../mod/admin.php:882 msgid "Maintainer: " msgstr "Betreuer:" -#: ../../mod/admin.php:802 +#: ../../mod/admin.php:804 msgid "No themes found." msgstr "Keine Themen gefunden." -#: ../../mod/admin.php:861 +#: ../../mod/admin.php:863 msgid "Screenshot" msgstr "Bildschirmfoto" -#: ../../mod/admin.php:909 +#: ../../mod/admin.php:911 msgid "[Experimental]" msgstr "[Experimentell]" -#: ../../mod/admin.php:910 +#: ../../mod/admin.php:912 msgid "[Unsupported]" msgstr "[Nicht unterstützt]" -#: ../../mod/admin.php:937 +#: ../../mod/admin.php:939 msgid "Log settings updated." msgstr "Protokolleinstellungen aktualisiert." -#: ../../mod/admin.php:994 +#: ../../mod/admin.php:996 msgid "Clear" msgstr "löschen" -#: ../../mod/admin.php:1000 +#: ../../mod/admin.php:1002 msgid "Debugging" msgstr "Protokoll führen" -#: ../../mod/admin.php:1001 +#: ../../mod/admin.php:1003 msgid "Log file" msgstr "Protokolldatei" -#: ../../mod/admin.php:1001 +#: ../../mod/admin.php:1003 msgid "" "Must be writable by web server. Relative to your Friendica top-level " "directory." msgstr "Webserver muss Schreibrechte besitzen. Abhängig vom Friendica-Installationsverzeichnis." -#: ../../mod/admin.php:1002 +#: ../../mod/admin.php:1004 msgid "Log level" msgstr "Protokoll-Level" -#: ../../mod/admin.php:1052 +#: ../../mod/admin.php:1054 msgid "Close" msgstr "Schließen" -#: ../../mod/admin.php:1058 +#: ../../mod/admin.php:1060 msgid "FTP Host" msgstr "FTP Host" -#: ../../mod/admin.php:1059 +#: ../../mod/admin.php:1061 msgid "FTP Path" msgstr "FTP Pfad" -#: ../../mod/admin.php:1060 +#: ../../mod/admin.php:1062 msgid "FTP User" msgstr "FTP Nutzername" -#: ../../mod/admin.php:1061 +#: ../../mod/admin.php:1063 msgid "FTP Password" msgstr "FTP Passwort" @@ -3517,56 +3471,56 @@ msgstr "FTP Passwort" msgid "Requested profile is not available." msgstr "Das angefragte Profil ist nicht vorhanden." -#: ../../mod/profile.php:124 ../../mod/display.php:75 +#: ../../mod/profile.php:126 ../../mod/display.php:75 msgid "Access to this profile has been restricted." msgstr "Der Zugriff zu diesem Profil wurde eingeschränkt." -#: ../../mod/profile.php:145 +#: ../../mod/profile.php:147 msgid "Tips for New Members" msgstr "Tipps für neue Nutzer" -#: ../../mod/ping.php:175 +#: ../../mod/ping.php:177 msgid "{0} wants to be your friend" msgstr "{0} möchte mit dir in Kontakt treten" -#: ../../mod/ping.php:180 +#: ../../mod/ping.php:182 msgid "{0} sent you a message" msgstr "{0} hat dir eine Nachricht geschickt" -#: ../../mod/ping.php:185 +#: ../../mod/ping.php:187 msgid "{0} requested registration" msgstr "{0} möchte sich registrieren" -#: ../../mod/ping.php:191 +#: ../../mod/ping.php:193 #, php-format msgid "{0} commented %s's post" msgstr "{0} kommentierte einen Beitrag von %s" -#: ../../mod/ping.php:196 +#: ../../mod/ping.php:198 #, php-format msgid "{0} liked %s's post" msgstr "{0} mag %ss Beitrag" -#: ../../mod/ping.php:201 +#: ../../mod/ping.php:203 #, php-format msgid "{0} disliked %s's post" msgstr "{0} mag %ss Beitrag nicht" -#: ../../mod/ping.php:206 +#: ../../mod/ping.php:208 #, php-format msgid "{0} is now friends with %s" msgstr "{0} ist jetzt mit %s befreundet" -#: ../../mod/ping.php:211 +#: ../../mod/ping.php:213 msgid "{0} posted" msgstr "{0} hat etwas veröffentlicht" -#: ../../mod/ping.php:216 +#: ../../mod/ping.php:218 #, php-format msgid "{0} tagged %s's post with #%s" msgstr "{0} hat %ss Beitrag mit dem Schlagwort #%s versehen" -#: ../../mod/ping.php:222 +#: ../../mod/ping.php:224 msgid "{0} mentioned you in a post" msgstr "{0} hat dich in einem Beitrag erwähnt" @@ -3922,7 +3876,7 @@ msgstr "sichtbar für jeden" msgid "Edit visibility" msgstr "Sichtbarkeit bearbeiten" -#: ../../mod/filer.php:29 ../../include/conversation.php:914 +#: ../../mod/filer.php:29 ../../include/conversation.php:922 msgid "Save to Folder:" msgstr "In diesen Ordner verschieben:" @@ -3970,14 +3924,7 @@ msgstr "Hinzufügen" msgid "No entries." msgstr "Keine Einträge" -#: ../../mod/suggest.php:38 -#: ../../view/theme/diabook/diabook-green/theme.php:145 -#: ../../view/theme/diabook/diabook-red/theme.php:143 -#: ../../view/theme/diabook/diabook-blue/theme.php:143 -#: ../../view/theme/diabook/theme.php:158 -#: ../../view/theme/diabook/diabook-dark/theme.php:145 -#: ../../view/theme/diabook/diabook-aerith/theme.php:145 -#: ../../view/theme/diabook/diabook-pink/theme.php:145 +#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:163 #: ../../include/contact_widgets.php:34 msgid "Friend Suggestions" msgstr "Kontaktvorschläge" @@ -3992,14 +3939,7 @@ msgstr "Keine Vorschläge. Falls der Server frisch aufgesetzt wurde, versuche es msgid "Ignore/Hide" msgstr "Ignorieren/Verbergen" -#: ../../mod/directory.php:47 -#: ../../view/theme/diabook/diabook-green/theme.php:143 -#: ../../view/theme/diabook/diabook-red/theme.php:141 -#: ../../view/theme/diabook/diabook-blue/theme.php:141 -#: ../../view/theme/diabook/theme.php:156 -#: ../../view/theme/diabook/diabook-dark/theme.php:143 -#: ../../view/theme/diabook/diabook-aerith/theme.php:143 -#: ../../view/theme/diabook/diabook-pink/theme.php:143 +#: ../../mod/directory.php:47 ../../view/theme/diabook/theme.php:161 msgid "Global Directory" msgstr "Weltweites Verzeichnis" @@ -4278,93 +4218,99 @@ msgstr "Facebook-Verbindungseinstellungen" msgid "Facebook API Key" msgstr "Facebook API Schlüssel" -#: ../../addon/facebook/facebook.php:700 +#: ../../addon/facebook/facebook.php:701 msgid "" "Error: it appears that you have specified the App-ID and -Secret in your " ".htconfig.php file. As long as they are specified there, they cannot be set " "using this form.

" msgstr "Fehler: du scheinst die App-ID und das App-Geheimnis in deiner .htconfig.php Datei angegeben zu haben. Solange sie dort festgelegt werden kannst du dieses Formular hier nicht verwenden.

" -#: ../../addon/facebook/facebook.php:705 +#: ../../addon/facebook/facebook.php:706 msgid "" "Error: the given API Key seems to be incorrect (the application access token" " could not be retrieved)." msgstr "Fehler: der angegebene API Schlüssel scheint nicht korrekt zu sein (Zugriffstoken konnte nicht empfangen werden)." -#: ../../addon/facebook/facebook.php:707 +#: ../../addon/facebook/facebook.php:708 msgid "The given API Key seems to work correctly." msgstr "Der angegebene API Schlüssel scheint korrekt zu funktionieren." -#: ../../addon/facebook/facebook.php:709 +#: ../../addon/facebook/facebook.php:710 msgid "" "The correctness of the API Key could not be detected. Somthing strange's " "going on." msgstr "Die Echtheit des API Schlüssels konnte nicht überprüft werden. Etwas Merkwürdiges ist hier im Gange." -#: ../../addon/facebook/facebook.php:712 +#: ../../addon/facebook/facebook.php:713 msgid "App-ID / API-Key" msgstr "App-ID / API-Key" -#: ../../addon/facebook/facebook.php:713 +#: ../../addon/facebook/facebook.php:714 msgid "Application secret" msgstr "Anwendungs-Geheimnis" -#: ../../addon/facebook/facebook.php:714 +#: ../../addon/facebook/facebook.php:715 #, php-format -msgid "Polling Interval (min. %1$s minutes)" -msgstr "Abrufintervall (min. %1$s Minuten)" +msgid "Polling Interval in minutes (minimum %1$s minutes)" +msgstr "Abfrage-Intervall in Minuten (min %1$s Minuten)" -#: ../../addon/facebook/facebook.php:718 +#: ../../addon/facebook/facebook.php:716 +msgid "" +"Synchronize comments (no comments on Facebook are missed, at the cost of " +"increased system load)" +msgstr "Kommentare synchronisieren (Kein Kommentar von Facebook geht verlohren, verursacht höhere Last auf dem Server)" + +#: ../../addon/facebook/facebook.php:720 msgid "Real-Time Updates" msgstr "Echt-Zeit Aktualisierungen" -#: ../../addon/facebook/facebook.php:722 +#: ../../addon/facebook/facebook.php:724 msgid "Real-Time Updates are activated." msgstr "Echtzeit-Updates sind aktiviert." -#: ../../addon/facebook/facebook.php:723 +#: ../../addon/facebook/facebook.php:725 msgid "Deactivate Real-Time Updates" msgstr "Echtzeit-Updates deaktivieren" -#: ../../addon/facebook/facebook.php:725 +#: ../../addon/facebook/facebook.php:727 msgid "Real-Time Updates not activated." msgstr "Echtzeit-Updates nicht aktiviert." -#: ../../addon/facebook/facebook.php:725 +#: ../../addon/facebook/facebook.php:727 msgid "Activate Real-Time Updates" msgstr "Echtzeit-Updates aktivieren" -#: ../../addon/facebook/facebook.php:743 +#: ../../addon/facebook/facebook.php:746 msgid "The new values have been saved." msgstr "Die neuen Einstellungen wurden gespeichert." -#: ../../addon/facebook/facebook.php:767 +#: ../../addon/facebook/facebook.php:770 msgid "Post to Facebook" msgstr "Bei Facebook veröffentlichen" -#: ../../addon/facebook/facebook.php:865 +#: ../../addon/facebook/facebook.php:868 msgid "" "Post to Facebook cancelled because of multi-network access permission " "conflict." msgstr "Beitrag wurde nicht bei Facebook veröffentlicht, da Konflikte bei den Multi-Netzwerk-Zugriffsrechten vorliegen." -#: ../../addon/facebook/facebook.php:1085 +#: ../../addon/facebook/facebook.php:1088 msgid "View on Friendica" msgstr "In Friendica betrachten" -#: ../../addon/facebook/facebook.php:1118 +#: ../../addon/facebook/facebook.php:1121 msgid "Facebook post failed. Queued for retry." msgstr "Veröffentlichung bei Facebook gescheitert. Wir versuchen es später erneut." -#: ../../addon/facebook/facebook.php:1158 +#: ../../addon/facebook/facebook.php:1161 msgid "Your Facebook connection became invalid. Please Re-authenticate." msgstr "Deine Facebook Anmeldedaten sind ungültig geworden. Bitte re-authentifiziere dich." -#: ../../addon/facebook/facebook.php:1159 +#: ../../addon/facebook/facebook.php:1162 msgid "Facebook connection became invalid" msgstr "Facebook Anmeldedaten sind ungültig geworden" -#: ../../addon/facebook/facebook.php:1160 +#: ../../addon/facebook/facebook.php:1163 #, php-format msgid "" "Hi %1$s,\n" @@ -4372,6 +4318,26 @@ msgid "" "The connection between your accounts on %2$s and Facebook became invalid. This usually happens after you change your Facebook-password. To enable the connection again, you have to %3$sre-authenticate the Facebook-connector%4$s." msgstr "Hi %1$s,\n\ndie Verbindung von deinem Account auf %2$s und Facebook funktioniert derzeit nicht. Dies ist im Allgemeinen das Ergebnis einer Passwortänderung bei Facebook. Um die Verbindung wieder zu aktivieren musst du %3$sden Facebook-Connector neu Authentifizieren%4$s." +#: ../../addon/privacy_image_cache/privacy_image_cache.php:144 +msgid "Lifetime of the cache (in hours)" +msgstr "Lebenszeit des Caches (in Stunden)" + +#: ../../addon/privacy_image_cache/privacy_image_cache.php:149 +msgid "Cache Statistics" +msgstr "Cache Statistik" + +#: ../../addon/privacy_image_cache/privacy_image_cache.php:152 +msgid "Number of items" +msgstr "Anzahl der Einträge" + +#: ../../addon/privacy_image_cache/privacy_image_cache.php:154 +msgid "Size of the cache" +msgstr "Größe des Caches" + +#: ../../addon/privacy_image_cache/privacy_image_cache.php:156 +msgid "Delete the whole cache" +msgstr "Cache leeren" + #: ../../addon/widgets/widget_like.php:58 #, php-format msgid "%d person likes this" @@ -4386,6 +4352,10 @@ msgid_plural "%d people don't like this" msgstr[0] " %d Person mag das nicht" msgstr[1] "%d Leute mögen das nicht" +#: ../../addon/widgets/widget_friendheader.php:40 +msgid "Get added to this list!" +msgstr "Werde Mitglied dieser Liste" + #: ../../addon/widgets/widgets.php:56 msgid "Generate new key" msgstr "Neuen Schlüssel erstellen" @@ -4529,15 +4499,8 @@ msgid "Latest likes" msgstr "Neueste Favoriten" #: ../../addon/communityhome/communityhome.php:155 -#: ../../view/theme/diabook/diabook-green/theme.php:80 -#: ../../view/theme/diabook/diabook-red/theme.php:79 -#: ../../view/theme/diabook/diabook-blue/theme.php:79 -#: ../../view/theme/diabook/theme.php:94 -#: ../../view/theme/diabook/diabook-dark/theme.php:80 -#: ../../view/theme/diabook/diabook-aerith/theme.php:80 -#: ../../view/theme/diabook/diabook-pink/theme.php:80 -#: ../../include/text.php:1302 ../../include/conversation.php:45 -#: ../../include/conversation.php:118 +#: ../../view/theme/diabook/theme.php:99 ../../include/text.php:1302 +#: ../../include/conversation.php:45 ../../include/conversation.php:118 msgid "event" msgstr "Veranstaltung" @@ -4745,68 +4708,70 @@ msgstr "OEmbed für Youtube Videos verwenden" msgid "URL to embed:" msgstr "URL zum Einbetten:" -#: ../../addon/impressum/impressum.php:34 +#: ../../addon/impressum/impressum.php:36 msgid "Impressum" msgstr "Impressum" -#: ../../addon/impressum/impressum.php:47 #: ../../addon/impressum/impressum.php:49 -#: ../../addon/impressum/impressum.php:81 +#: ../../addon/impressum/impressum.php:51 +#: ../../addon/impressum/impressum.php:83 msgid "Site Owner" msgstr "Betreiber der Seite" -#: ../../addon/impressum/impressum.php:47 -#: ../../addon/impressum/impressum.php:85 +#: ../../addon/impressum/impressum.php:49 +#: ../../addon/impressum/impressum.php:87 msgid "Email Address" msgstr "Email Adresse" -#: ../../addon/impressum/impressum.php:52 -#: ../../addon/impressum/impressum.php:83 +#: ../../addon/impressum/impressum.php:54 +#: ../../addon/impressum/impressum.php:85 msgid "Postal Address" msgstr "Postalische Anschrift" -#: ../../addon/impressum/impressum.php:58 +#: ../../addon/impressum/impressum.php:60 msgid "" "The impressum addon needs to be configured!
Please add at least the " "owner variable to your config file. For other variables please " "refer to the README file of the addon." msgstr "Das Impressums-Plugin muss noch konfiguriert werden.
Bitte gebe mindestens den Betreiber in der Konfiguration an. Alle weiteren Parameter werden in der README-Datei des Addons erläutert." -#: ../../addon/impressum/impressum.php:81 +#: ../../addon/impressum/impressum.php:83 msgid "The page operators name." msgstr "Name des Server-Administrators" -#: ../../addon/impressum/impressum.php:82 +#: ../../addon/impressum/impressum.php:84 msgid "Site Owners Profile" msgstr "Profil des Seitenbetreibers" -#: ../../addon/impressum/impressum.php:82 +#: ../../addon/impressum/impressum.php:84 msgid "Profile address of the operator." msgstr "Profil-Adresse des Server-Administrators" -#: ../../addon/impressum/impressum.php:83 -msgid "How to contact the operator via snail mail." -msgstr "Wie erreicht man den Betreiber der Seite postalisch." +#: ../../addon/impressum/impressum.php:85 +msgid "How to contact the operator via snail mail. You can use BBCode here." +msgstr "Kontaktmöglichkeiten zum Administrator via Schneckenpost. Du kannst BBCode verwenden." -#: ../../addon/impressum/impressum.php:84 +#: ../../addon/impressum/impressum.php:86 msgid "Notes" msgstr "Hinweise" -#: ../../addon/impressum/impressum.php:84 -msgid "Additional notes that are displayed beneath the contact information." -msgstr "Zusätzliche Angaben, die unterhalb der Kontakt-Informationen angezeigt werden." +#: ../../addon/impressum/impressum.php:86 +msgid "" +"Additional notes that are displayed beneath the contact information. You can" +" use BBCode here." +msgstr "Zusätzliche Informationen die neben den Kontaktmöglichkeiten angezeigt werden. Du kannst BBCode verwenden." -#: ../../addon/impressum/impressum.php:85 +#: ../../addon/impressum/impressum.php:87 msgid "How to contact the operator via email. (will be displayed obfuscated)" msgstr "Wie erreichts man den Betreiber per Email. (Adresse wird verschleiert dargestellt)" -#: ../../addon/impressum/impressum.php:86 +#: ../../addon/impressum/impressum.php:88 msgid "Footer note" msgstr "Fußnote" -#: ../../addon/impressum/impressum.php:86 -msgid "Text for the footer." -msgstr "Text für die Fußnote" +#: ../../addon/impressum/impressum.php:88 +msgid "Text for the footer. You can use BBCode here." +msgstr "Text für die Fußzeile. Du kannst BBCode verwenden." #: ../../addon/buglink/buglink.php:15 msgid "Report Bug" @@ -5430,228 +5395,100 @@ msgstr "Posterous-Passwort" msgid "Post to Posterous by default" msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei Posterous" -#: ../../view/theme/diabook/diabook-green/theme.php:29 -#: ../../view/theme/diabook/diabook-red/theme.php:28 -#: ../../view/theme/diabook/diabook-blue/theme.php:28 -#: ../../view/theme/diabook/theme.php:43 -#: ../../view/theme/diabook/diabook-dark/theme.php:29 -#: ../../view/theme/diabook/diabook-aerith/theme.php:29 -#: ../../view/theme/diabook/diabook-pink/theme.php:29 -msgid "Last users" -msgstr "Letzte Nutzer" - -#: ../../view/theme/diabook/diabook-green/theme.php:58 -#: ../../view/theme/diabook/diabook-red/theme.php:57 -#: ../../view/theme/diabook/diabook-blue/theme.php:57 -#: ../../view/theme/diabook/theme.php:72 -#: ../../view/theme/diabook/diabook-dark/theme.php:58 -#: ../../view/theme/diabook/diabook-aerith/theme.php:58 -#: ../../view/theme/diabook/diabook-pink/theme.php:58 -msgid "Last likes" -msgstr "Zuletzt gemocht" - -#: ../../view/theme/diabook/diabook-green/theme.php:103 -#: ../../view/theme/diabook/diabook-red/theme.php:102 -#: ../../view/theme/diabook/diabook-blue/theme.php:102 -#: ../../view/theme/diabook/theme.php:117 -#: ../../view/theme/diabook/diabook-dark/theme.php:103 -#: ../../view/theme/diabook/diabook-aerith/theme.php:103 -#: ../../view/theme/diabook/diabook-pink/theme.php:103 -msgid "Last photos" -msgstr "Letzte Fotos" - -#: ../../view/theme/diabook/diabook-green/theme.php:141 -#: ../../view/theme/diabook/diabook-red/theme.php:139 -#: ../../view/theme/diabook/diabook-blue/theme.php:139 -#: ../../view/theme/diabook/theme.php:154 -#: ../../view/theme/diabook/diabook-dark/theme.php:141 -#: ../../view/theme/diabook/diabook-aerith/theme.php:141 -#: ../../view/theme/diabook/diabook-pink/theme.php:141 -msgid "Find Friends" -msgstr "Freunde finden" - -#: ../../view/theme/diabook/diabook-green/theme.php:142 -#: ../../view/theme/diabook/diabook-red/theme.php:140 -#: ../../view/theme/diabook/diabook-blue/theme.php:140 -#: ../../view/theme/diabook/theme.php:155 -#: ../../view/theme/diabook/diabook-dark/theme.php:142 -#: ../../view/theme/diabook/diabook-aerith/theme.php:142 -#: ../../view/theme/diabook/diabook-pink/theme.php:142 -msgid "Local Directory" -msgstr "Lokales Verzeichnis" - -#: ../../view/theme/diabook/diabook-green/theme.php:144 -#: ../../view/theme/diabook/diabook-red/theme.php:142 -#: ../../view/theme/diabook/diabook-blue/theme.php:142 -#: ../../view/theme/diabook/theme.php:157 -#: ../../view/theme/diabook/diabook-dark/theme.php:144 -#: ../../view/theme/diabook/diabook-aerith/theme.php:144 -#: ../../view/theme/diabook/diabook-pink/theme.php:144 -#: ../../include/contact_widgets.php:35 -msgid "Similar Interests" -msgstr "Ähnliche Interessen" - -#: ../../view/theme/diabook/diabook-green/theme.php:146 -#: ../../view/theme/diabook/diabook-red/theme.php:144 -#: ../../view/theme/diabook/diabook-blue/theme.php:144 -#: ../../view/theme/diabook/theme.php:159 -#: ../../view/theme/diabook/diabook-dark/theme.php:146 -#: ../../view/theme/diabook/diabook-aerith/theme.php:146 -#: ../../view/theme/diabook/diabook-pink/theme.php:146 -#: ../../include/contact_widgets.php:37 -msgid "Invite Friends" -msgstr "Freunde einladen" - -#: ../../view/theme/diabook/diabook-green/theme.php:161 -#: ../../view/theme/diabook/diabook-green/theme.php:236 -#: ../../view/theme/diabook/diabook-red/theme.php:159 -#: ../../view/theme/diabook/diabook-red/theme.php:234 -#: ../../view/theme/diabook/diabook-blue/theme.php:159 -#: ../../view/theme/diabook/diabook-blue/theme.php:234 -#: ../../view/theme/diabook/theme.php:175 -#: ../../view/theme/diabook/theme.php:253 -#: ../../view/theme/diabook/diabook-dark/theme.php:161 -#: ../../view/theme/diabook/diabook-dark/theme.php:236 -#: ../../view/theme/diabook/diabook-aerith/theme.php:161 -#: ../../view/theme/diabook/diabook-aerith/theme.php:236 -#: ../../view/theme/diabook/diabook-pink/theme.php:161 -#: ../../view/theme/diabook/diabook-pink/theme.php:236 -msgid "Community Pages" -msgstr "Foren" - -#: ../../view/theme/diabook/diabook-green/theme.php:194 -#: ../../view/theme/diabook/diabook-red/theme.php:192 -#: ../../view/theme/diabook/diabook-blue/theme.php:192 -#: ../../view/theme/diabook/theme.php:208 -#: ../../view/theme/diabook/diabook-dark/theme.php:194 -#: ../../view/theme/diabook/diabook-aerith/theme.php:194 -#: ../../view/theme/diabook/diabook-pink/theme.php:194 -msgid "Help or @NewHere ?" -msgstr "Hilfe oder @NewHere" - -#: ../../view/theme/diabook/diabook-green/theme.php:200 -#: ../../view/theme/diabook/diabook-red/theme.php:198 -#: ../../view/theme/diabook/diabook-blue/theme.php:198 -#: ../../view/theme/diabook/theme.php:214 -#: ../../view/theme/diabook/diabook-dark/theme.php:200 -#: ../../view/theme/diabook/diabook-aerith/theme.php:200 -#: ../../view/theme/diabook/diabook-pink/theme.php:200 -msgid "Connect Services" -msgstr "Verbinde Dienste" - -#: ../../view/theme/diabook/diabook-green/theme.php:229 -#: ../../view/theme/diabook/diabook-red/theme.php:227 -#: ../../view/theme/diabook/diabook-blue/theme.php:227 -#: ../../view/theme/diabook/theme.php:246 -#: ../../view/theme/diabook/diabook-dark/theme.php:229 -#: ../../view/theme/diabook/diabook-aerith/theme.php:229 -#: ../../view/theme/diabook/diabook-pink/theme.php:229 -#: ../../include/nav.php:49 ../../include/nav.php:115 -msgid "Your posts and conversations" -msgstr "Deine Beiträge und Unterhaltungen" - -#: ../../view/theme/diabook/diabook-green/theme.php:230 -#: ../../view/theme/diabook/diabook-red/theme.php:228 -#: ../../view/theme/diabook/diabook-blue/theme.php:228 -#: ../../view/theme/diabook/theme.php:247 -#: ../../view/theme/diabook/diabook-dark/theme.php:230 -#: ../../view/theme/diabook/diabook-aerith/theme.php:230 -#: ../../view/theme/diabook/diabook-pink/theme.php:230 -#: ../../include/nav.php:50 -msgid "Your profile page" -msgstr "Deine Profilseite" - -#: ../../view/theme/diabook/diabook-green/theme.php:231 -#: ../../view/theme/diabook/diabook-red/theme.php:229 -#: ../../view/theme/diabook/diabook-blue/theme.php:229 -#: ../../view/theme/diabook/theme.php:248 -#: ../../view/theme/diabook/diabook-dark/theme.php:231 -#: ../../view/theme/diabook/diabook-aerith/theme.php:231 -#: ../../view/theme/diabook/diabook-pink/theme.php:231 -msgid "Your contacts" -msgstr "Deine Kontakte" - -#: ../../view/theme/diabook/diabook-green/theme.php:232 -#: ../../view/theme/diabook/diabook-red/theme.php:230 -#: ../../view/theme/diabook/diabook-blue/theme.php:230 -#: ../../view/theme/diabook/theme.php:249 -#: ../../view/theme/diabook/diabook-dark/theme.php:232 -#: ../../view/theme/diabook/diabook-aerith/theme.php:232 -#: ../../view/theme/diabook/diabook-pink/theme.php:232 -#: ../../include/nav.php:51 -msgid "Your photos" -msgstr "Deine Fotos" - -#: ../../view/theme/diabook/diabook-green/theme.php:233 -#: ../../view/theme/diabook/diabook-red/theme.php:231 -#: ../../view/theme/diabook/diabook-blue/theme.php:231 -#: ../../view/theme/diabook/theme.php:250 -#: ../../view/theme/diabook/diabook-dark/theme.php:233 -#: ../../view/theme/diabook/diabook-aerith/theme.php:233 -#: ../../view/theme/diabook/diabook-pink/theme.php:233 -#: ../../include/nav.php:52 -msgid "Your events" -msgstr "Deine Ereignisse" - -#: ../../view/theme/diabook/diabook-green/theme.php:234 -#: ../../view/theme/diabook/diabook-red/theme.php:232 -#: ../../view/theme/diabook/diabook-blue/theme.php:232 -#: ../../view/theme/diabook/theme.php:251 -#: ../../view/theme/diabook/diabook-dark/theme.php:234 -#: ../../view/theme/diabook/diabook-aerith/theme.php:234 -#: ../../view/theme/diabook/diabook-pink/theme.php:234 -#: ../../include/nav.php:53 -msgid "Personal notes" -msgstr "Persönliche Notizen" - -#: ../../view/theme/diabook/diabook-green/theme.php:234 -#: ../../view/theme/diabook/diabook-red/theme.php:232 -#: ../../view/theme/diabook/diabook-blue/theme.php:232 -#: ../../view/theme/diabook/theme.php:251 -#: ../../view/theme/diabook/diabook-dark/theme.php:234 -#: ../../view/theme/diabook/diabook-aerith/theme.php:234 -#: ../../view/theme/diabook/diabook-pink/theme.php:234 -#: ../../include/nav.php:53 -msgid "Your personal photos" -msgstr "Deine privaten Fotos" - -#: ../../view/theme/diabook/diabook-green/config.php:78 -#: ../../view/theme/diabook/diabook-red/config.php:78 -#: ../../view/theme/diabook/diabook-blue/config.php:78 -#: ../../view/theme/diabook/diabook-dark/config.php:78 -#: ../../view/theme/diabook/diabook-aerith/config.php:78 -#: ../../view/theme/diabook/diabook-pink/config.php:78 +#: ../../view/theme/cleanzero/config.php:73 #: ../../view/theme/diabook/config.php:93 -#: ../../view/theme/quattro/config.php:54 +#: ../../view/theme/quattro/config.php:54 ../../view/theme/dispy/config.php:72 msgid "Theme settings" msgstr "Themen Einstellungen" -#: ../../view/theme/diabook/diabook-green/config.php:79 -#: ../../view/theme/diabook/diabook-red/config.php:79 -#: ../../view/theme/diabook/diabook-blue/config.php:79 -#: ../../view/theme/diabook/diabook-dark/config.php:79 -#: ../../view/theme/diabook/diabook-aerith/config.php:79 -#: ../../view/theme/diabook/diabook-pink/config.php:79 -#: ../../view/theme/diabook/config.php:94 +#: ../../view/theme/cleanzero/config.php:74 +msgid "Set resize level for images in posts and comments (width and height)" +msgstr "Wähle das Vergrößerungsmaß für Bilder in Beiträgen und Kommentaren (Höhe und Breite)" + +#: ../../view/theme/cleanzero/config.php:75 +#: ../../view/theme/diabook/config.php:94 ../../view/theme/dispy/config.php:73 msgid "Set font-size for posts and comments" msgstr "Schriftgröße für Beiträge und Kommentare festlegen" -#: ../../view/theme/diabook/diabook-green/config.php:80 -#: ../../view/theme/diabook/diabook-red/config.php:80 -#: ../../view/theme/diabook/diabook-blue/config.php:80 -#: ../../view/theme/diabook/diabook-dark/config.php:80 -#: ../../view/theme/diabook/diabook-aerith/config.php:80 -#: ../../view/theme/diabook/diabook-pink/config.php:80 -#: ../../view/theme/diabook/config.php:95 +#: ../../view/theme/cleanzero/config.php:76 +#: ../../view/theme/quattro/config.php:56 +msgid "Color scheme" +msgstr "Farbschema" + +#: ../../view/theme/diabook/theme.php:48 +msgid "Last users" +msgstr "Letzte Nutzer" + +#: ../../view/theme/diabook/theme.php:77 +msgid "Last likes" +msgstr "Zuletzt gemocht" + +#: ../../view/theme/diabook/theme.php:122 +msgid "Last photos" +msgstr "Letzte Fotos" + +#: ../../view/theme/diabook/theme.php:159 +msgid "Find Friends" +msgstr "Freunde finden" + +#: ../../view/theme/diabook/theme.php:160 +msgid "Local Directory" +msgstr "Lokales Verzeichnis" + +#: ../../view/theme/diabook/theme.php:162 ../../include/contact_widgets.php:35 +msgid "Similar Interests" +msgstr "Ähnliche Interessen" + +#: ../../view/theme/diabook/theme.php:164 ../../include/contact_widgets.php:37 +msgid "Invite Friends" +msgstr "Freunde einladen" + +#: ../../view/theme/diabook/theme.php:180 +#: ../../view/theme/diabook/theme.php:258 +msgid "Community Pages" +msgstr "Foren" + +#: ../../view/theme/diabook/theme.php:213 +msgid "Help or @NewHere ?" +msgstr "Hilfe oder @NewHere" + +#: ../../view/theme/diabook/theme.php:219 +msgid "Connect Services" +msgstr "Verbinde Dienste" + +#: ../../view/theme/diabook/theme.php:251 ../../include/nav.php:49 +#: ../../include/nav.php:115 +msgid "Your posts and conversations" +msgstr "Deine Beiträge und Unterhaltungen" + +#: ../../view/theme/diabook/theme.php:252 ../../include/nav.php:50 +msgid "Your profile page" +msgstr "Deine Profilseite" + +#: ../../view/theme/diabook/theme.php:253 +msgid "Your contacts" +msgstr "Deine Kontakte" + +#: ../../view/theme/diabook/theme.php:254 ../../include/nav.php:51 +msgid "Your photos" +msgstr "Deine Fotos" + +#: ../../view/theme/diabook/theme.php:255 ../../include/nav.php:52 +msgid "Your events" +msgstr "Deine Ereignisse" + +#: ../../view/theme/diabook/theme.php:256 ../../include/nav.php:53 +msgid "Personal notes" +msgstr "Persönliche Notizen" + +#: ../../view/theme/diabook/theme.php:256 ../../include/nav.php:53 +msgid "Your personal photos" +msgstr "Deine privaten Fotos" + +#: ../../view/theme/diabook/config.php:95 ../../view/theme/dispy/config.php:74 msgid "Set line-height for posts and comments" msgstr "Liniengröße für Beiträge und Kommantare festlegen" -#: ../../view/theme/diabook/diabook-green/config.php:81 -#: ../../view/theme/diabook/diabook-red/config.php:81 -#: ../../view/theme/diabook/diabook-blue/config.php:81 -#: ../../view/theme/diabook/diabook-dark/config.php:81 -#: ../../view/theme/diabook/diabook-aerith/config.php:81 -#: ../../view/theme/diabook/diabook-pink/config.php:81 #: ../../view/theme/diabook/config.php:96 msgid "Set resolution for middle column" msgstr "Auflösung für die Mittelspalte setzen" @@ -5672,9 +5509,9 @@ msgstr "Links" msgid "Center" msgstr "Mitte" -#: ../../view/theme/quattro/config.php:56 -msgid "Color scheme" -msgstr "Farbschema" +#: ../../view/theme/dispy/config.php:75 +msgid "Set colour scheme" +msgstr "Farbschema wählen" #: ../../include/profile_advanced.php:17 ../../boot.php:1085 msgid "Gender:" @@ -6065,12 +5902,12 @@ msgstr "Beginnt:" msgid "Finishes:" msgstr "Endet:" -#: ../../include/delivery.php:434 ../../include/notifier.php:651 +#: ../../include/delivery.php:434 ../../include/notifier.php:652 msgid "(no subject)" msgstr "(kein Betreff)" #: ../../include/delivery.php:441 ../../include/enotify.php:23 -#: ../../include/notifier.php:658 +#: ../../include/notifier.php:659 msgid "noreply" msgstr "noreply" @@ -6293,7 +6130,7 @@ msgstr "Abmelden" msgid "End this session" msgstr "Diese Sitzung beenden" -#: ../../include/nav.php:49 ../../boot.php:1453 +#: ../../include/nav.php:49 ../../boot.php:1463 msgid "Status" msgstr "Status" @@ -6543,7 +6380,7 @@ msgstr "Sekunden" msgid "%1$d %2$s ago" msgstr "%1$d %2$s her" -#: ../../include/poller.php:543 +#: ../../include/onepoll.php:402 msgid "From: " msgstr "Von: " @@ -6551,7 +6388,7 @@ msgstr "Von: " msgid "$1 wrote:" msgstr "$1 hat geschrieben:" -#: ../../include/bbcode.php:238 ../../include/bbcode.php:304 +#: ../../include/bbcode.php:238 ../../include/bbcode.php:307 msgid "Image/photo" msgstr "Bild/Foto" @@ -6799,30 +6636,34 @@ msgid "" "form has been opened for too long (>3 hours) before submitting it." msgstr "Das Sicherheits-Merkmal war nicht korrekt. Das passiert meistens wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden)." -#: ../../include/Contact.php:145 ../../include/conversation.php:809 +#: ../../include/Contact.php:96 +msgid "stopped following" +msgstr "wird nicht mehr gefolgt" + +#: ../../include/Contact.php:188 ../../include/conversation.php:817 msgid "View Status" msgstr "Pinnwand anschauen" -#: ../../include/Contact.php:146 ../../include/conversation.php:810 +#: ../../include/Contact.php:189 ../../include/conversation.php:818 msgid "View Profile" msgstr "Profil anschauen" -#: ../../include/Contact.php:147 ../../include/conversation.php:811 +#: ../../include/Contact.php:190 ../../include/conversation.php:819 msgid "View Photos" msgstr "Bilder anschauen" -#: ../../include/Contact.php:148 ../../include/Contact.php:161 -#: ../../include/conversation.php:812 +#: ../../include/Contact.php:191 ../../include/Contact.php:204 +#: ../../include/conversation.php:820 msgid "Network Posts" msgstr "Netzwerk Beiträge" -#: ../../include/Contact.php:149 ../../include/Contact.php:161 -#: ../../include/conversation.php:813 +#: ../../include/Contact.php:192 ../../include/Contact.php:204 +#: ../../include/conversation.php:821 msgid "Edit Contact" msgstr "Kontakt bearbeiten" -#: ../../include/Contact.php:150 ../../include/Contact.php:161 -#: ../../include/conversation.php:814 +#: ../../include/Contact.php:193 ../../include/Contact.php:204 +#: ../../include/conversation.php:822 msgid "Send PM" msgstr "Private Nachricht senden" @@ -6835,17 +6676,17 @@ msgstr "Nachricht/Beitrag" msgid "%1$s marked %2$s's %3$s as favorite" msgstr "%1$s hat %2$s\\s %3$s als Favorit markiert" -#: ../../include/conversation.php:317 ../../include/conversation.php:575 +#: ../../include/conversation.php:317 ../../include/conversation.php:583 msgid "Select" msgstr "Auswählen" -#: ../../include/conversation.php:334 ../../include/conversation.php:668 -#: ../../include/conversation.php:669 +#: ../../include/conversation.php:334 ../../include/conversation.php:676 +#: ../../include/conversation.php:677 #, php-format msgid "View %s's profile @ %s" msgstr "Das Profil von %s auf %s betrachten." -#: ../../include/conversation.php:344 ../../include/conversation.php:680 +#: ../../include/conversation.php:344 ../../include/conversation.php:688 #, php-format msgid "%s from %s" msgstr "%s von %s" @@ -6877,142 +6718,174 @@ msgstr "Teile dieses" msgid "share" msgstr "Teilen" -#: ../../include/conversation.php:588 +#: ../../include/conversation.php:556 +msgid "Bold" +msgstr "Fett" + +#: ../../include/conversation.php:557 +msgid "Italic" +msgstr "Kursiv" + +#: ../../include/conversation.php:558 +msgid "Underline" +msgstr "Unterstrichen" + +#: ../../include/conversation.php:559 +msgid "Quote" +msgstr "Zitat" + +#: ../../include/conversation.php:560 +msgid "Code" +msgstr "Code" + +#: ../../include/conversation.php:561 +msgid "Image" +msgstr "Bild" + +#: ../../include/conversation.php:562 +msgid "Link" +msgstr "Verweis" + +#: ../../include/conversation.php:563 +msgid "Video" +msgstr "Video" + +#: ../../include/conversation.php:596 msgid "add star" msgstr "markieren" -#: ../../include/conversation.php:589 +#: ../../include/conversation.php:597 msgid "remove star" msgstr "Markierung entfernen" -#: ../../include/conversation.php:590 +#: ../../include/conversation.php:598 msgid "toggle star status" msgstr "Markierung umschalten" -#: ../../include/conversation.php:593 +#: ../../include/conversation.php:601 msgid "starred" msgstr "markiert" -#: ../../include/conversation.php:594 +#: ../../include/conversation.php:602 msgid "add tag" msgstr "Tag hinzufügen" -#: ../../include/conversation.php:598 +#: ../../include/conversation.php:606 msgid "save to folder" msgstr "In Ordner speichern" -#: ../../include/conversation.php:670 +#: ../../include/conversation.php:678 msgid "to" msgstr "zu" -#: ../../include/conversation.php:671 +#: ../../include/conversation.php:679 msgid "Wall-to-Wall" msgstr "Wall-to-Wall" -#: ../../include/conversation.php:672 +#: ../../include/conversation.php:680 msgid "via Wall-To-Wall:" msgstr "via Wall-To-Wall:" -#: ../../include/conversation.php:717 +#: ../../include/conversation.php:725 msgid "Delete Selected Items" msgstr "Lösche die markierten Beiträge" -#: ../../include/conversation.php:868 +#: ../../include/conversation.php:876 #, php-format msgid "%s likes this." msgstr "%s mag das." -#: ../../include/conversation.php:868 +#: ../../include/conversation.php:876 #, php-format msgid "%s doesn't like this." msgstr "%s mag das nicht." -#: ../../include/conversation.php:872 +#: ../../include/conversation.php:880 #, php-format msgid "%2$d people like this." msgstr "%2$d Leute mögen das." -#: ../../include/conversation.php:874 +#: ../../include/conversation.php:882 #, php-format msgid "%2$d people don't like this." msgstr "%2$d Leute mögen das nicht." -#: ../../include/conversation.php:880 +#: ../../include/conversation.php:888 msgid "and" msgstr "und" -#: ../../include/conversation.php:883 +#: ../../include/conversation.php:891 #, php-format msgid ", and %d other people" msgstr " und %d andere" -#: ../../include/conversation.php:884 +#: ../../include/conversation.php:892 #, php-format msgid "%s like this." msgstr "%s mögen das." -#: ../../include/conversation.php:884 +#: ../../include/conversation.php:892 #, php-format msgid "%s don't like this." msgstr "%s mögen das nicht." -#: ../../include/conversation.php:909 +#: ../../include/conversation.php:917 msgid "Visible to everybody" msgstr "Für jedermann sichtbar" -#: ../../include/conversation.php:911 +#: ../../include/conversation.php:919 msgid "Please enter a video link/URL:" msgstr "Bitte Link/URL zum Video einfügen:" -#: ../../include/conversation.php:912 +#: ../../include/conversation.php:920 msgid "Please enter an audio link/URL:" msgstr "Bitte Link/URL zum Audio einfügen:" -#: ../../include/conversation.php:913 +#: ../../include/conversation.php:921 msgid "Tag term:" msgstr "Tag:" -#: ../../include/conversation.php:915 +#: ../../include/conversation.php:923 msgid "Where are you right now?" msgstr "Wo hältst du dich jetzt gerade auf?" -#: ../../include/conversation.php:958 +#: ../../include/conversation.php:966 msgid "upload photo" msgstr "Bild hochladen" -#: ../../include/conversation.php:960 +#: ../../include/conversation.php:968 msgid "attach file" msgstr "Datei anhängen" -#: ../../include/conversation.php:962 +#: ../../include/conversation.php:970 msgid "web link" msgstr "Weblink" -#: ../../include/conversation.php:963 +#: ../../include/conversation.php:971 msgid "Insert video link" msgstr "Video-Adresse einfügen" -#: ../../include/conversation.php:964 +#: ../../include/conversation.php:972 msgid "video link" msgstr "Video-Link" -#: ../../include/conversation.php:965 +#: ../../include/conversation.php:973 msgid "Insert audio link" msgstr "Audio-Adresse einfügen" -#: ../../include/conversation.php:966 +#: ../../include/conversation.php:974 msgid "audio link" msgstr "Audio-Link" -#: ../../include/conversation.php:968 +#: ../../include/conversation.php:976 msgid "set location" msgstr "Ort setzen" -#: ../../include/conversation.php:970 +#: ../../include/conversation.php:978 msgid "clear location" msgstr "Ort löschen" -#: ../../include/conversation.php:977 +#: ../../include/conversation.php:985 msgid "permissions" msgstr "Zugriffsrechte" @@ -7052,34 +6925,34 @@ msgstr "Profil bearbeiten" msgid "Message" msgstr "Nachricht" -#: ../../boot.php:1151 ../../boot.php:1223 +#: ../../boot.php:1151 ../../boot.php:1227 msgid "g A l F d" msgstr "l, d. F G \\U\\h\\r" -#: ../../boot.php:1152 ../../boot.php:1224 +#: ../../boot.php:1152 ../../boot.php:1228 msgid "F d" msgstr "d. F" -#: ../../boot.php:1177 -msgid "Birthday Reminders" -msgstr "Geburtstagserinnerungen" - -#: ../../boot.php:1178 -msgid "Birthdays this week:" -msgstr "Geburtstage diese Woche:" - -#: ../../boot.php:1201 ../../boot.php:1266 +#: ../../boot.php:1197 ../../boot.php:1268 msgid "[today]" msgstr "[heute]" -#: ../../boot.php:1247 +#: ../../boot.php:1209 +msgid "Birthday Reminders" +msgstr "Geburtstagserinnerungen" + +#: ../../boot.php:1210 +msgid "Birthdays this week:" +msgstr "Geburtstage diese Woche:" + +#: ../../boot.php:1261 +msgid "[No description]" +msgstr "[keine Beschreibung]" + +#: ../../boot.php:1279 msgid "Event Reminders" msgstr "Veranstaltungserinnerungen" -#: ../../boot.php:1248 +#: ../../boot.php:1280 msgid "Events this week:" msgstr "Veranstaltungen diese Woche" - -#: ../../boot.php:1260 -msgid "[No description]" -msgstr "[keine Beschreibung]" diff --git a/view/de/register_open_eml.tpl b/view/de/register_open_eml.tpl index d1c0e5ff4..fffee2247 100644 --- a/view/de/register_open_eml.tpl +++ b/view/de/register_open_eml.tpl @@ -1,34 +1,34 @@ - -Hallo $[username], - Danke für deine Anmeldung auf $[sitename]. Dein Account wurde angelegt. -Die Login Details sind die folgenden: - - -Adresse der Seite: $[siteurl] -Login Name: $[email] -Passwort: $[password] - -Du kannst das Passwort in den "Einstellungen" zu deinem Account ändern -nachdem du dich eingeloggt hast. - -Bitte nimm dir einige Augenblicke Zeit um die anderen Einstellungen auf der Seite zu überprüfen. - -Eventuell möchtest du außerdem einige grundlegenden Informationen in dein Standart-Profil eintragen -(auf der "Profile" Seite) damit andere Leute dich einfacher finden können. - -Wir empfehlen den kompletten Namen anzugeben, ein eigenes Profil-Foto, -ein paar "Profil-Schlüsselwörter" anzugeben (damit man leichter Gleichinteressierte finden kann) - und -natürlich in welchen Land Du lebst; wenn Du es nicht genauer angeben möchtest -dann das. - -Wir respektieren Ihr Recht auf Privatsphäre, und keines dieser Elemente sind notwendig. -Wenn Du hier neu bist und keinen kennst, wird man Dir helfen -ein paar neue und interessante Freunde zu finden. - - -Danke dir und willkommen auf $[sitename]. - -Beste Grüße, - $[sitename] Administrator - + +Hallo $[username], + Danke für deine Anmeldung auf $[sitename]. Dein Account wurde angelegt. +Die Login Details sind die folgenden: + + +Adresse der Seite: $[siteurl] +Login Name: $[email] +Passwort: $[password] + +Du kannst das Passwort in den "Einstellungen" zu deinem Account ändern +nachdem du dich eingeloggt hast. + +Bitte nimm dir einige Augenblicke Zeit um die anderen Einstellungen auf der Seite zu überprüfen. + +Eventuell möchtest du außerdem einige grundlegenden Informationen in dein Standart-Profil eintragen +(auf der "Profile" Seite) damit andere Leute dich einfacher finden können. + +Wir empfehlen den kompletten Namen anzugeben, ein eigenes Profil-Foto, +ein paar "Profil-Schlüsselwörter" anzugeben (damit man leichter Gleichinteressierte finden kann) - und +natürlich in welchen Land Du lebst; wenn Du es nicht genauer angeben möchtest +dann das. + +Wir respektieren Ihr Recht auf Privatsphäre, und keines dieser Elemente sind notwendig. +Wenn Du hier neu bist und keinen kennst, wird man Dir helfen +ein paar neue und interessante Freunde zu finden. + + +Danke dir und willkommen auf $[sitename]. + +Beste Grüße, + $[sitename] Administrator + \ No newline at end of file diff --git a/view/de/strings.php b/view/de/strings.php index 74125549d..f9d4fa668 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -138,7 +138,7 @@ $a->strings["Permission settings"] = "Berechtigungseinstellungen"; $a->strings["CC: email addresses"] = "Cc:-E-Mail-Addressen"; $a->strings["Public post"] = "Öffentlicher Beitrag"; $a->strings["Set title"] = "Titel setzen"; -$a->strings["Categories (comma-separated list)"] = "Kategorien (mit Komma separierte Liste)"; +$a->strings["Categories (comma-separated list)"] = "Kategorien (kommasepariert)"; $a->strings["Example: bob@example.com, mary@example.com"] = "Z.B.: bob@example.com, mary@example.com"; $a->strings["This introduction has already been accepted."] = "Diese Kontaktanfrage wurde bereits akzeptiert."; $a->strings["Profile location is not valid or does not contain profile information."] = "Profiladresse ist ungültig oder stellt einige Profildaten nicht zur Verfügung."; @@ -301,7 +301,8 @@ $a->strings["Contact has been blocked"] = "Kontakt wurde blockiert"; $a->strings["Contact has been unblocked"] = "Kontakt wurde wieder freigegeben"; $a->strings["Contact has been ignored"] = "Kontakt wurde ignoriert"; $a->strings["Contact has been unignored"] = "Kontakt wird nicht mehr ignoriert"; -$a->strings["stopped following"] = "wird nicht mehr gefolgt"; +$a->strings["Contact has been archived"] = "Kontakt wurde archiviert"; +$a->strings["Contact has been unarchived"] = "Kontakt wurde aus dem Archiv geholt"; $a->strings["Contact has been removed."] = "Kontakt wurde entfernt."; $a->strings["You are mutual friends with %s"] = "Du hast mit %s eine beidseitige Freundschaft"; $a->strings["You are sharing with %s"] = "Du teilst mit %s"; @@ -320,6 +321,8 @@ $a->strings["View all contacts"] = "Alle Kontakte anzeigen"; $a->strings["Unblock"] = "Entsperren"; $a->strings["Block"] = "Sperren"; $a->strings["Unignore"] = "Ignorieren aufheben"; +$a->strings["Unarchive"] = "Unarchivieren"; +$a->strings["Archive"] = "Archivieren"; $a->strings["Repair"] = "Reparieren"; $a->strings["Contact Editor"] = "Kontakt Editor"; $a->strings["Profile Visibility"] = "Profil Anzeige"; @@ -337,13 +340,15 @@ $a->strings["Update public posts"] = "Öffentliche Beiträge aktualisieren"; $a->strings["Update now"] = "Jetzt aktualisieren"; $a->strings["Currently blocked"] = "Derzeit geblockt"; $a->strings["Currently ignored"] = "Derzeit ignoriert"; +$a->strings["Currently archived"] = "Momentan archiviert"; $a->strings["Replies/likes to your public posts may still be visible"] = "Antworten/Likes auf deine öffentlichen Beiträge könnten weiterhin sichtbar sein"; $a->strings["Suggestions"] = "Kontaktvorschläge"; $a->strings["All Contacts"] = "Alle Kontakte"; -$a->strings["Unblocked Contacts"] = "Nicht blockierte Kontakte"; -$a->strings["Blocked Contacts"] = "Blockierte Kontakte"; -$a->strings["Ignored Contacts"] = "Ignorierte Kontakte"; -$a->strings["Hidden Contacts"] = "Verborgene Kontakte"; +$a->strings["Unblocked"] = "Ungeblockt"; +$a->strings["Blocked"] = "Geblockt"; +$a->strings["Ignored"] = "Ignoriert"; +$a->strings["Archived"] = "Archiviert"; +$a->strings["Hidden"] = "Verborgen"; $a->strings["Mutual Friendship"] = "Beidseitige Freundschaft"; $a->strings["is a fan of yours"] = "ist ein Fan von dir"; $a->strings["you are a fan of"] = "du bist Fan von"; @@ -373,6 +378,7 @@ $a->strings["Connector settings"] = "Connector-Einstellungen"; $a->strings["Plugin settings"] = "Plugin-Einstellungen"; $a->strings["Connected apps"] = "Verbundene Programme"; $a->strings["Export personal data"] = "Persönliche Daten exportieren"; +$a->strings["Remove account"] = "Account entfernen"; $a->strings["Settings"] = "Einstellungen"; $a->strings["Missing some important data!"] = "Wichtige Daten fehlen!"; $a->strings["Update"] = "Aktualisierungen"; @@ -723,6 +729,8 @@ $a->strings["Proxy user"] = "Proxy Nutzer"; $a->strings["Proxy URL"] = "Proxy URL"; $a->strings["Network timeout"] = "Netzwerk Wartezeit"; $a->strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = "Der Wert ist in Sekunden. Setze 0 für unbegrenzt (nicht empfohlen)."; +$a->strings["Delivery interval"] = "Zustellungsintervall"; +$a->strings["Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers."] = "Verzögere im Hintergrund laufende Auslieferungsprozesse um die angegebene Anzahl an Sekunden um die Systemlast zu verringern. Empfehlungen: 4-5 für Shared-Hosts, 2-3 für VPS, 0-1 für große dedizierte Server."; $a->strings["%s user blocked/unblocked"] = array( 0 => "%s Benutzer geblockt/freigegeben", 1 => "%s Benutzer geblockt/freigegeben", @@ -947,7 +955,8 @@ $a->strings["The given API Key seems to work correctly."] = "Der angegebene API $a->strings["The correctness of the API Key could not be detected. Somthing strange's going on."] = "Die Echtheit des API Schlüssels konnte nicht überprüft werden. Etwas Merkwürdiges ist hier im Gange."; $a->strings["App-ID / API-Key"] = "App-ID / API-Key"; $a->strings["Application secret"] = "Anwendungs-Geheimnis"; -$a->strings["Polling Interval (min. %1\$s minutes)"] = "Abrufintervall (min. %1\$s Minuten)"; +$a->strings["Polling Interval in minutes (minimum %1\$s minutes)"] = "Abfrage-Intervall in Minuten (min %1\$s Minuten)"; +$a->strings["Synchronize comments (no comments on Facebook are missed, at the cost of increased system load)"] = "Kommentare synchronisieren (Kein Kommentar von Facebook geht verlohren, verursacht höhere Last auf dem Server)"; $a->strings["Real-Time Updates"] = "Echt-Zeit Aktualisierungen"; $a->strings["Real-Time Updates are activated."] = "Echtzeit-Updates sind aktiviert."; $a->strings["Deactivate Real-Time Updates"] = "Echtzeit-Updates deaktivieren"; @@ -961,6 +970,11 @@ $a->strings["Facebook post failed. Queued for retry."] = "Veröffentlichung bei $a->strings["Your Facebook connection became invalid. Please Re-authenticate."] = "Deine Facebook Anmeldedaten sind ungültig geworden. Bitte re-authentifiziere dich."; $a->strings["Facebook connection became invalid"] = "Facebook Anmeldedaten sind ungültig geworden"; $a->strings["Hi %1\$s,\n\nThe connection between your accounts on %2\$s and Facebook became invalid. This usually happens after you change your Facebook-password. To enable the connection again, you have to %3\$sre-authenticate the Facebook-connector%4\$s."] = "Hi %1\$s,\n\ndie Verbindung von deinem Account auf %2\$s und Facebook funktioniert derzeit nicht. Dies ist im Allgemeinen das Ergebnis einer Passwortänderung bei Facebook. Um die Verbindung wieder zu aktivieren musst du %3\$sden Facebook-Connector neu Authentifizieren%4\$s."; +$a->strings["Lifetime of the cache (in hours)"] = "Lebenszeit des Caches (in Stunden)"; +$a->strings["Cache Statistics"] = "Cache Statistik"; +$a->strings["Number of items"] = "Anzahl der Einträge"; +$a->strings["Size of the cache"] = "Größe des Caches"; +$a->strings["Delete the whole cache"] = "Cache leeren"; $a->strings["%d person likes this"] = array( 0 => "%d Person mag das", 1 => "%d Leuten mögen das", @@ -969,6 +983,7 @@ $a->strings["%d person doesn't like this"] = array( 0 => " %d Person mag das nicht", 1 => "%d Leute mögen das nicht", ); +$a->strings["Get added to this list!"] = "Werde Mitglied dieser Liste"; $a->strings["Generate new key"] = "Neuen Schlüssel erstellen"; $a->strings["Widgets key"] = "Widgets Schlüssel"; $a->strings["Widgets available"] = "Verfügbare Widgets"; @@ -1058,12 +1073,12 @@ $a->strings["The impressum addon needs to be configured!
Please add at leas $a->strings["The page operators name."] = "Name des Server-Administrators"; $a->strings["Site Owners Profile"] = "Profil des Seitenbetreibers"; $a->strings["Profile address of the operator."] = "Profil-Adresse des Server-Administrators"; -$a->strings["How to contact the operator via snail mail."] = "Wie erreicht man den Betreiber der Seite postalisch."; +$a->strings["How to contact the operator via snail mail. You can use BBCode here."] = "Kontaktmöglichkeiten zum Administrator via Schneckenpost. Du kannst BBCode verwenden."; $a->strings["Notes"] = "Hinweise"; -$a->strings["Additional notes that are displayed beneath the contact information."] = "Zusätzliche Angaben, die unterhalb der Kontakt-Informationen angezeigt werden."; +$a->strings["Additional notes that are displayed beneath the contact information. You can use BBCode here."] = "Zusätzliche Informationen die neben den Kontaktmöglichkeiten angezeigt werden. Du kannst BBCode verwenden."; $a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "Wie erreichts man den Betreiber per Email. (Adresse wird verschleiert dargestellt)"; $a->strings["Footer note"] = "Fußnote"; -$a->strings["Text for the footer."] = "Text für die Fußnote"; +$a->strings["Text for the footer. You can use BBCode here."] = "Text für die Fußzeile. Du kannst BBCode verwenden."; $a->strings["Report Bug"] = "Fehlerreport erstellen"; $a->strings["\"Blockem\" Settings"] = "\"Blockem\"-Einstellungen"; $a->strings["Comma separated profile URLS to block"] = "Profil-URLs, die blockiert werden sollen (durch Kommas getrennt)"; @@ -1204,6 +1219,10 @@ $a->strings["Enable Posterous Post Plugin"] = "Posterous-Plugin aktivieren"; $a->strings["Posterous login"] = "Posterous-Anmeldename"; $a->strings["Posterous password"] = "Posterous-Passwort"; $a->strings["Post to Posterous by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei Posterous"; +$a->strings["Theme settings"] = "Themen Einstellungen"; +$a->strings["Set resize level for images in posts and comments (width and height)"] = "Wähle das Vergrößerungsmaß für Bilder in Beiträgen und Kommentaren (Höhe und Breite)"; +$a->strings["Set font-size for posts and comments"] = "Schriftgröße für Beiträge und Kommentare festlegen"; +$a->strings["Color scheme"] = "Farbschema"; $a->strings["Last users"] = "Letzte Nutzer"; $a->strings["Last likes"] = "Zuletzt gemocht"; $a->strings["Last photos"] = "Letzte Fotos"; @@ -1221,15 +1240,13 @@ $a->strings["Your photos"] = "Deine Fotos"; $a->strings["Your events"] = "Deine Ereignisse"; $a->strings["Personal notes"] = "Persönliche Notizen"; $a->strings["Your personal photos"] = "Deine privaten Fotos"; -$a->strings["Theme settings"] = "Themen Einstellungen"; -$a->strings["Set font-size for posts and comments"] = "Schriftgröße für Beiträge und Kommentare festlegen"; $a->strings["Set line-height for posts and comments"] = "Liniengröße für Beiträge und Kommantare festlegen"; $a->strings["Set resolution for middle column"] = "Auflösung für die Mittelspalte setzen"; $a->strings["Set color scheme"] = "Wähle Farbschema"; $a->strings["Alignment"] = "Ausrichtung"; $a->strings["Left"] = "Links"; $a->strings["Center"] = "Mitte"; -$a->strings["Color scheme"] = "Farbschema"; +$a->strings["Set colour scheme"] = "Farbschema wählen"; $a->strings["Gender:"] = "Geschlecht:"; $a->strings["j F, Y"] = "j F, Y"; $a->strings["j F"] = "j F"; @@ -1505,6 +1522,7 @@ $a->strings["Welcome "] = "Willkommen "; $a->strings["Please upload a profile photo."] = "Bitte lade ein Profilbild hoch."; $a->strings["Welcome back "] = "Willkommen zurück "; $a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Das Sicherheits-Merkmal war nicht korrekt. Das passiert meistens wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden)."; +$a->strings["stopped following"] = "wird nicht mehr gefolgt"; $a->strings["View Status"] = "Pinnwand anschauen"; $a->strings["View Profile"] = "Profil anschauen"; $a->strings["View Photos"] = "Bilder anschauen"; @@ -1525,6 +1543,14 @@ $a->strings["like"] = "mag ich"; $a->strings["dislike"] = "mag ich nicht"; $a->strings["Share this"] = "Teile dieses"; $a->strings["share"] = "Teilen"; +$a->strings["Bold"] = "Fett"; +$a->strings["Italic"] = "Kursiv"; +$a->strings["Underline"] = "Unterstrichen"; +$a->strings["Quote"] = "Zitat"; +$a->strings["Code"] = "Code"; +$a->strings["Image"] = "Bild"; +$a->strings["Link"] = "Verweis"; +$a->strings["Video"] = "Video"; $a->strings["add star"] = "markieren"; $a->strings["remove star"] = "Markierung entfernen"; $a->strings["toggle star status"] = "Markierung umschalten"; @@ -1569,9 +1595,9 @@ $a->strings["Edit profile"] = "Profil bearbeiten"; $a->strings["Message"] = "Nachricht"; $a->strings["g A l F d"] = "l, d. F G \\U\\h\\r"; $a->strings["F d"] = "d. F"; +$a->strings["[today]"] = "[heute]"; $a->strings["Birthday Reminders"] = "Geburtstagserinnerungen"; $a->strings["Birthdays this week:"] = "Geburtstage diese Woche:"; -$a->strings["[today]"] = "[heute]"; +$a->strings["[No description]"] = "[keine Beschreibung]"; $a->strings["Event Reminders"] = "Veranstaltungserinnerungen"; $a->strings["Events this week:"] = "Veranstaltungen diese Woche"; -$a->strings["[No description]"] = "[keine Beschreibung]"; diff --git a/view/update_fail_eml.tpl b/view/en/update_fail_eml.tpl similarity index 100% rename from view/update_fail_eml.tpl rename to view/en/update_fail_eml.tpl diff --git a/view/eo/messages.po b/view/eo/messages.po index a09c949a6..cda7c3f85 100644 --- a/view/eo/messages.po +++ b/view/eo/messages.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" -"POT-Creation-Date: 2012-04-23 10:00-0700\n" -"PO-Revision-Date: 2012-04-25 06:35+0000\n" +"POT-Creation-Date: 2012-04-28 10:00-0700\n" +"PO-Revision-Date: 2012-04-29 20:18+0000\n" "Last-Translator: Martin Schmitt \n" "Language-Team: Esperanto (http://www.transifex.net/projects/p/friendica/language/eo/)\n" "MIME-Version: 1.0\n" @@ -41,8 +41,8 @@ msgstr "Ĝisdatigo de kontakto malsukcesis." #: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:865 #: ../../mod/editpost.php:10 ../../mod/install.php:171 #: ../../mod/notifications.php:66 ../../mod/contacts.php:125 -#: ../../mod/settings.php:99 ../../mod/settings.php:514 -#: ../../mod/settings.php:519 ../../mod/manage.php:86 ../../mod/network.php:6 +#: ../../mod/settings.php:104 ../../mod/settings.php:519 +#: ../../mod/settings.php:524 ../../mod/manage.php:86 ../../mod/network.php:6 #: ../../mod/notes.php:20 ../../mod/wallmessage.php:9 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33 @@ -87,8 +87,8 @@ msgstr "Bonvolu klaki 'malantaŭen' en via retesplorilo nun se msgid "Return to contact editor" msgstr "Reen al kontakta redaktilo" -#: ../../mod/crepair.php:148 ../../mod/settings.php:534 -#: ../../mod/settings.php:560 ../../mod/admin.php:573 ../../mod/admin.php:582 +#: ../../mod/crepair.php:148 ../../mod/settings.php:539 +#: ../../mod/settings.php:565 ../../mod/admin.php:575 ../../mod/admin.php:584 msgid "Name" msgstr "Nomo" @@ -129,19 +129,19 @@ msgstr "Nova bildo el tiu adreso" #: ../../mod/photos.php:1193 ../../mod/photos.php:1233 #: ../../mod/photos.php:1273 ../../mod/photos.php:1304 #: ../../mod/install.php:251 ../../mod/install.php:289 -#: ../../mod/localtime.php:45 ../../mod/contacts.php:325 -#: ../../mod/settings.php:532 ../../mod/settings.php:678 -#: ../../mod/settings.php:739 ../../mod/settings.php:930 -#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:392 -#: ../../mod/admin.php:570 ../../mod/admin.php:706 ../../mod/admin.php:905 -#: ../../mod/admin.php:993 ../../mod/profiles.php:498 ../../mod/invite.php:119 +#: ../../mod/localtime.php:45 ../../mod/contacts.php:318 +#: ../../mod/settings.php:537 ../../mod/settings.php:683 +#: ../../mod/settings.php:744 ../../mod/settings.php:935 +#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:393 +#: ../../mod/admin.php:572 ../../mod/admin.php:708 ../../mod/admin.php:907 +#: ../../mod/admin.php:995 ../../mod/profiles.php:498 ../../mod/invite.php:119 #: ../../addon/facebook/facebook.php:574 ../../addon/yourls/yourls.php:76 #: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:57 #: ../../addon/planets/planets.php:158 #: ../../addon/uhremotestorage/uhremotestorage.php:89 #: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93 #: ../../addon/drpost/drpost.php:110 ../../addon/geonames/geonames.php:187 -#: ../../addon/oembed.old/oembed.php:41 ../../addon/impressum/impressum.php:80 +#: ../../addon/oembed.old/oembed.php:41 ../../addon/impressum/impressum.php:82 #: ../../addon/blockem/blockem.php:57 ../../addon/qcomment/qcomment.php:61 #: ../../addon/openstreetmap/openstreetmap.php:70 #: ../../addon/mathjax/mathjax.php:42 ../../addon/editplain/editplain.php:84 @@ -160,14 +160,10 @@ msgstr "Nova bildo el tiu adreso" #: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:375 #: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102 #: ../../addon/posterous/posterous.php:90 -#: ../../view/theme/diabook/diabook-green/config.php:76 -#: ../../view/theme/diabook/diabook-red/config.php:76 -#: ../../view/theme/diabook/diabook-blue/config.php:76 -#: ../../view/theme/diabook/diabook-dark/config.php:76 -#: ../../view/theme/diabook/diabook-aerith/config.php:76 -#: ../../view/theme/diabook/diabook-pink/config.php:76 +#: ../../view/theme/cleanzero/config.php:71 #: ../../view/theme/diabook/config.php:91 -#: ../../view/theme/quattro/config.php:52 ../../include/conversation.php:555 +#: ../../view/theme/quattro/config.php:52 ../../view/theme/dispy/config.php:70 +#: ../../include/conversation.php:555 msgid "Submit" msgstr "Sendi" @@ -225,15 +221,8 @@ msgstr "Redakti okazon" msgid "link to source" msgstr "ligi al fonto" -#: ../../mod/events.php:296 -#: ../../view/theme/diabook/diabook-green/theme.php:233 -#: ../../view/theme/diabook/diabook-red/theme.php:231 -#: ../../view/theme/diabook/diabook-blue/theme.php:231 -#: ../../view/theme/diabook/theme.php:250 -#: ../../view/theme/diabook/diabook-dark/theme.php:233 -#: ../../view/theme/diabook/diabook-aerith/theme.php:233 -#: ../../view/theme/diabook/diabook-pink/theme.php:233 -#: ../../include/nav.php:52 ../../boot.php:1471 +#: ../../mod/events.php:296 ../../view/theme/diabook/theme.php:255 +#: ../../include/nav.php:52 ../../boot.php:1481 msgid "Events" msgstr "Okazoj" @@ -292,8 +281,8 @@ msgid "Share this event" msgstr "Kunhavigi la okazon" #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 -#: ../../mod/dfrn_request.php:800 ../../mod/settings.php:533 -#: ../../mod/settings.php:559 ../../addon/js_upload/js_upload.php:45 +#: ../../mod/dfrn_request.php:817 ../../mod/settings.php:538 +#: ../../mod/settings.php:564 ../../addon/js_upload/js_upload.php:45 msgid "Cancel" msgstr "Nuligi" @@ -336,24 +325,24 @@ msgid "" " and/or create new posts for you?" msgstr "Ĉu rajtigi ĉi tiun programon por atingi viajn afiŝojn kaj kontaktojn kaj/aŭ krei novajn afiŝojn?" -#: ../../mod/api.php:105 ../../mod/dfrn_request.php:788 -#: ../../mod/settings.php:844 ../../mod/settings.php:850 -#: ../../mod/settings.php:858 ../../mod/settings.php:862 -#: ../../mod/settings.php:867 ../../mod/settings.php:873 -#: ../../mod/settings.php:879 ../../mod/settings.php:885 -#: ../../mod/settings.php:921 ../../mod/settings.php:922 -#: ../../mod/settings.php:923 ../../mod/settings.php:924 +#: ../../mod/api.php:105 ../../mod/dfrn_request.php:805 +#: ../../mod/settings.php:849 ../../mod/settings.php:855 +#: ../../mod/settings.php:863 ../../mod/settings.php:867 +#: ../../mod/settings.php:872 ../../mod/settings.php:878 +#: ../../mod/settings.php:884 ../../mod/settings.php:890 +#: ../../mod/settings.php:926 ../../mod/settings.php:927 +#: ../../mod/settings.php:928 ../../mod/settings.php:929 #: ../../mod/register.php:532 ../../mod/profiles.php:475 msgid "Yes" msgstr "Jes" -#: ../../mod/api.php:106 ../../mod/dfrn_request.php:789 -#: ../../mod/settings.php:844 ../../mod/settings.php:850 -#: ../../mod/settings.php:858 ../../mod/settings.php:862 -#: ../../mod/settings.php:867 ../../mod/settings.php:873 -#: ../../mod/settings.php:879 ../../mod/settings.php:885 -#: ../../mod/settings.php:921 ../../mod/settings.php:922 -#: ../../mod/settings.php:923 ../../mod/settings.php:924 +#: ../../mod/api.php:106 ../../mod/dfrn_request.php:806 +#: ../../mod/settings.php:849 ../../mod/settings.php:855 +#: ../../mod/settings.php:863 ../../mod/settings.php:867 +#: ../../mod/settings.php:872 ../../mod/settings.php:878 +#: ../../mod/settings.php:884 ../../mod/settings.php:890 +#: ../../mod/settings.php:926 ../../mod/settings.php:927 +#: ../../mod/settings.php:928 ../../mod/settings.php:929 #: ../../mod/register.php:533 ../../mod/profiles.php:476 msgid "No" msgstr "Ne" @@ -365,13 +354,7 @@ msgstr "Bildalbumoj" #: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:879 #: ../../mod/photos.php:950 ../../mod/photos.php:965 ../../mod/photos.php:1382 #: ../../mod/photos.php:1394 ../../addon/communityhome/communityhome.php:110 -#: ../../view/theme/diabook/diabook-green/theme.php:116 -#: ../../view/theme/diabook/diabook-red/theme.php:115 -#: ../../view/theme/diabook/diabook-blue/theme.php:115 -#: ../../view/theme/diabook/theme.php:130 -#: ../../view/theme/diabook/diabook-dark/theme.php:116 -#: ../../view/theme/diabook/diabook-aerith/theme.php:116 -#: ../../view/theme/diabook/diabook-pink/theme.php:116 +#: ../../view/theme/diabook/theme.php:135 msgid "Contact Photos" msgstr "Kontaktbildoj" @@ -394,13 +377,7 @@ msgstr "Kontaktoj informoj ne disponeblas" #: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174 #: ../../mod/profile_photo.php:252 ../../mod/profile_photo.php:261 #: ../../addon/communityhome/communityhome.php:111 -#: ../../view/theme/diabook/diabook-green/theme.php:117 -#: ../../view/theme/diabook/diabook-red/theme.php:116 -#: ../../view/theme/diabook/diabook-blue/theme.php:116 -#: ../../view/theme/diabook/theme.php:131 -#: ../../view/theme/diabook/diabook-dark/theme.php:117 -#: ../../view/theme/diabook/diabook-aerith/theme.php:117 -#: ../../view/theme/diabook/diabook-pink/theme.php:117 +#: ../../view/theme/diabook/theme.php:136 msgid "Profile Photos" msgstr "Profilbildoj" @@ -422,15 +399,9 @@ msgstr "estas markita en" #: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70 #: ../../addon/communityhome/communityhome.php:163 -#: ../../view/theme/diabook/diabook-green/theme.php:88 -#: ../../view/theme/diabook/diabook-red/theme.php:87 -#: ../../view/theme/diabook/diabook-blue/theme.php:87 -#: ../../view/theme/diabook/theme.php:102 -#: ../../view/theme/diabook/diabook-dark/theme.php:88 -#: ../../view/theme/diabook/diabook-aerith/theme.php:88 -#: ../../view/theme/diabook/diabook-pink/theme.php:88 -#: ../../include/text.php:1304 ../../include/diaspora.php:1654 -#: ../../include/conversation.php:53 ../../include/conversation.php:126 +#: ../../view/theme/diabook/theme.php:107 ../../include/text.php:1304 +#: ../../include/diaspora.php:1654 ../../include/conversation.php:53 +#: ../../include/conversation.php:126 msgid "photo" msgstr "bildo" @@ -457,7 +428,7 @@ msgid "Image upload failed." msgstr "Alŝuto de bildo malsukcesis." #: ../../mod/photos.php:759 ../../mod/community.php:16 -#: ../../mod/dfrn_request.php:719 ../../mod/viewcontacts.php:17 +#: ../../mod/dfrn_request.php:731 ../../mod/viewcontacts.php:17 #: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:29 msgid "Public access denied." msgstr "Publika atingo ne permesita." @@ -559,14 +530,14 @@ msgstr "Mi ŝatas tion (ŝalti)" msgid "I don't like this (toggle)" msgstr "Mi malŝatas tion(ŝalti)" -#: ../../mod/photos.php:1213 ../../include/conversation.php:956 +#: ../../mod/photos.php:1213 ../../include/conversation.php:964 msgid "Share" msgstr "Kunhavigi" #: ../../mod/photos.php:1214 ../../mod/editpost.php:104 #: ../../mod/wallmessage.php:145 ../../mod/message.php:188 -#: ../../mod/message.php:357 ../../include/conversation.php:361 -#: ../../include/conversation.php:698 ../../include/conversation.php:975 +#: ../../mod/message.php:380 ../../include/conversation.php:361 +#: ../../include/conversation.php:706 ../../include/conversation.php:983 msgid "Please wait" msgstr "Bonvolu atendi" @@ -582,13 +553,13 @@ msgid "Comment" msgstr "Komenti" #: ../../mod/photos.php:1234 ../../mod/editpost.php:125 -#: ../../include/conversation.php:556 ../../include/conversation.php:993 +#: ../../include/conversation.php:564 ../../include/conversation.php:1001 msgid "Preview" msgstr "Antaŭrigardi" -#: ../../mod/photos.php:1331 ../../mod/settings.php:595 -#: ../../mod/settings.php:676 ../../mod/group.php:168 ../../mod/admin.php:577 -#: ../../include/conversation.php:318 ../../include/conversation.php:576 +#: ../../mod/photos.php:1331 ../../mod/settings.php:600 +#: ../../mod/settings.php:681 ../../mod/group.php:168 ../../mod/admin.php:579 +#: ../../include/conversation.php:318 ../../include/conversation.php:584 msgid "Delete" msgstr "Forviŝi" @@ -604,19 +575,12 @@ msgstr "̂Ĵusaj bildoj" msgid "Not available." msgstr "Ne disponebla." -#: ../../mod/community.php:30 -#: ../../view/theme/diabook/diabook-green/theme.php:235 -#: ../../view/theme/diabook/diabook-red/theme.php:233 -#: ../../view/theme/diabook/diabook-blue/theme.php:233 -#: ../../view/theme/diabook/theme.php:252 -#: ../../view/theme/diabook/diabook-dark/theme.php:235 -#: ../../view/theme/diabook/diabook-aerith/theme.php:235 -#: ../../view/theme/diabook/diabook-pink/theme.php:235 +#: ../../mod/community.php:30 ../../view/theme/diabook/theme.php:257 #: ../../include/nav.php:101 msgid "Community" msgstr "Komunumo" -#: ../../mod/community.php:61 ../../mod/search.php:115 +#: ../../mod/community.php:61 ../../mod/search.php:128 msgid "No results." msgstr "Nenion trovita." @@ -660,28 +624,28 @@ msgstr "Elemento ne trovita" msgid "Edit post" msgstr "Redakti afiŝon" -#: ../../mod/editpost.php:80 ../../include/conversation.php:942 +#: ../../mod/editpost.php:80 ../../include/conversation.php:950 msgid "Post to Email" msgstr "Sendi tra retpoŝto" -#: ../../mod/editpost.php:95 ../../mod/settings.php:594 -#: ../../include/conversation.php:563 +#: ../../mod/editpost.php:95 ../../mod/settings.php:599 +#: ../../include/conversation.php:571 msgid "Edit" msgstr "Redakti" #: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143 -#: ../../mod/message.php:186 ../../mod/message.php:355 -#: ../../include/conversation.php:957 +#: ../../mod/message.php:186 ../../mod/message.php:378 +#: ../../include/conversation.php:965 msgid "Upload photo" msgstr "Alŝuti bildon" -#: ../../mod/editpost.php:97 ../../include/conversation.php:959 +#: ../../mod/editpost.php:97 ../../include/conversation.php:967 msgid "Attach file" msgstr "Kunligi dosieron" #: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144 -#: ../../mod/message.php:187 ../../mod/message.php:356 -#: ../../include/conversation.php:961 +#: ../../mod/message.php:187 ../../mod/message.php:379 +#: ../../include/conversation.php:969 msgid "Insert web link" msgstr "Enmeti retan adreson" @@ -697,35 +661,35 @@ msgstr "Enmeti videton en formato Vorbis [.ogg]" msgid "Insert Vorbis [.ogg] audio" msgstr "Enmeti sonon en formato Vorbis [.ogg]" -#: ../../mod/editpost.php:102 ../../include/conversation.php:967 +#: ../../mod/editpost.php:102 ../../include/conversation.php:975 msgid "Set your location" msgstr "Agordi vian lokon" -#: ../../mod/editpost.php:103 ../../include/conversation.php:969 +#: ../../mod/editpost.php:103 ../../include/conversation.php:977 msgid "Clear browser location" msgstr "Forviŝu retesplorilan lokon" -#: ../../mod/editpost.php:105 ../../include/conversation.php:976 +#: ../../mod/editpost.php:105 ../../include/conversation.php:984 msgid "Permission settings" msgstr "Permesagordoj" -#: ../../mod/editpost.php:113 ../../include/conversation.php:985 +#: ../../mod/editpost.php:113 ../../include/conversation.php:993 msgid "CC: email addresses" msgstr "CC: retpoŝtadresojn" -#: ../../mod/editpost.php:114 ../../include/conversation.php:986 +#: ../../mod/editpost.php:114 ../../include/conversation.php:994 msgid "Public post" msgstr "Publika afiŝo" -#: ../../mod/editpost.php:117 ../../include/conversation.php:972 +#: ../../mod/editpost.php:117 ../../include/conversation.php:980 msgid "Set title" msgstr "Redakti titolon" -#: ../../mod/editpost.php:119 ../../include/conversation.php:974 +#: ../../mod/editpost.php:119 ../../include/conversation.php:982 msgid "Categories (comma-separated list)" msgstr "Kategorioj (disigita per komo)" -#: ../../mod/editpost.php:120 ../../include/conversation.php:988 +#: ../../mod/editpost.php:120 ../../include/conversation.php:996 msgid "Example: bob@example.com, mary@example.com" msgstr "Ekzemple: bob@example.com, mary@example.com" @@ -733,19 +697,19 @@ msgstr "Ekzemple: bob@example.com, mary@example.com" msgid "This introduction has already been accepted." msgstr "Tia prezento jam estas akceptita" -#: ../../mod/dfrn_request.php:117 ../../mod/dfrn_request.php:475 +#: ../../mod/dfrn_request.php:117 ../../mod/dfrn_request.php:487 msgid "Profile location is not valid or does not contain profile information." msgstr "La adreso de la profilo ne validas aŭ ne enhavas profilinformojn." -#: ../../mod/dfrn_request.php:122 ../../mod/dfrn_request.php:480 +#: ../../mod/dfrn_request.php:122 ../../mod/dfrn_request.php:492 msgid "Warning: profile location has no identifiable owner name." msgstr "Averto: La adreso de la profilo ne enhavas identeblan personan nomon." -#: ../../mod/dfrn_request.php:124 ../../mod/dfrn_request.php:482 +#: ../../mod/dfrn_request.php:124 ../../mod/dfrn_request.php:494 msgid "Warning: profile location has no profile photo." msgstr "Averto: La adreso de la profilo ne enhavas bildon." -#: ../../mod/dfrn_request.php:127 ../../mod/dfrn_request.php:485 +#: ../../mod/dfrn_request.php:127 ../../mod/dfrn_request.php:497 #, php-format msgid "%d required parameter was not found at the given location" msgid_plural "%d required parameters were not found at the given location" @@ -789,128 +753,128 @@ msgstr "Nevalida repoŝtadreso." msgid "This account has not been configured for email. Request failed." msgstr "La konto ne estas agordita por retpoŝto. La peto malsukcesis." -#: ../../mod/dfrn_request.php:420 +#: ../../mod/dfrn_request.php:432 msgid "Unable to resolve your name at the provided location." msgstr "Via nomo ne troveblas al la donita adreso." -#: ../../mod/dfrn_request.php:433 +#: ../../mod/dfrn_request.php:445 msgid "You have already introduced yourself here." msgstr "Vi vin jam prezentis tie." -#: ../../mod/dfrn_request.php:437 +#: ../../mod/dfrn_request.php:449 #, php-format msgid "Apparently you are already friends with %s." msgstr "Ŝajnas kvazaŭ vi jam amikiĝis kun %s." -#: ../../mod/dfrn_request.php:458 +#: ../../mod/dfrn_request.php:470 msgid "Invalid profile URL." msgstr "Nevalida adreso de profilo." -#: ../../mod/dfrn_request.php:464 ../../mod/follow.php:20 +#: ../../mod/dfrn_request.php:476 ../../mod/follow.php:20 msgid "Disallowed profile URL." msgstr "Malpermesita adreso de profilo." -#: ../../mod/dfrn_request.php:533 ../../mod/contacts.php:102 +#: ../../mod/dfrn_request.php:545 ../../mod/contacts.php:102 msgid "Failed to update contact record." msgstr "Ĝisdatigo de via kontaktrikordo malsukcesis." -#: ../../mod/dfrn_request.php:554 +#: ../../mod/dfrn_request.php:566 msgid "Your introduction has been sent." msgstr "Via prezento estas sendita." -#: ../../mod/dfrn_request.php:607 +#: ../../mod/dfrn_request.php:619 msgid "Please login to confirm introduction." msgstr "Bonvolu ensaluti por jesigi la prezenton." -#: ../../mod/dfrn_request.php:621 +#: ../../mod/dfrn_request.php:633 msgid "" "Incorrect identity currently logged in. Please login to " "this profile." msgstr "Malĝusta identaĵo ensalutata. Bonvolu ensaluti en tiun profilon." -#: ../../mod/dfrn_request.php:633 +#: ../../mod/dfrn_request.php:645 #, php-format msgid "Welcome home %s." msgstr "Bonvenon hejme, %s." -#: ../../mod/dfrn_request.php:634 +#: ../../mod/dfrn_request.php:646 #, php-format msgid "Please confirm your introduction/connection request to %s." msgstr "Bonvolu konfirmi vian prezenton / kontaktpeton al %s." -#: ../../mod/dfrn_request.php:635 +#: ../../mod/dfrn_request.php:647 msgid "Confirm" msgstr "Konfirmi." -#: ../../mod/dfrn_request.php:676 ../../include/items.php:2691 +#: ../../mod/dfrn_request.php:688 ../../include/items.php:2691 msgid "[Name Withheld]" msgstr "[Kaŝita nomo]" -#: ../../mod/dfrn_request.php:763 +#: ../../mod/dfrn_request.php:780 msgid "" "Please enter your 'Identity Address' from one of the following supported " "communications networks:" msgstr "Bonvolu entajpi vian 'Identecan Adreson' de iu de tiuj subtenataj komunikaj retejoj: " -#: ../../mod/dfrn_request.php:779 +#: ../../mod/dfrn_request.php:796 msgid "Connect as an email follower (Coming soon)" msgstr "Konektu kiel retpoŝta sekvanto (Baldaŭ venos)" -#: ../../mod/dfrn_request.php:781 +#: ../../mod/dfrn_request.php:798 msgid "" "If you are not yet a member of the free social web, follow this link to find a public" " Friendica site and join us today." msgstr "Se vi ne estas membro de la libra interkona reto, sekvu ĉi-ligilon por trovi publikan Friendica retejon kaj aliĝi kun ni hodiaŭ." -#: ../../mod/dfrn_request.php:784 +#: ../../mod/dfrn_request.php:801 msgid "Friend/Connection Request" msgstr "Prezento / Konektpeto" -#: ../../mod/dfrn_request.php:785 +#: ../../mod/dfrn_request.php:802 msgid "" "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, " "testuser@identi.ca" msgstr "Ekzemploj: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca" -#: ../../mod/dfrn_request.php:786 +#: ../../mod/dfrn_request.php:803 msgid "Please answer the following:" msgstr "Bonvolu respondi:" -#: ../../mod/dfrn_request.php:787 +#: ../../mod/dfrn_request.php:804 #, php-format msgid "Does %s know you?" msgstr "Ĉu %s konas vin?" -#: ../../mod/dfrn_request.php:790 +#: ../../mod/dfrn_request.php:807 msgid "Add a personal note:" msgstr "Aldoni personan noton:" -#: ../../mod/dfrn_request.php:792 ../../include/contact_selectors.php:76 +#: ../../mod/dfrn_request.php:809 ../../include/contact_selectors.php:76 msgid "Friendica" msgstr "Friendica" -#: ../../mod/dfrn_request.php:793 +#: ../../mod/dfrn_request.php:810 msgid "StatusNet/Federated Social Web" msgstr "StatusNet/Federaciaj interkonaj retejoj" -#: ../../mod/dfrn_request.php:794 ../../mod/settings.php:629 +#: ../../mod/dfrn_request.php:811 ../../mod/settings.php:634 #: ../../include/contact_selectors.php:80 msgid "Diaspora" msgstr "Diaspora" -#: ../../mod/dfrn_request.php:795 +#: ../../mod/dfrn_request.php:812 #, php-format msgid "" " - please do not use this form. Instead, enter %s into your Diaspora search" " bar." msgstr " - bonvolu ne uzi ĉi formo. Anstataŭe, entajpu %s en la Diaspora serĉilo." -#: ../../mod/dfrn_request.php:796 +#: ../../mod/dfrn_request.php:813 msgid "Your Identity Address:" msgstr "Via identeca adreso:" -#: ../../mod/dfrn_request.php:799 +#: ../../mod/dfrn_request.php:816 msgid "Submit Request" msgstr "Sendi peton" @@ -1237,8 +1201,8 @@ msgid "Discard" msgstr "Forviŝi" #: ../../mod/notifications.php:51 ../../mod/notifications.php:160 -#: ../../mod/notifications.php:206 ../../mod/contacts.php:308 -#: ../../mod/contacts.php:351 +#: ../../mod/notifications.php:206 ../../mod/contacts.php:295 +#: ../../mod/contacts.php:344 msgid "Ignore" msgstr "Ignori" @@ -1254,14 +1218,7 @@ msgstr "Reto" msgid "Personal" msgstr "Propra" -#: ../../mod/notifications.php:90 -#: ../../view/theme/diabook/diabook-green/theme.php:229 -#: ../../view/theme/diabook/diabook-red/theme.php:227 -#: ../../view/theme/diabook/diabook-blue/theme.php:227 -#: ../../view/theme/diabook/theme.php:246 -#: ../../view/theme/diabook/diabook-dark/theme.php:229 -#: ../../view/theme/diabook/diabook-aerith/theme.php:229 -#: ../../view/theme/diabook/diabook-pink/theme.php:229 +#: ../../mod/notifications.php:90 ../../view/theme/diabook/theme.php:251 #: ../../include/nav.php:77 ../../include/nav.php:115 msgid "Home" msgstr "Hejmo" @@ -1297,7 +1254,7 @@ msgid "suggested by %s" msgstr "sugestita de %s" #: ../../mod/notifications.php:153 ../../mod/notifications.php:200 -#: ../../mod/contacts.php:356 +#: ../../mod/contacts.php:350 msgid "Hide this contact from others" msgstr "Kaŝi ĉi tiun kontakton al aliaj" @@ -1310,7 +1267,7 @@ msgid "if applicable" msgstr "se aplikebla" #: ../../mod/notifications.php:157 ../../mod/notifications.php:204 -#: ../../mod/admin.php:575 +#: ../../mod/admin.php:577 msgid "Approve" msgstr "Aprobi" @@ -1447,218 +1404,231 @@ msgstr "Kontakto estas ignorita." msgid "Contact has been unignored" msgstr "Kontakto estas malignorita." -#: ../../mod/contacts.php:200 -msgid "stopped following" -msgstr "ne plu sekvas" +#: ../../mod/contacts.php:195 +msgid "Contact has been archived" +msgstr "Enarkivigis kontakton" -#: ../../mod/contacts.php:221 +#: ../../mod/contacts.php:195 +msgid "Contact has been unarchived" +msgstr "Elarkivigis kontakton" + +#: ../../mod/contacts.php:208 msgid "Contact has been removed." msgstr "Kontakto estas forigita." -#: ../../mod/contacts.php:251 +#: ../../mod/contacts.php:238 #, php-format msgid "You are mutual friends with %s" msgstr "Vi estas reciproka amiko de %s" -#: ../../mod/contacts.php:255 +#: ../../mod/contacts.php:242 #, php-format msgid "You are sharing with %s" msgstr "Vi kunhavigas kun %s" -#: ../../mod/contacts.php:260 +#: ../../mod/contacts.php:247 #, php-format msgid "%s is sharing with you" msgstr "%s kunhavigas kun vi" -#: ../../mod/contacts.php:277 +#: ../../mod/contacts.php:264 msgid "Private communications are not available for this contact." msgstr "Privataj komunikadoj ne disponeblas por ĉi tiu kontakto." -#: ../../mod/contacts.php:280 +#: ../../mod/contacts.php:267 msgid "Never" msgstr "Neniam" -#: ../../mod/contacts.php:284 +#: ../../mod/contacts.php:271 msgid "(Update was successful)" msgstr "(Ĝisdatigo sukcesis.)" -#: ../../mod/contacts.php:284 +#: ../../mod/contacts.php:271 msgid "(Update was not successful)" msgstr "(Ĝisdatigo malsukcesis.)" -#: ../../mod/contacts.php:286 +#: ../../mod/contacts.php:273 msgid "Suggest friends" msgstr "Sugesti amikojn" -#: ../../mod/contacts.php:290 +#: ../../mod/contacts.php:277 #, php-format msgid "Network type: %s" msgstr "Reta tipo: %s" -#: ../../mod/contacts.php:293 +#: ../../mod/contacts.php:280 #, php-format msgid "%d contact in common" msgid_plural "%d contacts in common" msgstr[0] "%d komuna kontakto" msgstr[1] "%d komunaj kontaktoj" -#: ../../mod/contacts.php:298 +#: ../../mod/contacts.php:285 msgid "View all contacts" msgstr "Vidi ĉiujn kontaktojn" -#: ../../mod/contacts.php:303 ../../mod/contacts.php:350 -#: ../../mod/admin.php:579 +#: ../../mod/contacts.php:290 ../../mod/contacts.php:343 +#: ../../mod/admin.php:581 msgid "Unblock" msgstr "Malbloki" -#: ../../mod/contacts.php:303 ../../mod/contacts.php:350 -#: ../../mod/admin.php:578 +#: ../../mod/contacts.php:290 ../../mod/contacts.php:343 +#: ../../mod/admin.php:580 msgid "Block" msgstr "Bloki" -#: ../../mod/contacts.php:308 ../../mod/contacts.php:351 +#: ../../mod/contacts.php:295 ../../mod/contacts.php:344 msgid "Unignore" msgstr "Malignori" -#: ../../mod/contacts.php:313 +#: ../../mod/contacts.php:301 +msgid "Unarchive" +msgstr "Elarkivigi" + +#: ../../mod/contacts.php:301 +msgid "Archive" +msgstr "Enarkivigi" + +#: ../../mod/contacts.php:306 msgid "Repair" msgstr "Ripari" -#: ../../mod/contacts.php:323 +#: ../../mod/contacts.php:316 msgid "Contact Editor" msgstr "Kontakta redaktilo." -#: ../../mod/contacts.php:326 +#: ../../mod/contacts.php:319 msgid "Profile Visibility" msgstr "Videbleco de profilo" -#: ../../mod/contacts.php:327 +#: ../../mod/contacts.php:320 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "Bonvolu elekti la profilon kiu vi volas montri al %s aspektinde kiam sekure aspektante vian profilon." -#: ../../mod/contacts.php:328 +#: ../../mod/contacts.php:321 msgid "Contact Information / Notes" msgstr "Kontaktaj informoj / Notoj" -#: ../../mod/contacts.php:329 +#: ../../mod/contacts.php:322 msgid "Edit contact notes" msgstr "Redakti kontaktnotojn" -#: ../../mod/contacts.php:334 ../../mod/contacts.php:507 +#: ../../mod/contacts.php:327 ../../mod/contacts.php:511 #: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40 #, php-format msgid "Visit %s's profile [%s]" msgstr "Viziti la profilon de %s [%s]" -#: ../../mod/contacts.php:335 +#: ../../mod/contacts.php:328 msgid "Block/Unblock contact" msgstr "Bloki/Malbloki kontakton" -#: ../../mod/contacts.php:336 +#: ../../mod/contacts.php:329 msgid "Ignore contact" msgstr "Ignori kontakton" -#: ../../mod/contacts.php:337 +#: ../../mod/contacts.php:330 msgid "Repair URL settings" msgstr "Ripari URL agordoj" -#: ../../mod/contacts.php:338 +#: ../../mod/contacts.php:331 msgid "View conversations" msgstr "Vidi konversaciojn" -#: ../../mod/contacts.php:340 +#: ../../mod/contacts.php:333 msgid "Delete contact" msgstr "Forviŝi kontakton" -#: ../../mod/contacts.php:344 +#: ../../mod/contacts.php:337 msgid "Last update:" msgstr "Plej ĵusa ĝisdatigo:" -#: ../../mod/contacts.php:345 +#: ../../mod/contacts.php:338 msgid "Update public posts" msgstr "Ĝisdatigi publikajn afiŝojn" -#: ../../mod/contacts.php:347 ../../mod/admin.php:1051 +#: ../../mod/contacts.php:340 ../../mod/admin.php:1053 msgid "Update now" msgstr "Ĝisdatigi nun" -#: ../../mod/contacts.php:354 +#: ../../mod/contacts.php:347 msgid "Currently blocked" msgstr "Nuntempe blokata" -#: ../../mod/contacts.php:355 +#: ../../mod/contacts.php:348 msgid "Currently ignored" msgstr "Nuntempe ignorata" -#: ../../mod/contacts.php:356 +#: ../../mod/contacts.php:349 +msgid "Currently archived" +msgstr "Nuntempe enarkivigita" + +#: ../../mod/contacts.php:350 msgid "" "Replies/likes to your public posts may still be visible" msgstr "Rispondoj/ŝataĵo al viaj publikaj afiŝoj eble plu estos videbla" -#: ../../mod/contacts.php:405 +#: ../../mod/contacts.php:403 msgid "Suggestions" msgstr "Sugestoj" -#: ../../mod/contacts.php:410 ../../mod/group.php:191 +#: ../../mod/contacts.php:408 ../../mod/group.php:191 msgid "All Contacts" msgstr "Ĉiuj Kontaktoj" -#: ../../mod/contacts.php:415 -msgid "Unblocked Contacts" -msgstr "Malblokitaj Kontaktoj" +#: ../../mod/contacts.php:413 +msgid "Unblocked" +msgstr "Malblokita" -#: ../../mod/contacts.php:421 -msgid "Blocked Contacts" -msgstr "Blokitaj Kontaktoj" +#: ../../mod/contacts.php:419 +msgid "Blocked" +msgstr "Blokita" -#: ../../mod/contacts.php:427 -msgid "Ignored Contacts" -msgstr "Ignoritaj Kontaktoj" +#: ../../mod/contacts.php:425 +msgid "Ignored" +msgstr "Ignorita" -#: ../../mod/contacts.php:433 -msgid "Hidden Contacts" -msgstr "Kaŝitaj Kontaktoj" +#: ../../mod/contacts.php:431 +msgid "Archived" +msgstr "Enarkivigita" -#: ../../mod/contacts.php:483 +#: ../../mod/contacts.php:437 +msgid "Hidden" +msgstr "Kaŝita" + +#: ../../mod/contacts.php:487 msgid "Mutual Friendship" msgstr "Reciproka amikeco" -#: ../../mod/contacts.php:487 +#: ../../mod/contacts.php:491 msgid "is a fan of yours" msgstr "estas admiranto de vi" -#: ../../mod/contacts.php:491 +#: ../../mod/contacts.php:495 msgid "you are a fan of" msgstr "vi estas admiranto de" -#: ../../mod/contacts.php:508 ../../mod/nogroup.php:41 +#: ../../mod/contacts.php:512 ../../mod/nogroup.php:41 msgid "Edit contact" msgstr "Redakti kontakton" -#: ../../mod/contacts.php:529 -#: ../../view/theme/diabook/diabook-green/theme.php:231 -#: ../../view/theme/diabook/diabook-red/theme.php:229 -#: ../../view/theme/diabook/diabook-blue/theme.php:229 -#: ../../view/theme/diabook/theme.php:248 -#: ../../view/theme/diabook/diabook-dark/theme.php:231 -#: ../../view/theme/diabook/diabook-aerith/theme.php:231 -#: ../../view/theme/diabook/diabook-pink/theme.php:231 +#: ../../mod/contacts.php:533 ../../view/theme/diabook/theme.php:253 #: ../../include/nav.php:139 msgid "Contacts" msgstr "Kontaktoj" -#: ../../mod/contacts.php:533 +#: ../../mod/contacts.php:537 msgid "Search your contacts" msgstr "Serĉi viajn kontaktojn" -#: ../../mod/contacts.php:534 ../../mod/directory.php:57 +#: ../../mod/contacts.php:538 ../../mod/directory.php:57 msgid "Finding: " msgstr "Trovata:" -#: ../../mod/contacts.php:535 ../../mod/directory.php:59 +#: ../../mod/contacts.php:539 ../../mod/directory.php:59 #: ../../include/contact_widgets.php:33 msgid "Find" msgstr "Trovi" @@ -1759,468 +1729,472 @@ msgstr "Konektitaj programoj" msgid "Export personal data" msgstr "Eksporto" -#: ../../mod/settings.php:83 ../../mod/admin.php:665 ../../mod/admin.php:870 +#: ../../mod/settings.php:80 +msgid "Remove account" +msgstr "Forigi konton" + +#: ../../mod/settings.php:88 ../../mod/admin.php:667 ../../mod/admin.php:872 #: ../../addon/mathjax/mathjax.php:36 ../../include/nav.php:137 msgid "Settings" msgstr "Agordoj" -#: ../../mod/settings.php:126 +#: ../../mod/settings.php:131 msgid "Missing some important data!" msgstr "Mankas importantaj datumoj!" -#: ../../mod/settings.php:129 ../../mod/settings.php:558 +#: ../../mod/settings.php:134 ../../mod/settings.php:563 #: ../../mod/admin.php:97 msgid "Update" msgstr "Ĝisdatigi" -#: ../../mod/settings.php:234 +#: ../../mod/settings.php:239 msgid "Failed to connect with email account using the settings provided." msgstr "Ne sukcesis konekti al retpoŝtkonto kun la provizitaj agordoj." -#: ../../mod/settings.php:239 +#: ../../mod/settings.php:244 msgid "Email settings updated." msgstr "Retpoŝtagordoj ĝisdatigita" -#: ../../mod/settings.php:298 +#: ../../mod/settings.php:303 msgid "Passwords do not match. Password unchanged." msgstr "La pasvortoj ne estas egala. Pasvorto ne ŝanĝita." -#: ../../mod/settings.php:303 +#: ../../mod/settings.php:308 msgid "Empty passwords are not allowed. Password unchanged." msgstr "Malplenaj pasvortoj ne estas permesita. Pasvorto ne ŝanĝita." -#: ../../mod/settings.php:314 +#: ../../mod/settings.php:319 msgid "Password changed." msgstr "Pasvorto ŝanĝita." -#: ../../mod/settings.php:316 +#: ../../mod/settings.php:321 msgid "Password update failed. Please try again." msgstr "Ĝisdatigo de pasvorto malsukcesis. Bonvolu provi refoje." -#: ../../mod/settings.php:379 +#: ../../mod/settings.php:384 msgid " Please use a shorter name." msgstr " Bonvolu uzi pli mallongan nomon." -#: ../../mod/settings.php:381 +#: ../../mod/settings.php:386 msgid " Name too short." msgstr " Nomo estas tro mallonga." -#: ../../mod/settings.php:387 +#: ../../mod/settings.php:392 msgid " Not valid email." msgstr " Repoŝtadreso ne validas." -#: ../../mod/settings.php:389 +#: ../../mod/settings.php:394 msgid " Cannot change to that email." msgstr " Ne povas ŝanĝi al tio retpoŝtadreso." -#: ../../mod/settings.php:461 ../../addon/facebook/facebook.php:469 -#: ../../addon/impressum/impressum.php:75 +#: ../../mod/settings.php:466 ../../addon/facebook/facebook.php:469 +#: ../../addon/impressum/impressum.php:77 #: ../../addon/openstreetmap/openstreetmap.php:80 #: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105 #: ../../addon/twitter/twitter.php:370 msgid "Settings updated." msgstr "Agordoj ĝisdatigita." -#: ../../mod/settings.php:531 ../../mod/settings.php:557 -#: ../../mod/settings.php:593 +#: ../../mod/settings.php:536 ../../mod/settings.php:562 +#: ../../mod/settings.php:598 msgid "Add application" msgstr "Aldoni programon" -#: ../../mod/settings.php:535 ../../mod/settings.php:561 +#: ../../mod/settings.php:540 ../../mod/settings.php:566 #: ../../addon/statusnet/statusnet.php:547 msgid "Consumer Key" msgstr "Ŝlosilo de kliento" -#: ../../mod/settings.php:536 ../../mod/settings.php:562 +#: ../../mod/settings.php:541 ../../mod/settings.php:567 #: ../../addon/statusnet/statusnet.php:546 msgid "Consumer Secret" msgstr "Sekreto de kliento" -#: ../../mod/settings.php:537 ../../mod/settings.php:563 +#: ../../mod/settings.php:542 ../../mod/settings.php:568 msgid "Redirect" msgstr "Alidirekto" -#: ../../mod/settings.php:538 ../../mod/settings.php:564 +#: ../../mod/settings.php:543 ../../mod/settings.php:569 msgid "Icon url" msgstr "Piktograma adreso" -#: ../../mod/settings.php:549 +#: ../../mod/settings.php:554 msgid "You can't edit this application." msgstr "Ĉi tio programo ne estas redaktebla." -#: ../../mod/settings.php:592 +#: ../../mod/settings.php:597 msgid "Connected Apps" msgstr "Konektitaj Programoj" -#: ../../mod/settings.php:596 +#: ../../mod/settings.php:601 msgid "Client key starts with" msgstr "Ŝlosilo de kliento komencas kun" -#: ../../mod/settings.php:597 +#: ../../mod/settings.php:602 msgid "No name" msgstr "Neniu nomo" -#: ../../mod/settings.php:598 +#: ../../mod/settings.php:603 msgid "Remove authorization" msgstr "Forviŝi rajtigon" -#: ../../mod/settings.php:609 +#: ../../mod/settings.php:614 msgid "No Plugin settings configured" msgstr "Neniom da kromprogramoagordoj farita" -#: ../../mod/settings.php:617 ../../addon/widgets/widgets.php:123 +#: ../../mod/settings.php:622 ../../addon/widgets/widgets.php:123 msgid "Plugin Settings" msgstr "Kromprogramoagordoj" -#: ../../mod/settings.php:629 ../../mod/settings.php:630 +#: ../../mod/settings.php:634 ../../mod/settings.php:635 #, php-format msgid "Built-in support for %s connectivity is %s" msgstr "Integrita subteno por %s koneto estas %s" -#: ../../mod/settings.php:629 ../../mod/settings.php:630 +#: ../../mod/settings.php:634 ../../mod/settings.php:635 msgid "enabled" msgstr "ŝaltita" -#: ../../mod/settings.php:629 ../../mod/settings.php:630 +#: ../../mod/settings.php:634 ../../mod/settings.php:635 msgid "disabled" msgstr "malŝaltita" -#: ../../mod/settings.php:630 +#: ../../mod/settings.php:635 msgid "StatusNet" msgstr "StatusNet" -#: ../../mod/settings.php:660 +#: ../../mod/settings.php:665 msgid "Connector Settings" msgstr "Konektiloagordoj" -#: ../../mod/settings.php:665 +#: ../../mod/settings.php:670 msgid "Email/Mailbox Setup" msgstr "Agordoj pri Retpoŝto" -#: ../../mod/settings.php:666 +#: ../../mod/settings.php:671 msgid "" "If you wish to communicate with email contacts using this service " "(optional), please specify how to connect to your mailbox." msgstr "Se vi volas uzi ĉi tiun servon por komuniki tra retpoŝto (nedeviga), bonvolu specifi kiel konekti al vian retpoŝtkonton." -#: ../../mod/settings.php:667 +#: ../../mod/settings.php:672 msgid "Last successful email check:" msgstr "Plej ĵusa sukcesa kontrolo de poŝto:" -#: ../../mod/settings.php:668 +#: ../../mod/settings.php:673 msgid "Email access is disabled on this site." msgstr "Retpoŝta atingo ne disponeblas ĉi tie." -#: ../../mod/settings.php:669 +#: ../../mod/settings.php:674 msgid "IMAP server name:" msgstr "Nomo de IMAP servilo:" -#: ../../mod/settings.php:670 +#: ../../mod/settings.php:675 msgid "IMAP port:" msgstr "Numero de IMAP pordo:" -#: ../../mod/settings.php:671 +#: ../../mod/settings.php:676 msgid "Security:" msgstr "Sekureco:" -#: ../../mod/settings.php:671 ../../mod/settings.php:676 +#: ../../mod/settings.php:676 ../../mod/settings.php:681 msgid "None" msgstr "Nenio" -#: ../../mod/settings.php:672 +#: ../../mod/settings.php:677 msgid "Email login name:" msgstr "Retpoŝta salutnomo:" -#: ../../mod/settings.php:673 +#: ../../mod/settings.php:678 msgid "Email password:" msgstr "Retpoŝta pasvorto:" -#: ../../mod/settings.php:674 +#: ../../mod/settings.php:679 msgid "Reply-to address:" msgstr "Responda adreso (Reply-to):" -#: ../../mod/settings.php:675 +#: ../../mod/settings.php:680 msgid "Send public posts to all email contacts:" msgstr "Sendu publikajn afiŝojn al ĉiuj retpoŝtkontaktoj:" -#: ../../mod/settings.php:676 +#: ../../mod/settings.php:681 msgid "Action after import:" msgstr "Ago post la importado:" -#: ../../mod/settings.php:676 +#: ../../mod/settings.php:681 msgid "Mark as seen" msgstr "Marki kiel legita" -#: ../../mod/settings.php:676 +#: ../../mod/settings.php:681 msgid "Move to folder" msgstr "Movi al dosierujo" -#: ../../mod/settings.php:677 +#: ../../mod/settings.php:682 msgid "Move to folder:" msgstr "Movi al dosierujo:" -#: ../../mod/settings.php:737 +#: ../../mod/settings.php:742 msgid "Display Settings" msgstr "Ekranagordoj" -#: ../../mod/settings.php:743 +#: ../../mod/settings.php:748 msgid "Display Theme:" msgstr "Vidiga etoso:" -#: ../../mod/settings.php:744 +#: ../../mod/settings.php:749 msgid "Update browser every xx seconds" msgstr "Ĝisdatigu retesplorilon ĉiu xxx sekundoj" -#: ../../mod/settings.php:744 +#: ../../mod/settings.php:749 msgid "Minimum of 10 seconds, no maximum" msgstr "Minimume 10 sekundoj, sen maksimumo" -#: ../../mod/settings.php:745 +#: ../../mod/settings.php:750 msgid "Number of items to display on the network page:" msgstr "Kvanto da elementoj kiuj estos montrata ĉe la reto paĝo." -#: ../../mod/settings.php:745 +#: ../../mod/settings.php:750 msgid "Maximum of 100 items" msgstr "Maksimume 100 eroj" -#: ../../mod/settings.php:746 +#: ../../mod/settings.php:751 msgid "Don't show emoticons" msgstr "Ne montru ridetulojn" -#: ../../mod/settings.php:811 ../../mod/admin.php:173 ../../mod/admin.php:551 +#: ../../mod/settings.php:816 ../../mod/admin.php:173 ../../mod/admin.php:553 msgid "Normal Account" msgstr "Normala konto" -#: ../../mod/settings.php:812 +#: ../../mod/settings.php:817 msgid "This account is a normal personal profile" msgstr "Tiu konto estas normala persona profilo" -#: ../../mod/settings.php:815 ../../mod/admin.php:174 ../../mod/admin.php:552 +#: ../../mod/settings.php:820 ../../mod/admin.php:174 ../../mod/admin.php:554 msgid "Soapbox Account" msgstr "Soapbox Konto" -#: ../../mod/settings.php:816 +#: ../../mod/settings.php:821 msgid "Automatically approve all connection/friend requests as read-only fans" msgstr "Aŭtomate konfirmi ĉiujn kontaktpetojn kiel nurlegaj admirantoj" -#: ../../mod/settings.php:819 ../../mod/admin.php:175 ../../mod/admin.php:553 +#: ../../mod/settings.php:824 ../../mod/admin.php:175 ../../mod/admin.php:555 msgid "Community/Celebrity Account" msgstr "Komunuma/eminentula Konto" -#: ../../mod/settings.php:820 +#: ../../mod/settings.php:825 msgid "" "Automatically approve all connection/friend requests as read-write fans" msgstr "Aŭtomate konfirmi ĉiujn kontaktpetojn kiel admirantoj kapable legi kaj skribi" -#: ../../mod/settings.php:823 ../../mod/admin.php:176 ../../mod/admin.php:554 +#: ../../mod/settings.php:828 ../../mod/admin.php:176 ../../mod/admin.php:556 msgid "Automatic Friend Account" msgstr "Aŭtomata Amika Konto" -#: ../../mod/settings.php:824 +#: ../../mod/settings.php:829 msgid "Automatically approve all connection/friend requests as friends" msgstr "Aŭtomate konfirmi ĉiujn kontaktpetojn kiel amikoj" -#: ../../mod/settings.php:834 +#: ../../mod/settings.php:839 msgid "OpenID:" msgstr "OpenID:" -#: ../../mod/settings.php:834 +#: ../../mod/settings.php:839 msgid "(Optional) Allow this OpenID to login to this account." msgstr "(Nedeviga) Permesi atingon al la konton al ĉi tio OpenID." -#: ../../mod/settings.php:844 +#: ../../mod/settings.php:849 msgid "Publish your default profile in your local site directory?" msgstr "Publikigi vian defaŭltan profilon en la loka reteja katalogo?" -#: ../../mod/settings.php:850 +#: ../../mod/settings.php:855 msgid "Publish your default profile in the global social directory?" msgstr "Publikigi vian defaŭltan profilon en la tutmonda interkona katalogo?" -#: ../../mod/settings.php:858 +#: ../../mod/settings.php:863 msgid "Hide your contact/friend list from viewers of your default profile?" msgstr "Kaŝi vian liston de kontaktoj/amiko al spektantoj de via defaŭlta profilo?" -#: ../../mod/settings.php:862 +#: ../../mod/settings.php:867 msgid "Hide your profile details from unknown viewers?" msgstr "Kaŝi viajn profilajn detalojn al nekonataj spektantoj?" -#: ../../mod/settings.php:867 +#: ../../mod/settings.php:872 msgid "Allow friends to post to your profile page?" msgstr "Ĉu amikoj povu afiŝi al via profilo?" -#: ../../mod/settings.php:873 +#: ../../mod/settings.php:878 msgid "Allow friends to tag your posts?" msgstr "Ĉu amikoj povu aldoni markojn al viaj afiŝoj?" -#: ../../mod/settings.php:879 +#: ../../mod/settings.php:884 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "Ĉu ni povu sugesti vin kiel amiko al novaj membroj?" -#: ../../mod/settings.php:885 +#: ../../mod/settings.php:890 msgid "Permit unknown people to send you private mail?" msgstr "Permesigi nekonatulojn sendi retpoŝton al vi?" -#: ../../mod/settings.php:896 +#: ../../mod/settings.php:901 msgid "Profile is not published." msgstr "Profilo ne estas publika." -#: ../../mod/settings.php:902 ../../mod/profile_photo.php:211 +#: ../../mod/settings.php:907 ../../mod/profile_photo.php:211 msgid "or" msgstr "aŭ" -#: ../../mod/settings.php:907 +#: ../../mod/settings.php:912 msgid "Your Identity Address is" msgstr "Via identeca adreso estas" -#: ../../mod/settings.php:918 +#: ../../mod/settings.php:923 msgid "Automatically expire posts after this many days:" msgstr "Automatike senvalidigi afiŝojn post tiom da tagoj:" -#: ../../mod/settings.php:918 +#: ../../mod/settings.php:923 msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "Se malplena, afiŝoj neniam senvalidiĝos. Senvalidigitajn afiŝon estos forviŝata" -#: ../../mod/settings.php:919 +#: ../../mod/settings.php:924 msgid "Advanced expiration settings" msgstr "Detalaj agordoj rilate al senvalidiĝo" -#: ../../mod/settings.php:920 +#: ../../mod/settings.php:925 msgid "Advanced Expiration" msgstr "Detala senvalidiĝo" -#: ../../mod/settings.php:921 +#: ../../mod/settings.php:926 msgid "Expire posts:" msgstr "Senvalidigi afiŝojn:" -#: ../../mod/settings.php:922 +#: ../../mod/settings.php:927 msgid "Expire personal notes:" msgstr "Senvalidigi personajn notojn:" -#: ../../mod/settings.php:923 +#: ../../mod/settings.php:928 msgid "Expire starred posts:" msgstr "Senvalidigi steligitajn afiŝojn:" -#: ../../mod/settings.php:924 +#: ../../mod/settings.php:929 msgid "Expire photos:" msgstr "Senvalidigi bildojn:" -#: ../../mod/settings.php:928 +#: ../../mod/settings.php:933 msgid "Account Settings" msgstr "Kontoagordoj" -#: ../../mod/settings.php:937 +#: ../../mod/settings.php:942 msgid "Password Settings" msgstr "Agordoj pri Pasvorto" -#: ../../mod/settings.php:938 +#: ../../mod/settings.php:943 msgid "New Password:" msgstr "Nova pasvorto:" -#: ../../mod/settings.php:939 +#: ../../mod/settings.php:944 msgid "Confirm:" msgstr "Konfirmi:" -#: ../../mod/settings.php:939 +#: ../../mod/settings.php:944 msgid "Leave password fields blank unless changing" msgstr "Lasu pasvortkampojn malplenaj se vi ne ŝanĝas la pasvorton." -#: ../../mod/settings.php:943 +#: ../../mod/settings.php:948 msgid "Basic Settings" msgstr "Bazaj Agordoj" -#: ../../mod/settings.php:944 ../../include/profile_advanced.php:15 +#: ../../mod/settings.php:949 ../../include/profile_advanced.php:15 msgid "Full Name:" msgstr "Plena Nomo:" -#: ../../mod/settings.php:945 +#: ../../mod/settings.php:950 msgid "Email Address:" msgstr "Retpoŝtadreso:" -#: ../../mod/settings.php:946 +#: ../../mod/settings.php:951 msgid "Your Timezone:" msgstr "Via Horzono:" -#: ../../mod/settings.php:947 +#: ../../mod/settings.php:952 msgid "Default Post Location:" msgstr "Defaŭlta Loko por Afiŝoj:" -#: ../../mod/settings.php:948 +#: ../../mod/settings.php:953 msgid "Use Browser Location:" msgstr "Uzu Lokon laŭ Retesplorilo:" -#: ../../mod/settings.php:951 +#: ../../mod/settings.php:956 msgid "Security and Privacy Settings" msgstr "Agordoj pri Sekureco kaj Privateco" -#: ../../mod/settings.php:953 +#: ../../mod/settings.php:958 msgid "Maximum Friend Requests/Day:" msgstr "Taga maksimumo da kontaktpetoj:" -#: ../../mod/settings.php:953 ../../mod/settings.php:968 +#: ../../mod/settings.php:958 ../../mod/settings.php:973 msgid "(to prevent spam abuse)" msgstr "(por malhelpi spamaĵojn)" -#: ../../mod/settings.php:954 +#: ../../mod/settings.php:959 msgid "Default Post Permissions" msgstr "Defaŭltaj permesoj por afiŝoj" -#: ../../mod/settings.php:955 +#: ../../mod/settings.php:960 msgid "(click to open/close)" msgstr "(klaku por malfermi/fermi)" -#: ../../mod/settings.php:968 +#: ../../mod/settings.php:973 msgid "Maximum private messages per day from unknown people:" msgstr "Taga maksimumo da privataj mesaĝoj." -#: ../../mod/settings.php:971 +#: ../../mod/settings.php:976 msgid "Notification Settings" msgstr "Agordoj pri Atentigoj" -#: ../../mod/settings.php:972 +#: ../../mod/settings.php:977 msgid "By default post a status message when:" msgstr "Defaŭlte afiŝi statmesaĝon okaze de:" -#: ../../mod/settings.php:973 +#: ../../mod/settings.php:978 msgid "accepting a friend request" msgstr "akcepti kontaktpeton" -#: ../../mod/settings.php:974 +#: ../../mod/settings.php:979 msgid "making an interesting profile change" msgstr "fari interesan profilŝanĝon" -#: ../../mod/settings.php:975 +#: ../../mod/settings.php:980 msgid "Send a notification email when:" msgstr "Sendu atentiga repoŝton se:" -#: ../../mod/settings.php:976 +#: ../../mod/settings.php:981 msgid "You receive an introduction" msgstr "Vi ricevas inviton" -#: ../../mod/settings.php:977 +#: ../../mod/settings.php:982 msgid "Your introductions are confirmed" msgstr "Viaj prezentoj estas konfirmata." -#: ../../mod/settings.php:978 +#: ../../mod/settings.php:983 msgid "Someone writes on your profile wall" msgstr "Iu skribas je via profila muro." -#: ../../mod/settings.php:979 +#: ../../mod/settings.php:984 msgid "Someone writes a followup comment" msgstr "Iu skribas sekvan komenton" -#: ../../mod/settings.php:980 +#: ../../mod/settings.php:985 msgid "You receive a private message" msgstr "Vi ricevas privatan mesaĝon." -#: ../../mod/settings.php:981 +#: ../../mod/settings.php:986 msgid "You receive a friend suggestion" msgstr "Vi ricevas amikosugeston" -#: ../../mod/settings.php:982 +#: ../../mod/settings.php:987 msgid "You are tagged in a post" msgstr "Vi estas markita en afiŝon" -#: ../../mod/settings.php:985 +#: ../../mod/settings.php:990 msgid "Advanced Page Settings" msgstr "Specialaj agordoj pri paĝoj" @@ -2310,7 +2284,7 @@ msgstr "La privateco de privataj mesaĝoj al ĉi tiu persono ne ĉiam estas gara msgid "Invalid contact." msgstr "Nevalida kontakto." -#: ../../mod/notes.php:44 ../../boot.php:1476 +#: ../../mod/notes.php:44 ../../boot.php:1486 msgid "Personal Notes" msgstr "Personaj Notoj" @@ -2351,7 +2325,7 @@ msgid "No recipient." msgstr "Neniom da ricevontoj." #: ../../mod/wallmessage.php:124 ../../mod/message.php:169 -#: ../../include/conversation.php:910 +#: ../../include/conversation.php:918 msgid "Please enter a link URL:" msgstr "Bonvolu entajpu adreson de ligilo:" @@ -2367,17 +2341,17 @@ msgid "" msgstr "Se vi deziras ke %s respondu, bonvolu kontroli ke la privatecaj agordoj je via retejo permesas privatajn mesaĝojn de nekonataj sendantoj." #: ../../mod/wallmessage.php:133 ../../mod/message.php:178 -#: ../../mod/message.php:347 +#: ../../mod/message.php:370 msgid "To:" msgstr "Al:" #: ../../mod/wallmessage.php:134 ../../mod/message.php:179 -#: ../../mod/message.php:348 +#: ../../mod/message.php:371 msgid "Subject:" msgstr "Temo:" #: ../../mod/wallmessage.php:140 ../../mod/message.php:183 -#: ../../mod/message.php:351 ../../mod/invite.php:113 +#: ../../mod/message.php:374 ../../mod/invite.php:113 msgid "Your message:" msgstr "Via mesaĝo:" @@ -2559,16 +2533,9 @@ msgstr "Nevaliada profila identigilo." msgid "Profile Visibility Editor" msgstr "Redaktilo por profila videbleco." -#: ../../mod/profperm.php:103 -#: ../../view/theme/diabook/diabook-green/theme.php:230 -#: ../../view/theme/diabook/diabook-red/theme.php:228 -#: ../../view/theme/diabook/diabook-blue/theme.php:228 -#: ../../view/theme/diabook/theme.php:247 -#: ../../view/theme/diabook/diabook-dark/theme.php:230 -#: ../../view/theme/diabook/diabook-aerith/theme.php:230 -#: ../../view/theme/diabook/diabook-pink/theme.php:230 +#: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:252 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74 -#: ../../include/nav.php:50 ../../boot.php:1458 +#: ../../include/nav.php:50 ../../boot.php:1468 msgid "Profile" msgstr "Profilo" @@ -2717,7 +2684,7 @@ msgstr "Membriĝi ĉi tie nur eblas laŭ invito." msgid "Your invitation ID: " msgstr "Via invita idento: " -#: ../../mod/register.php:553 ../../mod/admin.php:393 +#: ../../mod/register.php:553 ../../mod/admin.php:394 msgid "Registration" msgstr "Registrado" @@ -2752,36 +2719,17 @@ msgstr "Serĉi Membrojn" #: ../../addon/facebook/facebook.php:1533 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 -#: ../../view/theme/diabook/diabook-green/theme.php:83 -#: ../../view/theme/diabook/diabook-green/theme.php:92 -#: ../../view/theme/diabook/diabook-red/theme.php:82 -#: ../../view/theme/diabook/diabook-red/theme.php:91 -#: ../../view/theme/diabook/diabook-blue/theme.php:82 -#: ../../view/theme/diabook/diabook-blue/theme.php:91 -#: ../../view/theme/diabook/theme.php:97 -#: ../../view/theme/diabook/theme.php:106 -#: ../../view/theme/diabook/diabook-dark/theme.php:83 -#: ../../view/theme/diabook/diabook-dark/theme.php:92 -#: ../../view/theme/diabook/diabook-aerith/theme.php:83 -#: ../../view/theme/diabook/diabook-aerith/theme.php:92 -#: ../../view/theme/diabook/diabook-pink/theme.php:83 -#: ../../view/theme/diabook/diabook-pink/theme.php:92 -#: ../../include/diaspora.php:1654 ../../include/conversation.php:48 -#: ../../include/conversation.php:57 ../../include/conversation.php:121 -#: ../../include/conversation.php:130 +#: ../../view/theme/diabook/theme.php:102 +#: ../../view/theme/diabook/theme.php:111 ../../include/diaspora.php:1654 +#: ../../include/conversation.php:48 ../../include/conversation.php:57 +#: ../../include/conversation.php:121 ../../include/conversation.php:130 msgid "status" msgstr "staton" #: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1537 #: ../../addon/communityhome/communityhome.php:172 -#: ../../view/theme/diabook/diabook-green/theme.php:97 -#: ../../view/theme/diabook/diabook-red/theme.php:96 -#: ../../view/theme/diabook/diabook-blue/theme.php:96 -#: ../../view/theme/diabook/theme.php:111 -#: ../../view/theme/diabook/diabook-dark/theme.php:97 -#: ../../view/theme/diabook/diabook-aerith/theme.php:97 -#: ../../view/theme/diabook/diabook-pink/theme.php:97 -#: ../../include/diaspora.php:1670 ../../include/conversation.php:65 +#: ../../view/theme/diabook/theme.php:116 ../../include/diaspora.php:1670 +#: ../../include/conversation.php:65 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "%1$s ŝatas la %3$s de %2$s" @@ -2792,7 +2740,7 @@ msgid "%1$s doesn't like %2$s's %3$s" msgstr "%1$s malŝatas la %3$s de %2$s" #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:149 -#: ../../mod/admin.php:614 ../../mod/admin.php:813 ../../mod/display.php:37 +#: ../../mod/admin.php:616 ../../mod/admin.php:815 ../../mod/display.php:37 #: ../../mod/display.php:142 ../../include/items.php:3083 msgid "Item not found." msgstr "Elemento ne estas trovita." @@ -2801,15 +2749,8 @@ msgstr "Elemento ne estas trovita." msgid "Access denied." msgstr "Atingo nepermesita." -#: ../../mod/fbrowser.php:23 -#: ../../view/theme/diabook/diabook-green/theme.php:232 -#: ../../view/theme/diabook/diabook-red/theme.php:230 -#: ../../view/theme/diabook/diabook-blue/theme.php:230 -#: ../../view/theme/diabook/theme.php:249 -#: ../../view/theme/diabook/diabook-dark/theme.php:232 -#: ../../view/theme/diabook/diabook-aerith/theme.php:232 -#: ../../view/theme/diabook/diabook-pink/theme.php:232 -#: ../../include/nav.php:51 ../../boot.php:1463 +#: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:254 +#: ../../include/nav.php:51 ../../boot.php:1473 msgid "Photos" msgstr "Bildoj" @@ -2985,7 +2926,7 @@ msgstr "Vi kaj %s" msgid "%s and You" msgstr "%s kaj vi" -#: ../../mod/message.php:242 ../../mod/message.php:340 +#: ../../mod/message.php:242 ../../mod/message.php:363 msgid "Delete conversation" msgstr "Forviŝi dialogon" @@ -3004,17 +2945,17 @@ msgstr[1] "%d mesaĝoj" msgid "Message not available." msgstr "Mesaĝo nedisponebla." -#: ../../mod/message.php:324 +#: ../../mod/message.php:347 msgid "Delete message" msgstr "Forviŝu mesaĝon" -#: ../../mod/message.php:342 +#: ../../mod/message.php:365 msgid "" "No secure communications available. You may be able to " "respond from the sender's profile page." msgstr "Sekura komunikado ne disponeblas. Vi eble povus respondi sur la profilpaĝo de la sendanto." -#: ../../mod/message.php:346 +#: ../../mod/message.php:369 msgid "Send Reply" msgstr "Respondi" @@ -3031,23 +2972,23 @@ msgstr "Neniom da amiko al montri." msgid "Theme settings updated." msgstr "Gisdatigis agordojn pri etosoj." -#: ../../mod/admin.php:93 ../../mod/admin.php:391 +#: ../../mod/admin.php:93 ../../mod/admin.php:392 msgid "Site" msgstr "Retejo" -#: ../../mod/admin.php:94 ../../mod/admin.php:569 ../../mod/admin.php:581 +#: ../../mod/admin.php:94 ../../mod/admin.php:571 ../../mod/admin.php:583 msgid "Users" msgstr "Uzantoj" -#: ../../mod/admin.php:95 ../../mod/admin.php:663 ../../mod/admin.php:705 +#: ../../mod/admin.php:95 ../../mod/admin.php:665 ../../mod/admin.php:707 msgid "Plugins" msgstr "Kromprogramoj" -#: ../../mod/admin.php:96 ../../mod/admin.php:868 ../../mod/admin.php:904 +#: ../../mod/admin.php:96 ../../mod/admin.php:870 ../../mod/admin.php:906 msgid "Themes" msgstr "Etosoj" -#: ../../mod/admin.php:111 ../../mod/admin.php:992 +#: ../../mod/admin.php:111 ../../mod/admin.php:994 msgid "Logs" msgstr "Protokoloj" @@ -3055,9 +2996,9 @@ msgstr "Protokoloj" msgid "User registrations waiting for confirmation" msgstr "Uzantaj registradoj atendante konfirmon" -#: ../../mod/admin.php:188 ../../mod/admin.php:390 ../../mod/admin.php:568 -#: ../../mod/admin.php:662 ../../mod/admin.php:704 ../../mod/admin.php:867 -#: ../../mod/admin.php:903 ../../mod/admin.php:991 +#: ../../mod/admin.php:188 ../../mod/admin.php:391 ../../mod/admin.php:570 +#: ../../mod/admin.php:664 ../../mod/admin.php:706 ../../mod/admin.php:869 +#: ../../mod/admin.php:905 ../../mod/admin.php:993 msgid "Administration" msgstr "Administrado" @@ -3081,427 +3022,438 @@ msgstr "Versio" msgid "Active plugins" msgstr "Ŝaltitaj kromprogramoj" -#: ../../mod/admin.php:329 +#: ../../mod/admin.php:330 msgid "Site settings updated." msgstr "Ĝisdatigis retejaj agordoj." -#: ../../mod/admin.php:377 +#: ../../mod/admin.php:378 msgid "Closed" msgstr "Ferma" -#: ../../mod/admin.php:378 +#: ../../mod/admin.php:379 msgid "Requires approval" msgstr "Bezonas aprobon" -#: ../../mod/admin.php:379 +#: ../../mod/admin.php:380 msgid "Open" msgstr "Malferma" -#: ../../mod/admin.php:383 +#: ../../mod/admin.php:384 msgid "No SSL policy, links will track page SSL state" msgstr "Sen SSL strategio. Ligiloj sekvos la SSL staton de la paĝo." -#: ../../mod/admin.php:384 +#: ../../mod/admin.php:385 msgid "Force all links to use SSL" msgstr "Devigi ke ĉiuj ligiloj uzu SSL." -#: ../../mod/admin.php:385 +#: ../../mod/admin.php:386 msgid "Self-signed certificate, use SSL for local links only (discouraged)" msgstr "Memsubskribita atestilo, nur uzu SSL por lokaj ligiloj (malkuraĝigata)" -#: ../../mod/admin.php:394 +#: ../../mod/admin.php:395 msgid "File upload" msgstr "Alŝuto" -#: ../../mod/admin.php:395 +#: ../../mod/admin.php:396 msgid "Policies" msgstr "Politiko" -#: ../../mod/admin.php:396 +#: ../../mod/admin.php:397 msgid "Advanced" msgstr "Altnivela" -#: ../../mod/admin.php:400 ../../addon/statusnet/statusnet.php:544 +#: ../../mod/admin.php:401 ../../addon/statusnet/statusnet.php:544 msgid "Site name" msgstr "Nomo de retejo" -#: ../../mod/admin.php:401 +#: ../../mod/admin.php:402 msgid "Banner/Logo" msgstr "Emblemo" -#: ../../mod/admin.php:402 +#: ../../mod/admin.php:403 msgid "System language" msgstr "Sistema lingvo" -#: ../../mod/admin.php:403 +#: ../../mod/admin.php:404 msgid "System theme" msgstr "Sistema etoso" -#: ../../mod/admin.php:403 +#: ../../mod/admin.php:404 msgid "" "Default system theme - may be over-ridden by user profiles - change theme settings" msgstr "Defaŭlta sistema etoso - transpasebla de uzantprofiloj - redakti agordoj pri etosoj" -#: ../../mod/admin.php:404 +#: ../../mod/admin.php:405 msgid "SSL link policy" msgstr "Strategio por SSL ligiloj" -#: ../../mod/admin.php:404 +#: ../../mod/admin.php:405 msgid "Determines whether generated links should be forced to use SSL" msgstr "Difinas ĉu generotaj ligiloj devige uzu SSL." -#: ../../mod/admin.php:405 +#: ../../mod/admin.php:406 msgid "Maximum image size" msgstr "Maksimuma bildgrando" -#: ../../mod/admin.php:405 +#: ../../mod/admin.php:406 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "Maksimuma grando en bajtoj por alŝutotaj bildoj. Defaŭlte 0, kio signifas neniu limito." -#: ../../mod/admin.php:407 +#: ../../mod/admin.php:408 msgid "Register policy" msgstr "Interkonsento pri registrado" -#: ../../mod/admin.php:408 +#: ../../mod/admin.php:409 msgid "Register text" msgstr "Interkonsento teksto" -#: ../../mod/admin.php:408 +#: ../../mod/admin.php:409 msgid "Will be displayed prominently on the registration page." msgstr "Tio estos eminente montrata en la registro paĝo." -#: ../../mod/admin.php:409 +#: ../../mod/admin.php:410 msgid "Accounts abandoned after x days" msgstr "Kontoj forlasitaj post x tagoj" -#: ../../mod/admin.php:409 +#: ../../mod/admin.php:410 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "Mi ne malŝparu energion por enketi aliajn retejojn pri forlasitaj kontoj. Entajpu 0 por ne uzi templimo." -#: ../../mod/admin.php:410 +#: ../../mod/admin.php:411 msgid "Allowed friend domains" msgstr "Permesitaj amikaj domainoj" -#: ../../mod/admin.php:410 +#: ../../mod/admin.php:411 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "Perkome disigita listo da domajnoj kiuj rajtas konstrui amikecojn kun ĉi tiu retejo. Ĵokeroj eblas. Malplena por rajtigi ĉiujn ajn domajnojn." -#: ../../mod/admin.php:411 +#: ../../mod/admin.php:412 msgid "Allowed email domains" msgstr "Permesitaj retpoŝtaj domajnoj" -#: ../../mod/admin.php:411 +#: ../../mod/admin.php:412 msgid "" "Comma separated list of domains which are allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains" msgstr "Perkome disigita listo da domajnoj kiuj uzeblas kiel retpoŝtaj adresoj en novaj registradoj. Ĵokeroj eblas. Malplena por rajtigi ĉiujn ajn domajnojn." -#: ../../mod/admin.php:412 +#: ../../mod/admin.php:413 msgid "Block public" msgstr "Bloki publike" -#: ../../mod/admin.php:412 +#: ../../mod/admin.php:413 msgid "" "Check to block public access to all otherwise public personal pages on this " "site unless you are currently logged in." msgstr "Elektu por bloki publikan atingon al ĉiuj alie publikajn paĝojn en ĉi tiu retejo kiam vi ne estas ensalutita." -#: ../../mod/admin.php:413 +#: ../../mod/admin.php:414 msgid "Force publish" msgstr "Devigi publikigon" -#: ../../mod/admin.php:413 +#: ../../mod/admin.php:414 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "Elektu por devigi la registradon en la loka katalogo al ĉiuj profiloj en ĉi tiu retejo." -#: ../../mod/admin.php:414 +#: ../../mod/admin.php:415 msgid "Global directory update URL" msgstr "Ĝenerala adreso por ĝisdatigi la katalogon" -#: ../../mod/admin.php:414 +#: ../../mod/admin.php:415 msgid "" "URL to update the global directory. If this is not set, the global directory" " is completely unavailable to the application." msgstr "URL adreso por ĝisdatigi la tutmondan katalogon. Se ne agordita, la tutmonda katatolge tute ne disponeblas al la programo." -#: ../../mod/admin.php:416 +#: ../../mod/admin.php:417 msgid "Block multiple registrations" msgstr "Bloki pluroblajn registradojn." -#: ../../mod/admin.php:416 +#: ../../mod/admin.php:417 msgid "Disallow users to register additional accounts for use as pages." msgstr "Malpermesi al uzantoj la permeson por registri pluajn kontojn kiel paĝoj." -#: ../../mod/admin.php:417 +#: ../../mod/admin.php:418 msgid "OpenID support" msgstr "Subteno por OpenID" -#: ../../mod/admin.php:417 +#: ../../mod/admin.php:418 msgid "OpenID support for registration and logins." msgstr "Subteni OpenID por registrado kaj ensaluto." -#: ../../mod/admin.php:418 +#: ../../mod/admin.php:419 msgid "Fullname check" msgstr "Kontroli plenan nomon" -#: ../../mod/admin.php:418 +#: ../../mod/admin.php:419 msgid "" "Force users to register with a space between firstname and lastname in Full " "name, as an antispam measure" msgstr "Kiel kontraŭspamilo, devigi uzantoj al registrado kun spaceto inter la persona nomo kaj la familia nomo." -#: ../../mod/admin.php:419 +#: ../../mod/admin.php:420 msgid "UTF-8 Regular expressions" msgstr "UTF-8 regulaj exprimoj" -#: ../../mod/admin.php:419 +#: ../../mod/admin.php:420 msgid "Use PHP UTF8 regular expressions" msgstr "Uzi PHP UTF8 regulajn esprimojn." -#: ../../mod/admin.php:420 +#: ../../mod/admin.php:421 msgid "Show Community Page" msgstr "Montri Komunuma Paĝo" -#: ../../mod/admin.php:420 +#: ../../mod/admin.php:421 msgid "" "Display a Community page showing all recent public postings on this site." msgstr "Montri komunuma paĝo kun ĉiuj ĵusaj afiŝoj en ĉi tiu retejo." -#: ../../mod/admin.php:421 +#: ../../mod/admin.php:422 msgid "Enable OStatus support" msgstr "Ŝalti subtenon por OStatus" -#: ../../mod/admin.php:421 +#: ../../mod/admin.php:422 msgid "" "Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All " "communications in OStatus are public, so privacy warnings will be " "occasionally displayed." msgstr "Provizi integritan OStatus (identi.ca, status.net ktp) subtenon. Ĉiuj komunikadoj en OStatus estas publikaj, do privatecaj avertoj aperos de tempo al tempo." -#: ../../mod/admin.php:422 +#: ../../mod/admin.php:423 msgid "Enable Diaspora support" msgstr "Ŝalti subtenon por Diaspora" -#: ../../mod/admin.php:422 +#: ../../mod/admin.php:423 msgid "Provide built-in Diaspora network compatibility." msgstr "Provizi integritan Diaspora subtenon." -#: ../../mod/admin.php:423 +#: ../../mod/admin.php:424 msgid "Only allow Friendica contacts" msgstr "Nur permesigi Friendica kontaktojn" -#: ../../mod/admin.php:423 +#: ../../mod/admin.php:424 msgid "" "All contacts must use Friendica protocols. All other built-in communication " "protocols disabled." msgstr "Ĉiuj kontaktoj devas uzi Friendica protokolojn. Ĉiuj aliaj komunikaj protokoloj malaktivita." -#: ../../mod/admin.php:424 +#: ../../mod/admin.php:425 msgid "Verify SSL" msgstr "Kontroli SSL" -#: ../../mod/admin.php:424 +#: ../../mod/admin.php:425 msgid "" "If you wish, you can turn on strict certificate checking. This will mean you" " cannot connect (at all) to self-signed SSL sites." msgstr "Se vi deziras, vi povas aktivigi severan kontroladon de SSL atestiloj. Pro tio, vie (tute) ne eblos konekti al SSL retejoj kun memsubskribitaj atestiloj." -#: ../../mod/admin.php:425 +#: ../../mod/admin.php:426 msgid "Proxy user" msgstr "Uzantnomo por retperanto" -#: ../../mod/admin.php:426 +#: ../../mod/admin.php:427 msgid "Proxy URL" msgstr "URL adreso de retperanto" -#: ../../mod/admin.php:427 +#: ../../mod/admin.php:428 msgid "Network timeout" msgstr "Reta tempolimo" -#: ../../mod/admin.php:427 +#: ../../mod/admin.php:428 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "Valoro en sekundoj. Uzu 0 por mallimitigi (ne rekomendata)." -#: ../../mod/admin.php:453 +#: ../../mod/admin.php:429 +msgid "Delivery interval" +msgstr "Intervalo de liverado" + +#: ../../mod/admin.php:429 +msgid "" +"Delay background delivery processes by this many seconds to reduce system " +"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " +"for large dedicated servers." +msgstr "Malfruigi fonan liveradon dum tiom da sekundoj por malpliigi la ŝargon de la sistemo. Rekomendoj: 4-5 por komunaj serviloj, 2-3 por virtualaj privataj serviloj, 0-1 por grandaj dediĉitaj serviloj." + +#: ../../mod/admin.php:455 #, php-format msgid "%s user blocked/unblocked" msgid_plural "%s users blocked/unblocked" msgstr[0] "Blokis/malblokis %s uzanton" msgstr[1] "Blokis/malblokis %s uzantojn" -#: ../../mod/admin.php:460 +#: ../../mod/admin.php:462 #, php-format msgid "%s user deleted" msgid_plural "%s users deleted" msgstr[0] "%s uzanto forviŝita" msgstr[1] "%s uzanto forviŝitaj" -#: ../../mod/admin.php:499 +#: ../../mod/admin.php:501 #, php-format msgid "User '%s' deleted" msgstr "Uzanto '%s' forviŝita" -#: ../../mod/admin.php:507 +#: ../../mod/admin.php:509 #, php-format msgid "User '%s' unblocked" msgstr "Uzanto '%s' malblokita" -#: ../../mod/admin.php:507 +#: ../../mod/admin.php:509 #, php-format msgid "User '%s' blocked" msgstr "Uzanto '%s' blokita" -#: ../../mod/admin.php:571 +#: ../../mod/admin.php:573 msgid "select all" msgstr "elekti ĉiujn" -#: ../../mod/admin.php:572 +#: ../../mod/admin.php:574 msgid "User registrations waiting for confirm" msgstr "Registriĝoj atendante aprobon" -#: ../../mod/admin.php:573 +#: ../../mod/admin.php:575 msgid "Request date" msgstr "Dato de peto" -#: ../../mod/admin.php:573 ../../mod/admin.php:582 +#: ../../mod/admin.php:575 ../../mod/admin.php:584 #: ../../include/contact_selectors.php:79 msgid "Email" msgstr "Retpoŝto" -#: ../../mod/admin.php:574 +#: ../../mod/admin.php:576 msgid "No registrations." msgstr "Neniom da registriĝoj." -#: ../../mod/admin.php:576 +#: ../../mod/admin.php:578 msgid "Deny" msgstr "Negi" -#: ../../mod/admin.php:582 +#: ../../mod/admin.php:584 msgid "Register date" msgstr "Dato de registrado" -#: ../../mod/admin.php:582 +#: ../../mod/admin.php:584 msgid "Last login" msgstr "Plej ĵusa ensaluto" -#: ../../mod/admin.php:582 +#: ../../mod/admin.php:584 msgid "Last item" msgstr "Plej ĵusa elemento" -#: ../../mod/admin.php:582 +#: ../../mod/admin.php:584 msgid "Account" msgstr "Konto" -#: ../../mod/admin.php:584 +#: ../../mod/admin.php:586 msgid "" "Selected users will be deleted!\\n\\nEverything these users had posted on " "this site will be permanently deleted!\\n\\nAre you sure?" msgstr "La elektitaj uzantkontoj estas forviŝotaj!\\n\\nĈiuj elementoj kiujn ili afiŝis je la retpaĝo estos permanente forviŝitaj.\\n\\nĈu vi certas?" -#: ../../mod/admin.php:585 +#: ../../mod/admin.php:587 msgid "" "The user {0} will be deleted!\\n\\nEverything this user has posted on this " "site will be permanently deleted!\\n\\nAre you sure?" msgstr "La uzanto {0} estas forviŝota!\\n\\nĈiuj elementoj kiujn li afiŝis je la retpaĝo estos permanente forviŝitaj.\\n\\nĈu vi certas?" -#: ../../mod/admin.php:626 +#: ../../mod/admin.php:628 #, php-format msgid "Plugin %s disabled." msgstr "Kromprogramo %s estas malŝaltita." -#: ../../mod/admin.php:630 +#: ../../mod/admin.php:632 #, php-format msgid "Plugin %s enabled." msgstr "Kromprogramo %s estas ŝaltita." -#: ../../mod/admin.php:640 ../../mod/admin.php:838 +#: ../../mod/admin.php:642 ../../mod/admin.php:840 msgid "Disable" msgstr "Malŝalti" -#: ../../mod/admin.php:642 ../../mod/admin.php:840 +#: ../../mod/admin.php:644 ../../mod/admin.php:842 msgid "Enable" msgstr "Ŝalti" -#: ../../mod/admin.php:664 ../../mod/admin.php:869 +#: ../../mod/admin.php:666 ../../mod/admin.php:871 msgid "Toggle" msgstr "Ŝalti/Malŝalti" -#: ../../mod/admin.php:672 ../../mod/admin.php:879 +#: ../../mod/admin.php:674 ../../mod/admin.php:881 msgid "Author: " msgstr "Aŭtoro: " -#: ../../mod/admin.php:673 ../../mod/admin.php:880 +#: ../../mod/admin.php:675 ../../mod/admin.php:882 msgid "Maintainer: " msgstr "Prizorganto: " -#: ../../mod/admin.php:802 +#: ../../mod/admin.php:804 msgid "No themes found." msgstr "Ne trovis etosojn." -#: ../../mod/admin.php:861 +#: ../../mod/admin.php:863 msgid "Screenshot" msgstr "Ekrankopio" -#: ../../mod/admin.php:909 +#: ../../mod/admin.php:911 msgid "[Experimental]" msgstr "[Eksperimenta]" -#: ../../mod/admin.php:910 +#: ../../mod/admin.php:912 msgid "[Unsupported]" msgstr "[Nesubtenata]" -#: ../../mod/admin.php:937 +#: ../../mod/admin.php:939 msgid "Log settings updated." msgstr "Protokolagordoj ĝisdatigitaj." -#: ../../mod/admin.php:994 +#: ../../mod/admin.php:996 msgid "Clear" msgstr "Forviŝi" -#: ../../mod/admin.php:1000 +#: ../../mod/admin.php:1002 msgid "Debugging" msgstr "Sencimigado" -#: ../../mod/admin.php:1001 +#: ../../mod/admin.php:1003 msgid "Log file" msgstr "Protokolo" -#: ../../mod/admin.php:1001 +#: ../../mod/admin.php:1003 msgid "" "Must be writable by web server. Relative to your Friendica top-level " "directory." msgstr "Devas esti skribebla de la retservilo. Relativa al via plej supra Friendica dosierujo." -#: ../../mod/admin.php:1002 +#: ../../mod/admin.php:1004 msgid "Log level" msgstr "Protokolnivelo" -#: ../../mod/admin.php:1052 +#: ../../mod/admin.php:1054 msgid "Close" msgstr "Fermi" -#: ../../mod/admin.php:1058 +#: ../../mod/admin.php:1060 msgid "FTP Host" msgstr "FTP Servilo" -#: ../../mod/admin.php:1059 +#: ../../mod/admin.php:1061 msgid "FTP Path" msgstr "FTP Vojo" -#: ../../mod/admin.php:1060 +#: ../../mod/admin.php:1062 msgid "FTP User" msgstr "FTP Uzanto" -#: ../../mod/admin.php:1061 +#: ../../mod/admin.php:1063 msgid "FTP Password" msgstr "FTP Pasvorto" @@ -3509,11 +3461,11 @@ msgstr "FTP Pasvorto" msgid "Requested profile is not available." msgstr "La petita profilo ne disponeblas." -#: ../../mod/profile.php:124 ../../mod/display.php:75 +#: ../../mod/profile.php:126 ../../mod/display.php:75 msgid "Access to this profile has been restricted." msgstr "Atingo al ĉi tio profilo estas limitigita" -#: ../../mod/profile.php:145 +#: ../../mod/profile.php:147 msgid "Tips for New Members" msgstr "Konsilo por novaj membroj" @@ -3914,7 +3866,7 @@ msgstr "videbla al ĉiuj" msgid "Edit visibility" msgstr "Redakti videblecon" -#: ../../mod/filer.php:29 ../../include/conversation.php:914 +#: ../../mod/filer.php:29 ../../include/conversation.php:922 msgid "Save to Folder:" msgstr "Konservi en Dosierujo:" @@ -3962,14 +3914,7 @@ msgstr "Aldoni" msgid "No entries." msgstr "Neniom da afiŝoj." -#: ../../mod/suggest.php:38 -#: ../../view/theme/diabook/diabook-green/theme.php:145 -#: ../../view/theme/diabook/diabook-red/theme.php:143 -#: ../../view/theme/diabook/diabook-blue/theme.php:143 -#: ../../view/theme/diabook/theme.php:158 -#: ../../view/theme/diabook/diabook-dark/theme.php:145 -#: ../../view/theme/diabook/diabook-aerith/theme.php:145 -#: ../../view/theme/diabook/diabook-pink/theme.php:145 +#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:163 #: ../../include/contact_widgets.php:34 msgid "Friend Suggestions" msgstr "Amikosugestoj." @@ -3984,14 +3929,7 @@ msgstr "Neniu sugestoj disponeblas. Se ĉi tiu estas nova retejo, bonvolu reprov msgid "Ignore/Hide" msgstr "Ignori/Kaŝi" -#: ../../mod/directory.php:47 -#: ../../view/theme/diabook/diabook-green/theme.php:143 -#: ../../view/theme/diabook/diabook-red/theme.php:141 -#: ../../view/theme/diabook/diabook-blue/theme.php:141 -#: ../../view/theme/diabook/theme.php:156 -#: ../../view/theme/diabook/diabook-dark/theme.php:143 -#: ../../view/theme/diabook/diabook-aerith/theme.php:143 -#: ../../view/theme/diabook/diabook-pink/theme.php:143 +#: ../../mod/directory.php:47 ../../view/theme/diabook/theme.php:161 msgid "Global Directory" msgstr "Tutmonda Katalogo" @@ -4303,8 +4241,8 @@ msgstr "Programo sekreto" #: ../../addon/facebook/facebook.php:715 #, php-format -msgid "Polling Interval (min. %1$s minutes)" -msgstr "Intervalo por la enketilo (poller intervalo, minimume %1$s mintuoj) " +msgid "Polling Interval in minutes (minimum %1$s minutes)" +msgstr "Intervalo de enketo en minutoj (minimume %1$s minutoj)" #: ../../addon/facebook/facebook.php:716 msgid "" @@ -4404,6 +4342,10 @@ msgid_plural "%d people don't like this" msgstr[0] "%d homo malŝatas tiun" msgstr[1] "%d homo malŝatas tiun" +#: ../../addon/widgets/widget_friendheader.php:40 +msgid "Get added to this list!" +msgstr "Iĝu membro de ĉi tiu listo!" + #: ../../addon/widgets/widgets.php:56 msgid "Generate new key" msgstr "Generi novan ĉifroŝlosilon" @@ -4547,15 +4489,8 @@ msgid "Latest likes" msgstr "Ĵusaj ŝatitaĵoj" #: ../../addon/communityhome/communityhome.php:155 -#: ../../view/theme/diabook/diabook-green/theme.php:80 -#: ../../view/theme/diabook/diabook-red/theme.php:79 -#: ../../view/theme/diabook/diabook-blue/theme.php:79 -#: ../../view/theme/diabook/theme.php:94 -#: ../../view/theme/diabook/diabook-dark/theme.php:80 -#: ../../view/theme/diabook/diabook-aerith/theme.php:80 -#: ../../view/theme/diabook/diabook-pink/theme.php:80 -#: ../../include/text.php:1302 ../../include/conversation.php:45 -#: ../../include/conversation.php:118 +#: ../../view/theme/diabook/theme.php:99 ../../include/text.php:1302 +#: ../../include/conversation.php:45 ../../include/conversation.php:118 msgid "event" msgstr "okazo" @@ -4763,68 +4698,70 @@ msgstr "Uzi OEmbed por YouTube videtoj" msgid "URL to embed:" msgstr "Enigi la URL adreson:" -#: ../../addon/impressum/impressum.php:34 +#: ../../addon/impressum/impressum.php:36 msgid "Impressum" msgstr "Kolofono" -#: ../../addon/impressum/impressum.php:47 #: ../../addon/impressum/impressum.php:49 -#: ../../addon/impressum/impressum.php:81 +#: ../../addon/impressum/impressum.php:51 +#: ../../addon/impressum/impressum.php:83 msgid "Site Owner" msgstr "Proprietulo de la paĝo" -#: ../../addon/impressum/impressum.php:47 -#: ../../addon/impressum/impressum.php:85 +#: ../../addon/impressum/impressum.php:49 +#: ../../addon/impressum/impressum.php:87 msgid "Email Address" msgstr "Retpoŝta Adreso" -#: ../../addon/impressum/impressum.php:52 -#: ../../addon/impressum/impressum.php:83 +#: ../../addon/impressum/impressum.php:54 +#: ../../addon/impressum/impressum.php:85 msgid "Postal Address" msgstr "Poŝta Adreso" -#: ../../addon/impressum/impressum.php:58 +#: ../../addon/impressum/impressum.php:60 msgid "" "The impressum addon needs to be configured!
Please add at least the " "owner variable to your config file. For other variables please " "refer to the README file of the addon." msgstr "La kolofono (impressum) kromprogramo bezonas agordojn!
Bonvolu aldoni minimume la owner variablon al via agorda dosiero. Por aliaj variabloj, bonvolu legi la README dosieron de la kromprogramo." -#: ../../addon/impressum/impressum.php:81 +#: ../../addon/impressum/impressum.php:83 msgid "The page operators name." msgstr "La nomo de la funkciigisto de la retejo." -#: ../../addon/impressum/impressum.php:82 +#: ../../addon/impressum/impressum.php:84 msgid "Site Owners Profile" msgstr "Profilo de la Proprietulo de la Retejo" -#: ../../addon/impressum/impressum.php:82 +#: ../../addon/impressum/impressum.php:84 msgid "Profile address of the operator." msgstr "La profilo de la funkciigisto de la retejo." -#: ../../addon/impressum/impressum.php:83 -msgid "How to contact the operator via snail mail." -msgstr "Kiel kontakti la funkciigiston de la retejo tra paperpoŝto." +#: ../../addon/impressum/impressum.php:85 +msgid "How to contact the operator via snail mail. You can use BBCode here." +msgstr "Kiel poŝte kontakti la funkciigisto de la retejo. Vi eblas uzi BBCode ĉi tie." -#: ../../addon/impressum/impressum.php:84 +#: ../../addon/impressum/impressum.php:86 msgid "Notes" msgstr "Notoj" -#: ../../addon/impressum/impressum.php:84 -msgid "Additional notes that are displayed beneath the contact information." -msgstr "Pliaj notoj kiuj estas montrigota malsupre la kontaktinformojn." +#: ../../addon/impressum/impressum.php:86 +msgid "" +"Additional notes that are displayed beneath the contact information. You can" +" use BBCode here." +msgstr "Pli da notoj kiuj aperas sub la kontaktinformoj. Vi eblas uzi BBCode ĉi tie." -#: ../../addon/impressum/impressum.php:85 +#: ../../addon/impressum/impressum.php:87 msgid "How to contact the operator via email. (will be displayed obfuscated)" msgstr "Kiel kontakti la funkciigiston de la retejo tra retpoŝto. (montriĝos vuale) " -#: ../../addon/impressum/impressum.php:86 +#: ../../addon/impressum/impressum.php:88 msgid "Footer note" msgstr "Paĝpiednoto" -#: ../../addon/impressum/impressum.php:86 -msgid "Text for the footer." -msgstr "Teksto por la paĝpiedo." +#: ../../addon/impressum/impressum.php:88 +msgid "Text for the footer. You can use BBCode here." +msgstr "Teksto por la paĝpiedo. Vie eblas uzi BBCode ĉi tie." #: ../../addon/buglink/buglink.php:15 msgid "Report Bug" @@ -5448,228 +5385,100 @@ msgstr "Posterous pasvorto" msgid "Post to Posterous by default" msgstr "Defaŭlte afiŝi al Posterous" -#: ../../view/theme/diabook/diabook-green/theme.php:29 -#: ../../view/theme/diabook/diabook-red/theme.php:28 -#: ../../view/theme/diabook/diabook-blue/theme.php:28 -#: ../../view/theme/diabook/theme.php:43 -#: ../../view/theme/diabook/diabook-dark/theme.php:29 -#: ../../view/theme/diabook/diabook-aerith/theme.php:29 -#: ../../view/theme/diabook/diabook-pink/theme.php:29 -msgid "Last users" -msgstr "Ĵusaj uzantoj" - -#: ../../view/theme/diabook/diabook-green/theme.php:58 -#: ../../view/theme/diabook/diabook-red/theme.php:57 -#: ../../view/theme/diabook/diabook-blue/theme.php:57 -#: ../../view/theme/diabook/theme.php:72 -#: ../../view/theme/diabook/diabook-dark/theme.php:58 -#: ../../view/theme/diabook/diabook-aerith/theme.php:58 -#: ../../view/theme/diabook/diabook-pink/theme.php:58 -msgid "Last likes" -msgstr "Ĵusaj ŝatitaj elementoj" - -#: ../../view/theme/diabook/diabook-green/theme.php:103 -#: ../../view/theme/diabook/diabook-red/theme.php:102 -#: ../../view/theme/diabook/diabook-blue/theme.php:102 -#: ../../view/theme/diabook/theme.php:117 -#: ../../view/theme/diabook/diabook-dark/theme.php:103 -#: ../../view/theme/diabook/diabook-aerith/theme.php:103 -#: ../../view/theme/diabook/diabook-pink/theme.php:103 -msgid "Last photos" -msgstr "Ĵusaj bildoj" - -#: ../../view/theme/diabook/diabook-green/theme.php:141 -#: ../../view/theme/diabook/diabook-red/theme.php:139 -#: ../../view/theme/diabook/diabook-blue/theme.php:139 -#: ../../view/theme/diabook/theme.php:154 -#: ../../view/theme/diabook/diabook-dark/theme.php:141 -#: ../../view/theme/diabook/diabook-aerith/theme.php:141 -#: ../../view/theme/diabook/diabook-pink/theme.php:141 -msgid "Find Friends" -msgstr "Trovi Amikojn" - -#: ../../view/theme/diabook/diabook-green/theme.php:142 -#: ../../view/theme/diabook/diabook-red/theme.php:140 -#: ../../view/theme/diabook/diabook-blue/theme.php:140 -#: ../../view/theme/diabook/theme.php:155 -#: ../../view/theme/diabook/diabook-dark/theme.php:142 -#: ../../view/theme/diabook/diabook-aerith/theme.php:142 -#: ../../view/theme/diabook/diabook-pink/theme.php:142 -msgid "Local Directory" -msgstr "Loka Katalogo" - -#: ../../view/theme/diabook/diabook-green/theme.php:144 -#: ../../view/theme/diabook/diabook-red/theme.php:142 -#: ../../view/theme/diabook/diabook-blue/theme.php:142 -#: ../../view/theme/diabook/theme.php:157 -#: ../../view/theme/diabook/diabook-dark/theme.php:144 -#: ../../view/theme/diabook/diabook-aerith/theme.php:144 -#: ../../view/theme/diabook/diabook-pink/theme.php:144 -#: ../../include/contact_widgets.php:35 -msgid "Similar Interests" -msgstr "Similaj Interesoj" - -#: ../../view/theme/diabook/diabook-green/theme.php:146 -#: ../../view/theme/diabook/diabook-red/theme.php:144 -#: ../../view/theme/diabook/diabook-blue/theme.php:144 -#: ../../view/theme/diabook/theme.php:159 -#: ../../view/theme/diabook/diabook-dark/theme.php:146 -#: ../../view/theme/diabook/diabook-aerith/theme.php:146 -#: ../../view/theme/diabook/diabook-pink/theme.php:146 -#: ../../include/contact_widgets.php:37 -msgid "Invite Friends" -msgstr "Inviti amikojn" - -#: ../../view/theme/diabook/diabook-green/theme.php:161 -#: ../../view/theme/diabook/diabook-green/theme.php:236 -#: ../../view/theme/diabook/diabook-red/theme.php:159 -#: ../../view/theme/diabook/diabook-red/theme.php:234 -#: ../../view/theme/diabook/diabook-blue/theme.php:159 -#: ../../view/theme/diabook/diabook-blue/theme.php:234 -#: ../../view/theme/diabook/theme.php:175 -#: ../../view/theme/diabook/theme.php:253 -#: ../../view/theme/diabook/diabook-dark/theme.php:161 -#: ../../view/theme/diabook/diabook-dark/theme.php:236 -#: ../../view/theme/diabook/diabook-aerith/theme.php:161 -#: ../../view/theme/diabook/diabook-aerith/theme.php:236 -#: ../../view/theme/diabook/diabook-pink/theme.php:161 -#: ../../view/theme/diabook/diabook-pink/theme.php:236 -msgid "Community Pages" -msgstr "Komunumaj paĝoj" - -#: ../../view/theme/diabook/diabook-green/theme.php:194 -#: ../../view/theme/diabook/diabook-red/theme.php:192 -#: ../../view/theme/diabook/diabook-blue/theme.php:192 -#: ../../view/theme/diabook/theme.php:208 -#: ../../view/theme/diabook/diabook-dark/theme.php:194 -#: ../../view/theme/diabook/diabook-aerith/theme.php:194 -#: ../../view/theme/diabook/diabook-pink/theme.php:194 -msgid "Help or @NewHere ?" -msgstr "Helpu aŭ @NewHere ?" - -#: ../../view/theme/diabook/diabook-green/theme.php:200 -#: ../../view/theme/diabook/diabook-red/theme.php:198 -#: ../../view/theme/diabook/diabook-blue/theme.php:198 -#: ../../view/theme/diabook/theme.php:214 -#: ../../view/theme/diabook/diabook-dark/theme.php:200 -#: ../../view/theme/diabook/diabook-aerith/theme.php:200 -#: ../../view/theme/diabook/diabook-pink/theme.php:200 -msgid "Connect Services" -msgstr "Konekti Servojn" - -#: ../../view/theme/diabook/diabook-green/theme.php:229 -#: ../../view/theme/diabook/diabook-red/theme.php:227 -#: ../../view/theme/diabook/diabook-blue/theme.php:227 -#: ../../view/theme/diabook/theme.php:246 -#: ../../view/theme/diabook/diabook-dark/theme.php:229 -#: ../../view/theme/diabook/diabook-aerith/theme.php:229 -#: ../../view/theme/diabook/diabook-pink/theme.php:229 -#: ../../include/nav.php:49 ../../include/nav.php:115 -msgid "Your posts and conversations" -msgstr "Viaj afiŝoj kaj komunikadoj" - -#: ../../view/theme/diabook/diabook-green/theme.php:230 -#: ../../view/theme/diabook/diabook-red/theme.php:228 -#: ../../view/theme/diabook/diabook-blue/theme.php:228 -#: ../../view/theme/diabook/theme.php:247 -#: ../../view/theme/diabook/diabook-dark/theme.php:230 -#: ../../view/theme/diabook/diabook-aerith/theme.php:230 -#: ../../view/theme/diabook/diabook-pink/theme.php:230 -#: ../../include/nav.php:50 -msgid "Your profile page" -msgstr "Via profilo" - -#: ../../view/theme/diabook/diabook-green/theme.php:231 -#: ../../view/theme/diabook/diabook-red/theme.php:229 -#: ../../view/theme/diabook/diabook-blue/theme.php:229 -#: ../../view/theme/diabook/theme.php:248 -#: ../../view/theme/diabook/diabook-dark/theme.php:231 -#: ../../view/theme/diabook/diabook-aerith/theme.php:231 -#: ../../view/theme/diabook/diabook-pink/theme.php:231 -msgid "Your contacts" -msgstr "Viaj kontaktoj" - -#: ../../view/theme/diabook/diabook-green/theme.php:232 -#: ../../view/theme/diabook/diabook-red/theme.php:230 -#: ../../view/theme/diabook/diabook-blue/theme.php:230 -#: ../../view/theme/diabook/theme.php:249 -#: ../../view/theme/diabook/diabook-dark/theme.php:232 -#: ../../view/theme/diabook/diabook-aerith/theme.php:232 -#: ../../view/theme/diabook/diabook-pink/theme.php:232 -#: ../../include/nav.php:51 -msgid "Your photos" -msgstr "Viaj bildoj" - -#: ../../view/theme/diabook/diabook-green/theme.php:233 -#: ../../view/theme/diabook/diabook-red/theme.php:231 -#: ../../view/theme/diabook/diabook-blue/theme.php:231 -#: ../../view/theme/diabook/theme.php:250 -#: ../../view/theme/diabook/diabook-dark/theme.php:233 -#: ../../view/theme/diabook/diabook-aerith/theme.php:233 -#: ../../view/theme/diabook/diabook-pink/theme.php:233 -#: ../../include/nav.php:52 -msgid "Your events" -msgstr "Viaj okazoj" - -#: ../../view/theme/diabook/diabook-green/theme.php:234 -#: ../../view/theme/diabook/diabook-red/theme.php:232 -#: ../../view/theme/diabook/diabook-blue/theme.php:232 -#: ../../view/theme/diabook/theme.php:251 -#: ../../view/theme/diabook/diabook-dark/theme.php:234 -#: ../../view/theme/diabook/diabook-aerith/theme.php:234 -#: ../../view/theme/diabook/diabook-pink/theme.php:234 -#: ../../include/nav.php:53 -msgid "Personal notes" -msgstr "Personaj notoj" - -#: ../../view/theme/diabook/diabook-green/theme.php:234 -#: ../../view/theme/diabook/diabook-red/theme.php:232 -#: ../../view/theme/diabook/diabook-blue/theme.php:232 -#: ../../view/theme/diabook/theme.php:251 -#: ../../view/theme/diabook/diabook-dark/theme.php:234 -#: ../../view/theme/diabook/diabook-aerith/theme.php:234 -#: ../../view/theme/diabook/diabook-pink/theme.php:234 -#: ../../include/nav.php:53 -msgid "Your personal photos" -msgstr "Viaj personaj bildoj" - -#: ../../view/theme/diabook/diabook-green/config.php:78 -#: ../../view/theme/diabook/diabook-red/config.php:78 -#: ../../view/theme/diabook/diabook-blue/config.php:78 -#: ../../view/theme/diabook/diabook-dark/config.php:78 -#: ../../view/theme/diabook/diabook-aerith/config.php:78 -#: ../../view/theme/diabook/diabook-pink/config.php:78 +#: ../../view/theme/cleanzero/config.php:73 #: ../../view/theme/diabook/config.php:93 -#: ../../view/theme/quattro/config.php:54 +#: ../../view/theme/quattro/config.php:54 ../../view/theme/dispy/config.php:72 msgid "Theme settings" msgstr "Agordoj pri la etoso" -#: ../../view/theme/diabook/diabook-green/config.php:79 -#: ../../view/theme/diabook/diabook-red/config.php:79 -#: ../../view/theme/diabook/diabook-blue/config.php:79 -#: ../../view/theme/diabook/diabook-dark/config.php:79 -#: ../../view/theme/diabook/diabook-aerith/config.php:79 -#: ../../view/theme/diabook/diabook-pink/config.php:79 -#: ../../view/theme/diabook/config.php:94 +#: ../../view/theme/cleanzero/config.php:74 +msgid "Set resize level for images in posts and comments (width and height)" +msgstr "Agordi la regrandignivelo por bildoj en afiŝoj kaj komentoj (larĝo kaj alto)" + +#: ../../view/theme/cleanzero/config.php:75 +#: ../../view/theme/diabook/config.php:94 ../../view/theme/dispy/config.php:73 msgid "Set font-size for posts and comments" msgstr "Agordi la tiparan grandon por afiŝoj kaj komentoj" -#: ../../view/theme/diabook/diabook-green/config.php:80 -#: ../../view/theme/diabook/diabook-red/config.php:80 -#: ../../view/theme/diabook/diabook-blue/config.php:80 -#: ../../view/theme/diabook/diabook-dark/config.php:80 -#: ../../view/theme/diabook/diabook-aerith/config.php:80 -#: ../../view/theme/diabook/diabook-pink/config.php:80 -#: ../../view/theme/diabook/config.php:95 +#: ../../view/theme/cleanzero/config.php:76 +#: ../../view/theme/quattro/config.php:56 +msgid "Color scheme" +msgstr "Kolorskemo" + +#: ../../view/theme/diabook/theme.php:48 +msgid "Last users" +msgstr "Ĵusaj uzantoj" + +#: ../../view/theme/diabook/theme.php:77 +msgid "Last likes" +msgstr "Ĵusaj ŝatitaj elementoj" + +#: ../../view/theme/diabook/theme.php:122 +msgid "Last photos" +msgstr "Ĵusaj bildoj" + +#: ../../view/theme/diabook/theme.php:159 +msgid "Find Friends" +msgstr "Trovi Amikojn" + +#: ../../view/theme/diabook/theme.php:160 +msgid "Local Directory" +msgstr "Loka Katalogo" + +#: ../../view/theme/diabook/theme.php:162 ../../include/contact_widgets.php:35 +msgid "Similar Interests" +msgstr "Similaj Interesoj" + +#: ../../view/theme/diabook/theme.php:164 ../../include/contact_widgets.php:37 +msgid "Invite Friends" +msgstr "Inviti amikojn" + +#: ../../view/theme/diabook/theme.php:180 +#: ../../view/theme/diabook/theme.php:258 +msgid "Community Pages" +msgstr "Komunumaj paĝoj" + +#: ../../view/theme/diabook/theme.php:213 +msgid "Help or @NewHere ?" +msgstr "Helpu aŭ @NewHere ?" + +#: ../../view/theme/diabook/theme.php:219 +msgid "Connect Services" +msgstr "Konekti Servojn" + +#: ../../view/theme/diabook/theme.php:251 ../../include/nav.php:49 +#: ../../include/nav.php:115 +msgid "Your posts and conversations" +msgstr "Viaj afiŝoj kaj komunikadoj" + +#: ../../view/theme/diabook/theme.php:252 ../../include/nav.php:50 +msgid "Your profile page" +msgstr "Via profilo" + +#: ../../view/theme/diabook/theme.php:253 +msgid "Your contacts" +msgstr "Viaj kontaktoj" + +#: ../../view/theme/diabook/theme.php:254 ../../include/nav.php:51 +msgid "Your photos" +msgstr "Viaj bildoj" + +#: ../../view/theme/diabook/theme.php:255 ../../include/nav.php:52 +msgid "Your events" +msgstr "Viaj okazoj" + +#: ../../view/theme/diabook/theme.php:256 ../../include/nav.php:53 +msgid "Personal notes" +msgstr "Personaj notoj" + +#: ../../view/theme/diabook/theme.php:256 ../../include/nav.php:53 +msgid "Your personal photos" +msgstr "Viaj personaj bildoj" + +#: ../../view/theme/diabook/config.php:95 ../../view/theme/dispy/config.php:74 msgid "Set line-height for posts and comments" msgstr "Agordi la linigrandon por afiŝoj kaj komentoj" -#: ../../view/theme/diabook/diabook-green/config.php:81 -#: ../../view/theme/diabook/diabook-red/config.php:81 -#: ../../view/theme/diabook/diabook-blue/config.php:81 -#: ../../view/theme/diabook/diabook-dark/config.php:81 -#: ../../view/theme/diabook/diabook-aerith/config.php:81 -#: ../../view/theme/diabook/diabook-pink/config.php:81 #: ../../view/theme/diabook/config.php:96 msgid "Set resolution for middle column" msgstr "Agordi la distingivon por la meza kolumno" @@ -5690,9 +5499,9 @@ msgstr "Maldekstren" msgid "Center" msgstr "Centren" -#: ../../view/theme/quattro/config.php:56 -msgid "Color scheme" -msgstr "Kolorskemo" +#: ../../view/theme/dispy/config.php:75 +msgid "Set colour scheme" +msgstr "Agordi Kolorskemon" #: ../../include/profile_advanced.php:17 ../../boot.php:1085 msgid "Gender:" @@ -6083,12 +5892,12 @@ msgstr "Ekas:" msgid "Finishes:" msgstr "Finas:" -#: ../../include/delivery.php:434 ../../include/notifier.php:651 +#: ../../include/delivery.php:434 ../../include/notifier.php:652 msgid "(no subject)" msgstr "(neniu temo)" #: ../../include/delivery.php:441 ../../include/enotify.php:23 -#: ../../include/notifier.php:658 +#: ../../include/notifier.php:659 msgid "noreply" msgstr "nerespondi" @@ -6311,7 +6120,7 @@ msgstr "Elsaluti" msgid "End this session" msgstr "Fini ĉi-tiun seancon" -#: ../../include/nav.php:49 ../../boot.php:1453 +#: ../../include/nav.php:49 ../../boot.php:1463 msgid "Status" msgstr "Stato" @@ -6561,7 +6370,7 @@ msgstr "sekundoj" msgid "%1$d %2$s ago" msgstr "antaŭ %1$d %2$s" -#: ../../include/poller.php:543 +#: ../../include/onepoll.php:402 msgid "From: " msgstr "De: " @@ -6817,30 +6626,34 @@ msgid "" "form has been opened for too long (>3 hours) before submitting it." msgstr "La sekuriga ĵetono de la formo estis malĝusta. Tio verŝajne okazis ĉar la formo estis malfermita dum tro longa tempo (>3 horoj) antaŭ la sendado." -#: ../../include/Contact.php:145 ../../include/conversation.php:809 +#: ../../include/Contact.php:96 +msgid "stopped following" +msgstr "ne plu sekvas" + +#: ../../include/Contact.php:188 ../../include/conversation.php:817 msgid "View Status" msgstr "Vidi Staton" -#: ../../include/Contact.php:146 ../../include/conversation.php:810 +#: ../../include/Contact.php:189 ../../include/conversation.php:818 msgid "View Profile" msgstr "Vidi Profilon" -#: ../../include/Contact.php:147 ../../include/conversation.php:811 +#: ../../include/Contact.php:190 ../../include/conversation.php:819 msgid "View Photos" msgstr "Vidi Bildojn" -#: ../../include/Contact.php:148 ../../include/Contact.php:161 -#: ../../include/conversation.php:812 +#: ../../include/Contact.php:191 ../../include/Contact.php:204 +#: ../../include/conversation.php:820 msgid "Network Posts" msgstr "Enretaj Afiŝoj" -#: ../../include/Contact.php:149 ../../include/Contact.php:161 -#: ../../include/conversation.php:813 +#: ../../include/Contact.php:192 ../../include/Contact.php:204 +#: ../../include/conversation.php:821 msgid "Edit Contact" msgstr "Redakti Kontakton" -#: ../../include/Contact.php:150 ../../include/Contact.php:161 -#: ../../include/conversation.php:814 +#: ../../include/Contact.php:193 ../../include/Contact.php:204 +#: ../../include/conversation.php:822 msgid "Send PM" msgstr "Sendi PM" @@ -6853,17 +6666,17 @@ msgstr "afiŝo/elemento" msgid "%1$s marked %2$s's %3$s as favorite" msgstr "%1$s markis la %3$s de %2$s kiel preferita." -#: ../../include/conversation.php:317 ../../include/conversation.php:575 +#: ../../include/conversation.php:317 ../../include/conversation.php:583 msgid "Select" msgstr "Elekti" -#: ../../include/conversation.php:334 ../../include/conversation.php:668 -#: ../../include/conversation.php:669 +#: ../../include/conversation.php:334 ../../include/conversation.php:676 +#: ../../include/conversation.php:677 #, php-format msgid "View %s's profile @ %s" msgstr "Vidi la profilon de %s ĉe %s" -#: ../../include/conversation.php:344 ../../include/conversation.php:680 +#: ../../include/conversation.php:344 ../../include/conversation.php:688 #, php-format msgid "%s from %s" msgstr "%s de %s" @@ -6895,142 +6708,174 @@ msgstr "Kunhavigi ĉi tiun" msgid "share" msgstr "kunhavigi" -#: ../../include/conversation.php:588 +#: ../../include/conversation.php:556 +msgid "Bold" +msgstr "Grasa" + +#: ../../include/conversation.php:557 +msgid "Italic" +msgstr "Kursiva" + +#: ../../include/conversation.php:558 +msgid "Underline" +msgstr "Substreki" + +#: ../../include/conversation.php:559 +msgid "Quote" +msgstr "Citaĵo" + +#: ../../include/conversation.php:560 +msgid "Code" +msgstr "Kodo" + +#: ../../include/conversation.php:561 +msgid "Image" +msgstr "Bildo" + +#: ../../include/conversation.php:562 +msgid "Link" +msgstr "Ligilo" + +#: ../../include/conversation.php:563 +msgid "Video" +msgstr "Video" + +#: ../../include/conversation.php:596 msgid "add star" msgstr "aldoni stelon" -#: ../../include/conversation.php:589 +#: ../../include/conversation.php:597 msgid "remove star" msgstr "forpreni stelon" -#: ../../include/conversation.php:590 +#: ../../include/conversation.php:598 msgid "toggle star status" msgstr "ŝalti/malŝalti steloŝtato" -#: ../../include/conversation.php:593 +#: ../../include/conversation.php:601 msgid "starred" msgstr "steligita" -#: ../../include/conversation.php:594 +#: ../../include/conversation.php:602 msgid "add tag" msgstr "aldoni markon" -#: ../../include/conversation.php:598 +#: ../../include/conversation.php:606 msgid "save to folder" msgstr "konservi en dosierujo" -#: ../../include/conversation.php:670 +#: ../../include/conversation.php:678 msgid "to" msgstr "al" -#: ../../include/conversation.php:671 +#: ../../include/conversation.php:679 msgid "Wall-to-Wall" msgstr "Muro-al-Muro" -#: ../../include/conversation.php:672 +#: ../../include/conversation.php:680 msgid "via Wall-To-Wall:" msgstr "tra Muro-al-Muro:" -#: ../../include/conversation.php:717 +#: ../../include/conversation.php:725 msgid "Delete Selected Items" msgstr "Forviŝi Elektitajn Elementojn" -#: ../../include/conversation.php:868 +#: ../../include/conversation.php:876 #, php-format msgid "%s likes this." msgstr "%s ŝatas tiun." -#: ../../include/conversation.php:868 +#: ../../include/conversation.php:876 #, php-format msgid "%s doesn't like this." msgstr "%s malŝatas tiun." -#: ../../include/conversation.php:872 +#: ../../include/conversation.php:880 #, php-format msgid "%2$d people like this." msgstr "%2$d homoj ŝatas tiun." -#: ../../include/conversation.php:874 +#: ../../include/conversation.php:882 #, php-format msgid "%2$d people don't like this." msgstr "%2$d homojmalŝatas tiun." -#: ../../include/conversation.php:880 +#: ../../include/conversation.php:888 msgid "and" msgstr "kaj" -#: ../../include/conversation.php:883 +#: ../../include/conversation.php:891 #, php-format msgid ", and %d other people" msgstr ", kaj %d aliaj homoj." -#: ../../include/conversation.php:884 +#: ../../include/conversation.php:892 #, php-format msgid "%s like this." msgstr "%s ŝatas tiun." -#: ../../include/conversation.php:884 +#: ../../include/conversation.php:892 #, php-format msgid "%s don't like this." msgstr "%s malŝatas tiun." -#: ../../include/conversation.php:909 +#: ../../include/conversation.php:917 msgid "Visible to everybody" msgstr "Videbla al ĉiuj" -#: ../../include/conversation.php:911 +#: ../../include/conversation.php:919 msgid "Please enter a video link/URL:" msgstr "Bonvolu entajpi ligilon/adreson de video:" -#: ../../include/conversation.php:912 +#: ../../include/conversation.php:920 msgid "Please enter an audio link/URL:" msgstr "Bonvolu entajpi ligilon/adreson de sono:" -#: ../../include/conversation.php:913 +#: ../../include/conversation.php:921 msgid "Tag term:" msgstr "Markfrazo:" -#: ../../include/conversation.php:915 +#: ../../include/conversation.php:923 msgid "Where are you right now?" msgstr "Kie vi estas nun?" -#: ../../include/conversation.php:958 +#: ../../include/conversation.php:966 msgid "upload photo" msgstr "alŝuti bildon" -#: ../../include/conversation.php:960 +#: ../../include/conversation.php:968 msgid "attach file" msgstr "kunsendi dosieron" -#: ../../include/conversation.php:962 +#: ../../include/conversation.php:970 msgid "web link" msgstr "TTT ligilo" -#: ../../include/conversation.php:963 +#: ../../include/conversation.php:971 msgid "Insert video link" msgstr "Alglui ligilon de video" -#: ../../include/conversation.php:964 +#: ../../include/conversation.php:972 msgid "video link" msgstr "video ligilo" -#: ../../include/conversation.php:965 +#: ../../include/conversation.php:973 msgid "Insert audio link" msgstr "Alglui ligilon de sono" -#: ../../include/conversation.php:966 +#: ../../include/conversation.php:974 msgid "audio link" msgstr "sono ligilo" -#: ../../include/conversation.php:968 +#: ../../include/conversation.php:976 msgid "set location" msgstr "agordi lokon" -#: ../../include/conversation.php:970 +#: ../../include/conversation.php:978 msgid "clear location" msgstr "forviŝi lokon" -#: ../../include/conversation.php:977 +#: ../../include/conversation.php:985 msgid "permissions" msgstr "permesoj" @@ -7070,34 +6915,34 @@ msgstr "Redakti profilon" msgid "Message" msgstr "Mesaĝo" -#: ../../boot.php:1151 ../../boot.php:1223 +#: ../../boot.php:1151 ../../boot.php:1227 msgid "g A l F d" msgstr "\\j\\e \\l\\a G\\a \\h\\o\\r\\o, l F d" -#: ../../boot.php:1152 ../../boot.php:1224 +#: ../../boot.php:1152 ../../boot.php:1228 msgid "F d" msgstr "F d" -#: ../../boot.php:1177 -msgid "Birthday Reminders" -msgstr "Memorigilo pri naskiĝtagoj" - -#: ../../boot.php:1178 -msgid "Birthdays this week:" -msgstr "Naskiĝtagoj ĉi-semajne:" - -#: ../../boot.php:1201 ../../boot.php:1266 +#: ../../boot.php:1197 ../../boot.php:1268 msgid "[today]" msgstr "[hodiaŭ]" -#: ../../boot.php:1247 +#: ../../boot.php:1209 +msgid "Birthday Reminders" +msgstr "Memorigilo pri naskiĝtagoj" + +#: ../../boot.php:1210 +msgid "Birthdays this week:" +msgstr "Naskiĝtagoj ĉi-semajne:" + +#: ../../boot.php:1261 +msgid "[No description]" +msgstr "[Neniu priskribo]" + +#: ../../boot.php:1279 msgid "Event Reminders" msgstr "Memorigiloj pri Okazoj" -#: ../../boot.php:1248 +#: ../../boot.php:1280 msgid "Events this week:" msgstr "Okazoj ĉi-semajne:" - -#: ../../boot.php:1260 -msgid "[No description]" -msgstr "[Neniu priskribo]" diff --git a/view/eo/strings.php b/view/eo/strings.php index 78d6b05ce..0fab27288 100644 --- a/view/eo/strings.php +++ b/view/eo/strings.php @@ -301,7 +301,8 @@ $a->strings["Contact has been blocked"] = "Kontakto estas blokita."; $a->strings["Contact has been unblocked"] = "Kontakto estas malblokita."; $a->strings["Contact has been ignored"] = "Kontakto estas ignorita."; $a->strings["Contact has been unignored"] = "Kontakto estas malignorita."; -$a->strings["stopped following"] = "ne plu sekvas"; +$a->strings["Contact has been archived"] = "Enarkivigis kontakton"; +$a->strings["Contact has been unarchived"] = "Elarkivigis kontakton"; $a->strings["Contact has been removed."] = "Kontakto estas forigita."; $a->strings["You are mutual friends with %s"] = "Vi estas reciproka amiko de %s"; $a->strings["You are sharing with %s"] = "Vi kunhavigas kun %s"; @@ -320,6 +321,8 @@ $a->strings["View all contacts"] = "Vidi ĉiujn kontaktojn"; $a->strings["Unblock"] = "Malbloki"; $a->strings["Block"] = "Bloki"; $a->strings["Unignore"] = "Malignori"; +$a->strings["Unarchive"] = "Elarkivigi"; +$a->strings["Archive"] = "Enarkivigi"; $a->strings["Repair"] = "Ripari"; $a->strings["Contact Editor"] = "Kontakta redaktilo."; $a->strings["Profile Visibility"] = "Videbleco de profilo"; @@ -337,13 +340,15 @@ $a->strings["Update public posts"] = "Ĝisdatigi publikajn afiŝojn"; $a->strings["Update now"] = "Ĝisdatigi nun"; $a->strings["Currently blocked"] = "Nuntempe blokata"; $a->strings["Currently ignored"] = "Nuntempe ignorata"; +$a->strings["Currently archived"] = "Nuntempe enarkivigita"; $a->strings["Replies/likes to your public posts may still be visible"] = "Rispondoj/ŝataĵo al viaj publikaj afiŝoj eble plu estos videbla"; $a->strings["Suggestions"] = "Sugestoj"; $a->strings["All Contacts"] = "Ĉiuj Kontaktoj"; -$a->strings["Unblocked Contacts"] = "Malblokitaj Kontaktoj"; -$a->strings["Blocked Contacts"] = "Blokitaj Kontaktoj"; -$a->strings["Ignored Contacts"] = "Ignoritaj Kontaktoj"; -$a->strings["Hidden Contacts"] = "Kaŝitaj Kontaktoj"; +$a->strings["Unblocked"] = "Malblokita"; +$a->strings["Blocked"] = "Blokita"; +$a->strings["Ignored"] = "Ignorita"; +$a->strings["Archived"] = "Enarkivigita"; +$a->strings["Hidden"] = "Kaŝita"; $a->strings["Mutual Friendship"] = "Reciproka amikeco"; $a->strings["is a fan of yours"] = "estas admiranto de vi"; $a->strings["you are a fan of"] = "vi estas admiranto de"; @@ -373,6 +378,7 @@ $a->strings["Connector settings"] = "Konektiloj"; $a->strings["Plugin settings"] = "Kromprogramoj"; $a->strings["Connected apps"] = "Konektitaj programoj"; $a->strings["Export personal data"] = "Eksporto"; +$a->strings["Remove account"] = "Forigi konton"; $a->strings["Settings"] = "Agordoj"; $a->strings["Missing some important data!"] = "Mankas importantaj datumoj!"; $a->strings["Update"] = "Ĝisdatigi"; @@ -723,6 +729,8 @@ $a->strings["Proxy user"] = "Uzantnomo por retperanto"; $a->strings["Proxy URL"] = "URL adreso de retperanto"; $a->strings["Network timeout"] = "Reta tempolimo"; $a->strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = "Valoro en sekundoj. Uzu 0 por mallimitigi (ne rekomendata)."; +$a->strings["Delivery interval"] = "Intervalo de liverado"; +$a->strings["Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers."] = "Malfruigi fonan liveradon dum tiom da sekundoj por malpliigi la ŝargon de la sistemo. Rekomendoj: 4-5 por komunaj serviloj, 2-3 por virtualaj privataj serviloj, 0-1 por grandaj dediĉitaj serviloj."; $a->strings["%s user blocked/unblocked"] = array( 0 => "Blokis/malblokis %s uzanton", 1 => "Blokis/malblokis %s uzantojn", @@ -947,7 +955,7 @@ $a->strings["The given API Key seems to work correctly."] = "La API ŝlosilo ŝa $a->strings["The correctness of the API Key could not be detected. Somthing strange's going on."] = "Ne povis kontroli la ĝustecon de la API ŝlosilo. Ia stranga afero okazas. "; $a->strings["App-ID / API-Key"] = "Programo ID / API Ŝlosilo"; $a->strings["Application secret"] = "Programo sekreto"; -$a->strings["Polling Interval (min. %1\$s minutes)"] = "Intervalo por la enketilo (poller intervalo, minimume %1\$s mintuoj) "; +$a->strings["Polling Interval in minutes (minimum %1\$s minutes)"] = "Intervalo de enketo en minutoj (minimume %1\$s minutoj)"; $a->strings["Synchronize comments (no comments on Facebook are missed, at the cost of increased system load)"] = "Sinkronigi komentojn (vi ricevas ĉiujn komentojn de Facebook, sed la ŝargo de la sistemo iom kreskas)"; $a->strings["Real-Time Updates"] = "Realtempaj Ĝisdatigoj"; $a->strings["Real-Time Updates are activated."] = "Realtempaj Ĝisdatigoj estas ŝaltita"; @@ -975,6 +983,7 @@ $a->strings["%d person doesn't like this"] = array( 0 => "%d homo malŝatas tiun", 1 => "%d homo malŝatas tiun", ); +$a->strings["Get added to this list!"] = "Iĝu membro de ĉi tiu listo!"; $a->strings["Generate new key"] = "Generi novan ĉifroŝlosilon"; $a->strings["Widgets key"] = "Ŝlosilo por fenestraĵoj"; $a->strings["Widgets available"] = "Disponeblaj fenestraĵoj"; @@ -1064,12 +1073,12 @@ $a->strings["The impressum addon needs to be configured!
Please add at leas $a->strings["The page operators name."] = "La nomo de la funkciigisto de la retejo."; $a->strings["Site Owners Profile"] = "Profilo de la Proprietulo de la Retejo"; $a->strings["Profile address of the operator."] = "La profilo de la funkciigisto de la retejo."; -$a->strings["How to contact the operator via snail mail."] = "Kiel kontakti la funkciigiston de la retejo tra paperpoŝto."; +$a->strings["How to contact the operator via snail mail. You can use BBCode here."] = "Kiel poŝte kontakti la funkciigisto de la retejo. Vi eblas uzi BBCode ĉi tie."; $a->strings["Notes"] = "Notoj"; -$a->strings["Additional notes that are displayed beneath the contact information."] = "Pliaj notoj kiuj estas montrigota malsupre la kontaktinformojn."; +$a->strings["Additional notes that are displayed beneath the contact information. You can use BBCode here."] = "Pli da notoj kiuj aperas sub la kontaktinformoj. Vi eblas uzi BBCode ĉi tie."; $a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "Kiel kontakti la funkciigiston de la retejo tra retpoŝto. (montriĝos vuale) "; $a->strings["Footer note"] = "Paĝpiednoto"; -$a->strings["Text for the footer."] = "Teksto por la paĝpiedo."; +$a->strings["Text for the footer. You can use BBCode here."] = "Teksto por la paĝpiedo. Vie eblas uzi BBCode ĉi tie."; $a->strings["Report Bug"] = "Skribi cimraporton"; $a->strings["\"Blockem\" Settings"] = "\"Blockem\" Agordoj"; $a->strings["Comma separated profile URLS to block"] = "Blokotaj URL adresoj, disigita per komo"; @@ -1210,6 +1219,10 @@ $a->strings["Enable Posterous Post Plugin"] = "Ŝalti la Poserous-afiŝo krompro $a->strings["Posterous login"] = "Posterous salutnomo"; $a->strings["Posterous password"] = "Posterous pasvorto"; $a->strings["Post to Posterous by default"] = "Defaŭlte afiŝi al Posterous"; +$a->strings["Theme settings"] = "Agordoj pri la etoso"; +$a->strings["Set resize level for images in posts and comments (width and height)"] = "Agordi la regrandignivelo por bildoj en afiŝoj kaj komentoj (larĝo kaj alto)"; +$a->strings["Set font-size for posts and comments"] = "Agordi la tiparan grandon por afiŝoj kaj komentoj"; +$a->strings["Color scheme"] = "Kolorskemo"; $a->strings["Last users"] = "Ĵusaj uzantoj"; $a->strings["Last likes"] = "Ĵusaj ŝatitaj elementoj"; $a->strings["Last photos"] = "Ĵusaj bildoj"; @@ -1227,15 +1240,13 @@ $a->strings["Your photos"] = "Viaj bildoj"; $a->strings["Your events"] = "Viaj okazoj"; $a->strings["Personal notes"] = "Personaj notoj"; $a->strings["Your personal photos"] = "Viaj personaj bildoj"; -$a->strings["Theme settings"] = "Agordoj pri la etoso"; -$a->strings["Set font-size for posts and comments"] = "Agordi la tiparan grandon por afiŝoj kaj komentoj"; $a->strings["Set line-height for posts and comments"] = "Agordi la linigrandon por afiŝoj kaj komentoj"; $a->strings["Set resolution for middle column"] = "Agordi la distingivon por la meza kolumno"; $a->strings["Set color scheme"] = "Agordi Kolorskemon"; $a->strings["Alignment"] = "Ĝisrandigo"; $a->strings["Left"] = "Maldekstren"; $a->strings["Center"] = "Centren"; -$a->strings["Color scheme"] = "Kolorskemo"; +$a->strings["Set colour scheme"] = "Agordi Kolorskemon"; $a->strings["Gender:"] = "Sekso:"; $a->strings["j F, Y"] = "j F, Y"; $a->strings["j F"] = "j F"; @@ -1511,6 +1522,7 @@ $a->strings["Welcome "] = "Bonvenon "; $a->strings["Please upload a profile photo."] = "Bonvolu alŝuti profilbildon."; $a->strings["Welcome back "] = "Bonvenon "; $a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "La sekuriga ĵetono de la formo estis malĝusta. Tio verŝajne okazis ĉar la formo estis malfermita dum tro longa tempo (>3 horoj) antaŭ la sendado."; +$a->strings["stopped following"] = "ne plu sekvas"; $a->strings["View Status"] = "Vidi Staton"; $a->strings["View Profile"] = "Vidi Profilon"; $a->strings["View Photos"] = "Vidi Bildojn"; @@ -1531,6 +1543,14 @@ $a->strings["like"] = "ŝati"; $a->strings["dislike"] = "malŝati"; $a->strings["Share this"] = "Kunhavigi ĉi tiun"; $a->strings["share"] = "kunhavigi"; +$a->strings["Bold"] = "Grasa"; +$a->strings["Italic"] = "Kursiva"; +$a->strings["Underline"] = "Substreki"; +$a->strings["Quote"] = "Citaĵo"; +$a->strings["Code"] = "Kodo"; +$a->strings["Image"] = "Bildo"; +$a->strings["Link"] = "Ligilo"; +$a->strings["Video"] = "Video"; $a->strings["add star"] = "aldoni stelon"; $a->strings["remove star"] = "forpreni stelon"; $a->strings["toggle star status"] = "ŝalti/malŝalti steloŝtato"; @@ -1575,9 +1595,9 @@ $a->strings["Edit profile"] = "Redakti profilon"; $a->strings["Message"] = "Mesaĝo"; $a->strings["g A l F d"] = "\\j\\e \\l\\a G\\a \\h\\o\\r\\o, l F d"; $a->strings["F d"] = "F d"; +$a->strings["[today]"] = "[hodiaŭ]"; $a->strings["Birthday Reminders"] = "Memorigilo pri naskiĝtagoj"; $a->strings["Birthdays this week:"] = "Naskiĝtagoj ĉi-semajne:"; -$a->strings["[today]"] = "[hodiaŭ]"; +$a->strings["[No description]"] = "[Neniu priskribo]"; $a->strings["Event Reminders"] = "Memorigiloj pri Okazoj"; $a->strings["Events this week:"] = "Okazoj ĉi-semajne:"; -$a->strings["[No description]"] = "[Neniu priskribo]"; diff --git a/view/failed_updates.tpl b/view/failed_updates.tpl new file mode 100644 index 000000000..c6e4cb08e --- /dev/null +++ b/view/failed_updates.tpl @@ -0,0 +1,17 @@ +

$banner

+ +
$desc
+ +{{ if $failed }} +{{ for $failed as $f }} + +

$f

+ + +
+{{ endfor }} +{{ endif }} + diff --git a/view/head.tpl b/view/head.tpl index 7638e56ca..7b1541242 100644 --- a/view/head.tpl +++ b/view/head.tpl @@ -6,6 +6,7 @@ + $activity_options {{inc field_checkbox.tpl with $field=$post_newfriend }}{{endinc}} +{{inc field_checkbox.tpl with $field=$post_joingroup }}{{endinc}} {{inc field_checkbox.tpl with $field=$post_profilechange }}{{endinc}} diff --git a/view/theme/cleanzero/theme.php b/view/theme/cleanzero/theme.php index cc924539e..c99361997 100644 --- a/view/theme/cleanzero/theme.php +++ b/view/theme/cleanzero/theme.php @@ -108,7 +108,7 @@ $a->page['htmlhead'] .= ' ';} } diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl index 66f93c32d..982e2bd26 100755 --- a/view/theme/diabook/communityhome.tpl +++ b/view/theme/diabook/communityhome.tpl @@ -4,9 +4,20 @@ {{ endif }} +
+{{ if $comunity_profilest_title }} +

$comunity_profilest_title

+
+{{ for $comunity_profiles_items as $i }} + $i +{{ endfor }} +
+{{ endif }} +
+
{{ if $lastusers_title }} -

$helpers.title.1

+

$helpers.title.1

NewHere
Friendica Support
Let's talk
@@ -42,6 +53,9 @@ $nv.search {{ endif }}
+
+
+
{{ if $lastusers_title }}

$lastusers_title

diff --git a/view/theme/diabook/diabook-aerith/style-network-wide.css b/view/theme/diabook/diabook-aerith/style-network-wide.css index d5c91c9a4..b63015c4c 100644 --- a/view/theme/diabook/diabook-aerith/style-network-wide.css +++ b/view/theme/diabook/diabook-aerith/style-network-wide.css @@ -1182,7 +1182,7 @@ list-style-type: disc; } /* widget: search */ span.sbox_l { - background: white url('../diabook/icons/srch_l.gif') no-repeat top left; + background: white url('../diabook-aerith/icons/srch_l.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-left: 10px; @@ -1191,14 +1191,14 @@ span.sbox_l { } span.sbox_r { - background: white url('../diabook/icons/srch_r.gif') no-repeat top left; + background: white url('../diabook-aerith/icons/srch_r.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-top: 5px; } span.sbox input { - background: white url('../diabook/icons/srch_bg.gif') repeat-x top left; + background: white url('../diabook-aerith/icons/srch_bg.gif') repeat-x top left; float: left; margin-top: 5px; border: 0; diff --git a/view/theme/diabook/diabook-aerith/style-network.css b/view/theme/diabook/diabook-aerith/style-network.css index 21273c19c..d6a2619ea 100644 --- a/view/theme/diabook/diabook-aerith/style-network.css +++ b/view/theme/diabook/diabook-aerith/style-network.css @@ -1178,7 +1178,7 @@ list-style-type: disc; } /* widget: search */ span.sbox_l { - background: white url('../diabook/icons/srch_l.gif') no-repeat top left; + background: white url('../diabook-aerith/icons/srch_l.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-left: 10px; @@ -1187,14 +1187,14 @@ span.sbox_l { } span.sbox_r { - background: white url('../diabook/icons/srch_r.gif') no-repeat top left; + background: white url('../diabook-aerith/icons/srch_r.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-top: 5px; } span.sbox input { - background: white url('../diabook/icons/srch_bg.gif') repeat-x top left; + background: white url('../diabook-aerith/icons/srch_bg.gif') repeat-x top left; float: left; margin-top: 5px; border: 0; diff --git a/view/theme/diabook/diabook-aerith/style-profile-wide.css b/view/theme/diabook/diabook-aerith/style-profile-wide.css index 1b8e38481..d4b79d55a 100644 --- a/view/theme/diabook/diabook-aerith/style-profile-wide.css +++ b/view/theme/diabook/diabook-aerith/style-profile-wide.css @@ -1158,7 +1158,7 @@ list-style-type: disc; } /* widget: search */ span.sbox_l { - background: white url('../diabook/icons/srch_l.gif') no-repeat top left; + background: white url('../diabook-aerith/icons/srch_l.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-left: 10px; @@ -1167,14 +1167,14 @@ span.sbox_l { } span.sbox_r { - background: white url('../diabook/icons/srch_r.gif') no-repeat top left; + background: white url('../diabook-aerith/icons/srch_r.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-top: 5px; } span.sbox input { - background: white url('../diabook/icons/srch_bg.gif') repeat-x top left; + background: white url('../diabook-aerith/icons/srch_bg.gif') repeat-x top left; float: left; margin-top: 5px; border: 0; diff --git a/view/theme/diabook/diabook-aerith/style-profile.css b/view/theme/diabook/diabook-aerith/style-profile.css index e21432d4e..77d1fe34d 100644 --- a/view/theme/diabook/diabook-aerith/style-profile.css +++ b/view/theme/diabook/diabook-aerith/style-profile.css @@ -1154,7 +1154,7 @@ list-style-type: disc; } /* widget: search */ span.sbox_l { - background: white url('../diabook/icons/srch_l.gif') no-repeat top left; + background: white url('../diabook-aerith/icons/srch_l.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-left: 10px; @@ -1163,14 +1163,14 @@ span.sbox_l { } span.sbox_r { - background: white url('../diabook/icons/srch_r.gif') no-repeat top left; + background: white url('../diabook-aerith/icons/srch_r.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-top: 5px; } span.sbox input { - background: white url('../diabook/icons/srch_bg.gif') repeat-x top left; + background: white url('../diabook-aerith/icons/srch_bg.gif') repeat-x top left; float: left; margin-top: 5px; border: 0; diff --git a/view/theme/diabook/diabook-aerith/style-wide.css b/view/theme/diabook/diabook-aerith/style-wide.css index b8ff1fe25..5c263154f 100644 --- a/view/theme/diabook/diabook-aerith/style-wide.css +++ b/view/theme/diabook/diabook-aerith/style-wide.css @@ -21,6 +21,7 @@ .admin.linklist { border: 0px; padding: 0px; + list-style: none; } .admin.link { @@ -1014,7 +1015,7 @@ ul.menu-popup .empty { background-color: #bdcdd4; } #nav-notifications-menu { - width: 400px; + width: 425px !important; max-height: 550px; overflow: auto; } @@ -1243,7 +1244,7 @@ aside #likes a:hover{ margin-right: 20px; } #login-submit-wrapper{ - padding-top: 120px; + margin-bottom: 12px; } aside #login-submit-button{ diff --git a/view/theme/diabook/diabook-aerith/style.css b/view/theme/diabook/diabook-aerith/style.css index 01d35b754..e0f38aff6 100644 --- a/view/theme/diabook/diabook-aerith/style.css +++ b/view/theme/diabook/diabook-aerith/style.css @@ -21,6 +21,7 @@ .admin.linklist { border: 0px; padding: 0px; + list-style: none; } .admin.link { @@ -1013,7 +1014,7 @@ ul.menu-popup .empty { background-color: #bdcdd4; } #nav-notifications-menu { - width: 400px; + width: 425px !important; max-height: 550px; overflow: auto; } @@ -1241,7 +1242,7 @@ aside #likes a:hover{ margin-right: 20px; } #login-submit-wrapper{ - padding-top: 120px; + margin-bottom: 12px; } aside #login-submit-button{ diff --git a/view/theme/diabook/diabook-blue/style-network-wide.css b/view/theme/diabook/diabook-blue/style-network-wide.css index eb1cee255..a34c00db5 100644 --- a/view/theme/diabook/diabook-blue/style-network-wide.css +++ b/view/theme/diabook/diabook-blue/style-network-wide.css @@ -1148,7 +1148,7 @@ list-style-type: disc; } /* widget: search */ span.sbox_l { - background: white url('../diabook/icons/srch_l.gif') no-repeat top left; + background: white url('../diabook-blue/icons/srch_l.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-left: 10px; @@ -1157,14 +1157,14 @@ span.sbox_l { } span.sbox_r { - background: white url('../diabook/icons/srch_r.gif') no-repeat top left; + background: white url('../diabook-blue/icons/srch_r.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-top: 5px; } span.sbox input { - background: white url('../diabook/icons/srch_bg.gif') repeat-x top left; + background: white url('../diabook-blue/icons/srch_bg.gif') repeat-x top left; float: left; margin-top: 5px; border: 0; diff --git a/view/theme/diabook/diabook-blue/style-network.css b/view/theme/diabook/diabook-blue/style-network.css index 3a972b832..c018967f2 100644 --- a/view/theme/diabook/diabook-blue/style-network.css +++ b/view/theme/diabook/diabook-blue/style-network.css @@ -1144,7 +1144,7 @@ list-style-type: disc; } /* widget: search */ span.sbox_l { - background: white url('../diabook/icons/srch_l.gif') no-repeat top left; + background: white url('../diabook-blue/icons/srch_l.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-left: 10px; @@ -1153,14 +1153,14 @@ span.sbox_l { } span.sbox_r { - background: white url('../diabook/icons/srch_r.gif') no-repeat top left; + background: white url('../diabook-blue/icons/srch_r.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-top: 5px; } span.sbox input { - background: white url('../diabook/icons/srch_bg.gif') repeat-x top left; + background: white url('../diabook-blue/icons/srch_bg.gif') repeat-x top left; float: left; margin-top: 5px; border: 0; diff --git a/view/theme/diabook/diabook-blue/style-profile-wide.css b/view/theme/diabook/diabook-blue/style-profile-wide.css index ad6b7ca21..5cf50b143 100644 --- a/view/theme/diabook/diabook-blue/style-profile-wide.css +++ b/view/theme/diabook/diabook-blue/style-profile-wide.css @@ -1128,7 +1128,7 @@ list-style-type: disc; } /* widget: search */ span.sbox_l { - background: white url('../diabook/icons/srch_l.gif') no-repeat top left; + background: white url('../diabook-blue/icons/srch_l.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-left: 10px; @@ -1137,14 +1137,14 @@ span.sbox_l { } span.sbox_r { - background: white url('../diabook/icons/srch_r.gif') no-repeat top left; + background: white url('../diabook-blue/icons/srch_r.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-top: 5px; } span.sbox input { - background: white url('../diabook/icons/srch_bg.gif') repeat-x top left; + background: white url('../diabook-blue/icons/srch_bg.gif') repeat-x top left; float: left; margin-top: 5px; border: 0; diff --git a/view/theme/diabook/diabook-blue/style-profile.css b/view/theme/diabook/diabook-blue/style-profile.css index 50fb980d6..e6d0fb61b 100644 --- a/view/theme/diabook/diabook-blue/style-profile.css +++ b/view/theme/diabook/diabook-blue/style-profile.css @@ -1124,7 +1124,7 @@ list-style-type: disc; } /* widget: search */ span.sbox_l { - background: white url('../diabook/icons/srch_l.gif') no-repeat top left; + background: white url('../diabook-blue/icons/srch_l.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-left: 10px; @@ -1133,14 +1133,14 @@ span.sbox_l { } span.sbox_r { - background: white url('../diabook/icons/srch_r.gif') no-repeat top left; + background: white url('../diabook-blue/icons/srch_r.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-top: 5px; } span.sbox input { - background: white url('../diabook/icons/srch_bg.gif') repeat-x top left; + background: white url('../diabook-blue/icons/srch_bg.gif') repeat-x top left; float: left; margin-top: 5px; border: 0; diff --git a/view/theme/diabook/diabook-blue/style-wide.css b/view/theme/diabook/diabook-blue/style-wide.css index c8c203347..189f4d559 100644 --- a/view/theme/diabook/diabook-blue/style-wide.css +++ b/view/theme/diabook/diabook-blue/style-wide.css @@ -21,6 +21,7 @@ .admin.linklist { border: 0px; padding: 0px; + list-style: none; } .admin.link { @@ -983,7 +984,7 @@ ul.menu-popup .empty { background-color: #bdcdd4; } #nav-notifications-menu { - width: 400px; + width: 425px !important; max-height: 550px; overflow: auto; } @@ -1203,7 +1204,7 @@ aside #side-peoplefind-url { margin-right: 20px; } #login-submit-wrapper{ - padding-top: 120px; + margin-bottom: 12px; } aside #login-submit-button{ diff --git a/view/theme/diabook/diabook-blue/style.css b/view/theme/diabook/diabook-blue/style.css index 7bf7e8eaa..2b68afc6f 100644 --- a/view/theme/diabook/diabook-blue/style.css +++ b/view/theme/diabook/diabook-blue/style.css @@ -21,6 +21,7 @@ .admin.linklist { border: 0px; padding: 0px; + list-style: none; } .admin.link { @@ -982,7 +983,7 @@ ul.menu-popup .empty { background-color: #bdcdd4; } #nav-notifications-menu { - width: 400px; + width: 425px !important; max-height: 550px; overflow: auto; } @@ -1201,7 +1202,7 @@ aside #side-peoplefind-url { margin-right: 20px; } #login-submit-wrapper{ - padding-top: 120px; + margin-bottom: 12px; } aside #login-submit-button{ diff --git a/view/theme/diabook/diabook-dark/style-network.css b/view/theme/diabook/diabook-dark/style-network.css index 6ff44748f..8a7083d9d 100644 --- a/view/theme/diabook/diabook-dark/style-network.css +++ b/view/theme/diabook/diabook-dark/style-network.css @@ -1431,7 +1431,7 @@ transition: all 0.2s ease-in-out; .wall-item-comment-wrapper { margin: 1px 5px 5px 80px; - background-color: #fff; + background-color: #444; width: 500px; } .wall-item-comment-wrapper .comment-edit-photo { @@ -1442,14 +1442,14 @@ transition: all 0.2s ease-in-out; width: 100%; font-size: 10px; color: #999999; - border: 1px solid #DDD; + border: 1px solid #2e2e2f; padding: 0.3em; font-size: 14px; } .wall-item-comment-wrapper .comment-edit-text-full { font-size: 14px; height: 4em; - color: #2e2f2e; + color: #eec; border: 1px solid #2e2f2e; } .comment-edit-preview { @@ -1596,8 +1596,8 @@ transition: all 0.2s ease-in-out; height: 2.0em; width: 99%; font-size: 15px; - color: #999999; - border: 1px solid #DDD; + color: #eec; + border: 1px solid #444; padding: 0.3em; margin-bottom: 10px; } diff --git a/view/theme/diabook/diabook-dark/style-profile.css b/view/theme/diabook/diabook-dark/style-profile.css index b052b77ff..3ecad85af 100644 --- a/view/theme/diabook/diabook-dark/style-profile.css +++ b/view/theme/diabook/diabook-dark/style-profile.css @@ -540,7 +540,7 @@ header #banner a:active, header #banner a:visited, header #banner a:link, header #banner a:hover { - color: #2e2f2e; + color: #eec; text-decoration: none; outline: none; vertical-align: middle; @@ -661,7 +661,7 @@ nav .nav-menu-icon { border-radius: 5px 5px 0 0; } nav .nav-menu-icon:hover { - background-color: #eec; + background-color: #308dbf; position: relative; height: 22px; padding: 5px; @@ -776,7 +776,7 @@ nav #nav-apps-link.selected { } .notify-seen { - background: none repeat scroll 0 0 #DDDDDD; + background: none repeat scroll 0 0 #666; } ul.menu-popup { @@ -1424,7 +1424,7 @@ transition: all 0.2s ease-in-out; .wall-item-comment-wrapper .comment-edit-text-full { font-size: 14px; height: 4em; - color: #2e302; + color: #eec; border: 1px solid #2e302; } .comment-edit-preview { @@ -1571,10 +1571,11 @@ transition: all 0.2s ease-in-out; height: 2.0em; width: 99%; font-size: 15px; - color: #999999; + color: #eec; border: 1px solid #DDD; padding: 0.3em; margin-bottom: 10px; + background: #444; } .grey { @@ -1667,6 +1668,7 @@ transition: all 0.2s ease-in-out; margin: 0 0 5px; width: 60%; border: 1px solid #d2d2d2; + background: #444; } #profile-jot-form #jot-title:-webkit-input-placeholder { font-weight: normal; diff --git a/view/theme/diabook/diabook-dark/style.css b/view/theme/diabook/diabook-dark/style.css index 638aeb455..b59ab5dc1 100644 --- a/view/theme/diabook/diabook-dark/style.css +++ b/view/theme/diabook/diabook-dark/style.css @@ -1671,6 +1671,7 @@ body .pageheader{ height: 2.0em; width: 100%; font-size: 10px; + background: #444; color: #999999; border: 1px solid #DDD; padding: 0.3em; diff --git a/view/theme/diabook/diabook-green/style-network-wide.css b/view/theme/diabook/diabook-green/style-network-wide.css index cc598b9fe..c202146d5 100644 --- a/view/theme/diabook/diabook-green/style-network-wide.css +++ b/view/theme/diabook/diabook-green/style-network-wide.css @@ -439,7 +439,7 @@ a:hover { clear: both; } .fakelink { - color: #194719; + color: #2c9936; /* color: #3e3e8c; */ text-decoration: none; cursor: pointer; @@ -1158,7 +1158,7 @@ list-style-type: disc; } /* widget: search */ span.sbox_l { - background: white url('../diabook/icons/srch_l.gif') no-repeat top left; + background: white url('../diabook-green/icons/srch_l.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-left: 10px; @@ -1167,14 +1167,14 @@ span.sbox_l { } span.sbox_r { - background: white url('../diabook/icons/srch_r.gif') no-repeat top left; + background: white url('../diabook-green/icons/srch_r.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-top: 5px; } span.sbox input { - background: white url('../diabook/icons/srch_bg.gif') repeat-x top left; + background: white url('../diabook-green/icons/srch_bg.gif') repeat-x top left; float: left; margin-top: 5px; border: 0; @@ -1301,7 +1301,7 @@ transition: all 0.2s ease-in-out; padding-top: 10px; } .tread-wrapper a{ - color: #194719; + color: #2c9936; } /*marker*/ @@ -1840,7 +1840,7 @@ transition: all 0.2s ease-in-out; font-weight: bolder; } .button.creation2 { - background-color: #194719; + background-color: #2c9936; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; diff --git a/view/theme/diabook/diabook-green/style-network.css b/view/theme/diabook/diabook-green/style-network.css index 786547711..9b11c0b17 100644 --- a/view/theme/diabook/diabook-green/style-network.css +++ b/view/theme/diabook/diabook-green/style-network.css @@ -439,7 +439,7 @@ a:hover { clear: both; } .fakelink { - color: #194719; + color: #2c9936; /* color: #3e3e8c; */ text-decoration: none; cursor: pointer; @@ -493,7 +493,7 @@ code { float: right; } .tool a { - color: #194719; + color: #2c9936; } .tool a:hover { text-decoration: none; @@ -1155,7 +1155,7 @@ list-style-type: disc; } /* widget: search */ span.sbox_l { - background: white url('../diabook/icons/srch_l.gif') no-repeat top left; + background: white url('../diabook-green/icons/srch_l.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-left: 10px; @@ -1164,14 +1164,14 @@ span.sbox_l { } span.sbox_r { - background: white url('../diabook/icons/srch_r.gif') no-repeat top left; + background: white url('../diabook-green/icons/srch_r.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-top: 5px; } span.sbox input { - background: white url('../diabook/icons/srch_bg.gif') repeat-x top left; + background: white url('../diabook-green/icons/srch_bg.gif') repeat-x top left; float: left; margin-top: 5px; border: 0; @@ -1297,7 +1297,7 @@ transition: all 0.2s ease-in-out; padding-top: 10px; } .tread-wrapper a{ - color: #194719; + color: #2c9936; } .wall-item-decor { @@ -1832,7 +1832,7 @@ transition: all 0.2s ease-in-out; font-weight: bolder; } .button.creation2 { - background-color: #194719; + background-color: #2c9936; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; @@ -1964,7 +1964,7 @@ ul.tabs li { margin-left: 5px; } ul.tabs li .active { - background-color: #194719; + background-color: #2c9936; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; diff --git a/view/theme/diabook/diabook-green/style-profile-wide.css b/view/theme/diabook/diabook-green/style-profile-wide.css index 65b7f2ba3..779bc5c22 100644 --- a/view/theme/diabook/diabook-green/style-profile-wide.css +++ b/view/theme/diabook/diabook-green/style-profile-wide.css @@ -440,7 +440,7 @@ a:hover { clear: both; } .fakelink { - color: #194719; + color: #2c9936; /* color: #3e3e8c; */ text-decoration: none; cursor: pointer; @@ -1134,7 +1134,7 @@ list-style-type: disc; } /* widget: search */ span.sbox_l { - background: white url('../diabook/icons/srch_l.gif') no-repeat top left; + background: white url('../diabook-green/icons/srch_l.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-left: 10px; @@ -1143,14 +1143,14 @@ span.sbox_l { } span.sbox_r { - background: white url('../diabook/icons/srch_r.gif') no-repeat top left; + background: white url('../diabook-green/icons/srch_r.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-top: 5px; } span.sbox input { - background: white url('../diabook/icons/srch_bg.gif') repeat-x top left; + background: white url('../diabook-green/icons/srch_bg.gif') repeat-x top left; float: left; margin-top: 5px; border: 0; @@ -1276,7 +1276,7 @@ transition: all 0.2s ease-in-out; padding-top: 10px; } .tread-wrapper a{ - color: #194719; + color: #2c9936; } /*marker*/ @@ -1811,7 +1811,7 @@ transition: all 0.2s ease-in-out; cursor: pointer; } .button.creation2 { - background-color: #194719; + background-color: #2c9936; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; @@ -1945,7 +1945,7 @@ ul.tabs li { margin-left: 5px; } ul.tabs li .active { - background-color: #194719; + background-color: #2c9936; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; diff --git a/view/theme/diabook/diabook-green/style-profile.css b/view/theme/diabook/diabook-green/style-profile.css index dcc7b373a..a955d3b9d 100644 --- a/view/theme/diabook/diabook-green/style-profile.css +++ b/view/theme/diabook/diabook-green/style-profile.css @@ -440,7 +440,7 @@ a:hover { clear: both; } .fakelink { - color: #194719; + color: #2c9936; /* color: #3e3e8c; */ text-decoration: none; cursor: pointer; @@ -1130,7 +1130,7 @@ list-style-type: disc; } /* widget: search */ span.sbox_l { - background: white url('../diabook/icons/srch_l.gif') no-repeat top left; + background: white url('../diabook-green/icons/srch_l.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-left: 10px; @@ -1139,14 +1139,14 @@ span.sbox_l { } span.sbox_r { - background: white url('../diabook/icons/srch_r.gif') no-repeat top left; + background: white url('../diabook-green/icons/srch_r.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-top: 5px; } span.sbox input { - background: white url('../diabook/icons/srch_bg.gif') repeat-x top left; + background: white url('../diabook-green/icons/srch_bg.gif') repeat-x top left; float: left; margin-top: 5px; border: 0; @@ -1270,7 +1270,7 @@ transition: all 0.2s ease-in-out; padding-top: 10px; } .tread-wrapper a{ - color: #194719; + color: #2c9936; } .wall-item-decor { @@ -1801,7 +1801,7 @@ transition: all 0.2s ease-in-out; cursor: pointer; } .button.creation2 { - background-color: #194719; + background-color: #2c9936; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; @@ -1933,7 +1933,7 @@ ul.tabs li { margin-left: 5px; } ul.tabs li .active { - background-color: #194719; + background-color: #2c9936; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; diff --git a/view/theme/diabook/diabook-green/style-wide.css b/view/theme/diabook/diabook-green/style-wide.css index d85ea23a6..d98a6c325 100644 --- a/view/theme/diabook/diabook-green/style-wide.css +++ b/view/theme/diabook/diabook-green/style-wide.css @@ -21,6 +21,7 @@ .admin.linklist { border: 0px; padding: 0px; + list-style: none; } .admin.link { @@ -476,7 +477,7 @@ a:hover { clear: both; } .fakelink { - color: #194719; + color: #2c9936; /* color: #3e3e8c; */ text-decoration: none; cursor: pointer; @@ -614,7 +615,7 @@ header #banner #logo-text { } /* messages */ #message-new { - background: #194719; + background: #2c9936; border: 1px solid #333; width: 150px; } @@ -991,7 +992,7 @@ ul.menu-popup .empty { background-color: #bdcdd4; } #nav-notifications-menu { - width: 400px; + width: 425px !important; max-height: 550px; overflow: auto; } @@ -1185,7 +1186,7 @@ aside #side-peoplefind-url { height: auto; } aside #likes a, a:visited, a:link { - color: #194719; + color: #2c9936; text-decoration: none; cursor: pointer; @@ -1220,7 +1221,7 @@ aside #likes a:hover{ margin-right: 20px; } #login-submit-wrapper{ - padding-top: 120px; + margin-bottom: 12px; } aside #login-submit-button{ @@ -1422,7 +1423,7 @@ body .pageheader{ padding-top: 10px; } .tread-wrapper a{ - color: #194719; + color: #2c9936; } /*marker*/ @@ -2073,7 +2074,7 @@ body .pageheader{ cursor: pointer; } .button.creation2 { - background-color: #194719; + background-color: #2c9936; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; @@ -2207,7 +2208,7 @@ ul.tabs li { margin-left: 5px; } ul.tabs li .active { - background-color: #194719; + background-color: #2c9936; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; @@ -2225,7 +2226,7 @@ ul.rs_tabs li { clear: both; } ul.rs_tabs li .selected { - background-color: #194719; + background-color: #2c9936; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; diff --git a/view/theme/diabook/diabook-green/style.css b/view/theme/diabook/diabook-green/style.css index c83ddd397..6a9d8f7d0 100644 --- a/view/theme/diabook/diabook-green/style.css +++ b/view/theme/diabook/diabook-green/style.css @@ -21,6 +21,7 @@ .admin.linklist { border: 0px; padding: 0px; + list-style: none; } .admin.link { @@ -477,7 +478,7 @@ a:hover { } /*color*/ .fakelink { - color: #194719; + color: #2c9936; /* color: #3e3e8c; */ text-decoration: none; cursor: pointer; @@ -550,7 +551,7 @@ code { } /*color*/ .tool a { - color: #194719; + color: #2c9936; } .tool a:hover { text-decoration: none; @@ -617,7 +618,7 @@ header #banner #logo-text { /*color*/ /* messages */ #message-new { - background: #194719; + background: #2c9936; border: 1px solid #333; width: 150px; } @@ -994,7 +995,7 @@ ul.menu-popup .empty { background-color: #bdcdd4; } #nav-notifications-menu { - width: 400px; + width: 425px !important; max-height: 550px; overflow: auto; } @@ -1189,7 +1190,7 @@ aside #side-peoplefind-url { } /*color*/ aside #likes a, a:visited, a:link { - color: #194719; + color: #2c9936; text-decoration: none; cursor: pointer; @@ -1224,7 +1225,7 @@ aside #likes a:hover{ margin-right: 20px; } #login-submit-wrapper{ - padding-top: 120px; + margin-bottom: 12px; } aside #login-submit-button{ @@ -1425,7 +1426,7 @@ body .pageheader{ } /*color*/ .tread-wrapper a{ - color: #194719; + color: #2c9936; } .wall-item-decor { position: absolute; @@ -2071,7 +2072,7 @@ body .pageheader{ } /*color*/ .button.creation2 { - background-color: #194719; + background-color: #2c9936; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; @@ -2204,7 +2205,7 @@ ul.tabs li { } /*color*/ ul.tabs li .active { - background-color: #194719; + background-color: #2c9936; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; @@ -2223,7 +2224,7 @@ ul.rs_tabs li { } /*color*/ ul.rs_tabs li .selected { - background-color: #194719; + background-color: #2c9936; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; diff --git a/view/theme/diabook/diabook-pink/style-network-wide.css b/view/theme/diabook/diabook-pink/style-network-wide.css index 0a83955df..0e6eaf2c7 100644 --- a/view/theme/diabook/diabook-pink/style-network-wide.css +++ b/view/theme/diabook/diabook-pink/style-network-wide.css @@ -439,7 +439,7 @@ a:hover { clear: both; } .fakelink { - color: #996d73; + color: #D02B55; /* color: #3e3e8c; */ text-decoration: none; cursor: pointer; @@ -807,7 +807,7 @@ ul.menu-popup a { text-decoration: none; } ul.menu-popup a:hover { - background-color: #996d73; /*bdcdd4;*/ + background-color: #D02B55; /*bdcdd4;*/ color: #fff; } ul.menu-popup .menu-sep { @@ -1158,7 +1158,7 @@ list-style-type: disc; } /* widget: search */ span.sbox_l { - background: white url('../diabook/icons/srch_l.gif') no-repeat top left; + background: white url('../diabook-pink/icons/srch_l.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-left: 10px; @@ -1167,14 +1167,14 @@ span.sbox_l { } span.sbox_r { - background: white url('../diabook/icons/srch_r.gif') no-repeat top left; + background: white url('../diabook-pink/icons/srch_r.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-top: 5px; } span.sbox input { - background: white url('../diabook/icons/srch_bg.gif') repeat-x top left; + background: white url('../diabook-pink/icons/srch_bg.gif') repeat-x top left; float: left; margin-top: 5px; border: 0; @@ -1301,7 +1301,7 @@ transition: all 0.2s ease-in-out; padding-top: 10px; } .tread-wrapper a{ - color: #996d73; + color: #D02B55; } /*marker*/ @@ -1840,7 +1840,7 @@ transition: all 0.2s ease-in-out; font-weight: bolder; } .button.creation2 { - background-color: #996d73; + background-color: #D02B55; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; diff --git a/view/theme/diabook/diabook-pink/style-network.css b/view/theme/diabook/diabook-pink/style-network.css index 3a4f49877..09e5b6f09 100644 --- a/view/theme/diabook/diabook-pink/style-network.css +++ b/view/theme/diabook/diabook-pink/style-network.css @@ -439,7 +439,7 @@ a:hover { clear: both; } .fakelink { - color: #996d73; + color: #D02B55; /* color: #3e3e8c; */ text-decoration: none; cursor: pointer; @@ -493,7 +493,7 @@ code { float: right; } .tool a { - color: #996d73; + color: #D02B55; } .tool a:hover { text-decoration: none; @@ -807,7 +807,7 @@ ul.menu-popup a { text-decoration: none; } ul.menu-popup a:hover { - background-color: #996d73; /*bdcdd4;*/ + background-color: #D02B55; /*bdcdd4;*/ color: #fff; } ul.menu-popup .menu-sep { @@ -1155,7 +1155,7 @@ list-style-type: disc; } /* widget: search */ span.sbox_l { - background: white url('../diabook/icons/srch_l.gif') no-repeat top left; + background: white url('../diabook-pink/icons/srch_l.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-left: 10px; @@ -1164,14 +1164,14 @@ span.sbox_l { } span.sbox_r { - background: white url('../diabook/icons/srch_r.gif') no-repeat top left; + background: white url('../diabook-pink/icons/srch_r.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-top: 5px; } span.sbox input { - background: white url('../diabook/icons/srch_bg.gif') repeat-x top left; + background: white url('../diabook-pink/icons/srch_bg.gif') repeat-x top left; float: left; margin-top: 5px; border: 0; @@ -1297,7 +1297,7 @@ transition: all 0.2s ease-in-out; padding-top: 10px; } .tread-wrapper a{ - color: #996d73; + color: #D02B55; } .wall-item-decor { @@ -1832,7 +1832,7 @@ transition: all 0.2s ease-in-out; font-weight: bolder; } .button.creation2 { - background-color: #996d73; + background-color: #D02B55; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; @@ -1964,7 +1964,7 @@ ul.tabs li { margin-left: 5px; } ul.tabs li .active { - background-color: #996d73; + background-color: #D02B55; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; diff --git a/view/theme/diabook/diabook-pink/style-profile-wide.css b/view/theme/diabook/diabook-pink/style-profile-wide.css index 080551896..15c12cf9c 100644 --- a/view/theme/diabook/diabook-pink/style-profile-wide.css +++ b/view/theme/diabook/diabook-pink/style-profile-wide.css @@ -440,7 +440,7 @@ a:hover { clear: both; } .fakelink { - color: #996d73; + color: #D02B55; /* color: #3e3e8c; */ text-decoration: none; cursor: pointer; @@ -807,7 +807,7 @@ ul.menu-popup a { text-decoration: none; } ul.menu-popup a:hover { - background-color: #996d73; /*bdcdd4;*/ + background-color: #D02B55; /*bdcdd4;*/ color: #fff; } ul.menu-popup .menu-sep { @@ -1134,7 +1134,7 @@ list-style-type: disc; } /* widget: search */ span.sbox_l { - background: white url('../diabook/icons/srch_l.gif') no-repeat top left; + background: white url('../diabook-pink/icons/srch_l.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-left: 10px; @@ -1143,14 +1143,14 @@ span.sbox_l { } span.sbox_r { - background: white url('../diabook/icons/srch_r.gif') no-repeat top left; + background: white url('../diabook-pink/icons/srch_r.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-top: 5px; } span.sbox input { - background: white url('../diabook/icons/srch_bg.gif') repeat-x top left; + background: white url('../diabook-pink/icons/srch_bg.gif') repeat-x top left; float: left; margin-top: 5px; border: 0; @@ -1276,7 +1276,7 @@ transition: all 0.2s ease-in-out; padding-top: 10px; } .tread-wrapper a{ - color: #996d73; + color: #D02B55; } /*marker*/ @@ -1811,7 +1811,7 @@ transition: all 0.2s ease-in-out; cursor: pointer; } .button.creation2 { - background-color: #996d73; + background-color: #D02B55; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; @@ -1945,7 +1945,7 @@ ul.tabs li { margin-left: 5px; } ul.tabs li .active { - background-color: #996d73; + background-color: #D02B55; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; diff --git a/view/theme/diabook/diabook-pink/style-profile.css b/view/theme/diabook/diabook-pink/style-profile.css index 8f3753061..959880c25 100644 --- a/view/theme/diabook/diabook-pink/style-profile.css +++ b/view/theme/diabook/diabook-pink/style-profile.css @@ -440,7 +440,7 @@ a:hover { clear: both; } .fakelink { - color: #996d73; + color: #D02B55; /* color: #3e3e8c; */ text-decoration: none; cursor: pointer; @@ -806,7 +806,7 @@ ul.menu-popup a { text-decoration: none; } ul.menu-popup a:hover { - background-color: #996d73; /*bdcdd4;*/ + background-color: #D02B55; /*bdcdd4;*/ color: #fff; } ul.menu-popup .menu-sep { @@ -1130,7 +1130,7 @@ list-style-type: disc; } /* widget: search */ span.sbox_l { - background: white url('../diabook/icons/srch_l.gif') no-repeat top left; + background: white url('../diabook-pink/icons/srch_l.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-left: 10px; @@ -1139,14 +1139,14 @@ span.sbox_l { } span.sbox_r { - background: white url('../diabook/icons/srch_r.gif') no-repeat top left; + background: white url('../diabook-pink/icons/srch_r.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-top: 5px; } span.sbox input { - background: white url('../diabook/icons/srch_bg.gif') repeat-x top left; + background: white url('../diabook-pink/icons/srch_bg.gif') repeat-x top left; float: left; margin-top: 5px; border: 0; @@ -1270,7 +1270,7 @@ transition: all 0.2s ease-in-out; padding-top: 10px; } .tread-wrapper a{ - color: #996d73; + color: #D02B55; } .wall-item-decor { @@ -1801,7 +1801,7 @@ transition: all 0.2s ease-in-out; cursor: pointer; } .button.creation2 { - background-color: #996d73; + background-color: #D02B55; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; @@ -1933,7 +1933,7 @@ ul.tabs li { margin-left: 5px; } ul.tabs li .active { - background-color: #996d73; + background-color: #D02B55; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; diff --git a/view/theme/diabook/diabook-pink/style-wide.css b/view/theme/diabook/diabook-pink/style-wide.css index a51ca49cc..849566aa0 100644 --- a/view/theme/diabook/diabook-pink/style-wide.css +++ b/view/theme/diabook/diabook-pink/style-wide.css @@ -21,6 +21,7 @@ .admin.linklist { border: 0px; padding: 0px; + list-style: none; } .admin.link { @@ -476,7 +477,7 @@ a:hover { clear: both; } .fakelink { - color: #996d73; + color: #D02B55; /* color: #3e3e8c; */ text-decoration: none; cursor: pointer; @@ -614,7 +615,7 @@ header #banner #logo-text { } /* messages */ #message-new { - background: #996d73; + background: #D02B55; border: 1px solid #333; width: 150px; } @@ -943,7 +944,7 @@ ul.menu-popup a { text-decoration: none; } ul.menu-popup a:hover { - background-color: #996d73; /*bdcdd4;*/ + background-color: #D02B55; /*bdcdd4;*/ color: #fff; } ul.menu-popup .menu-sep { @@ -991,7 +992,7 @@ ul.menu-popup .empty { background-color: #bdcdd4; } #nav-notifications-menu { - width: 400px; + width: 425px !important; max-height: 550px; overflow: auto; } @@ -1185,7 +1186,7 @@ aside #side-peoplefind-url { height: auto; } aside #likes a, a:visited, a:link { - color: #996d73; + color: #D02B55; text-decoration: none; cursor: pointer; @@ -1220,7 +1221,7 @@ aside #likes a:hover{ margin-right: 20px; } #login-submit-wrapper{ - padding-top: 120px; + margin-bottom: 12px; } aside #login-submit-button{ @@ -1422,7 +1423,7 @@ body .pageheader{ padding-top: 10px; } .tread-wrapper a{ - color: #996d73; + color: #D02B55; } /*marker*/ @@ -2073,7 +2074,7 @@ body .pageheader{ cursor: pointer; } .button.creation2 { - background-color: #996d73; + background-color: #D02B55; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; @@ -2207,7 +2208,7 @@ ul.tabs li { margin-left: 5px; } ul.tabs li .active { - background-color: #996d73; + background-color: #D02B55; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; @@ -2225,7 +2226,7 @@ ul.rs_tabs li { clear: both; } ul.rs_tabs li .selected { - background-color: #996d73; + background-color: #D02B55; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; diff --git a/view/theme/diabook/diabook-pink/style.css b/view/theme/diabook/diabook-pink/style.css index 833e81a5f..798d73979 100644 --- a/view/theme/diabook/diabook-pink/style.css +++ b/view/theme/diabook/diabook-pink/style.css @@ -21,6 +21,7 @@ .admin.linklist { border: 0px; padding: 0px; + list-style: none; } .admin.link { @@ -477,7 +478,7 @@ a:hover { } /*color*/ .fakelink { - color: #996d73; + color: #D02B55; /* color: #3e3e8c; */ text-decoration: none; cursor: pointer; @@ -550,7 +551,7 @@ code { } /*color*/ .tool a { - color: #996d73; + color: #D02B55; } .tool a:hover { text-decoration: none; @@ -617,7 +618,7 @@ header #banner #logo-text { /* messages */ /*color*/ #message-new { - background: #996d73; + background: #D02B55; border: 1px solid #333; width: 150px; } @@ -946,7 +947,7 @@ ul.menu-popup a { } /*color*/ ul.menu-popup a:hover { - background-color: #996d73; /*bdcdd4;*/ + background-color: #D02B55; /*bdcdd4;*/ color: #fff; } ul.menu-popup .menu-sep { @@ -994,7 +995,7 @@ ul.menu-popup .empty { background-color: #bdcdd4; } #nav-notifications-menu { - width: 400px; + width: 425px !important; max-height: 550px; overflow: auto; } @@ -1189,7 +1190,7 @@ aside #side-peoplefind-url { } /*color*/ aside #likes a, a:visited, a:link { - color: #996d73; + color: #D02B55; text-decoration: none; cursor: pointer; @@ -1224,7 +1225,7 @@ aside #likes a:hover{ margin-right: 20px; } #login-submit-wrapper{ - padding-top: 120px; + margin-bottom: 12px; } aside #login-submit-button{ @@ -1425,7 +1426,7 @@ body .pageheader{ } /*color*/ .tread-wrapper a{ - color: #996d73; + color: #D02B55; } .wall-item-decor { position: absolute; @@ -2071,7 +2072,7 @@ body .pageheader{ } /*color*/ .button.creation2 { - background-color: #996d73; + background-color: #D02B55; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; @@ -2204,7 +2205,7 @@ ul.tabs li { } /*color*/ ul.tabs li .active { - background-color: #996d73; + background-color: #D02B55; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; @@ -2223,7 +2224,7 @@ ul.rs_tabs li { } /*color*/ ul.rs_tabs li .selected { - background-color: #996d73; + background-color: #D02B55; border: 1px solid #777777; color: white; border-radius: 3px 3px 3px 3px; diff --git a/view/theme/diabook/diabook-red/style-network-wide.css b/view/theme/diabook/diabook-red/style-network-wide.css index 8c3b67cb6..b40594c77 100644 --- a/view/theme/diabook/diabook-red/style-network-wide.css +++ b/view/theme/diabook/diabook-red/style-network-wide.css @@ -1182,7 +1182,7 @@ list-style-type: disc; } /* widget: search */ span.sbox_l { - background: white url('../diabook/icons/srch_l.gif') no-repeat top left; + background: white url('../diabook-red/icons/srch_l.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-left: 10px; @@ -1191,14 +1191,14 @@ span.sbox_l { } span.sbox_r { - background: white url('../diabook/icons/srch_r.gif') no-repeat top left; + background: white url('../diabook-red/icons/srch_r.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-top: 5px; } span.sbox input { - background: white url('../diabook/icons/srch_bg.gif') repeat-x top left; + background: white url('../diabook-red/icons/srch_bg.gif') repeat-x top left; float: left; margin-top: 5px; border: 0; diff --git a/view/theme/diabook/diabook-red/style-network.css b/view/theme/diabook/diabook-red/style-network.css index 84fd5da48..faf34560c 100644 --- a/view/theme/diabook/diabook-red/style-network.css +++ b/view/theme/diabook/diabook-red/style-network.css @@ -1178,7 +1178,7 @@ list-style-type: disc; } /* widget: search */ span.sbox_l { - background: white url('../diabook/icons/srch_l.gif') no-repeat top left; + background: white url('../diabook-red/icons/srch_l.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-left: 10px; @@ -1187,14 +1187,14 @@ span.sbox_l { } span.sbox_r { - background: white url('../diabook/icons/srch_r.gif') no-repeat top left; + background: white url('../diabook-red/icons/srch_r.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-top: 5px; } span.sbox input { - background: white url('../diabook/icons/srch_bg.gif') repeat-x top left; + background: white url('../diabook-red/icons/srch_bg.gif') repeat-x top left; float: left; margin-top: 5px; border: 0; diff --git a/view/theme/diabook/diabook-red/style-profile-wide.css b/view/theme/diabook/diabook-red/style-profile-wide.css index acb6075f7..78e37770c 100644 --- a/view/theme/diabook/diabook-red/style-profile-wide.css +++ b/view/theme/diabook/diabook-red/style-profile-wide.css @@ -1141,7 +1141,7 @@ list-style-type: disc; } /* widget: search */ span.sbox_l { - background: white url('../diabook/icons/srch_l.gif') no-repeat top left; + background: white url('../diabook-red/icons/srch_l.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-left: 10px; @@ -1150,14 +1150,14 @@ span.sbox_l { } span.sbox_r { - background: white url('../diabook/icons/srch_r.gif') no-repeat top left; + background: white url('../diabook-red/icons/srch_r.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-top: 5px; } span.sbox input { - background: white url('../diabook/icons/srch_bg.gif') repeat-x top left; + background: white url('../diabook-red/icons/srch_bg.gif') repeat-x top left; float: left; margin-top: 5px; border: 0; diff --git a/view/theme/diabook/diabook-red/style-profile.css b/view/theme/diabook/diabook-red/style-profile.css index a29eb3eb0..8534c4822 100644 --- a/view/theme/diabook/diabook-red/style-profile.css +++ b/view/theme/diabook/diabook-red/style-profile.css @@ -1137,7 +1137,7 @@ list-style-type: disc; } /* widget: search */ span.sbox_l { - background: white url('../diabook/icons/srch_l.gif') no-repeat top left; + background: white url('../diabook-red/icons/srch_l.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-left: 10px; @@ -1146,14 +1146,14 @@ span.sbox_l { } span.sbox_r { - background: white url('../diabook/icons/srch_r.gif') no-repeat top left; + background: white url('../diabook-red/icons/srch_r.gif') no-repeat top left; float: left; width: 19px; height: 19px; margin-top: 5px; } span.sbox input { - background: white url('../diabook/icons/srch_bg.gif') repeat-x top left; + background: white url('../diabook-red/icons/srch_bg.gif') repeat-x top left; float: left; margin-top: 5px; border: 0; diff --git a/view/theme/diabook/diabook-red/style-wide.css b/view/theme/diabook/diabook-red/style-wide.css index 79c5fb1cb..b9ea238e2 100644 --- a/view/theme/diabook/diabook-red/style-wide.css +++ b/view/theme/diabook/diabook-red/style-wide.css @@ -21,6 +21,7 @@ .admin.linklist { border: 0px; padding: 0px; + list-style: none; } .admin.link { @@ -1013,7 +1014,7 @@ ul.menu-popup .empty { background-color: #bdcdd4; } #nav-notifications-menu { - width: 400px; + width: 425px !important; max-height: 550px; overflow: auto; } @@ -1232,7 +1233,7 @@ aside #side-peoplefind-url { margin-right: 20px; } #login-submit-wrapper{ - padding-top: 120px; + margin-bottom: 12px; } aside #login-submit-button{ diff --git a/view/theme/diabook/diabook-red/style.css b/view/theme/diabook/diabook-red/style.css index c7cb1586d..05c802102 100644 --- a/view/theme/diabook/diabook-red/style.css +++ b/view/theme/diabook/diabook-red/style.css @@ -21,6 +21,7 @@ .admin.linklist { border: 0px; padding: 0px; + list-style: none; } .admin.link { @@ -1012,7 +1013,7 @@ ul.menu-popup .empty { background-color: #bdcdd4; } #nav-notifications-menu { - width: 400px; + width: 425px !important; max-height: 550px; overflow: auto; } @@ -1230,7 +1231,7 @@ aside #side-peoplefind-url { margin-right: 20px; } #login-submit-wrapper{ - padding-top: 120px; + margin-bottom: 12px; } aside #login-submit-button{ diff --git a/view/theme/diabook/footer.tpl b/view/theme/diabook/footer.tpl index 8d3c65162..25058a7ff 100644 --- a/view/theme/diabook/footer.tpl +++ b/view/theme/diabook/footer.tpl @@ -1,4 +1,3 @@ -
-
+ \ No newline at end of file diff --git a/view/theme/diabook/js/README b/view/theme/diabook/js/README index 57ca16d02..12447afc9 100644 --- a/view/theme/diabook/js/README +++ b/view/theme/diabook/js/README @@ -24,3 +24,8 @@ $(function() { _______________________________________________________________________________________________ http://javascriptly.com/examples/jquery-grab-bag/autogrow-textarea.html + +_______________________________________________________________________________________________ + +http://jquery.malsup.com/ +http://jquery.malsup.com/twitter/ diff --git a/view/theme/diabook/js/jquery.twitter.search.js b/view/theme/diabook/js/jquery.twitter.search.js new file mode 100644 index 000000000..18d2e091a --- /dev/null +++ b/view/theme/diabook/js/jquery.twitter.search.js @@ -0,0 +1,289 @@ +/*! + * jQuery Twitter Search Plugin + * Examples and documentation at: http://jquery.malsup.com/twitter/ + * Copyright (c) 2010 M. Alsup + * Version: 1.04 (15-SEP-2011) + * Dual licensed under the MIT and GPL licenses: + * http://www.opensource.org/licenses/mit-license.php + * http://www.gnu.org/licenses/gpl.html + * Requires: jQuery v1.3.2 or later + */ + +;(function($) { + $.fn.twitterSearch = function(options) { + if (typeof options == 'string') + options = { term: options }; + return this.each(function() { + var grabFlag = false, + grabbing = false, + $frame = $(this), text, $text, $title, $bird, $cont, height, paused = false, + opts = $.extend(true, {}, $.fn.twitterSearch.defaults, options || {}, $.metadata ? $frame.metadata() : {}); + + opts.formatter = opts.formatter || $.fn.twitterSearch.formatter; + opts.filter = opts.filter || $.fn.twitterSearch.filter; + + if (!opts.applyStyles) { // throw away all style defs + for (var css in opts.css) + opts.css[css] = {}; + } + + if (opts.title === null) // user can set to '' to suppress title + opts.title = opts.term; + + opts.title = opts.title || ''; + text = opts.titleLink ? (''+ opts.title + '') : ('' + opts.title +''+ ''); + $text = $(text); + if (opts.titleLink) + $text.css(opts.css['titleLink']); + $title = $('
').append($text).appendTo($frame).css(opts.css['title']); + if (opts.bird) { + $bird = $('').appendTo($title).css(opts.css['bird']); + if (opts.birdLink) + $bird.wrap(''); + } + $cont = $('
').appendTo($frame).css(opts.css['container']); + cont = $cont[0]; + if (opts.colorExterior) + $title.css('background-color',opts.colorExterior); + if (opts.colorInterior) + $cont.css('background-color',opts.colorInterior); + + $frame.css(opts.css['frame']); + if (opts.colorExterior) + $frame.css('border-color',opts.colorExterior); + + height = $frame.innerHeight() - $title.outerHeight(); + $cont.height(height); + + if (opts.pause) + $cont.hover(function(){paused = true;},function(){paused = false;}); + + $('
Loading tweets..
').css(opts.css['loading']).appendTo($cont); + + grabTweets(); + + function grabTweets() { + var url = opts.url + opts.term; + grabFlag = false; + grabbing = true; + // grab twitter stream + $.getJSONP({ + url: url, + timeout: 30000, + error: function(xhr, status, e) { + failWhale(e); + }, + complete: function() { + grabbing = false; + if (opts.refreshSeconds) + setTimeout(regrab, opts.refreshSeconds * 1000); + }, + success: function(json) { + if (json.error) { + failWhale(json.error); + return; + } + $cont.fadeOut('fast',function() { + $cont.empty(); + + // iterate twitter results + $.each(json.results, function(i) { + if (!opts.filter.call(opts, this)) + return; // skip this tweet + var $img, $text, w, + tweet = opts.formatter(this, opts), + $tweet = $(tweet); + $tweet.css(opts.css['tweet']); + $img = $tweet.find('.twitterSearchProfileImg').css(opts.css['img']); + $tweet.find('.twitterSearchUser').css(opts.css['user']); + $tweet.find('.twitterSearchTime').css(opts.css['time']); + $tweet.find('a').css(opts.css['a']); + $tweet.appendTo($cont); + $text = $tweet.find('.twitterSearchText').css(opts.css['text']); + if (opts.avatar) { + w = $img.outerWidth() + parseInt($tweet.css('paddingLeft')); + $text.css('paddingLeft', w); + } + }); + + $cont.fadeIn('fast'); + + if (json.results.length < 2) { + if (opts.refreshSeconds) + setTimeout(grabTweets, opts.refreshSeconds * 1000); + return; + } + + // stage first animation + setTimeout(go, opts.timeout); + }); + } + }); + }; + + function regrab() { + grabFlag = true; + } + + function failWhale(msg) { + var $fail = $('
' + msg + '
').css(opts.css['fail']); + $cont.empty().append($fail); + }; + + function go() { + if (paused || grabbing) { + setTimeout(go, 500); + return; + } + var h, $el = $cont.children(':first'), el = $el[0]; + $el.animate(opts.animOut, opts.animOutSpeed, function() { + h = $el.outerHeight(); + $el.animate({ marginTop: -h }, opts.animInSpeed, function() { + $el.css({ marginTop: 0, opacity: 1 }); + /*@cc_on + try { el.style.removeAttribute('filter'); } // ie cleartype fix + catch(smother) {} + @*/ + $el.css(opts.css['tweet']).show().appendTo($cont); + + setTimeout(grabFlag ? grabTweets : go, opts.timeout); + }); + }); + } + }); + }; + + $.fn.twitterSearch.filter = function(tweet) { + return true; + }; + + $.fn.twitterSearch.formatter = function(json, opts) { + var str, pretty, + text = json.text; + if (opts.anchors) { + text = json.text.replace(/(http:\/\/\S+)/g, '$1'); + text = text.replace(/\@(\w+)/g, '@$1'); + } + str = '
'; + if (opts.avatar) + str += ''; + str += '
' + + json.from_user + ''; + pretty = prettyDate(json.created_at); + if (opts.time && pretty) + str += ' ('+ pretty +')' + str += '
' + text + '
'; + return str; + }; + + $.fn.twitterSearch.defaults = { + url: 'http://search.twitter.com/search.json?callback=?&q=', + anchors: true, // true or false (enable embedded links in tweets) + animOutSpeed: 500, // speed of animation for top tweet when removed + animInSpeed: 500, // speed of scroll animation for moving tweets up + animOut: { opacity: 0 }, // animation of top tweet when it is removed + applyStyles: true, // true or false (apply default css styling or not) + avatar: true, // true or false (show or hide twitter profile images) + bird: true, // true or false (show or hide twitter bird image) + birdLink: false, // url that twitter bird image should like to + birdSrc: 'http://cloud.github.com/downloads/malsup/twitter/tweet.gif', // twitter bird image + colorExterior: null, // css override of frame border-color and title background-color + colorInterior: null, // css override of container background-color + filter: null, // callback fn to filter tweets: fn(tweetJson) { /* return false to skip tweet */ } + formatter: null, // callback fn to build tweet markup + pause: false, // true or false (pause on hover) + refreshSeconds: 0, // number of seconds to wait before polling for newer tweets + term: '', // twitter search term + time: true, // true or false (show or hide the time that the tweet was sent) + timeout: 4000, // delay betweet tweet scroll + title: null, // title text to display when frame option is true (default = 'term' text) + titleLink: null, // url for title link + css: { + // default styling + a: { textDecoration: 'none', color: '#3B5998' }, + bird: { width: '50px', height: '20px', position: 'absolute', left: '-30px', top: '-20px', border: 'none' }, + container: { overflow: 'hidden', backgroundColor: '', height: '360px' }, + fail: { background: '#6cc5c3 url(http://cloud.github.com/downloads/malsup/twitter/failwhale.png) no-repeat 50% 50%', height: '100%', padding: '10px' }, + frame: { border: '0px solid #C2CFF1', borderRadius: '0px', '-moz-border-radius': '0px', '-webkit-border-radius': '0px' }, + tweet: { padding: '5px 10px', clear: 'left' }, + img: { 'float': 'left', margin: '5px', width: '48px', height: '48px' }, + loading: { padding: '20px', textAlign: 'center', color: '#888' }, + text: {}, + time: { fontSize: 'smaller', color: '#888' }, + title: { 'border-bottom': '1px solid #D2D2D2', 'padding-top': '5px', 'padding-bottom': '0px', 'padding-left': '9px', 'margin-bottom': '0px', 'margin-top': '30px' , 'display': 'block', 'font-size': '1.17em', 'font-weight': 'bold'}, + titleLink: { textDecoration: 'none', color: '#3B5998' }, + user: { fontWeight: 'bold' } + } + }; + + // fn to handle jsonp with timeouts and errors + // hat tip to Ricardo Tomasi for the timeout logic + $.getJSONP = function(s) { + s.dataType = 'jsonp'; + $.ajax(s); + + // figure out what the callback fn is + var $script = $(document.getElementsByTagName('head')[0].firstChild); + var url = $script.attr('src') || ''; + var cb = (url.match(/callback=(\w+)/)||[])[1]; + if (!cb) + return; // bail + var t = 0, cbFn = window[cb]; + + $script[0].onerror = function(e) { + $script.remove(); + handleError(s, {}, "error", e); + clearTimeout(t); + }; + + if (!s.timeout) + return; + + window[cb] = function(json) { + clearTimeout(t); + cbFn(json); + cbFn = null; + }; + + t = setTimeout(function() { + $script.remove(); + handleError(s, {}, "timeout"); + if (cbFn) + window[cb] = function(){}; + }, s.timeout); + + function handleError(s, xhr, msg, e) { + s.error && s.error.call(s.context, xhr, msg, e); + s.global && $.event.trigger("ajaxError", [xhr, s, e || msg]); + s.complete && s.complete.call(s.context, xhr, e || msg); + } + }; + + /* + * JavaScript Pretty Date + * Copyright (c) 2008 John Resig (jquery.com) + * Licensed under the MIT license. + */ + // converts ISO time to casual time + function prettyDate(time){ + var date = new Date((time || "").replace(/-/g,"/").replace(/TZ/g," ")), + diff = (((new Date()).getTime() - date.getTime()) / 1000), + day_diff = Math.floor(diff / 86400); + + if ( isNaN(day_diff) || day_diff < 0 || day_diff >= 31 ) + return; + var v = day_diff == 0 && ( + diff < 60 && "just now" || + diff < 120 && "1 minute ago" || + diff < 3600 && Math.floor( diff / 60 ) + " minutes ago" || + diff < 7200 && "1 hour ago" || + diff < 86400 && Math.floor( diff / 3600 ) + " hours ago") || + day_diff == 1 && "Yesterday" || + day_diff < 7 && day_diff + " days ago" || + day_diff < 31 && Math.ceil( day_diff / 7 ) + " weeks ago"; + if (!v) + window.console && console.log(time); + return v ? v : ''; + } + +})(jQuery); diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl index ce27400f6..f611de004 100644 --- a/view/theme/diabook/nav.tpl +++ b/view/theme/diabook/nav.tpl @@ -136,7 +136,7 @@ - +
$langselector
diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css index a8ed1e9a2..2ba8d1b07 100644 --- a/view/theme/diabook/style-network.css +++ b/view/theme/diabook/style-network.css @@ -1252,6 +1252,7 @@ right_aside .icon {width: 10px; height: 10px;} transition: all 0.2s ease-in-out; } + /* wall item */ .tread-wrapper { border-bottom: 1px solid #D2D2D2; diff --git a/view/theme/diabook/style-wide.css b/view/theme/diabook/style-wide.css index f8dced3e6..71ed4e472 100644 --- a/view/theme/diabook/style-wide.css +++ b/view/theme/diabook/style-wide.css @@ -21,6 +21,7 @@ .admin.linklist { border: 0px; padding: 0px; + list-style: none; } .admin.link { @@ -974,7 +975,7 @@ ul.menu-popup .empty { background-color: #bdcdd4; } #nav-notifications-menu { - width: 400px; + width: 425px !important; max-height: 550px; overflow: auto; } @@ -1195,7 +1196,7 @@ aside #side-peoplefind-url { margin-right: 20px; } #login-submit-wrapper{ - padding-top: 120px; + margin-bottom: 12px; } aside #login-submit-button{ diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index 9150ea8cf..e70c72cb2 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -21,6 +21,7 @@ .admin.linklist { border: 0px; padding: 0px; + list-style: none; } .admin.link { @@ -974,7 +975,7 @@ ul.menu-popup .empty { background-color: #bdcdd4; } #nav-notifications-menu { - width: 400px; + width: 425px !important; max-height: 550px; overflow: auto; } @@ -1198,7 +1199,7 @@ aside #side-peoplefind-url { margin-right: 20px; } #login-submit-wrapper{ - padding-top: 120px; + margin-bottom: 12px; } aside #login-submit-button{ diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index c45db9884..945c3f36b 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -3,13 +3,13 @@ /* * Name: Diabook * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu - * Version: (Version: 1.022) + * Version: (Version: 1.024) * Author: */ //print diabook-version for debugging -$diabook_version = "Diabook (Version: 1.022)"; +$diabook_version = "Diabook (Version: 1.024)"; $a->page['htmlhead'] .= sprintf('', $diabook_version); //change css on network and profilepages @@ -44,6 +44,26 @@ function diabook_community_info(){ $a = get_app(); + // comunity_profiles + $aside['$comunity_profilest_title'] = t('Community Profiles'); + $aside['$comunity_profiles_items'] = array(); + $r = q("select gcontact.* from gcontact left join glink on glink.gcid = gcontact.id + where glink.cid = 0 and glink.uid = 0 order by rand() limit 9"); + $tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl'); + if(count($r)) { + $photo = 'photo'; + foreach($r as $rr) { + $profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']); + $entry = replace_macros($tpl,array( + '$id' => $rr['id'], + '$profile-link' => zrl($rr['url']), + '$photo' => $rr[$photo], + '$alt-text' => $rr['name'], + )); + $aside['$comunity_profiles_items'][] = $entry; + } + } + // last 12 users $aside['$lastusers_title'] = t('Last users'); $aside['$lastusers_items'] = array(); @@ -175,9 +195,8 @@ function diabook_community_info(){ //Community Page if(local_user()) { - $page = '
-
-

'.t("Community Pages").'

+ $page = '
+

'.t("Community Pages").'