tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge remote branch 'upstream/master'

Browse source
This commit is contained in:
zottel 2012-05-31 08:43:14 +02:00
parent 24b58af689 f0cf0ebb48
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'); require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '3.0.1358' ); define ( 'FRIENDICA_VERSION', '3.0.1359' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1145 ); 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) { foreach($items as $item) {
// prevent private email from leaking.
if($item['network'] === NETWORK_MAIL)
continue;
// public feeds get html, our own nodes use bbcode // public feeds get html, our own nodes use bbcode
if($public_feed) { if($public_feed) {
@ -2933,8 +2937,8 @@ function fix_private_photos($s,$uid, $item = null, $cid = 0) {
logger('fix_private_photos', LOGGER_DEBUG); logger('fix_private_photos', LOGGER_DEBUG);
$site = substr($a->get_baseurl(),strpos($a->get_baseurl(),'://')); $site = substr($a->get_baseurl(),strpos($a->get_baseurl(),'://'));
if(preg_match("/\[img\](.*?)\[\/img\]/is",$s,$matches)) { if(preg_match("/\[img(.*?)\](.*?)\[\/img\]/is",$s,$matches)) {
$image = $matches[1]; $image = $matches[2];
logger('fix_private_photos: found photo ' . $image, LOGGER_DEBUG); logger('fix_private_photos: found photo ' . $image, LOGGER_DEBUG);
if(stristr($image , $site . '/photo/')) { if(stristr($image , $site . '/photo/')) {
$replace = false; $replace = false;

4
include/text.php
View file

@ -742,6 +742,8 @@ function smilies($s, $sample = false) {
':homebrew', ':homebrew',
':coffee', ':coffee',
':facepalm', ':facepalm',
':like',
':dislike',
'~friendika', '~friendika',
'~friendica' '~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/beer_mug.gif" alt=":homebrew" />',
'<img src="' . $a->get_baseurl() . '/images/coffee.gif" alt=":coffee" />', '<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/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://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>' '<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[250]="|Kosovo|Montenegro|Serbia|Vojvodina";
aStates[251]="|Central|Copperbelt|Eastern|Luapula|Lusaka|North-Western|Northern|Southern|Western"; 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[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 * gArCountryInfo
* (0) Country name * (0) Country name

2
mod/acl.php
View file

@ -135,7 +135,7 @@ function acl_init(&$a){
foreach($r as $g) { foreach($r as $g) {
$x['photos'][] = $g['micro']; $x['photos'][] = $g['micro'];
$x['links'][] = $g['url']; $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']); $x['data'][] = intval($g['id']);
} }
} }

5
mod/register.php
View file

@ -290,6 +290,11 @@ function register_post(&$a) {
dbesc(datetime_convert()) 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'); $pageset_tpl = get_markup_template('pagetypes.tpl');
$pagetype = replace_macros($pageset_tpl,array( $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'), t('This account is a normal personal profile'),
($a->user['page-flags'] == PAGE_NORMAL)), ($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'), t('Automatically approve all connection/friend requests as read-only fans'),
($a->user['page-flags'] == PAGE_SOAPBOX)), ($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'), t('Automatically approve all connection/friend requests as read-write fans'),
($a->user['page-flags'] == PAGE_COMMUNITY)), ($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'), t('Automatically approve all connection/friend requests as friends'),
($a->user['page-flags'] == PAGE_FREELOVE)), ($a->user['page-flags'] == PAGE_FREELOVE)),
'$page_prvgroup' => array('page-flags', t('Private Forum'), PAGE_PRVGROUP, '$page_prvgroup' => array('page-flags', t('Private Forum [Experimental]'), PAGE_PRVGROUP,
t('Private forum - approved members only [Experimental]'), t('Private forum - approved members only'),
($a->user['page-flags'] == PAGE_PRVGROUP)), ($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, ''), '$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, '$pagetype' => $pagetype,

336
util/messages.po
View file

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

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

@ -717,7 +717,17 @@ input#dfrn-url {
#settings-community { #settings-community {
float: left; 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-yes-label,
#profile-in-dir-no-label, #profile-in-dir-no-label,