Merge remote-tracking branch 'upstream/master'
Conflicts: images/smiley-beard.png
This commit is contained in:
Thomas
commit
dadf80f644
2
boot.php
2
boot.php
|
|
@ -9,7 +9,7 @@ require_once('include/nav.php');
|
|||
require_once('include/cache.php');
|
||||
|
||||
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
||||
define ( 'FRIENDICA_VERSION', '2.3.1272' );
|
||||
define ( 'FRIENDICA_VERSION', '2.3.1273' );
|
||||
define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
|
||||
define ( 'DB_UPDATE_VERSION', 1131 );
|
||||
|
||||
|
|
|
|||
BIN
images/beard.jpg
BIN
images/beard.jpg
Binary file not shown.
|
Before Width: | Height: | Size: 989 B |
Binary file not shown.
|
Before Width: | Height: | Size: 951 B |
|
|
@ -217,7 +217,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
|
|||
if($update)
|
||||
$return_url = $_SESSION['return_url'];
|
||||
else
|
||||
$return_url = $_SESSION['return_url'] = $a->cmd;
|
||||
$return_url = $_SESSION['return_url'] = $a->query_string;
|
||||
|
||||
load_contact_links(local_user());
|
||||
|
||||
|
|
|
|||
|
|
@ -122,6 +122,9 @@ function nav(&$a) {
|
|||
}
|
||||
|
||||
$nav['messages'] = array('message', t('Messages'), "", t('Private mail'));
|
||||
$nav['messages']['inbox'] = array('message', t('Inbox'), "", t('Inbox'));
|
||||
$nav['messages']['outbox']= array('message/sent', t('Outbox'), "", t('Outbox'));
|
||||
$nav['messages']['new'] = array('message/new', t('New Message'), "", t('New Message'));
|
||||
|
||||
if(is_array($a->identities) && count($a->identities) > 1) {
|
||||
$nav['manage'] = array('manage', t('Manage'), "", t('Manage other pages'));
|
||||
|
|
|
|||
|
|
@ -321,32 +321,32 @@ function admin_page_site(&$a) {
|
|||
'$sitename' => array('sitename', t("Site name"), htmlentities($a->config['sitename'], ENT_QUOTES), ""),
|
||||
'$banner' => array('banner', t("Banner/Logo"), $banner, ""),
|
||||
'$language' => array('language', t("System language"), get_config('system','language'), "", $lang_choices),
|
||||
'$theme' => array('theme', t("System theme"), get_config('system','theme'), "Default system theme (which may be over-ridden by user profiles)", $theme_choices),
|
||||
'$theme' => array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles"), $theme_choices),
|
||||
|
||||
'$maximagesize' => array('maximagesize', t("Maximum image size"), get_config('system','maximagesize'), "Maximum size in bytes of uploaded images. Default is 0, which means no limits."),
|
||||
'$maximagesize' => array('maximagesize', t("Maximum image size"), get_config('system','maximagesize'), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")),
|
||||
|
||||
'$register_policy' => array('register_policy', t("Register policy"), $a->config['register_policy'], "", $register_choices),
|
||||
'$register_text' => array('register_text', t("Register text"), htmlentities($a->config['register_text'], ENT_QUOTES), "Will be displayed prominently on the registration page."),
|
||||
'$register_text' => array('register_text', t("Register text"), htmlentities($a->config['register_text'], ENT_QUOTES), t("Will be displayed prominently on the registration page.")),
|
||||
'$abandon_days' => array('abandon_days', t('Accounts abandoned after x days'), get_config('system','account_abandon_days'), t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')),
|
||||
'$allowed_sites' => array('allowed_sites', t("Allowed friend domains"), get_config('system','allowed_sites'), "Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"),
|
||||
'$allowed_email' => array('allowed_email', t("Allowed email domains"), get_config('system','allowed_email'), "Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"),
|
||||
'$block_public' => array('block_public', t("Block public"), get_config('system','block_public'), "Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."),
|
||||
'$force_publish' => array('publish_all', t("Force publish"), get_config('system','publish_all'), "Check to force all profiles on this site to be listed in the site directory."),
|
||||
'$global_directory' => array('directory_submit_url', t("Global directory update URL"), get_config('system','directory_submit_url'), "URL to update the global directory. If this is not set, the global directory is completely unavailable to the application."),
|
||||
'$allowed_sites' => array('allowed_sites', t("Allowed friend domains"), get_config('system','allowed_sites'), t("Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains")),
|
||||
'$allowed_email' => array('allowed_email', t("Allowed email domains"), get_config('system','allowed_email'), t("Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains")),
|
||||
'$block_public' => array('block_public', t("Block public"), get_config('system','block_public'), t("Check to block public access to all otherwise public personal pages on this site unless you are currently logged in.")),
|
||||
'$force_publish' => array('publish_all', t("Force publish"), get_config('system','publish_all'), t("Check to force all profiles on this site to be listed in the site directory.")),
|
||||
'$global_directory' => array('directory_submit_url', t("Global directory update URL"), get_config('system','directory_submit_url'), t("URL to update the global directory. If this is not set, the global directory is completely unavailable to the application.")),
|
||||
|
||||
'$no_multi_reg' => array('no_multi_reg', t("Block multiple registrations"), get_config('system','block_extended_register'), "Disallow users to register additional accounts for use as pages."),
|
||||
'$no_openid' => array('no_openid', t("OpenID support"), !get_config('system','no_openid'), "OpenID support for registration and logins."),
|
||||
'$no_gravatar' => array('no_gravatar', t("Gravatar support"), !get_config('system','no_gravatar'), "Search new user's photo on Gravatar."),
|
||||
'$no_regfullname' => array('no_regfullname', t("Fullname check"), !get_config('system','no_regfullname'), "Force users to register with a space between firstname and lastname in Full name, as an antispam measure"),
|
||||
'$no_utf' => array('no_utf', t("UTF-8 Regular expressions"), !get_config('system','no_utf'), "Use PHP UTF8 regular expressions"),
|
||||
'$no_community_page' => array('no_community_page', t("Show Community Page"), !get_config('system','no_community_page'), "Display a Community page showing all recent public postings on this site."),
|
||||
'$ostatus_disabled' => array('ostatus_disabled', t("Enable OStatus support"), !get_config('system','ostatus_disable'), "Provide built-in OStatus \x28identi.ca, status.net, etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."),
|
||||
'$diaspora_enabled' => array('diaspora_enabled', t("Enable Diaspora support"), get_config('system','diaspora_enabled'), "Provide built-in Diaspora network compatibility."),
|
||||
'$dfrn_only' => array('dfrn_only', t('Only allow Friendica contacts'), get_config('system','dfrn_only'), "All contacts must use Friendica protocols. All other built-in communication protocols disabled."),
|
||||
'$verifyssl' => array('verifyssl', t("Verify SSL"), get_config('system','verifyssl'), "If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."),
|
||||
'$no_multi_reg' => array('no_multi_reg', t("Block multiple registrations"), get_config('system','block_extended_register'), t("Disallow users to register additional accounts for use as pages.")),
|
||||
'$no_openid' => array('no_openid', t("OpenID support"), !get_config('system','no_openid'), t("OpenID support for registration and logins.")),
|
||||
'$no_gravatar' => array('no_gravatar', t("Gravatar support"), !get_config('system','no_gravatar'), t("Search new user's photo on Gravatar.")),
|
||||
'$no_regfullname' => array('no_regfullname', t("Fullname check"), !get_config('system','no_regfullname'), t("Force users to register with a space between firstname and lastname in Full name, as an antispam measure")),
|
||||
'$no_utf' => array('no_utf', t("UTF-8 Regular expressions"), !get_config('system','no_utf'), t("Use PHP UTF8 regular expressions")),
|
||||
'$no_community_page' => array('no_community_page', t("Show Community Page"), !get_config('system','no_community_page'), t("Display a Community page showing all recent public postings on this site.")),
|
||||
'$ostatus_disabled' => array('ostatus_disabled', t("Enable OStatus support"), !get_config('system','ostatus_disable'), t("Provide built-in OStatus \x28identi.ca, status.net, etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed.")),
|
||||
'$diaspora_enabled' => array('diaspora_enabled', t("Enable Diaspora support"), get_config('system','diaspora_enabled'), t("Provide built-in Diaspora network compatibility.")),
|
||||
'$dfrn_only' => array('dfrn_only', t('Only allow Friendica contacts'), get_config('system','dfrn_only'), t("All contacts must use Friendica protocols. All other built-in communication protocols disabled.")),
|
||||
'$verifyssl' => array('verifyssl', t("Verify SSL"), get_config('system','verifyssl'), t("If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites.")),
|
||||
'$proxyuser' => array('proxyuser', t("Proxy user"), get_config('system','proxyuser'), ""),
|
||||
'$proxy' => array('proxy', t("Proxy URL"), get_config('system','proxy'), ""),
|
||||
'$timeout' => array('timeout', t("Network timeout"), (x(get_config('system','curl_timeout'))?get_config('system','curl_timeout'):60), "Value is in seconds. Set to 0 for unlimited (not recommended)."),
|
||||
'$timeout' => array('timeout', t("Network timeout"), (x(get_config('system','curl_timeout'))?get_config('system','curl_timeout'):60), t("Value is in seconds. Set to 0 for unlimited (not recommended).")),
|
||||
|
||||
|
||||
));
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ function display_content(&$a) {
|
|||
|
||||
$contact = null;
|
||||
$remote_contact = false;
|
||||
|
||||
dbg(1);
|
||||
if(remote_user()) {
|
||||
$contact_id = $_SESSION['visitor_id'];
|
||||
$groups = init_groups_visitor($contact_id);
|
||||
|
|
@ -87,6 +87,9 @@ function display_content(&$a) {
|
|||
|
||||
$sql_extra = permissions_sql($a->profile['uid'],$remote_contact,$groups);
|
||||
|
||||
if(! local_user() && ! remote_user())
|
||||
$sql_extra .= " and `item`.`private` = 0 ";
|
||||
|
||||
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
|
||||
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
|
||||
`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
|
||||
|
|
@ -135,7 +138,7 @@ function display_content(&$a) {
|
|||
}
|
||||
|
||||
}
|
||||
|
||||
dbg(0);
|
||||
return $o;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -51,14 +51,14 @@ function network_init(&$a) {
|
|||
|
||||
function saved_searches($search) {
|
||||
|
||||
$srchurl = '/network'
|
||||
. ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '')
|
||||
. ((x($_GET,'star')) ? '?star=' . $_GET['star'] : '')
|
||||
. ((x($_GET,'bmark')) ? '?bmark=' . $_GET['bmark'] : '')
|
||||
. ((x($_GET,'conv')) ? '?conv=' . $_GET['conv'] : '')
|
||||
. ((x($_GET,'nets')) ? '?nets=' . $_GET['nets'] : '')
|
||||
. ((x($_GET,'cmin')) ? '?cmin=' . $_GET['cmin'] : '')
|
||||
. ((x($_GET,'cmax')) ? '?cmax=' . $_GET['cmax'] : '');
|
||||
$srchurl = '/network?f='
|
||||
. ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '')
|
||||
. ((x($_GET,'star')) ? '&star=' . $_GET['star'] : '')
|
||||
. ((x($_GET,'bmark')) ? '&bmark=' . $_GET['bmark'] : '')
|
||||
. ((x($_GET,'conv')) ? '&conv=' . $_GET['conv'] : '')
|
||||
. ((x($_GET,'nets')) ? '&nets=' . $_GET['nets'] : '')
|
||||
. ((x($_GET,'cmin')) ? '&cmin=' . $_GET['cmin'] : '')
|
||||
. ((x($_GET,'cmax')) ? '&cmax=' . $_GET['cmax'] : '');
|
||||
|
||||
$o = '';
|
||||
|
||||
|
|
@ -164,33 +164,33 @@ function network_content(&$a, $update = 0) {
|
|||
$tabs = array(
|
||||
array(
|
||||
'label' => t('Commented Order'),
|
||||
'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : ''),
|
||||
'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '?f=&cid=' . $_GET['cid'] : ''),
|
||||
'sel'=>$all_active,
|
||||
),
|
||||
array(
|
||||
'label' => t('Posted Order'),
|
||||
'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . '?order=post' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''),
|
||||
'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . '?f=&order=post' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''),
|
||||
'sel'=>$postord_active,
|
||||
),
|
||||
|
||||
array(
|
||||
'label' => t('Personal'),
|
||||
'url' => $a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '&conv=1',
|
||||
'url' => $a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&conv=1',
|
||||
'sel' => $conv_active,
|
||||
),
|
||||
array(
|
||||
'label' => t('New'),
|
||||
'url' => $a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . '/new' . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : ''),
|
||||
'url' => $a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . '/new' . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : ''),
|
||||
'sel' => $new_active,
|
||||
),
|
||||
array(
|
||||
'label' => t('Starred'),
|
||||
'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '&star=1',
|
||||
'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&star=1',
|
||||
'sel'=>$starred_active,
|
||||
),
|
||||
array(
|
||||
'label' => t('Bookmarks'),
|
||||
'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '&bmark=1',
|
||||
'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&bmark=1',
|
||||
'sel'=>$bookmarked_active,
|
||||
),
|
||||
// array(
|
||||
|
|
@ -256,8 +256,6 @@ function network_content(&$a, $update = 0) {
|
|||
|
||||
nav_set_selected('network');
|
||||
|
||||
$_SESSION['return_url'] = $a->query_string;
|
||||
|
||||
$celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
|
||||
|
||||
$x = array(
|
||||
|
|
|
|||
|
|
@ -127,7 +127,7 @@ function search_content(&$a) {
|
|||
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
|
||||
LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
|
||||
WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
|
||||
AND (( `wall` = 1 AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `user`.`hidewall` = 0 )
|
||||
AND (( `wall` = 1 AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `item`.`private` = 0 AND `user`.`hidewall` = 0 )
|
||||
OR `item`.`uid` = %d )
|
||||
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
|
||||
$search_alg
|
||||
|
|
|
|||
|
|
@ -16,10 +16,18 @@ function share_init(&$a) {
|
|||
|
||||
$o = '';
|
||||
|
||||
if(local_user() && intval(get_pconfig(local_user(),'system','plaintext'))) {
|
||||
$o .= '♲ [url=' . $r[0]['author-link'] . ']' . $r[0]['author-name'] . '[/url]';
|
||||
if($r[0]['title'])
|
||||
$o .= '[b]' . $r[0]['title'] . '[/b]' . "\n";
|
||||
$o .= $r[0]['body'] . "\n";
|
||||
}
|
||||
else {
|
||||
$o .= '♲ <a href="' . $r[0]['author-link'] . '">' . $r[0]['author-name'] . '</a><br />';
|
||||
if($r[0]['title'])
|
||||
$o .= '<strong>' . $r[0]['title'] . '</strong><br />';
|
||||
$o .= bbcode($r[0]['body'], true);
|
||||
echo $o . '<br />';
|
||||
$o .= bbcode($r[0]['body'], true) . '<br />';
|
||||
}
|
||||
echo $o;
|
||||
killme();
|
||||
}
|
||||
|
|
|
|||
325
util/messages.po
325
util/messages.po
|
|
@ -6,9 +6,9 @@
|
|||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: 2.3.1272\n"
|
||||
"Project-Id-Version: 2.3.1273\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2012-03-05 16:34-0800\n"
|
||||
"POT-Creation-Date: 2012-03-06 15:09-0800\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"
|
||||
|
|
@ -48,11 +48,11 @@ msgstr ""
|
|||
#: ../../mod/profile_photo.php:148 ../../mod/profile_photo.php:159
|
||||
#: ../../mod/message.php:9 ../../mod/message.php:46 ../../mod/allfriends.php:9
|
||||
#: ../../mod/wall_upload.php:42 ../../mod/follow.php:8 ../../mod/common.php:9
|
||||
#: ../../mod/display.php:130 ../../mod/profiles.php:7
|
||||
#: ../../mod/display.php:133 ../../mod/profiles.php:7
|
||||
#: ../../mod/profiles.php:229 ../../mod/delegate.php:6
|
||||
#: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
|
||||
#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:332
|
||||
#: ../../include/items.php:3005 ../../index.php:288
|
||||
#: ../../include/items.php:3030 ../../index.php:288
|
||||
msgid "Permission denied."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -82,7 +82,7 @@ msgid "Return to contact editor"
|
|||
msgstr ""
|
||||
|
||||
#: ../../mod/crepair.php:148 ../../mod/settings.php:462
|
||||
#: ../../mod/settings.php:488 ../../mod/admin.php:483 ../../mod/admin.php:492
|
||||
#: ../../mod/settings.php:488 ../../mod/admin.php:484 ../../mod/admin.php:493
|
||||
msgid "Name"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -126,8 +126,8 @@ msgstr ""
|
|||
#: ../../mod/localtime.php:45 ../../mod/contacts.php:319
|
||||
#: ../../mod/settings.php:460 ../../mod/settings.php:603
|
||||
#: ../../mod/settings.php:797 ../../mod/manage.php:109 ../../mod/group.php:80
|
||||
#: ../../mod/admin.php:312 ../../mod/admin.php:480 ../../mod/admin.php:606
|
||||
#: ../../mod/admin.php:772 ../../mod/admin.php:852 ../../mod/profiles.php:375
|
||||
#: ../../mod/admin.php:313 ../../mod/admin.php:481 ../../mod/admin.php:609
|
||||
#: ../../mod/admin.php:776 ../../mod/admin.php:856 ../../mod/profiles.php:375
|
||||
#: ../../mod/invite.php:106 ../../addon/facebook/facebook.php:411
|
||||
#: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:92
|
||||
#: ../../addon/nsfw/nsfw.php:57
|
||||
|
|
@ -149,7 +149,8 @@ msgstr ""
|
|||
#: ../../addon/wppost/wppost.php:102 ../../addon/showmore/showmore.php:48
|
||||
#: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:175
|
||||
#: ../../addon/twitter/twitter.php:201 ../../addon/twitter/twitter.php:355
|
||||
#: ../../addon/posterous/posterous.php:90 ../../include/conversation.php:552
|
||||
#: ../../addon/posterous/posterous.php:90
|
||||
#: ../../view/theme/quattro/theme.php:15 ../../include/conversation.php:552
|
||||
msgid "Submit"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -539,7 +540,7 @@ msgid "Preview"
|
|||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1320 ../../mod/settings.php:520
|
||||
#: ../../mod/settings.php:601 ../../mod/group.php:158 ../../mod/admin.php:487
|
||||
#: ../../mod/settings.php:601 ../../mod/group.php:158 ../../mod/admin.php:488
|
||||
#: ../../include/conversation.php:304 ../../include/conversation.php:573
|
||||
msgid "Delete"
|
||||
msgstr ""
|
||||
|
|
@ -772,7 +773,7 @@ msgstr ""
|
|||
msgid "Confirm"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/dfrn_request.php:582 ../../include/items.php:2541
|
||||
#: ../../mod/dfrn_request.php:582 ../../include/items.php:2566
|
||||
msgid "[Name Withheld]"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1225,7 +1226,7 @@ msgid "if applicable"
|
|||
msgstr ""
|
||||
|
||||
#: ../../mod/notifications.php:153 ../../mod/notifications.php:200
|
||||
#: ../../mod/admin.php:485
|
||||
#: ../../mod/admin.php:486
|
||||
msgid "Approve"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1422,12 +1423,12 @@ msgid "View all contacts"
|
|||
msgstr ""
|
||||
|
||||
#: ../../mod/contacts.php:297 ../../mod/contacts.php:344
|
||||
#: ../../mod/admin.php:489
|
||||
#: ../../mod/admin.php:490
|
||||
msgid "Unblock"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/contacts.php:297 ../../mod/contacts.php:344
|
||||
#: ../../mod/admin.php:488
|
||||
#: ../../mod/admin.php:489
|
||||
msgid "Block"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1496,7 +1497,7 @@ msgstr ""
|
|||
msgid "Update public posts"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/contacts.php:341 ../../mod/admin.php:901
|
||||
#: ../../mod/contacts.php:341 ../../mod/admin.php:905
|
||||
msgid "Update now"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1583,7 +1584,7 @@ msgstr ""
|
|||
#: ../../mod/lostpass.php:44 ../../mod/lostpass.php:106
|
||||
#: ../../mod/register.php:380 ../../mod/register.php:434
|
||||
#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:726
|
||||
#: ../../include/items.php:2550
|
||||
#: ../../include/items.php:2575
|
||||
msgid "Administrator"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1850,7 +1851,7 @@ msgstr ""
|
|||
msgid "Move to folder:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:659 ../../mod/admin.php:142 ../../mod/admin.php:461
|
||||
#: ../../mod/settings.php:659 ../../mod/admin.php:142 ../../mod/admin.php:462
|
||||
msgid "Normal Account"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1858,7 +1859,7 @@ msgstr ""
|
|||
msgid "This account is a normal personal profile"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:663 ../../mod/admin.php:143 ../../mod/admin.php:462
|
||||
#: ../../mod/settings.php:663 ../../mod/admin.php:143 ../../mod/admin.php:463
|
||||
msgid "Soapbox Account"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1866,7 +1867,7 @@ msgstr ""
|
|||
msgid "Automatically approve all connection/friend requests as read-only fans"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:667 ../../mod/admin.php:144 ../../mod/admin.php:463
|
||||
#: ../../mod/settings.php:667 ../../mod/admin.php:144 ../../mod/admin.php:464
|
||||
msgid "Community/Celebrity Account"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1874,7 +1875,7 @@ msgstr ""
|
|||
msgid "Automatically approve all connection/friend requests as read-write fans"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:671 ../../mod/admin.php:145 ../../mod/admin.php:464
|
||||
#: ../../mod/settings.php:671 ../../mod/admin.php:145 ../../mod/admin.php:465
|
||||
msgid "Automatic Friend Account"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2140,27 +2141,27 @@ msgstr[1] ""
|
|||
msgid "Private messages to this group are at risk of public disclosure."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/network.php:300
|
||||
#: ../../mod/network.php:298
|
||||
msgid "No such group"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/network.php:311
|
||||
#: ../../mod/network.php:309
|
||||
msgid "Group is empty"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/network.php:315
|
||||
#: ../../mod/network.php:313
|
||||
msgid "Group: "
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/network.php:325
|
||||
#: ../../mod/network.php:323
|
||||
msgid "Contact: "
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/network.php:327
|
||||
#: ../../mod/network.php:325
|
||||
msgid "Private messages to this person are at risk of public disclosure."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/network.php:332
|
||||
#: ../../mod/network.php:330
|
||||
msgid "Invalid contact."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2488,7 +2489,7 @@ msgstr ""
|
|||
msgid "Your invitation ID: "
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/register.php:540 ../../mod/admin.php:313
|
||||
#: ../../mod/register.php:540 ../../mod/admin.php:314
|
||||
msgid "Registration"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2542,9 +2543,9 @@ msgid "%1$s doesn't like %2$s's %3$s"
|
|||
msgstr ""
|
||||
|
||||
#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:127
|
||||
#: ../../mod/admin.php:521 ../../mod/admin.php:697 ../../mod/display.php:29
|
||||
#: ../../mod/display.php:134 ../../mod/viewd.php:14
|
||||
#: ../../include/items.php:2917
|
||||
#: ../../mod/admin.php:522 ../../mod/admin.php:700 ../../mod/display.php:29
|
||||
#: ../../mod/display.php:137 ../../mod/viewd.php:14
|
||||
#: ../../include/items.php:2942
|
||||
msgid "Item not found."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2778,23 +2779,23 @@ msgstr ""
|
|||
msgid "No friends to display."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:71 ../../mod/admin.php:311
|
||||
#: ../../mod/admin.php:71 ../../mod/admin.php:312
|
||||
msgid "Site"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:72 ../../mod/admin.php:479 ../../mod/admin.php:491
|
||||
#: ../../mod/admin.php:72 ../../mod/admin.php:480 ../../mod/admin.php:492
|
||||
msgid "Users"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:73 ../../mod/admin.php:568 ../../mod/admin.php:605
|
||||
#: ../../mod/admin.php:73 ../../mod/admin.php:569 ../../mod/admin.php:608
|
||||
msgid "Plugins"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:74 ../../mod/admin.php:739 ../../mod/admin.php:771
|
||||
#: ../../mod/admin.php:74 ../../mod/admin.php:742 ../../mod/admin.php:775
|
||||
msgid "Themes"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:89 ../../mod/admin.php:851
|
||||
#: ../../mod/admin.php:89 ../../mod/admin.php:855
|
||||
msgid "Logs"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2802,333 +2803,439 @@ msgstr ""
|
|||
msgid "User registrations waiting for confirmation"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:160 ../../mod/admin.php:310 ../../mod/admin.php:478
|
||||
#: ../../mod/admin.php:567 ../../mod/admin.php:604 ../../mod/admin.php:738
|
||||
#: ../../mod/admin.php:770 ../../mod/admin.php:850
|
||||
#: ../../mod/admin.php:161 ../../mod/admin.php:311 ../../mod/admin.php:479
|
||||
#: ../../mod/admin.php:568 ../../mod/admin.php:607 ../../mod/admin.php:741
|
||||
#: ../../mod/admin.php:774 ../../mod/admin.php:854
|
||||
msgid "Administration"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:161
|
||||
#: ../../mod/admin.php:162
|
||||
msgid "Summary"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:162
|
||||
#: ../../mod/admin.php:163
|
||||
msgid "Registered users"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:164
|
||||
#: ../../mod/admin.php:165
|
||||
msgid "Pending registrations"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:165
|
||||
#: ../../mod/admin.php:166
|
||||
msgid "Version"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:167
|
||||
#: ../../mod/admin.php:168
|
||||
msgid "Active plugins"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:259
|
||||
#: ../../mod/admin.php:260
|
||||
msgid "Site settings updated."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:303
|
||||
#: ../../mod/admin.php:304
|
||||
msgid "Closed"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:304
|
||||
#: ../../mod/admin.php:305
|
||||
msgid "Requires approval"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:305
|
||||
#: ../../mod/admin.php:306
|
||||
msgid "Open"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:314
|
||||
#: ../../mod/admin.php:315
|
||||
msgid "File upload"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:315
|
||||
#: ../../mod/admin.php:316
|
||||
msgid "Policies"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:316
|
||||
#: ../../mod/admin.php:317
|
||||
msgid "Advanced"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:320 ../../addon/statusnet/statusnet.php:523
|
||||
#: ../../mod/admin.php:321 ../../addon/statusnet/statusnet.php:523
|
||||
msgid "Site name"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:321
|
||||
#: ../../mod/admin.php:322
|
||||
msgid "Banner/Logo"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:322
|
||||
#: ../../mod/admin.php:323
|
||||
msgid "System language"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:323
|
||||
#: ../../mod/admin.php:324
|
||||
msgid "System theme"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:325
|
||||
#: ../../mod/admin.php:324
|
||||
msgid "Default system theme - may be over-ridden by user profiles"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:326
|
||||
msgid "Maximum image size"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:327
|
||||
msgid "Register policy"
|
||||
#: ../../mod/admin.php:326
|
||||
msgid ""
|
||||
"Maximum size in bytes of uploaded images. Default is 0, which means no "
|
||||
"limits."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:328
|
||||
msgid "Register policy"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:329
|
||||
msgid "Register text"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:329
|
||||
msgid "Will be displayed prominently on the registration page."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:330
|
||||
msgid "Accounts abandoned after x days"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:329
|
||||
#: ../../mod/admin.php:330
|
||||
msgid ""
|
||||
"Will not waste system resources polling external sites for abandonded "
|
||||
"accounts. Enter 0 for no time limit."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:330
|
||||
#: ../../mod/admin.php:331
|
||||
msgid "Allowed friend domains"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:331
|
||||
msgid ""
|
||||
"Comma separated list of domains which are allowed to establish friendships "
|
||||
"with this site. Wildcards are accepted. Empty to allow any domains"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:332
|
||||
msgid "Allowed email domains"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:332
|
||||
msgid ""
|
||||
"Comma separated list of domains which are allowed in email addresses for "
|
||||
"registrations to this site. Wildcards are accepted. Empty to allow any "
|
||||
"domains"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:333
|
||||
msgid "Block public"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:333
|
||||
msgid ""
|
||||
"Check to block public access to all otherwise public personal pages on this "
|
||||
"site unless you are currently logged in."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:334
|
||||
msgid "Force publish"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:334
|
||||
msgid ""
|
||||
"Check to force all profiles on this site to be listed in the site directory."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:335
|
||||
msgid "Global directory update URL"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:336
|
||||
#: ../../mod/admin.php:335
|
||||
msgid ""
|
||||
"URL to update the global directory. If this is not set, the global directory "
|
||||
"is completely unavailable to the application."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:337
|
||||
msgid "Block multiple registrations"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:337
|
||||
msgid "Disallow users to register additional accounts for use as pages."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:338
|
||||
msgid "OpenID support"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:338
|
||||
msgid "OpenID support for registration and logins."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:339
|
||||
msgid "Gravatar support"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:339
|
||||
msgid "Search new user's photo on Gravatar."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:340
|
||||
msgid "Fullname check"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:340
|
||||
msgid ""
|
||||
"Force users to register with a space between firstname and lastname in Full "
|
||||
"name, as an antispam measure"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:341
|
||||
msgid "UTF-8 Regular expressions"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:341
|
||||
msgid "Use PHP UTF8 regular expressions"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:342
|
||||
msgid "Show Community Page"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:342
|
||||
msgid ""
|
||||
"Display a Community page showing all recent public postings on this site."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:343
|
||||
msgid "Enable OStatus support"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:343
|
||||
msgid ""
|
||||
"Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All "
|
||||
"communications in OStatus are public, so privacy warnings will be "
|
||||
"occasionally displayed."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:344
|
||||
msgid "Enable Diaspora support"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:344
|
||||
msgid "Provide built-in Diaspora network compatibility."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:345
|
||||
msgid "Only allow Friendica contacts"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:345
|
||||
msgid ""
|
||||
"All contacts must use Friendica protocols. All other built-in communication "
|
||||
"protocols disabled."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:346
|
||||
msgid "Verify SSL"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:346
|
||||
msgid "Proxy user"
|
||||
msgid ""
|
||||
"If you wish, you can turn on strict certificate checking. This will mean you "
|
||||
"cannot connect (at all) to self-signed SSL sites."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:347
|
||||
msgid "Proxy URL"
|
||||
msgid "Proxy user"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:348
|
||||
msgid "Proxy URL"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:349
|
||||
msgid "Network timeout"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:369
|
||||
#: ../../mod/admin.php:349
|
||||
msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:370
|
||||
#, php-format
|
||||
msgid "%s user blocked/unblocked"
|
||||
msgid_plural "%s users blocked/unblocked"
|
||||
msgstr[0] ""
|
||||
msgstr[1] ""
|
||||
|
||||
#: ../../mod/admin.php:376
|
||||
#: ../../mod/admin.php:377
|
||||
#, php-format
|
||||
msgid "%s user deleted"
|
||||
msgid_plural "%s users deleted"
|
||||
msgstr[0] ""
|
||||
msgstr[1] ""
|
||||
|
||||
#: ../../mod/admin.php:410
|
||||
#: ../../mod/admin.php:411
|
||||
#, php-format
|
||||
msgid "User '%s' deleted"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:417
|
||||
#: ../../mod/admin.php:418
|
||||
#, php-format
|
||||
msgid "User '%s' unblocked"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:417
|
||||
#: ../../mod/admin.php:418
|
||||
#, php-format
|
||||
msgid "User '%s' blocked"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:481
|
||||
#: ../../mod/admin.php:482
|
||||
msgid "select all"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:482
|
||||
#: ../../mod/admin.php:483
|
||||
msgid "User registrations waiting for confirm"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:483
|
||||
#: ../../mod/admin.php:484
|
||||
msgid "Request date"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:483 ../../mod/admin.php:492
|
||||
#: ../../mod/admin.php:484 ../../mod/admin.php:493
|
||||
#: ../../include/contact_selectors.php:79
|
||||
msgid "Email"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:484
|
||||
#: ../../mod/admin.php:485
|
||||
msgid "No registrations."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:486
|
||||
#: ../../mod/admin.php:487
|
||||
msgid "Deny"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:492
|
||||
#: ../../mod/admin.php:493
|
||||
msgid "Register date"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:492
|
||||
#: ../../mod/admin.php:493
|
||||
msgid "Last login"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:492
|
||||
#: ../../mod/admin.php:493
|
||||
msgid "Last item"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:492
|
||||
#: ../../mod/admin.php:493
|
||||
msgid "Account"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:494
|
||||
#: ../../mod/admin.php:495
|
||||
msgid ""
|
||||
"Selected users will be deleted!\\n\\nEverything these users had posted on "
|
||||
"this site will be permanently deleted!\\n\\nAre you sure?"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:495
|
||||
#: ../../mod/admin.php:496
|
||||
msgid ""
|
||||
"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
|
||||
"site will be permanently deleted!\\n\\nAre you sure?"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:531
|
||||
#: ../../mod/admin.php:532
|
||||
#, php-format
|
||||
msgid "Plugin %s disabled."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:535
|
||||
#: ../../mod/admin.php:536
|
||||
#, php-format
|
||||
msgid "Plugin %s enabled."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:545 ../../mod/admin.php:721
|
||||
#: ../../mod/admin.php:546 ../../mod/admin.php:724
|
||||
msgid "Disable"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:547 ../../mod/admin.php:723
|
||||
#: ../../mod/admin.php:548 ../../mod/admin.php:726
|
||||
msgid "Enable"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:569 ../../mod/admin.php:740
|
||||
#: ../../mod/admin.php:570 ../../mod/admin.php:743
|
||||
msgid "Toggle"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:570 ../../mod/admin.php:741 ../../include/nav.php:130
|
||||
#: ../../mod/admin.php:571 ../../mod/admin.php:744 ../../include/nav.php:130
|
||||
msgid "Settings"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:686
|
||||
#: ../../mod/admin.php:578 ../../mod/admin.php:753
|
||||
msgid "Author: "
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:579 ../../mod/admin.php:754
|
||||
msgid "Maintainer: "
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:689
|
||||
msgid "No themes found."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:776
|
||||
#: ../../mod/admin.php:780
|
||||
msgid "[Experimental]"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:777
|
||||
#: ../../mod/admin.php:781
|
||||
msgid "[Unsupported]"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:800
|
||||
#: ../../mod/admin.php:804
|
||||
msgid "Log settings updated."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:853
|
||||
#: ../../mod/admin.php:857
|
||||
msgid "Clear"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:859
|
||||
#: ../../mod/admin.php:863
|
||||
msgid "Debugging"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:860
|
||||
#: ../../mod/admin.php:864
|
||||
msgid "Log file"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:860
|
||||
#: ../../mod/admin.php:864
|
||||
msgid ""
|
||||
"Must be writable by web server. Relative to your Friendica top-level "
|
||||
"directory."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:861
|
||||
#: ../../mod/admin.php:865
|
||||
msgid "Log level"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:902
|
||||
#: ../../mod/admin.php:906
|
||||
msgid "Close"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:908
|
||||
#: ../../mod/admin.php:912
|
||||
msgid "FTP Host"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:909
|
||||
#: ../../mod/admin.php:913
|
||||
msgid "FTP Path"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:910
|
||||
#: ../../mod/admin.php:914
|
||||
msgid "FTP User"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/admin.php:911
|
||||
#: ../../mod/admin.php:915
|
||||
msgid "FTP Password"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -3247,7 +3354,7 @@ msgstr ""
|
|||
msgid "No friends in common."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/display.php:127
|
||||
#: ../../mod/display.php:130
|
||||
msgid "Item has been removed."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -4650,6 +4757,22 @@ msgstr ""
|
|||
msgid "Post to Posterous by default"
|
||||
msgstr ""
|
||||
|
||||
#: ../../view/theme/quattro/theme.php:17
|
||||
msgid "Theme settings"
|
||||
msgstr ""
|
||||
|
||||
#: ../../view/theme/quattro/theme.php:18
|
||||
msgid "Alignment"
|
||||
msgstr ""
|
||||
|
||||
#: ../../view/theme/quattro/theme.php:18
|
||||
msgid "Left"
|
||||
msgstr ""
|
||||
|
||||
#: ../../view/theme/quattro/theme.php:18
|
||||
msgid "Center"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/profile_advanced.php:17 ../../boot.php:982
|
||||
msgid "Gender:"
|
||||
msgstr ""
|
||||
|
|
@ -5692,11 +5815,11 @@ msgstr ""
|
|||
msgid "Please visit %s to approve or reject the suggestion."
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/items.php:2548
|
||||
#: ../../include/items.php:2573
|
||||
msgid "A new person is sharing with you at "
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/items.php:2548
|
||||
#: ../../include/items.php:2573
|
||||
msgid "You have a new follower at "
|
||||
msgstr ""
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<ul class="nets-ul">
|
||||
<li class="tool {{ if $sel_all }}selected{{ endif }}"><a href="$base" class="nets-link nets-all">$all</a>
|
||||
{{ for $nets as $net }}
|
||||
<li class="tool {{ if $net.selected }}selected{{ endif }}"><a href="$base?nets=$net.ref" class="nets-link">$net.name</a></li>
|
||||
<li class="tool {{ if $net.selected }}selected{{ endif }}"><a href="$base?f=&nets=$net.ref" class="nets-link">$net.name</a></li>
|
||||
{{ endfor }}
|
||||
</ul>
|
||||
|
||||
|
|
|
|||
|
|
@ -60,9 +60,9 @@ $suggestme
|
|||
|
||||
{{inc field_input.tpl with $field=$expire.days }}{{endinc}}
|
||||
<div class="field input">
|
||||
<span class="field_help"><a href="#advaced-expire-popup" id="advenced-expire" class='popupbox' title="$expire.advanced">$expire.label</a></span>
|
||||
<span class="field_help"><a href="#advanced-expire-popup" id="advanced-expire" class='popupbox' title="$expire.advanced">$expire.label</a></span>
|
||||
<div style="display: none;">
|
||||
<div id="advaced-expire-popup" style="width:auto;height:auto;overflow:auto;">
|
||||
<div id="advanced-expire-popup" style="width:auto;height:auto;overflow:auto;">
|
||||
<h3>$expire.advanced</h3>
|
||||
{{ inc field_yesno.tpl with $field=$expire.items }}{{endinc}}
|
||||
{{ inc field_yesno.tpl with $field=$expire.notes }}{{endinc}}
|
||||
|
|
|
|||
BIN
view/theme/diabook/icons/ftdevs.gif
Normal file
BIN
view/theme/diabook/icons/ftdevs.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.2 KiB |
BIN
view/theme/diabook/icons/scroll_top.png
Executable file
BIN
view/theme/diabook/icons/scroll_top.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 296 B |
|
|
@ -25,7 +25,7 @@
|
|||
<span class="icon contacts">$nav.contacts.1</span></a>
|
||||
<span id="intro-update" class="nav-notify"></span>
|
||||
<ul id="nav-contacts-menu" class="menu-popup">
|
||||
<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">Kontaktanfragen</a><span id="intro-update" class="nav-notify"></span></li>
|
||||
<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update" class="nav-notify"></span></li>
|
||||
<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
|
|
@ -38,9 +38,9 @@
|
|||
<span id="mail-update" class="nav-notify"></span>
|
||||
<ul id="nav-messages-menu" class="menu-popup">
|
||||
<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
|
||||
<li id="nav-messages-inbox"><a href="$nav.messages.0">Eingang</a></li>
|
||||
<li id="nav-messages-outbox"><a href="message/sent">Ausgang</a></li>
|
||||
<li id="nav-messages-new"><a href="message/new">Neue Nachricht</a></li>
|
||||
<li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a></li>
|
||||
<li id="nav-messages-see-all"><a href="$nav.messages.outbox.0">$nav.messages.outbox.1</a></li>
|
||||
<li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
{{ endif }}
|
||||
|
|
@ -138,18 +138,15 @@
|
|||
|
||||
</nav>
|
||||
|
||||
<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div>
|
||||
<div style="position: fixed; bottom: 5px; left: 25px;">$langselector</div>
|
||||
<div style="position: fixed; bottom: 7px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="images/bug-x.gif" title="Fehlerreport für das Theme diaBook erstellen"></a></div>
|
||||
|
||||
|
||||
<a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
|
||||
|
||||
|
||||
<div style="position: fixed; bottom: 25px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/ftdevs.gif" title="Fehlerreport für das Theme diaBook erstellen"/></a></div>
|
||||
|
||||
<ul id="nav-notifications-template" style="display:none;" rel="template">
|
||||
<li class="{4}"><a href="{0}"><img src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
|
||||
<li><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
|
||||
</ul>
|
||||
|
||||
|
||||
{#
|
||||
|
||||
{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
|
||||
|
|
|
|||
|
|
@ -619,6 +619,7 @@ nav .nav-menu-search {
|
|||
margin: 3px 17px;
|
||||
margin-right: 0px;
|
||||
height: 17px;
|
||||
width: 205px;
|
||||
}
|
||||
|
||||
nav .nav-menu-icon {
|
||||
|
|
@ -856,7 +857,7 @@ aside {
|
|||
/* background: #F1F1F1; */
|
||||
}
|
||||
aside .vcard .fn {
|
||||
font-size: 16px;
|
||||
font-size: 18px;
|
||||
font-weight: bold;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
|
|
@ -1427,11 +1428,12 @@ section {
|
|||
margin-top: 10px;
|
||||
}
|
||||
#profile-jot-form #jot-title {
|
||||
border: 0px;
|
||||
margin: 0px;
|
||||
height: 20px;
|
||||
width: 700px;
|
||||
|
||||
border-radius: 5px 5px 5px 5px;
|
||||
font-weight: bold;
|
||||
height: 20px;
|
||||
margin: 0 0 5px;
|
||||
width: 60%;
|
||||
border: 1px solid #ffffff;
|
||||
}
|
||||
#profile-jot-form #jot-title:-webkit-input-placeholder {
|
||||
|
|
@ -1883,7 +1885,12 @@ blockquote {
|
|||
padding-left: 9px;
|
||||
margin: 0 0 0 .8ex;
|
||||
}
|
||||
|
||||
.aprofile dt{
|
||||
box-shadow: 1px 1px 5px 0;
|
||||
color: #666666;
|
||||
margin: 15px 0 5px;
|
||||
padding-left: 5px;
|
||||
}
|
||||
/* ================== */
|
||||
/* = Contacts Block = */
|
||||
/* ================== */
|
||||
|
|
|
|||
|
|
@ -24,9 +24,9 @@ audio:not([controls]) {
|
|||
display: none;
|
||||
}
|
||||
|
||||
/* =============================================================================
|
||||
Base
|
||||
========================================================================== */
|
||||
/*
|
||||
* Base
|
||||
*/
|
||||
|
||||
/*
|
||||
* 1. Correct text resizing oddly in IE6/7 when body font-size is set using em units
|
||||
|
|
@ -177,7 +177,7 @@ input[type=submit] {
|
|||
padding: 1em;
|
||||
}
|
||||
.pager {
|
||||
padding-top: 30px;
|
||||
margin-top: 60px;
|
||||
display: block;
|
||||
clear: both;
|
||||
text-align: center;
|
||||
|
|
@ -613,25 +613,33 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
|
|||
aside {
|
||||
position: absolute;
|
||||
right: 15px;
|
||||
width: 255px;
|
||||
width: 230px;
|
||||
font-size: smaller;
|
||||
}
|
||||
.vcard .fn {
|
||||
font-size: 1.7em;
|
||||
font-weight: 700;
|
||||
font-weight: bold;
|
||||
border-bottom: 1px solid #729fcf;
|
||||
padding-top: 1px;
|
||||
padding-bottom: 3px;
|
||||
}
|
||||
.vcard #profile-photo-wrapper {
|
||||
margin: 10px 0px;
|
||||
margin: 20px;
|
||||
}
|
||||
.vcard #profile-photo-wrapper img {
|
||||
box-shadow: 3px 3px 10px 0;
|
||||
}
|
||||
aside h4 {
|
||||
font-size: 1.2em;
|
||||
}
|
||||
|
||||
aside #viewcontacts {
|
||||
text-align: right;
|
||||
}
|
||||
.aprofile dt {
|
||||
box-shadow: 1px 1px 5px 0;
|
||||
color: #666666;
|
||||
margin: 15px 0 5px;
|
||||
padding-left: 5px;
|
||||
}
|
||||
#profile-extra-links ul {
|
||||
margin-left: 0px;
|
||||
padding-left: 0px;
|
||||
|
|
@ -750,34 +758,27 @@ aside #viewcontacts {
|
|||
}
|
||||
#jot #jot-title {
|
||||
border: 0px;
|
||||
margin: 0px;
|
||||
margin: 0 0 5px;
|
||||
height: 20px;
|
||||
width: 100%;
|
||||
width: 90%;
|
||||
font-weight: bold;
|
||||
border: 1px solid #ffffff;
|
||||
border-radius: 5px;
|
||||
}
|
||||
#jot #jot-title:-webkit-input-placeholder {
|
||||
font-weight: normal;
|
||||
}
|
||||
#jot #jot-title:-moz-placeholder {
|
||||
font-weight: normal;
|
||||
}
|
||||
#jot #jot-title:placeholder {
|
||||
font-weight: normal;
|
||||
vertical-align: middle;
|
||||
padding: 5px 1px;
|
||||
}
|
||||
#jot #jot-title:hover,
|
||||
#jot #jot-title:focus {
|
||||
border: 1px solid #999999;
|
||||
border: 1px solid #999;
|
||||
border-radius: 5px;
|
||||
}
|
||||
#jot #character-counter {
|
||||
width: 80px;
|
||||
width: 40px;
|
||||
float: right;
|
||||
text-align: right;
|
||||
height: 20px;
|
||||
line-height: 20px;
|
||||
padding-right: 20px;
|
||||
padding: 5px;
|
||||
margin: 0 0 5px;
|
||||
}
|
||||
#profile-jot-text_tbl {
|
||||
margin-bottom: 10px;
|
||||
|
|
@ -796,10 +797,6 @@ aside #viewcontacts {
|
|||
float: left;
|
||||
margin-left: 10px;
|
||||
}
|
||||
#character-counter {
|
||||
float:right;
|
||||
padding:8px 10px;
|
||||
}
|
||||
#profile-rotator-wrapper {
|
||||
float: right;
|
||||
}
|
||||
|
|
@ -959,7 +956,7 @@ aside #viewcontacts {
|
|||
section {
|
||||
margin: 20px 6% 0 4%;
|
||||
font-size: 0.8em;
|
||||
padding-right: 250px;
|
||||
padding-right: 220px;
|
||||
min-width: 475px;
|
||||
}
|
||||
|
||||
|
|
@ -1005,7 +1002,6 @@ section {
|
|||
.wall-item-content-wrapper {
|
||||
position: relative;
|
||||
padding: 10px;
|
||||
overflow-x: auto;
|
||||
width: auto;
|
||||
}
|
||||
.wall-item-outside-wrapper .wall-item-comment-wrapper {
|
||||
|
|
@ -1110,7 +1106,7 @@ section {
|
|||
clear:both;
|
||||
}
|
||||
.wall-item-location {
|
||||
margin-top: 5px;
|
||||
margin-top: 10px;
|
||||
width: 100px;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
|
|
@ -1133,10 +1129,10 @@ section {
|
|||
display: none;
|
||||
}
|
||||
.wallwall .wwto {
|
||||
left:-10px;
|
||||
left: 5px;
|
||||
margin: 0;
|
||||
position: absolute;
|
||||
top:65px;
|
||||
top: 75px;
|
||||
width: 30px;
|
||||
z-index: 10001;
|
||||
width: 30px;
|
||||
|
|
@ -1151,8 +1147,8 @@ section {
|
|||
}
|
||||
.wall-item-arrowphoto-wrapper {
|
||||
position: absolute;
|
||||
left: 20px;
|
||||
top: 70px;
|
||||
left: 35px;
|
||||
top: 80px;
|
||||
z-index: 10002;
|
||||
}
|
||||
.wall-item-photo-menu {
|
||||
|
|
@ -1556,10 +1552,11 @@ div[id$="wrapper"] br {
|
|||
.view-contact-wrapper,
|
||||
.contact-entry-wrapper {
|
||||
float: left;
|
||||
margin-right: 20px;
|
||||
margin-bottom: 20px;
|
||||
margin-right: 5px;
|
||||
margin-bottom: 40px;
|
||||
width: 120px;
|
||||
/*height: 120px;*/
|
||||
height: 120px;
|
||||
padding: 3px;
|
||||
position: relative;
|
||||
}
|
||||
.contact-direction-wrapper {
|
||||
|
|
@ -1703,13 +1700,15 @@ div[id$="wrapper"] br {
|
|||
}
|
||||
|
||||
#settings-nickname-desc {
|
||||
background-color: #def;
|
||||
background-color: #eee;
|
||||
-webkit-border-radius: 5px;
|
||||
-moz-border-radius: 5px;
|
||||
border-radius: 5px;
|
||||
padding: 5px;
|
||||
}
|
||||
|
||||
#settings-default-perms {
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
#register-form div,
|
||||
#profile-edit-form div {
|
||||
clear: both;
|
||||
|
|
@ -1732,11 +1731,11 @@ div[id$="wrapper"] br {
|
|||
margin: 30px 0px;
|
||||
}
|
||||
.profile-edit-side-div {
|
||||
margin-top: 10px;
|
||||
margin-top: 0px;
|
||||
}
|
||||
.profile-edit-side-link {
|
||||
float: right;
|
||||
margin: 10px 20px -16px 0;
|
||||
margin: 0px 20px -18px 0;
|
||||
}
|
||||
.profile-listing {
|
||||
float: left;
|
||||
|
|
@ -2112,17 +2111,16 @@ div[id$="wrapper"] br {
|
|||
display: block;
|
||||
font-size: 1.077em;
|
||||
/*font-weight: bold;*/
|
||||
margin-bottom: 0.2em;
|
||||
margin: 0 10px 0.2em 0;
|
||||
margin: 0 10px 0.5em 0;
|
||||
border: 1px #999 solid;
|
||||
padding: 5px;
|
||||
background: #def;
|
||||
background: #eee;
|
||||
vertical-align: middle;
|
||||
}
|
||||
.field input {
|
||||
width: 250px;
|
||||
height: 25px;
|
||||
border: 1px #666 solid;
|
||||
border: 1px #999 solid;
|
||||
}
|
||||
.field textarea {
|
||||
width: 80%;
|
||||
|
|
@ -2147,8 +2145,8 @@ div[id$="wrapper"] br {
|
|||
text-decoration: none;
|
||||
}
|
||||
.field .onoff .on {
|
||||
background: url("../../../images/onoff.jpg") no-repeat 42px 1px #def;
|
||||
color: #333;
|
||||
background: url("../../../images/onoff.jpg") no-repeat 42px 1px #999;
|
||||
color: #111;
|
||||
text-align: left;
|
||||
}
|
||||
.field .onoff .off {
|
||||
|
|
|
|||
Loading…
Reference in a new issue