strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote branch 'upstream/master'

Browse source
This commit is contained in:
zottel 2012-05-31 08:43:14 +02:00
commit 20fdbda25e
11 changed files with 214 additions and 186 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '3.0.1358' );
define ( 'FRIENDICA_VERSION', '3.0.1359' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1145 );

8
include/items.php
View file

@ -180,6 +180,10 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
foreach($items as $item) {
// prevent private email from leaking.
if($item['network'] === NETWORK_MAIL)
continue;
// public feeds get html, our own nodes use bbcode
if($public_feed) {
@ -2933,8 +2937,8 @@ function fix_private_photos($s,$uid, $item = null, $cid = 0) {
logger('fix_private_photos', LOGGER_DEBUG);
$site = substr($a->get_baseurl(),strpos($a->get_baseurl(),'://'));
if(preg_match("/\[img\](.*?)\[\/img\]/is",$s,$matches)) {
$image = $matches[1];
if(preg_match("/\[img(.*?)\](.*?)\[\/img\]/is",$s,$matches)) {
$image = $matches[2];
logger('fix_private_photos: found photo ' . $image, LOGGER_DEBUG);
if(stristr($image , $site . '/photo/')) {
$replace = false;

4
include/text.php
View file

@ -742,6 +742,8 @@ function smilies($s, $sample = false) {
':homebrew',
':coffee',
':facepalm',
':like',
':dislike',
'~friendika',
'~friendica'
@ -778,6 +780,8 @@ function smilies($s, $sample = false) {
'<img src="' . $a->get_baseurl() . '/images/beer_mug.gif" alt=":homebrew" />',
'<img src="' . $a->get_baseurl() . '/images/coffee.gif" alt=":coffee" />',
'<img src="' . $a->get_baseurl() . '/images/smiley-facepalm.gif" alt=":facepalm" />',
'<img src="' . $a->get_baseurl() . '/images/like.gif" alt=":like" />',
'<img src="' . $a->get_baseurl() . '/images/dislike.gif" alt=":dislike" />',
'<a href="http://project.friendika.com">~friendika <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendika" /></a>',
'<a href="http://friendica.com">~friendica <img src="' . $a->get_baseurl() . '/images/friendica-16.png" alt="~friendica" /></a>'
);

2
js/country.js
View file

@ -275,7 +275,7 @@ aStates[249]="|'Adan|'Ataq|Abyan|Al Bayda'|Al Hudaydah|Al Jawf|Al Mahrah|Al Mahw
aStates[250]="|Kosovo|Montenegro|Serbia|Vojvodina";
aStates[251]="|Central|Copperbelt|Eastern|Luapula|Lusaka|North-Western|Northern|Southern|Western";
aStates[252]="|Bulawayo|Harare|ManicalandMashonaland Central|Mashonaland East|Mashonaland West|Masvingo|Matabeleland North|Matabeleland South|Midlands";
aStates[253]="Self Hosted|Private Server|Architects Of Sleep|DFRN|Distributed Friend Network|Free-Beer.ch|Foojbook|Free-Haven|Friendica.eu|Friendika.me.4.it|Friendika - I Ask Questions|Frndc.com|Hipatia|Hungerfreunde|Kaluguran Community|Kak Ste?|Karl.Markx.pm|Loozah Social Club|MyFriendica.net|MyFriendNetwork|Oi!|OpenMindSpace|Oradons Friendica|Recolutionari.es|Sysfu Social Club|theshi.re|Tumpambae|Uzmiac|Other";
aStates[253]="|Self Hosted|Private Server|Architects Of Sleep|DFRN|Distributed Friend Network|Free-Beer.ch|Foojbook|Free-Haven|Friendica.eu|Friendika.me.4.it|Friendika - I Ask Questions|Frndc.com|Hipatia|Hungerfreunde|Kaluguran Community|Kak Ste?|Karl.Markx.pm|Loozah Social Club|MyFriendica.net|MyFriendNetwork|Oi!|OpenMindSpace|Recolutionari.es|Sysfu Social Club|theshi.re|Tumpambae|Uzmiac|Other";
/*
* gArCountryInfo
* (0) Country name

2
mod/acl.php
View file

@ -135,7 +135,7 @@ function acl_init(&$a){
foreach($r as $g) {
$x['photos'][] = $g['micro'];
$x['links'][] = $g['url'];
$x['suggestions'][] = $g['name']; // sprintf( t('%s [%s]'),$g['name'],$g['url']);
$x['suggestions'][] = $g['name'];
$x['data'][] = intval($g['id']);
}
}

5
mod/register.php
View file

@ -290,6 +290,11 @@ function register_post(&$a) {
dbesc(datetime_convert())
);
// Create a group with no members. This allows somebody to use it
// right away as a default group for new contacts.
require_once('include/group.php');
group_add($newuid, t('Friends'));
}

16
mod/settings.php
View file

@ -837,27 +837,26 @@ function settings_content(&$a) {
$pageset_tpl = get_markup_template('pagetypes.tpl');
$pagetype = replace_macros($pageset_tpl,array(
'$page_normal' => array('page-flags', t('Normal Account'), PAGE_NORMAL,
'$page_normal' => array('page-flags', t('Normal Account Page'), PAGE_NORMAL,
t('This account is a normal personal profile'),
($a->user['page-flags'] == PAGE_NORMAL)),
'$page_soapbox' => array('page-flags', t('Soapbox Account'), PAGE_SOAPBOX,
'$page_soapbox' => array('page-flags', t('Soapbox Page'), PAGE_SOAPBOX,
t('Automatically approve all connection/friend requests as read-only fans'),
($a->user['page-flags'] == PAGE_SOAPBOX)),
'$page_community' => array('page-flags', t('Community/Celebrity Account'), PAGE_COMMUNITY,
'$page_community' => array('page-flags', t('Community Forum/Celebrity Account'), PAGE_COMMUNITY,
t('Automatically approve all connection/friend requests as read-write fans'),
($a->user['page-flags'] == PAGE_COMMUNITY)),
'$page_freelove' => array('page-flags', t('Automatic Friend Account'), PAGE_FREELOVE,
'$page_freelove' => array('page-flags', t('Automatic Friend Page'), PAGE_FREELOVE,
t('Automatically approve all connection/friend requests as friends'),
($a->user['page-flags'] == PAGE_FREELOVE)),
'$page_prvgroup' => array('page-flags', t('Private Forum'), PAGE_PRVGROUP,
t('Private forum - approved members only [Experimental]'),
'$page_prvgroup' => array('page-flags', t('Private Forum [Experimental]'), PAGE_PRVGROUP,
t('Private forum - approved members only'),
($a->user['page-flags'] == PAGE_PRVGROUP)),
'$experimental' => ( (intval(get_config('system','prvgroup_testing'))) ? 'true' : ''),
));
@ -1026,7 +1025,8 @@ function settings_content(&$a) {
'$notify7' => array('notify7', t('You are tagged in a post'), ($notify & NOTIFY_TAGSELF), NOTIFY_TAGSELF, ''),
'$h_advn' => t('Advanced Page Settings'),
'$h_advn' => t('Advanced Account/Page Type Settings'),
'$h_descadvn' => t('Change the behaviour of this account for special situations'),
'$pagetype' => $pagetype,

336
util/messages.po
View file

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: 3.0.1358\n"
"Project-Id-Version: 3.0.1359\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-05-29 10:00-0700\n"
"POT-Creation-Date: 2012-05-30 10:00-0700\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"
@ -159,7 +159,7 @@ msgstr ""
#: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102
#: ../../addon/posterous/posterous.php:103
#: ../../view/theme/cleanzero/config.php:80
#: ../../view/theme/diabook/theme.php:752
#: ../../view/theme/diabook/theme.php:757
#: ../../view/theme/diabook/config.php:190
#: ../../view/theme/quattro/config.php:52 ../../view/theme/dispy/config.php:70
#: ../../include/conversation.php:559
@ -220,7 +220,7 @@ msgstr ""
msgid "link to source"
msgstr ""
#: ../../mod/events.php:324 ../../view/theme/diabook/theme.php:126
#: ../../mod/events.php:324 ../../view/theme/diabook/theme.php:131
#: ../../include/nav.php:52 ../../boot.php:1520
msgid "Events"
msgstr ""
@ -280,7 +280,7 @@ msgid "Share this event"
msgstr ""
#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
#: ../../mod/dfrn_request.php:826 ../../mod/settings.php:556
#: ../../mod/dfrn_request.php:830 ../../mod/settings.php:556
#: ../../mod/settings.php:582 ../../addon/js_upload/js_upload.php:45
msgid "Cancel"
msgstr ""
@ -324,26 +324,26 @@ msgid ""
"and/or create new posts for you?"
msgstr ""
#: ../../mod/api.php:105 ../../mod/dfrn_request.php:814
#: ../../mod/api.php:105 ../../mod/dfrn_request.php:818
#: ../../mod/settings.php:880 ../../mod/settings.php:886
#: ../../mod/settings.php:894 ../../mod/settings.php:898
#: ../../mod/settings.php:903 ../../mod/settings.php:909
#: ../../mod/settings.php:915 ../../mod/settings.php:921
#: ../../mod/settings.php:957 ../../mod/settings.php:958
#: ../../mod/settings.php:959 ../../mod/settings.php:960
#: ../../mod/settings.php:961 ../../mod/register.php:511
#: ../../mod/settings.php:961 ../../mod/register.php:516
#: ../../mod/profiles.php:520
msgid "Yes"
msgstr ""
#: ../../mod/api.php:106 ../../mod/dfrn_request.php:815
#: ../../mod/api.php:106 ../../mod/dfrn_request.php:819
#: ../../mod/settings.php:880 ../../mod/settings.php:886
#: ../../mod/settings.php:894 ../../mod/settings.php:898
#: ../../mod/settings.php:903 ../../mod/settings.php:909
#: ../../mod/settings.php:915 ../../mod/settings.php:921
#: ../../mod/settings.php:957 ../../mod/settings.php:958
#: ../../mod/settings.php:959 ../../mod/settings.php:960
#: ../../mod/settings.php:961 ../../mod/register.php:512
#: ../../mod/settings.php:961 ../../mod/register.php:517
#: ../../mod/profiles.php:521
msgid "No"
msgstr ""
@ -356,7 +356,7 @@ msgstr ""
#: ../../mod/photos.php:1005 ../../mod/photos.php:1020
#: ../../mod/photos.php:1445 ../../mod/photos.php:1457
#: ../../addon/communityhome/communityhome.php:110
#: ../../view/theme/diabook/theme.php:593
#: ../../view/theme/diabook/theme.php:598
msgid "Contact Photos"
msgstr ""
@ -373,13 +373,13 @@ msgid "Contact information unavailable"
msgstr ""
#: ../../mod/photos.php:151 ../../mod/photos.php:652 ../../mod/photos.php:1005
#: ../../mod/photos.php:1020 ../../mod/register.php:314
#: ../../mod/register.php:321 ../../mod/register.php:328
#: ../../mod/photos.php:1020 ../../mod/register.php:319
#: ../../mod/register.php:326 ../../mod/register.php:333
#: ../../mod/profile_photo.php:60 ../../mod/profile_photo.php:67
#: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174
#: ../../mod/profile_photo.php:252 ../../mod/profile_photo.php:261
#: ../../addon/communityhome/communityhome.php:111
#: ../../view/theme/diabook/theme.php:594
#: ../../view/theme/diabook/theme.php:599
msgid "Profile Photos"
msgstr ""
@ -401,7 +401,7 @@ msgstr ""
#: ../../mod/photos.php:583 ../../mod/like.php:127 ../../mod/tagger.php:70
#: ../../addon/communityhome/communityhome.php:163
#: ../../view/theme/diabook/theme.php:565 ../../include/text.php:1311
#: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1311
#: ../../include/diaspora.php:1662 ../../include/conversation.php:53
#: ../../include/conversation.php:126
msgid "photo"
@ -430,7 +430,7 @@ msgid "Image upload failed."
msgstr ""
#: ../../mod/photos.php:814 ../../mod/community.php:16
#: ../../mod/dfrn_request.php:740 ../../mod/viewcontacts.php:17
#: ../../mod/dfrn_request.php:744 ../../mod/viewcontacts.php:17
#: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:29
msgid "Public access denied."
msgstr ""
@ -580,12 +580,12 @@ msgstr ""
msgid "Not available."
msgstr ""
#: ../../mod/community.php:30 ../../view/theme/diabook/theme.php:128
#: ../../mod/community.php:30 ../../view/theme/diabook/theme.php:133
#: ../../include/nav.php:101
msgid "Community"
msgstr ""
#: ../../mod/community.php:61 ../../mod/search.php:138
#: ../../mod/community.php:61 ../../mod/search.php:144
msgid "No results."
msgstr ""
@ -702,184 +702,188 @@ msgstr ""
msgid "This introduction has already been accepted."
msgstr ""
#: ../../mod/dfrn_request.php:117 ../../mod/dfrn_request.php:495
#: ../../mod/dfrn_request.php:118 ../../mod/dfrn_request.php:497
msgid "Profile location is not valid or does not contain profile information."
msgstr ""
#: ../../mod/dfrn_request.php:122 ../../mod/dfrn_request.php:500
#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:502
msgid "Warning: profile location has no identifiable owner name."
msgstr ""
#: ../../mod/dfrn_request.php:124 ../../mod/dfrn_request.php:502
#: ../../mod/dfrn_request.php:125 ../../mod/dfrn_request.php:504
msgid "Warning: profile location has no profile photo."
msgstr ""
#: ../../mod/dfrn_request.php:127 ../../mod/dfrn_request.php:505
#: ../../mod/dfrn_request.php:128 ../../mod/dfrn_request.php:507
#, php-format
msgid "%d required parameter was not found at the given location"
msgid_plural "%d required parameters were not found at the given location"
msgstr[0] ""
msgstr[1] ""
#: ../../mod/dfrn_request.php:168
#: ../../mod/dfrn_request.php:170
msgid "Introduction complete."
msgstr ""
#: ../../mod/dfrn_request.php:192
#: ../../mod/dfrn_request.php:194
msgid "Unrecoverable protocol error."
msgstr ""
#: ../../mod/dfrn_request.php:220
#: ../../mod/dfrn_request.php:222
msgid "Profile unavailable."
msgstr ""
#: ../../mod/dfrn_request.php:245
#: ../../mod/dfrn_request.php:247
#, php-format
msgid "%s has received too many connection requests today."
msgstr ""
#: ../../mod/dfrn_request.php:246
#: ../../mod/dfrn_request.php:248
msgid "Spam protection measures have been invoked."
msgstr ""
#: ../../mod/dfrn_request.php:247
#: ../../mod/dfrn_request.php:249
msgid "Friends are advised to please try again in 24 hours."
msgstr ""
#: ../../mod/dfrn_request.php:309
#: ../../mod/dfrn_request.php:311
msgid "Invalid locator"
msgstr ""
#: ../../mod/dfrn_request.php:318
#: ../../mod/dfrn_request.php:320
msgid "Invalid email address."
msgstr ""
#: ../../mod/dfrn_request.php:344
#: ../../mod/dfrn_request.php:346
msgid "This account has not been configured for email. Request failed."
msgstr ""
#: ../../mod/dfrn_request.php:440
#: ../../mod/dfrn_request.php:442
msgid "Unable to resolve your name at the provided location."
msgstr ""
#: ../../mod/dfrn_request.php:453
#: ../../mod/dfrn_request.php:455
msgid "You have already introduced yourself here."
msgstr ""
#: ../../mod/dfrn_request.php:457
#: ../../mod/dfrn_request.php:459
#, php-format
msgid "Apparently you are already friends with %s."
msgstr ""
#: ../../mod/dfrn_request.php:478
#: ../../mod/dfrn_request.php:480
msgid "Invalid profile URL."
msgstr ""
#: ../../mod/dfrn_request.php:484 ../../mod/follow.php:23
#: ../../mod/dfrn_request.php:486 ../../mod/follow.php:23
msgid "Disallowed profile URL."
msgstr ""
#: ../../mod/dfrn_request.php:553 ../../mod/contacts.php:102
#: ../../mod/dfrn_request.php:555 ../../mod/contacts.php:102
msgid "Failed to update contact record."
msgstr ""
#: ../../mod/dfrn_request.php:574
#: ../../mod/dfrn_request.php:576
msgid "Your introduction has been sent."
msgstr ""
#: ../../mod/dfrn_request.php:627
#: ../../mod/dfrn_request.php:629
msgid "Please login to confirm introduction."
msgstr ""
#: ../../mod/dfrn_request.php:641
#: ../../mod/dfrn_request.php:643
msgid ""
"Incorrect identity currently logged in. Please login to <strong>this</"
"strong> profile."
msgstr ""
#: ../../mod/dfrn_request.php:653
#: ../../mod/dfrn_request.php:654
msgid "Hide this contact"
msgstr ""
#: ../../mod/dfrn_request.php:657
#, php-format
msgid "Welcome home %s."
msgstr ""
#: ../../mod/dfrn_request.php:654
#: ../../mod/dfrn_request.php:658
#, php-format
msgid "Please confirm your introduction/connection request to %s."
msgstr ""
#: ../../mod/dfrn_request.php:655
#: ../../mod/dfrn_request.php:659
msgid "Confirm"
msgstr ""
#: ../../mod/dfrn_request.php:696 ../../include/items.php:2729
#: ../../mod/dfrn_request.php:700 ../../include/items.php:2729
msgid "[Name Withheld]"
msgstr ""
#: ../../mod/dfrn_request.php:789
#: ../../mod/dfrn_request.php:793
msgid ""
"Please enter your 'Identity Address' from one of the following supported "
"communications networks:"
msgstr ""
#: ../../mod/dfrn_request.php:805
#: ../../mod/dfrn_request.php:809
msgid "<strike>Connect as an email follower</strike> (Coming soon)"
msgstr ""
#: ../../mod/dfrn_request.php:807
#: ../../mod/dfrn_request.php:811
msgid ""
"If you are not yet a member of the free social web, <a href=\"http://dir."
"friendica.com/siteinfo\">follow this link to find a public Friendica site "
"and join us today</a>."
msgstr ""
#: ../../mod/dfrn_request.php:810
#: ../../mod/dfrn_request.php:814
msgid "Friend/Connection Request"
msgstr ""
#: ../../mod/dfrn_request.php:811
#: ../../mod/dfrn_request.php:815
msgid ""
"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
"testuser@identi.ca"
msgstr ""
#: ../../mod/dfrn_request.php:812
#: ../../mod/dfrn_request.php:816
msgid "Please answer the following:"
msgstr ""
#: ../../mod/dfrn_request.php:813
#: ../../mod/dfrn_request.php:817
#, php-format
msgid "Does %s know you?"
msgstr ""
#: ../../mod/dfrn_request.php:816
#: ../../mod/dfrn_request.php:820
msgid "Add a personal note:"
msgstr ""
#: ../../mod/dfrn_request.php:818 ../../include/contact_selectors.php:76
#: ../../mod/dfrn_request.php:822 ../../include/contact_selectors.php:76
msgid "Friendica"
msgstr ""
#: ../../mod/dfrn_request.php:819
#: ../../mod/dfrn_request.php:823
msgid "StatusNet/Federated Social Web"
msgstr ""
#: ../../mod/dfrn_request.php:820 ../../mod/settings.php:652
#: ../../mod/dfrn_request.php:824 ../../mod/settings.php:652
#: ../../include/contact_selectors.php:80
msgid "Diaspora"
msgstr ""
#: ../../mod/dfrn_request.php:821
#: ../../mod/dfrn_request.php:825
#, php-format
msgid ""
" - please do not use this form. Instead, enter %s into your Diaspora search "
"bar."
msgstr ""
#: ../../mod/dfrn_request.php:822
#: ../../mod/dfrn_request.php:826
msgid "Your Identity Address:"
msgstr ""
#: ../../mod/dfrn_request.php:825
#: ../../mod/dfrn_request.php:829
msgid "Submit Request"
msgstr ""
@ -1231,7 +1235,7 @@ msgstr ""
msgid "Personal"
msgstr ""
#: ../../mod/notifications.php:90 ../../view/theme/diabook/theme.php:122
#: ../../mod/notifications.php:90 ../../view/theme/diabook/theme.php:127
#: ../../include/nav.php:77 ../../include/nav.php:115
msgid "Home"
msgstr ""
@ -1672,7 +1676,7 @@ msgstr ""
msgid "Edit contact"
msgstr ""
#: ../../mod/contacts.php:544 ../../view/theme/diabook/theme.php:124
#: ../../mod/contacts.php:544 ../../view/theme/diabook/theme.php:129
#: ../../include/nav.php:139
msgid "Contacts"
msgstr ""
@ -1704,8 +1708,8 @@ msgid "Password reset requested at %s"
msgstr ""
#: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107
#: ../../mod/register.php:367 ../../mod/register.php:421
#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:745
#: ../../mod/register.php:372 ../../mod/register.php:426
#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752
#: ../../addon/facebook/facebook.php:688
#: ../../addon/facebook/facebook.php:1178
#: ../../addon/public_server/public_server.php:62
@ -1793,8 +1797,8 @@ msgid "Remove account"
msgstr ""
#: ../../mod/settings.php:89 ../../mod/admin.php:748 ../../mod/admin.php:953
#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:638
#: ../../view/theme/diabook/theme.php:768 ../../include/nav.php:137
#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:643
#: ../../view/theme/diabook/theme.php:773 ../../include/nav.php:137
msgid "Settings"
msgstr ""
@ -2639,7 +2643,7 @@ msgstr ""
msgid "Profile Visibility Editor"
msgstr ""
#: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:123
#: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:128
#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74
#: ../../include/nav.php:50 ../../boot.php:1505
msgid "Profile"
@ -2729,91 +2733,95 @@ msgstr ""
msgid "An error occurred creating your default profile. Please try again."
msgstr ""
#: ../../mod/register.php:365 ../../mod/regmod.php:52
#: ../../mod/register.php:297 ../../include/profile_selectors.php:42
msgid "Friends"
msgstr ""
#: ../../mod/register.php:370 ../../mod/regmod.php:52
#, php-format
msgid "Registration details for %s"
msgstr ""
#: ../../mod/register.php:373
#: ../../mod/register.php:378
msgid ""
"Registration successful. Please check your email for further instructions."
msgstr ""
#: ../../mod/register.php:377
#: ../../mod/register.php:382
msgid "Failed to send email message. Here is the message that failed."
msgstr ""
#: ../../mod/register.php:382
#: ../../mod/register.php:387
msgid "Your registration can not be processed."
msgstr ""
#: ../../mod/register.php:419
#: ../../mod/register.php:424
#, php-format
msgid "Registration request at %s"
msgstr ""
#: ../../mod/register.php:428
#: ../../mod/register.php:433
msgid "Your registration is pending approval by the site owner."
msgstr ""
#: ../../mod/register.php:466
#: ../../mod/register.php:471
msgid ""
"This site has exceeded the number of allowed daily account registrations. "
"Please try again tomorrow."
msgstr ""
#: ../../mod/register.php:492
#: ../../mod/register.php:497
msgid ""
"You may (optionally) fill in this form via OpenID by supplying your OpenID "
"and clicking 'Register'."
msgstr ""
#: ../../mod/register.php:493
#: ../../mod/register.php:498
msgid ""
"If you are not familiar with OpenID, please leave that field blank and fill "
"in the rest of the items."
msgstr ""
#: ../../mod/register.php:494
#: ../../mod/register.php:499
msgid "Your OpenID (optional): "
msgstr ""
#: ../../mod/register.php:508
#: ../../mod/register.php:513
msgid "Include your profile in member directory?"
msgstr ""
#: ../../mod/register.php:528
#: ../../mod/register.php:533
msgid "Membership on this site is by invitation only."
msgstr ""
#: ../../mod/register.php:529
#: ../../mod/register.php:534
msgid "Your invitation ID: "
msgstr ""
#: ../../mod/register.php:532 ../../mod/admin.php:418
#: ../../mod/register.php:537 ../../mod/admin.php:418
msgid "Registration"
msgstr ""
#: ../../mod/register.php:540
#: ../../mod/register.php:545
msgid "Your Full Name (e.g. Joe Smith): "
msgstr ""
#: ../../mod/register.php:541
#: ../../mod/register.php:546
msgid "Your Email Address: "
msgstr ""
#: ../../mod/register.php:542
#: ../../mod/register.php:547
msgid ""
"Choose a profile nickname. This must begin with a text character. Your "
"profile address on this site will then be '<strong>nickname@$sitename</"
"strong>'."
msgstr ""
#: ../../mod/register.php:543
#: ../../mod/register.php:548
msgid "Choose a nickname: "
msgstr ""
#: ../../mod/register.php:546 ../../include/nav.php:81 ../../boot.php:792
#: ../../mod/register.php:551 ../../include/nav.php:81 ../../boot.php:792
msgid "Register"
msgstr ""
@ -2825,8 +2833,8 @@ msgstr ""
#: ../../addon/facebook/facebook.php:1572
#: ../../addon/communityhome/communityhome.php:158
#: ../../addon/communityhome/communityhome.php:167
#: ../../view/theme/diabook/theme.php:560
#: ../../view/theme/diabook/theme.php:569 ../../include/diaspora.php:1662
#: ../../view/theme/diabook/theme.php:565
#: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1662
#: ../../include/conversation.php:48 ../../include/conversation.php:57
#: ../../include/conversation.php:121 ../../include/conversation.php:130
msgid "status"
@ -2834,7 +2842,7 @@ msgstr ""
#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1576
#: ../../addon/communityhome/communityhome.php:172
#: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1678
#: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1678
#: ../../include/conversation.php:65
#, php-format
msgid "%1$s likes %2$s's %3$s"
@ -2855,7 +2863,7 @@ msgstr ""
msgid "Access denied."
msgstr ""
#: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:125
#: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:130
#: ../../include/nav.php:51 ../../boot.php:1511
msgid "Photos"
msgstr ""
@ -2891,28 +2899,28 @@ msgstr ""
msgid "Wall Photos"
msgstr ""
#: ../../mod/item.php:788
#: ../../mod/item.php:800
msgid "System error. Post not saved."
msgstr ""
#: ../../mod/item.php:813
#: ../../mod/item.php:825
#, php-format
msgid ""
"This message was sent to you by %s, a member of the Friendica social network."
msgstr ""
#: ../../mod/item.php:815
#: ../../mod/item.php:827
#, php-format
msgid "You may visit them online at %s"
msgstr ""
#: ../../mod/item.php:816
#: ../../mod/item.php:828
msgid ""
"Please contact the sender by replying to this post if you do not wish to "
"receive these messages."
msgstr ""
#: ../../mod/item.php:818
#: ../../mod/item.php:830
#, php-format
msgid "%s posted an update."
msgstr ""
@ -4125,7 +4133,7 @@ msgstr ""
msgid "No entries."
msgstr ""
#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:621
#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:626
#: ../../include/contact_widgets.php:34
msgid "Friend Suggestions"
msgstr ""
@ -4140,7 +4148,7 @@ msgstr ""
msgid "Ignore/Hide"
msgstr ""
#: ../../mod/directory.php:47 ../../view/theme/diabook/theme.php:619
#: ../../mod/directory.php:47 ../../view/theme/diabook/theme.php:624
msgid "Global Directory"
msgstr ""
@ -4250,83 +4258,83 @@ msgid ""
"has already been approved."
msgstr ""
#: ../../mod/dfrn_confirm.php:235
#: ../../mod/dfrn_confirm.php:237
msgid "Response from remote site was not understood."
msgstr ""
#: ../../mod/dfrn_confirm.php:244
#: ../../mod/dfrn_confirm.php:246
msgid "Unexpected response from remote site: "
msgstr ""
#: ../../mod/dfrn_confirm.php:252
#: ../../mod/dfrn_confirm.php:254
msgid "Confirmation completed successfully."
msgstr ""
#: ../../mod/dfrn_confirm.php:254 ../../mod/dfrn_confirm.php:268
#: ../../mod/dfrn_confirm.php:275
#: ../../mod/dfrn_confirm.php:256 ../../mod/dfrn_confirm.php:270
#: ../../mod/dfrn_confirm.php:277
msgid "Remote site reported: "
msgstr ""
#: ../../mod/dfrn_confirm.php:266
#: ../../mod/dfrn_confirm.php:268
msgid "Temporary failure. Please wait and try again."
msgstr ""
#: ../../mod/dfrn_confirm.php:273
#: ../../mod/dfrn_confirm.php:275
msgid "Introduction failed or was revoked."
msgstr ""
#: ../../mod/dfrn_confirm.php:418
#: ../../mod/dfrn_confirm.php:420
msgid "Unable to set contact photo."
msgstr ""
#: ../../mod/dfrn_confirm.php:475 ../../include/diaspora.php:507
#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:507
#: ../../include/conversation.php:101
#, php-format
msgid "%1$s is now friends with %2$s"
msgstr ""
#: ../../mod/dfrn_confirm.php:557
#: ../../mod/dfrn_confirm.php:562
#, php-format
msgid "No user record found for '%s' "
msgstr ""
#: ../../mod/dfrn_confirm.php:567
#: ../../mod/dfrn_confirm.php:572
msgid "Our site encryption key is apparently messed up."
msgstr ""
#: ../../mod/dfrn_confirm.php:578
#: ../../mod/dfrn_confirm.php:583
msgid "Empty site URL was provided or URL could not be decrypted by us."
msgstr ""
#: ../../mod/dfrn_confirm.php:599
#: ../../mod/dfrn_confirm.php:604
msgid "Contact record was not found for you on our site."
msgstr ""
#: ../../mod/dfrn_confirm.php:613
#: ../../mod/dfrn_confirm.php:618
#, php-format
msgid "Site public key not available in contact record for URL %s."
msgstr ""
#: ../../mod/dfrn_confirm.php:633
#: ../../mod/dfrn_confirm.php:638
msgid ""
"The ID provided by your system is a duplicate on our system. It should work "
"if you try again."
msgstr ""
#: ../../mod/dfrn_confirm.php:644
#: ../../mod/dfrn_confirm.php:649
msgid "Unable to set your contact credentials on our system."
msgstr ""
#: ../../mod/dfrn_confirm.php:709
#: ../../mod/dfrn_confirm.php:716
msgid "Unable to update your contact profile details on our system"
msgstr ""
#: ../../mod/dfrn_confirm.php:743
#: ../../mod/dfrn_confirm.php:750
#, php-format
msgid "Connection accepted at %s"
msgstr ""
#: ../../mod/dfrn_confirm.php:792
#: ../../mod/dfrn_confirm.php:799
#, php-format
msgid "%1$s has joined %2$s"
msgstr ""
@ -4725,7 +4733,7 @@ msgid "Latest likes"
msgstr ""
#: ../../addon/communityhome/communityhome.php:155
#: ../../view/theme/diabook/theme.php:557 ../../include/text.php:1309
#: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1309
#: ../../include/conversation.php:45 ../../include/conversation.php:118
msgid "event"
msgstr ""
@ -5687,153 +5695,153 @@ msgstr ""
msgid "Color scheme"
msgstr ""
#: ../../view/theme/diabook/theme.php:122 ../../include/nav.php:49
#: ../../view/theme/diabook/theme.php:127 ../../include/nav.php:49
#: ../../include/nav.php:115
msgid "Your posts and conversations"
msgstr ""
#: ../../view/theme/diabook/theme.php:123 ../../include/nav.php:50
#: ../../view/theme/diabook/theme.php:128 ../../include/nav.php:50
msgid "Your profile page"
msgstr ""
#: ../../view/theme/diabook/theme.php:124
#: ../../view/theme/diabook/theme.php:129
msgid "Your contacts"
msgstr ""
#: ../../view/theme/diabook/theme.php:125 ../../include/nav.php:51
#: ../../view/theme/diabook/theme.php:130 ../../include/nav.php:51
msgid "Your photos"
msgstr ""
#: ../../view/theme/diabook/theme.php:126 ../../include/nav.php:52
#: ../../view/theme/diabook/theme.php:131 ../../include/nav.php:52
msgid "Your events"
msgstr ""
#: ../../view/theme/diabook/theme.php:127 ../../include/nav.php:53
#: ../../view/theme/diabook/theme.php:132 ../../include/nav.php:53
msgid "Personal notes"
msgstr ""
#: ../../view/theme/diabook/theme.php:127 ../../include/nav.php:53
#: ../../view/theme/diabook/theme.php:132 ../../include/nav.php:53
msgid "Your personal photos"
msgstr ""
#: ../../view/theme/diabook/theme.php:129
#: ../../view/theme/diabook/theme.php:638
#: ../../view/theme/diabook/theme.php:742
#: ../../view/theme/diabook/theme.php:134
#: ../../view/theme/diabook/theme.php:643
#: ../../view/theme/diabook/theme.php:747
#: ../../view/theme/diabook/config.php:201
msgid "Community Pages"
msgstr ""
#: ../../view/theme/diabook/theme.php:485
#: ../../view/theme/diabook/theme.php:744
#: ../../view/theme/diabook/theme.php:490
#: ../../view/theme/diabook/theme.php:749
#: ../../view/theme/diabook/config.php:203
msgid "Community Profiles"
msgstr ""
#: ../../view/theme/diabook/theme.php:506
#: ../../view/theme/diabook/theme.php:749
#: ../../view/theme/diabook/theme.php:511
#: ../../view/theme/diabook/theme.php:754
#: ../../view/theme/diabook/config.php:208
msgid "Last users"
msgstr ""
#: ../../view/theme/diabook/theme.php:535
#: ../../view/theme/diabook/theme.php:751
#: ../../view/theme/diabook/theme.php:540
#: ../../view/theme/diabook/theme.php:756
#: ../../view/theme/diabook/config.php:210
msgid "Last likes"
msgstr ""
#: ../../view/theme/diabook/theme.php:580
#: ../../view/theme/diabook/theme.php:750
#: ../../view/theme/diabook/theme.php:585
#: ../../view/theme/diabook/theme.php:755
#: ../../view/theme/diabook/config.php:209
msgid "Last photos"
msgstr ""
#: ../../view/theme/diabook/theme.php:617
#: ../../view/theme/diabook/theme.php:747
#: ../../view/theme/diabook/theme.php:622
#: ../../view/theme/diabook/theme.php:752
#: ../../view/theme/diabook/config.php:206
msgid "Find Friends"
msgstr ""
#: ../../view/theme/diabook/theme.php:618
#: ../../view/theme/diabook/theme.php:623
msgid "Local Directory"
msgstr ""
#: ../../view/theme/diabook/theme.php:620 ../../include/contact_widgets.php:35
#: ../../view/theme/diabook/theme.php:625 ../../include/contact_widgets.php:35
msgid "Similar Interests"
msgstr ""
#: ../../view/theme/diabook/theme.php:622 ../../include/contact_widgets.php:37
#: ../../view/theme/diabook/theme.php:627 ../../include/contact_widgets.php:37
msgid "Invite Friends"
msgstr ""
#: ../../view/theme/diabook/theme.php:673
#: ../../view/theme/diabook/theme.php:743
#: ../../view/theme/diabook/theme.php:678
#: ../../view/theme/diabook/theme.php:748
#: ../../view/theme/diabook/config.php:202
msgid "Earth Layers"
msgstr ""
#: ../../view/theme/diabook/theme.php:678
#: ../../view/theme/diabook/theme.php:683
msgid "Set zoomfactor for Earth Layers"
msgstr ""
#: ../../view/theme/diabook/theme.php:679
#: ../../view/theme/diabook/theme.php:684
#: ../../view/theme/diabook/config.php:199
msgid "Set longitude (X) for Earth Layers"
msgstr ""
#: ../../view/theme/diabook/theme.php:680
#: ../../view/theme/diabook/theme.php:685
#: ../../view/theme/diabook/config.php:200
msgid "Set latitude (Y) for Earth Layers"
msgstr ""
#: ../../view/theme/diabook/theme.php:693
#: ../../view/theme/diabook/theme.php:745
#: ../../view/theme/diabook/theme.php:698
#: ../../view/theme/diabook/theme.php:750
#: ../../view/theme/diabook/config.php:204
msgid "Help or @NewHere ?"
msgstr ""
#: ../../view/theme/diabook/theme.php:700
#: ../../view/theme/diabook/theme.php:746
#: ../../view/theme/diabook/theme.php:705
#: ../../view/theme/diabook/theme.php:751
#: ../../view/theme/diabook/config.php:205
msgid "Connect Services"
msgstr ""
#: ../../view/theme/diabook/theme.php:707
#: ../../view/theme/diabook/theme.php:748
#: ../../view/theme/diabook/theme.php:712
#: ../../view/theme/diabook/theme.php:753
msgid "Last Tweets"
msgstr ""
#: ../../view/theme/diabook/theme.php:710
#: ../../view/theme/diabook/theme.php:715
#: ../../view/theme/diabook/config.php:197
msgid "Set twitter search term"
msgstr ""
#: ../../view/theme/diabook/theme.php:730
#: ../../view/theme/diabook/theme.php:731
#: ../../view/theme/diabook/theme.php:732
#: ../../view/theme/diabook/theme.php:733
#: ../../view/theme/diabook/theme.php:734
#: ../../view/theme/diabook/theme.php:735
#: ../../view/theme/diabook/theme.php:736
#: ../../view/theme/diabook/theme.php:737
#: ../../view/theme/diabook/theme.php:738
#: ../../view/theme/diabook/theme.php:739 ../../include/acl_selectors.php:288
#: ../../view/theme/diabook/theme.php:739
#: ../../view/theme/diabook/theme.php:740
#: ../../view/theme/diabook/theme.php:741
#: ../../view/theme/diabook/theme.php:742
#: ../../view/theme/diabook/theme.php:743
#: ../../view/theme/diabook/theme.php:744 ../../include/acl_selectors.php:288
msgid "don't show"
msgstr ""
#: ../../view/theme/diabook/theme.php:730
#: ../../view/theme/diabook/theme.php:731
#: ../../view/theme/diabook/theme.php:732
#: ../../view/theme/diabook/theme.php:733
#: ../../view/theme/diabook/theme.php:734
#: ../../view/theme/diabook/theme.php:735
#: ../../view/theme/diabook/theme.php:736
#: ../../view/theme/diabook/theme.php:737
#: ../../view/theme/diabook/theme.php:738
#: ../../view/theme/diabook/theme.php:739 ../../include/acl_selectors.php:287
#: ../../view/theme/diabook/theme.php:739
#: ../../view/theme/diabook/theme.php:740
#: ../../view/theme/diabook/theme.php:741
#: ../../view/theme/diabook/theme.php:742
#: ../../view/theme/diabook/theme.php:743
#: ../../view/theme/diabook/theme.php:744 ../../include/acl_selectors.php:287
msgid "show"
msgstr ""
#: ../../view/theme/diabook/theme.php:740
#: ../../view/theme/diabook/theme.php:745
msgid "Show/hide boxes at right-hand column:"
msgstr ""
@ -6167,10 +6175,6 @@ msgstr ""
msgid "Sex Addict"
msgstr ""
#: ../../include/profile_selectors.php:42
msgid "Friends"
msgstr ""
#: ../../include/profile_selectors.php:42
msgid "Friends/Benefits"
msgstr ""

6
view/pagetypes.tpl
View file

@ -1,7 +1,5 @@
{{inc field_radio.tpl with $field=$page_normal }}{{endinc}}
{{inc field_radio.tpl with $field=$page_soapbox }}{{endinc}}
{{inc field_radio.tpl with $field=$page_community }}{{endinc}}
{{inc field_radio.tpl with $field=$page_freelove }}{{endinc}}
{{ if $experimental }}
{{inc field_radio.tpl with $field=$page_prvgroup }}{{endinc}}
{{ endif }}
{{inc field_radio.tpl with $field=$page_soapbox }}{{endinc}}
{{inc field_radio.tpl with $field=$page_freelove }}{{endinc}}

7
view/settings.tpl
View file

@ -104,15 +104,16 @@ $group_select
<h3 class="settings-heading">$h_not</h3>
<div id="settings-notifications">
<strong>$activity_options</strong>
<div id="settings-activity-desc">$activity_options</div>
{{inc field_checkbox.tpl with $field=$post_newfriend }}{{endinc}}
{{inc field_checkbox.tpl with $field=$post_joingroup }}{{endinc}}
{{inc field_checkbox.tpl with $field=$post_profilechange }}{{endinc}}
<div id="settings-notify-desc"><strong>$lbl_not </strong></div>
<div id="settings-notify-desc">$lbl_not</div>
<div class="group">
{{inc field_intcheckbox.tpl with $field=$notify1 }}{{endinc}}
@ -124,6 +125,7 @@ $group_select
{{inc field_intcheckbox.tpl with $field=$notify7 }}{{endinc}}
</div>
</div>
<div class="settings-submit-wrapper" >
<input type="submit" name="submit" class="settings-submit" value="$submit" />
@ -131,6 +133,7 @@ $group_select
<h3 class="settings-heading">$h_advn</h3>
<div id="settings-pagetype-desc">$h_descadvn</div>
$pagetype

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

@ -717,7 +717,17 @@ input#dfrn-url {
#settings-community {
float: left;
}
#settings-notifications label {
margin-left: 20px;
}
#settings-notify-desc, #settings-activity-desc {
font-weight: bold;
margin-bottom: 15px;
}
#settings-pagetype-desc {
color: #666666;
margin-bottom: 15px;
}
#profile-in-dir-yes-label,
#profile-in-dir-no-label,