bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge branch 'fabrixxm-master'

Browse source 
Conflicts:
	boot.php
This commit is contained in:
Friendika 2011-05-23 18:17:02 -07:00
commit 78b2db3a98
34 changed files with 475 additions and 330 deletions
Download patch file Download diff file Expand all files Collapse all files

4
addon/facebook/facebook.php
View file

@ -245,12 +245,12 @@ function facebook_content(&$a) {
if($a->argc > 1 && $a->argv[1] === 'remove') { if($a->argc > 1 && $a->argv[1] === 'remove') {
del_pconfig(local_user(),'facebook','post'); del_pconfig(local_user(),'facebook','post');
notice( t('Facebook disabled') . EOL); info( t('Facebook disabled') . EOL);
} }
if($a->argc > 1 && $a->argv[1] === 'friends') { if($a->argc > 1 && $a->argv[1] === 'friends') {
fb_get_friends(local_user()); fb_get_friends(local_user());
notice( t('Updating contacts') . EOL); info( t('Updating contacts') . EOL);
} }

2
addon/statusnet/statusnet.php
View file

@ -169,7 +169,7 @@ function statusnet_settings_post ($a,$post) {
// to post a tweet for every new __public__ posting to the wall // to post a tweet for every new __public__ posting to the wall
set_pconfig(local_user(),'statusnet','post',intval($_POST['statusnet-enable'])); set_pconfig(local_user(),'statusnet','post',intval($_POST['statusnet-enable']));
set_pconfig(local_user(),'statusnet','post_by_default',intval($_POST['statusnet-default'])); set_pconfig(local_user(),'statusnet','post_by_default',intval($_POST['statusnet-default']));
notice( t('StatusNet settings updated.') . EOL); info( t('StatusNet settings updated.') . EOL);
}}}} }}}}
} }
function statusnet_settings(&$a,&$s) { function statusnet_settings(&$a,&$s) {

7
boot.php
View file

@ -1007,6 +1007,13 @@ function notice($s) {
if($a->interactive) if($a->interactive)
$_SESSION['sysmsg'] .= $s; $_SESSION['sysmsg'] .= $s;
}} }}
if(! function_exists('info')) {
function info($s) {
$a = get_app();
if($a->interactive)
$_SESSION['sysmsg_info'] .= $s;
}}
// wrapper around config to limit the text length of an incoming message // wrapper around config to limit the text length of an incoming message

8
include/auth.php
View file

@ -24,7 +24,7 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
// process logout request // process logout request
nuke_session(); nuke_session();
notice( t('Logged out.') . EOL); info( t('Logged out.') . EOL);
goaway($a->get_baseurl()); goaway($a->get_baseurl());
} }
@ -205,11 +205,11 @@ else {
if($a->user['login_date'] === '0000-00-00 00:00:00') { if($a->user['login_date'] === '0000-00-00 00:00:00') {
$_SESSION['return_url'] = 'profile_photo/new'; $_SESSION['return_url'] = 'profile_photo/new';
$a->module = 'profile_photo'; $a->module = 'profile_photo';
notice( t("Welcome ") . $a->user['username'] . EOL); info( t("Welcome ") . $a->user['username'] . EOL);
notice( t('Please upload a profile photo.') . EOL); info( t('Please upload a profile photo.') . EOL);
} }
else else
notice( t("Welcome back ") . $a->user['username'] . EOL); info( t("Welcome back ") . $a->user['username'] . EOL);
if(strlen($a->user['timezone'])) { if(strlen($a->user['timezone'])) {
date_default_timezone_set($a->user['timezone']); date_default_timezone_set($a->user['timezone']);

11
index.php
View file

@ -110,6 +110,9 @@ if(! x($_SESSION,'authenticated'))
if(! x($_SESSION,'sysmsg')) if(! x($_SESSION,'sysmsg'))
$_SESSION['sysmsg'] = ''; $_SESSION['sysmsg'] = '';
if(! x($_SESSION,'sysmsg_info'))
$_SESSION['sysmsg_info'] = '';
/* /*
* check_config() is responsible for running update scripts. These automatically * check_config() is responsible for running update scripts. These automatically
* update the DB schema whenever we push a new one out. It also checks to see if * update the DB schema whenever we push a new one out. It also checks to see if
@ -262,8 +265,16 @@ if(stristr($_SESSION['sysmsg'], t('Permission denied'))) {
if(x($_SESSION,'sysmsg')) { if(x($_SESSION,'sysmsg')) {
$a->page['content'] = "<div id=\"sysmsg\" class=\"error-message\">{$_SESSION['sysmsg']}</div>\r\n" $a->page['content'] = "<div id=\"sysmsg\" class=\"error-message\">{$_SESSION['sysmsg']}</div>\r\n"
. ((x($a->page,'content')) ? $a->page['content'] : ''); . ((x($a->page,'content')) ? $a->page['content'] : '');
$_SESSION['sysmsg']="";
unset($_SESSION['sysmsg']); unset($_SESSION['sysmsg']);
} }
if(x($_SESSION,'sysmsg_info')) {
$a->page['content'] = "<div id=\"sysmsg_info\" class=\"info-message\">{$_SESSION['sysmsg_info']}</div>\r\n"
. ((x($a->page,'content')) ? $a->page['content'] : '');
$_SESSION['sysmsg_info']="";
unset($_SESSION['sysmsg_info']);
}
call_hooks('page_end', $a->page['content']); call_hooks('page_end', $a->page['content']);

8
mod/contacts.php
View file

@ -85,7 +85,7 @@ logger('contact_edit ' . print_r($_POST,true));
intval(local_user()) intval(local_user())
); );
if($r) if($r)
notice( t('Contact updated.') . EOL); info( t('Contact updated.') . EOL);
else else
notice( t('Failed to update contact record.') . EOL); notice( t('Failed to update contact record.') . EOL);
return; return;
@ -143,7 +143,7 @@ function contacts_content(&$a) {
); );
if($r) { if($r) {
//notice( t('Contact has been ') . (($blocked) ? t('blocked') : t('unblocked')) . EOL ); //notice( t('Contact has been ') . (($blocked) ? t('blocked') : t('unblocked')) . EOL );
notice( (($blocked) ? t('Contact has been blocked') : t('Contact has been unblocked')) . EOL ); info( (($blocked) ? t('Contact has been blocked') : t('Contact has been unblocked')) . EOL );
} }
goaway($a->get_baseurl() . '/contacts/' . $contact_id); goaway($a->get_baseurl() . '/contacts/' . $contact_id);
return; // NOTREACHED return; // NOTREACHED
@ -157,7 +157,7 @@ function contacts_content(&$a) {
intval(local_user()) intval(local_user())
); );
if($r) { if($r) {
notice( (($readonly) ? t('Contact has been ignored') : t('Contact has been unignored')) . EOL ); info( (($readonly) ? t('Contact has been ignored') : t('Contact has been unignored')) . EOL );
} }
goaway($a->get_baseurl() . '/contacts/' . $contact_id); goaway($a->get_baseurl() . '/contacts/' . $contact_id);
return; // NOTREACHED return; // NOTREACHED
@ -197,7 +197,7 @@ function contacts_content(&$a) {
contact_remove($contact_id); contact_remove($contact_id);
notice( t('Contact has been removed.') . EOL ); info( t('Contact has been removed.') . EOL );
goaway($a->get_baseurl() . '/contacts'); goaway($a->get_baseurl() . '/contacts');
return; // NOTREACHED return; // NOTREACHED
} }

2
mod/crepair.php
View file

@ -39,7 +39,7 @@ function crepair_post(&$a) {
); );
if($r) if($r)
notice( t('Contact settings applied.') . EOL); info( t('Contact settings applied.') . EOL);
else else
notice( t('Contact update failed.') . EOL); notice( t('Contact update failed.') . EOL);

4
mod/dfrn_poll.php
View file

@ -81,7 +81,7 @@ function dfrn_poll_init(&$a) {
$_SESSION['visitor_id'] = $r[0]['id']; $_SESSION['visitor_id'] = $r[0]['id'];
$_SESSION['visitor_home'] = $r[0]['url']; $_SESSION['visitor_home'] = $r[0]['url'];
$_SESSION['visitor_visiting'] = $r[0]['uid']; $_SESSION['visitor_visiting'] = $r[0]['uid'];
notice( sprintf(t('%s welcomes %s'), $r[0]['username'] , $r[0]['name']) . EOL); info( sprintf(t('%s welcomes %s'), $r[0]['username'] , $r[0]['name']) . EOL);
// Visitors get 1 day session. // Visitors get 1 day session.
$session_id = session_id(); $session_id = session_id();
$expire = time() + 86400; $expire = time() + 86400;
@ -507,7 +507,7 @@ function dfrn_poll_content(&$a) {
$_SESSION['visitor_id'] = $r[0]['id']; $_SESSION['visitor_id'] = $r[0]['id'];
$_SESSION['visitor_home'] = $r[0]['url']; $_SESSION['visitor_home'] = $r[0]['url'];
$_SESSION['visitor_visiting'] = $r[0]['uid']; $_SESSION['visitor_visiting'] = $r[0]['uid'];
notice( sprintf(t('%s welcomes %s'), $r[0]['username'] , $r[0]['name']) . EOL); info( sprintf(t('%s welcomes %s'), $r[0]['username'] , $r[0]['name']) . EOL);
// Visitors get 1 day session. // Visitors get 1 day session.
$session_id = session_id(); $session_id = session_id();
$expire = time() + 86400; $expire = time() + 86400;

6
mod/dfrn_request.php
View file

@ -165,7 +165,7 @@ function dfrn_request_post(&$a) {
} }
if($r) { if($r) {
notice( t("Introduction complete.") . EOL); info( t("Introduction complete.") . EOL);
} }
/** /**
@ -424,7 +424,7 @@ function dfrn_request_post(&$a) {
// This notice will only be seen by the requestor if the requestor and requestee are on the same server. // This notice will only be seen by the requestor if the requestor and requestee are on the same server.
if(! $failed) if(! $failed)
notice( t('Your introduction has been sent.') . EOL ); info( t('Your introduction has been sent.') . EOL );
// "Homecoming" - send the requestor back to their site to record the introduction. // "Homecoming" - send the requestor back to their site to record the introduction.
@ -478,7 +478,7 @@ function dfrn_request_content(&$a) {
if(x($_GET,'dfrn_url')) { if(x($_GET,'dfrn_url')) {
if(! local_user()) { if(! local_user()) {
notice( t("Please login to confirm introduction.") . EOL ); info( t("Please login to confirm introduction.") . EOL );
/* setup the return URL to come back to this page if they use openid */ /* setup the return URL to come back to this page if they use openid */

2
mod/directory.php
View file

@ -138,7 +138,7 @@ function directory_content(&$a) {
} }
else else
notice( t("No entries \x28some entries may be hidden\x29.") . EOL); info( t("No entries \x28some entries may be hidden\x29.") . EOL);
return $o; return $o;
} }

6
mod/group.php
View file

@ -24,7 +24,7 @@ function group_post(&$a) {
$name = notags(trim($_POST['groupname'])); $name = notags(trim($_POST['groupname']));
$r = group_add(local_user(),$name); $r = group_add(local_user(),$name);
if($r) { if($r) {
notice( t('Group created.') . EOL ); info( t('Group created.') . EOL );
$r = group_byname(local_user(),$name); $r = group_byname(local_user(),$name);
if($r) if($r)
goaway($a->get_baseurl() . '/group/' . $r); goaway($a->get_baseurl() . '/group/' . $r);
@ -53,7 +53,7 @@ function group_post(&$a) {
intval($group['id']) intval($group['id'])
); );
if($r) if($r)
notice( t('Group name changed.') . EOL ); info( t('Group name changed.') . EOL );
} }
$a->page['aside'] = group_side(); $a->page['aside'] = group_side();
@ -87,7 +87,7 @@ function group_content(&$a) {
if(count($r)) if(count($r))
$result = group_rmv(local_user(),$r[0]['name']); $result = group_rmv(local_user(),$r[0]['name']);
if($result) if($result)
notice( t('Group removed.') . EOL); info( t('Group removed.') . EOL);
else else
notice( t('Unable to remove group.') . EOL); notice( t('Unable to remove group.') . EOL);
} }

4
mod/install.php
View file

@ -35,7 +35,7 @@ function install_post(&$a) {
} }
} }
notice( t('Connected to database.') . EOL); info( t('Connected to database.') . EOL);
$tpl = get_intltext_template('htconfig.tpl'); $tpl = get_intltext_template('htconfig.tpl');
$txt = replace_macros($tpl,array( $txt = replace_macros($tpl,array(
@ -95,7 +95,7 @@ function install_content(&$a) {
} }
} }
notice( t('Welcome to Friendika.') . EOL); info( t('Welcome to Friendika.') . EOL);
check_funcs(); check_funcs();

2
mod/item.php
View file

@ -125,7 +125,7 @@ function item_post(&$a) {
$pubmail_enable = ((x($_POST,'pubmail_enable') && intval($_POST['pubmail_enable']) && (! $private)) ? 1 : 0); $pubmail_enable = ((x($_POST,'pubmail_enable') && intval($_POST['pubmail_enable']) && (! $private)) ? 1 : 0);
if(! strlen($body)) { if(! strlen($body)) {
notice( t('Empty post discarded.') . EOL ); info( t('Empty post discarded.') . EOL );
if(x($_POST,'return')) if(x($_POST,'return'))
goaway($a->get_baseurl() . "/" . $_POST['return'] ); goaway($a->get_baseurl() . "/" . $_POST['return'] );
killme(); killme();

4
mod/lostpass.php
View file

@ -24,7 +24,7 @@ function lostpass_post(&$a) {
intval($uid) intval($uid)
); );
if($r) if($r)
notice( t('Password reset request issued. Check your email.') . EOL); info( t('Password reset request issued. Check your email.') . EOL);
$email_tpl = get_intltext_template("lostpass_eml.tpl"); $email_tpl = get_intltext_template("lostpass_eml.tpl");
$email_tpl = replace_macros($email_tpl, array( $email_tpl = replace_macros($email_tpl, array(
@ -85,7 +85,7 @@ function lostpass_content(&$a) {
'$baseurl' => $a->get_baseurl() '$baseurl' => $a->get_baseurl()
)); ));
notice("Your password has been reset." . EOL); info("Your password has been reset." . EOL);

2
mod/manage.php
View file

@ -34,7 +34,7 @@ function manage_post(&$a) {
$_SESSION['page_flags'] = $r[0]['page-flags']; $_SESSION['page_flags'] = $r[0]['page-flags'];
$_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $r[0]['nickname']; $_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $r[0]['nickname'];
notice( sprintf( t("Welcome back %s") , $r[0]['username']) . EOL); info( sprintf( t("Welcome back %s") , $r[0]['username']) . EOL);
$a->user = $r[0]; $a->user = $r[0];
if(strlen($a->user['timezone'])) { if(strlen($a->user['timezone'])) {

2
mod/match.php
View file

@ -47,7 +47,7 @@ function match_content(&$a) {
$o .= '<div id="profile-match-wrapper-end"></div>'; $o .= '<div id="profile-match-wrapper-end"></div>';
} }
else { else {
notice( t('No matches') . EOL); info( t('No matches') . EOL);
} }
} }

8
mod/message.php
View file

@ -99,7 +99,7 @@ function message_post(&$a) {
if($post_id) { if($post_id) {
proc_run('php',"include/notifier.php","mail","$post_id"); proc_run('php',"include/notifier.php","mail","$post_id");
notice( t('Message sent.') . EOL ); info( t('Message sent.') . EOL );
} }
else { else {
notice( t('Message could not be sent.') . EOL ); notice( t('Message could not be sent.') . EOL );
@ -139,7 +139,7 @@ function message_content(&$a) {
intval(local_user()) intval(local_user())
); );
if($r) { if($r) {
notice( t('Message deleted.') . EOL ); info( t('Message deleted.') . EOL );
} }
goaway($a->get_baseurl() . '/message' ); goaway($a->get_baseurl() . '/message' );
} }
@ -155,7 +155,7 @@ function message_content(&$a) {
intval(local_user()) intval(local_user())
); );
if($r) if($r)
notice( t('Conversation removed.') . EOL ); info( t('Conversation removed.') . EOL );
} }
goaway($a->get_baseurl() . '/message' ); goaway($a->get_baseurl() . '/message' );
} }
@ -221,7 +221,7 @@ function message_content(&$a) {
intval($a->pager['itemspage']) intval($a->pager['itemspage'])
); );
if(! count($r)) { if(! count($r)) {
notice( t('No messages.') . EOL); info( t('No messages.') . EOL);
return $o; return $o;
} }

7
mod/network.php
View file

@ -61,8 +61,9 @@ function network_content(&$a, $update = 0) {
if(! $update) { if(! $update) {
if(group) { if(group) {
if(($t = group_public_members($group)) && (! get_pconfig(local_user(),'system','nowarn_insecure'))) { if(($t = group_public_members($group)) && (! get_pconfig(local_user(),'system','nowarn_insecure'))) {
$plural_form = sprintf( tt('%d member', '%d members', $t), $t); notice( sprintf( tt('Warning: This group contains %s member from an insecure network.',
notice( sprintf( t('Warning: This group contains %s from an insecure network.'), $plural_form ) . EOL); 'Warning: This group contains %s members from an insecure network.',
$t), $t ) . EOL);
notice( t('Private messages to this group are at risk of public disclosure.') . EOL); notice( t('Private messages to this group are at risk of public disclosure.') . EOL);
} }
} }
@ -136,7 +137,7 @@ function network_content(&$a, $update = 0) {
} }
else { else {
$contact_str = ' 0 '; $contact_str = ' 0 ';
notice( t('Group is empty')); info( t('Group is empty'));
} }
$sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` AND ( `contact-id` IN ( $contact_str ) OR `allow_gid` REGEXP '<" . intval($group) . ">' )) "; $sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` AND ( `contact-id` IN ( $contact_str ) OR `allow_gid` REGEXP '<" . intval($group) . ">' )) ";

4
mod/notifications.php
View file

@ -136,7 +136,7 @@ function notifications_content(&$a) {
} }
} }
else else
notice( t('No notifications.') . EOL); info( t('No notifications.') . EOL);
if ($a->config['register_policy'] == REGISTER_APPROVE && if ($a->config['register_policy'] == REGISTER_APPROVE &&
$a->config['admin_email'] === $a->user['email']){ $a->config['admin_email'] === $a->user['email']){
@ -156,7 +156,7 @@ function notifications_content(&$a) {
$o .= "</ul>"; $o .= "</ul>";
} }
else else
notice( t('No registrations.') . EOL); info( t('No registrations.') . EOL);
} }

2
mod/oexchange.php
View file

@ -24,7 +24,7 @@ function oexchange_content(&$a) {
} }
if(($a->argc > 1) && $a->argv[1] === 'done') { if(($a->argc > 1) && $a->argv[1] === 'done') {
notice( t('Post successful.') . EOL); info( t('Post successful.') . EOL);
return; return;
} }

6
mod/openid.php
View file

@ -75,11 +75,11 @@ function openid_content(&$a) {
if($a->user['login_date'] === '0000-00-00 00:00:00') { if($a->user['login_date'] === '0000-00-00 00:00:00') {
$_SESSION['return_url'] = 'profile_photo/new'; $_SESSION['return_url'] = 'profile_photo/new';
$a->module = 'profile_photo'; $a->module = 'profile_photo';
notice( t("Welcome ") . $a->user['username'] . EOL); info( t("Welcome ") . $a->user['username'] . EOL);
notice( t('Please upload a profile photo.') . EOL); info( t('Please upload a profile photo.') . EOL);
} }
else else
notice( t("Welcome back ") . $a->user['username'] . EOL); info( t("Welcome back ") . $a->user['username'] . EOL);
if(strlen($a->user['timezone'])) { if(strlen($a->user['timezone'])) {

2
mod/profile_photo.php
View file

@ -236,7 +236,7 @@ function profile_photo_crop_ui_head(&$a, $ph){
$r = $ph->store(local_user(), 0 , $hash, $filename, t('Profile Photos'), 0 ); $r = $ph->store(local_user(), 0 , $hash, $filename, t('Profile Photos'), 0 );
if($r) if($r)
notice( t('Image uploaded successfully.') . EOL ); info( t('Image uploaded successfully.') . EOL );
else else
notice( t('Image upload failed.') . EOL ); notice( t('Image upload failed.') . EOL );

8
mod/profiles.php
View file

@ -196,7 +196,7 @@ function profiles_post(&$a) {
); );
if($r) if($r)
notice( t('Profile updated.') . EOL); info( t('Profile updated.') . EOL);
if($namechanged && $is_default) { if($namechanged && $is_default) {
@ -251,7 +251,7 @@ function profiles_content(&$a) {
intval(local_user()) intval(local_user())
); );
if($r) if($r)
notice( t('Profile deleted.') . EOL); info( t('Profile deleted.') . EOL);
goaway($a->get_baseurl() . '/profiles'); goaway($a->get_baseurl() . '/profiles');
return; // NOTREACHED return; // NOTREACHED
@ -286,7 +286,7 @@ function profiles_content(&$a) {
dbesc($name) dbesc($name)
); );
notice( t('New profile created.') . EOL); info( t('New profile created.') . EOL);
if(count($r3) == 1) if(count($r3) == 1)
goaway($a->get_baseurl() . '/profiles/' . $r3[0]['id']); goaway($a->get_baseurl() . '/profiles/' . $r3[0]['id']);
goaway($a->get_baseurl() . '/profiles'); goaway($a->get_baseurl() . '/profiles');
@ -325,7 +325,7 @@ function profiles_content(&$a) {
intval(local_user()), intval(local_user()),
dbesc($name) dbesc($name)
); );
notice( t('New profile created.') . EOL); info( t('New profile created.') . EOL);
if(count($r3) == 1) if(count($r3) == 1)
goaway($a->get_baseurl() . '/profiles/' . $r3[0]['id']); goaway($a->get_baseurl() . '/profiles/' . $r3[0]['id']);
goaway($a->get_baseurl() . '/profiles'); goaway($a->get_baseurl() . '/profiles');

4
mod/register.php
View file

@ -336,7 +336,7 @@ function register_post(&$a) {
if($res) { if($res) {
notice( t('Registration successful. Please check your email for further instructions.') . EOL ) ; info( t('Registration successful. Please check your email for further instructions.') . EOL ) ;
goaway($a->get_baseurl()); goaway($a->get_baseurl());
} }
else { else {
@ -374,7 +374,7 @@ function register_post(&$a) {
. 'Content-type: text/plain; charset=UTF-8' . "\n" . 'Content-type: text/plain; charset=UTF-8' . "\n"
. 'Content-transfer-encoding: 8bit' ); . 'Content-transfer-encoding: 8bit' );
if($res) { if($res) {
notice( t('Your registration is pending approval by the site owner.') . EOL ) ; info( t('Your registration is pending approval by the site owner.') . EOL ) ;
goaway($a->get_baseurl()); goaway($a->get_baseurl());
} }

4
mod/regmod.php
View file

@ -7,7 +7,7 @@ function regmod_content(&$a) {
$_SESSION['return_url'] = $a->cmd; $_SESSION['return_url'] = $a->cmd;
if(! local_user()) { if(! local_user()) {
notice( t('Please login.') . EOL); info( t('Please login.') . EOL);
$o .= '<br /><br />' . login(($a->config['register_policy'] == REGISTER_CLOSED) ? 0 : 1); $o .= '<br /><br />' . login(($a->config['register_policy'] == REGISTER_CLOSED) ? 0 : 1);
return $o; return $o;
} }
@ -96,7 +96,7 @@ function regmod_content(&$a) {
. 'Content-transfer-encoding: 8bit' ); . 'Content-transfer-encoding: 8bit' );
if($res) { if($res) {
notice( t('Account approved.') . EOL ); info( t('Account approved.') . EOL );
return; return;
} }
} }

2
mod/search.php
View file

@ -66,7 +66,7 @@ function search_content(&$a) {
$a->set_pager_total($r[0]['total']); $a->set_pager_total($r[0]['total']);
if(! $r[0]['total']) { if(! $r[0]['total']) {
notice( t('No results.') . EOL); info( t('No results.') . EOL);
return $o; return $o;
} }

8
mod/settings.php
View file

@ -51,7 +51,7 @@ function settings_post(&$a) {
intval(local_user()) intval(local_user())
); );
if($r) if($r)
notice( t('Password changed.') . EOL); info( t('Password changed.') . EOL);
else else
notice( t('Password update failed. Please try again.') . EOL); notice( t('Password update failed. Please try again.') . EOL);
} }
@ -203,7 +203,7 @@ function settings_post(&$a) {
intval(local_user()) intval(local_user())
); );
if($r) if($r)
notice( t('Settings updated.') . EOL); info( t('Settings updated.') . EOL);
$r = q("UPDATE `profile` $r = q("UPDATE `profile`
SET `publish` = %d, `net-publish` = %d SET `publish` = %d, `net-publish` = %d
@ -374,7 +374,7 @@ function settings_content(&$a) {
? true : false); ? true : false);
if($invisible) if($invisible)
notice( t('Profile is <strong>not published</strong>.') . EOL ); info( t('Profile is <strong>not published</strong>.') . EOL );
$theme_selector = '<select name="theme" id="theme-select" >'; $theme_selector = '<select name="theme" id="theme-select" >';
@ -485,7 +485,7 @@ function settings_content(&$a) {
'$imap_replyto' => $mail_replyto, '$imap_replyto' => $mail_replyto,
'$lbl_imap7' => t('Send public posts to all email contacts:'), '$lbl_imap7' => t('Send public posts to all email contacts:'),
'$pubmail_checked' => (($mail_pubmail) ? ' checked="checked" ' : ''), '$pubmail_checked' => (($mail_pubmail) ? ' checked="checked" ' : ''),
'$mail_disabled' => (($mail_disabled) ? '<div class="error-message">' . t('Email access is disabled on this site.') . '</div>' : ''), '$mail_disabled' => (($mail_disabled) ? '<div class="info-message">' . t('Email access is disabled on this site.') . '</div>' : ''),
'$imap_disabled' => $imap_disabled '$imap_disabled' => $imap_disabled
)); ));

2
mod/tagrm.php
View file

@ -38,7 +38,7 @@ function tagrm_post(&$a) {
intval(local_user()) intval(local_user())
); );
notice( t('Tag removed') . EOL ); info( t('Tag removed') . EOL );
goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']); goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
// NOTREACHED // NOTREACHED

2
mod/viewcontacts.php
View file

@ -37,7 +37,7 @@ function viewcontacts_content(&$a) {
intval($a->pager['itemspage']) intval($a->pager['itemspage'])
); );
if(! count($r)) { if(! count($r)) {
notice( t('No contacts.') . EOL ); info( t('No contacts.') . EOL );
return $o; return $o;
} }

609
util/messages.po
View file

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2.2.975\n" "Project-Id-Version: 2.2.988\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-05-10 14:13+0200\n" "POT-Creation-Date: 2011-05-23 12:00+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -18,33 +18,33 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" #"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
#: ../../index.php:210 #: ../../index.php:213
msgid "Not Found" msgid "Not Found"
msgstr "" msgstr ""
#: ../../index.php:211 #: ../../index.php:214
msgid "Page not found." msgid "Page not found."
msgstr "" msgstr ""
#: ../../index.php:266 ../../mod/profperm.php:19 ../../mod/group.php:67 #: ../../index.php:269 ../../mod/profperm.php:19 ../../mod/group.php:67
msgid "Permission denied" msgid "Permission denied"
msgstr "" msgstr ""
#: ../../index.php:267 ../../mod/manage.php:75 ../../mod/wall_upload.php:42 #: ../../index.php:270 ../../mod/manage.php:75 ../../mod/wall_upload.php:42
#: ../../mod/follow.php:8 ../../mod/profile_photo.php:19 #: ../../mod/follow.php:8 ../../mod/profile_photo.php:19
#: ../../mod/profile_photo.php:133 ../../mod/profile_photo.php:144 #: ../../mod/profile_photo.php:133 ../../mod/profile_photo.php:144
#: ../../mod/profile_photo.php:155 ../../mod/regmod.php:16 #: ../../mod/profile_photo.php:155 ../../mod/regmod.php:16
#: ../../mod/profiles.php:7 ../../mod/profiles.php:227 #: ../../mod/profiles.php:7 ../../mod/profiles.php:227
#: ../../mod/settings.php:15 ../../mod/settings.php:20 #: ../../mod/settings.php:15 ../../mod/settings.php:20
#: ../../mod/settings.php:251 ../../mod/photos.php:89 ../../mod/photos.php:798 #: ../../mod/settings.php:251 ../../mod/photos.php:89 ../../mod/photos.php:802
#: ../../mod/display.php:138 ../../mod/editpost.php:10 ../../mod/invite.php:13 #: ../../mod/display.php:138 ../../mod/editpost.php:10 ../../mod/invite.php:13
#: ../../mod/invite.php:54 ../../mod/contacts.php:106 #: ../../mod/invite.php:54 ../../mod/contacts.php:106
#: ../../mod/register.php:25 ../../mod/install.php:93 ../../mod/network.php:6 #: ../../mod/register.php:25 ../../mod/install.php:93 ../../mod/network.php:6
#: ../../mod/notifications.php:56 ../../mod/crepair.php:54 #: ../../mod/notifications.php:56 ../../mod/crepair.php:54
#: ../../mod/item.php:57 ../../mod/item.php:680 ../../mod/message.php:8 #: ../../mod/notes.php:20 ../../mod/item.php:57 ../../mod/item.php:751
#: ../../mod/message.php:116 ../../mod/dfrn_confirm.php:53 #: ../../mod/message.php:8 ../../mod/message.php:116
#: ../../mod/viewcontacts.php:21 ../../mod/group.php:19 #: ../../mod/dfrn_confirm.php:53 ../../mod/viewcontacts.php:21
#: ../../addon/facebook/facebook.php:246 #: ../../mod/group.php:19 ../../addon/facebook/facebook.php:242
msgid "Permission denied." msgid "Permission denied."
msgstr "" msgstr ""
@ -52,8 +52,8 @@ msgstr ""
msgid "Delete this item?" msgid "Delete this item?"
msgstr "" msgstr ""
#: ../../boot.php:386 ../../mod/photos.php:1130 ../../mod/photos.php:1169 #: ../../boot.php:386 ../../mod/photos.php:1134 ../../mod/photos.php:1173
#: ../../mod/photos.php:1200 ../../include/conversation.php:375 #: ../../mod/photos.php:1204 ../../include/conversation.php:380
msgid "Comment" msgid "Comment"
msgstr "" msgstr ""
@ -97,166 +97,166 @@ msgstr ""
msgid "Logout" msgid "Logout"
msgstr "" msgstr ""
#: ../../boot.php:1106 #: ../../boot.php:1113
msgid "prev" msgid "prev"
msgstr "" msgstr ""
#: ../../boot.php:1108 #: ../../boot.php:1115
msgid "first" msgid "first"
msgstr "" msgstr ""
#: ../../boot.php:1137 #: ../../boot.php:1144
msgid "last" msgid "last"
msgstr "" msgstr ""
#: ../../boot.php:1140 #: ../../boot.php:1147
msgid "next" msgid "next"
msgstr "" msgstr ""
#: ../../boot.php:2001 #: ../../boot.php:2046
msgid "No contacts" msgid "No contacts"
msgstr "" msgstr ""
#: ../../boot.php:2009 #: ../../boot.php:2054
#, php-format #, php-format
msgid "%d Contact" msgid "%d Contact"
msgid_plural "%d Contacts" msgid_plural "%d Contacts"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: ../../boot.php:2014 ../../mod/viewcontacts.php:25 #: ../../boot.php:2059 ../../mod/viewcontacts.php:25
msgid "View Contacts" msgid "View Contacts"
msgstr "" msgstr ""
#: ../../boot.php:2060 ../../mod/search.php:26 ../../include/nav.php:71 #: ../../boot.php:2114 ../../mod/search.php:26 ../../include/nav.php:70
msgid "Search" msgid "Search"
msgstr "" msgstr ""
#: ../../boot.php:2216 ../../mod/profile.php:11 #: ../../boot.php:2270 ../../mod/profile.php:11
msgid "No profile" msgid "No profile"
msgstr "" msgstr ""
#: ../../boot.php:2275 #: ../../boot.php:2329
msgid "Connect" msgid "Connect"
msgstr "" msgstr ""
#: ../../boot.php:2290 #: ../../boot.php:2344
msgid "Location:" msgid "Location:"
msgstr "" msgstr ""
#: ../../boot.php:2294 #: ../../boot.php:2348
msgid ", " msgid ", "
msgstr "" msgstr ""
#: ../../boot.php:2302 ../../include/profile_advanced.php:23 #: ../../boot.php:2356 ../../include/profile_advanced.php:23
msgid "Gender:" msgid "Gender:"
msgstr "" msgstr ""
#: ../../boot.php:2306 #: ../../boot.php:2360
msgid "Status:" msgid "Status:"
msgstr "" msgstr ""
#: ../../boot.php:2308 ../../include/profile_advanced.php:103 #: ../../boot.php:2362 ../../include/profile_advanced.php:103
msgid "Homepage:" msgid "Homepage:"
msgstr "" msgstr ""
#: ../../boot.php:2399 #: ../../boot.php:2453
msgid "Monday" msgid "Monday"
msgstr "" msgstr ""
#: ../../boot.php:2399 #: ../../boot.php:2453
msgid "Tuesday" msgid "Tuesday"
msgstr "" msgstr ""
#: ../../boot.php:2399 #: ../../boot.php:2453
msgid "Wednesday" msgid "Wednesday"
msgstr "" msgstr ""
#: ../../boot.php:2399 #: ../../boot.php:2453
msgid "Thursday" msgid "Thursday"
msgstr "" msgstr ""
#: ../../boot.php:2399 #: ../../boot.php:2453
msgid "Friday" msgid "Friday"
msgstr "" msgstr ""
#: ../../boot.php:2399 #: ../../boot.php:2453
msgid "Saturday" msgid "Saturday"
msgstr "" msgstr ""
#: ../../boot.php:2399 #: ../../boot.php:2453
msgid "Sunday" msgid "Sunday"
msgstr "" msgstr ""
#: ../../boot.php:2403 #: ../../boot.php:2457
msgid "January" msgid "January"
msgstr "" msgstr ""
#: ../../boot.php:2403 #: ../../boot.php:2457
msgid "February" msgid "February"
msgstr "" msgstr ""
#: ../../boot.php:2403 #: ../../boot.php:2457
msgid "March" msgid "March"
msgstr "" msgstr ""
#: ../../boot.php:2403 #: ../../boot.php:2457
msgid "April" msgid "April"
msgstr "" msgstr ""
#: ../../boot.php:2403 #: ../../boot.php:2457
msgid "May" msgid "May"
msgstr "" msgstr ""
#: ../../boot.php:2403 #: ../../boot.php:2457
msgid "June" msgid "June"
msgstr "" msgstr ""
#: ../../boot.php:2403 #: ../../boot.php:2457
msgid "July" msgid "July"
msgstr "" msgstr ""
#: ../../boot.php:2403 #: ../../boot.php:2457
msgid "August" msgid "August"
msgstr "" msgstr ""
#: ../../boot.php:2403 #: ../../boot.php:2457
msgid "September" msgid "September"
msgstr "" msgstr ""
#: ../../boot.php:2403 #: ../../boot.php:2457
msgid "October" msgid "October"
msgstr "" msgstr ""
#: ../../boot.php:2403 #: ../../boot.php:2457
msgid "November" msgid "November"
msgstr "" msgstr ""
#: ../../boot.php:2403 #: ../../boot.php:2457
msgid "December" msgid "December"
msgstr "" msgstr ""
#: ../../boot.php:2418 #: ../../boot.php:2472
msgid "g A l F d" msgid "g A l F d"
msgstr "" msgstr ""
#: ../../boot.php:2435 #: ../../boot.php:2490
msgid "Birthday Reminders" msgid "Birthday Reminders"
msgstr "" msgstr ""
#: ../../boot.php:2436 #: ../../boot.php:2491
msgid "Birthdays this week:" msgid "Birthdays this week:"
msgstr "" msgstr ""
#: ../../boot.php:2437 #: ../../boot.php:2492
msgid "(Adjusted for local time)" msgid "(Adjusted for local time)"
msgstr "" msgstr ""
#: ../../boot.php:2448 #: ../../boot.php:2503
msgid "[today]" msgid "[today]"
msgstr "" msgstr ""
#: ../../boot.php:2654 #: ../../boot.php:2707
msgid "link to source" msgid "link to source"
msgstr "" msgstr ""
@ -280,18 +280,20 @@ msgid "Select an identity to manage: "
msgstr "" msgstr ""
#: ../../mod/manage.php:106 ../../mod/profiles.php:370 #: ../../mod/manage.php:106 ../../mod/profiles.php:370
#: ../../mod/settings.php:426 ../../mod/photos.php:826 #: ../../mod/settings.php:426 ../../mod/photos.php:830
#: ../../mod/photos.php:883 ../../mod/photos.php:1091 #: ../../mod/photos.php:887 ../../mod/photos.php:1095
#: ../../mod/photos.php:1131 ../../mod/photos.php:1170 #: ../../mod/photos.php:1135 ../../mod/photos.php:1174
#: ../../mod/photos.php:1201 ../../mod/invite.php:68 #: ../../mod/photos.php:1205 ../../mod/invite.php:68
#: ../../mod/contacts.php:264 ../../mod/install.php:133 #: ../../mod/contacts.php:264 ../../mod/install.php:133
#: ../../mod/crepair.php:100 ../../mod/group.php:76 ../../mod/group.php:159 #: ../../mod/crepair.php:100 ../../mod/group.php:76 ../../mod/group.php:159
#: ../../addon/twitter/twitter.php:156 ../../addon/twitter/twitter.php:175 #: ../../addon/twitter/twitter.php:156 ../../addon/twitter/twitter.php:175
#: ../../addon/statusnet/statusnet.php:163 #: ../../addon/statusnet/statusnet.php:216
#: ../../addon/statusnet/statusnet.php:189 #: ../../addon/statusnet/statusnet.php:230
#: ../../addon/statusnet/statusnet.php:207 #: ../../addon/statusnet/statusnet.php:256
#: ../../addon/facebook/facebook.php:293 #: ../../addon/statusnet/statusnet.php:263
#: ../../addon/randplace/randplace.php:179 ../../include/conversation.php:376 #: ../../addon/statusnet/statusnet.php:285
#: ../../addon/facebook/facebook.php:289
#: ../../addon/randplace/randplace.php:179 ../../include/conversation.php:381
msgid "Submit" msgid "Submit"
msgstr "" msgstr ""
@ -301,7 +303,7 @@ msgid "Image exceeds size limit of %d"
msgstr "" msgstr ""
#: ../../mod/wall_upload.php:65 ../../mod/profile_photo.php:118 #: ../../mod/wall_upload.php:65 ../../mod/profile_photo.php:118
#: ../../mod/photos.php:575 #: ../../mod/photos.php:577
msgid "Unable to process image." msgid "Unable to process image."
msgstr "" msgstr ""
@ -312,20 +314,22 @@ msgid "Wall Photos"
msgstr "" msgstr ""
#: ../../mod/wall_upload.php:82 ../../mod/profile_photo.php:241 #: ../../mod/wall_upload.php:82 ../../mod/profile_photo.php:241
#: ../../mod/photos.php:593 #: ../../mod/photos.php:597
msgid "Image upload failed." msgid "Image upload failed."
msgstr "" msgstr ""
#: ../../mod/dfrn_notify.php:189 ../../mod/dfrn_notify.php:405 #: ../../mod/dfrn_notify.php:189 ../../mod/regmod.php:94
#: ../../mod/dfrn_notify.php:495 ../../mod/regmod.php:94
#: ../../mod/register.php:333 ../../mod/register.php:373 #: ../../mod/register.php:333 ../../mod/register.php:373
#: ../../mod/dfrn_request.php:551 ../../mod/lostpass.php:40 #: ../../mod/dfrn_request.php:551 ../../mod/lostpass.php:40
#: ../../mod/lostpass.php:102 ../../mod/item.php:480 ../../mod/item.php:506 #: ../../mod/lostpass.php:102 ../../mod/dfrn_confirm.php:657
#: ../../mod/dfrn_confirm.php:657 ../../include/items.php:1435 #: ../../include/items.php:1449
msgid "Administrator" msgid "Administrator"
msgstr "" msgstr ""
#: ../../mod/dfrn_notify.php:191 #: ../../mod/dfrn_notify.php:191 ../../mod/dfrn_notify.php:396
#: ../../mod/dfrn_notify.php:439 ../../mod/dfrn_notify.php:523
#: ../../mod/dfrn_notify.php:564 ../../mod/item.php:471 ../../mod/item.php:514
#: ../../mod/item.php:534 ../../mod/item.php:575
msgid "noreply" msgid "noreply"
msgstr "" msgstr ""
@ -333,9 +337,14 @@ msgstr ""
msgid "New mail received at " msgid "New mail received at "
msgstr "" msgstr ""
#: ../../mod/dfrn_notify.php:403 ../../mod/dfrn_notify.php:493 #: ../../mod/dfrn_notify.php:438 ../../mod/dfrn_notify.php:563
#, php-format #: ../../mod/item.php:513 ../../mod/item.php:574
msgid "%s commented on an item at %s" msgid "Administrator@"
msgstr ""
#: ../../mod/dfrn_notify.php:441 ../../mod/dfrn_notify.php:566
#: ../../mod/item.php:516 ../../mod/item.php:577
msgid " commented on an item at "
msgstr "" msgstr ""
#: ../../mod/profile.php:112 #: ../../mod/profile.php:112
@ -352,31 +361,43 @@ msgid "Photos"
msgstr "" msgstr ""
#: ../../mod/profile.php:262 ../../mod/display.php:147 #: ../../mod/profile.php:262 ../../mod/display.php:147
#: ../../mod/register.php:450 ../../mod/network.php:259 #: ../../mod/register.php:450 ../../mod/network.php:262
msgid "" msgid ""
"Shared content is covered by the <a href=\"http://creativecommons.org/" "Shared content is covered by the <a href=\"http://creativecommons.org/"
"licenses/by/3.0/\">Creative Commons Attribution 3.0</a> license." "licenses/by/3.0/\">Creative Commons Attribution 3.0</a> license."
msgstr "" msgstr ""
#: ../../mod/follow.php:16 ../../mod/dfrn_request.php:340 #: ../../mod/follow.php:20 ../../mod/dfrn_request.php:340
msgid "Disallowed profile URL." msgid "Disallowed profile URL."
msgstr "" msgstr ""
#: ../../mod/follow.php:39 #: ../../mod/follow.php:43
msgid "The profile address specified does not provide adequate information." msgid "The profile address specified does not provide adequate information."
msgstr "" msgstr ""
#: ../../mod/follow.php:45 #: ../../mod/follow.php:45
msgid "No compatible communication protocols or feeds were discovered."
msgstr ""
#: ../../mod/follow.php:47
msgid "An author or name was not found."
msgstr ""
#: ../../mod/follow.php:49
msgid "No browser URL could be matched to this address."
msgstr ""
#: ../../mod/follow.php:57
msgid "" msgid ""
"Limited profile. This person will be unable to receive direct/personal " "Limited profile. This person will be unable to receive direct/personal "
"notifications from you." "notifications from you."
msgstr "" msgstr ""
#: ../../mod/follow.php:100 #: ../../mod/follow.php:112
msgid "Unable to retrieve contact information." msgid "Unable to retrieve contact information."
msgstr "" msgstr ""
#: ../../mod/follow.php:146 #: ../../mod/follow.php:158
msgid "following" msgid "following"
msgstr "" msgstr ""
@ -387,8 +408,8 @@ msgstr ""
#: ../../mod/profile_photo.php:58 ../../mod/profile_photo.php:65 #: ../../mod/profile_photo.php:58 ../../mod/profile_photo.php:65
#: ../../mod/profile_photo.php:72 ../../mod/profile_photo.php:160 #: ../../mod/profile_photo.php:72 ../../mod/profile_photo.php:160
#: ../../mod/profile_photo.php:236 ../../mod/profile_photo.php:245 #: ../../mod/profile_photo.php:236 ../../mod/profile_photo.php:245
#: ../../mod/photos.php:110 ../../mod/photos.php:535 ../../mod/photos.php:875 #: ../../mod/photos.php:110 ../../mod/photos.php:535 ../../mod/photos.php:879
#: ../../mod/photos.php:890 ../../mod/register.php:288 #: ../../mod/photos.php:894 ../../mod/register.php:288
#: ../../mod/register.php:295 ../../mod/register.php:302 #: ../../mod/register.php:295 ../../mod/register.php:302
msgid "Profile Photos" msgid "Profile Photos"
msgstr "" msgstr ""
@ -665,11 +686,11 @@ msgid ""
"be visible to anybody using the internet." "be visible to anybody using the internet."
msgstr "" msgstr ""
#: ../../mod/profiles.php:421 ../../mod/directory.php:97 #: ../../mod/profiles.php:421 ../../mod/directory.php:112
msgid "Age: " msgid "Age: "
msgstr "" msgstr ""
#: ../../mod/profiles.php:456 ../../include/nav.php:109 #: ../../mod/profiles.php:456 ../../include/nav.php:108
msgid "Profiles" msgid "Profiles"
msgstr "" msgstr ""
@ -730,6 +751,7 @@ msgid "Settings updated."
msgstr "" msgstr ""
#: ../../mod/settings.php:256 ../../mod/settings.php:418 #: ../../mod/settings.php:256 ../../mod/settings.php:418
#: ../../addon/widgets/widgets.php:120
msgid "Plugin Settings" msgid "Plugin Settings"
msgstr "" msgstr ""
@ -951,8 +973,8 @@ msgstr ""
msgid "Email access is disabled on this site." msgid "Email access is disabled on this site."
msgstr "" msgstr ""
#: ../../mod/search.php:13 ../../mod/photos.php:676 ../../mod/display.php:7 #: ../../mod/search.php:13 ../../mod/photos.php:680 ../../mod/display.php:7
#: ../../mod/dfrn_request.php:591 ../../mod/directory.php:18 #: ../../mod/dfrn_request.php:591 ../../mod/directory.php:20
#: ../../mod/viewcontacts.php:16 #: ../../mod/viewcontacts.php:16
msgid "Public access denied." msgid "Public access denied."
msgstr "" msgstr ""
@ -965,12 +987,12 @@ msgstr ""
msgid "Photo Albums" msgid "Photo Albums"
msgstr "" msgstr ""
#: ../../mod/photos.php:38 ../../mod/photos.php:110 ../../mod/photos.php:806 #: ../../mod/photos.php:38 ../../mod/photos.php:110 ../../mod/photos.php:810
#: ../../mod/photos.php:875 ../../mod/photos.php:890 ../../mod/photos.php:1278 #: ../../mod/photos.php:879 ../../mod/photos.php:894 ../../mod/photos.php:1282
#: ../../mod/photos.php:1289 ../../include/Photo.php:233 #: ../../mod/photos.php:1293 ../../include/Photo.php:233
#: ../../include/Photo.php:240 ../../include/Photo.php:247 #: ../../include/Photo.php:240 ../../include/Photo.php:247
#: ../../include/items.php:1027 ../../include/items.php:1030 #: ../../include/items.php:1041 ../../include/items.php:1044
#: ../../include/items.php:1033 #: ../../include/items.php:1047
msgid "Contact Photos" msgid "Contact Photos"
msgstr "" msgstr ""
@ -982,11 +1004,11 @@ msgstr ""
msgid "Album not found." msgid "Album not found."
msgstr "" msgstr ""
#: ../../mod/photos.php:138 ../../mod/photos.php:884 #: ../../mod/photos.php:138 ../../mod/photos.php:888
msgid "Delete Album" msgid "Delete Album"
msgstr "" msgstr ""
#: ../../mod/photos.php:201 ../../mod/photos.php:1092 #: ../../mod/photos.php:201 ../../mod/photos.php:1096
msgid "Delete Photo" msgid "Delete Photo"
msgstr "" msgstr ""
@ -1007,128 +1029,128 @@ msgstr ""
msgid "Image exceeds size limit of " msgid "Image exceeds size limit of "
msgstr "" msgstr ""
#: ../../mod/photos.php:686 #: ../../mod/photos.php:690
msgid "No photos selected" msgid "No photos selected"
msgstr "" msgstr ""
#: ../../mod/photos.php:833 #: ../../mod/photos.php:837
msgid "Upload Photos" msgid "Upload Photos"
msgstr "" msgstr ""
#: ../../mod/photos.php:836 ../../mod/photos.php:879 #: ../../mod/photos.php:840 ../../mod/photos.php:883
msgid "New album name: " msgid "New album name: "
msgstr "" msgstr ""
#: ../../mod/photos.php:837 #: ../../mod/photos.php:841
msgid "or existing album name: " msgid "or existing album name: "
msgstr "" msgstr ""
#: ../../mod/photos.php:839 ../../mod/photos.php:1087 #: ../../mod/photos.php:843 ../../mod/photos.php:1091
msgid "Permissions" msgid "Permissions"
msgstr "" msgstr ""
#: ../../mod/photos.php:894 #: ../../mod/photos.php:898
msgid "Edit Album" msgid "Edit Album"
msgstr "" msgstr ""
#: ../../mod/photos.php:904 ../../mod/photos.php:1307 #: ../../mod/photos.php:908 ../../mod/photos.php:1311
msgid "View Photo" msgid "View Photo"
msgstr "" msgstr ""
#: ../../mod/photos.php:933 #: ../../mod/photos.php:937
msgid "Photo not available" msgid "Photo not available"
msgstr "" msgstr ""
#: ../../mod/photos.php:982 #: ../../mod/photos.php:986
msgid "Edit photo" msgid "Edit photo"
msgstr "" msgstr ""
#: ../../mod/photos.php:983 #: ../../mod/photos.php:987
msgid "Use as profile photo" msgid "Use as profile photo"
msgstr "" msgstr ""
#: ../../mod/photos.php:989 ../../include/conversation.php:309 #: ../../mod/photos.php:993 ../../include/conversation.php:314
msgid "Private Message" msgid "Private Message"
msgstr "" msgstr ""
#: ../../mod/photos.php:996 #: ../../mod/photos.php:1000
msgid "<< Prev" msgid "<< Prev"
msgstr "" msgstr ""
#: ../../mod/photos.php:1000 #: ../../mod/photos.php:1004
msgid "View Full Size" msgid "View Full Size"
msgstr "" msgstr ""
#: ../../mod/photos.php:1005 #: ../../mod/photos.php:1009
msgid "Next >>" msgid "Next >>"
msgstr "" msgstr ""
#: ../../mod/photos.php:1067 #: ../../mod/photos.php:1071
msgid "Tags: " msgid "Tags: "
msgstr "" msgstr ""
#: ../../mod/photos.php:1070 #: ../../mod/photos.php:1074
msgid "[Remove any tag]" msgid "[Remove any tag]"
msgstr "" msgstr ""
#: ../../mod/photos.php:1080 #: ../../mod/photos.php:1084
msgid "New album name" msgid "New album name"
msgstr "" msgstr ""
#: ../../mod/photos.php:1083 #: ../../mod/photos.php:1087
msgid "Caption" msgid "Caption"
msgstr "" msgstr ""
#: ../../mod/photos.php:1085 #: ../../mod/photos.php:1089
msgid "Add a Tag" msgid "Add a Tag"
msgstr "" msgstr ""
#: ../../mod/photos.php:1089 #: ../../mod/photos.php:1093
msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
msgstr "" msgstr ""
#: ../../mod/photos.php:1109 ../../include/conversation.php:357 #: ../../mod/photos.php:1113 ../../include/conversation.php:362
msgid "I like this (toggle)" msgid "I like this (toggle)"
msgstr "" msgstr ""
#: ../../mod/photos.php:1110 ../../include/conversation.php:358 #: ../../mod/photos.php:1114 ../../include/conversation.php:363
msgid "I don't like this (toggle)" msgid "I don't like this (toggle)"
msgstr "" msgstr ""
#: ../../mod/photos.php:1111 ../../include/conversation.php:359 #: ../../mod/photos.php:1115 ../../include/conversation.php:364
#: ../../include/conversation.php:718 #: ../../include/conversation.php:726
msgid "Share" msgid "Share"
msgstr "" msgstr ""
#: ../../mod/photos.php:1112 ../../mod/editpost.php:96 #: ../../mod/photos.php:1116 ../../mod/editpost.php:96
#: ../../mod/message.php:190 ../../mod/message.php:324 #: ../../mod/message.php:190 ../../mod/message.php:324
#: ../../include/conversation.php:360 ../../include/conversation.php:727 #: ../../include/conversation.php:365 ../../include/conversation.php:735
msgid "Please wait" msgid "Please wait"
msgstr "" msgstr ""
#: ../../mod/photos.php:1128 ../../mod/photos.php:1167 #: ../../mod/photos.php:1132 ../../mod/photos.php:1171
#: ../../mod/photos.php:1198 ../../include/conversation.php:373 #: ../../mod/photos.php:1202 ../../include/conversation.php:378
msgid "This is you" msgid "This is you"
msgstr "" msgstr ""
#: ../../mod/photos.php:1228 ../../mod/group.php:146 #: ../../mod/photos.php:1232 ../../mod/group.php:146
#: ../../include/conversation.php:174 ../../include/conversation.php:386 #: ../../include/conversation.php:179 ../../include/conversation.php:391
msgid "Delete" msgid "Delete"
msgstr "" msgstr ""
#: ../../mod/photos.php:1294 #: ../../mod/photos.php:1298
msgid "Recent Photos" msgid "Recent Photos"
msgstr "" msgstr ""
#: ../../mod/photos.php:1298 #: ../../mod/photos.php:1302
msgid "Upload New Photos" msgid "Upload New Photos"
msgstr "" msgstr ""
#: ../../mod/photos.php:1311 #: ../../mod/photos.php:1315
msgid "View Album" msgid "View Album"
msgstr "" msgstr ""
#: ../../mod/display.php:25 ../../mod/display.php:142 ../../mod/item.php:609 #: ../../mod/display.php:25 ../../mod/display.php:142 ../../mod/item.php:680
msgid "Item not found." msgid "Item not found."
msgstr "" msgstr ""
@ -1144,61 +1166,65 @@ msgstr ""
msgid "Edit post" msgid "Edit post"
msgstr "" msgstr ""
#: ../../mod/editpost.php:38 ../../include/conversation.php:673 #: ../../mod/editpost.php:75 ../../include/conversation.php:712
msgid "Visible to <strong>everybody</strong>"
msgstr ""
#: ../../mod/editpost.php:75 ../../include/conversation.php:707
msgid "Post to Email" msgid "Post to Email"
msgstr "" msgstr ""
#: ../../mod/editpost.php:88 ../../include/conversation.php:384 #: ../../mod/editpost.php:88 ../../include/conversation.php:389
#: ../../include/group.php:169 #: ../../include/group.php:169
msgid "Edit" msgid "Edit"
msgstr "" msgstr ""
#: ../../mod/editpost.php:89 ../../mod/message.php:188 #: ../../mod/editpost.php:89 ../../mod/message.php:188
#: ../../mod/message.php:322 ../../include/conversation.php:719 #: ../../mod/message.php:322 ../../include/conversation.php:727
msgid "Upload photo" msgid "Upload photo"
msgstr "" msgstr ""
#: ../../mod/editpost.php:90 ../../mod/message.php:189 #: ../../mod/editpost.php:90 ../../mod/message.php:189
#: ../../mod/message.php:323 ../../include/conversation.php:720 #: ../../mod/message.php:323 ../../include/conversation.php:728
msgid "Insert web link" msgid "Insert web link"
msgstr "" msgstr ""
#: ../../mod/editpost.php:91 ../../include/conversation.php:721 #: ../../mod/editpost.php:91 ../../include/conversation.php:729
msgid "Insert YouTube video" msgid "Insert YouTube video"
msgstr "" msgstr ""
#: ../../mod/editpost.php:92 ../../include/conversation.php:722 #: ../../mod/editpost.php:92 ../../include/conversation.php:730
msgid "Insert Vorbis [.ogg] video" msgid "Insert Vorbis [.ogg] video"
msgstr "" msgstr ""
#: ../../mod/editpost.php:93 ../../include/conversation.php:723 #: ../../mod/editpost.php:93 ../../include/conversation.php:731
msgid "Insert Vorbis [.ogg] audio" msgid "Insert Vorbis [.ogg] audio"
msgstr "" msgstr ""
#: ../../mod/editpost.php:94 ../../include/conversation.php:724 #: ../../mod/editpost.php:94 ../../include/conversation.php:732
msgid "Set your location" msgid "Set your location"
msgstr "" msgstr ""
#: ../../mod/editpost.php:95 ../../include/conversation.php:725 #: ../../mod/editpost.php:95 ../../include/conversation.php:733
msgid "Clear browser location" msgid "Clear browser location"
msgstr "" msgstr ""
#: ../../mod/editpost.php:97 ../../include/conversation.php:728 #: ../../mod/editpost.php:97 ../../include/conversation.php:736
msgid "Permission settings" msgid "Permission settings"
msgstr "" msgstr ""
#: ../../mod/editpost.php:103 ../../include/conversation.php:734 #: ../../mod/editpost.php:105 ../../include/conversation.php:744
msgid "CC: email addresses" msgid "CC: email addresses"
msgstr "" msgstr ""
#: ../../mod/editpost.php:105 ../../include/conversation.php:736 #: ../../mod/editpost.php:106 ../../include/conversation.php:745
msgid "Public post"
msgstr ""
#: ../../mod/editpost.php:108 ../../include/conversation.php:747
msgid "Example: bob@example.com, mary@example.com" msgid "Example: bob@example.com, mary@example.com"
msgstr "" msgstr ""
#: ../../mod/update_network.php:22 ../../mod/update_profile.php:41
msgid "[Embedded content - reload page to view]"
msgstr ""
#: ../../mod/invite.php:28 #: ../../mod/invite.php:28
#, php-format #, php-format
msgid "%s : Not a valid email address." msgid "%s : Not a valid email address."
@ -1450,7 +1476,7 @@ msgid "Currently ignored"
msgstr "" msgstr ""
#: ../../mod/contacts.php:322 ../../include/acl_selectors.php:141 #: ../../mod/contacts.php:322 ../../include/acl_selectors.php:141
#: ../../include/acl_selectors.php:156 ../../include/nav.php:110 #: ../../include/acl_selectors.php:156 ../../include/nav.php:109
msgid "Contacts" msgid "Contacts"
msgstr "" msgstr ""
@ -1462,11 +1488,11 @@ msgstr ""
msgid "Hide Blocked Connections" msgid "Hide Blocked Connections"
msgstr "" msgstr ""
#: ../../mod/contacts.php:326 ../../mod/directory.php:44 #: ../../mod/contacts.php:326 ../../mod/directory.php:55
msgid "Finding: " msgid "Finding: "
msgstr "" msgstr ""
#: ../../mod/contacts.php:327 ../../mod/directory.php:46 #: ../../mod/contacts.php:327 ../../mod/directory.php:57
msgid "Find" msgid "Find"
msgstr "" msgstr ""
@ -1474,7 +1500,7 @@ msgstr ""
msgid "Visit $username's profile" msgid "Visit $username's profile"
msgstr "" msgstr ""
#: ../../mod/contacts.php:388 ../../include/conversation.php:587 #: ../../mod/contacts.php:388 ../../include/conversation.php:592
msgid "Edit contact" msgid "Edit contact"
msgstr "" msgstr ""
@ -1804,41 +1830,37 @@ msgstr ""
#: ../../mod/network.php:64 #: ../../mod/network.php:64
#, php-format #, php-format
msgid "%d member" msgid "Warning: This group contains %s member from an insecure network."
msgid_plural "%d members" msgid_plural ""
"Warning: This group contains %s members from an insecure network."
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: ../../mod/network.php:65 #: ../../mod/network.php:67
#, php-format
msgid "Warning: This group contains %s from an insecure network."
msgstr ""
#: ../../mod/network.php:66
msgid "Private messages to this group are at risk of public disclosure." msgid "Private messages to this group are at risk of public disclosure."
msgstr "" msgstr ""
#: ../../mod/network.php:126 #: ../../mod/network.php:129
msgid "No such group" msgid "No such group"
msgstr "" msgstr ""
#: ../../mod/network.php:137 #: ../../mod/network.php:140
msgid "Group is empty" msgid "Group is empty"
msgstr "" msgstr ""
#: ../../mod/network.php:141 #: ../../mod/network.php:144
msgid "Group: " msgid "Group: "
msgstr "" msgstr ""
#: ../../mod/network.php:151 #: ../../mod/network.php:154
msgid "Contact: " msgid "Contact: "
msgstr "" msgstr ""
#: ../../mod/network.php:153 #: ../../mod/network.php:156
msgid "Private messages to this person are at risk of public disclosure." msgid "Private messages to this person are at risk of public disclosure."
msgstr "" msgstr ""
#: ../../mod/network.php:158 #: ../../mod/network.php:161
msgid "Invalid contact." msgid "Invalid contact."
msgstr "" msgstr ""
@ -2091,7 +2113,7 @@ msgstr ""
msgid "Confirm" msgid "Confirm"
msgstr "" msgstr ""
#: ../../mod/dfrn_request.php:542 ../../include/items.php:1426 #: ../../mod/dfrn_request.php:542 ../../include/items.php:1440
msgid "[Name Withheld]" msgid "[Name Withheld]"
msgstr "" msgstr ""
@ -2156,12 +2178,12 @@ msgstr ""
msgid "Cancel" msgid "Cancel"
msgstr "" msgstr ""
#: ../../mod/like.php:110 ../../addon/facebook/facebook.php:745 #: ../../mod/like.php:110 ../../addon/facebook/facebook.php:759
#: ../../include/conversation.php:20 #: ../../include/conversation.php:20
msgid "status" msgid "status"
msgstr "" msgstr ""
#: ../../mod/like.php:127 ../../addon/facebook/facebook.php:749 #: ../../mod/like.php:127 ../../addon/facebook/facebook.php:763
#: ../../include/conversation.php:25 #: ../../include/conversation.php:25
#, php-format #, php-format
msgid "%1$s likes %2$s's %3$s" msgid "%1$s likes %2$s's %3$s"
@ -2245,58 +2267,74 @@ msgstr ""
msgid "Applications" msgid "Applications"
msgstr "" msgstr ""
#: ../../mod/directory.php:38 #: ../../mod/apps.php:8 ../../mod/notes.php:41
msgid "Private Notes"
msgstr ""
#: ../../mod/notes.php:60
msgid "Save"
msgstr ""
#: ../../mod/directory.php:40
msgid "Global Directory" msgid "Global Directory"
msgstr "" msgstr ""
#: ../../mod/directory.php:45 #: ../../mod/directory.php:46
msgid "Normal site view"
msgstr ""
#: ../../mod/directory.php:48
msgid "View all site entries"
msgstr ""
#: ../../mod/directory.php:56
msgid "Site Directory" msgid "Site Directory"
msgstr "" msgstr ""
#: ../../mod/directory.php:100 #: ../../mod/directory.php:115
msgid "Gender: " msgid "Gender: "
msgstr "" msgstr ""
#: ../../mod/directory.php:126 #: ../../mod/directory.php:141
msgid "No entries (some entries may be hidden)." msgid "No entries (some entries may be hidden)."
msgstr "" msgstr ""
#: ../../mod/friendika.php:12 #: ../../mod/friendika.php:43
msgid "This is Friendika version" msgid "This is Friendika version"
msgstr "" msgstr ""
#: ../../mod/friendika.php:13 #: ../../mod/friendika.php:44
msgid "running at web location" msgid "running at web location"
msgstr "" msgstr ""
#: ../../mod/friendika.php:15 #: ../../mod/friendika.php:46
msgid "" msgid ""
"Shared content within the Friendika network is provided under the <a href=" "Shared content within the Friendika network is provided under the <a href="
"\"http://creativecommons.org/licenses/by/3.0/\">Creative Commons Attribution " "\"http://creativecommons.org/licenses/by/3.0/\">Creative Commons Attribution "
"3.0 license</a>" "3.0 license</a>"
msgstr "" msgstr ""
#: ../../mod/friendika.php:17 #: ../../mod/friendika.php:48
msgid "" msgid ""
"Please visit <a href=\"http://project.friendika.com\">Project.Friendika.com</" "Please visit <a href=\"http://project.friendika.com\">Project.Friendika.com</"
"a> to learn more about the Friendika project." "a> to learn more about the Friendika project."
msgstr "" msgstr ""
#: ../../mod/friendika.php:19 #: ../../mod/friendika.php:50
msgid "Bug reports and issues: please visit" msgid "Bug reports and issues: please visit"
msgstr "" msgstr ""
#: ../../mod/friendika.php:20 #: ../../mod/friendika.php:51
msgid "" msgid ""
"Suggestions, praise, donations, etc. - please email \"Info\" at Friendika - " "Suggestions, praise, donations, etc. - please email \"Info\" at Friendika - "
"dot com" "dot com"
msgstr "" msgstr ""
#: ../../mod/friendika.php:25 #: ../../mod/friendika.php:56
msgid "Installed plugins/addons/apps" msgid "Installed plugins/addons/apps"
msgstr "" msgstr ""
#: ../../mod/friendika.php:33 #: ../../mod/friendika.php:64
msgid "No installed plugins/addons/apps" msgid "No installed plugins/addons/apps"
msgstr "" msgstr ""
@ -2308,38 +2346,28 @@ msgstr ""
msgid "Empty post discarded." msgid "Empty post discarded."
msgstr "" msgstr ""
#: ../../mod/item.php:478 #: ../../mod/item.php:605
#, php-format
msgid "%s commented on your item at %s"
msgstr ""
#: ../../mod/item.php:504
#, php-format
msgid "%s posted on your profile wall at %s"
msgstr ""
#: ../../mod/item.php:534
msgid "System error. Post not saved." msgid "System error. Post not saved."
msgstr "" msgstr ""
#: ../../mod/item.php:553 #: ../../mod/item.php:624
#, php-format #, php-format
msgid "" msgid ""
"This message was sent to you by %s, a member of the Friendika social network." "This message was sent to you by %s, a member of the Friendika social network."
msgstr "" msgstr ""
#: ../../mod/item.php:555 #: ../../mod/item.php:626
#, php-format #, php-format
msgid "You may visit them online at %s" msgid "You may visit them online at %s"
msgstr "" msgstr ""
#: ../../mod/item.php:556 #: ../../mod/item.php:627
msgid "" msgid ""
"Please contact the sender by replying to this post if you do not wish to " "Please contact the sender by replying to this post if you do not wish to "
"receive these messages." "receive these messages."
msgstr "" msgstr ""
#: ../../mod/item.php:558 #: ../../mod/item.php:629
#, php-format #, php-format
msgid "%s posted an update." msgid "%s posted an update."
msgstr "" msgstr ""
@ -2380,7 +2408,7 @@ msgstr ""
msgid "Message could not be sent." msgid "Message could not be sent."
msgstr "" msgstr ""
#: ../../mod/message.php:125 ../../include/nav.php:102 #: ../../mod/message.php:125 ../../include/nav.php:101
msgid "Messages" msgid "Messages"
msgstr "" msgstr ""
@ -2404,7 +2432,7 @@ msgstr ""
msgid "Conversation removed." msgid "Conversation removed."
msgstr "" msgstr ""
#: ../../mod/message.php:172 ../../include/conversation.php:674 #: ../../mod/message.php:172 ../../include/conversation.php:679
msgid "Please enter a link URL:" msgid "Please enter a link URL:"
msgstr "" msgstr ""
@ -2576,11 +2604,11 @@ msgstr ""
msgid "Group Editor" msgid "Group Editor"
msgstr "" msgstr ""
#: ../../mod/group.php:169 #: ../../mod/group.php:172
msgid "Members" msgid "Members"
msgstr "" msgstr ""
#: ../../mod/group.php:183 #: ../../mod/group.php:186
msgid "All Contacts" msgid "All Contacts"
msgstr "" msgstr ""
@ -2623,7 +2651,7 @@ msgstr ""
msgid "Copy the PIN from Twitter here" msgid "Copy the PIN from Twitter here"
msgstr "" msgstr ""
#: ../../addon/twitter/twitter.php:165 ../../addon/statusnet/statusnet.php:197 #: ../../addon/twitter/twitter.php:165 ../../addon/statusnet/statusnet.php:271
msgid "Currently connected to: " msgid "Currently connected to: "
msgstr "" msgstr ""
@ -2637,7 +2665,7 @@ msgstr ""
msgid "Send public postings to Twitter" msgid "Send public postings to Twitter"
msgstr "" msgstr ""
#: ../../addon/twitter/twitter.php:172 ../../addon/statusnet/statusnet.php:204 #: ../../addon/twitter/twitter.php:172 ../../addon/statusnet/statusnet.php:282
msgid "Clear OAuth configuration" msgid "Clear OAuth configuration"
msgstr "" msgstr ""
@ -2645,11 +2673,40 @@ msgstr ""
msgid "Post to StatusNet" msgid "Post to StatusNet"
msgstr "" msgstr ""
#: ../../addon/statusnet/statusnet.php:146 #: ../../addon/statusnet/statusnet.php:117
msgid ""
"Please contact your site administrator.<br />The provided API URL is not "
"valid."
msgstr ""
#: ../../addon/statusnet/statusnet.php:145
msgid "We could not contact the StatusNet API with the Path you entered."
msgstr ""
#: ../../addon/statusnet/statusnet.php:172
msgid "StatusNet settings updated."
msgstr ""
#: ../../addon/statusnet/statusnet.php:195
msgid "StatusNet Posting Settings" msgid "StatusNet Posting Settings"
msgstr "" msgstr ""
#: ../../addon/statusnet/statusnet.php:152 #: ../../addon/statusnet/statusnet.php:209
msgid "Globally Available StatusNet OAuthKeys"
msgstr ""
#: ../../addon/statusnet/statusnet.php:210
msgid ""
"There are preconfigured OAuth key pairs for some StatusNet servers "
"available. If you are useing one of them, please use these credentials. If "
"not feel free to connect to any other StatusNet instance (see below)."
msgstr ""
#: ../../addon/statusnet/statusnet.php:218
msgid "Provide your own OAuth Credentials"
msgstr ""
#: ../../addon/statusnet/statusnet.php:219
msgid "" msgid ""
"No consumer key pair for StatusNet found. Register your Friendika Account as " "No consumer key pair for StatusNet found. Register your Friendika Account as "
"an desktop client on your StatusNet account, copy the consumer key pair here " "an desktop client on your StatusNet account, copy the consumer key pair here "
@ -2658,19 +2715,19 @@ msgid ""
"installation at your favorited StatusNet installation." "installation at your favorited StatusNet installation."
msgstr "" msgstr ""
#: ../../addon/statusnet/statusnet.php:154 #: ../../addon/statusnet/statusnet.php:221
msgid "OAuth Consumer Key" msgid "OAuth Consumer Key"
msgstr "" msgstr ""
#: ../../addon/statusnet/statusnet.php:157 #: ../../addon/statusnet/statusnet.php:224
msgid "OAuth Consumer Secret" msgid "OAuth Consumer Secret"
msgstr "" msgstr ""
#: ../../addon/statusnet/statusnet.php:160 #: ../../addon/statusnet/statusnet.php:227
msgid "Base API Path (remember the trailing /)" msgid "Base API Path (remember the trailing /)"
msgstr "" msgstr ""
#: ../../addon/statusnet/statusnet.php:181 #: ../../addon/statusnet/statusnet.php:248
msgid "" msgid ""
"To connect to your StatusNet account click the button below to get a " "To connect to your StatusNet account click the button below to get a "
"security code from StatusNet which you have to copy into the input box below " "security code from StatusNet which you have to copy into the input box below "
@ -2678,22 +2735,38 @@ msgid ""
"to StatusNet." "to StatusNet."
msgstr "" msgstr ""
#: ../../addon/statusnet/statusnet.php:182 #: ../../addon/statusnet/statusnet.php:249
msgid "Log in with StatusNet" msgid "Log in with StatusNet"
msgstr "" msgstr ""
#: ../../addon/statusnet/statusnet.php:184 #: ../../addon/statusnet/statusnet.php:251
msgid "Copy the security code from StatusNet here" msgid "Copy the security code from StatusNet here"
msgstr "" msgstr ""
#: ../../addon/statusnet/statusnet.php:198 #: ../../addon/statusnet/statusnet.php:257
msgid "" msgid "Cancel Connection Process"
"If enabled all your <strong>public</strong> postings will be posted to the "
"associated StatusNet account as well."
msgstr "" msgstr ""
#: ../../addon/statusnet/statusnet.php:200 #: ../../addon/statusnet/statusnet.php:259
msgid "Send public postings to StatusNet" msgid "Current StatusNet API is"
msgstr ""
#: ../../addon/statusnet/statusnet.php:260
msgid "Cancel StatusNet Connection"
msgstr ""
#: ../../addon/statusnet/statusnet.php:272
msgid ""
"If enabled all your <strong>public</strong> postings will be posted to the "
"associated StatusNet account."
msgstr ""
#: ../../addon/statusnet/statusnet.php:274
msgid "Allow posting to StatusNet"
msgstr ""
#: ../../addon/statusnet/statusnet.php:277
msgid "Send public postings to StatusNet by default"
msgstr "" msgstr ""
#: ../../addon/tictac/tictac.php:14 #: ../../addon/tictac/tictac.php:14
@ -2759,60 +2832,72 @@ msgid ""
"Use the following controls only if the Java uploader [above] fails to launch." "Use the following controls only if the Java uploader [above] fails to launch."
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:252 #: ../../addon/facebook/facebook.php:248
msgid "Facebook disabled" msgid "Facebook disabled"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:257 #: ../../addon/facebook/facebook.php:253
msgid "Updating contacts" msgid "Updating contacts"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:266 #: ../../addon/facebook/facebook.php:262
msgid "Facebook API key is missing." msgid "Facebook API key is missing."
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:273 #: ../../addon/facebook/facebook.php:269
msgid "Facebook Connect" msgid "Facebook Connect"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:279 #: ../../addon/facebook/facebook.php:275
msgid "Install Facebook connector for this account." msgid "Install Facebook connector for this account."
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:286 #: ../../addon/facebook/facebook.php:282
msgid "Remove Facebook connector" msgid "Remove Facebook connector"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:292 #: ../../addon/facebook/facebook.php:288
msgid "Post to Facebook by default" msgid "Post to Facebook by default"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:354 #: ../../addon/facebook/facebook.php:350
msgid "Facebook" msgid "Facebook"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:355 #: ../../addon/facebook/facebook.php:351
msgid "Facebook Connector Settings" msgid "Facebook Connector Settings"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:369 #: ../../addon/facebook/facebook.php:365
msgid "Post to Facebook" msgid "Post to Facebook"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:436 #: ../../addon/facebook/facebook.php:434
msgid "" msgid ""
"Post to Facebook cancelled because of multi-network access permission " "Post to Facebook cancelled because of multi-network access permission "
"conflict." "conflict."
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:491 #: ../../addon/facebook/facebook.php:500
msgid "Image: " msgid "Image: "
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:551 #: ../../addon/facebook/facebook.php:561
msgid "View on Friendika" msgid "View on Friendika"
msgstr "" msgstr ""
#: ../../addon/widgets/widgets.php:38
msgid "Widgets key: "
msgstr ""
#: ../../addon/widgets/widgets.php:42
msgid "Generate new key"
msgstr ""
#: ../../addon/widgets/widget_friends.php:30
msgid "Connect on Friendika!"
msgstr ""
#: ../../addon/randplace/randplace.php:171 #: ../../addon/randplace/randplace.php:171
msgid "Randplace Settings" msgid "Randplace Settings"
msgstr "" msgstr ""
@ -3121,6 +3206,10 @@ msgstr ""
msgid "Visible To:" msgid "Visible To:"
msgstr "" msgstr ""
#: ../../include/acl_selectors.php:133
msgid "everybody"
msgstr ""
#: ../../include/acl_selectors.php:137 ../../include/acl_selectors.php:152 #: ../../include/acl_selectors.php:137 ../../include/acl_selectors.php:152
msgid "Groups" msgid "Groups"
msgstr "" msgstr ""
@ -3137,6 +3226,10 @@ msgstr ""
msgid "Image/photo" msgid "Image/photo"
msgstr "" msgstr ""
#: ../../include/poller.php:380
msgid "From: "
msgstr ""
#: ../../include/datetime.php:44 ../../include/datetime.php:46 #: ../../include/datetime.php:44 ../../include/datetime.php:46
msgid "Miscellaneous" msgid "Miscellaneous"
msgstr "" msgstr ""
@ -3201,7 +3294,7 @@ msgstr ""
msgid " ago" msgid " ago"
msgstr "" msgstr ""
#: ../../include/profile_advanced.php:36 ../../include/items.php:1072 #: ../../include/profile_advanced.php:36 ../../include/items.php:1086
msgid "Birthday:" msgid "Birthday:"
msgstr "" msgstr ""
@ -3265,7 +3358,7 @@ msgstr ""
msgid "School/education:" msgid "School/education:"
msgstr "" msgstr ""
#: ../../include/nav.php:55 ../../include/nav.php:93 #: ../../include/nav.php:55 ../../include/nav.php:92
msgid "Home" msgid "Home"
msgstr "" msgstr ""
@ -3273,137 +3366,141 @@ msgstr ""
msgid "Apps" msgid "Apps"
msgstr "" msgstr ""
#: ../../include/nav.php:81 #: ../../include/nav.php:80
msgid "Directory" msgid "Directory"
msgstr "" msgstr ""
#: ../../include/nav.php:91 #: ../../include/nav.php:90
msgid "Network" msgid "Network"
msgstr "" msgstr ""
#: ../../include/nav.php:99 #: ../../include/nav.php:98
msgid "Notifications" msgid "Notifications"
msgstr "" msgstr ""
#: ../../include/nav.php:105 #: ../../include/nav.php:104
msgid "Manage" msgid "Manage"
msgstr "" msgstr ""
#: ../../include/nav.php:108 #: ../../include/nav.php:107
msgid "Settings" msgid "Settings"
msgstr "" msgstr ""
#: ../../include/conversation.php:184 ../../include/conversation.php:441 #: ../../include/conversation.php:189 ../../include/conversation.php:446
#: ../../include/conversation.php:442 #: ../../include/conversation.php:447
#, php-format #, php-format
msgid "View %s's profile" msgid "View %s's profile"
msgstr "" msgstr ""
#: ../../include/conversation.php:200 #: ../../include/conversation.php:205
msgid "View in context" msgid "View in context"
msgstr "" msgstr ""
#: ../../include/conversation.php:271 #: ../../include/conversation.php:276
msgid "See more posts like this" msgid "See more posts like this"
msgstr "" msgstr ""
#: ../../include/conversation.php:296 #: ../../include/conversation.php:301
#, php-format #, php-format
msgid "See all %d comments" msgid "See all %d comments"
msgstr "" msgstr ""
#: ../../include/conversation.php:443 #: ../../include/conversation.php:448
msgid "to" msgid "to"
msgstr "" msgstr ""
#: ../../include/conversation.php:444 #: ../../include/conversation.php:449
msgid "Wall-to-Wall" msgid "Wall-to-Wall"
msgstr "" msgstr ""
#: ../../include/conversation.php:445 #: ../../include/conversation.php:450
msgid "via Wall-To-Wall:" msgid "via Wall-To-Wall:"
msgstr "" msgstr ""
#: ../../include/conversation.php:583 #: ../../include/conversation.php:588
msgid "View status" msgid "View status"
msgstr "" msgstr ""
#: ../../include/conversation.php:584 #: ../../include/conversation.php:589
msgid "View profile" msgid "View profile"
msgstr "" msgstr ""
#: ../../include/conversation.php:585 #: ../../include/conversation.php:590
msgid "View photos" msgid "View photos"
msgstr "" msgstr ""
#: ../../include/conversation.php:586 #: ../../include/conversation.php:591
msgid "View recent" msgid "View recent"
msgstr "" msgstr ""
#: ../../include/conversation.php:588 #: ../../include/conversation.php:593
msgid "Send PM" msgid "Send PM"
msgstr "" msgstr ""
#: ../../include/conversation.php:638 #: ../../include/conversation.php:643
#, php-format #, php-format
msgid "%s likes this." msgid "%s likes this."
msgstr "" msgstr ""
#: ../../include/conversation.php:638 #: ../../include/conversation.php:643
#, php-format #, php-format
msgid "%s doesn't like this." msgid "%s doesn't like this."
msgstr "" msgstr ""
#: ../../include/conversation.php:642 #: ../../include/conversation.php:647
#, php-format #, php-format
msgid "<span %1$s>%2$d people</span> like this." msgid "<span %1$s>%2$d people</span> like this."
msgstr "" msgstr ""
#: ../../include/conversation.php:644 #: ../../include/conversation.php:649
#, php-format #, php-format
msgid "<span %1$s>%2$d people</span> don't like this." msgid "<span %1$s>%2$d people</span> don't like this."
msgstr "" msgstr ""
#: ../../include/conversation.php:650 #: ../../include/conversation.php:655
msgid "and" msgid "and"
msgstr "" msgstr ""
#: ../../include/conversation.php:653 #: ../../include/conversation.php:658
#, php-format #, php-format
msgid ", and %d other people" msgid ", and %d other people"
msgstr "" msgstr ""
#: ../../include/conversation.php:654 #: ../../include/conversation.php:659
#, php-format #, php-format
msgid "%s like this." msgid "%s like this."
msgstr "" msgstr ""
#: ../../include/conversation.php:654 #: ../../include/conversation.php:659
#, php-format #, php-format
msgid "%s don't like this." msgid "%s don't like this."
msgstr "" msgstr ""
#: ../../include/conversation.php:675 #: ../../include/conversation.php:678
msgid "Visible to <strong>everybody</strong>"
msgstr ""
#: ../../include/conversation.php:680
msgid "Please enter a YouTube link:" msgid "Please enter a YouTube link:"
msgstr "" msgstr ""
#: ../../include/conversation.php:676 #: ../../include/conversation.php:681
msgid "Please enter a video(.ogg) link/URL:" msgid "Please enter a video(.ogg) link/URL:"
msgstr "" msgstr ""
#: ../../include/conversation.php:677 #: ../../include/conversation.php:682
msgid "Please enter an audio(.ogg) link/URL:" msgid "Please enter an audio(.ogg) link/URL:"
msgstr "" msgstr ""
#: ../../include/conversation.php:678 #: ../../include/conversation.php:683
msgid "Where are you right now?" msgid "Where are you right now?"
msgstr "" msgstr ""
#: ../../include/conversation.php:679 #: ../../include/conversation.php:684
msgid "Enter a title for this item" msgid "Enter a title for this item"
msgstr "" msgstr ""
#: ../../include/conversation.php:726 #: ../../include/conversation.php:734
msgid "Set title" msgid "Set title"
msgstr "" msgstr ""
@ -3412,7 +3509,7 @@ msgstr ""
msgid "Cannot locate DNS info for database server '%s'" msgid "Cannot locate DNS info for database server '%s'"
msgstr "" msgstr ""
#: ../../include/items.php:1433 #: ../../include/items.php:1447
msgid "You have a new follower at " msgid "You have a new follower at "
msgstr "" msgstr ""

4
view/settings_nick_set.tpl
View file

@ -1,7 +1,5 @@
<div id="settings-nick-wrapper" > <div id="settings-nick-wrapper" >
<p id="settings-nickname-desc"> <div id="settings-nickname-desc" class="info-message">$desc <strong>'$nickname@$basepath'</strong>$subdir</div>
<div class="error-message">$desc <strong>'$nickname@$basepath'</strong>$subdir</div>
</p>
</div> </div>
<div id="settings-nick-end" ></div> <div id="settings-nick-end" ></div>

15
view/theme/dispy/style.css
View file

@ -171,6 +171,18 @@ nav .nav-link {
#home-update { background-position: -90px 0px; } #home-update { background-position: -90px 0px; }
/** sysmsg **/ /** sysmsg **/
#sysmsg_info{
position:fixed;
bottom: 0px; right:20%;
-moz-box-shadow: 0px 0px 5px #888;
-webkit-box-shadow: 0px 0px 5px #888;
box-shadow: 0px 0px 5px #888;
padding: 10px;
background-color: #fcaf3e; border:2px solid #f8911b;
border-bottom:0px;
padding-bottom: 50px;
z-index: 1000;
}
#sysmsg { #sysmsg {
position:fixed; position:fixed;
bottom: 0px; right:10%; bottom: 0px; right:10%;
@ -183,12 +195,15 @@ nav .nav-link {
padding-bottom: 50px; padding-bottom: 50px;
z-index: 1000; z-index: 1000;
} }
#sysmsg_info br,
#sysmsg br { #sysmsg br {
display:block; display:block;
margin:2px 0px; margin:2px 0px;
border-top: 1px solid #ccccce; border-top: 1px solid #ccccce;
} }
/** /**
* aside * aside
**/ **/

8
view/theme/duepuntozero/style.css
View file

@ -93,6 +93,14 @@ nav #site-location {
padding: 10px; padding: 10px;
} }
.info-message {
color: #204a87;
font-size: 1.1em;
border: 1px solid #3465a4;
background-color: #d7e3f1;
padding: 10px;
}
nav #banner { nav #banner {
display: block; display: block;

8
view/theme/loozah/style.css
View file

@ -290,6 +290,14 @@ nav {
background-color: #FFEEEE; background-color: #FFEEEE;
padding: 10px; padding: 10px;
} }
.info-message {
color: #204a87;
font-size: 1.1em;
border: 1px solid #3465a4;
background-color: #d7e3f1;
padding: 10px;
}
.nav-link { .nav-link {
float: right; float: right;