Merge branch 'fabrixxm-master'
Conflicts: boot.php
This commit is contained in:
Friendika
commit
78b2db3a98
34 changed files with 475 additions and 330 deletions
|
|
@ -245,12 +245,12 @@ function facebook_content(&$a) {
|
|||
|
||||
if($a->argc > 1 && $a->argv[1] === 'remove') {
|
||||
del_pconfig(local_user(),'facebook','post');
|
||||
notice( t('Facebook disabled') . EOL);
|
||||
info( t('Facebook disabled') . EOL);
|
||||
}
|
||||
|
||||
if($a->argc > 1 && $a->argv[1] === 'friends') {
|
||||
fb_get_friends(local_user());
|
||||
notice( t('Updating contacts') . EOL);
|
||||
info( t('Updating contacts') . EOL);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -169,7 +169,7 @@ function statusnet_settings_post ($a,$post) {
|
|||
// 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_by_default',intval($_POST['statusnet-default']));
|
||||
notice( t('StatusNet settings updated.') . EOL);
|
||||
info( t('StatusNet settings updated.') . EOL);
|
||||
}}}}
|
||||
}
|
||||
function statusnet_settings(&$a,&$s) {
|
||||
|
|
|
|||
7
boot.php
7
boot.php
|
|
@ -1007,6 +1007,13 @@ function notice($s) {
|
|||
if($a->interactive)
|
||||
$_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
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
|
|||
// process logout request
|
||||
|
||||
nuke_session();
|
||||
notice( t('Logged out.') . EOL);
|
||||
info( t('Logged out.') . EOL);
|
||||
goaway($a->get_baseurl());
|
||||
}
|
||||
|
||||
|
|
@ -205,11 +205,11 @@ else {
|
|||
if($a->user['login_date'] === '0000-00-00 00:00:00') {
|
||||
$_SESSION['return_url'] = 'profile_photo/new';
|
||||
$a->module = 'profile_photo';
|
||||
notice( t("Welcome ") . $a->user['username'] . EOL);
|
||||
notice( t('Please upload a profile photo.') . EOL);
|
||||
info( t("Welcome ") . $a->user['username'] . EOL);
|
||||
info( t('Please upload a profile photo.') . EOL);
|
||||
}
|
||||
else
|
||||
notice( t("Welcome back ") . $a->user['username'] . EOL);
|
||||
info( t("Welcome back ") . $a->user['username'] . EOL);
|
||||
|
||||
if(strlen($a->user['timezone'])) {
|
||||
date_default_timezone_set($a->user['timezone']);
|
||||
|
|
|
|||
11
index.php
11
index.php
|
|
@ -110,6 +110,9 @@ if(! x($_SESSION,'authenticated'))
|
|||
if(! x($_SESSION,'sysmsg'))
|
||||
$_SESSION['sysmsg'] = '';
|
||||
|
||||
if(! x($_SESSION,'sysmsg_info'))
|
||||
$_SESSION['sysmsg_info'] = '';
|
||||
|
||||
/*
|
||||
* 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
|
||||
|
|
@ -262,8 +265,16 @@ if(stristr($_SESSION['sysmsg'], t('Permission denied'))) {
|
|||
if(x($_SESSION,'sysmsg')) {
|
||||
$a->page['content'] = "<div id=\"sysmsg\" class=\"error-message\">{$_SESSION['sysmsg']}</div>\r\n"
|
||||
. ((x($a->page,'content')) ? $a->page['content'] : '');
|
||||
$_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']);
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ logger('contact_edit ' . print_r($_POST,true));
|
|||
intval(local_user())
|
||||
);
|
||||
if($r)
|
||||
notice( t('Contact updated.') . EOL);
|
||||
info( t('Contact updated.') . EOL);
|
||||
else
|
||||
notice( t('Failed to update contact record.') . EOL);
|
||||
return;
|
||||
|
|
@ -143,7 +143,7 @@ function contacts_content(&$a) {
|
|||
);
|
||||
if($r) {
|
||||
//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);
|
||||
return; // NOTREACHED
|
||||
|
|
@ -157,7 +157,7 @@ function contacts_content(&$a) {
|
|||
intval(local_user())
|
||||
);
|
||||
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);
|
||||
return; // NOTREACHED
|
||||
|
|
@ -197,7 +197,7 @@ function contacts_content(&$a) {
|
|||
|
||||
|
||||
contact_remove($contact_id);
|
||||
notice( t('Contact has been removed.') . EOL );
|
||||
info( t('Contact has been removed.') . EOL );
|
||||
goaway($a->get_baseurl() . '/contacts');
|
||||
return; // NOTREACHED
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ function crepair_post(&$a) {
|
|||
);
|
||||
|
||||
if($r)
|
||||
notice( t('Contact settings applied.') . EOL);
|
||||
info( t('Contact settings applied.') . EOL);
|
||||
else
|
||||
notice( t('Contact update failed.') . EOL);
|
||||
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ function dfrn_poll_init(&$a) {
|
|||
$_SESSION['visitor_id'] = $r[0]['id'];
|
||||
$_SESSION['visitor_home'] = $r[0]['url'];
|
||||
$_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.
|
||||
$session_id = session_id();
|
||||
$expire = time() + 86400;
|
||||
|
|
@ -507,7 +507,7 @@ function dfrn_poll_content(&$a) {
|
|||
$_SESSION['visitor_id'] = $r[0]['id'];
|
||||
$_SESSION['visitor_home'] = $r[0]['url'];
|
||||
$_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.
|
||||
$session_id = session_id();
|
||||
$expire = time() + 86400;
|
||||
|
|
|
|||
|
|
@ -165,7 +165,7 @@ function dfrn_request_post(&$a) {
|
|||
}
|
||||
|
||||
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.
|
||||
|
||||
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.
|
||||
|
||||
|
|
@ -478,7 +478,7 @@ function dfrn_request_content(&$a) {
|
|||
if(x($_GET,'dfrn_url')) {
|
||||
|
||||
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 */
|
||||
|
||||
|
|
|
|||
|
|
@ -138,7 +138,7 @@ function directory_content(&$a) {
|
|||
|
||||
}
|
||||
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;
|
||||
}
|
||||
|
|
@ -24,7 +24,7 @@ function group_post(&$a) {
|
|||
$name = notags(trim($_POST['groupname']));
|
||||
$r = group_add(local_user(),$name);
|
||||
if($r) {
|
||||
notice( t('Group created.') . EOL );
|
||||
info( t('Group created.') . EOL );
|
||||
$r = group_byname(local_user(),$name);
|
||||
if($r)
|
||||
goaway($a->get_baseurl() . '/group/' . $r);
|
||||
|
|
@ -53,7 +53,7 @@ function group_post(&$a) {
|
|||
intval($group['id'])
|
||||
);
|
||||
if($r)
|
||||
notice( t('Group name changed.') . EOL );
|
||||
info( t('Group name changed.') . EOL );
|
||||
}
|
||||
|
||||
$a->page['aside'] = group_side();
|
||||
|
|
@ -87,7 +87,7 @@ function group_content(&$a) {
|
|||
if(count($r))
|
||||
$result = group_rmv(local_user(),$r[0]['name']);
|
||||
if($result)
|
||||
notice( t('Group removed.') . EOL);
|
||||
info( t('Group removed.') . EOL);
|
||||
else
|
||||
notice( t('Unable to remove group.') . EOL);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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');
|
||||
$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();
|
||||
|
|
|
|||
|
|
@ -125,7 +125,7 @@ function item_post(&$a) {
|
|||
$pubmail_enable = ((x($_POST,'pubmail_enable') && intval($_POST['pubmail_enable']) && (! $private)) ? 1 : 0);
|
||||
|
||||
if(! strlen($body)) {
|
||||
notice( t('Empty post discarded.') . EOL );
|
||||
info( t('Empty post discarded.') . EOL );
|
||||
if(x($_POST,'return'))
|
||||
goaway($a->get_baseurl() . "/" . $_POST['return'] );
|
||||
killme();
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ function lostpass_post(&$a) {
|
|||
intval($uid)
|
||||
);
|
||||
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 = replace_macros($email_tpl, array(
|
||||
|
|
@ -85,7 +85,7 @@ function lostpass_content(&$a) {
|
|||
'$baseurl' => $a->get_baseurl()
|
||||
|
||||
));
|
||||
notice("Your password has been reset." . EOL);
|
||||
info("Your password has been reset." . EOL);
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ function manage_post(&$a) {
|
|||
$_SESSION['page_flags'] = $r[0]['page-flags'];
|
||||
$_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];
|
||||
|
||||
if(strlen($a->user['timezone'])) {
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ function match_content(&$a) {
|
|||
$o .= '<div id="profile-match-wrapper-end"></div>';
|
||||
}
|
||||
else {
|
||||
notice( t('No matches') . EOL);
|
||||
info( t('No matches') . EOL);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ function message_post(&$a) {
|
|||
|
||||
if($post_id) {
|
||||
proc_run('php',"include/notifier.php","mail","$post_id");
|
||||
notice( t('Message sent.') . EOL );
|
||||
info( t('Message sent.') . EOL );
|
||||
}
|
||||
else {
|
||||
notice( t('Message could not be sent.') . EOL );
|
||||
|
|
@ -139,7 +139,7 @@ function message_content(&$a) {
|
|||
intval(local_user())
|
||||
);
|
||||
if($r) {
|
||||
notice( t('Message deleted.') . EOL );
|
||||
info( t('Message deleted.') . EOL );
|
||||
}
|
||||
goaway($a->get_baseurl() . '/message' );
|
||||
}
|
||||
|
|
@ -155,7 +155,7 @@ function message_content(&$a) {
|
|||
intval(local_user())
|
||||
);
|
||||
if($r)
|
||||
notice( t('Conversation removed.') . EOL );
|
||||
info( t('Conversation removed.') . EOL );
|
||||
}
|
||||
goaway($a->get_baseurl() . '/message' );
|
||||
}
|
||||
|
|
@ -221,7 +221,7 @@ function message_content(&$a) {
|
|||
intval($a->pager['itemspage'])
|
||||
);
|
||||
if(! count($r)) {
|
||||
notice( t('No messages.') . EOL);
|
||||
info( t('No messages.') . EOL);
|
||||
return $o;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -61,8 +61,9 @@ function network_content(&$a, $update = 0) {
|
|||
if(! $update) {
|
||||
if(group) {
|
||||
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( t('Warning: This group contains %s from an insecure network.'), $plural_form ) . EOL);
|
||||
notice( sprintf( tt('Warning: This group contains %s member from an insecure network.',
|
||||
'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);
|
||||
}
|
||||
}
|
||||
|
|
@ -136,7 +137,7 @@ function network_content(&$a, $update = 0) {
|
|||
}
|
||||
else {
|
||||
$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) . ">' )) ";
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@ function notifications_content(&$a) {
|
|||
}
|
||||
}
|
||||
else
|
||||
notice( t('No notifications.') . EOL);
|
||||
info( t('No notifications.') . EOL);
|
||||
|
||||
if ($a->config['register_policy'] == REGISTER_APPROVE &&
|
||||
$a->config['admin_email'] === $a->user['email']){
|
||||
|
|
@ -156,7 +156,7 @@ function notifications_content(&$a) {
|
|||
$o .= "</ul>";
|
||||
}
|
||||
else
|
||||
notice( t('No registrations.') . EOL);
|
||||
info( t('No registrations.') . EOL);
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ function oexchange_content(&$a) {
|
|||
}
|
||||
|
||||
if(($a->argc > 1) && $a->argv[1] === 'done') {
|
||||
notice( t('Post successful.') . EOL);
|
||||
info( t('Post successful.') . EOL);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -75,11 +75,11 @@ function openid_content(&$a) {
|
|||
if($a->user['login_date'] === '0000-00-00 00:00:00') {
|
||||
$_SESSION['return_url'] = 'profile_photo/new';
|
||||
$a->module = 'profile_photo';
|
||||
notice( t("Welcome ") . $a->user['username'] . EOL);
|
||||
notice( t('Please upload a profile photo.') . EOL);
|
||||
info( t("Welcome ") . $a->user['username'] . EOL);
|
||||
info( t('Please upload a profile photo.') . EOL);
|
||||
}
|
||||
else
|
||||
notice( t("Welcome back ") . $a->user['username'] . EOL);
|
||||
info( t("Welcome back ") . $a->user['username'] . EOL);
|
||||
|
||||
|
||||
if(strlen($a->user['timezone'])) {
|
||||
|
|
|
|||
|
|
@ -236,7 +236,7 @@ function profile_photo_crop_ui_head(&$a, $ph){
|
|||
$r = $ph->store(local_user(), 0 , $hash, $filename, t('Profile Photos'), 0 );
|
||||
|
||||
if($r)
|
||||
notice( t('Image uploaded successfully.') . EOL );
|
||||
info( t('Image uploaded successfully.') . EOL );
|
||||
else
|
||||
notice( t('Image upload failed.') . EOL );
|
||||
|
||||
|
|
|
|||
|
|
@ -196,7 +196,7 @@ function profiles_post(&$a) {
|
|||
);
|
||||
|
||||
if($r)
|
||||
notice( t('Profile updated.') . EOL);
|
||||
info( t('Profile updated.') . EOL);
|
||||
|
||||
|
||||
if($namechanged && $is_default) {
|
||||
|
|
@ -251,7 +251,7 @@ function profiles_content(&$a) {
|
|||
intval(local_user())
|
||||
);
|
||||
if($r)
|
||||
notice( t('Profile deleted.') . EOL);
|
||||
info( t('Profile deleted.') . EOL);
|
||||
|
||||
goaway($a->get_baseurl() . '/profiles');
|
||||
return; // NOTREACHED
|
||||
|
|
@ -286,7 +286,7 @@ function profiles_content(&$a) {
|
|||
dbesc($name)
|
||||
);
|
||||
|
||||
notice( t('New profile created.') . EOL);
|
||||
info( t('New profile created.') . EOL);
|
||||
if(count($r3) == 1)
|
||||
goaway($a->get_baseurl() . '/profiles/' . $r3[0]['id']);
|
||||
goaway($a->get_baseurl() . '/profiles');
|
||||
|
|
@ -325,7 +325,7 @@ function profiles_content(&$a) {
|
|||
intval(local_user()),
|
||||
dbesc($name)
|
||||
);
|
||||
notice( t('New profile created.') . EOL);
|
||||
info( t('New profile created.') . EOL);
|
||||
if(count($r3) == 1)
|
||||
goaway($a->get_baseurl() . '/profiles/' . $r3[0]['id']);
|
||||
goaway($a->get_baseurl() . '/profiles');
|
||||
|
|
|
|||
|
|
@ -336,7 +336,7 @@ function register_post(&$a) {
|
|||
|
||||
|
||||
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());
|
||||
}
|
||||
else {
|
||||
|
|
@ -374,7 +374,7 @@ function register_post(&$a) {
|
|||
. 'Content-type: text/plain; charset=UTF-8' . "\n"
|
||||
. 'Content-transfer-encoding: 8bit' );
|
||||
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());
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ function regmod_content(&$a) {
|
|||
$_SESSION['return_url'] = $a->cmd;
|
||||
|
||||
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);
|
||||
return $o;
|
||||
}
|
||||
|
|
@ -96,7 +96,7 @@ function regmod_content(&$a) {
|
|||
. 'Content-transfer-encoding: 8bit' );
|
||||
|
||||
if($res) {
|
||||
notice( t('Account approved.') . EOL );
|
||||
info( t('Account approved.') . EOL );
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ function search_content(&$a) {
|
|||
$a->set_pager_total($r[0]['total']);
|
||||
|
||||
if(! $r[0]['total']) {
|
||||
notice( t('No results.') . EOL);
|
||||
info( t('No results.') . EOL);
|
||||
return $o;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ function settings_post(&$a) {
|
|||
intval(local_user())
|
||||
);
|
||||
if($r)
|
||||
notice( t('Password changed.') . EOL);
|
||||
info( t('Password changed.') . EOL);
|
||||
else
|
||||
notice( t('Password update failed. Please try again.') . EOL);
|
||||
}
|
||||
|
|
@ -203,7 +203,7 @@ function settings_post(&$a) {
|
|||
intval(local_user())
|
||||
);
|
||||
if($r)
|
||||
notice( t('Settings updated.') . EOL);
|
||||
info( t('Settings updated.') . EOL);
|
||||
|
||||
$r = q("UPDATE `profile`
|
||||
SET `publish` = %d, `net-publish` = %d
|
||||
|
|
@ -374,7 +374,7 @@ function settings_content(&$a) {
|
|||
? true : false);
|
||||
|
||||
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" >';
|
||||
|
|
@ -485,7 +485,7 @@ function settings_content(&$a) {
|
|||
'$imap_replyto' => $mail_replyto,
|
||||
'$lbl_imap7' => t('Send public posts to all email contacts:'),
|
||||
'$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
|
||||
));
|
||||
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ function tagrm_post(&$a) {
|
|||
intval(local_user())
|
||||
);
|
||||
|
||||
notice( t('Tag removed') . EOL );
|
||||
info( t('Tag removed') . EOL );
|
||||
goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
|
||||
|
||||
// NOTREACHED
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ function viewcontacts_content(&$a) {
|
|||
intval($a->pager['itemspage'])
|
||||
);
|
||||
if(! count($r)) {
|
||||
notice( t('No contacts.') . EOL );
|
||||
info( t('No contacts.') . EOL );
|
||||
return $o;
|
||||
}
|
||||
|
||||
|
|
|
|||
609
util/messages.po
609
util/messages.po
|
|
@ -6,9 +6,9 @@
|
|||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: 2.2.975\n"
|
||||
"Project-Id-Version: 2.2.988\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"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
|
@ -18,33 +18,33 @@ msgstr ""
|
|||
"Content-Transfer-Encoding: 8bit\n"
|
||||
#"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
|
||||
|
||||
#: ../../index.php:210
|
||||
#: ../../index.php:213
|
||||
msgid "Not Found"
|
||||
msgstr ""
|
||||
|
||||
#: ../../index.php:211
|
||||
#: ../../index.php:214
|
||||
msgid "Page not found."
|
||||
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"
|
||||
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/profile_photo.php:133 ../../mod/profile_photo.php:144
|
||||
#: ../../mod/profile_photo.php:155 ../../mod/regmod.php:16
|
||||
#: ../../mod/profiles.php:7 ../../mod/profiles.php:227
|
||||
#: ../../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/invite.php:54 ../../mod/contacts.php:106
|
||||
#: ../../mod/register.php:25 ../../mod/install.php:93 ../../mod/network.php:6
|
||||
#: ../../mod/notifications.php:56 ../../mod/crepair.php:54
|
||||
#: ../../mod/item.php:57 ../../mod/item.php:680 ../../mod/message.php:8
|
||||
#: ../../mod/message.php:116 ../../mod/dfrn_confirm.php:53
|
||||
#: ../../mod/viewcontacts.php:21 ../../mod/group.php:19
|
||||
#: ../../addon/facebook/facebook.php:246
|
||||
#: ../../mod/notes.php:20 ../../mod/item.php:57 ../../mod/item.php:751
|
||||
#: ../../mod/message.php:8 ../../mod/message.php:116
|
||||
#: ../../mod/dfrn_confirm.php:53 ../../mod/viewcontacts.php:21
|
||||
#: ../../mod/group.php:19 ../../addon/facebook/facebook.php:242
|
||||
msgid "Permission denied."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -52,8 +52,8 @@ msgstr ""
|
|||
msgid "Delete this item?"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:386 ../../mod/photos.php:1130 ../../mod/photos.php:1169
|
||||
#: ../../mod/photos.php:1200 ../../include/conversation.php:375
|
||||
#: ../../boot.php:386 ../../mod/photos.php:1134 ../../mod/photos.php:1173
|
||||
#: ../../mod/photos.php:1204 ../../include/conversation.php:380
|
||||
msgid "Comment"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -97,166 +97,166 @@ msgstr ""
|
|||
msgid "Logout"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:1106
|
||||
#: ../../boot.php:1113
|
||||
msgid "prev"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:1108
|
||||
#: ../../boot.php:1115
|
||||
msgid "first"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:1137
|
||||
#: ../../boot.php:1144
|
||||
msgid "last"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:1140
|
||||
#: ../../boot.php:1147
|
||||
msgid "next"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:2001
|
||||
#: ../../boot.php:2046
|
||||
msgid "No contacts"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:2009
|
||||
#: ../../boot.php:2054
|
||||
#, php-format
|
||||
msgid "%d Contact"
|
||||
msgid_plural "%d Contacts"
|
||||
msgstr[0] ""
|
||||
msgstr[1] ""
|
||||
|
||||
#: ../../boot.php:2014 ../../mod/viewcontacts.php:25
|
||||
#: ../../boot.php:2059 ../../mod/viewcontacts.php:25
|
||||
msgid "View Contacts"
|
||||
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"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:2216 ../../mod/profile.php:11
|
||||
#: ../../boot.php:2270 ../../mod/profile.php:11
|
||||
msgid "No profile"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:2275
|
||||
#: ../../boot.php:2329
|
||||
msgid "Connect"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:2290
|
||||
#: ../../boot.php:2344
|
||||
msgid "Location:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:2294
|
||||
#: ../../boot.php:2348
|
||||
msgid ", "
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:2302 ../../include/profile_advanced.php:23
|
||||
#: ../../boot.php:2356 ../../include/profile_advanced.php:23
|
||||
msgid "Gender:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:2306
|
||||
#: ../../boot.php:2360
|
||||
msgid "Status:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:2308 ../../include/profile_advanced.php:103
|
||||
#: ../../boot.php:2362 ../../include/profile_advanced.php:103
|
||||
msgid "Homepage:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:2399
|
||||
#: ../../boot.php:2453
|
||||
msgid "Monday"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:2399
|
||||
#: ../../boot.php:2453
|
||||
msgid "Tuesday"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:2399
|
||||
#: ../../boot.php:2453
|
||||
msgid "Wednesday"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:2399
|
||||
#: ../../boot.php:2453
|
||||
msgid "Thursday"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:2399
|
||||
#: ../../boot.php:2453
|
||||
msgid "Friday"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:2399
|
||||
#: ../../boot.php:2453
|
||||
msgid "Saturday"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:2399
|
||||
#: ../../boot.php:2453
|
||||
msgid "Sunday"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:2403
|
||||
#: ../../boot.php:2457
|
||||
msgid "January"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:2403
|
||||
#: ../../boot.php:2457
|
||||
msgid "February"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:2403
|
||||
#: ../../boot.php:2457
|
||||
msgid "March"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:2403
|
||||
#: ../../boot.php:2457
|
||||
msgid "April"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:2403
|
||||
#: ../../boot.php:2457
|
||||
msgid "May"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:2403
|
||||
#: ../../boot.php:2457
|
||||
msgid "June"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:2403
|
||||
#: ../../boot.php:2457
|
||||
msgid "July"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:2403
|
||||
#: ../../boot.php:2457
|
||||
msgid "August"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:2403
|
||||
#: ../../boot.php:2457
|
||||
msgid "September"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:2403
|
||||
#: ../../boot.php:2457
|
||||
msgid "October"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:2403
|
||||
#: ../../boot.php:2457
|
||||
msgid "November"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:2403
|
||||
#: ../../boot.php:2457
|
||||
msgid "December"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:2418
|
||||
#: ../../boot.php:2472
|
||||
msgid "g A l F d"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:2435
|
||||
#: ../../boot.php:2490
|
||||
msgid "Birthday Reminders"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:2436
|
||||
#: ../../boot.php:2491
|
||||
msgid "Birthdays this week:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:2437
|
||||
#: ../../boot.php:2492
|
||||
msgid "(Adjusted for local time)"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:2448
|
||||
#: ../../boot.php:2503
|
||||
msgid "[today]"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:2654
|
||||
#: ../../boot.php:2707
|
||||
msgid "link to source"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -280,18 +280,20 @@ msgid "Select an identity to manage: "
|
|||
msgstr ""
|
||||
|
||||
#: ../../mod/manage.php:106 ../../mod/profiles.php:370
|
||||
#: ../../mod/settings.php:426 ../../mod/photos.php:826
|
||||
#: ../../mod/photos.php:883 ../../mod/photos.php:1091
|
||||
#: ../../mod/photos.php:1131 ../../mod/photos.php:1170
|
||||
#: ../../mod/photos.php:1201 ../../mod/invite.php:68
|
||||
#: ../../mod/settings.php:426 ../../mod/photos.php:830
|
||||
#: ../../mod/photos.php:887 ../../mod/photos.php:1095
|
||||
#: ../../mod/photos.php:1135 ../../mod/photos.php:1174
|
||||
#: ../../mod/photos.php:1205 ../../mod/invite.php:68
|
||||
#: ../../mod/contacts.php:264 ../../mod/install.php:133
|
||||
#: ../../mod/crepair.php:100 ../../mod/group.php:76 ../../mod/group.php:159
|
||||
#: ../../addon/twitter/twitter.php:156 ../../addon/twitter/twitter.php:175
|
||||
#: ../../addon/statusnet/statusnet.php:163
|
||||
#: ../../addon/statusnet/statusnet.php:189
|
||||
#: ../../addon/statusnet/statusnet.php:207
|
||||
#: ../../addon/facebook/facebook.php:293
|
||||
#: ../../addon/randplace/randplace.php:179 ../../include/conversation.php:376
|
||||
#: ../../addon/statusnet/statusnet.php:216
|
||||
#: ../../addon/statusnet/statusnet.php:230
|
||||
#: ../../addon/statusnet/statusnet.php:256
|
||||
#: ../../addon/statusnet/statusnet.php:263
|
||||
#: ../../addon/statusnet/statusnet.php:285
|
||||
#: ../../addon/facebook/facebook.php:289
|
||||
#: ../../addon/randplace/randplace.php:179 ../../include/conversation.php:381
|
||||
msgid "Submit"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -301,7 +303,7 @@ msgid "Image exceeds size limit of %d"
|
|||
msgstr ""
|
||||
|
||||
#: ../../mod/wall_upload.php:65 ../../mod/profile_photo.php:118
|
||||
#: ../../mod/photos.php:575
|
||||
#: ../../mod/photos.php:577
|
||||
msgid "Unable to process image."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -312,20 +314,22 @@ msgid "Wall Photos"
|
|||
msgstr ""
|
||||
|
||||
#: ../../mod/wall_upload.php:82 ../../mod/profile_photo.php:241
|
||||
#: ../../mod/photos.php:593
|
||||
#: ../../mod/photos.php:597
|
||||
msgid "Image upload failed."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/dfrn_notify.php:189 ../../mod/dfrn_notify.php:405
|
||||
#: ../../mod/dfrn_notify.php:495 ../../mod/regmod.php:94
|
||||
#: ../../mod/dfrn_notify.php:189 ../../mod/regmod.php:94
|
||||
#: ../../mod/register.php:333 ../../mod/register.php:373
|
||||
#: ../../mod/dfrn_request.php:551 ../../mod/lostpass.php:40
|
||||
#: ../../mod/lostpass.php:102 ../../mod/item.php:480 ../../mod/item.php:506
|
||||
#: ../../mod/dfrn_confirm.php:657 ../../include/items.php:1435
|
||||
#: ../../mod/lostpass.php:102 ../../mod/dfrn_confirm.php:657
|
||||
#: ../../include/items.php:1449
|
||||
msgid "Administrator"
|
||||
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"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -333,9 +337,14 @@ msgstr ""
|
|||
msgid "New mail received at "
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/dfrn_notify.php:403 ../../mod/dfrn_notify.php:493
|
||||
#, php-format
|
||||
msgid "%s commented on an item at %s"
|
||||
#: ../../mod/dfrn_notify.php:438 ../../mod/dfrn_notify.php:563
|
||||
#: ../../mod/item.php:513 ../../mod/item.php:574
|
||||
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 ""
|
||||
|
||||
#: ../../mod/profile.php:112
|
||||
|
|
@ -352,31 +361,43 @@ msgid "Photos"
|
|||
msgstr ""
|
||||
|
||||
#: ../../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 ""
|
||||
"Shared content is covered by the <a href=\"http://creativecommons.org/"
|
||||
"licenses/by/3.0/\">Creative Commons Attribution 3.0</a> license."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/follow.php:16 ../../mod/dfrn_request.php:340
|
||||
#: ../../mod/follow.php:20 ../../mod/dfrn_request.php:340
|
||||
msgid "Disallowed profile URL."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/follow.php:39
|
||||
#: ../../mod/follow.php:43
|
||||
msgid "The profile address specified does not provide adequate information."
|
||||
msgstr ""
|
||||
|
||||
#: ../../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 ""
|
||||
"Limited profile. This person will be unable to receive direct/personal "
|
||||
"notifications from you."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/follow.php:100
|
||||
#: ../../mod/follow.php:112
|
||||
msgid "Unable to retrieve contact information."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/follow.php:146
|
||||
#: ../../mod/follow.php:158
|
||||
msgid "following"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -387,8 +408,8 @@ msgstr ""
|
|||
#: ../../mod/profile_photo.php:58 ../../mod/profile_photo.php:65
|
||||
#: ../../mod/profile_photo.php:72 ../../mod/profile_photo.php:160
|
||||
#: ../../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:890 ../../mod/register.php:288
|
||||
#: ../../mod/photos.php:110 ../../mod/photos.php:535 ../../mod/photos.php:879
|
||||
#: ../../mod/photos.php:894 ../../mod/register.php:288
|
||||
#: ../../mod/register.php:295 ../../mod/register.php:302
|
||||
msgid "Profile Photos"
|
||||
msgstr ""
|
||||
|
|
@ -665,11 +686,11 @@ msgid ""
|
|||
"be visible to anybody using the internet."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/profiles.php:421 ../../mod/directory.php:97
|
||||
#: ../../mod/profiles.php:421 ../../mod/directory.php:112
|
||||
msgid "Age: "
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/profiles.php:456 ../../include/nav.php:109
|
||||
#: ../../mod/profiles.php:456 ../../include/nav.php:108
|
||||
msgid "Profiles"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -730,6 +751,7 @@ msgid "Settings updated."
|
|||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:256 ../../mod/settings.php:418
|
||||
#: ../../addon/widgets/widgets.php:120
|
||||
msgid "Plugin Settings"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -951,8 +973,8 @@ msgstr ""
|
|||
msgid "Email access is disabled on this site."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/search.php:13 ../../mod/photos.php:676 ../../mod/display.php:7
|
||||
#: ../../mod/dfrn_request.php:591 ../../mod/directory.php:18
|
||||
#: ../../mod/search.php:13 ../../mod/photos.php:680 ../../mod/display.php:7
|
||||
#: ../../mod/dfrn_request.php:591 ../../mod/directory.php:20
|
||||
#: ../../mod/viewcontacts.php:16
|
||||
msgid "Public access denied."
|
||||
msgstr ""
|
||||
|
|
@ -965,12 +987,12 @@ msgstr ""
|
|||
msgid "Photo Albums"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:38 ../../mod/photos.php:110 ../../mod/photos.php:806
|
||||
#: ../../mod/photos.php:875 ../../mod/photos.php:890 ../../mod/photos.php:1278
|
||||
#: ../../mod/photos.php:1289 ../../include/Photo.php:233
|
||||
#: ../../mod/photos.php:38 ../../mod/photos.php:110 ../../mod/photos.php:810
|
||||
#: ../../mod/photos.php:879 ../../mod/photos.php:894 ../../mod/photos.php:1282
|
||||
#: ../../mod/photos.php:1293 ../../include/Photo.php:233
|
||||
#: ../../include/Photo.php:240 ../../include/Photo.php:247
|
||||
#: ../../include/items.php:1027 ../../include/items.php:1030
|
||||
#: ../../include/items.php:1033
|
||||
#: ../../include/items.php:1041 ../../include/items.php:1044
|
||||
#: ../../include/items.php:1047
|
||||
msgid "Contact Photos"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -982,11 +1004,11 @@ msgstr ""
|
|||
msgid "Album not found."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:138 ../../mod/photos.php:884
|
||||
#: ../../mod/photos.php:138 ../../mod/photos.php:888
|
||||
msgid "Delete Album"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:201 ../../mod/photos.php:1092
|
||||
#: ../../mod/photos.php:201 ../../mod/photos.php:1096
|
||||
msgid "Delete Photo"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1007,128 +1029,128 @@ msgstr ""
|
|||
msgid "Image exceeds size limit of "
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:686
|
||||
#: ../../mod/photos.php:690
|
||||
msgid "No photos selected"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:833
|
||||
#: ../../mod/photos.php:837
|
||||
msgid "Upload Photos"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:836 ../../mod/photos.php:879
|
||||
#: ../../mod/photos.php:840 ../../mod/photos.php:883
|
||||
msgid "New album name: "
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:837
|
||||
#: ../../mod/photos.php:841
|
||||
msgid "or existing album name: "
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:839 ../../mod/photos.php:1087
|
||||
#: ../../mod/photos.php:843 ../../mod/photos.php:1091
|
||||
msgid "Permissions"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:894
|
||||
#: ../../mod/photos.php:898
|
||||
msgid "Edit Album"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:904 ../../mod/photos.php:1307
|
||||
#: ../../mod/photos.php:908 ../../mod/photos.php:1311
|
||||
msgid "View Photo"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:933
|
||||
#: ../../mod/photos.php:937
|
||||
msgid "Photo not available"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:982
|
||||
#: ../../mod/photos.php:986
|
||||
msgid "Edit photo"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:983
|
||||
#: ../../mod/photos.php:987
|
||||
msgid "Use as profile photo"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:989 ../../include/conversation.php:309
|
||||
#: ../../mod/photos.php:993 ../../include/conversation.php:314
|
||||
msgid "Private Message"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:996
|
||||
#: ../../mod/photos.php:1000
|
||||
msgid "<< Prev"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1000
|
||||
#: ../../mod/photos.php:1004
|
||||
msgid "View Full Size"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1005
|
||||
#: ../../mod/photos.php:1009
|
||||
msgid "Next >>"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1067
|
||||
#: ../../mod/photos.php:1071
|
||||
msgid "Tags: "
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1070
|
||||
#: ../../mod/photos.php:1074
|
||||
msgid "[Remove any tag]"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1080
|
||||
#: ../../mod/photos.php:1084
|
||||
msgid "New album name"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1083
|
||||
#: ../../mod/photos.php:1087
|
||||
msgid "Caption"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1085
|
||||
#: ../../mod/photos.php:1089
|
||||
msgid "Add a Tag"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1089
|
||||
#: ../../mod/photos.php:1093
|
||||
msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1109 ../../include/conversation.php:357
|
||||
#: ../../mod/photos.php:1113 ../../include/conversation.php:362
|
||||
msgid "I like this (toggle)"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1110 ../../include/conversation.php:358
|
||||
#: ../../mod/photos.php:1114 ../../include/conversation.php:363
|
||||
msgid "I don't like this (toggle)"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1111 ../../include/conversation.php:359
|
||||
#: ../../include/conversation.php:718
|
||||
#: ../../mod/photos.php:1115 ../../include/conversation.php:364
|
||||
#: ../../include/conversation.php:726
|
||||
msgid "Share"
|
||||
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
|
||||
#: ../../include/conversation.php:360 ../../include/conversation.php:727
|
||||
#: ../../include/conversation.php:365 ../../include/conversation.php:735
|
||||
msgid "Please wait"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1128 ../../mod/photos.php:1167
|
||||
#: ../../mod/photos.php:1198 ../../include/conversation.php:373
|
||||
#: ../../mod/photos.php:1132 ../../mod/photos.php:1171
|
||||
#: ../../mod/photos.php:1202 ../../include/conversation.php:378
|
||||
msgid "This is you"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1228 ../../mod/group.php:146
|
||||
#: ../../include/conversation.php:174 ../../include/conversation.php:386
|
||||
#: ../../mod/photos.php:1232 ../../mod/group.php:146
|
||||
#: ../../include/conversation.php:179 ../../include/conversation.php:391
|
||||
msgid "Delete"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1294
|
||||
#: ../../mod/photos.php:1298
|
||||
msgid "Recent Photos"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1298
|
||||
#: ../../mod/photos.php:1302
|
||||
msgid "Upload New Photos"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1311
|
||||
#: ../../mod/photos.php:1315
|
||||
msgid "View Album"
|
||||
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."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1144,61 +1166,65 @@ msgstr ""
|
|||
msgid "Edit post"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/editpost.php:38 ../../include/conversation.php:673
|
||||
msgid "Visible to <strong>everybody</strong>"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/editpost.php:75 ../../include/conversation.php:707
|
||||
#: ../../mod/editpost.php:75 ../../include/conversation.php:712
|
||||
msgid "Post to Email"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/editpost.php:88 ../../include/conversation.php:384
|
||||
#: ../../mod/editpost.php:88 ../../include/conversation.php:389
|
||||
#: ../../include/group.php:169
|
||||
msgid "Edit"
|
||||
msgstr ""
|
||||
|
||||
#: ../../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"
|
||||
msgstr ""
|
||||
|
||||
#: ../../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"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/editpost.php:91 ../../include/conversation.php:721
|
||||
#: ../../mod/editpost.php:91 ../../include/conversation.php:729
|
||||
msgid "Insert YouTube video"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/editpost.php:92 ../../include/conversation.php:722
|
||||
#: ../../mod/editpost.php:92 ../../include/conversation.php:730
|
||||
msgid "Insert Vorbis [.ogg] video"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/editpost.php:93 ../../include/conversation.php:723
|
||||
#: ../../mod/editpost.php:93 ../../include/conversation.php:731
|
||||
msgid "Insert Vorbis [.ogg] audio"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/editpost.php:94 ../../include/conversation.php:724
|
||||
#: ../../mod/editpost.php:94 ../../include/conversation.php:732
|
||||
msgid "Set your location"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/editpost.php:95 ../../include/conversation.php:725
|
||||
#: ../../mod/editpost.php:95 ../../include/conversation.php:733
|
||||
msgid "Clear browser location"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/editpost.php:97 ../../include/conversation.php:728
|
||||
#: ../../mod/editpost.php:97 ../../include/conversation.php:736
|
||||
msgid "Permission settings"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/editpost.php:103 ../../include/conversation.php:734
|
||||
#: ../../mod/editpost.php:105 ../../include/conversation.php:744
|
||||
msgid "CC: email addresses"
|
||||
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"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/update_network.php:22 ../../mod/update_profile.php:41
|
||||
msgid "[Embedded content - reload page to view]"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/invite.php:28
|
||||
#, php-format
|
||||
msgid "%s : Not a valid email address."
|
||||
|
|
@ -1450,7 +1476,7 @@ msgid "Currently ignored"
|
|||
msgstr ""
|
||||
|
||||
#: ../../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"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1462,11 +1488,11 @@ msgstr ""
|
|||
msgid "Hide Blocked Connections"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/contacts.php:326 ../../mod/directory.php:44
|
||||
#: ../../mod/contacts.php:326 ../../mod/directory.php:55
|
||||
msgid "Finding: "
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/contacts.php:327 ../../mod/directory.php:46
|
||||
#: ../../mod/contacts.php:327 ../../mod/directory.php:57
|
||||
msgid "Find"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1474,7 +1500,7 @@ msgstr ""
|
|||
msgid "Visit $username's profile"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/contacts.php:388 ../../include/conversation.php:587
|
||||
#: ../../mod/contacts.php:388 ../../include/conversation.php:592
|
||||
msgid "Edit contact"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1804,41 +1830,37 @@ msgstr ""
|
|||
|
||||
#: ../../mod/network.php:64
|
||||
#, php-format
|
||||
msgid "%d member"
|
||||
msgid_plural "%d members"
|
||||
msgid "Warning: This group contains %s member from an insecure network."
|
||||
msgid_plural ""
|
||||
"Warning: This group contains %s members from an insecure network."
|
||||
msgstr[0] ""
|
||||
msgstr[1] ""
|
||||
|
||||
#: ../../mod/network.php:65
|
||||
#, php-format
|
||||
msgid "Warning: This group contains %s from an insecure network."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/network.php:66
|
||||
#: ../../mod/network.php:67
|
||||
msgid "Private messages to this group are at risk of public disclosure."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/network.php:126
|
||||
#: ../../mod/network.php:129
|
||||
msgid "No such group"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/network.php:137
|
||||
#: ../../mod/network.php:140
|
||||
msgid "Group is empty"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/network.php:141
|
||||
#: ../../mod/network.php:144
|
||||
msgid "Group: "
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/network.php:151
|
||||
#: ../../mod/network.php:154
|
||||
msgid "Contact: "
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/network.php:153
|
||||
#: ../../mod/network.php:156
|
||||
msgid "Private messages to this person are at risk of public disclosure."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/network.php:158
|
||||
#: ../../mod/network.php:161
|
||||
msgid "Invalid contact."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2091,7 +2113,7 @@ msgstr ""
|
|||
msgid "Confirm"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/dfrn_request.php:542 ../../include/items.php:1426
|
||||
#: ../../mod/dfrn_request.php:542 ../../include/items.php:1440
|
||||
msgid "[Name Withheld]"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2156,12 +2178,12 @@ msgstr ""
|
|||
msgid "Cancel"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/like.php:110 ../../addon/facebook/facebook.php:745
|
||||
#: ../../mod/like.php:110 ../../addon/facebook/facebook.php:759
|
||||
#: ../../include/conversation.php:20
|
||||
msgid "status"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/like.php:127 ../../addon/facebook/facebook.php:749
|
||||
#: ../../mod/like.php:127 ../../addon/facebook/facebook.php:763
|
||||
#: ../../include/conversation.php:25
|
||||
#, php-format
|
||||
msgid "%1$s likes %2$s's %3$s"
|
||||
|
|
@ -2245,58 +2267,74 @@ msgstr ""
|
|||
msgid "Applications"
|
||||
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"
|
||||
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"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/directory.php:100
|
||||
#: ../../mod/directory.php:115
|
||||
msgid "Gender: "
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/directory.php:126
|
||||
#: ../../mod/directory.php:141
|
||||
msgid "No entries (some entries may be hidden)."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/friendika.php:12
|
||||
#: ../../mod/friendika.php:43
|
||||
msgid "This is Friendika version"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/friendika.php:13
|
||||
#: ../../mod/friendika.php:44
|
||||
msgid "running at web location"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/friendika.php:15
|
||||
#: ../../mod/friendika.php:46
|
||||
msgid ""
|
||||
"Shared content within the Friendika network is provided under the <a href="
|
||||
"\"http://creativecommons.org/licenses/by/3.0/\">Creative Commons Attribution "
|
||||
"3.0 license</a>"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/friendika.php:17
|
||||
#: ../../mod/friendika.php:48
|
||||
msgid ""
|
||||
"Please visit <a href=\"http://project.friendika.com\">Project.Friendika.com</"
|
||||
"a> to learn more about the Friendika project."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/friendika.php:19
|
||||
#: ../../mod/friendika.php:50
|
||||
msgid "Bug reports and issues: please visit"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/friendika.php:20
|
||||
#: ../../mod/friendika.php:51
|
||||
msgid ""
|
||||
"Suggestions, praise, donations, etc. - please email \"Info\" at Friendika - "
|
||||
"dot com"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/friendika.php:25
|
||||
#: ../../mod/friendika.php:56
|
||||
msgid "Installed plugins/addons/apps"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/friendika.php:33
|
||||
#: ../../mod/friendika.php:64
|
||||
msgid "No installed plugins/addons/apps"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2308,38 +2346,28 @@ msgstr ""
|
|||
msgid "Empty post discarded."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/item.php:478
|
||||
#, 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
|
||||
#: ../../mod/item.php:605
|
||||
msgid "System error. Post not saved."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/item.php:553
|
||||
#: ../../mod/item.php:624
|
||||
#, php-format
|
||||
msgid ""
|
||||
"This message was sent to you by %s, a member of the Friendika social network."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/item.php:555
|
||||
#: ../../mod/item.php:626
|
||||
#, php-format
|
||||
msgid "You may visit them online at %s"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/item.php:556
|
||||
#: ../../mod/item.php:627
|
||||
msgid ""
|
||||
"Please contact the sender by replying to this post if you do not wish to "
|
||||
"receive these messages."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/item.php:558
|
||||
#: ../../mod/item.php:629
|
||||
#, php-format
|
||||
msgid "%s posted an update."
|
||||
msgstr ""
|
||||
|
|
@ -2380,7 +2408,7 @@ msgstr ""
|
|||
msgid "Message could not be sent."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/message.php:125 ../../include/nav.php:102
|
||||
#: ../../mod/message.php:125 ../../include/nav.php:101
|
||||
msgid "Messages"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2404,7 +2432,7 @@ msgstr ""
|
|||
msgid "Conversation removed."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/message.php:172 ../../include/conversation.php:674
|
||||
#: ../../mod/message.php:172 ../../include/conversation.php:679
|
||||
msgid "Please enter a link URL:"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2576,11 +2604,11 @@ msgstr ""
|
|||
msgid "Group Editor"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/group.php:169
|
||||
#: ../../mod/group.php:172
|
||||
msgid "Members"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/group.php:183
|
||||
#: ../../mod/group.php:186
|
||||
msgid "All Contacts"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2623,7 +2651,7 @@ msgstr ""
|
|||
msgid "Copy the PIN from Twitter here"
|
||||
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: "
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2637,7 +2665,7 @@ msgstr ""
|
|||
msgid "Send public postings to Twitter"
|
||||
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"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2645,11 +2673,40 @@ msgstr ""
|
|||
msgid "Post to StatusNet"
|
||||
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"
|
||||
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 ""
|
||||
"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 "
|
||||
|
|
@ -2658,19 +2715,19 @@ msgid ""
|
|||
"installation at your favorited StatusNet installation."
|
||||
msgstr ""
|
||||
|
||||
#: ../../addon/statusnet/statusnet.php:154
|
||||
#: ../../addon/statusnet/statusnet.php:221
|
||||
msgid "OAuth Consumer Key"
|
||||
msgstr ""
|
||||
|
||||
#: ../../addon/statusnet/statusnet.php:157
|
||||
#: ../../addon/statusnet/statusnet.php:224
|
||||
msgid "OAuth Consumer Secret"
|
||||
msgstr ""
|
||||
|
||||
#: ../../addon/statusnet/statusnet.php:160
|
||||
#: ../../addon/statusnet/statusnet.php:227
|
||||
msgid "Base API Path (remember the trailing /)"
|
||||
msgstr ""
|
||||
|
||||
#: ../../addon/statusnet/statusnet.php:181
|
||||
#: ../../addon/statusnet/statusnet.php:248
|
||||
msgid ""
|
||||
"To connect to your StatusNet account click the button below to get a "
|
||||
"security code from StatusNet which you have to copy into the input box below "
|
||||
|
|
@ -2678,22 +2735,38 @@ msgid ""
|
|||
"to StatusNet."
|
||||
msgstr ""
|
||||
|
||||
#: ../../addon/statusnet/statusnet.php:182
|
||||
#: ../../addon/statusnet/statusnet.php:249
|
||||
msgid "Log in with StatusNet"
|
||||
msgstr ""
|
||||
|
||||
#: ../../addon/statusnet/statusnet.php:184
|
||||
#: ../../addon/statusnet/statusnet.php:251
|
||||
msgid "Copy the security code from StatusNet here"
|
||||
msgstr ""
|
||||
|
||||
#: ../../addon/statusnet/statusnet.php:198
|
||||
msgid ""
|
||||
"If enabled all your <strong>public</strong> postings will be posted to the "
|
||||
"associated StatusNet account as well."
|
||||
#: ../../addon/statusnet/statusnet.php:257
|
||||
msgid "Cancel Connection Process"
|
||||
msgstr ""
|
||||
|
||||
#: ../../addon/statusnet/statusnet.php:200
|
||||
msgid "Send public postings to StatusNet"
|
||||
#: ../../addon/statusnet/statusnet.php:259
|
||||
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 ""
|
||||
|
||||
#: ../../addon/tictac/tictac.php:14
|
||||
|
|
@ -2759,60 +2832,72 @@ msgid ""
|
|||
"Use the following controls only if the Java uploader [above] fails to launch."
|
||||
msgstr ""
|
||||
|
||||
#: ../../addon/facebook/facebook.php:252
|
||||
#: ../../addon/facebook/facebook.php:248
|
||||
msgid "Facebook disabled"
|
||||
msgstr ""
|
||||
|
||||
#: ../../addon/facebook/facebook.php:257
|
||||
#: ../../addon/facebook/facebook.php:253
|
||||
msgid "Updating contacts"
|
||||
msgstr ""
|
||||
|
||||
#: ../../addon/facebook/facebook.php:266
|
||||
#: ../../addon/facebook/facebook.php:262
|
||||
msgid "Facebook API key is missing."
|
||||
msgstr ""
|
||||
|
||||
#: ../../addon/facebook/facebook.php:273
|
||||
#: ../../addon/facebook/facebook.php:269
|
||||
msgid "Facebook Connect"
|
||||
msgstr ""
|
||||
|
||||
#: ../../addon/facebook/facebook.php:279
|
||||
#: ../../addon/facebook/facebook.php:275
|
||||
msgid "Install Facebook connector for this account."
|
||||
msgstr ""
|
||||
|
||||
#: ../../addon/facebook/facebook.php:286
|
||||
#: ../../addon/facebook/facebook.php:282
|
||||
msgid "Remove Facebook connector"
|
||||
msgstr ""
|
||||
|
||||
#: ../../addon/facebook/facebook.php:292
|
||||
#: ../../addon/facebook/facebook.php:288
|
||||
msgid "Post to Facebook by default"
|
||||
msgstr ""
|
||||
|
||||
#: ../../addon/facebook/facebook.php:354
|
||||
#: ../../addon/facebook/facebook.php:350
|
||||
msgid "Facebook"
|
||||
msgstr ""
|
||||
|
||||
#: ../../addon/facebook/facebook.php:355
|
||||
#: ../../addon/facebook/facebook.php:351
|
||||
msgid "Facebook Connector Settings"
|
||||
msgstr ""
|
||||
|
||||
#: ../../addon/facebook/facebook.php:369
|
||||
#: ../../addon/facebook/facebook.php:365
|
||||
msgid "Post to Facebook"
|
||||
msgstr ""
|
||||
|
||||
#: ../../addon/facebook/facebook.php:436
|
||||
#: ../../addon/facebook/facebook.php:434
|
||||
msgid ""
|
||||
"Post to Facebook cancelled because of multi-network access permission "
|
||||
"conflict."
|
||||
msgstr ""
|
||||
|
||||
#: ../../addon/facebook/facebook.php:491
|
||||
#: ../../addon/facebook/facebook.php:500
|
||||
msgid "Image: "
|
||||
msgstr ""
|
||||
|
||||
#: ../../addon/facebook/facebook.php:551
|
||||
#: ../../addon/facebook/facebook.php:561
|
||||
msgid "View on Friendika"
|
||||
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
|
||||
msgid "Randplace Settings"
|
||||
msgstr ""
|
||||
|
|
@ -3121,6 +3206,10 @@ msgstr ""
|
|||
msgid "Visible To:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/acl_selectors.php:133
|
||||
msgid "everybody"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/acl_selectors.php:137 ../../include/acl_selectors.php:152
|
||||
msgid "Groups"
|
||||
msgstr ""
|
||||
|
|
@ -3137,6 +3226,10 @@ msgstr ""
|
|||
msgid "Image/photo"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/poller.php:380
|
||||
msgid "From: "
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/datetime.php:44 ../../include/datetime.php:46
|
||||
msgid "Miscellaneous"
|
||||
msgstr ""
|
||||
|
|
@ -3201,7 +3294,7 @@ msgstr ""
|
|||
msgid " ago"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/profile_advanced.php:36 ../../include/items.php:1072
|
||||
#: ../../include/profile_advanced.php:36 ../../include/items.php:1086
|
||||
msgid "Birthday:"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -3265,7 +3358,7 @@ msgstr ""
|
|||
msgid "School/education:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/nav.php:55 ../../include/nav.php:93
|
||||
#: ../../include/nav.php:55 ../../include/nav.php:92
|
||||
msgid "Home"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -3273,137 +3366,141 @@ msgstr ""
|
|||
msgid "Apps"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/nav.php:81
|
||||
#: ../../include/nav.php:80
|
||||
msgid "Directory"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/nav.php:91
|
||||
#: ../../include/nav.php:90
|
||||
msgid "Network"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/nav.php:99
|
||||
#: ../../include/nav.php:98
|
||||
msgid "Notifications"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/nav.php:105
|
||||
#: ../../include/nav.php:104
|
||||
msgid "Manage"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/nav.php:108
|
||||
#: ../../include/nav.php:107
|
||||
msgid "Settings"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:184 ../../include/conversation.php:441
|
||||
#: ../../include/conversation.php:442
|
||||
#: ../../include/conversation.php:189 ../../include/conversation.php:446
|
||||
#: ../../include/conversation.php:447
|
||||
#, php-format
|
||||
msgid "View %s's profile"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:200
|
||||
#: ../../include/conversation.php:205
|
||||
msgid "View in context"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:271
|
||||
#: ../../include/conversation.php:276
|
||||
msgid "See more posts like this"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:296
|
||||
#: ../../include/conversation.php:301
|
||||
#, php-format
|
||||
msgid "See all %d comments"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:443
|
||||
#: ../../include/conversation.php:448
|
||||
msgid "to"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:444
|
||||
#: ../../include/conversation.php:449
|
||||
msgid "Wall-to-Wall"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:445
|
||||
#: ../../include/conversation.php:450
|
||||
msgid "via Wall-To-Wall:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:583
|
||||
#: ../../include/conversation.php:588
|
||||
msgid "View status"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:584
|
||||
#: ../../include/conversation.php:589
|
||||
msgid "View profile"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:585
|
||||
#: ../../include/conversation.php:590
|
||||
msgid "View photos"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:586
|
||||
#: ../../include/conversation.php:591
|
||||
msgid "View recent"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:588
|
||||
#: ../../include/conversation.php:593
|
||||
msgid "Send PM"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:638
|
||||
#: ../../include/conversation.php:643
|
||||
#, php-format
|
||||
msgid "%s likes this."
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:638
|
||||
#: ../../include/conversation.php:643
|
||||
#, php-format
|
||||
msgid "%s doesn't like this."
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:642
|
||||
#: ../../include/conversation.php:647
|
||||
#, php-format
|
||||
msgid "<span %1$s>%2$d people</span> like this."
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:644
|
||||
#: ../../include/conversation.php:649
|
||||
#, php-format
|
||||
msgid "<span %1$s>%2$d people</span> don't like this."
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:650
|
||||
#: ../../include/conversation.php:655
|
||||
msgid "and"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:653
|
||||
#: ../../include/conversation.php:658
|
||||
#, php-format
|
||||
msgid ", and %d other people"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:654
|
||||
#: ../../include/conversation.php:659
|
||||
#, php-format
|
||||
msgid "%s like this."
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:654
|
||||
#: ../../include/conversation.php:659
|
||||
#, php-format
|
||||
msgid "%s don't like this."
|
||||
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:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:676
|
||||
#: ../../include/conversation.php:681
|
||||
msgid "Please enter a video(.ogg) link/URL:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:677
|
||||
#: ../../include/conversation.php:682
|
||||
msgid "Please enter an audio(.ogg) link/URL:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:678
|
||||
#: ../../include/conversation.php:683
|
||||
msgid "Where are you right now?"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:679
|
||||
#: ../../include/conversation.php:684
|
||||
msgid "Enter a title for this item"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/conversation.php:726
|
||||
#: ../../include/conversation.php:734
|
||||
msgid "Set title"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -3412,7 +3509,7 @@ msgstr ""
|
|||
msgid "Cannot locate DNS info for database server '%s'"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/items.php:1433
|
||||
#: ../../include/items.php:1447
|
||||
msgid "You have a new follower at "
|
||||
msgstr ""
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
|
||||
<div id="settings-nick-wrapper" >
|
||||
<p id="settings-nickname-desc">
|
||||
<div class="error-message">$desc <strong>'$nickname@$basepath'</strong>$subdir</div>
|
||||
</p>
|
||||
<div id="settings-nickname-desc" class="info-message">$desc <strong>'$nickname@$basepath'</strong>$subdir</div>
|
||||
</div>
|
||||
<div id="settings-nick-end" ></div>
|
||||
|
|
|
|||
|
|
@ -171,6 +171,18 @@ nav .nav-link {
|
|||
#home-update { background-position: -90px 0px; }
|
||||
|
||||
/** 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 {
|
||||
position:fixed;
|
||||
bottom: 0px; right:10%;
|
||||
|
|
@ -183,12 +195,15 @@ nav .nav-link {
|
|||
padding-bottom: 50px;
|
||||
z-index: 1000;
|
||||
}
|
||||
#sysmsg_info br,
|
||||
#sysmsg br {
|
||||
display:block;
|
||||
margin:2px 0px;
|
||||
border-top: 1px solid #ccccce;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* aside
|
||||
**/
|
||||
|
|
|
|||
|
|
@ -93,6 +93,14 @@ nav #site-location {
|
|||
padding: 10px;
|
||||
}
|
||||
|
||||
.info-message {
|
||||
color: #204a87;
|
||||
font-size: 1.1em;
|
||||
border: 1px solid #3465a4;
|
||||
background-color: #d7e3f1;
|
||||
padding: 10px;
|
||||
}
|
||||
|
||||
|
||||
nav #banner {
|
||||
display: block;
|
||||
|
|
|
|||
|
|
@ -290,6 +290,14 @@ nav {
|
|||
background-color: #FFEEEE;
|
||||
padding: 10px;
|
||||
}
|
||||
.info-message {
|
||||
color: #204a87;
|
||||
font-size: 1.1em;
|
||||
border: 1px solid #3465a4;
|
||||
background-color: #d7e3f1;
|
||||
padding: 10px;
|
||||
}
|
||||
|
||||
|
||||
.nav-link {
|
||||
float: right;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue