From 953c8ac68675d2f866489b040e2defea855f5c83 Mon Sep 17 00:00:00 2001 From: marijus Date: Mon, 18 Aug 2014 21:25:02 +0200 Subject: make lockview provide the right info --- mod/lockview.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/mod/lockview.php b/mod/lockview.php index 8903bdec6..86d238593 100644 --- a/mod/lockview.php +++ b/mod/lockview.php @@ -26,11 +26,6 @@ function lockview_content(&$a) { $item = $r[0]; - if(array_key_exists('public_policy',$item) && $item['public_policy']) { - echo '
  • ' . translate_scope($item['public_policy']) . '
  • '; - killme(); - } - if($item['uid'] != local_user()) { echo '
  • ' . t('Remote privacy information not available.') . '
  • '; killme(); @@ -83,4 +78,8 @@ function lockview_content(&$a) { echo $o . implode($l); killme(); + if(array_key_exists('public_policy',$item) && $item['public_policy']) { + echo '
  • ' . translate_scope($item['public_policy']) . '
  • '; + killme(); + } } -- cgit v1.2.3 From b522ab13cbf7653dcc5e0f91b10eed0a63560ecb Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 18 Aug 2014 20:03:48 -0700 Subject: nav channel selection --- include/features.php | 3 +++ include/nav.php | 15 ++++++++++++++- version.inc | 2 +- view/theme/redbasic/css/style.css | 2 ++ view/tpl/nav.tpl | 7 ++++++- 5 files changed, 26 insertions(+), 3 deletions(-) diff --git a/include/features.php b/include/features.php index 6bb444cb6..7530158ec 100644 --- a/include/features.php +++ b/include/features.php @@ -31,6 +31,9 @@ function get_features() { // prettyphoto has licensing issues and will no longer be provided in core - // in any event this setting should probably be a theme option or plugin // array('prettyphoto', t('Enhanced Photo Albums'), t('Enable photo album with enhanced features')), + array('nav_channel_select', t('Navigation Channel Select'), t('Change channels directly from within the navigation dropdown menu')), + + //FIXME - needs a description, but how the hell do we explain this to normals? array('sendzid', t('Extended Identity Sharing'), t('Share your identity with all websites on the internet. When disabled, identity is only shared with sites in the matrix.')), array('expert', t('Expert Mode'), t('Enable Expert Mode to provide advanced configuration options')), diff --git a/include/nav.php b/include/nav.php index 8133ecf67..799faf5ce 100644 --- a/include/nav.php +++ b/include/nav.php @@ -38,6 +38,14 @@ EOT; intval($channel['channel_id']) ); + $chans = q("select channel_name, channel_id from channel where channel_account_id = %d and not ( channel_pageflags & %d ) order by channel_name ", + intval(get_account_id()), + intval(PAGE_REMOVED) + ); + + + + } elseif(remote_user()) $observer = $a->get_observer(); @@ -78,6 +86,11 @@ EOT; $userinfo = null; if(local_user()) { + + + if($chans && count($chans) > 1 && feature_enabled(local_user(),'nav_channel_select')) + $nav['channels'] = $chans; + $nav['logout'] = Array('logout',t('Logout'), "", t('End this session')); // user menu @@ -193,7 +206,7 @@ EOT; $nav['all_events']['all']=array('events', t('See all events'), "", ""); $nav['all_events']['mark'] = array('', t('Mark all events seen'), '',''); - $nav['manage'] = array('manage', t('Channel Select'), "", t('Manage Your Channels')); + $nav['manage'] = array('manage', t('Channel Manager'), "", t('Manage Your Channels')); $nav['settings'] = array('settings', t('Settings'),"", t('Account/Channel Settings')); diff --git a/version.inc b/version.inc index 6d17789e1..9699f543a 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-08-17.770 +2014-08-18.771 diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 889988d48..478f1efee 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -177,6 +177,8 @@ nav #banner #logo-text a { } nav #banner #logo-text a:hover { text-decoration: none; } +.nav-channel-select { margin-left: 8px; } + header #banner { /* overflow: hidden; */ text-align: center; diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 0602c72af..2953f3b41 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -20,8 +20,13 @@ {{/foreach}} {{if $nav.profiles}}
  • {{$nav.profiles.1}}
  • {{/if}} - {{if $nav.manage}}
  • {{$nav.manage.1}}
  • {{/if}} {{if $nav.settings}}
  • {{$nav.settings.1}}
  • {{/if}} + {{if $nav.manage}}
  • {{$nav.manage.1}}
  • {{/if}} + {{if $nav.channels}} + {{foreach $nav.channels as $chan}} + + {{/foreach}} + {{/if}} {{if $nav.admin}}
  • {{$nav.admin.1}}
  • -- cgit v1.2.3 From b3d450626e830f648c4c2e596e449d6817a8b324 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 18 Aug 2014 22:44:03 -0700 Subject: provide an overt indication that a post/comment was edited. --- include/text.php | 6 ++++-- view/tpl/conv_item.tpl | 2 +- view/tpl/search_item.tpl | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/text.php b/include/text.php index 1c5a78d4e..680e6fe95 100755 --- a/include/text.php +++ b/include/text.php @@ -1003,7 +1003,8 @@ function smilies($s, $sample = false) { ':like', ':dislike', 'red#', - 'r#' + 'r#', + 'red#matrix' ); $icons = array( @@ -1040,7 +1041,8 @@ function smilies($s, $sample = false) { ':like', ':dislike', 'redred#matrix', - 'redr#matrix' + 'redr#matrix', + 'redred#matrixmatrix' ); diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index d7ed7d0f4..bfa62f1b7 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -26,7 +26,7 @@ {{$item.name}}{{if $item.owner_url}} {{$item.via}} {{$item.owner_name}}{{/if}}
    - {{if $item.verified}} {{/if}}{{if $item.location}}{{$item.location}}, {{/if}}{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}} {{if $item.app}}{{$item.str_app}}{{/if}} + {{if $item.verified}} {{/if}}{{if $item.location}}{{$item.location}}, {{/if}}{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}{{if $item.editedtime}} {{/if}} {{if $item.app}}{{$item.str_app}}{{/if}}
    diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index f86ee0202..6719f2e75 100755 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -20,7 +20,7 @@ {{$item.name}}{{if $item.owner_url}} {{$item.via}} {{$item.owner_name}}{{/if}}
    - {{if $item.verified}} {{/if}}{{if $item.location}}{{$item.location}}, {{/if}}{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}{{if $item.app}}{{$item.str_app}}{{/if}} + {{if $item.verified}} {{/if}}{{if $item.location}}{{$item.location}}, {{/if}}{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}{{if $item.editedtime}} {{/if}} {{if $item.app}}{{$item.str_app}}{{/if}}
    -- cgit v1.2.3 From dc212c80e2ed436b7e4c9cc555736485df111e34 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 19 Aug 2014 02:00:34 -0700 Subject: diaspora - crazy amount of work remaining --- include/diaspora.php | 143 +++++++++++++++++++++++---------------------------- version.inc | 2 +- 2 files changed, 64 insertions(+), 81 deletions(-) diff --git a/include/diaspora.php b/include/diaspora.php index 6121466f2..02d479d95 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -671,36 +671,24 @@ function diaspora_post($importer,$xml,$msg) { return 202; } - $message_id = $diaspora_handle . ':' . $guid; - $r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' AND `guid` = '%s' LIMIT 1", + $r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' LIMIT 1", intval($importer['channel_id']), - dbesc($message_id), dbesc($guid) ); - if(count($r)) { + if($r) { + // check dates if post editing is implemented logger('diaspora_post: message exists: ' . $guid); return; } - // allocate a guid on our system - we aren't fixing any collisions. - // we're ignoring them - - $g = q("select * from guid where guid = '%s' limit 1", - dbesc($guid) - ); - if(! count($g)) { - q("insert into guid ( guid ) values ( '%s' )", - dbesc($guid) - ); - } - $created = unxmlify($xml->created_at); $private = ((unxmlify($xml->public) == 'false') ? 1 : 0); $body = diaspora2bb($xml->raw_message); +//WTF? FIXME // Add OEmbed and other information to the body - $body = add_page_info_to_body($body, false, true); +// $body = add_page_info_to_body($body, false, true); $datarray = array(); @@ -708,6 +696,8 @@ function diaspora_post($importer,$xml,$msg) { $tags = get_tags($body); +// FIXME call handle_tags() + if(count($tags)) { foreach($tags as $tag) { if(strpos($tag,'#') === 0) { @@ -743,40 +733,36 @@ function diaspora_post($importer,$xml,$msg) { $plink = 'https://'.substr($diaspora_handle,strpos($diaspora_handle,'@')+1).'/posts/'.$guid; $datarray['uid'] = $importer['channel_id']; + +// FIXME $datarray['contact-id'] = $contact['id']; $datarray['wall'] = 0; $datarray['network'] = NETWORK_DIASPORA; + + $datarray['verb'] = ACTIVITY_POST; - $datarray['guid'] = $guid; - $datarray['uri'] = $datarray['parent-uri'] = $message_id; + $datarray['mid'] = $datarray['parent-mid'] = $guid; + $datarray['changed'] = $datarray['created'] = $datarray['edited'] = datetime_convert('UTC','UTC',$created); - $datarray['private'] = $private; - $datarray['parent'] = 0; + $datarray['item_private'] = $private; + + $datarray['plink'] = $plink; - $datarray['owner-name'] = $contact['name']; - $datarray['owner-link'] = $contact['url']; - //$datarray['owner-avatar'] = $contact['thumb']; - $datarray['owner-avatar'] = ((x($contact,'thumb')) ? $contact['thumb'] : $contact['photo']); - $datarray['author-name'] = $contact['name']; - $datarray['author-link'] = $contact['url']; - $datarray['author-avatar'] = $contact['thumb']; - $datarray['body'] = $body; - $datarray['tag'] = $str_tags; - $datarray['app'] = 'Diaspora'; - // if empty content it might be a photo that hasn't arrived yet. If a photo arrives, we'll make it visible. + $datarray['author_xchan'] = $contact['xchan_hash']; + $datarray['owner_xchan'] = $importer['channel_hash']; - $datarray['visible'] = ((strlen($body)) ? 1 : 0); + $datarray['body'] = $body; - $message_id = item_store($datarray); +// FIXME +// $datarray['tag'] = $str_tags; - //if($message_id) { - // q("update item set plink = '%s' where id = %d", - // dbesc($a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $message_id), - // intval($message_id) - // ); - //} + $datarray['app'] = 'Diaspora'; + // if empty content it might be a photo that hasn't arrived yet. If a photo arrives, we'll make it visible. +// $datarray['visible'] = ((strlen($body)) ? 1 : 0); + + $result = item_store($datarray); return; } @@ -1105,20 +1091,20 @@ function diaspora_comment($importer,$xml,$msg) { return 202; } - $r = q("SELECT * FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1", + $r = q("SELECT * FROM `item` WHERE `uid` = %d AND `mid` = '%s' LIMIT 1", intval($importer['channel_id']), dbesc($guid) ); - if(count($r)) { + if($r) { logger('diaspora_comment: our comment just got relayed back to us (or there was a guid collision) : ' . $guid); return; } - $r = q("SELECT * FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1", + $r = q("SELECT * FROM `item` WHERE `uid` = %d AND `mid` = '%s' LIMIT 1", intval($importer['channel_id']), dbesc($parent_guid) ); - if(! count($r)) { + if(! $r) { logger('diaspora_comment: parent item not found: parent: ' . $parent_guid . ' item: ' . $guid); return; } @@ -1183,7 +1169,6 @@ function diaspora_comment($importer,$xml,$msg) { } $body = diaspora2bb($text); - $message_id = $diaspora_handle . ':' . $guid; $datarray = array(); @@ -1216,59 +1201,54 @@ function diaspora_comment($importer,$xml,$msg) { } $datarray['uid'] = $importer['channel_id']; - $datarray['contact-id'] = $contact['id']; - $datarray['type'] = 'remote-comment'; - $datarray['wall'] = $parent_item['wall']; - $datarray['network'] = NETWORK_DIASPORA; + +//FIXME +// $datarray['contact-id'] = $contact['id']; +// $datarray['type'] = 'remote-comment'; +// $datarray['wall'] = $parent_item['wall']; +// $datarray['network'] = NETWORK_DIASPORA; + $datarray['verb'] = ACTIVITY_POST; - $datarray['gravity'] = GRAVITY_COMMENT; - $datarray['guid'] = $guid; - $datarray['uri'] = $message_id; - $datarray['parent-uri'] = $parent_item['uri']; + $datarray['mid'] = $guid; + $datarray['parent_mid'] = $parent_item['mid']; + // No timestamps for comments? OK, we'll the use current time. $datarray['changed'] = $datarray['created'] = $datarray['edited'] = datetime_convert(); $datarray['private'] = $parent_item['private']; - $datarray['owner-name'] = $parent_item['owner-name']; - $datarray['owner-link'] = $parent_item['owner-link']; - $datarray['owner-avatar'] = $parent_item['owner-avatar']; + $datarray['owner_xchan'] = $parent_item['owner_xchan']; + $datarray['author_xchan'] = $person['xchan_hash']; - $datarray['author-name'] = $person['name']; - $datarray['author-link'] = $person['url']; - $datarray['author-avatar'] = ((x($person,'thumb')) ? $person['thumb'] : $person['photo']); $datarray['body'] = $body; - $datarray['tag'] = $str_tags; + +// FIXME +// $datarray['tag'] = $str_tags; // We can't be certain what the original app is if the message is relayed. - if(($parent_item['origin']) && (! $parent_author_signature)) - $datarray['app'] = 'Diaspora'; +// if(($parent_item['origin']) && (! $parent_author_signature)) +// $datarray['app'] = 'Diaspora'; - $message_id = item_store($datarray); + $result = item_store($datarray); - //if($message_id) { - //q("update item set plink = '%s' where id = %d", - // //dbesc($a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $message_id), - // dbesc($a->get_baseurl().'/display/'.$datarray['guid']), - // intval($message_id) - //); - //} - - if(($parent_item['origin']) && (! $parent_author_signature)) { - q("insert into sign (`iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ", - intval($message_id), - dbesc($signed_data), - dbesc(base64_encode($author_signature)), - dbesc($diaspora_handle) - ); +// if(($parent_item['origin']) && (! $parent_author_signature)) { +// q("insert into sign (`iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ", +// intval($message_id), +// dbesc($signed_data), +// dbesc(base64_encode($author_signature)), +// dbesc($diaspora_handle) +// ); // if the message isn't already being relayed, notify others // the existence of parent_author_signature means the parent_author or owner // is already relaying. - proc_run('php','include/notifier.php','comment-import',$message_id); - } +// proc_run('php','include/notifier.php','comment-import',$message_id); +// } + +// FIXME +/* $myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 AND `deleted` = 0 ", dbesc($parent_item['uri']), intval($importer['channel_id']) @@ -1311,6 +1291,9 @@ function diaspora_comment($importer,$xml,$msg) { break; } } + +*/ + return; } diff --git a/version.inc b/version.inc index 9699f543a..6ca87b875 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-08-18.771 +2014-08-19.772 -- cgit v1.2.3 From a10f39b9942d6805d62351e06b0b89e5bc999bf5 Mon Sep 17 00:00:00 2001 From: marijus Date: Tue, 19 Aug 2014 22:01:33 +0200 Subject: really fix lock info --- mod/lockview.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mod/lockview.php b/mod/lockview.php index 86d238593..7d39f9e2f 100644 --- a/mod/lockview.php +++ b/mod/lockview.php @@ -33,7 +33,7 @@ function lockview_content(&$a) { if(($item['item_private'] == 1) && (! strlen($item['allow_cid'])) && (! strlen($item['allow_gid'])) && (! strlen($item['deny_cid'])) && (! strlen($item['deny_gid']))) { - echo '
  • ' . t('Remote privacy information not available.') . '
  • '; + echo '
  • ' . translate_scope($item['public_policy']) . '
  • '; killme(); } @@ -82,4 +82,5 @@ function lockview_content(&$a) { echo '
  • ' . translate_scope($item['public_policy']) . '
  • '; killme(); } + } -- cgit v1.2.3 From 9f400229a7bf85c96902a17772ec1e95da210403 Mon Sep 17 00:00:00 2001 From: Jeroen Date: Tue, 19 Aug 2014 20:22:15 +0000 Subject: Update nl --- view/nl/messages.po | 11428 ++++++++++++++++++++++++++------------------------ view/nl/strings.php | 3161 +++++++------- 2 files changed, 7459 insertions(+), 7130 deletions(-) diff --git a/view/nl/messages.po b/view/nl/messages.po index 14fd4e460..48ed857b6 100644 --- a/view/nl/messages.po +++ b/view/nl/messages.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Red Matrix\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-09 01:13+0000\n" -"PO-Revision-Date: 2014-08-14 14:55+0000\n" +"POT-Creation-Date: 2014-08-15 00:03-0700\n" +"PO-Revision-Date: 2014-08-19 20:17+0000\n" "Last-Translator: jeroenpraat <>\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/red-matrix/language/nl/)\n" "MIME-Version: 1.0\n" @@ -18,1249 +18,1124 @@ msgstr "" "Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../../view/theme/redbasic/php/config.php:84 -msgid "Light (Red Matrix default)" -msgstr "Light (RedMatrix-standaard)" +#: ../../include/dba/dba_driver.php:50 +#, php-format +msgid "Cannot locate DNS info for database server '%s'" +msgstr "Kan DNS-informatie voor databaseserver '%s' niet vinden" -#: ../../view/theme/redbasic/php/config.php:99 -#: ../../include/ItemObject.php:583 ../../mod/settings.php:516 -#: ../../mod/settings.php:628 ../../mod/settings.php:656 -#: ../../mod/settings.php:680 ../../mod/settings.php:750 -#: ../../mod/settings.php:928 ../../mod/filestorage.php:137 -#: ../../mod/admin.php:442 ../../mod/admin.php:751 ../../mod/admin.php:886 -#: ../../mod/admin.php:1019 ../../mod/admin.php:1218 ../../mod/admin.php:1305 -#: ../../mod/photos.php:563 ../../mod/photos.php:668 ../../mod/photos.php:956 -#: ../../mod/photos.php:996 ../../mod/photos.php:1083 ../../mod/mood.php:135 -#: ../../mod/pdledit.php:58 ../../mod/connedit.php:518 ../../mod/setup.php:307 -#: ../../mod/setup.php:350 ../../mod/invite.php:156 ../../mod/thing.php:286 -#: ../../mod/thing.php:329 ../../mod/connect.php:92 ../../mod/fsuggest.php:108 -#: ../../mod/poke.php:166 ../../mod/group.php:81 ../../mod/appman.php:99 -#: ../../mod/sources.php:104 ../../mod/sources.php:138 -#: ../../mod/import.php:393 ../../mod/mail.php:345 ../../mod/profiles.php:589 -#: ../../mod/chat.php:177 ../../mod/chat.php:211 ../../mod/events.php:511 -msgid "Submit" -msgstr "Opslaan" +#: ../../include/photo/photo_driver.php:653 ../../include/photos.php:51 +#: ../../mod/profile_photo.php:142 ../../mod/profile_photo.php:301 +#: ../../mod/profile_photo.php:421 ../../mod/photos.php:91 +#: ../../mod/photos.php:659 ../../mod/photos.php:681 +msgid "Profile Photos" +msgstr "Profielfoto's" -#: ../../view/theme/redbasic/php/config.php:102 -msgid "Theme settings" -msgstr "Thema-instellingen" +#: ../../include/diaspora.php:610 +#, php-format +msgid "%1$s is now friends with %2$s" +msgstr "%1$s is nu bevriend met %2$s" -#: ../../view/theme/redbasic/php/config.php:103 -msgid "Set scheme" -msgstr "Schema van thema instellen" +#: ../../include/diaspora.php:693 +msgid "Sharing notification from Diaspora network" +msgstr "Notificatie delen vanuit het Diaspora-netwerk" -#: ../../view/theme/redbasic/php/config.php:104 -msgid "Narrow navbar" -msgstr "Smalle navigatiebalk" +#: ../../include/diaspora.php:1910 ../../include/text.php:1732 +#: ../../include/conversation.php:120 ../../mod/subthread.php:72 +#: ../../mod/subthread.php:174 ../../mod/tagger.php:45 ../../mod/like.php:294 +msgid "photo" +msgstr "foto" -#: ../../view/theme/redbasic/php/config.php:105 -msgid "Navigation bar background color" -msgstr "Achtergrondkleur navigatiebalk" +#: ../../include/diaspora.php:1910 ../../include/text.php:1738 +#: ../../include/conversation.php:148 ../../mod/subthread.php:72 +#: ../../mod/subthread.php:174 ../../mod/tagger.php:53 ../../mod/like.php:294 +msgid "status" +msgstr "status" -#: ../../view/theme/redbasic/php/config.php:106 -msgid "Navigation bar gradient top color" -msgstr "Bovenste gradiëntkleur navigatiebalk" +#: ../../include/diaspora.php:1926 ../../include/conversation.php:164 +#: ../../mod/like.php:331 +#, php-format +msgid "%1$s likes %2$s's %3$s" +msgstr "%1$s vindt %3$s van %2$s leuk" -#: ../../view/theme/redbasic/php/config.php:107 -msgid "Navigation bar gradient bottom color" -msgstr "Onderste gradiëntkleur navigatiebalk" +#: ../../include/diaspora.php:2303 +msgid "Attachments:" +msgstr "Bijlagen:" -#: ../../view/theme/redbasic/php/config.php:108 -msgid "Navigation active button gradient top color" -msgstr "Bovenste gradiëntkleur actieve knop navigatiebalk" +#: ../../include/oembed.php:163 +msgid "Embedded content" +msgstr "Ingesloten inhoud" -#: ../../view/theme/redbasic/php/config.php:109 -msgid "Navigation active button gradient bottom color" -msgstr "Onderste gradiëntkleur actieve knop op navigatiebalk" +#: ../../include/oembed.php:172 +msgid "Embedding disabled" +msgstr "Insluiten uitgeschakeld" -#: ../../view/theme/redbasic/php/config.php:110 -msgid "Navigation bar border color " -msgstr "Randkleur navigatiebalk " +#: ../../include/notify.php:23 +msgid "created a new post" +msgstr "maakte een nieuw bericht aan" -#: ../../view/theme/redbasic/php/config.php:111 -msgid "Navigation bar icon color " -msgstr "Pictogramkleur navigatiebalk" +#: ../../include/notify.php:24 +#, php-format +msgid "commented on %s's post" +msgstr "gaf een reactie op een bericht van %s" -#: ../../view/theme/redbasic/php/config.php:112 -msgid "Navigation bar active icon color " -msgstr "Actieve pictogramkleur navigatiebalk" +#: ../../include/apps.php:123 +msgid "Site Admin" +msgstr "Hubbeheerder" -#: ../../view/theme/redbasic/php/config.php:113 -msgid "link color" -msgstr "Linkkleur instellen" +#: ../../include/apps.php:124 ../../include/nav.php:100 +#: ../../include/conversation.php:1543 +msgid "Bookmarks" +msgstr "Bladwijzers" -#: ../../view/theme/redbasic/php/config.php:114 -msgid "Set font-color for banner" -msgstr "Tekstkleur van banner instellen" +#: ../../include/apps.php:125 +msgid "Address Book" +msgstr "Connecties" -#: ../../view/theme/redbasic/php/config.php:115 -msgid "Set the background color" -msgstr "Achtergrondkleur instellen" +#: ../../include/apps.php:126 ../../include/nav.php:106 ../../boot.php:1498 +msgid "Login" +msgstr "Inloggen" -#: ../../view/theme/redbasic/php/config.php:116 -msgid "Set the background image" -msgstr "Achtergrondafbeelding instellen" +#: ../../include/apps.php:127 ../../include/nav.php:196 +msgid "Channel Select" +msgstr "Kanaalkiezer" -#: ../../view/theme/redbasic/php/config.php:117 -msgid "Set the background color of items" -msgstr "Achtergrondkleur items instellen" +#: ../../include/apps.php:128 ../../include/nav.php:170 +msgid "Matrix" +msgstr "Matrix" -#: ../../view/theme/redbasic/php/config.php:118 -msgid "Set the background color of comments" -msgstr "Achtergrondkleur reacties instellen" +#: ../../include/apps.php:129 ../../include/nav.php:198 +#: ../../include/widgets.php:514 ../../mod/admin.php:987 +#: ../../mod/admin.php:1192 +msgid "Settings" +msgstr "Instellingen" -#: ../../view/theme/redbasic/php/config.php:119 -msgid "Set the border color of comments" -msgstr "Randkleur reacties instellen" +#: ../../include/apps.php:130 ../../include/nav.php:92 +#: ../../include/reddav.php:1280 ../../include/conversation.php:1521 +#: ../../mod/fbrowser.php:114 +msgid "Files" +msgstr "Bestanden" -#: ../../view/theme/redbasic/php/config.php:120 -msgid "Set the indent for comments" -msgstr "Inspringen reacties instellen" +#: ../../include/apps.php:131 ../../include/nav.php:102 +#: ../../include/conversation.php:1554 ../../mod/webpages.php:79 +msgid "Webpages" +msgstr "Webpagina's" -#: ../../view/theme/redbasic/php/config.php:121 -msgid "Set the basic color for item icons" -msgstr "Basiskleur itempictogrammen instellen" +#: ../../include/apps.php:132 ../../include/nav.php:173 +msgid "Channel Home" +msgstr "Tijdlijn kanaal" -#: ../../view/theme/redbasic/php/config.php:122 -msgid "Set the hover color for item icons" -msgstr "Hoverkleur itempictogrammen instellen" +#: ../../include/apps.php:133 ../../include/identity.php:973 +#: ../../include/identity.php:1091 ../../mod/profperm.php:112 +msgid "Profile" +msgstr "Profiel" -#: ../../view/theme/redbasic/php/config.php:123 -msgid "Set font-size for the entire application" -msgstr "Tekstgrootte van de volledige applicatie instellen" +#: ../../include/apps.php:134 ../../include/nav.php:91 +#: ../../include/conversation.php:1512 ../../mod/fbrowser.php:25 +msgid "Photos" +msgstr "Foto's" -#: ../../view/theme/redbasic/php/config.php:124 -msgid "Set font-size for posts and comments" -msgstr "Lettergrootte voor berichten en reacties instellen" +#: ../../include/apps.php:135 ../../include/nav.php:192 +#: ../../mod/events.php:396 +msgid "Events" +msgstr "Gebeurtenissen" -#: ../../view/theme/redbasic/php/config.php:125 -msgid "Set font-color for posts and comments" -msgstr "Tekstkleur van berichten en reacties" +#: ../../include/apps.php:136 ../../include/nav.php:159 +#: ../../mod/directory.php:226 +msgid "Directory" +msgstr "Gids" -#: ../../view/theme/redbasic/php/config.php:126 -msgid "Set radius of corners" -msgstr "Radius van hoeken instellen" +#: ../../include/apps.php:137 ../../include/nav.php:151 ../../mod/help.php:60 +#: ../../mod/help.php:65 +msgid "Help" +msgstr "Hulp" -#: ../../view/theme/redbasic/php/config.php:127 -msgid "Set shadow depth of photos" -msgstr "Schaduwdiepte van foto's instellen" +#: ../../include/apps.php:138 ../../include/nav.php:184 +msgid "Mail" +msgstr "Privéberichten" -#: ../../view/theme/redbasic/php/config.php:128 -msgid "Set maximum width of conversation regions" -msgstr "Maximumbreedte conversatieruimte instellen" +#: ../../include/apps.php:139 ../../mod/mood.php:131 +msgid "Mood" +msgstr "Stemming" -#: ../../view/theme/redbasic/php/config.php:129 -msgid "Center conversation regions" -msgstr "Centreer conversatieruimte" +#: ../../include/apps.php:140 ../../include/conversation.php:945 +msgid "Poke" +msgstr "Aanstoten" -#: ../../view/theme/redbasic/php/config.php:130 -msgid "Set minimum opacity of nav bar - to hide it" -msgstr "Minimale ondoorzichtigheid navigatiebalk (- om te verbergen)" +#: ../../include/apps.php:141 ../../include/nav.php:97 +msgid "Chat" +msgstr "Chatten" -#: ../../view/theme/redbasic/php/config.php:131 -msgid "Set size of conversation author photo" -msgstr "Grootte profielfoto's van berichten instellen" +#: ../../include/apps.php:142 ../../include/text.php:815 +#: ../../include/text.php:829 ../../include/nav.php:156 +#: ../../mod/search.php:30 +msgid "Search" +msgstr "Zoeken" -#: ../../view/theme/redbasic/php/config.php:132 -msgid "Set size of followup author photos" -msgstr "Grootte profielfoto's van reacties instellen" +#: ../../include/apps.php:143 +msgid "Probe" +msgstr "Onderzoeken" -#: ../../view/theme/redbasic/php/config.php:133 -msgid "Sloppy photo albums" -msgstr "Rommelig vormgegeven fotoalbums" +#: ../../include/apps.php:144 +msgid "Suggest" +msgstr "Voorstellen" -#: ../../view/theme/redbasic/php/config.php:133 -msgid "Are you a clean desk or a messy desk person?" -msgstr "Ben je iemand die van een opgeruimd bureau houdt of van een rommelig bureau?" +#: ../../include/apps.php:145 +msgid "Random Channel" +msgstr "Willekeurig kanaal" -#: ../../boot.php:1291 -#, php-format -msgid "Update %s failed. See error logs." -msgstr "Update %s mislukt. Zie foutenlogboek." +#: ../../include/apps.php:146 +msgid "Invite" +msgstr "Uitnodigen " -#: ../../boot.php:1294 -#, php-format -msgid "Update Error at %s" -msgstr "Update-fout op %s" +#: ../../include/apps.php:147 +msgid "Features" +msgstr "Extra functies" -#: ../../boot.php:1468 -msgid "" -"Create an account to access services and applications within the Red Matrix" -msgstr "Maak een account aan om toegang te krijgen tot diensten en toepassingen van de RedMatrix" +#: ../../include/apps.php:148 +msgid "Language" +msgstr "Taal" -#: ../../boot.php:1469 ../../include/nav.php:146 ../../mod/register.php:221 -msgid "Register" -msgstr "Registreren " +#: ../../include/apps.php:149 +msgid "Post" +msgstr "Bericht" -#: ../../boot.php:1492 ../../include/nav.php:81 ../../include/nav.php:108 -msgid "Logout" -msgstr "Uitloggen" +#: ../../include/apps.php:150 +msgid "Profile Photo" +msgstr "Profielfoto" -#: ../../boot.php:1493 ../../include/nav.php:106 ../../include/apps.php:126 -msgid "Login" -msgstr "Inloggen" +#: ../../include/apps.php:239 ../../mod/settings.php:79 +#: ../../mod/settings.php:543 +msgid "Update" +msgstr "Bijwerken" -#: ../../boot.php:1495 ../../include/contact_selectors.php:79 -#: ../../mod/admin.php:754 ../../mod/admin.php:763 -msgid "Email" -msgstr "E-mail" +#: ../../include/apps.php:239 +msgid "Install" +msgstr "Installeren" -#: ../../boot.php:1496 -msgid "Password" -msgstr "Wachtwoord" +#: ../../include/apps.php:244 +msgid "Purchase" +msgstr "Aanschaffen" -#: ../../boot.php:1497 -msgid "Remember me" -msgstr "Aangemeld blijven" +#: ../../include/apps.php:246 ../../include/page_widgets.php:8 +#: ../../include/page_widgets.php:36 ../../include/reddav.php:1289 +#: ../../include/menu.php:42 ../../include/ItemObject.php:96 +#: ../../mod/settings.php:579 ../../mod/blocks.php:94 +#: ../../mod/connections.php:393 ../../mod/editblock.php:111 +#: ../../mod/editlayout.php:106 ../../mod/editpost.php:112 +#: ../../mod/editwebpage.php:143 ../../mod/thing.php:235 +#: ../../mod/layouts.php:112 ../../mod/menu.php:59 ../../mod/webpages.php:120 +msgid "Edit" +msgstr "Bewerken" -#: ../../boot.php:1502 -msgid "Forgot your password?" -msgstr "Wachtwoord vergeten?" +#: ../../include/apps.php:247 ../../include/reddav.php:1290 +#: ../../include/conversation.php:635 ../../include/ItemObject.php:108 +#: ../../mod/settings.php:580 ../../mod/connedit.php:440 +#: ../../mod/photos.php:1052 ../../mod/group.php:176 ../../mod/admin.php:767 +#: ../../mod/admin.php:897 ../../mod/thing.php:236 +msgid "Delete" +msgstr "Verwijderen" -#: ../../boot.php:1503 ../../mod/lostpass.php:85 -msgid "Password Reset" -msgstr "Wachtwoord vergeten?" +#: ../../include/apps.php:328 ../../include/apps.php:379 +#: ../../include/reddav.php:1202 ../../mod/connedit.php:476 +msgid "Unknown" +msgstr "Onbekend" -#: ../../boot.php:1567 -msgid "permission denied" -msgstr "toegang geweigerd" +#: ../../include/text.php:321 +msgid "prev" +msgstr "vorige" -#: ../../boot.php:1568 -msgid "Got Zot?" -msgstr "Heb je Zot?" +#: ../../include/text.php:323 +msgid "first" +msgstr "eerste" -#: ../../boot.php:1998 -msgid "toggle mobile" -msgstr "mobiele weergave omschakelen" +#: ../../include/text.php:352 +msgid "last" +msgstr "laatste" -#: ../../include/auth.php:90 -msgid "Logged out." -msgstr "Uitgelogd." +#: ../../include/text.php:355 +msgid "next" +msgstr "volgende" -#: ../../include/auth.php:236 -msgid "Failed authentication" -msgstr "Mislukte authenticatie" - -#: ../../include/auth.php:251 ../../mod/openid.php:188 -msgid "Login failed." -msgstr "Inloggen mislukt." - -#: ../../include/comanche.php:35 -msgid "Default" -msgstr "Standaard" +#: ../../include/text.php:367 +msgid "older" +msgstr "ouder" -#: ../../include/photos.php:15 ../../include/items.php:3704 -#: ../../include/attach.php:119 ../../include/attach.php:166 -#: ../../include/attach.php:229 ../../include/attach.php:243 -#: ../../include/attach.php:283 ../../include/attach.php:297 -#: ../../include/attach.php:322 ../../include/attach.php:513 -#: ../../include/attach.php:585 ../../include/chat.php:116 -#: ../../mod/settings.php:493 ../../mod/filestorage.php:10 -#: ../../mod/filestorage.php:59 ../../mod/filestorage.php:75 -#: ../../mod/filestorage.php:98 ../../mod/webpages.php:40 -#: ../../mod/authtest.php:13 ../../mod/new_channel.php:66 -#: ../../mod/new_channel.php:97 ../../mod/connections.php:169 -#: ../../mod/profile.php:64 ../../mod/profile.php:72 ../../mod/photos.php:68 -#: ../../mod/photos.php:526 ../../mod/mitem.php:73 ../../mod/regmod.php:18 -#: ../../mod/mood.php:112 ../../mod/pdledit.php:21 -#: ../../mod/profile_photo.php:263 ../../mod/profile_photo.php:276 -#: ../../mod/menu.php:44 ../../mod/block.php:22 ../../mod/block.php:72 -#: ../../mod/suggest.php:26 ../../mod/connedit.php:254 -#: ../../mod/message.php:16 ../../mod/setup.php:203 ../../mod/invite.php:13 -#: ../../mod/invite.php:104 ../../mod/thing.php:249 ../../mod/thing.php:266 -#: ../../mod/thing.php:301 ../../mod/viewconnections.php:22 -#: ../../mod/viewconnections.php:27 ../../mod/register.php:71 -#: ../../mod/network.php:12 ../../mod/delegate.php:6 ../../mod/fsuggest.php:78 -#: ../../mod/manage.php:6 ../../mod/editpost.php:13 -#: ../../mod/editwebpage.php:44 ../../mod/editwebpage.php:83 -#: ../../mod/poke.php:128 ../../mod/blocks.php:29 ../../mod/blocks.php:44 -#: ../../mod/group.php:9 ../../mod/item.php:178 ../../mod/item.php:186 -#: ../../mod/item.php:916 ../../mod/appman.php:66 ../../mod/sources.php:66 -#: ../../mod/page.php:30 ../../mod/page.php:80 ../../mod/mail.php:108 -#: ../../mod/channel.php:89 ../../mod/channel.php:193 -#: ../../mod/channel.php:236 ../../mod/profiles.php:179 -#: ../../mod/profiles.php:524 ../../mod/bookmarks.php:46 -#: ../../mod/common.php:35 ../../mod/like.php:154 ../../mod/api.php:26 -#: ../../mod/api.php:31 ../../mod/chat.php:90 ../../mod/chat.php:95 -#: ../../mod/events.php:160 ../../mod/notifications.php:66 -#: ../../mod/layouts.php:27 ../../mod/layouts.php:39 -#: ../../mod/editblock.php:34 ../../mod/viewsrc.php:12 -#: ../../mod/achievements.php:27 ../../mod/editlayout.php:48 -#: ../../index.php:186 ../../index.php:361 -msgid "Permission denied." -msgstr "Toegang geweigerd" +#: ../../include/text.php:369 +msgid "newer" +msgstr "nieuwer" -#: ../../include/photos.php:51 ../../include/photo/photo_driver.php:643 -#: ../../mod/photos.php:91 ../../mod/photos.php:653 ../../mod/photos.php:675 -#: ../../mod/profile_photo.php:142 ../../mod/profile_photo.php:301 -#: ../../mod/profile_photo.php:421 -msgid "Profile Photos" -msgstr "Profielfoto's" +#: ../../include/text.php:730 +msgid "No connections" +msgstr "Geen connecties" -#: ../../include/photos.php:89 +#: ../../include/text.php:743 #, php-format -msgid "Image exceeds website size limit of %lu bytes" -msgstr "Afbeelding is groter dan op deze hub toegestane limiet van %lu bytes" +msgid "%d Connection" +msgid_plural "%d Connections" +msgstr[0] "%d connectie" +msgstr[1] "%d connecties" -#: ../../include/photos.php:96 -msgid "Image file is empty." -msgstr "Afbeeldingsbestand is leeg" +#: ../../include/text.php:756 +msgid "View Connections" +msgstr "Connecties weergeven" -#: ../../include/photos.php:123 ../../mod/profile_photo.php:216 -msgid "Unable to process image" -msgstr "Afbeelding kan niet verwerkt worden" +#: ../../include/text.php:817 ../../include/text.php:831 +#: ../../include/widgets.php:186 ../../mod/rbmark.php:28 +#: ../../mod/rbmark.php:98 ../../mod/filer.php:50 +msgid "Save" +msgstr "Opslaan" -#: ../../include/photos.php:186 -msgid "Photo storage failed." -msgstr "Foto kan niet worden opgeslagen" +#: ../../include/text.php:897 +msgid "poke" +msgstr "aanstoten" -#: ../../include/photos.php:313 ../../include/conversation.php:1515 -msgid "Photo Albums" -msgstr "Fotoalbums" +#: ../../include/text.php:897 ../../include/conversation.php:243 +msgid "poked" +msgstr "aangestoten" -#: ../../include/photos.php:317 ../../mod/photos.php:691 -#: ../../mod/photos.php:1193 -msgid "Upload New Photos" -msgstr "Nieuwe foto's uploaden" +#: ../../include/text.php:898 +msgid "ping" +msgstr "ping" -#: ../../include/contact_widgets.php:14 -#, php-format -msgid "%d invitation available" -msgid_plural "%d invitations available" -msgstr[0] "%d uitnodiging beschikbaar" -msgstr[1] "%d uitnodigingen beschikbaar" +#: ../../include/text.php:898 +msgid "pinged" +msgstr "gepingd" -#: ../../include/contact_widgets.php:19 ../../mod/admin.php:446 -msgid "Advanced" -msgstr "Geavanceerd" +#: ../../include/text.php:899 +msgid "prod" +msgstr "por" -#: ../../include/contact_widgets.php:22 -msgid "Find Channels" -msgstr "Kanalen vinden" +#: ../../include/text.php:899 +msgid "prodded" +msgstr "gepord" -#: ../../include/contact_widgets.php:23 -msgid "Enter name or interest" -msgstr "Vul naam of interesse in" +#: ../../include/text.php:900 +msgid "slap" +msgstr "slaan" -#: ../../include/contact_widgets.php:24 -msgid "Connect/Follow" -msgstr "Verbinden/volgen" +#: ../../include/text.php:900 +msgid "slapped" +msgstr "sloeg" -#: ../../include/contact_widgets.php:25 -msgid "Examples: Robert Morgenstein, Fishing" -msgstr "Voorbeeld: Robert Morgenstein, vissen" +#: ../../include/text.php:901 +msgid "finger" +msgstr "finger" -#: ../../include/contact_widgets.php:26 ../../mod/connections.php:392 -#: ../../mod/directory.php:222 ../../mod/directory.php:227 -msgid "Find" -msgstr "Vinden" +#: ../../include/text.php:901 +msgid "fingered" +msgstr "gefingerd" -#: ../../include/contact_widgets.php:27 ../../mod/suggest.php:59 -msgid "Channel Suggestions" -msgstr "Voorgestelde kanalen" +#: ../../include/text.php:902 +msgid "rebuff" +msgstr "afpoeieren" -#: ../../include/contact_widgets.php:29 -msgid "Random Profile" -msgstr "Willekeurig profiel" +#: ../../include/text.php:902 +msgid "rebuffed" +msgstr "afgepoeierd" -#: ../../include/contact_widgets.php:30 -msgid "Invite Friends" -msgstr "Vrienden uitnodigen" +#: ../../include/text.php:911 +msgid "happy" +msgstr "gelukkig" -#: ../../include/contact_widgets.php:32 -msgid "Exammple: name=fred and country=iceland" -msgstr "Voorbeeld: (voor naam) name=herman en (voor land) country=nederland" +#: ../../include/text.php:912 +msgid "sad" +msgstr "bedroefd" -#: ../../include/contact_widgets.php:33 -msgid "Advanced Find" -msgstr "Geavanceerd zoeken" +#: ../../include/text.php:913 +msgid "mellow" +msgstr "mellow" -#: ../../include/contact_widgets.php:58 ../../include/features.php:69 -#: ../../include/widgets.php:296 -msgid "Saved Folders" -msgstr "Bewaarde mappen" +#: ../../include/text.php:914 +msgid "tired" +msgstr "moe" -#: ../../include/contact_widgets.php:61 ../../include/contact_widgets.php:96 -#: ../../include/widgets.php:299 -msgid "Everything" -msgstr "Alles" +#: ../../include/text.php:915 +msgid "perky" +msgstr "parmantig" -#: ../../include/contact_widgets.php:93 ../../include/widgets.php:29 -msgid "Categories" -msgstr "Categorieën" +#: ../../include/text.php:916 +msgid "angry" +msgstr "boos" -#: ../../include/contact_widgets.php:126 -#, php-format -msgid "%d connection in common" -msgid_plural "%d connections in common" -msgstr[0] "%d gemeenschappelijke connectie" -msgstr[1] "%d gemeenschappelijke connecties" +#: ../../include/text.php:917 +msgid "stupified" +msgstr "beteuterd" -#: ../../include/contact_widgets.php:131 -msgid "show more" -msgstr "meer connecties weergeven" +#: ../../include/text.php:918 +msgid "puzzled" +msgstr "verward" -#: ../../include/activities.php:39 -msgid " and " -msgstr " en " +#: ../../include/text.php:919 +msgid "interested" +msgstr "geïnteresseerd" -#: ../../include/activities.php:47 -msgid "public profile" -msgstr "openbaar profiel" +#: ../../include/text.php:920 +msgid "bitter" +msgstr "verbitterd" -#: ../../include/activities.php:52 -#, php-format -msgid "%1$s changed %2$s to “%3$s”" -msgstr "%1$s veranderde %2$s naar “%3$s”" +#: ../../include/text.php:921 +msgid "cheerful" +msgstr "vrolijk" -#: ../../include/activities.php:53 -#, php-format -msgid "Visit %1$s's %2$s" -msgstr "Bezoek het %2$s van %1$s" +#: ../../include/text.php:922 +msgid "alive" +msgstr "levendig" -#: ../../include/activities.php:56 -#, php-format -msgid "%1$s has an updated %2$s, changing %3$s." -msgstr "%1$s heeft een aangepaste %2$s, %3$s veranderd." +#: ../../include/text.php:923 +msgid "annoyed" +msgstr "geërgerd" -#: ../../include/items.php:295 ../../mod/subthread.php:49 -#: ../../mod/profperm.php:23 ../../mod/group.php:68 ../../mod/like.php:242 -#: ../../index.php:360 -msgid "Permission denied" -msgstr "Toegang geweigerd" +#: ../../include/text.php:924 +msgid "anxious" +msgstr "bezorgd" -#: ../../include/items.php:824 -msgid "(Unknown)" -msgstr "(Onbekend)" +#: ../../include/text.php:925 +msgid "cranky" +msgstr "humeurig" -#: ../../include/items.php:953 -msgid "Visible to anybody on the internet." -msgstr "Voor iedereen op het internet zichtbaar." +#: ../../include/text.php:926 +msgid "disturbed" +msgstr "verontrust" -#: ../../include/items.php:955 -msgid "Visible to you only." -msgstr "Alleen voor jou zichtbaar." +#: ../../include/text.php:927 +msgid "frustrated" +msgstr "gefrustreerd " -#: ../../include/items.php:957 -msgid "Visible to anybody in this network." -msgstr "Voor iedereen in dit netwerk zichtbaar." +#: ../../include/text.php:928 +msgid "depressed" +msgstr "gedeprimeerd" -#: ../../include/items.php:959 -msgid "Visible to anybody authenticated." -msgstr "Voor iedereen die geauthenticeerd is zichtbaar." +#: ../../include/text.php:929 +msgid "motivated" +msgstr "gemotiveerd" -#: ../../include/items.php:961 -#, php-format -msgid "Visible to anybody on %s." -msgstr "Voor iedereen op %s zichtbaar." +#: ../../include/text.php:930 +msgid "relaxed" +msgstr "ontspannen" -#: ../../include/items.php:963 -msgid "Visible to all connections." -msgstr "Voor alle connecties zichtbaar." +#: ../../include/text.php:931 +msgid "surprised" +msgstr "verrast" -#: ../../include/items.php:965 -msgid "Visible to approved connections." -msgstr "Voor alle goedgekeurde connecties zichtbaar." +#: ../../include/text.php:1092 +msgid "Monday" +msgstr "maandag" -#: ../../include/items.php:3642 ../../mod/filestorage.php:18 -#: ../../mod/home.php:67 ../../mod/admin.php:159 ../../mod/admin.php:923 -#: ../../mod/admin.php:1126 ../../mod/thing.php:78 ../../mod/display.php:32 -#: ../../mod/viewsrc.php:18 -msgid "Item not found." -msgstr "Item niet gevonden." +#: ../../include/text.php:1092 +msgid "Tuesday" +msgstr "dinsdag" -#: ../../include/items.php:4075 ../../mod/group.php:38 ../../mod/group.php:140 -msgid "Collection not found." -msgstr "Collectie niet gevonden." - -#: ../../include/items.php:4090 -msgid "Collection is empty." -msgstr "Collectie is leeg" +#: ../../include/text.php:1092 +msgid "Wednesday" +msgstr "woensdag" -#: ../../include/items.php:4097 -#, php-format -msgid "Collection: %s" -msgstr "Collectie: %s" +#: ../../include/text.php:1092 +msgid "Thursday" +msgstr "donderdag" -#: ../../include/items.php:4108 -#, php-format -msgid "Connection: %s" -msgstr "Connectie: %s" +#: ../../include/text.php:1092 +msgid "Friday" +msgstr "vrijdag" -#: ../../include/items.php:4111 -msgid "Connection not found." -msgstr "Connectie niet gevonden." +#: ../../include/text.php:1092 +msgid "Saturday" +msgstr "zaterdag" -#: ../../include/Contact.php:107 ../../include/identity.php:675 -#: ../../include/widgets.php:128 ../../include/widgets.php:168 -#: ../../mod/dirprofile.php:164 ../../mod/suggest.php:51 -#: ../../mod/directory.php:183 ../../mod/match.php:62 -msgid "Connect" -msgstr "Verbinden" +#: ../../include/text.php:1092 +msgid "Sunday" +msgstr "zondag" -#: ../../include/Contact.php:123 -msgid "New window" -msgstr "Nieuw venster" +#: ../../include/text.php:1096 +msgid "January" +msgstr "januari" -#: ../../include/Contact.php:124 -msgid "Open the selected location in a different window or browser tab" -msgstr "Open de geselecteerde locatie in een ander venster of tab" +#: ../../include/text.php:1096 +msgid "February" +msgstr "februari" -#: ../../include/datetime.php:43 ../../include/datetime.php:45 -msgid "Miscellaneous" -msgstr "Diversen" +#: ../../include/text.php:1096 +msgid "March" +msgstr "maart" -#: ../../include/datetime.php:152 ../../include/datetime.php:284 -msgid "year" -msgstr "jaar" +#: ../../include/text.php:1096 +msgid "April" +msgstr "april" -#: ../../include/datetime.php:157 ../../include/datetime.php:285 -msgid "month" -msgstr "maand" +#: ../../include/text.php:1096 +msgid "May" +msgstr "mei" -#: ../../include/datetime.php:162 ../../include/datetime.php:287 -msgid "day" -msgstr "dag" +#: ../../include/text.php:1096 +msgid "June" +msgstr "juni" -#: ../../include/datetime.php:275 -msgid "never" -msgstr "nooit" +#: ../../include/text.php:1096 +msgid "July" +msgstr "juli" -#: ../../include/datetime.php:281 -msgid "less than a second ago" -msgstr "minder dan een seconde geleden" +#: ../../include/text.php:1096 +msgid "August" +msgstr "augustus" -#: ../../include/datetime.php:284 -msgid "years" -msgstr "jaren" +#: ../../include/text.php:1096 +msgid "September" +msgstr "september" -#: ../../include/datetime.php:285 -msgid "months" -msgstr "maanden" +#: ../../include/text.php:1096 +msgid "October" +msgstr "oktober" -#: ../../include/datetime.php:286 -msgid "week" -msgstr "week" +#: ../../include/text.php:1096 +msgid "November" +msgstr "november" -#: ../../include/datetime.php:286 -msgid "weeks" -msgstr "weken" +#: ../../include/text.php:1096 +msgid "December" +msgstr "december" -#: ../../include/datetime.php:287 -msgid "days" -msgstr "dagen" +#: ../../include/text.php:1174 +msgid "unknown.???" +msgstr "onbekend.???" -#: ../../include/datetime.php:288 -msgid "hour" -msgstr "uur" +#: ../../include/text.php:1175 +msgid "bytes" +msgstr "bytes" -#: ../../include/datetime.php:288 -msgid "hours" -msgstr "uren" +#: ../../include/text.php:1210 +msgid "remove category" +msgstr "categorie verwijderen" -#: ../../include/datetime.php:289 -msgid "minute" -msgstr "minuut" +#: ../../include/text.php:1280 +msgid "remove from file" +msgstr "uit map verwijderen" -#: ../../include/datetime.php:289 -msgid "minutes" -msgstr "minuten" +#: ../../include/text.php:1345 ../../include/text.php:1357 +msgid "Click to open/close" +msgstr "Klik om te openen of te sluiten" -#: ../../include/datetime.php:290 -msgid "second" -msgstr "seconde" +#: ../../include/text.php:1512 ../../mod/events.php:374 +msgid "Link to Source" +msgstr "Originele locatie" -#: ../../include/datetime.php:290 -msgid "seconds" -msgstr "seconden" +#: ../../include/text.php:1531 +msgid "Select a page layout: " +msgstr "Kies een paginalayout: " -#: ../../include/datetime.php:299 -#, php-format -msgid "%1$d %2$s ago" -msgstr "%1$d %2$s geleden" +#: ../../include/text.php:1534 ../../include/text.php:1599 +msgid "default" +msgstr "standaard" -#: ../../include/datetime.php:504 -#, php-format -msgid "%1$s's birthday" -msgstr "Verjaardag van %1$s" +#: ../../include/text.php:1570 +msgid "Page content type: " +msgstr "Opmaakcode pagina" -#: ../../include/datetime.php:505 -#, php-format -msgid "Happy Birthday %1$s" -msgstr "Gefeliciteerd met je verjaardag %1$s" +#: ../../include/text.php:1611 +msgid "Select an alternate language" +msgstr "Kies een andere taal" -#: ../../include/identity.php:30 ../../mod/item.php:1297 -msgid "Unable to obtain identity information from database" -msgstr "Niet in staat om identiteitsinformatie uit de database te verkrijgen" +#: ../../include/text.php:1735 ../../include/conversation.php:123 +#: ../../mod/tagger.php:49 +msgid "event" +msgstr "gebeurtenis" -#: ../../include/identity.php:63 -msgid "Empty name" -msgstr "Ontbrekende naam" +#: ../../include/text.php:1740 ../../include/conversation.php:150 +#: ../../mod/tagger.php:55 +msgid "comment" +msgstr "reactie" -#: ../../include/identity.php:65 -msgid "Name too long" -msgstr "Naam te lang" +#: ../../include/text.php:1745 +msgid "activity" +msgstr "activiteit" -#: ../../include/identity.php:166 -msgid "No account identifier" -msgstr "Geen account-identificator" +#: ../../include/text.php:2004 +msgid "Design" +msgstr "Ontwerp" -#: ../../include/identity.php:176 -msgid "Nickname is required." -msgstr "Bijnaam is verplicht" +#: ../../include/text.php:2006 +msgid "Blocks" +msgstr "Blokken" -#: ../../include/identity.php:190 -msgid "Reserved nickname. Please choose another." -msgstr "Deze naam is gereserveerd. Kies een andere." +#: ../../include/text.php:2007 +msgid "Menus" +msgstr "Menu's" -#: ../../include/identity.php:195 -msgid "" -"Nickname has unsupported characters or is already being used on this site." -msgstr "Deze naam heeft niet ondersteunde karakters of is al op deze hub in gebruik." +#: ../../include/text.php:2008 +msgid "Layouts" +msgstr "Layouts" -#: ../../include/identity.php:258 -msgid "Unable to retrieve created identity" -msgstr "Niet in staat om aangemaakte identiteit te vinden" +#: ../../include/text.php:2009 +msgid "Pages" +msgstr "Pagina's" -#: ../../include/identity.php:317 -msgid "Default Profile" -msgstr "Standaardprofiel" +#: ../../include/page_widgets.php:6 +msgid "New Page" +msgstr "Nieuwe pagina" -#: ../../include/identity.php:342 ../../include/profile_selectors.php:80 -#: ../../include/widgets.php:400 ../../mod/connedit.php:473 -msgid "Friends" -msgstr "Vrienden" +#: ../../include/page_widgets.php:39 ../../mod/blocks.php:97 +#: ../../mod/layouts.php:116 ../../mod/webpages.php:123 +msgid "View" +msgstr "Weergeven" -#: ../../include/identity.php:509 -msgid "Requested channel is not available." -msgstr "Opgevraagd kanaal is niet beschikbaar." +#: ../../include/page_widgets.php:40 ../../include/conversation.php:1091 +#: ../../include/ItemObject.php:592 ../../mod/editblock.php:141 +#: ../../mod/editlayout.php:135 ../../mod/editpost.php:140 +#: ../../mod/editwebpage.php:174 ../../mod/photos.php:1003 +#: ../../mod/webpages.php:124 +msgid "Preview" +msgstr "Voorvertoning" -#: ../../include/identity.php:557 ../../mod/filestorage.php:40 -#: ../../mod/webpages.php:8 ../../mod/profile.php:16 ../../mod/connect.php:13 -#: ../../mod/blocks.php:10 ../../mod/layouts.php:8 -#: ../../mod/achievements.php:8 -msgid "Requested profile is not available." -msgstr "Opgevraagd profiel is niet beschikbaar" +#: ../../include/page_widgets.php:41 ../../mod/webpages.php:125 +msgid "Actions" +msgstr "Acties" -#: ../../include/identity.php:689 ../../mod/profiles.php:695 -msgid "Change profile photo" -msgstr "Profielfoto veranderen" +#: ../../include/page_widgets.php:42 ../../mod/webpages.php:126 +msgid "Page Link" +msgstr "Paginalink" -#: ../../include/identity.php:695 -msgid "Profiles" -msgstr "Profielen" +#: ../../include/page_widgets.php:43 ../../mod/webpages.php:127 +msgid "Title" +msgstr "Titel" -#: ../../include/identity.php:695 -msgid "Manage/edit profiles" -msgstr "Profielen beheren/bewerken" +#: ../../include/page_widgets.php:44 ../../mod/webpages.php:128 +msgid "Created" +msgstr "Aangemaakt" -#: ../../include/identity.php:696 ../../mod/profiles.php:696 -msgid "Create New Profile" -msgstr "Nieuw profiel aanmaken" +#: ../../include/page_widgets.php:45 ../../mod/webpages.php:129 +msgid "Edited" +msgstr "Bewerkt" -#: ../../include/identity.php:699 ../../include/nav.php:89 -msgid "Edit Profile" -msgstr "Profiel bewerken" +#: ../../include/security.php:301 +msgid "" +"The form security token was not correct. This probably happened because the " +"form has been opened for too long (>3 hours) before submitting it." +msgstr "De beveiligings-token van het tekstvak was ongeldig. Dit is mogelijk het gevolg van dat er te lang (meer dan 3 uur) gewacht is om de tekst op te slaan. " -#: ../../include/identity.php:710 ../../mod/profiles.php:707 -msgid "Profile Image" -msgstr "Profielfoto" +#: ../../include/account.php:23 +msgid "Not a valid email address" +msgstr "Geen geldig e-mailadres" -#: ../../include/identity.php:713 -msgid "visible to everybody" -msgstr "Voor iedereen zichtbaar" +#: ../../include/account.php:25 +msgid "Your email domain is not among those allowed on this site" +msgstr "Jouw e-maildomein is op deze RedMatrix-hub niet toegestaan" -#: ../../include/identity.php:714 ../../mod/profiles.php:591 -#: ../../mod/profiles.php:711 -msgid "Edit visibility" -msgstr "Zichtbaarheid bewerken" +#: ../../include/account.php:31 +msgid "Your email address is already registered at this site." +msgstr "Jouw e-mailadres is al op deze RedMatrix-hub geregistreerd ." -#: ../../include/identity.php:726 ../../include/event.php:40 -#: ../../include/bb2diaspora.php:485 ../../mod/dirprofile.php:105 -#: ../../mod/directory.php:156 ../../mod/events.php:504 -msgid "Location:" -msgstr "Plaats:" +#: ../../include/account.php:64 +msgid "An invitation is required." +msgstr "Een uitnodiging is vereist" -#: ../../include/identity.php:728 ../../include/identity.php:952 -#: ../../mod/directory.php:158 -msgid "Gender:" -msgstr "Geslacht:" +#: ../../include/account.php:68 +msgid "Invitation could not be verified." +msgstr "Uitnodiging kon niet geverifieerd worden" -#: ../../include/identity.php:729 ../../include/identity.php:996 -#: ../../mod/directory.php:160 -msgid "Status:" -msgstr "Status:" +#: ../../include/account.php:119 +msgid "Please enter the required information." +msgstr "Vul de vereiste informatie in." -#: ../../include/identity.php:730 ../../include/identity.php:1007 -#: ../../mod/directory.php:162 -msgid "Homepage:" -msgstr "Homepagina:" +#: ../../include/account.php:187 +msgid "Failed to store account information." +msgstr "Account-informatie kon niet opgeslagen worden." -#: ../../include/identity.php:731 ../../mod/dirprofile.php:151 -msgid "Online Now" -msgstr "Nu online" +#: ../../include/account.php:245 +#, php-format +msgid "Registration confirmation for %s" +msgstr "Registratiebevestiging voor %s" -#: ../../include/identity.php:796 ../../include/identity.php:876 -#: ../../mod/ping.php:298 -msgid "g A l F d" -msgstr "G:i, l d F" +#: ../../include/account.php:313 +#, php-format +msgid "Registration request at %s" +msgstr "Registratieverzoek op %s" -#: ../../include/identity.php:797 ../../include/identity.php:877 -msgid "F d" -msgstr "d F" +#: ../../include/account.php:315 ../../include/account.php:342 +#: ../../include/account.php:399 +msgid "Administrator" +msgstr "Beheerder" -#: ../../include/identity.php:842 ../../include/identity.php:917 -#: ../../mod/ping.php:320 -msgid "[today]" -msgstr "[vandaag]" +#: ../../include/account.php:337 +msgid "your registration password" +msgstr "jouw registratiewachtwoord" -#: ../../include/identity.php:854 -msgid "Birthday Reminders" -msgstr "Verjaardagsherinneringen" +#: ../../include/account.php:340 ../../include/account.php:397 +#, php-format +msgid "Registration details for %s" +msgstr "Registratiedetails voor %s" -#: ../../include/identity.php:855 -msgid "Birthdays this week:" -msgstr "Verjaardagen deze week:" +#: ../../include/account.php:406 +msgid "Account approved." +msgstr "Account goedgekeurd" -#: ../../include/identity.php:910 -msgid "[No description]" -msgstr "[Geen omschrijving]" +#: ../../include/account.php:440 +#, php-format +msgid "Registration revoked for %s" +msgstr "Registratie ingetrokken voor %s" -#: ../../include/identity.php:928 -msgid "Event Reminders" -msgstr "Herinneringen voor gebeurtenissen" +#: ../../include/account.php:486 +msgid "Account verified. Please login." +msgstr "Account is geverifieerd. Je kan inloggen." -#: ../../include/identity.php:929 -msgid "Events this week:" -msgstr "Gebeurtenissen deze week:" +#: ../../include/photos.php:15 ../../include/attach.php:119 +#: ../../include/attach.php:166 ../../include/attach.php:229 +#: ../../include/attach.php:243 ../../include/attach.php:283 +#: ../../include/attach.php:297 ../../include/attach.php:322 +#: ../../include/attach.php:513 ../../include/attach.php:585 +#: ../../include/chat.php:116 ../../include/items.php:3711 +#: ../../mod/mood.php:112 ../../mod/mitem.php:73 ../../mod/achievements.php:27 +#: ../../mod/settings.php:494 ../../mod/poke.php:128 ../../mod/api.php:26 +#: ../../mod/api.php:31 ../../mod/authtest.php:13 ../../mod/profile.php:64 +#: ../../mod/profile.php:72 ../../mod/block.php:22 ../../mod/block.php:72 +#: ../../mod/profile_photo.php:263 ../../mod/profile_photo.php:276 +#: ../../mod/blocks.php:29 ../../mod/blocks.php:44 ../../mod/profiles.php:179 +#: ../../mod/profiles.php:524 ../../mod/bookmarks.php:46 +#: ../../mod/channel.php:89 ../../mod/channel.php:193 +#: ../../mod/channel.php:236 ../../mod/chat.php:90 ../../mod/chat.php:95 +#: ../../mod/register.php:71 ../../mod/regmod.php:18 ../../mod/common.php:35 +#: ../../mod/network.php:12 ../../mod/connections.php:169 +#: ../../mod/connedit.php:254 ../../mod/delegate.php:6 ../../mod/page.php:30 +#: ../../mod/page.php:80 ../../mod/setup.php:203 ../../mod/editblock.php:34 +#: ../../mod/pdledit.php:21 ../../mod/editlayout.php:48 +#: ../../mod/editpost.php:13 ../../mod/editwebpage.php:44 +#: ../../mod/editwebpage.php:83 ../../mod/photos.php:68 +#: ../../mod/photos.php:526 ../../mod/sources.php:66 ../../mod/events.php:160 +#: ../../mod/filestorage.php:10 ../../mod/filestorage.php:59 +#: ../../mod/filestorage.php:75 ../../mod/filestorage.php:98 +#: ../../mod/fsuggest.php:78 ../../mod/suggest.php:26 ../../mod/group.php:9 +#: ../../mod/thing.php:249 ../../mod/thing.php:266 ../../mod/thing.php:301 +#: ../../mod/invite.php:13 ../../mod/invite.php:104 ../../mod/item.php:178 +#: ../../mod/item.php:186 ../../mod/item.php:916 ../../mod/layouts.php:27 +#: ../../mod/layouts.php:39 ../../mod/like.php:154 +#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27 +#: ../../mod/viewsrc.php:12 ../../mod/mail.php:108 ../../mod/manage.php:6 +#: ../../mod/menu.php:44 ../../mod/webpages.php:40 ../../mod/message.php:16 +#: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97 +#: ../../mod/notifications.php:66 ../../mod/appman.php:66 ../../index.php:186 +#: ../../index.php:361 +msgid "Permission denied." +msgstr "Toegang geweigerd" -#: ../../include/identity.php:942 ../../include/identity.php:1050 -#: ../../include/apps.php:133 ../../mod/profperm.php:112 -msgid "Profile" -msgstr "Profiel" +#: ../../include/photos.php:104 +#, php-format +msgid "Image exceeds website size limit of %lu bytes" +msgstr "Afbeelding is groter dan op deze hub toegestane limiet van %lu bytes" -#: ../../include/identity.php:950 ../../mod/settings.php:936 -msgid "Full Name:" -msgstr "Volledige naam:" +#: ../../include/photos.php:111 +msgid "Image file is empty." +msgstr "Afbeeldingsbestand is leeg" -#: ../../include/identity.php:957 -msgid "Like this channel" -msgstr "Vind dit kanaal leuk" +#: ../../include/photos.php:140 ../../mod/profile_photo.php:216 +msgid "Unable to process image" +msgstr "Afbeelding kan niet verwerkt worden" -#: ../../include/identity.php:968 ../../include/taxonomy.php:338 -#: ../../include/ItemObject.php:134 -msgctxt "noun" -msgid "Like" -msgid_plural "Likes" -msgstr[0] "vindt dit leuk" -msgstr[1] "vinden dit leuk" +#: ../../include/photos.php:212 +msgid "Photo storage failed." +msgstr "Foto kan niet worden opgeslagen" -#: ../../include/identity.php:981 -msgid "j F, Y" -msgstr "F j Y" +#: ../../include/photos.php:339 ../../include/conversation.php:1515 +msgid "Photo Albums" +msgstr "Fotoalbums" -#: ../../include/identity.php:982 -msgid "j F" -msgstr "F j" +#: ../../include/photos.php:343 ../../mod/photos.php:697 +#: ../../mod/photos.php:1199 +msgid "Upload New Photos" +msgstr "Nieuwe foto's uploaden" -#: ../../include/identity.php:989 -msgid "Birthday:" -msgstr "Geboortedatum:" +#: ../../include/acl_selectors.php:240 +msgid "Visible to your default audience" +msgstr "Voor iedereen zichtbaar, zoals dit van te voren is ingesteld" -#: ../../include/identity.php:993 -msgid "Age:" -msgstr "Leeftijd:" +#: ../../include/acl_selectors.php:241 +msgid "Show" +msgstr "Tonen" -#: ../../include/identity.php:1002 -#, php-format -msgid "for %1$d %2$s" -msgstr "voor %1$d %2$s" +#: ../../include/acl_selectors.php:242 +msgid "Don't show" +msgstr "Niet tonen" -#: ../../include/identity.php:1005 ../../mod/profiles.php:613 -msgid "Sexual Preference:" -msgstr "Seksuele voorkeur:" +#: ../../include/acl_selectors.php:248 ../../mod/chat.php:209 +#: ../../mod/photos.php:604 ../../mod/photos.php:958 +#: ../../mod/filestorage.php:128 +msgid "Permissions" +msgstr "Privacy-rechten" -#: ../../include/identity.php:1009 ../../mod/profiles.php:615 -msgid "Hometown:" -msgstr "Oorspronkelijk uit:" +#: ../../include/acl_selectors.php:249 ../../include/ItemObject.php:289 +msgid "Close" +msgstr "Sluiten" -#: ../../include/identity.php:1011 -msgid "Tags:" -msgstr "Trefwoorden:" +#: ../../include/activities.php:39 +msgid " and " +msgstr " en " -#: ../../include/identity.php:1013 ../../mod/profiles.php:616 -msgid "Political Views:" -msgstr "Politieke overtuigingen:" +#: ../../include/activities.php:47 +msgid "public profile" +msgstr "openbaar profiel" -#: ../../include/identity.php:1015 -msgid "Religion:" -msgstr "Religie:" +#: ../../include/activities.php:52 +#, php-format +msgid "%1$s changed %2$s to “%3$s”" +msgstr "%1$s veranderde %2$s naar “%3$s”" -#: ../../include/identity.php:1017 ../../mod/directory.php:164 -msgid "About:" -msgstr "Over:" +#: ../../include/activities.php:53 +#, php-format +msgid "Visit %1$s's %2$s" +msgstr "Bezoek het %2$s van %1$s" -#: ../../include/identity.php:1019 -msgid "Hobbies/Interests:" -msgstr "Hobby's/interesses:" +#: ../../include/activities.php:56 +#, php-format +msgid "%1$s has an updated %2$s, changing %3$s." +msgstr "%1$s heeft een aangepaste %2$s, %3$s veranderd." -#: ../../include/identity.php:1021 ../../mod/profiles.php:619 -msgid "Likes:" -msgstr "Houdt van:" +#: ../../include/api.php:1036 +msgid "Public Timeline" +msgstr "Openbare tijdlijn" -#: ../../include/identity.php:1023 ../../mod/profiles.php:620 -msgid "Dislikes:" -msgstr "Houdt niet van:" +#: ../../include/attach.php:224 ../../include/attach.php:278 +msgid "Item was not found." +msgstr "Item niet gevonden" -#: ../../include/identity.php:1026 -msgid "Contact information and Social Networks:" -msgstr "Contactinformatie en sociale netwerken:" +#: ../../include/attach.php:335 +msgid "No source file." +msgstr "Geen bronbestand." -#: ../../include/identity.php:1028 -msgid "My other channels:" -msgstr "Mijn andere kanalen" +#: ../../include/attach.php:352 +msgid "Cannot locate file to replace" +msgstr "Kan het te vervangen bestand niet vinden" -#: ../../include/identity.php:1030 -msgid "Musical interests:" -msgstr "Muzikale interesses:" +#: ../../include/attach.php:370 +msgid "Cannot locate file to revise/update" +msgstr "Kan het bestand wat aangepast moet worden niet vinden" -#: ../../include/identity.php:1032 -msgid "Books, literature:" -msgstr "Boeken, literatuur:" +#: ../../include/attach.php:381 +#, php-format +msgid "File exceeds size limit of %d" +msgstr "Bestand is groter dan de toegelaten %d" -#: ../../include/identity.php:1034 -msgid "Television:" -msgstr "Televisie:" +#: ../../include/attach.php:393 +#, php-format +msgid "You have reached your limit of %1$.0f Mbytes attachment storage." +msgstr "Je hebt jouw limiet van %1$.0f MB opslagruimte voor bijlagen bereikt." -#: ../../include/identity.php:1036 -msgid "Film/dance/culture/entertainment:" -msgstr "Films/dansen/cultuur/vermaak:" +#: ../../include/attach.php:475 +msgid "File upload failed. Possible system limit or action terminated." +msgstr "Uploaden van bestand mislukt. Mogelijk systeemlimiet bereikt of actie afgebroken." -#: ../../include/identity.php:1038 -msgid "Love/Romance:" -msgstr "Liefde/romantiek:" +#: ../../include/attach.php:487 +msgid "Stored file could not be verified. Upload failed." +msgstr "Opgeslagen bestand kon niet worden geverifieerd. Uploaden mislukt." -#: ../../include/identity.php:1040 -msgid "Work/employment:" -msgstr "Werk/beroep:" +#: ../../include/attach.php:528 ../../include/attach.php:545 +msgid "Path not available." +msgstr "Pad niet beschikbaar." -#: ../../include/identity.php:1042 -msgid "School/education:" -msgstr "School/opleiding:" +#: ../../include/attach.php:590 +msgid "Empty pathname" +msgstr "Padnaam leeg" -#: ../../include/identity.php:1052 -msgid "Like this thing" -msgstr "Vind dit ding leuk" +#: ../../include/attach.php:606 +msgid "duplicate filename or path" +msgstr "dubbele bestandsnaam of pad" -#: ../../include/page_widgets.php:6 -msgid "New Page" -msgstr "Nieuwe pagina" +#: ../../include/attach.php:630 +msgid "Path not found." +msgstr "Pad niet gevonden" -#: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36 -#: ../../include/menu.php:42 ../../include/reddav.php:1289 -#: ../../include/ItemObject.php:96 ../../include/apps.php:240 -#: ../../mod/settings.php:578 ../../mod/webpages.php:120 -#: ../../mod/connections.php:393 ../../mod/menu.php:59 ../../mod/thing.php:235 -#: ../../mod/editpost.php:112 ../../mod/editwebpage.php:143 -#: ../../mod/blocks.php:94 ../../mod/layouts.php:112 -#: ../../mod/editblock.php:111 ../../mod/editlayout.php:106 -msgid "Edit" -msgstr "Bewerken" +#: ../../include/attach.php:681 +msgid "mkdir failed." +msgstr "directory aanmaken (mkdir) mislukt." -#: ../../include/page_widgets.php:39 ../../mod/webpages.php:123 -#: ../../mod/blocks.php:97 ../../mod/layouts.php:116 -msgid "View" -msgstr "Weergeven" - -#: ../../include/page_widgets.php:40 ../../include/ItemObject.php:592 -#: ../../include/conversation.php:1091 ../../mod/webpages.php:124 -#: ../../mod/photos.php:997 ../../mod/editpost.php:140 -#: ../../mod/editwebpage.php:174 ../../mod/editblock.php:141 -#: ../../mod/editlayout.php:135 -msgid "Preview" -msgstr "Voorvertoning" +#: ../../include/attach.php:685 +msgid "database storage failed." +msgstr "opslag in database mislukt." -#: ../../include/page_widgets.php:41 ../../mod/webpages.php:125 -msgid "Actions" -msgstr "Acties" +#: ../../include/plugin.php:504 ../../include/plugin.php:506 +msgid "Click here to upgrade." +msgstr "Klik hier om te upgraden." -#: ../../include/page_widgets.php:42 ../../mod/webpages.php:126 -msgid "Page Link" -msgstr "Paginalink" +#: ../../include/plugin.php:512 +msgid "This action exceeds the limits set by your subscription plan." +msgstr "Deze handeling overschrijdt de beperkingen die voor jouw abonnement gelden." -#: ../../include/page_widgets.php:43 ../../mod/webpages.php:127 -msgid "Title" -msgstr "Titel" +#: ../../include/plugin.php:517 +msgid "This action is not available under your subscription plan." +msgstr "Deze handeling is niet mogelijk met jouw abonnement." -#: ../../include/page_widgets.php:44 ../../mod/webpages.php:128 -msgid "Created" -msgstr "Aangemaakt" +#: ../../include/bb2diaspora.php:463 ../../include/event.php:11 +msgid "l F d, Y \\@ g:i A" +msgstr "l d F Y \\@ G:i" -#: ../../include/page_widgets.php:45 ../../mod/webpages.php:129 -msgid "Edited" -msgstr "Bewerkt" +#: ../../include/bb2diaspora.php:469 ../../include/event.php:20 +msgid "Starts:" +msgstr "Start:" -#: ../../include/reddav.php:1145 ../../include/reddav.php:1288 -msgid "parent" -msgstr "omhoog" +#: ../../include/bb2diaspora.php:477 ../../include/event.php:30 +msgid "Finishes:" +msgstr "Einde:" -#: ../../include/reddav.php:1169 -msgid "Collection" -msgstr "map" +#: ../../include/bb2diaspora.php:485 ../../include/event.php:40 +#: ../../include/identity.php:757 ../../mod/directory.php:156 +#: ../../mod/dirprofile.php:105 ../../mod/events.php:504 +msgid "Location:" +msgstr "Plaats:" -#: ../../include/reddav.php:1172 -msgid "Principal" -msgstr "principal" +#: ../../include/nav.php:81 ../../include/nav.php:108 ../../boot.php:1497 +msgid "Logout" +msgstr "Uitloggen" -#: ../../include/reddav.php:1175 -msgid "Addressbook" -msgstr "Adresboek" +#: ../../include/nav.php:81 ../../include/nav.php:108 +msgid "End this session" +msgstr "Beëindig deze sessie" -#: ../../include/reddav.php:1178 -msgid "Calendar" -msgstr "Agenda" +#: ../../include/nav.php:84 ../../include/nav.php:142 +msgid "Home" +msgstr "Home" -#: ../../include/reddav.php:1181 -msgid "Schedule Inbox" -msgstr "Planning-postvak IN" +#: ../../include/nav.php:84 +msgid "Your posts and conversations" +msgstr "Jouw berichten en conversaties" -#: ../../include/reddav.php:1184 -msgid "Schedule Outbox" -msgstr "Planning-postvak UIT" +#: ../../include/nav.php:85 ../../include/conversation.php:940 +#: ../../mod/connedit.php:393 ../../mod/connedit.php:507 +msgid "View Profile" +msgstr "Profiel weergeven" -#: ../../include/reddav.php:1202 ../../include/apps.php:322 -#: ../../include/apps.php:373 ../../mod/connedit.php:476 -msgid "Unknown" -msgstr "Onbekend" +#: ../../include/nav.php:85 +msgid "Your profile page" +msgstr "Jouw profielpagina" -#: ../../include/reddav.php:1262 -#, php-format -msgid "%1$s used" -msgstr "%1$s gebruikt" +#: ../../include/nav.php:87 +msgid "Edit Profiles" +msgstr "Bewerk profielen" -#: ../../include/reddav.php:1267 -#, php-format -msgid "%1$s used of %2$s (%3$s%)" -msgstr "%1$s van %2$s gebruikt (%3$s%)" +#: ../../include/nav.php:87 +msgid "Manage/Edit profiles" +msgstr "Beheer/wijzig profielen" -#: ../../include/reddav.php:1280 ../../include/nav.php:92 -#: ../../include/apps.php:130 ../../include/conversation.php:1521 -#: ../../mod/fbrowser.php:114 -msgid "Files" -msgstr "Bestanden" +#: ../../include/nav.php:89 ../../include/identity.php:730 +msgid "Edit Profile" +msgstr "Profiel bewerken" -#: ../../include/reddav.php:1284 ../../mod/settings.php:518 -#: ../../mod/settings.php:544 ../../mod/admin.php:893 -msgid "Name" -msgstr "Naam" +#: ../../include/nav.php:89 +msgid "Edit your profile" +msgstr "Jouw profiel bewerken" -#: ../../include/reddav.php:1285 -msgid "Type" -msgstr "Type" +#: ../../include/nav.php:91 +msgid "Your photos" +msgstr "Jouw foto's" -#: ../../include/reddav.php:1286 -msgid "Size" -msgstr "Grootte" +#: ../../include/nav.php:92 +msgid "Your files" +msgstr "Jouw bestanden" -#: ../../include/reddav.php:1287 -msgid "Last Modified" -msgstr "Laatst gewijzigd" +#: ../../include/nav.php:97 +msgid "Your chatrooms" +msgstr "Jouw chatkanalen" -#: ../../include/reddav.php:1290 ../../include/ItemObject.php:108 -#: ../../include/apps.php:241 ../../include/conversation.php:635 -#: ../../mod/settings.php:579 ../../mod/admin.php:758 ../../mod/admin.php:888 -#: ../../mod/photos.php:1046 ../../mod/connedit.php:440 -#: ../../mod/thing.php:236 ../../mod/group.php:176 -msgid "Delete" -msgstr "Verwijderen" +#: ../../include/nav.php:100 +msgid "Your bookmarks" +msgstr "Jouw bladwijzers" -#: ../../include/reddav.php:1291 -msgid "Total" -msgstr "Totaal" +#: ../../include/nav.php:102 +msgid "Your webpages" +msgstr "Jouw webpagina's" -#: ../../include/reddav.php:1344 -msgid "Create new folder" -msgstr "Nieuwe map aanmaken" +#: ../../include/nav.php:106 +msgid "Sign in" +msgstr "Inloggen" -#: ../../include/reddav.php:1345 ../../mod/new_channel.php:117 -#: ../../mod/mitem.php:142 ../../mod/menu.php:84 -msgid "Create" -msgstr "Aanmaken" +#: ../../include/nav.php:123 +#, php-format +msgid "%s - click to logout" +msgstr "%s - klik om uit te loggen" -#: ../../include/reddav.php:1346 -msgid "Upload file" -msgstr "Bestand uploaden" +#: ../../include/nav.php:128 +msgid "Click to authenticate to your home hub" +msgstr "Klik om jezelf te authenticeren via jouw eigen RedMatrix-hub" -#: ../../include/reddav.php:1347 ../../mod/profile_photo.php:361 -msgid "Upload" -msgstr "Uploaden" +#: ../../include/nav.php:142 +msgid "Home Page" +msgstr "Homepage" -#: ../../include/message.php:18 -msgid "No recipient provided." -msgstr "Geen ontvanger opgegeven." +#: ../../include/nav.php:146 ../../mod/register.php:221 ../../boot.php:1474 +msgid "Register" +msgstr "Registreren " -#: ../../include/message.php:23 -msgid "[no subject]" -msgstr "[geen onderwerp]" +#: ../../include/nav.php:146 +msgid "Create an account" +msgstr "Maak een account aan" -#: ../../include/message.php:42 -msgid "Unable to determine sender." -msgstr "Afzender kan niet bepaald worden." +#: ../../include/nav.php:151 +msgid "Help and documentation" +msgstr "Hulp en documentatie" -#: ../../include/message.php:143 -msgid "Stored post could not be verified." -msgstr "Opgeslagen bericht kon niet worden geverifieerd." +#: ../../include/nav.php:154 ../../include/widgets.php:79 +#: ../../mod/apps.php:33 +msgid "Apps" +msgstr "Apps" -#: ../../include/taxonomy.php:210 -msgid "Tags" -msgstr "Labels" +#: ../../include/nav.php:154 +msgid "Applications, utilities, links, games" +msgstr "Apps" -#: ../../include/taxonomy.php:227 -msgid "Keywords" -msgstr "Trefwoorden" +#: ../../include/nav.php:156 +msgid "Search site content" +msgstr "Inhoud van deze RedMatrix-hub doorzoeken" -#: ../../include/taxonomy.php:252 -msgid "have" -msgstr "heb" +#: ../../include/nav.php:159 +msgid "Channel Locator" +msgstr "Kanalengids" -#: ../../include/taxonomy.php:252 -msgid "has" -msgstr "heeft" +#: ../../include/nav.php:170 +msgid "Your matrix" +msgstr "Jouw matrix" -#: ../../include/taxonomy.php:253 -msgid "want" -msgstr "wil" +#: ../../include/nav.php:171 +msgid "Mark all matrix notifications seen" +msgstr "Markeer alle matrixnotificaties als bekeken" -#: ../../include/taxonomy.php:253 -msgid "wants" -msgstr "wil" +#: ../../include/nav.php:173 +msgid "Channel home" +msgstr "Tijdlijn kanaal" -#: ../../include/taxonomy.php:254 ../../include/ItemObject.php:208 -msgid "like" -msgstr "vind dit leuk" +#: ../../include/nav.php:174 +msgid "Mark all channel notifications seen" +msgstr "Alle kanaalnotificaties als gelezen markeren" -#: ../../include/taxonomy.php:254 -msgid "likes" -msgstr "vindt dit leuk" +#: ../../include/nav.php:177 ../../mod/connections.php:386 +msgid "Connections" +msgstr "Connecties" -#: ../../include/taxonomy.php:255 ../../include/ItemObject.php:209 -msgid "dislike" -msgstr "vind dit niet leuk" +#: ../../include/nav.php:180 +msgid "Notices" +msgstr "Notificaties" -#: ../../include/taxonomy.php:255 -msgid "dislikes" -msgstr "vindt dit niet leuk" +#: ../../include/nav.php:180 +msgid "Notifications" +msgstr "Notificaties" -#: ../../include/js_strings.php:5 -msgid "Delete this item?" -msgstr "Dit item verwijderen?" +#: ../../include/nav.php:181 +msgid "See all notifications" +msgstr "Alle notificaties weergeven" -#: ../../include/js_strings.php:6 ../../include/ItemObject.php:582 -#: ../../mod/photos.php:995 ../../mod/photos.php:1082 -msgid "Comment" -msgstr "Reactie" +#: ../../include/nav.php:182 ../../mod/notifications.php:99 +msgid "Mark all system notifications seen" +msgstr "Markeer alle systeemnotificaties als bekeken" -#: ../../include/js_strings.php:7 ../../include/ItemObject.php:316 -msgid "[+] show all" -msgstr "[+] alle" +#: ../../include/nav.php:184 +msgid "Private mail" +msgstr "Privéberichten" -#: ../../include/js_strings.php:8 -msgid "[-] show less" -msgstr "[-] minder reacties weergeven" - -#: ../../include/js_strings.php:9 -msgid "[+] expand" -msgstr "[+] uitklappen" - -#: ../../include/js_strings.php:10 -msgid "[-] collapse" -msgstr "[-] inklappen" - -#: ../../include/js_strings.php:11 -msgid "Password too short" -msgstr "Wachtwoord te kort" - -#: ../../include/js_strings.php:12 -msgid "Passwords do not match" -msgstr "Wachtwoorden komen niet overeen" - -#: ../../include/js_strings.php:13 ../../mod/photos.php:39 -msgid "everybody" -msgstr "iedereen" - -#: ../../include/js_strings.php:14 -msgid "Secret Passphrase" -msgstr "Geheim wachtwoord" - -#: ../../include/js_strings.php:15 -msgid "Passphrase hint" -msgstr "Wachtwoordhint" - -#: ../../include/js_strings.php:16 -msgid "Notice: Permissions have changed but have not yet been submitted." -msgstr "Mededeling: de privacy-rechten zijn veranderd, maar zijn nog niet opgeslagen." - -#: ../../include/js_strings.php:17 -msgid "close all" -msgstr "Alles sluiten" - -#: ../../include/js_strings.php:19 -msgid "timeago.prefixAgo" -msgstr "timeago.prefixAgo" +#: ../../include/nav.php:185 +msgid "See all private messages" +msgstr "Alle privéberichten weergeven" -#: ../../include/js_strings.php:20 -msgid "timeago.prefixFromNow" -msgstr "timeago.prefixFromNow" +#: ../../include/nav.php:186 +msgid "Mark all private messages seen" +msgstr "Markeer alle privéberichten als bekeken" -#: ../../include/js_strings.php:21 -msgid "ago" -msgstr "geleden" +#: ../../include/nav.php:187 +msgid "Inbox" +msgstr "Postvak IN" -#: ../../include/js_strings.php:22 -msgid "from now" -msgstr "vanaf nu" +#: ../../include/nav.php:188 +msgid "Outbox" +msgstr "Postvak UIT" -#: ../../include/js_strings.php:23 -msgid "less than a minute" -msgstr "minder dan een minuut" +#: ../../include/nav.php:189 ../../include/widgets.php:536 +msgid "New Message" +msgstr "Nieuw bericht" -#: ../../include/js_strings.php:24 -msgid "about a minute" -msgstr "ongeveer een minuut" +#: ../../include/nav.php:192 +msgid "Event Calendar" +msgstr "Agenda" -#: ../../include/js_strings.php:25 -#, php-format -msgid "%d minutes" -msgstr "%d minuten" +#: ../../include/nav.php:193 +msgid "See all events" +msgstr "Alle gebeurtenissen weergeven" -#: ../../include/js_strings.php:26 -msgid "about an hour" -msgstr "ongeveer een uur" +#: ../../include/nav.php:194 +msgid "Mark all events seen" +msgstr "Markeer alle gebeurtenissen als bekeken" -#: ../../include/js_strings.php:27 -#, php-format -msgid "about %d hours" -msgstr "ongeveer %d uren" +#: ../../include/nav.php:196 +msgid "Manage Your Channels" +msgstr "Beheer je kanalen" -#: ../../include/js_strings.php:28 -msgid "a day" -msgstr "een dag" +#: ../../include/nav.php:198 +msgid "Account/Channel Settings" +msgstr "Account-/kanaal-instellingen" -#: ../../include/js_strings.php:29 -#, php-format -msgid "%d days" -msgstr "%d dagen" +#: ../../include/nav.php:206 ../../mod/admin.php:123 +msgid "Admin" +msgstr "Beheer" -#: ../../include/js_strings.php:30 -msgid "about a month" -msgstr "ongeveer een maand" +#: ../../include/nav.php:206 +msgid "Site Setup and Configuration" +msgstr "Hub instellen en beheren" -#: ../../include/js_strings.php:31 -#, php-format -msgid "%d months" -msgstr "%d maanden" +#: ../../include/nav.php:231 +msgid "Nothing new here" +msgstr "Niets nieuw hier" -#: ../../include/js_strings.php:32 -msgid "about a year" -msgstr "ongeveer een jaar" +#: ../../include/nav.php:235 +msgid "Please wait..." +msgstr "Wachten aub..." -#: ../../include/js_strings.php:33 +#: ../../include/bookmarks.php:35 #, php-format -msgid "%d years" -msgstr "%d jaren" - -#: ../../include/js_strings.php:34 -msgid " " -msgstr " " - -#: ../../include/js_strings.php:35 -msgid "timeago.numbers" -msgstr "timeago.numbers" - -#: ../../include/permissions.php:13 -msgid "Can view my normal stream and posts" -msgstr "Kan mijn normale kanaalstream en berichten bekijken" - -#: ../../include/permissions.php:14 -msgid "Can view my default channel profile" -msgstr "Kan mijn standaard kanaalprofiel bekijken" - -#: ../../include/permissions.php:15 -msgid "Can view my photo albums" -msgstr "Kan mijn fotoalbums bekijken" - -#: ../../include/permissions.php:16 -msgid "Can view my connections" -msgstr "Kan een lijst met mijn connecties bekijken" - -#: ../../include/permissions.php:17 -msgid "Can view my file storage" -msgstr "Kan mijn bestanden bekijken" - -#: ../../include/permissions.php:18 -msgid "Can view my webpages" -msgstr "Kan mijn pagina's bekijken" - -#: ../../include/permissions.php:21 -msgid "Can send me their channel stream and posts" -msgstr "Kan mij de inhoud van hun kanaal en berichten sturen" - -#: ../../include/permissions.php:22 -msgid "Can post on my channel page (\"wall\")" -msgstr "Kan een bericht in mijn kanaal (\"wall\") plaatsen" - -#: ../../include/permissions.php:23 -msgid "Can comment on or like my posts" -msgstr "Kan op mijn berichten reageren of deze (niet) leuk vinden" +msgid "%1$s's bookmarks" +msgstr "Bladwijzers van %1$s" -#: ../../include/permissions.php:24 -msgid "Can send me private mail messages" -msgstr "Kan mij privéberichten sturen" +#: ../../include/taxonomy.php:210 +msgid "Tags" +msgstr "Labels" -#: ../../include/permissions.php:25 -msgid "Can post photos to my photo albums" -msgstr "Kan foto's aan mijn fotoalbums toevoegen" +#: ../../include/taxonomy.php:227 +msgid "Keywords" +msgstr "Trefwoorden" -#: ../../include/permissions.php:26 -msgid "Can like/dislike stuff" -msgstr "Kan dingen leuk of niet leuk vinden" +#: ../../include/taxonomy.php:252 +msgid "have" +msgstr "heb" -#: ../../include/permissions.php:28 -msgid "Can forward to all my channel contacts via post @mentions" -msgstr "Kan naar al mijn kanaalconnecties berichten doorsturen met behulp van @vermeldingen+" +#: ../../include/taxonomy.php:252 +msgid "has" +msgstr "heeft" -#: ../../include/permissions.php:28 -msgid "Advanced - useful for creating group forum channels" -msgstr "Geavanceerd - nuttig voor kanalen met een groep- cq. forumfunctie" +#: ../../include/taxonomy.php:253 +msgid "want" +msgstr "wil" -#: ../../include/permissions.php:29 -msgid "Can chat with me (when available)" -msgstr "Kan met mij chatten (wanneer beschikbaar)" +#: ../../include/taxonomy.php:253 +msgid "wants" +msgstr "wil" -#: ../../include/permissions.php:30 -msgid "Can write to my file storage" -msgstr "Kan bestanden aan mijn bestandsopslag toevoegen" +#: ../../include/taxonomy.php:254 ../../include/ItemObject.php:208 +msgid "like" +msgstr "vind dit leuk" -#: ../../include/permissions.php:31 -msgid "Can edit my webpages" -msgstr "Kan mijn pagina's bewerken" +#: ../../include/taxonomy.php:254 +msgid "likes" +msgstr "vindt dit leuk" -#: ../../include/permissions.php:33 -msgid "Can source my public posts in derived channels" -msgstr "Kan mijn openbare berichten als bron voor andere kanalen gebruiken" +#: ../../include/taxonomy.php:255 ../../include/ItemObject.php:209 +msgid "dislike" +msgstr "vind dit niet leuk" -#: ../../include/permissions.php:33 -msgid "Somewhat advanced - very useful in open communities" -msgstr "Enigszins geavanceerd (erg nuttig voor kanalen van forums/groepen)" +#: ../../include/taxonomy.php:255 +msgid "dislikes" +msgstr "vindt dit niet leuk" -#: ../../include/permissions.php:35 -msgid "Can administer my channel resources" -msgstr "Kan mijn kanaal beheren" +#: ../../include/taxonomy.php:338 ../../include/identity.php:999 +#: ../../include/ItemObject.php:134 +msgctxt "noun" +msgid "Like" +msgid_plural "Likes" +msgstr[0] "vindt dit leuk" +msgstr[1] "vinden dit leuk" -#: ../../include/permissions.php:35 -msgid "" -"Extremely advanced. Leave this alone unless you know what you are doing" -msgstr "Zeer geavanceerd. Laat dit met rust, behalve als je weet wat je doet." +#: ../../include/comanche.php:35 ../../view/theme/apw/php/config.php:185 +msgid "Default" +msgstr "Standaard" #: ../../include/contact_selectors.php:56 msgid "Frequently" @@ -1298,6 +1173,11 @@ msgstr "OStatus" msgid "RSS/Atom" msgstr "RSS/Atom" +#: ../../include/contact_selectors.php:79 ../../mod/admin.php:763 +#: ../../mod/admin.php:772 ../../boot.php:1500 +msgid "Email" +msgstr "E-mail" + #: ../../include/contact_selectors.php:80 msgid "Diaspora" msgstr "Diaspora" @@ -1322,2379 +1202,2495 @@ msgstr "XMPP/IM" msgid "MySpace" msgstr "MySpace" -#: ../../include/event.php:11 ../../include/bb2diaspora.php:463 -msgid "l F d, Y \\@ g:i A" -msgstr "l d F Y \\@ G:i" +#: ../../include/contact_widgets.php:14 +#, php-format +msgid "%d invitation available" +msgid_plural "%d invitations available" +msgstr[0] "%d uitnodiging beschikbaar" +msgstr[1] "%d uitnodigingen beschikbaar" -#: ../../include/event.php:20 ../../include/bb2diaspora.php:469 -msgid "Starts:" -msgstr "Start:" +#: ../../include/contact_widgets.php:19 ../../mod/admin.php:455 +msgid "Advanced" +msgstr "Geavanceerd" -#: ../../include/event.php:30 ../../include/bb2diaspora.php:477 -msgid "Finishes:" -msgstr "Einde:" +#: ../../include/contact_widgets.php:22 +msgid "Find Channels" +msgstr "Kanalen vinden" -#: ../../include/event.php:326 -msgid "This event has been added to your calendar." -msgstr "Dit evenement is aan jouw agenda toegevoegd." +#: ../../include/contact_widgets.php:23 +msgid "Enter name or interest" +msgstr "Vul naam of interesse in" -#: ../../include/profile_selectors.php:6 -#: ../../include/profile_selectors.php:23 -msgid "Male" -msgstr "Man" +#: ../../include/contact_widgets.php:24 +msgid "Connect/Follow" +msgstr "Verbinden/volgen" -#: ../../include/profile_selectors.php:6 -#: ../../include/profile_selectors.php:23 -msgid "Female" -msgstr "Vrouw" +#: ../../include/contact_widgets.php:25 +msgid "Examples: Robert Morgenstein, Fishing" +msgstr "Voorbeeld: Robert Morgenstein, vissen" -#: ../../include/profile_selectors.php:6 -msgid "Currently Male" -msgstr "Momenteel man" +#: ../../include/contact_widgets.php:26 ../../mod/connections.php:392 +#: ../../mod/directory.php:222 ../../mod/directory.php:227 +msgid "Find" +msgstr "Vinden" -#: ../../include/profile_selectors.php:6 -msgid "Currently Female" -msgstr "Momenteel vrouw" +#: ../../include/contact_widgets.php:27 ../../mod/suggest.php:59 +msgid "Channel Suggestions" +msgstr "Voorgestelde kanalen" -#: ../../include/profile_selectors.php:6 -msgid "Mostly Male" -msgstr "Voornamelijk man" +#: ../../include/contact_widgets.php:29 +msgid "Random Profile" +msgstr "Willekeurig profiel" -#: ../../include/profile_selectors.php:6 -msgid "Mostly Female" -msgstr "Voornamelijk vrouw" +#: ../../include/contact_widgets.php:30 +msgid "Invite Friends" +msgstr "Vrienden uitnodigen" -#: ../../include/profile_selectors.php:6 -msgid "Transgender" -msgstr "Transgender" +#: ../../include/contact_widgets.php:32 +msgid "Exammple: name=fred and country=iceland" +msgstr "Voorbeeld: (voor naam) name=herman en (voor land) country=nederland" -#: ../../include/profile_selectors.php:6 -msgid "Intersex" -msgstr "Interseksueel" +#: ../../include/contact_widgets.php:33 +msgid "Advanced Find" +msgstr "Geavanceerd zoeken" -#: ../../include/profile_selectors.php:6 -msgid "Transsexual" -msgstr "Transseksueel" +#: ../../include/contact_widgets.php:58 ../../include/features.php:69 +#: ../../include/widgets.php:296 +msgid "Saved Folders" +msgstr "Bewaarde mappen" -#: ../../include/profile_selectors.php:6 -msgid "Hermaphrodite" -msgstr "Hermafrodiet" +#: ../../include/contact_widgets.php:61 ../../include/contact_widgets.php:96 +#: ../../include/widgets.php:299 +msgid "Everything" +msgstr "Alles" -#: ../../include/profile_selectors.php:6 -msgid "Neuter" -msgstr "Genderneutraal" +#: ../../include/contact_widgets.php:93 ../../include/widgets.php:29 +msgid "Categories" +msgstr "Categorieën" -#: ../../include/profile_selectors.php:6 -msgid "Non-specific" -msgstr "Niet gespecificeerd" +#: ../../include/contact_widgets.php:126 +#, php-format +msgid "%d connection in common" +msgid_plural "%d connections in common" +msgstr[0] "%d gemeenschappelijke connectie" +msgstr[1] "%d gemeenschappelijke connecties" -#: ../../include/profile_selectors.php:6 -#: ../../include/profile_selectors.php:23 -#: ../../include/profile_selectors.php:61 -#: ../../include/profile_selectors.php:97 -msgid "Other" -msgstr "Anders" +#: ../../include/contact_widgets.php:131 +msgid "show more" +msgstr "meer connecties weergeven" -#: ../../include/profile_selectors.php:6 -msgid "Undecided" -msgstr "Nog niet beslist" +#: ../../include/event.php:326 +msgid "This event has been added to your calendar." +msgstr "Dit evenement is aan jouw agenda toegevoegd." -#: ../../include/profile_selectors.php:42 -#: ../../include/profile_selectors.php:61 -msgid "Males" -msgstr "Mannen" +#: ../../include/zot.php:624 +msgid "Invalid data packet" +msgstr "Datapakket ongeldig" -#: ../../include/profile_selectors.php:42 -#: ../../include/profile_selectors.php:61 -msgid "Females" -msgstr "Vrouwen" +#: ../../include/zot.php:638 +msgid "Unable to verify channel signature" +msgstr "Kanaal-kenmerk (channel signature) kon niet worden geverifieerd. " -#: ../../include/profile_selectors.php:42 -msgid "Gay" -msgstr "Homoseksueel" +#: ../../include/zot.php:835 +#, php-format +msgid "Unable to verify site signature for %s" +msgstr "Hub-kenmerk (site signature) voor %s kon niet worden geverifieerd" -#: ../../include/profile_selectors.php:42 -msgid "Lesbian" -msgstr "Lesbisch" +#: ../../include/datetime.php:43 ../../include/datetime.php:45 +msgid "Miscellaneous" +msgstr "Diversen" -#: ../../include/profile_selectors.php:42 -msgid "No Preference" -msgstr "Geen voorkeur" +#: ../../include/datetime.php:152 ../../include/datetime.php:284 +msgid "year" +msgstr "jaar" -#: ../../include/profile_selectors.php:42 -msgid "Bisexual" -msgstr "Biseksueel" +#: ../../include/datetime.php:157 ../../include/datetime.php:285 +msgid "month" +msgstr "maand" -#: ../../include/profile_selectors.php:42 -msgid "Autosexual" -msgstr "Autoseksueel" +#: ../../include/datetime.php:162 ../../include/datetime.php:287 +msgid "day" +msgstr "dag" -#: ../../include/profile_selectors.php:42 -msgid "Abstinent" -msgstr "Seksuele onthouding" +#: ../../include/datetime.php:275 +msgid "never" +msgstr "nooit" -#: ../../include/profile_selectors.php:42 -msgid "Virgin" -msgstr "Maagd" +#: ../../include/datetime.php:281 +msgid "less than a second ago" +msgstr "minder dan een seconde geleden" -#: ../../include/profile_selectors.php:42 -msgid "Deviant" -msgstr "Afwijkend" +#: ../../include/datetime.php:284 +msgid "years" +msgstr "jaren" -#: ../../include/profile_selectors.php:42 -msgid "Fetish" -msgstr "Fetisj" +#: ../../include/datetime.php:285 +msgid "months" +msgstr "maanden" -#: ../../include/profile_selectors.php:42 -msgid "Oodles" -msgstr "Veel" +#: ../../include/datetime.php:286 +msgid "week" +msgstr "week" -#: ../../include/profile_selectors.php:42 -msgid "Nonsexual" -msgstr "Aseksueel" +#: ../../include/datetime.php:286 +msgid "weeks" +msgstr "weken" -#: ../../include/profile_selectors.php:80 -#: ../../include/profile_selectors.php:97 -msgid "Single" -msgstr "Alleen" +#: ../../include/datetime.php:287 +msgid "days" +msgstr "dagen" -#: ../../include/profile_selectors.php:80 -msgid "Lonely" -msgstr "Eenzaam" +#: ../../include/datetime.php:288 +msgid "hour" +msgstr "uur" -#: ../../include/profile_selectors.php:80 -msgid "Available" -msgstr "Beschikbaar" +#: ../../include/datetime.php:288 +msgid "hours" +msgstr "uren" -#: ../../include/profile_selectors.php:80 -msgid "Unavailable" -msgstr "Niet beschikbaar" +#: ../../include/datetime.php:289 +msgid "minute" +msgstr "minuut" -#: ../../include/profile_selectors.php:80 -msgid "Has crush" -msgstr "Heeft een oogje op iemand" +#: ../../include/datetime.php:289 +msgid "minutes" +msgstr "minuten" -#: ../../include/profile_selectors.php:80 -msgid "Infatuated" -msgstr "Smoorverliefd" +#: ../../include/datetime.php:290 +msgid "second" +msgstr "seconde" -#: ../../include/profile_selectors.php:80 -#: ../../include/profile_selectors.php:97 -msgid "Dating" -msgstr "Aan het daten" +#: ../../include/datetime.php:290 +msgid "seconds" +msgstr "seconden" -#: ../../include/profile_selectors.php:80 -msgid "Unfaithful" -msgstr "Ontrouw" +#: ../../include/datetime.php:299 +#, php-format +msgid "%1$d %2$s ago" +msgstr "%1$d %2$s geleden" -#: ../../include/profile_selectors.php:80 -msgid "Sex Addict" -msgstr "Seksverslaafd" +#: ../../include/datetime.php:504 +#, php-format +msgid "%1$s's birthday" +msgstr "Verjaardag van %1$s" -#: ../../include/profile_selectors.php:80 -msgid "Friends/Benefits" -msgstr "Vriendschap plus" +#: ../../include/datetime.php:505 +#, php-format +msgid "Happy Birthday %1$s" +msgstr "Gefeliciteerd met je verjaardag %1$s" -#: ../../include/profile_selectors.php:80 -msgid "Casual" -msgstr "Ongebonden/vluchtig" +#: ../../include/dir_fns.php:36 +msgid "Sort Options" +msgstr "Sorteeropties" -#: ../../include/profile_selectors.php:80 -msgid "Engaged" -msgstr "Verloofd" +#: ../../include/dir_fns.php:37 +msgid "Alphabetic" +msgstr "Alfabetisch" -#: ../../include/profile_selectors.php:80 -#: ../../include/profile_selectors.php:97 -msgid "Married" -msgstr "Getrouwd" +#: ../../include/dir_fns.php:38 +msgid "Reverse Alphabetic" +msgstr "Omgekeerd alfabetisch" -#: ../../include/profile_selectors.php:80 -msgid "Imaginarily married" -msgstr "Denkbeeldig getrouwd" +#: ../../include/dir_fns.php:39 +msgid "Newest to Oldest" +msgstr "Nieuw naar oud" -#: ../../include/profile_selectors.php:80 -msgid "Partners" -msgstr "Partners" +#: ../../include/dir_fns.php:51 +msgid "Enable Safe Search" +msgstr "Veilig zoeken inschakelen" -#: ../../include/profile_selectors.php:80 -#: ../../include/profile_selectors.php:97 -msgid "Cohabiting" -msgstr "Samenwonend" +#: ../../include/dir_fns.php:53 +msgid "Disable Safe Search" +msgstr "Veilig zoeken uitschakelen" -#: ../../include/profile_selectors.php:80 -msgid "Common law" -msgstr "Common-law-huwelijk" +#: ../../include/dir_fns.php:55 +msgid "Safe Mode" +msgstr "Veilig zoeken" -#: ../../include/profile_selectors.php:80 -msgid "Happy" -msgstr "Gelukkig" +#: ../../include/enotify.php:41 +msgid "Red Matrix Notification" +msgstr "RedMatrix-notificatie" -#: ../../include/profile_selectors.php:80 -msgid "Not looking" -msgstr "Niet op zoek" +#: ../../include/enotify.php:42 +msgid "redmatrix" +msgstr "RedMatrix" -#: ../../include/profile_selectors.php:80 -msgid "Swinger" -msgstr "Swinger" +#: ../../include/enotify.php:44 +msgid "Thank You," +msgstr "Bedankt," -#: ../../include/profile_selectors.php:80 -msgid "Betrayed" -msgstr "Verraden" +#: ../../include/enotify.php:46 +#, php-format +msgid "%s Administrator" +msgstr "%s beheerder" -#: ../../include/profile_selectors.php:80 -#: ../../include/profile_selectors.php:97 -msgid "Separated" -msgstr "Uit elkaar" +#: ../../include/enotify.php:81 +#, php-format +msgid "%s " +msgstr "%s " -#: ../../include/profile_selectors.php:80 -msgid "Unstable" -msgstr "Onstabiel" +#: ../../include/enotify.php:85 +#, php-format +msgid "[Red:Notify] New mail received at %s" +msgstr "[Red:Notificatie] Nieuw privébericht ontvangen op %s" -#: ../../include/profile_selectors.php:80 -#: ../../include/profile_selectors.php:97 -msgid "Divorced" -msgstr "Gescheiden" +#: ../../include/enotify.php:87 +#, php-format +msgid "%1$s, %2$s sent you a new private message at %3$s." +msgstr "%1$s, %2$s zond jou een nieuw privébericht om %3$s." -#: ../../include/profile_selectors.php:80 -msgid "Imaginarily divorced" -msgstr "Denkbeeldig gescheiden" +#: ../../include/enotify.php:88 +#, php-format +msgid "%1$s sent you %2$s." +msgstr "%1$s zond jou %2$s." -#: ../../include/profile_selectors.php:80 -#: ../../include/profile_selectors.php:97 -msgid "Widowed" -msgstr "Weduwnaar/weduwe" +#: ../../include/enotify.php:88 +msgid "a private message" +msgstr "een privébericht" -#: ../../include/profile_selectors.php:80 -msgid "Uncertain" -msgstr "Onzeker" +#: ../../include/enotify.php:89 +#, php-format +msgid "Please visit %s to view and/or reply to your private messages." +msgstr "Bezoek %s om je privéberichten te bekijken en/of er op te reageren." -#: ../../include/profile_selectors.php:80 -#: ../../include/profile_selectors.php:97 -msgid "It's complicated" -msgstr "Het is ingewikkeld" +#: ../../include/enotify.php:144 +#, php-format +msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]" +msgstr "%1$s, %2$s gaf een reactie op [zrl=%3$s]een %4$s[/zrl]" -#: ../../include/profile_selectors.php:80 -msgid "Don't care" -msgstr "Maakt mij niks uit" +#: ../../include/enotify.php:152 +#, php-format +msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]" +msgstr "%1$s, %2$s gaf een reactie op [zrl=%3$s]een %5$s van %4$s[/zrl]" -#: ../../include/profile_selectors.php:80 -msgid "Ask me" -msgstr "Vraag het me" +#: ../../include/enotify.php:161 +#, php-format +msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]" +msgstr "%1$s, %2$s gaf een reactie op [zrl=%3$s]jouw %4$s[/zrl]" -#: ../../include/account.php:23 -msgid "Not a valid email address" -msgstr "Geen geldig e-mailadres" +#: ../../include/enotify.php:172 +#, php-format +msgid "[Red:Notify] Comment to conversation #%1$d by %2$s" +msgstr "[Red:Notificatie] Reactie op conversatie #%1$d door %2$s" -#: ../../include/account.php:25 -msgid "Your email domain is not among those allowed on this site" -msgstr "Jouw e-maildomein is op deze RedMatrix-hub niet toegestaan" +#: ../../include/enotify.php:173 +#, php-format +msgid "%1$s, %2$s commented on an item/conversation you have been following." +msgstr "%1$s, %2$s gaf een reactie op een bericht/conversatie die jij volgt." -#: ../../include/account.php:31 -msgid "Your email address is already registered at this site." -msgstr "Jouw e-mailadres is al op deze RedMatrix-hub geregistreerd ." +#: ../../include/enotify.php:176 ../../include/enotify.php:191 +#: ../../include/enotify.php:217 ../../include/enotify.php:236 +#: ../../include/enotify.php:250 +#, php-format +msgid "Please visit %s to view and/or reply to the conversation." +msgstr "Bezoek %s om de conversatie te bekijken en/of er op te reageren." -#: ../../include/account.php:64 -msgid "An invitation is required." -msgstr "Een uitnodiging is vereist" +#: ../../include/enotify.php:182 +#, php-format +msgid "[Red:Notify] %s posted to your profile wall" +msgstr "[Red:Notificatie] %s heeft een bericht op jouw kanaal geplaatst" -#: ../../include/account.php:68 -msgid "Invitation could not be verified." -msgstr "Uitnodiging kon niet geverifieerd worden" +#: ../../include/enotify.php:184 +#, php-format +msgid "%1$s, %2$s posted to your profile wall at %3$s" +msgstr "%1$s, %2$s heeft om %3$s een bericht op jouw kanaal geplaatst" -#: ../../include/account.php:119 -msgid "Please enter the required information." -msgstr "Vul de vereiste informatie in." +#: ../../include/enotify.php:186 +#, php-format +msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]" +msgstr "%1$s, %2$s heeft een bericht op [zrl=%3$s]jouw kanaal[/zrl] geplaatst" -#: ../../include/account.php:187 -msgid "Failed to store account information." -msgstr "Account-informatie kon niet opgeslagen worden." +#: ../../include/enotify.php:210 +#, php-format +msgid "[Red:Notify] %s tagged you" +msgstr "[Red:Notificatie] %s heeft je genoemd" -#: ../../include/account.php:245 +#: ../../include/enotify.php:211 #, php-format -msgid "Registration confirmation for %s" -msgstr "Registratiebevestiging voor %s" +msgid "%1$s, %2$s tagged you at %3$s" +msgstr "%1$s, %2$s noemde jou om %3$s" -#: ../../include/account.php:313 +#: ../../include/enotify.php:212 #, php-format -msgid "Registration request at %s" -msgstr "Registratieverzoek op %s" +msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]." +msgstr "%1$s, %2$s [zrl=%3$s]noemde jou[/zrl]." -#: ../../include/account.php:315 ../../include/account.php:342 -#: ../../include/account.php:399 -msgid "Administrator" -msgstr "Beheerder" +#: ../../include/enotify.php:225 +#, php-format +msgid "[Red:Notify] %1$s poked you" +msgstr "[Red:Notificatie] %1$s heeft je aangestoten" -#: ../../include/account.php:337 -msgid "your registration password" -msgstr "jouw registratiewachtwoord" +#: ../../include/enotify.php:226 +#, php-format +msgid "%1$s, %2$s poked you at %3$s" +msgstr "%1$s, %2$s heeft je aangestoten op %3$s" -#: ../../include/account.php:340 ../../include/account.php:397 +#: ../../include/enotify.php:227 #, php-format -msgid "Registration details for %s" -msgstr "Registratiedetails voor %s" +msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]." +msgstr "%1$s, %2$s [zrl=%2$s]heeft je aangestoten[/zrl]." -#: ../../include/account.php:406 -msgid "Account approved." -msgstr "Account goedgekeurd" +#: ../../include/enotify.php:243 +#, php-format +msgid "[Red:Notify] %s tagged your post" +msgstr "[Red:Notificatie] %s heeft jouw bericht gelabeld" -#: ../../include/account.php:440 +#: ../../include/enotify.php:244 #, php-format -msgid "Registration revoked for %s" -msgstr "Registratie ingetrokken voor %s" +msgid "%1$s, %2$s tagged your post at %3$s" +msgstr "%1$s, %2$s labelde jouw bericht om %3$s" -#: ../../include/account.php:486 -msgid "Account verified. Please login." -msgstr "Account is geverifieerd. Je kan inloggen." +#: ../../include/enotify.php:245 +#, php-format +msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]" +msgstr "%1$s, %2$s labelde [zrl=%3$s]jouw bericht[/zrl]" -#: ../../include/oembed.php:163 -msgid "Embedded content" -msgstr "Ingesloten inhoud" +#: ../../include/enotify.php:257 +msgid "[Red:Notify] Introduction received" +msgstr "[Red:Notificatie] Connectieverzoek ontvangen" -#: ../../include/oembed.php:172 -msgid "Embedding disabled" -msgstr "Insluiten uitgeschakeld" +#: ../../include/enotify.php:258 +#, php-format +msgid "%1$s, you've received an new connection request from '%2$s' at %3$s" +msgstr "%1$s, je hebt een nieuw connectieverzoek ontvangen van '%2$s' op %3$s" -#: ../../include/zot.php:624 -msgid "Invalid data packet" -msgstr "Datapakket ongeldig" +#: ../../include/enotify.php:259 +#, php-format +msgid "" +"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s." +msgstr "%1$s, je hebt een [zrl=%2$s]nieuw connectieverzoek[/zrl] ontvangen van %3$s." -#: ../../include/zot.php:634 -msgid "Unable to verify channel signature" -msgstr "Kanaal-kenmerk (channel signature) kon niet worden geverifieerd. " +#: ../../include/enotify.php:263 ../../include/enotify.php:282 +#, php-format +msgid "You may visit their profile at %s" +msgstr "Je kan het profiel bekijken op %s" -#: ../../include/zot.php:831 +#: ../../include/enotify.php:265 #, php-format -msgid "Unable to verify site signature for %s" -msgstr "Hub-kenmerk (site signature) voor %s kon niet worden geverifieerd" +msgid "Please visit %s to approve or reject the connection request." +msgstr "Bezoek %s om het connectieverzoek te accepteren of af te wijzen." -#: ../../include/network.php:652 -msgid "view full size" -msgstr "volledige grootte tonen" +#: ../../include/enotify.php:272 +msgid "[Red:Notify] Friend suggestion received" +msgstr "[Red:Notificatie] Kanaalvoorstel ontvangen" -#: ../../include/dba/dba_driver.php:50 +#: ../../include/enotify.php:273 #, php-format -msgid "Cannot locate DNS info for database server '%s'" -msgstr "Kan DNS-informatie voor databaseserver '%s' niet vinden" +msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s" +msgstr "%1$s, je hebt een kanaalvoorstel ontvangen van '%2$s' om %3$s" -#: ../../include/group.php:25 +#: ../../include/enotify.php:274 +#, php-format msgid "" -"A deleted group with this name was revived. Existing item permissions " -"may apply to this group and any future members. If this is " -"not what you intended, please create another group with a different name." -msgstr "Een verwijderde collectie met deze naam is gereactiveerd. Bestaande itemrechten kunnen van toepassing zijn op deze collectie en toekomstige leden. Wanneer je dit niet zo bedoeld hebt, moet je een nieuwe collectie met een andere naam aanmaken." - -#: ../../include/group.php:234 -msgid "Default privacy group for new contacts" -msgstr "Standaard privacy-collectie voor nieuwe kanalen" +"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from " +"%4$s." +msgstr "%1$s, je hebt [zrl=%2$s]een kanaalvoorstel[/zrl] ontvangen voor %3$s van %4$s." -#: ../../include/group.php:253 ../../mod/admin.php:763 -msgid "All Channels" -msgstr "Alle kanalen" +#: ../../include/enotify.php:280 +msgid "Name:" +msgstr "Naam:" -#: ../../include/group.php:275 -msgid "edit" -msgstr "bewerken" +#: ../../include/enotify.php:281 +msgid "Photo:" +msgstr "Foto:" -#: ../../include/group.php:296 -msgid "Collections" -msgstr "Collecties" +#: ../../include/enotify.php:284 +#, php-format +msgid "Please visit %s to approve or reject the suggestion." +msgstr "Bezoek %s om het voorstel te accepteren of af te wijzen." -#: ../../include/group.php:297 -msgid "Edit collection" -msgstr "Collectie bewerken" +#: ../../include/enotify.php:474 +msgid "[Red:Notify]" +msgstr "[Red:Notificatie]" -#: ../../include/group.php:298 -msgid "Create a new collection" -msgstr "Nieuwe collectie aanmaken" +#: ../../include/reddav.php:1145 ../../include/reddav.php:1288 +msgid "parent" +msgstr "omhoog" -#: ../../include/group.php:299 -msgid "Channels not in any collection" -msgstr "Kanalen die zich in geen enkele collectie bevinden" +#: ../../include/reddav.php:1169 +msgid "Collection" +msgstr "map" -#: ../../include/group.php:301 ../../include/widgets.php:266 -msgid "add" -msgstr "toevoegen" +#: ../../include/reddav.php:1172 +msgid "Principal" +msgstr "principal" -#: ../../include/attach.php:224 ../../include/attach.php:278 -msgid "Item was not found." -msgstr "Item niet gevonden" +#: ../../include/reddav.php:1175 +msgid "Addressbook" +msgstr "Adresboek" -#: ../../include/attach.php:335 -msgid "No source file." -msgstr "Geen bronbestand." +#: ../../include/reddav.php:1178 +msgid "Calendar" +msgstr "Agenda" -#: ../../include/attach.php:352 -msgid "Cannot locate file to replace" -msgstr "Kan het te vervangen bestand niet vinden" +#: ../../include/reddav.php:1181 +msgid "Schedule Inbox" +msgstr "Planning-postvak IN" -#: ../../include/attach.php:370 -msgid "Cannot locate file to revise/update" -msgstr "Kan het bestand wat aangepast moet worden niet vinden" +#: ../../include/reddav.php:1184 +msgid "Schedule Outbox" +msgstr "Planning-postvak UIT" -#: ../../include/attach.php:381 +#: ../../include/reddav.php:1262 #, php-format -msgid "File exceeds size limit of %d" -msgstr "Bestand is groter dan de toegelaten %d" +msgid "%1$s used" +msgstr "%1$s gebruikt" -#: ../../include/attach.php:393 +#: ../../include/reddav.php:1267 #, php-format -msgid "You have reached your limit of %1$.0f Mbytes attachment storage." -msgstr "Je hebt jouw limiet van %1$.0f MB opslagruimte voor bijlagen bereikt." - -#: ../../include/attach.php:475 -msgid "File upload failed. Possible system limit or action terminated." -msgstr "Uploaden van bestand mislukt. Mogelijk systeemlimiet bereikt of actie afgebroken." +msgid "%1$s used of %2$s (%3$s%)" +msgstr "%1$s van %2$s gebruikt (%3$s%)" -#: ../../include/attach.php:487 -msgid "Stored file could not be verified. Upload failed." -msgstr "Opgeslagen bestand kon niet worden geverifieerd. Uploaden mislukt." +#: ../../include/reddav.php:1284 ../../mod/settings.php:519 +#: ../../mod/settings.php:545 ../../mod/admin.php:902 +msgid "Name" +msgstr "Naam" -#: ../../include/attach.php:528 ../../include/attach.php:545 -msgid "Path not available." -msgstr "Pad niet beschikbaar." +#: ../../include/reddav.php:1285 +msgid "Type" +msgstr "Type" -#: ../../include/attach.php:590 -msgid "Empty pathname" -msgstr "Padnaam leeg" +#: ../../include/reddav.php:1286 +msgid "Size" +msgstr "Grootte" -#: ../../include/attach.php:606 -msgid "duplicate filename or path" -msgstr "dubbele bestandsnaam of pad" +#: ../../include/reddav.php:1287 +msgid "Last Modified" +msgstr "Laatst gewijzigd" -#: ../../include/attach.php:630 -msgid "Path not found." -msgstr "Pad niet gevonden" +#: ../../include/reddav.php:1291 +msgid "Total" +msgstr "Totaal" -#: ../../include/attach.php:681 -msgid "mkdir failed." -msgstr "directory aanmaken (mkdir) mislukt." +#: ../../include/reddav.php:1344 +msgid "Create new folder" +msgstr "Nieuwe map aanmaken" -#: ../../include/attach.php:685 -msgid "database storage failed." -msgstr "opslag in database mislukt." +#: ../../include/reddav.php:1345 ../../mod/mitem.php:142 ../../mod/menu.php:84 +#: ../../mod/new_channel.php:117 +msgid "Create" +msgstr "Aanmaken" -#: ../../include/ItemObject.php:89 ../../include/conversation.php:642 -#: ../../mod/photos.php:844 -msgid "Private Message" -msgstr "Privébericht" +#: ../../include/reddav.php:1346 +msgid "Upload file" +msgstr "Bestand uploaden" -#: ../../include/ItemObject.php:114 ../../include/conversation.php:634 -msgid "Select" -msgstr "Kies" +#: ../../include/reddav.php:1347 ../../mod/profile_photo.php:361 +msgid "Upload" +msgstr "Uploaden" -#: ../../include/ItemObject.php:118 -msgid "Save to Folder" -msgstr "In map opslaan" +#: ../../include/conversation.php:126 ../../mod/like.php:89 +msgid "channel" +msgstr "kanaal" -#: ../../include/ItemObject.php:130 ../../include/ItemObject.php:142 -msgid "View all" -msgstr "Toon alles" +#: ../../include/conversation.php:167 ../../mod/like.php:333 +#, php-format +msgid "%1$s doesn't like %2$s's %3$s" +msgstr "%1$s vindt %3$s van %2$s niet leuk" -#: ../../include/ItemObject.php:139 -msgctxt "noun" -msgid "Dislike" -msgid_plural "Dislikes" -msgstr[0] "vindt dit niet leuk" -msgstr[1] "vinden dit niet leuk" +#: ../../include/conversation.php:204 +#, php-format +msgid "%1$s is now connected with %2$s" +msgstr "%1$s is nu met %2$s verbonden" -#: ../../include/ItemObject.php:167 -msgid "Add Star" -msgstr "Ster toevoegen" +#: ../../include/conversation.php:239 +#, php-format +msgid "%1$s poked %2$s" +msgstr "%1$s heeft %2$s aangestoten" -#: ../../include/ItemObject.php:168 -msgid "Remove Star" -msgstr "Ster verwijderen" +#: ../../include/conversation.php:261 ../../mod/mood.php:63 +#, php-format +msgctxt "mood" +msgid "%1$s is %2$s" +msgstr "%1$s is %2$s" -#: ../../include/ItemObject.php:169 -msgid "Toggle Star Status" -msgstr "Ster toevoegen of verwijderen" +#: ../../include/conversation.php:634 ../../include/ItemObject.php:114 +msgid "Select" +msgstr "Kies" -#: ../../include/ItemObject.php:173 -msgid "starred" -msgstr "met ster" +#: ../../include/conversation.php:642 ../../include/ItemObject.php:89 +#: ../../mod/photos.php:850 +msgid "Private Message" +msgstr "Privébericht" -#: ../../include/ItemObject.php:182 ../../include/conversation.php:649 +#: ../../include/conversation.php:649 ../../include/ItemObject.php:182 msgid "Message is verified" msgstr "Bericht is geverifieerd" -#: ../../include/ItemObject.php:190 -msgid "Add Tag" -msgstr "Label toevoegen" - -#: ../../include/ItemObject.php:208 ../../mod/photos.php:974 -msgid "I like this (toggle)" -msgstr "Vind ik leuk" +#: ../../include/conversation.php:669 +#, php-format +msgid "View %s's profile @ %s" +msgstr "Bekijk het profiel van %s @ %s" -#: ../../include/ItemObject.php:209 ../../mod/photos.php:975 -msgid "I don't like this (toggle)" -msgstr "Vind ik niet leuk" +#: ../../include/conversation.php:683 +msgid "Categories:" +msgstr "Categorieën:" -#: ../../include/ItemObject.php:211 -msgid "Share This" -msgstr "Delen" +#: ../../include/conversation.php:684 +msgid "Filed under:" +msgstr "Bewaard onder:" -#: ../../include/ItemObject.php:211 -msgid "share" -msgstr "delen" +#: ../../include/conversation.php:693 ../../include/ItemObject.php:250 +#, php-format +msgid " from %s" +msgstr " van %s" -#: ../../include/ItemObject.php:235 ../../include/ItemObject.php:236 +#: ../../include/conversation.php:696 ../../include/ItemObject.php:253 #, php-format -msgid "View %s's profile - %s" -msgstr "Profiel van %s bekijken - %s" +msgid "last edited: %s" +msgstr "laatst bewerkt: %s" -#: ../../include/ItemObject.php:237 -msgid "to" -msgstr "aan" +#: ../../include/conversation.php:697 ../../include/ItemObject.php:254 +#, php-format +msgid "Expires: %s" +msgstr "Verloopt: %s" -#: ../../include/ItemObject.php:238 -msgid "via" -msgstr "via" +#: ../../include/conversation.php:712 +msgid "View in context" +msgstr "In context bekijken" -#: ../../include/ItemObject.php:239 -msgid "Wall-to-Wall" -msgstr "Kanaal-naar-kanaal" +#: ../../include/conversation.php:714 ../../include/conversation.php:1130 +#: ../../include/ItemObject.php:294 ../../mod/editblock.php:120 +#: ../../mod/editlayout.php:115 ../../mod/editpost.php:121 +#: ../../mod/editwebpage.php:152 ../../mod/photos.php:983 +#: ../../mod/mail.php:231 ../../mod/mail.php:346 +msgid "Please wait" +msgstr "Even wachten" -#: ../../include/ItemObject.php:240 -msgid "via Wall-To-Wall:" -msgstr "via kanaal-naar-kanaal" +#: ../../include/conversation.php:841 +msgid "remove" +msgstr "verwijderen" -#: ../../include/ItemObject.php:250 ../../include/conversation.php:693 -#, php-format -msgid " from %s" -msgstr " van %s" +#: ../../include/conversation.php:845 +msgid "Loading..." +msgstr "Aan het laden..." -#: ../../include/ItemObject.php:253 ../../include/conversation.php:696 -#, php-format -msgid "last edited: %s" -msgstr "laatst bewerkt: %s" +#: ../../include/conversation.php:846 +msgid "Delete Selected Items" +msgstr "Verwijder de geselecteerde items" -#: ../../include/ItemObject.php:254 ../../include/conversation.php:697 -#, php-format -msgid "Expires: %s" -msgstr "Verloopt: %s" +#: ../../include/conversation.php:937 +msgid "View Source" +msgstr "Bron weergeven" -#: ../../include/ItemObject.php:274 -msgid "Save Bookmarks" -msgstr "Bladwijzers opslaan" +#: ../../include/conversation.php:938 +msgid "Follow Thread" +msgstr "Conversatie volgen" -#: ../../include/ItemObject.php:275 -msgid "Add to Calendar" -msgstr "Aan agenda toevoegen" +#: ../../include/conversation.php:939 +msgid "View Status" +msgstr "Status weergeven" -#: ../../include/ItemObject.php:283 -msgctxt "noun" -msgid "Likes" -msgstr "vinden dit leuk" +#: ../../include/conversation.php:941 +msgid "View Photos" +msgstr "Foto's weergeven" -#: ../../include/ItemObject.php:284 -msgctxt "noun" -msgid "Dislikes" -msgstr "vinden dit niet leuk" +#: ../../include/conversation.php:942 +msgid "Matrix Activity" +msgstr "Activiteit in de Matrix" -#: ../../include/ItemObject.php:289 ../../include/acl_selectors.php:249 -msgid "Close" -msgstr "Sluiten" +#: ../../include/conversation.php:943 +msgid "Edit Contact" +msgstr "Contact bewerken" -#: ../../include/ItemObject.php:294 ../../include/conversation.php:714 -#: ../../include/conversation.php:1130 ../../mod/photos.php:977 -#: ../../mod/editpost.php:121 ../../mod/editwebpage.php:152 -#: ../../mod/mail.php:231 ../../mod/mail.php:346 ../../mod/editblock.php:120 -#: ../../mod/editlayout.php:115 -msgid "Please wait" -msgstr "Even wachten" +#: ../../include/conversation.php:944 +msgid "Send PM" +msgstr "Privébericht verzenden" -#: ../../include/ItemObject.php:315 +#: ../../include/conversation.php:1001 #, php-format -msgid "%d comment" -msgid_plural "%d comments" -msgstr[0] "%d reactie" -msgstr[1] "%d reacties weergeven" - -#: ../../include/ItemObject.php:580 ../../mod/photos.php:993 -#: ../../mod/photos.php:1080 -msgid "This is you" -msgstr "Dit ben jij" +msgid "%s likes this." +msgstr "%s vindt dit leuk." -#: ../../include/ItemObject.php:584 -msgid "Bold" -msgstr "Vet" +#: ../../include/conversation.php:1001 +#, php-format +msgid "%s doesn't like this." +msgstr "%s vindt dit niet leuk." -#: ../../include/ItemObject.php:585 -msgid "Italic" -msgstr "Cursief" +#: ../../include/conversation.php:1005 +#, php-format +msgid "%2$d people like this." +msgid_plural "%2$d people like this." +msgstr[0] "%2$d persoon vindt dit leuk." +msgstr[1] "%2$d personen vinden dit leuk." -#: ../../include/ItemObject.php:586 -msgid "Underline" -msgstr "Onderstrepen" +#: ../../include/conversation.php:1007 +#, php-format +msgid "%2$d people don't like this." +msgid_plural "%2$d people don't like this." +msgstr[0] "%2$d persoon vindt dit niet leuk." +msgstr[1] "%2$d personen vinden dit niet leuk." -#: ../../include/ItemObject.php:587 -msgid "Quote" -msgstr "Citeren" +#: ../../include/conversation.php:1013 +msgid "and" +msgstr "en" -#: ../../include/ItemObject.php:588 -msgid "Code" -msgstr "Broncode" +#: ../../include/conversation.php:1016 +#, php-format +msgid ", and %d other people" +msgid_plural ", and %d other people" +msgstr[0] ", en %d ander persoon" +msgstr[1] ", en %d andere personen" -#: ../../include/ItemObject.php:589 -msgid "Image" -msgstr "Afbeelding" +#: ../../include/conversation.php:1017 +#, php-format +msgid "%s like this." +msgstr "%s vinden dit leuk." -#: ../../include/ItemObject.php:590 -msgid "Link" -msgstr "Link" +#: ../../include/conversation.php:1017 +#, php-format +msgid "%s don't like this." +msgstr "%s vinden dit niet leuk." -#: ../../include/ItemObject.php:591 -msgid "Video" -msgstr "Video" +#: ../../include/conversation.php:1074 +msgid "Visible to everybody" +msgstr "Voor iedereen zichtbaar" -#: ../../include/ItemObject.php:595 ../../include/conversation.php:1156 -#: ../../mod/editpost.php:148 ../../mod/mail.php:237 ../../mod/mail.php:351 -msgid "Encrypt text" -msgstr "Tekst versleutelen" +#: ../../include/conversation.php:1075 ../../mod/mail.php:167 +#: ../../mod/mail.php:279 +msgid "Please enter a link URL:" +msgstr "Vul een internetadres/URL in:" -#: ../../include/security.php:301 -msgid "" -"The form security token was not correct. This probably happened because the " -"form has been opened for too long (>3 hours) before submitting it." -msgstr "De beveiligings-token van het tekstvak was ongeldig. Dit is mogelijk het gevolg van dat er te lang (meer dan 3 uur) gewacht is om de tekst op te slaan. " +#: ../../include/conversation.php:1076 +msgid "Please enter a video link/URL:" +msgstr "Vul een videolink/URL in:" -#: ../../include/text.php:321 -msgid "prev" -msgstr "vorige" +#: ../../include/conversation.php:1077 +msgid "Please enter an audio link/URL:" +msgstr "Vul een audiolink/URL in:" -#: ../../include/text.php:323 -msgid "first" -msgstr "eerste" +#: ../../include/conversation.php:1078 +msgid "Tag term:" +msgstr "Label:" -#: ../../include/text.php:352 -msgid "last" -msgstr "laatste" +#: ../../include/conversation.php:1079 ../../mod/filer.php:49 +msgid "Save to Folder:" +msgstr "Bewaar in map: " -#: ../../include/text.php:355 -msgid "next" -msgstr "volgende" +#: ../../include/conversation.php:1080 +msgid "Where are you right now?" +msgstr "Waar bevind je je op dit moment?" -#: ../../include/text.php:367 -msgid "older" -msgstr "ouder" +#: ../../include/conversation.php:1081 ../../mod/editpost.php:52 +#: ../../mod/mail.php:168 ../../mod/mail.php:280 +msgid "Expires YYYY-MM-DD HH:MM" +msgstr "Verloopt op DD-MM-YYYY om HH:MM" -#: ../../include/text.php:369 -msgid "newer" -msgstr "nieuwer" +#: ../../include/conversation.php:1105 ../../mod/photos.php:982 +#: ../../mod/layouts.php:113 +msgid "Share" +msgstr "Delen" -#: ../../include/text.php:730 -msgid "No connections" -msgstr "Geen connecties" +#: ../../include/conversation.php:1107 ../../mod/editwebpage.php:139 +msgid "Page link title" +msgstr "Titel van paginalink" -#: ../../include/text.php:743 -#, php-format -msgid "%d Connection" -msgid_plural "%d Connections" -msgstr[0] "%d connectie" -msgstr[1] "%d connecties" +#: ../../include/conversation.php:1110 +msgid "Post as" +msgstr "Bericht plaatsen als" -#: ../../include/text.php:756 -msgid "View Connections" -msgstr "Connecties weergeven" +#: ../../include/conversation.php:1111 ../../mod/editblock.php:112 +#: ../../mod/editlayout.php:107 ../../mod/editpost.php:113 +#: ../../mod/editwebpage.php:144 ../../mod/mail.php:228 ../../mod/mail.php:342 +msgid "Upload photo" +msgstr "Foto uploaden" -#: ../../include/text.php:815 ../../include/text.php:829 -#: ../../include/nav.php:156 ../../include/apps.php:142 -#: ../../mod/search.php:30 -msgid "Search" -msgstr "Zoeken" +#: ../../include/conversation.php:1112 +msgid "upload photo" +msgstr "foto uploaden" -#: ../../include/text.php:817 ../../include/text.php:831 -#: ../../include/widgets.php:186 ../../mod/filer.php:50 -#: ../../mod/rbmark.php:28 ../../mod/rbmark.php:98 -msgid "Save" -msgstr "Opslaan" +#: ../../include/conversation.php:1113 ../../mod/editblock.php:113 +#: ../../mod/editlayout.php:108 ../../mod/editpost.php:114 +#: ../../mod/editwebpage.php:145 ../../mod/mail.php:229 ../../mod/mail.php:343 +msgid "Attach file" +msgstr "Bestand toevoegen" -#: ../../include/text.php:897 -msgid "poke" -msgstr "aanstoten" +#: ../../include/conversation.php:1114 +msgid "attach file" +msgstr "bestand toevoegen" -#: ../../include/text.php:897 ../../include/conversation.php:243 -msgid "poked" -msgstr "aangestoten" +#: ../../include/conversation.php:1115 ../../mod/editblock.php:114 +#: ../../mod/editlayout.php:109 ../../mod/editpost.php:115 +#: ../../mod/editwebpage.php:146 ../../mod/mail.php:230 ../../mod/mail.php:344 +msgid "Insert web link" +msgstr "Weblink invoegen" -#: ../../include/text.php:898 -msgid "ping" -msgstr "ping" +#: ../../include/conversation.php:1116 +msgid "web link" +msgstr "Weblink" -#: ../../include/text.php:898 -msgid "pinged" -msgstr "gepingd" +#: ../../include/conversation.php:1117 +msgid "Insert video link" +msgstr "Videolink invoegen" -#: ../../include/text.php:899 -msgid "prod" -msgstr "por" +#: ../../include/conversation.php:1118 +msgid "video link" +msgstr "videolink" -#: ../../include/text.php:899 -msgid "prodded" -msgstr "gepord" +#: ../../include/conversation.php:1119 +msgid "Insert audio link" +msgstr "Audiolink invoegen" -#: ../../include/text.php:900 -msgid "slap" -msgstr "slaan" +#: ../../include/conversation.php:1120 +msgid "audio link" +msgstr "audiolink" -#: ../../include/text.php:900 -msgid "slapped" -msgstr "sloeg" +#: ../../include/conversation.php:1121 ../../mod/editblock.php:118 +#: ../../mod/editlayout.php:113 ../../mod/editpost.php:119 +#: ../../mod/editwebpage.php:150 +msgid "Set your location" +msgstr "Locatie instellen" -#: ../../include/text.php:901 -msgid "finger" -msgstr "finger" +#: ../../include/conversation.php:1122 +msgid "set location" +msgstr "locatie instellen" -#: ../../include/text.php:901 -msgid "fingered" -msgstr "gefingerd" +#: ../../include/conversation.php:1123 ../../mod/editblock.php:119 +#: ../../mod/editlayout.php:114 ../../mod/editpost.php:120 +#: ../../mod/editwebpage.php:151 +msgid "Clear browser location" +msgstr "Locatie van webbrowser wissen" -#: ../../include/text.php:902 -msgid "rebuff" -msgstr "afpoeieren" +#: ../../include/conversation.php:1124 +msgid "clear location" +msgstr "locatie wissen" -#: ../../include/text.php:902 -msgid "rebuffed" -msgstr "afgepoeierd" +#: ../../include/conversation.php:1126 ../../mod/editblock.php:132 +#: ../../mod/editlayout.php:126 ../../mod/editpost.php:132 +#: ../../mod/editwebpage.php:167 +msgid "Set title" +msgstr "Titel instellen" -#: ../../include/text.php:911 -msgid "happy" -msgstr "gelukkig" +#: ../../include/conversation.php:1129 ../../mod/editblock.php:135 +#: ../../mod/editlayout.php:129 ../../mod/editpost.php:134 +#: ../../mod/editwebpage.php:169 +msgid "Categories (comma-separated list)" +msgstr "Categorieën (door komma's gescheiden lijst)" -#: ../../include/text.php:912 -msgid "sad" -msgstr "bedroefd" +#: ../../include/conversation.php:1131 ../../mod/editblock.php:121 +#: ../../mod/editlayout.php:116 ../../mod/editpost.php:122 +#: ../../mod/editwebpage.php:153 +msgid "Permission settings" +msgstr "Privacy-rechten" -#: ../../include/text.php:913 -msgid "mellow" -msgstr "mellow" +#: ../../include/conversation.php:1132 +msgid "permissions" +msgstr "privacy-rechten" -#: ../../include/text.php:914 -msgid "tired" -msgstr "moe" +#: ../../include/conversation.php:1139 ../../mod/editblock.php:129 +#: ../../mod/editlayout.php:123 ../../mod/editpost.php:129 +#: ../../mod/editwebpage.php:162 +msgid "Public post" +msgstr "Openbaar bericht" -#: ../../include/text.php:915 -msgid "perky" -msgstr "parmantig" +#: ../../include/conversation.php:1141 ../../mod/editblock.php:136 +#: ../../mod/editlayout.php:130 ../../mod/editpost.php:135 +#: ../../mod/editwebpage.php:170 +msgid "Example: bob@example.com, mary@example.com" +msgstr "Voorbeeld: bob@voorbeeld.nl, mary@voorbeeld.be" -#: ../../include/text.php:916 -msgid "angry" -msgstr "boos" +#: ../../include/conversation.php:1154 ../../mod/editblock.php:146 +#: ../../mod/editlayout.php:140 ../../mod/editpost.php:146 +#: ../../mod/editwebpage.php:179 ../../mod/mail.php:235 ../../mod/mail.php:349 +msgid "Set expiration date" +msgstr "Verloopdatum instellen" -#: ../../include/text.php:917 -msgid "stupified" -msgstr "beteuterd" +#: ../../include/conversation.php:1156 ../../include/ItemObject.php:595 +#: ../../mod/editpost.php:148 ../../mod/mail.php:237 ../../mod/mail.php:351 +msgid "Encrypt text" +msgstr "Tekst versleutelen" -#: ../../include/text.php:918 -msgid "puzzled" -msgstr "verward" +#: ../../include/conversation.php:1158 ../../mod/editpost.php:150 +msgid "OK" +msgstr "OK" -#: ../../include/text.php:919 -msgid "interested" -msgstr "geïnteresseerd" +#: ../../include/conversation.php:1159 ../../mod/settings.php:518 +#: ../../mod/settings.php:544 ../../mod/editpost.php:151 +#: ../../mod/fbrowser.php:82 ../../mod/fbrowser.php:117 ../../mod/tagrm.php:11 +#: ../../mod/tagrm.php:94 +msgid "Cancel" +msgstr "Annuleren" -#: ../../include/text.php:920 -msgid "bitter" -msgstr "verbitterd" +#: ../../include/conversation.php:1401 +msgid "Discover" +msgstr "Ontdekken" -#: ../../include/text.php:921 -msgid "cheerful" -msgstr "vrolijk" +#: ../../include/conversation.php:1404 +msgid "Imported public streams" +msgstr "Openbare streams importeren" -#: ../../include/text.php:922 -msgid "alive" -msgstr "levendig" +#: ../../include/conversation.php:1409 +msgid "Commented Order" +msgstr "Nieuwe reacties bovenaan" -#: ../../include/text.php:923 -msgid "annoyed" -msgstr "geërgerd" +#: ../../include/conversation.php:1412 +msgid "Sort by Comment Date" +msgstr "Berichten met nieuwe reacties bovenaan" -#: ../../include/text.php:924 -msgid "anxious" -msgstr "bezorgd" +#: ../../include/conversation.php:1416 +msgid "Posted Order" +msgstr "Nieuwe berichten bovenaan" -#: ../../include/text.php:925 -msgid "cranky" -msgstr "humeurig" +#: ../../include/conversation.php:1419 +msgid "Sort by Post Date" +msgstr "Nieuwe berichten bovenaan" -#: ../../include/text.php:926 -msgid "disturbed" -msgstr "verontrust" +#: ../../include/conversation.php:1424 ../../include/widgets.php:82 +msgid "Personal" +msgstr "Persoonlijk" -#: ../../include/text.php:927 -msgid "frustrated" -msgstr "gefrustreerd " +#: ../../include/conversation.php:1427 +msgid "Posts that mention or involve you" +msgstr "Alleen berichten die jou vermelden of waar je op een andere manier bij betrokken bent" -#: ../../include/text.php:928 -msgid "depressed" -msgstr "gedeprimeerd" +#: ../../include/conversation.php:1433 ../../mod/connections.php:211 +#: ../../mod/connections.php:224 ../../mod/menu.php:61 +msgid "New" +msgstr "Nieuw" -#: ../../include/text.php:929 -msgid "motivated" -msgstr "gemotiveerd" +#: ../../include/conversation.php:1436 +msgid "Activity Stream - by date" +msgstr "Activiteitenstroom - volgens datum" -#: ../../include/text.php:930 -msgid "relaxed" -msgstr "ontspannen" +#: ../../include/conversation.php:1442 +msgid "Starred" +msgstr "Met ster" -#: ../../include/text.php:931 -msgid "surprised" -msgstr "verrast" +#: ../../include/conversation.php:1445 +msgid "Favourite Posts" +msgstr "Favoriete berichten" -#: ../../include/text.php:1092 -msgid "Monday" -msgstr "maandag" +#: ../../include/conversation.php:1452 +msgid "Spam" +msgstr "Spam" -#: ../../include/text.php:1092 -msgid "Tuesday" -msgstr "dinsdag" +#: ../../include/conversation.php:1455 +msgid "Posts flagged as SPAM" +msgstr "Berichten gemarkeerd als SPAM" -#: ../../include/text.php:1092 -msgid "Wednesday" -msgstr "woensdag" +#: ../../include/conversation.php:1491 ../../mod/admin.php:901 +msgid "Channel" +msgstr "Kanaal" -#: ../../include/text.php:1092 -msgid "Thursday" -msgstr "donderdag" +#: ../../include/conversation.php:1494 +msgid "Status Messages and Posts" +msgstr "Berichten in dit kanaal" -#: ../../include/text.php:1092 -msgid "Friday" -msgstr "vrijdag" +#: ../../include/conversation.php:1503 +msgid "About" +msgstr "Over" -#: ../../include/text.php:1092 -msgid "Saturday" -msgstr "zaterdag" +#: ../../include/conversation.php:1506 +msgid "Profile Details" +msgstr "Profiel" -#: ../../include/text.php:1092 -msgid "Sunday" -msgstr "zondag" +#: ../../include/conversation.php:1524 +msgid "Files and Storage" +msgstr "Bestanden en opslagruimte" -#: ../../include/text.php:1096 -msgid "January" -msgstr "januari" +#: ../../include/conversation.php:1533 ../../include/conversation.php:1536 +msgid "Chatrooms" +msgstr "Chatkanalen" -#: ../../include/text.php:1096 -msgid "February" -msgstr "februari" +#: ../../include/conversation.php:1546 +msgid "Saved Bookmarks" +msgstr "Opgeslagen bladwijzers" -#: ../../include/text.php:1096 -msgid "March" -msgstr "maart" +#: ../../include/conversation.php:1557 +msgid "Manage Webpages" +msgstr "Webpagina's beheren" -#: ../../include/text.php:1096 -msgid "April" -msgstr "april" +#: ../../include/features.php:23 +msgid "General Features" +msgstr "Algemene functies" -#: ../../include/text.php:1096 -msgid "May" -msgstr "mei" +#: ../../include/features.php:25 +msgid "Content Expiration" +msgstr "Inhoud laten verlopen" -#: ../../include/text.php:1096 -msgid "June" -msgstr "juni" +#: ../../include/features.php:25 +msgid "Remove posts/comments and/or private messages at a future time" +msgstr "Berichten, reacties en/of privéberichten na een bepaalde tijd verwijderen" -#: ../../include/text.php:1096 -msgid "July" -msgstr "juli" +#: ../../include/features.php:26 +msgid "Multiple Profiles" +msgstr "Meerdere profielen" -#: ../../include/text.php:1096 -msgid "August" -msgstr "augustus" +#: ../../include/features.php:26 +msgid "Ability to create multiple profiles" +msgstr "Mogelijkheid om meerdere profielen aan te maken" -#: ../../include/text.php:1096 -msgid "September" -msgstr "september" +#: ../../include/features.php:27 +msgid "Advanced Profiles" +msgstr "Geavanceerde profielen" -#: ../../include/text.php:1096 -msgid "October" -msgstr "oktober" +#: ../../include/features.php:27 +msgid "Additional profile sections and selections" +msgstr "Extra onderdelen en keuzes voor je profiel" -#: ../../include/text.php:1096 -msgid "November" -msgstr "november" +#: ../../include/features.php:28 +msgid "Profile Import/Export" +msgstr "Profiel importen/exporteren" -#: ../../include/text.php:1096 -msgid "December" -msgstr "december" +#: ../../include/features.php:28 +msgid "Save and load profile details across sites/channels" +msgstr "Profielgegevens opslaan en in andere hubs/kanalen gebruiken." -#: ../../include/text.php:1174 -msgid "unknown.???" -msgstr "onbekend.???" +#: ../../include/features.php:29 +msgid "Web Pages" +msgstr "Webpagina's" -#: ../../include/text.php:1175 -msgid "bytes" -msgstr "bytes" +#: ../../include/features.php:29 +msgid "Provide managed web pages on your channel" +msgstr "Sta beheerde webpagina's op jouw kanaal toe" -#: ../../include/text.php:1210 -msgid "remove category" -msgstr "categorie verwijderen" +#: ../../include/features.php:30 +msgid "Private Notes" +msgstr "Privé-aantekeningen" -#: ../../include/text.php:1280 -msgid "remove from file" -msgstr "uit map verwijderen" +#: ../../include/features.php:30 +msgid "Enables a tool to store notes and reminders" +msgstr "Schakelt een eenvoudige toepassing in om aantekeningen en herinneringen in op te slaan" -#: ../../include/text.php:1345 ../../include/text.php:1357 -msgid "Click to open/close" -msgstr "Klik om te openen of te sluiten" +#: ../../include/features.php:35 +msgid "Extended Identity Sharing" +msgstr "Uitgebreid identiteit delen" -#: ../../include/text.php:1512 ../../mod/events.php:374 -msgid "Link to Source" -msgstr "Originele locatie" +#: ../../include/features.php:35 +msgid "" +"Share your identity with all websites on the internet. When disabled, " +"identity is only shared with sites in the matrix." +msgstr "Deel jouw RedMatrix-identiteit met alle websites op het internet. Wanneer dit is uitgeschakeld wordt je identiteit alleen binnen het RedMatrix-netwerk gedeeld. Schakel dit alleen als je weet wat je doet." -#: ../../include/text.php:1531 -msgid "Select a page layout: " -msgstr "Kies een paginalayout: " +#: ../../include/features.php:36 +msgid "Expert Mode" +msgstr "Expertmodus" -#: ../../include/text.php:1534 ../../include/text.php:1599 -msgid "default" -msgstr "standaard" +#: ../../include/features.php:36 +msgid "Enable Expert Mode to provide advanced configuration options" +msgstr "Schakel de expertmodus in voor geavanceerde instellingen" -#: ../../include/text.php:1570 -msgid "Page content type: " -msgstr "Opmaakcode pagina" +#: ../../include/features.php:37 +msgid "Premium Channel" +msgstr "Premiumkanaal" -#: ../../include/text.php:1611 -msgid "Select an alternate language" -msgstr "Kies een andere taal" +#: ../../include/features.php:37 +msgid "" +"Allows you to set restrictions and terms on those that connect with your " +"channel" +msgstr "Stelt je in staat om beperkingen en voorwaarden in te stellen voor jouw kanaal" -#: ../../include/text.php:1732 ../../include/conversation.php:120 -#: ../../mod/subthread.php:72 ../../mod/subthread.php:174 -#: ../../mod/tagger.php:45 ../../mod/like.php:294 -msgid "photo" -msgstr "foto" +#: ../../include/features.php:42 +msgid "Post Composition Features" +msgstr "Functies voor het opstellen van berichten" -#: ../../include/text.php:1735 ../../include/conversation.php:123 -#: ../../mod/tagger.php:49 -msgid "event" -msgstr "gebeurtenis" +#: ../../include/features.php:44 +msgid "Use Markdown" +msgstr "Markdown gebruiken" -#: ../../include/text.php:1738 ../../include/conversation.php:148 -#: ../../mod/subthread.php:72 ../../mod/subthread.php:174 -#: ../../mod/tagger.php:53 ../../mod/like.php:294 -msgid "status" -msgstr "status" +#: ../../include/features.php:44 +msgid "Allow use of \"Markdown\" to format posts" +msgstr "Sta het gebruik van \"markdown\" toe om berichten mee op te maken." -#: ../../include/text.php:1740 ../../include/conversation.php:150 -#: ../../mod/tagger.php:55 -msgid "comment" -msgstr "reactie" +#: ../../include/features.php:45 +msgid "Post Preview" +msgstr "Voorvertoning" -#: ../../include/text.php:1745 -msgid "activity" -msgstr "activiteit" +#: ../../include/features.php:45 +msgid "Allow previewing posts and comments before publishing them" +msgstr "Een optie om je berichten en reacties voor het definitief publiceren voor te vertonen" -#: ../../include/text.php:2004 -msgid "Design" -msgstr "Ontwerp" +#: ../../include/features.php:46 ../../include/widgets.php:503 +#: ../../mod/sources.php:88 +msgid "Channel Sources" +msgstr "Kanaalbronnen" -#: ../../include/text.php:2006 -msgid "Blocks" -msgstr "Blokken" +#: ../../include/features.php:46 +msgid "Automatically import channel content from other channels or feeds" +msgstr "Automatisch inhoud uit andere kanalen of feeds importeren." -#: ../../include/text.php:2007 -msgid "Menus" -msgstr "Menu's" +#: ../../include/features.php:47 +msgid "Even More Encryption" +msgstr "Extra encryptie" -#: ../../include/text.php:2008 -msgid "Layouts" -msgstr "Layouts" +#: ../../include/features.php:47 +msgid "" +"Allow optional encryption of content end-to-end with a shared secret key" +msgstr "Sta toe dat inhoud extra end-to-end wordt versleuteld met een gedeelde geheime sleutel." -#: ../../include/text.php:2009 -msgid "Pages" -msgstr "Pagina's" +#: ../../include/features.php:52 +msgid "Network and Stream Filtering" +msgstr "Netwerk- en streamfilter" -#: ../../include/dir_fns.php:36 -msgid "Sort Options" -msgstr "Sorteeropties" +#: ../../include/features.php:53 +msgid "Search by Date" +msgstr "Zoek op datum" -#: ../../include/dir_fns.php:37 -msgid "Alphabetic" -msgstr "Alfabetisch" +#: ../../include/features.php:53 +msgid "Ability to select posts by date ranges" +msgstr "Mogelijkheid om berichten op datum te filteren " -#: ../../include/dir_fns.php:38 -msgid "Reverse Alphabetic" -msgstr "Omgekeerd alfabetisch" +#: ../../include/features.php:54 +msgid "Collections Filter" +msgstr "Filter op collecties" -#: ../../include/dir_fns.php:39 -msgid "Newest to Oldest" -msgstr "Nieuw naar oud" +#: ../../include/features.php:54 +msgid "Enable widget to display Network posts only from selected collections" +msgstr "Sta de widget toe om netwerkberichten te tonen van bepaalde collecties" -#: ../../include/dir_fns.php:51 -msgid "Enable Safe Search" -msgstr "Veilig zoeken inschakelen" +#: ../../include/features.php:55 ../../include/widgets.php:265 +msgid "Saved Searches" +msgstr "Opgeslagen zoekopdrachten" -#: ../../include/dir_fns.php:53 -msgid "Disable Safe Search" -msgstr "Veilig zoeken uitschakelen" +#: ../../include/features.php:55 +msgid "Save search terms for re-use" +msgstr "Sla zoekopdrachten op voor hergebruik" -#: ../../include/dir_fns.php:55 -msgid "Safe Mode" -msgstr "Veilig zoeken" +#: ../../include/features.php:56 +msgid "Network Personal Tab" +msgstr "Persoonlijke netwerktab" -#: ../../include/bbcode.php:112 ../../include/bbcode.php:645 -#: ../../include/bbcode.php:648 ../../include/bbcode.php:653 -#: ../../include/bbcode.php:656 ../../include/bbcode.php:659 -#: ../../include/bbcode.php:662 ../../include/bbcode.php:667 -#: ../../include/bbcode.php:670 ../../include/bbcode.php:675 -#: ../../include/bbcode.php:678 ../../include/bbcode.php:681 -#: ../../include/bbcode.php:684 -msgid "Image/photo" -msgstr "Afbeelding/foto" +#: ../../include/features.php:56 +msgid "Enable tab to display only Network posts that you've interacted on" +msgstr "Sta het toe dat de tab netwerkberichten toont waarmee je interactie had" -#: ../../include/bbcode.php:147 ../../include/bbcode.php:695 -msgid "Encrypted content" -msgstr "Versleutelde inhoud" +#: ../../include/features.php:57 +msgid "Network New Tab" +msgstr "Nieuwe netwerktab" -#: ../../include/bbcode.php:163 -msgid "QR code" -msgstr "QR-code" +#: ../../include/features.php:57 +msgid "Enable tab to display all new Network activity" +msgstr "Laat de tab alle nieuwe netwerkactiviteit tonen" -#: ../../include/bbcode.php:212 -#, php-format -msgid "%1$s wrote the following %2$s %3$s" -msgstr "%1$s schreef het volgende %2$s %3$s" +#: ../../include/features.php:58 +msgid "Affinity Tool" +msgstr "Verwantschapsfilter" -#: ../../include/bbcode.php:214 -msgid "post" -msgstr "bericht" +#: ../../include/features.php:58 +msgid "Filter stream activity by depth of relationships" +msgstr "Filter wat je in de Matrix ziet op hoe goed je iemand kent of mag" -#: ../../include/bbcode.php:613 ../../include/bbcode.php:633 -msgid "$1 wrote:" -msgstr "$1 schreef:" +#: ../../include/features.php:59 +msgid "Suggest Channels" +msgstr "Kanalen voorstellen" -#: ../../include/enotify.php:41 -msgid "Red Matrix Notification" -msgstr "RedMatrix-notificatie" +#: ../../include/features.php:59 +msgid "Show channel suggestions" +msgstr "Voor jou mogelijk interessante kanalen voorstellen" -#: ../../include/enotify.php:42 -msgid "redmatrix" -msgstr "RedMatrix" +#: ../../include/features.php:64 +msgid "Post/Comment Tools" +msgstr "Bericht- en reactiehulpmiddelen" -#: ../../include/enotify.php:44 -msgid "Thank You," -msgstr "Bedankt," +#: ../../include/features.php:66 +msgid "Edit Sent Posts" +msgstr "Bewerk verzonden berichten" -#: ../../include/enotify.php:46 -#, php-format -msgid "%s Administrator" -msgstr "%s beheerder" +#: ../../include/features.php:66 +msgid "Edit and correct posts and comments after sending" +msgstr "Bewerk en corrigeer berichten en reacties nadat deze zijn verzonden" -#: ../../include/enotify.php:81 -#, php-format -msgid "%s " -msgstr "%s " +#: ../../include/features.php:67 +msgid "Tagging" +msgstr "Labelen" -#: ../../include/enotify.php:85 -#, php-format -msgid "[Red:Notify] New mail received at %s" -msgstr "[Red:Notificatie] Nieuw privébericht ontvangen op %s" +#: ../../include/features.php:67 +msgid "Ability to tag existing posts" +msgstr "Mogelijkheid om bestaande berichten te labelen" -#: ../../include/enotify.php:87 -#, php-format -msgid "%1$s, %2$s sent you a new private message at %3$s." -msgstr "%1$s, %2$s zond jou een nieuw privébericht om %3$s." +#: ../../include/features.php:68 +msgid "Post Categories" +msgstr "Categorieën berichten" -#: ../../include/enotify.php:88 -#, php-format -msgid "%1$s sent you %2$s." -msgstr "%1$s zond jou %2$s." +#: ../../include/features.php:68 +msgid "Add categories to your posts" +msgstr "Voeg categorieën toe aan je berichten" -#: ../../include/enotify.php:88 -msgid "a private message" -msgstr "een privébericht" +#: ../../include/features.php:69 +msgid "Ability to file posts under folders" +msgstr "Mogelijkheid om berichten in mappen op te slaan" -#: ../../include/enotify.php:89 -#, php-format -msgid "Please visit %s to view and/or reply to your private messages." -msgstr "Bezoek %s om je privéberichten te bekijken en/of er op te reageren." +#: ../../include/features.php:70 +msgid "Dislike Posts" +msgstr "Vind berichten niet leuk" -#: ../../include/enotify.php:144 -#, php-format -msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]" -msgstr "%1$s, %2$s gaf een reactie op [zrl=%3$s]een %4$s[/zrl]" +#: ../../include/features.php:70 +msgid "Ability to dislike posts/comments" +msgstr "Mogelijkheid om berichten en reacties niet leuk te vinden" -#: ../../include/enotify.php:152 -#, php-format -msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]" -msgstr "%1$s, %2$s gaf een reactie op [zrl=%3$s]een %5$s van %4$s[/zrl]" +#: ../../include/features.php:71 +msgid "Star Posts" +msgstr "Geef berichten een ster" -#: ../../include/enotify.php:161 -#, php-format -msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]" -msgstr "%1$s, %2$s gaf een reactie op [zrl=%3$s]jouw %4$s[/zrl]" +#: ../../include/features.php:71 +msgid "Ability to mark special posts with a star indicator" +msgstr "Mogelijkheid om speciale berichten met een ster te markeren" -#: ../../include/enotify.php:172 -#, php-format -msgid "[Red:Notify] Comment to conversation #%1$d by %2$s" -msgstr "[Red:Notificatie] Reactie op conversatie #%1$d door %2$s" +#: ../../include/features.php:72 +msgid "Tag Cloud" +msgstr "Wolk met trefwoorden/labels" -#: ../../include/enotify.php:173 -#, php-format -msgid "%1$s, %2$s commented on an item/conversation you have been following." -msgstr "%1$s, %2$s gaf een reactie op een bericht/conversatie die jij volgt." +#: ../../include/features.php:72 +msgid "Provide a personal tag cloud on your channel page" +msgstr "Zorgt voor een persoonlijke wolk met trefwoorden of labels op jouw kanaalpagina" -#: ../../include/enotify.php:176 ../../include/enotify.php:191 -#: ../../include/enotify.php:217 ../../include/enotify.php:236 -#: ../../include/enotify.php:250 -#, php-format -msgid "Please visit %s to view and/or reply to the conversation." -msgstr "Bezoek %s om de conversatie te bekijken en/of er op te reageren." +#: ../../include/follow.php:23 +msgid "Channel is blocked on this site." +msgstr "Kanaal is op deze hub geblokkeerd." -#: ../../include/enotify.php:182 -#, php-format -msgid "[Red:Notify] %s posted to your profile wall" -msgstr "[Red:Notificatie] %s heeft een bericht op jouw kanaal geplaatst" +#: ../../include/follow.php:28 +msgid "Channel location missing." +msgstr "Ontbrekende kanaallocatie." -#: ../../include/enotify.php:184 -#, php-format -msgid "%1$s, %2$s posted to your profile wall at %3$s" -msgstr "%1$s, %2$s heeft om %3$s een bericht op jouw kanaal geplaatst" +#: ../../include/follow.php:54 +msgid "Response from remote channel was incomplete." +msgstr "Antwoord van het kanaal op afstand was niet volledig." -#: ../../include/enotify.php:186 -#, php-format -msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]" -msgstr "%1$s, %2$s heeft een bericht op [zrl=%3$s]jouw kanaal[/zrl] geplaatst" +#: ../../include/follow.php:85 +msgid "Channel was deleted and no longer exists." +msgstr "Kanaal is verwijderd en bestaat niet meer." -#: ../../include/enotify.php:210 -#, php-format -msgid "[Red:Notify] %s tagged you" -msgstr "[Red:Notificatie] %s heeft je genoemd" +#: ../../include/follow.php:132 +msgid "Channel discovery failed." +msgstr "Kanaal ontdekken mislukt." -#: ../../include/enotify.php:211 -#, php-format -msgid "%1$s, %2$s tagged you at %3$s" -msgstr "%1$s, %2$s noemde jou om %3$s" +#: ../../include/follow.php:149 +msgid "local account not found." +msgstr "lokale account niet gevonden." -#: ../../include/enotify.php:212 -#, php-format -msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]." -msgstr "%1$s, %2$s [zrl=%3$s]noemde jou[/zrl]." +#: ../../include/follow.php:158 +msgid "Cannot connect to yourself." +msgstr "Kan niet met jezelf verbinden" -#: ../../include/enotify.php:225 -#, php-format -msgid "[Red:Notify] %1$s poked you" -msgstr "[Red:Notificatie] %1$s heeft je aangestoten" +#: ../../include/chat.php:10 +msgid "Missing room name" +msgstr "Naam chatkanaal ontbreekt" -#: ../../include/enotify.php:226 -#, php-format -msgid "%1$s, %2$s poked you at %3$s" -msgstr "%1$s, %2$s heeft je aangestoten op %3$s" +#: ../../include/chat.php:19 +msgid "Duplicate room name" +msgstr "Naam chatkanaal bestaat al" -#: ../../include/enotify.php:227 -#, php-format -msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]." -msgstr "%1$s, %2$s [zrl=%2$s]heeft je aangestoten[/zrl]." +#: ../../include/chat.php:68 ../../include/chat.php:76 +msgid "Invalid room specifier." +msgstr "Ongeldige omschrijving chatkanaal" -#: ../../include/enotify.php:243 -#, php-format -msgid "[Red:Notify] %s tagged your post" -msgstr "[Red:Notificatie] %s heeft jouw bericht gelabeld" +#: ../../include/chat.php:105 +msgid "Room not found." +msgstr "Chatkanaal niet gevonden" -#: ../../include/enotify.php:244 -#, php-format -msgid "%1$s, %2$s tagged your post at %3$s" -msgstr "%1$s, %2$s labelde jouw bericht om %3$s" +#: ../../include/chat.php:126 +msgid "Room is full" +msgstr "Chatkanaal is vol" -#: ../../include/enotify.php:245 -#, php-format -msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]" -msgstr "%1$s, %2$s labelde [zrl=%3$s]jouw bericht[/zrl]" +#: ../../include/items.php:295 ../../mod/profperm.php:23 +#: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/like.php:242 +#: ../../mod/frphotos.php:69 ../../index.php:360 +msgid "Permission denied" +msgstr "Toegang geweigerd" -#: ../../include/enotify.php:257 -msgid "[Red:Notify] Introduction received" -msgstr "[Red:Notificatie] Connectieverzoek ontvangen" +#: ../../include/items.php:830 +msgid "(Unknown)" +msgstr "(Onbekend)" -#: ../../include/enotify.php:258 -#, php-format -msgid "%1$s, you've received an new connection request from '%2$s' at %3$s" -msgstr "%1$s, je hebt een nieuw connectieverzoek ontvangen van '%2$s' op %3$s" +#: ../../include/items.php:959 +msgid "Visible to anybody on the internet." +msgstr "Voor iedereen op het internet zichtbaar." -#: ../../include/enotify.php:259 -#, php-format -msgid "" -"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s." -msgstr "%1$s, je hebt een [zrl=%2$s]nieuw connectieverzoek[/zrl] ontvangen van %3$s." +#: ../../include/items.php:961 +msgid "Visible to you only." +msgstr "Alleen voor jou zichtbaar." -#: ../../include/enotify.php:263 ../../include/enotify.php:282 -#, php-format -msgid "You may visit their profile at %s" -msgstr "Je kan het profiel bekijken op %s" +#: ../../include/items.php:963 +msgid "Visible to anybody in this network." +msgstr "Voor iedereen in dit netwerk zichtbaar." -#: ../../include/enotify.php:265 +#: ../../include/items.php:965 +msgid "Visible to anybody authenticated." +msgstr "Voor iedereen die geauthenticeerd is zichtbaar." + +#: ../../include/items.php:967 #, php-format -msgid "Please visit %s to approve or reject the connection request." -msgstr "Bezoek %s om het connectieverzoek te accepteren of af te wijzen." +msgid "Visible to anybody on %s." +msgstr "Voor iedereen op %s zichtbaar." -#: ../../include/enotify.php:272 -msgid "[Red:Notify] Friend suggestion received" -msgstr "[Red:Notificatie] Kanaalvoorstel ontvangen" +#: ../../include/items.php:969 +msgid "Visible to all connections." +msgstr "Voor alle connecties zichtbaar." -#: ../../include/enotify.php:273 -#, php-format -msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s" -msgstr "%1$s, je hebt een kanaalvoorstel ontvangen van '%2$s' om %3$s" +#: ../../include/items.php:971 +msgid "Visible to approved connections." +msgstr "Voor alle goedgekeurde connecties zichtbaar." -#: ../../include/enotify.php:274 -#, php-format -msgid "" -"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from " -"%4$s." -msgstr "%1$s, je hebt [zrl=%2$s]een kanaalvoorstel[/zrl] ontvangen voor %3$s van %4$s." +#: ../../include/items.php:3649 ../../mod/home.php:67 ../../mod/display.php:32 +#: ../../mod/filestorage.php:18 ../../mod/admin.php:168 +#: ../../mod/admin.php:932 ../../mod/admin.php:1135 ../../mod/thing.php:78 +#: ../../mod/viewsrc.php:18 +msgid "Item not found." +msgstr "Item niet gevonden." -#: ../../include/enotify.php:280 -msgid "Name:" -msgstr "Naam:" +#: ../../include/items.php:4082 ../../mod/group.php:38 ../../mod/group.php:140 +msgid "Collection not found." +msgstr "Collectie niet gevonden." -#: ../../include/enotify.php:281 -msgid "Photo:" -msgstr "Foto:" +#: ../../include/items.php:4097 +msgid "Collection is empty." +msgstr "Collectie is leeg" -#: ../../include/enotify.php:284 +#: ../../include/items.php:4104 #, php-format -msgid "Please visit %s to approve or reject the suggestion." -msgstr "Bezoek %s om het voorstel te accepteren of af te wijzen." +msgid "Collection: %s" +msgstr "Collectie: %s" -#: ../../include/bookmarks.php:35 +#: ../../include/items.php:4115 #, php-format -msgid "%1$s's bookmarks" -msgstr "Bladwijzers van %1$s" +msgid "Connection: %s" +msgstr "Connectie: %s" -#: ../../include/nav.php:81 ../../include/nav.php:108 -msgid "End this session" -msgstr "Beëindig deze sessie" +#: ../../include/items.php:4118 +msgid "Connection not found." +msgstr "Connectie niet gevonden." -#: ../../include/nav.php:84 ../../include/nav.php:142 -msgid "Home" -msgstr "Home" +#: ../../include/group.php:25 +msgid "" +"A deleted group with this name was revived. Existing item permissions " +"may apply to this group and any future members. If this is " +"not what you intended, please create another group with a different name." +msgstr "Een verwijderde collectie met deze naam is gereactiveerd. Bestaande itemrechten kunnen van toepassing zijn op deze collectie en toekomstige leden. Wanneer je dit niet zo bedoeld hebt, moet je een nieuwe collectie met een andere naam aanmaken." -#: ../../include/nav.php:84 -msgid "Your posts and conversations" -msgstr "Jouw berichten en conversaties" +#: ../../include/group.php:234 +msgid "Default privacy group for new contacts" +msgstr "Standaard privacy-collectie voor nieuwe kanalen" -#: ../../include/nav.php:85 ../../include/conversation.php:940 -#: ../../mod/connedit.php:393 ../../mod/connedit.php:507 -msgid "View Profile" -msgstr "Profiel weergeven" +#: ../../include/group.php:253 ../../mod/admin.php:772 +msgid "All Channels" +msgstr "Alle kanalen" -#: ../../include/nav.php:85 -msgid "Your profile page" -msgstr "Jouw profielpagina" +#: ../../include/group.php:275 +msgid "edit" +msgstr "bewerken" -#: ../../include/nav.php:87 -msgid "Edit Profiles" -msgstr "Bewerk profielen" +#: ../../include/group.php:296 +msgid "Collections" +msgstr "Collecties" -#: ../../include/nav.php:87 -msgid "Manage/Edit profiles" -msgstr "Beheer/wijzig profielen" +#: ../../include/group.php:297 +msgid "Edit collection" +msgstr "Collectie bewerken" -#: ../../include/nav.php:89 -msgid "Edit your profile" -msgstr "Jouw profiel bewerken" +#: ../../include/group.php:298 +msgid "Create a new collection" +msgstr "Nieuwe collectie aanmaken" -#: ../../include/nav.php:91 ../../include/apps.php:134 -#: ../../include/conversation.php:1512 ../../mod/fbrowser.php:25 -msgid "Photos" -msgstr "Foto's" +#: ../../include/group.php:299 +msgid "Channels not in any collection" +msgstr "Kanalen die zich in geen enkele collectie bevinden" -#: ../../include/nav.php:91 -msgid "Your photos" -msgstr "Jouw foto's" +#: ../../include/group.php:301 ../../include/widgets.php:266 +msgid "add" +msgstr "toevoegen" -#: ../../include/nav.php:92 -msgid "Your files" -msgstr "Jouw bestanden" +#: ../../include/identity.php:30 ../../mod/item.php:1297 +msgid "Unable to obtain identity information from database" +msgstr "Niet in staat om identiteitsinformatie uit de database te verkrijgen" -#: ../../include/nav.php:97 ../../include/apps.php:141 -msgid "Chat" -msgstr "Chatten" +#: ../../include/identity.php:63 +msgid "Empty name" +msgstr "Ontbrekende naam" -#: ../../include/nav.php:97 -msgid "Your chatrooms" -msgstr "Jouw chatkanalen" +#: ../../include/identity.php:65 +msgid "Name too long" +msgstr "Naam te lang" -#: ../../include/nav.php:100 ../../include/apps.php:124 -#: ../../include/conversation.php:1543 -msgid "Bookmarks" -msgstr "Bladwijzers" +#: ../../include/identity.php:166 +msgid "No account identifier" +msgstr "Geen account-identificator" -#: ../../include/nav.php:100 -msgid "Your bookmarks" -msgstr "Jouw bladwijzers" +#: ../../include/identity.php:176 +msgid "Nickname is required." +msgstr "Bijnaam is verplicht" -#: ../../include/nav.php:102 ../../include/apps.php:131 -#: ../../include/conversation.php:1554 ../../mod/webpages.php:79 -msgid "Webpages" -msgstr "Webpagina's" +#: ../../include/identity.php:190 +msgid "Reserved nickname. Please choose another." +msgstr "Deze naam is gereserveerd. Kies een andere." -#: ../../include/nav.php:102 -msgid "Your webpages" -msgstr "Jouw webpagina's" +#: ../../include/identity.php:195 +msgid "" +"Nickname has unsupported characters or is already being used on this site." +msgstr "Deze naam heeft niet ondersteunde karakters of is al op deze hub in gebruik." -#: ../../include/nav.php:106 -msgid "Sign in" -msgstr "Inloggen" +#: ../../include/identity.php:258 +msgid "Unable to retrieve created identity" +msgstr "Niet in staat om aangemaakte identiteit te vinden" -#: ../../include/nav.php:123 -#, php-format -msgid "%s - click to logout" -msgstr "%s - klik om uit te loggen" +#: ../../include/identity.php:317 +msgid "Default Profile" +msgstr "Standaardprofiel" -#: ../../include/nav.php:128 -msgid "Click to authenticate to your home hub" -msgstr "Klik om jezelf te authenticeren via jouw eigen RedMatrix-hub" +#: ../../include/identity.php:342 ../../include/widgets.php:400 +#: ../../include/profile_selectors.php:80 ../../mod/connedit.php:473 +msgid "Friends" +msgstr "Vrienden" -#: ../../include/nav.php:142 -msgid "Home Page" -msgstr "Homepage" +#: ../../include/identity.php:509 +msgid "Requested channel is not available." +msgstr "Opgevraagd kanaal is niet beschikbaar." -#: ../../include/nav.php:146 -msgid "Create an account" -msgstr "Maak een account aan" +#: ../../include/identity.php:557 ../../mod/achievements.php:8 +#: ../../mod/profile.php:16 ../../mod/blocks.php:10 ../../mod/connect.php:13 +#: ../../mod/filestorage.php:40 ../../mod/layouts.php:8 +#: ../../mod/webpages.php:8 ../../mod/hcard.php:8 +msgid "Requested profile is not available." +msgstr "Opgevraagd profiel is niet beschikbaar" -#: ../../include/nav.php:151 ../../include/apps.php:137 ../../mod/help.php:60 -#: ../../mod/help.php:65 -msgid "Help" -msgstr "Hulp" +#: ../../include/identity.php:706 ../../include/widgets.php:128 +#: ../../include/widgets.php:168 ../../include/Contact.php:107 +#: ../../mod/directory.php:183 ../../mod/dirprofile.php:164 +#: ../../mod/suggest.php:51 ../../mod/match.php:62 +msgid "Connect" +msgstr "Verbinden" -#: ../../include/nav.php:151 -msgid "Help and documentation" -msgstr "Hulp en documentatie" +#: ../../include/identity.php:720 ../../mod/profiles.php:695 +msgid "Change profile photo" +msgstr "Profielfoto veranderen" -#: ../../include/nav.php:154 ../../include/widgets.php:79 -#: ../../mod/apps.php:33 -msgid "Apps" -msgstr "Apps" +#: ../../include/identity.php:726 +msgid "Profiles" +msgstr "Profielen" -#: ../../include/nav.php:154 -msgid "Applications, utilities, links, games" -msgstr "Apps" +#: ../../include/identity.php:726 +msgid "Manage/edit profiles" +msgstr "Profielen beheren/bewerken" -#: ../../include/nav.php:156 -msgid "Search site content" -msgstr "Inhoud van deze RedMatrix-hub doorzoeken" +#: ../../include/identity.php:727 ../../mod/profiles.php:696 +msgid "Create New Profile" +msgstr "Nieuw profiel aanmaken" -#: ../../include/nav.php:159 ../../include/apps.php:136 -#: ../../mod/directory.php:226 -msgid "Directory" -msgstr "Gids" +#: ../../include/identity.php:741 ../../mod/profiles.php:707 +msgid "Profile Image" +msgstr "Profielfoto" -#: ../../include/nav.php:159 -msgid "Channel Locator" -msgstr "Kanalengids" +#: ../../include/identity.php:744 +msgid "visible to everybody" +msgstr "Voor iedereen zichtbaar" -#: ../../include/nav.php:170 ../../include/apps.php:128 -msgid "Matrix" -msgstr "Matrix" +#: ../../include/identity.php:745 ../../mod/profiles.php:591 +#: ../../mod/profiles.php:711 +msgid "Edit visibility" +msgstr "Zichtbaarheid bewerken" -#: ../../include/nav.php:170 -msgid "Your matrix" -msgstr "Jouw matrix" +#: ../../include/identity.php:759 ../../include/identity.php:983 +#: ../../mod/directory.php:158 +msgid "Gender:" +msgstr "Geslacht:" -#: ../../include/nav.php:171 -msgid "Mark all matrix notifications seen" -msgstr "Markeer alle matrixnotificaties als bekeken" +#: ../../include/identity.php:760 ../../include/identity.php:1027 +#: ../../mod/directory.php:160 +msgid "Status:" +msgstr "Status:" -#: ../../include/nav.php:173 ../../include/apps.php:132 -msgid "Channel Home" -msgstr "Tijdlijn kanaal" +#: ../../include/identity.php:761 ../../include/identity.php:1038 +#: ../../mod/directory.php:162 +msgid "Homepage:" +msgstr "Homepagina:" -#: ../../include/nav.php:173 -msgid "Channel home" -msgstr "Tijdlijn kanaal" +#: ../../include/identity.php:762 ../../mod/dirprofile.php:151 +msgid "Online Now" +msgstr "Nu online" -#: ../../include/nav.php:174 -msgid "Mark all channel notifications seen" -msgstr "Alle kanaalnotificaties als gelezen markeren" +#: ../../include/identity.php:827 ../../include/identity.php:907 +#: ../../mod/ping.php:298 +msgid "g A l F d" +msgstr "G:i, l d F" -#: ../../include/nav.php:177 ../../mod/connections.php:386 -msgid "Connections" -msgstr "Connecties" +#: ../../include/identity.php:828 ../../include/identity.php:908 +msgid "F d" +msgstr "d F" -#: ../../include/nav.php:180 -msgid "Notices" -msgstr "Notificaties" +#: ../../include/identity.php:873 ../../include/identity.php:948 +#: ../../mod/ping.php:320 +msgid "[today]" +msgstr "[vandaag]" -#: ../../include/nav.php:180 -msgid "Notifications" -msgstr "Notificaties" +#: ../../include/identity.php:885 +msgid "Birthday Reminders" +msgstr "Verjaardagsherinneringen" -#: ../../include/nav.php:181 -msgid "See all notifications" -msgstr "Alle notificaties weergeven" +#: ../../include/identity.php:886 +msgid "Birthdays this week:" +msgstr "Verjaardagen deze week:" -#: ../../include/nav.php:182 ../../mod/notifications.php:99 -msgid "Mark all system notifications seen" -msgstr "Markeer alle systeemnotificaties als bekeken" +#: ../../include/identity.php:941 +msgid "[No description]" +msgstr "[Geen omschrijving]" -#: ../../include/nav.php:184 ../../include/apps.php:138 -msgid "Mail" -msgstr "Privéberichten" +#: ../../include/identity.php:959 +msgid "Event Reminders" +msgstr "Herinneringen voor gebeurtenissen" -#: ../../include/nav.php:184 -msgid "Private mail" -msgstr "Privéberichten" +#: ../../include/identity.php:960 +msgid "Events this week:" +msgstr "Gebeurtenissen deze week:" -#: ../../include/nav.php:185 -msgid "See all private messages" -msgstr "Alle privéberichten weergeven" +#: ../../include/identity.php:981 ../../mod/settings.php:942 +msgid "Full Name:" +msgstr "Volledige naam:" -#: ../../include/nav.php:186 -msgid "Mark all private messages seen" -msgstr "Markeer alle privéberichten als bekeken" +#: ../../include/identity.php:988 +msgid "Like this channel" +msgstr "Vind dit kanaal leuk" -#: ../../include/nav.php:187 -msgid "Inbox" -msgstr "Postvak IN" +#: ../../include/identity.php:1012 +msgid "j F, Y" +msgstr "F j Y" -#: ../../include/nav.php:188 -msgid "Outbox" -msgstr "Postvak UIT" +#: ../../include/identity.php:1013 +msgid "j F" +msgstr "F j" -#: ../../include/nav.php:189 ../../include/widgets.php:536 -msgid "New Message" -msgstr "Nieuw bericht" +#: ../../include/identity.php:1020 +msgid "Birthday:" +msgstr "Geboortedatum:" -#: ../../include/nav.php:192 ../../include/apps.php:135 -#: ../../mod/events.php:396 -msgid "Events" -msgstr "Gebeurtenissen" +#: ../../include/identity.php:1024 +msgid "Age:" +msgstr "Leeftijd:" -#: ../../include/nav.php:192 -msgid "Event Calendar" -msgstr "Agenda" +#: ../../include/identity.php:1033 +#, php-format +msgid "for %1$d %2$s" +msgstr "voor %1$d %2$s" -#: ../../include/nav.php:193 -msgid "See all events" -msgstr "Alle gebeurtenissen weergeven" +#: ../../include/identity.php:1036 ../../mod/profiles.php:613 +msgid "Sexual Preference:" +msgstr "Seksuele voorkeur:" -#: ../../include/nav.php:194 -msgid "Mark all events seen" -msgstr "Markeer alle gebeurtenissen als bekeken" +#: ../../include/identity.php:1040 ../../mod/profiles.php:615 +msgid "Hometown:" +msgstr "Oorspronkelijk uit:" -#: ../../include/nav.php:196 ../../include/apps.php:127 -msgid "Channel Select" -msgstr "Kanaalkiezer" +#: ../../include/identity.php:1042 +msgid "Tags:" +msgstr "Trefwoorden:" -#: ../../include/nav.php:196 -msgid "Manage Your Channels" -msgstr "Beheer je kanalen" +#: ../../include/identity.php:1044 ../../mod/profiles.php:616 +msgid "Political Views:" +msgstr "Politieke overtuigingen:" -#: ../../include/nav.php:198 ../../include/apps.php:129 -#: ../../include/widgets.php:514 ../../mod/admin.php:978 -#: ../../mod/admin.php:1183 -msgid "Settings" -msgstr "Instellingen" +#: ../../include/identity.php:1046 +msgid "Religion:" +msgstr "Religie:" -#: ../../include/nav.php:198 -msgid "Account/Channel Settings" -msgstr "Account-/kanaal-instellingen" +#: ../../include/identity.php:1048 ../../mod/directory.php:164 +msgid "About:" +msgstr "Over:" -#: ../../include/nav.php:206 ../../mod/admin.php:117 -msgid "Admin" -msgstr "Beheer" +#: ../../include/identity.php:1050 +msgid "Hobbies/Interests:" +msgstr "Hobby's/interesses:" -#: ../../include/nav.php:206 -msgid "Site Setup and Configuration" -msgstr "Hub instellen en beheren" +#: ../../include/identity.php:1052 ../../mod/profiles.php:619 +msgid "Likes:" +msgstr "Houdt van:" -#: ../../include/nav.php:231 -msgid "Nothing new here" -msgstr "Niets nieuw hier" +#: ../../include/identity.php:1054 ../../mod/profiles.php:620 +msgid "Dislikes:" +msgstr "Houdt niet van:" -#: ../../include/nav.php:235 -msgid "Please wait..." -msgstr "Wachten aub..." +#: ../../include/identity.php:1057 +msgid "Contact information and Social Networks:" +msgstr "Contactinformatie en sociale netwerken:" -#: ../../include/features.php:23 -msgid "General Features" -msgstr "Algemene functies" +#: ../../include/identity.php:1059 +msgid "My other channels:" +msgstr "Mijn andere kanalen" -#: ../../include/features.php:25 -msgid "Content Expiration" -msgstr "Inhoud laten verlopen" +#: ../../include/identity.php:1061 +msgid "Musical interests:" +msgstr "Muzikale interesses:" -#: ../../include/features.php:25 -msgid "Remove posts/comments and/or private messages at a future time" -msgstr "Berichten, reacties en/of privéberichten na een bepaalde tijd verwijderen" +#: ../../include/identity.php:1063 +msgid "Books, literature:" +msgstr "Boeken, literatuur:" -#: ../../include/features.php:26 -msgid "Multiple Profiles" -msgstr "Meerdere profielen" +#: ../../include/identity.php:1065 +msgid "Television:" +msgstr "Televisie:" -#: ../../include/features.php:26 -msgid "Ability to create multiple profiles" -msgstr "Mogelijkheid om meerdere profielen aan te maken" +#: ../../include/identity.php:1067 +msgid "Film/dance/culture/entertainment:" +msgstr "Films/dansen/cultuur/vermaak:" -#: ../../include/features.php:27 -msgid "Advanced Profiles" -msgstr "Geavanceerde profielen" +#: ../../include/identity.php:1069 +msgid "Love/Romance:" +msgstr "Liefde/romantiek:" -#: ../../include/features.php:27 -msgid "Additional profile sections and selections" -msgstr "Extra onderdelen en keuzes voor je profiel" +#: ../../include/identity.php:1071 +msgid "Work/employment:" +msgstr "Werk/beroep:" -#: ../../include/features.php:28 -msgid "Profile Import/Export" -msgstr "Profiel importen/exporteren" +#: ../../include/identity.php:1073 +msgid "School/education:" +msgstr "School/opleiding:" -#: ../../include/features.php:28 -msgid "Save and load profile details across sites/channels" -msgstr "Profielgegevens opslaan en in andere hubs/kanalen gebruiken." +#: ../../include/identity.php:1093 +msgid "Like this thing" +msgstr "Vind dit ding leuk" -#: ../../include/features.php:29 -msgid "Web Pages" -msgstr "Webpagina's" +#: ../../include/network.php:652 +msgid "view full size" +msgstr "volledige grootte tonen" -#: ../../include/features.php:29 -msgid "Provide managed web pages on your channel" -msgstr "Sta beheerde webpagina's op jouw kanaal toe" +#: ../../include/bbcode.php:112 ../../include/bbcode.php:645 +#: ../../include/bbcode.php:648 ../../include/bbcode.php:653 +#: ../../include/bbcode.php:656 ../../include/bbcode.php:659 +#: ../../include/bbcode.php:662 ../../include/bbcode.php:667 +#: ../../include/bbcode.php:670 ../../include/bbcode.php:675 +#: ../../include/bbcode.php:678 ../../include/bbcode.php:681 +#: ../../include/bbcode.php:684 +msgid "Image/photo" +msgstr "Afbeelding/foto" -#: ../../include/features.php:30 -msgid "Private Notes" -msgstr "Privé-aantekeningen" +#: ../../include/bbcode.php:147 ../../include/bbcode.php:695 +msgid "Encrypted content" +msgstr "Versleutelde inhoud" -#: ../../include/features.php:30 -msgid "Enables a tool to store notes and reminders" -msgstr "Schakelt een eenvoudige toepassing in om aantekeningen en herinneringen in op te slaan" +#: ../../include/bbcode.php:163 +msgid "QR code" +msgstr "QR-code" -#: ../../include/features.php:35 -msgid "Extended Identity Sharing" -msgstr "Uitgebreid identiteit delen" +#: ../../include/bbcode.php:212 +#, php-format +msgid "%1$s wrote the following %2$s %3$s" +msgstr "%1$s schreef het volgende %2$s %3$s" -#: ../../include/features.php:35 -msgid "" -"Share your identity with all websites on the internet. When disabled, " -"identity is only shared with sites in the matrix." -msgstr "Deel jouw RedMatrix-identiteit met alle websites op het internet. Wanneer dit is uitgeschakeld wordt je identiteit alleen binnen het RedMatrix-netwerk gedeeld. Schakel dit alleen als je weet wat je doet." +#: ../../include/bbcode.php:214 +msgid "post" +msgstr "bericht" -#: ../../include/features.php:36 -msgid "Expert Mode" -msgstr "Expertmodus" +#: ../../include/bbcode.php:613 ../../include/bbcode.php:633 +msgid "$1 wrote:" +msgstr "$1 schreef:" -#: ../../include/features.php:36 -msgid "Enable Expert Mode to provide advanced configuration options" -msgstr "Schakel de expertmodus in voor geavanceerde instellingen" +#: ../../include/message.php:18 +msgid "No recipient provided." +msgstr "Geen ontvanger opgegeven." -#: ../../include/features.php:37 -msgid "Premium Channel" -msgstr "Premiumkanaal" +#: ../../include/message.php:23 +msgid "[no subject]" +msgstr "[geen onderwerp]" -#: ../../include/features.php:37 -msgid "" -"Allows you to set restrictions and terms on those that connect with your " -"channel" -msgstr "Stelt je in staat om beperkingen en voorwaarden in te stellen voor jouw kanaal" +#: ../../include/message.php:42 +msgid "Unable to determine sender." +msgstr "Afzender kan niet bepaald worden." -#: ../../include/features.php:42 -msgid "Post Composition Features" -msgstr "Functies voor het opstellen van berichten" +#: ../../include/message.php:143 +msgid "Stored post could not be verified." +msgstr "Opgeslagen bericht kon niet worden geverifieerd." -#: ../../include/features.php:44 -msgid "Use Markdown" -msgstr "Markdown gebruiken" +#: ../../include/widgets.php:80 +msgid "System" +msgstr "Systeem" -#: ../../include/features.php:44 -msgid "Allow use of \"Markdown\" to format posts" -msgstr "Sta het gebruik van \"markdown\" toe om berichten mee op te maken." +#: ../../include/widgets.php:83 +msgid "Create Personal App" +msgstr "Persoonlijke app maken" -#: ../../include/features.php:45 -msgid "Post Preview" -msgstr "Voorvertoning" +#: ../../include/widgets.php:84 +msgid "Edit Personal App" +msgstr "Persoonlijke app bewerken" -#: ../../include/features.php:45 -msgid "Allow previewing posts and comments before publishing them" -msgstr "Een optie om je berichten en reacties voor het definitief publiceren voor te vertonen" +#: ../../include/widgets.php:130 ../../mod/suggest.php:53 +msgid "Ignore/Hide" +msgstr "Negeren/Verbergen" -#: ../../include/features.php:46 ../../include/widgets.php:503 -#: ../../mod/sources.php:88 -msgid "Channel Sources" -msgstr "Kanaalbronnen" +#: ../../include/widgets.php:136 ../../mod/connections.php:267 +msgid "Suggestions" +msgstr "Voorgestelde kanalen" -#: ../../include/features.php:46 -msgid "Automatically import channel content from other channels or feeds" -msgstr "Automatisch inhoud uit andere kanalen of feeds importeren." +#: ../../include/widgets.php:137 +msgid "See more..." +msgstr "Meer..." -#: ../../include/features.php:47 -msgid "Even More Encryption" -msgstr "Extra encryptie" +#: ../../include/widgets.php:159 +#, php-format +msgid "You have %1$.0f of %2$.0f allowed connections." +msgstr "Je hebt %1$.0f van de %2$.0f toegestane connecties." -#: ../../include/features.php:47 -msgid "" -"Allow optional encryption of content end-to-end with a shared secret key" -msgstr "Sta toe dat inhoud extra end-to-end wordt versleuteld met een gedeelde geheime sleutel." +#: ../../include/widgets.php:165 +msgid "Add New Connection" +msgstr "Nieuwe connectie toevoegen" -#: ../../include/features.php:52 -msgid "Network and Stream Filtering" -msgstr "Netwerk- en streamfilter" +#: ../../include/widgets.php:166 +msgid "Enter the channel address" +msgstr "Vul het adres van het nieuwe kanaal in" -#: ../../include/features.php:53 -msgid "Search by Date" -msgstr "Zoek op datum" +#: ../../include/widgets.php:167 +msgid "Example: bob@example.com, http://example.com/barbara" +msgstr "Voorbeeld: bob@example.com, http://example.com/barbara" -#: ../../include/features.php:53 -msgid "Ability to select posts by date ranges" -msgstr "Mogelijkheid om berichten op datum te filteren " +#: ../../include/widgets.php:184 +msgid "Notes" +msgstr "Aantekeningen" -#: ../../include/features.php:54 -msgid "Collections Filter" -msgstr "Filter op collecties" +#: ../../include/widgets.php:256 +msgid "Remove term" +msgstr "Verwijder zoekterm" -#: ../../include/features.php:54 -msgid "Enable widget to display Network posts only from selected collections" -msgstr "Sta de widget toe om netwerkberichten te tonen van bepaalde collecties" +#: ../../include/widgets.php:335 +msgid "Archives" +msgstr "Archieven" -#: ../../include/features.php:55 ../../include/widgets.php:265 -msgid "Saved Searches" -msgstr "Opgeslagen zoekopdrachten" +#: ../../include/widgets.php:397 +msgid "Refresh" +msgstr "Vernieuwen" -#: ../../include/features.php:55 -msgid "Save search terms for re-use" -msgstr "Sla zoekopdrachten op voor hergebruik" +#: ../../include/widgets.php:398 ../../mod/connedit.php:470 +msgid "Me" +msgstr "Ik" -#: ../../include/features.php:56 -msgid "Network Personal Tab" -msgstr "Persoonlijke netwerktab" +#: ../../include/widgets.php:399 ../../mod/connedit.php:472 +msgid "Best Friends" +msgstr "Goede vrienden" -#: ../../include/features.php:56 -msgid "Enable tab to display only Network posts that you've interacted on" -msgstr "Sta het toe dat de tab netwerkberichten toont waarmee je interactie had" +#: ../../include/widgets.php:401 +msgid "Co-workers" +msgstr "Collega's" -#: ../../include/features.php:57 -msgid "Network New Tab" -msgstr "Nieuwe netwerktab" +#: ../../include/widgets.php:402 ../../mod/connedit.php:474 +msgid "Former Friends" +msgstr "Oude vrienden" -#: ../../include/features.php:57 -msgid "Enable tab to display all new Network activity" -msgstr "Laat de tab alle nieuwe netwerkactiviteit tonen" +#: ../../include/widgets.php:403 ../../mod/connedit.php:475 +msgid "Acquaintances" +msgstr "Kennissen" -#: ../../include/features.php:58 -msgid "Affinity Tool" -msgstr "Verwantschapsfilter" +#: ../../include/widgets.php:404 +msgid "Everybody" +msgstr "Iedereen" -#: ../../include/features.php:58 -msgid "Filter stream activity by depth of relationships" -msgstr "Filter wat je in de Matrix ziet op hoe goed je iemand kent of mag" +#: ../../include/widgets.php:436 +msgid "Account settings" +msgstr "Account" -#: ../../include/features.php:59 -msgid "Suggest Channels" -msgstr "Kanalen voorstellen" +#: ../../include/widgets.php:442 +msgid "Channel settings" +msgstr "Kanaal" -#: ../../include/features.php:59 -msgid "Show channel suggestions" -msgstr "Voor jou mogelijk interessante kanalen voorstellen" +#: ../../include/widgets.php:448 +msgid "Additional features" +msgstr "Extra functies" -#: ../../include/features.php:64 -msgid "Post/Comment Tools" -msgstr "Bericht- en reactiehulpmiddelen" +#: ../../include/widgets.php:454 +msgid "Feature settings" +msgstr "Plug-ins" -#: ../../include/features.php:66 -msgid "Edit Sent Posts" -msgstr "Bewerk verzonden berichten" +#: ../../include/widgets.php:460 +msgid "Display settings" +msgstr "Weergave" -#: ../../include/features.php:66 -msgid "Edit and correct posts and comments after sending" -msgstr "Bewerk en corrigeer berichten en reacties nadat deze zijn verzonden" +#: ../../include/widgets.php:466 +msgid "Connected apps" +msgstr "Verbonden applicaties" -#: ../../include/features.php:67 -msgid "Tagging" -msgstr "Labelen" +#: ../../include/widgets.php:472 +msgid "Export channel" +msgstr "Kanaal exporteren" -#: ../../include/features.php:67 -msgid "Ability to tag existing posts" -msgstr "Mogelijkheid om bestaande berichten te labelen" +#: ../../include/widgets.php:484 +msgid "Automatic Permissions (Advanced)" +msgstr "Automatische privacy-rechten (geavanceerd)" -#: ../../include/features.php:68 -msgid "Post Categories" -msgstr "Categorieën berichten" +#: ../../include/widgets.php:494 +msgid "Premium Channel Settings" +msgstr "Instellingen premiumkanaal" -#: ../../include/features.php:68 -msgid "Add categories to your posts" -msgstr "Voeg categorieën toe aan je berichten" +#: ../../include/widgets.php:531 +msgid "Check Mail" +msgstr "Controleer op nieuwe berichten" -#: ../../include/features.php:69 -msgid "Ability to file posts under folders" -msgstr "Mogelijkheid om berichten in mappen op te slaan" +#: ../../include/widgets.php:612 +msgid "Chat Rooms" +msgstr "Chatkanalen" -#: ../../include/features.php:70 -msgid "Dislike Posts" -msgstr "Vind berichten niet leuk" +#: ../../include/widgets.php:630 +msgid "Bookmarked Chatrooms" +msgstr "Bladwijzers van chatkanalen" -#: ../../include/features.php:70 -msgid "Ability to dislike posts/comments" -msgstr "Mogelijkheid om berichten en reacties niet leuk te vinden" +#: ../../include/widgets.php:648 +msgid "Suggested Chatrooms" +msgstr "Voorgestelde chatkanalen" -#: ../../include/features.php:71 -msgid "Star Posts" -msgstr "Geef berichten een ster" +#: ../../include/ItemObject.php:118 +msgid "Save to Folder" +msgstr "In map opslaan" -#: ../../include/features.php:71 -msgid "Ability to mark special posts with a star indicator" -msgstr "Mogelijkheid om speciale berichten met een ster te markeren" +#: ../../include/ItemObject.php:130 ../../include/ItemObject.php:142 +msgid "View all" +msgstr "Toon alles" -#: ../../include/features.php:72 -msgid "Tag Cloud" -msgstr "Wolk met trefwoorden/labels" +#: ../../include/ItemObject.php:139 +msgctxt "noun" +msgid "Dislike" +msgid_plural "Dislikes" +msgstr[0] "vindt dit niet leuk" +msgstr[1] "vinden dit niet leuk" -#: ../../include/features.php:72 -msgid "Provide a personal tag cloud on your channel page" -msgstr "Zorgt voor een persoonlijke wolk met trefwoorden of labels op jouw kanaalpagina" +#: ../../include/ItemObject.php:167 +msgid "Add Star" +msgstr "Ster toevoegen" -#: ../../include/notify.php:23 -msgid "created a new post" -msgstr "maakte een nieuw bericht aan" +#: ../../include/ItemObject.php:168 +msgid "Remove Star" +msgstr "Ster verwijderen" -#: ../../include/notify.php:24 -#, php-format -msgid "commented on %s's post" -msgstr "gaf een reactie op een bericht van %s" +#: ../../include/ItemObject.php:169 +msgid "Toggle Star Status" +msgstr "Ster toevoegen of verwijderen" -#: ../../include/apps.php:123 -msgid "Site Admin" -msgstr "Hubbeheerder" +#: ../../include/ItemObject.php:173 +msgid "starred" +msgstr "met ster" -#: ../../include/apps.php:125 -msgid "Address Book" -msgstr "Connecties" +#: ../../include/ItemObject.php:190 +msgid "Add Tag" +msgstr "Label toevoegen" -#: ../../include/apps.php:139 ../../mod/mood.php:131 -msgid "Mood" -msgstr "Stemming" +#: ../../include/ItemObject.php:208 ../../mod/photos.php:980 +msgid "I like this (toggle)" +msgstr "Vind ik leuk" -#: ../../include/apps.php:140 ../../include/conversation.php:945 -msgid "Poke" -msgstr "Aanstoten" +#: ../../include/ItemObject.php:209 ../../mod/photos.php:981 +msgid "I don't like this (toggle)" +msgstr "Vind ik niet leuk" -#: ../../include/apps.php:143 -msgid "Probe" -msgstr "Onderzoeken" +#: ../../include/ItemObject.php:211 +msgid "Share This" +msgstr "Delen" -#: ../../include/apps.php:144 -msgid "Suggest" -msgstr "Voorstellen" +#: ../../include/ItemObject.php:211 +msgid "share" +msgstr "delen" -#: ../../include/apps.php:233 ../../mod/settings.php:79 -#: ../../mod/settings.php:542 -msgid "Update" -msgstr "Bijwerken" +#: ../../include/ItemObject.php:235 ../../include/ItemObject.php:236 +#, php-format +msgid "View %s's profile - %s" +msgstr "Profiel van %s bekijken - %s" -#: ../../include/apps.php:233 -msgid "Install" -msgstr "Installeren" +#: ../../include/ItemObject.php:237 +msgid "to" +msgstr "aan" -#: ../../include/apps.php:238 -msgid "Purchase" -msgstr "Aanschaffen" +#: ../../include/ItemObject.php:238 +msgid "via" +msgstr "via" -#: ../../include/api.php:1016 -msgid "Public Timeline" -msgstr "Openbare tijdlijn" +#: ../../include/ItemObject.php:239 +msgid "Wall-to-Wall" +msgstr "Kanaal-naar-kanaal" -#: ../../include/chat.php:10 -msgid "Missing room name" -msgstr "Naam chatkanaal ontbreekt" +#: ../../include/ItemObject.php:240 +msgid "via Wall-To-Wall:" +msgstr "via kanaal-naar-kanaal" -#: ../../include/chat.php:19 -msgid "Duplicate room name" -msgstr "Naam chatkanaal bestaat al" +#: ../../include/ItemObject.php:274 +msgid "Save Bookmarks" +msgstr "Bladwijzers opslaan" -#: ../../include/chat.php:68 ../../include/chat.php:76 -msgid "Invalid room specifier." -msgstr "Ongeldige omschrijving chatkanaal" +#: ../../include/ItemObject.php:275 +msgid "Add to Calendar" +msgstr "Aan agenda toevoegen" -#: ../../include/chat.php:105 -msgid "Room not found." -msgstr "Chatkanaal niet gevonden" +#: ../../include/ItemObject.php:283 +msgctxt "noun" +msgid "Likes" +msgstr "vinden dit leuk" -#: ../../include/chat.php:126 -msgid "Room is full" -msgstr "Chatkanaal is vol" +#: ../../include/ItemObject.php:284 +msgctxt "noun" +msgid "Dislikes" +msgstr "vinden dit niet leuk" -#: ../../include/conversation.php:126 ../../mod/like.php:89 -msgid "channel" -msgstr "kanaal" - -#: ../../include/conversation.php:164 ../../mod/like.php:331 +#: ../../include/ItemObject.php:315 #, php-format -msgid "%1$s likes %2$s's %3$s" -msgstr "%1$s vindt %3$s van %2$s leuk" +msgid "%d comment" +msgid_plural "%d comments" +msgstr[0] "%d reactie" +msgstr[1] "%d reacties weergeven" -#: ../../include/conversation.php:167 ../../mod/like.php:333 -#, php-format -msgid "%1$s doesn't like %2$s's %3$s" -msgstr "%1$s vindt %3$s van %2$s niet leuk" +#: ../../include/ItemObject.php:316 ../../include/js_strings.php:7 +msgid "[+] show all" +msgstr "[+] alle" -#: ../../include/conversation.php:204 -#, php-format -msgid "%1$s is now connected with %2$s" -msgstr "%1$s is nu met %2$s verbonden" +#: ../../include/ItemObject.php:580 ../../mod/photos.php:999 +#: ../../mod/photos.php:1086 +msgid "This is you" +msgstr "Dit ben jij" -#: ../../include/conversation.php:239 -#, php-format -msgid "%1$s poked %2$s" -msgstr "%1$s heeft %2$s aangestoten" +#: ../../include/ItemObject.php:582 ../../include/js_strings.php:6 +#: ../../mod/photos.php:1001 ../../mod/photos.php:1088 +msgid "Comment" +msgstr "Reactie" -#: ../../include/conversation.php:261 ../../mod/mood.php:63 -#, php-format -msgctxt "mood" -msgid "%1$s is %2$s" -msgstr "%1$s is %2$s" +#: ../../include/ItemObject.php:583 ../../mod/mood.php:135 +#: ../../mod/settings.php:517 ../../mod/settings.php:629 +#: ../../mod/settings.php:657 ../../mod/settings.php:681 +#: ../../mod/settings.php:754 ../../mod/settings.php:934 +#: ../../mod/poke.php:166 ../../mod/profiles.php:589 ../../mod/chat.php:177 +#: ../../mod/chat.php:211 ../../mod/connect.php:92 ../../mod/connedit.php:518 +#: ../../mod/setup.php:307 ../../mod/setup.php:350 ../../mod/pdledit.php:58 +#: ../../mod/photos.php:563 ../../mod/photos.php:674 ../../mod/photos.php:962 +#: ../../mod/photos.php:1002 ../../mod/photos.php:1089 +#: ../../mod/sources.php:104 ../../mod/sources.php:138 +#: ../../mod/events.php:511 ../../mod/filestorage.php:137 +#: ../../mod/fsuggest.php:108 ../../mod/group.php:81 ../../mod/admin.php:451 +#: ../../mod/admin.php:760 ../../mod/admin.php:895 ../../mod/admin.php:1028 +#: ../../mod/admin.php:1227 ../../mod/admin.php:1314 ../../mod/thing.php:286 +#: ../../mod/thing.php:329 ../../mod/import.php:393 ../../mod/invite.php:142 +#: ../../mod/mail.php:345 ../../mod/appman.php:99 ../../mod/poll.php:68 +#: ../../mod/frphotos.php:84 ../../view/theme/apw/php/config.php:256 +#: ../../view/theme/blogga/php/config.php:67 +#: ../../view/theme/blogga/view/theme/blog/config.php:67 +#: ../../view/theme/redbasic/php/config.php:99 +msgid "Submit" +msgstr "Opslaan" -#: ../../include/conversation.php:669 -#, php-format -msgid "View %s's profile @ %s" -msgstr "Bekijk het profiel van %s @ %s" +#: ../../include/ItemObject.php:584 +msgid "Bold" +msgstr "Vet" -#: ../../include/conversation.php:683 -msgid "Categories:" -msgstr "Categorieën:" +#: ../../include/ItemObject.php:585 +msgid "Italic" +msgstr "Cursief" -#: ../../include/conversation.php:684 -msgid "Filed under:" -msgstr "Bewaard onder:" +#: ../../include/ItemObject.php:586 +msgid "Underline" +msgstr "Onderstrepen" -#: ../../include/conversation.php:712 -msgid "View in context" -msgstr "In context bekijken" +#: ../../include/ItemObject.php:587 +msgid "Quote" +msgstr "Citeren" -#: ../../include/conversation.php:841 -msgid "remove" -msgstr "verwijderen" +#: ../../include/ItemObject.php:588 +msgid "Code" +msgstr "Broncode" -#: ../../include/conversation.php:845 -msgid "Loading..." -msgstr "Aan het laden..." +#: ../../include/ItemObject.php:589 +msgid "Image" +msgstr "Afbeelding" -#: ../../include/conversation.php:846 -msgid "Delete Selected Items" -msgstr "Verwijder de geselecteerde items" +#: ../../include/ItemObject.php:590 +msgid "Link" +msgstr "Link" -#: ../../include/conversation.php:937 -msgid "View Source" -msgstr "Bron weergeven" +#: ../../include/ItemObject.php:591 +msgid "Video" +msgstr "Video" -#: ../../include/conversation.php:938 -msgid "Follow Thread" -msgstr "Conversatie volgen" +#: ../../include/js_strings.php:5 +msgid "Delete this item?" +msgstr "Dit item verwijderen?" -#: ../../include/conversation.php:939 -msgid "View Status" -msgstr "Status weergeven" +#: ../../include/js_strings.php:8 +msgid "[-] show less" +msgstr "[-] minder reacties weergeven" -#: ../../include/conversation.php:941 -msgid "View Photos" -msgstr "Foto's weergeven" +#: ../../include/js_strings.php:9 +msgid "[+] expand" +msgstr "[+] uitklappen" -#: ../../include/conversation.php:942 -msgid "Matrix Activity" -msgstr "Activiteit in de Matrix" +#: ../../include/js_strings.php:10 +msgid "[-] collapse" +msgstr "[-] inklappen" -#: ../../include/conversation.php:943 -msgid "Edit Contact" -msgstr "Contact bewerken" +#: ../../include/js_strings.php:11 +msgid "Password too short" +msgstr "Wachtwoord te kort" -#: ../../include/conversation.php:944 -msgid "Send PM" -msgstr "Privébericht verzenden" +#: ../../include/js_strings.php:12 +msgid "Passwords do not match" +msgstr "Wachtwoorden komen niet overeen" -#: ../../include/conversation.php:1001 -#, php-format -msgid "%s likes this." -msgstr "%s vindt dit leuk." +#: ../../include/js_strings.php:13 ../../mod/photos.php:39 +msgid "everybody" +msgstr "iedereen" -#: ../../include/conversation.php:1001 -#, php-format -msgid "%s doesn't like this." -msgstr "%s vindt dit niet leuk." +#: ../../include/js_strings.php:14 +msgid "Secret Passphrase" +msgstr "Geheim wachtwoord" -#: ../../include/conversation.php:1005 -#, php-format -msgid "%2$d people like this." -msgid_plural "%2$d people like this." -msgstr[0] "%2$d persoon vindt dit leuk." -msgstr[1] "%2$d personen vinden dit leuk." +#: ../../include/js_strings.php:15 +msgid "Passphrase hint" +msgstr "Wachtwoordhint" -#: ../../include/conversation.php:1007 -#, php-format -msgid "%2$d people don't like this." -msgid_plural "%2$d people don't like this." -msgstr[0] "%2$d persoon vindt dit niet leuk." -msgstr[1] "%2$d personen vinden dit niet leuk." +#: ../../include/js_strings.php:16 +msgid "Notice: Permissions have changed but have not yet been submitted." +msgstr "Mededeling: de privacy-rechten zijn veranderd, maar zijn nog niet opgeslagen." -#: ../../include/conversation.php:1013 -msgid "and" -msgstr "en" +#: ../../include/js_strings.php:17 +msgid "close all" +msgstr "Alles sluiten" -#: ../../include/conversation.php:1016 -#, php-format -msgid ", and %d other people" -msgid_plural ", and %d other people" -msgstr[0] ", en %d ander persoon" -msgstr[1] ", en %d andere personen" +#: ../../include/js_strings.php:19 +msgid "timeago.prefixAgo" +msgstr "timeago.prefixAgo" -#: ../../include/conversation.php:1017 -#, php-format -msgid "%s like this." -msgstr "%s vinden dit leuk." +#: ../../include/js_strings.php:20 +msgid "timeago.prefixFromNow" +msgstr "timeago.prefixFromNow" -#: ../../include/conversation.php:1017 -#, php-format -msgid "%s don't like this." -msgstr "%s vinden dit niet leuk." +#: ../../include/js_strings.php:21 +msgid "ago" +msgstr "geleden" -#: ../../include/conversation.php:1074 -msgid "Visible to everybody" -msgstr "Voor iedereen zichtbaar" +#: ../../include/js_strings.php:22 +msgid "from now" +msgstr "vanaf nu" -#: ../../include/conversation.php:1075 ../../mod/mail.php:167 -#: ../../mod/mail.php:279 -msgid "Please enter a link URL:" -msgstr "Vul een internetadres/URL in:" +#: ../../include/js_strings.php:23 +msgid "less than a minute" +msgstr "minder dan een minuut" -#: ../../include/conversation.php:1076 -msgid "Please enter a video link/URL:" -msgstr "Vul een videolink/URL in:" +#: ../../include/js_strings.php:24 +msgid "about a minute" +msgstr "ongeveer een minuut" -#: ../../include/conversation.php:1077 -msgid "Please enter an audio link/URL:" -msgstr "Vul een audiolink/URL in:" +#: ../../include/js_strings.php:25 +#, php-format +msgid "%d minutes" +msgstr "%d minuten" -#: ../../include/conversation.php:1078 -msgid "Tag term:" -msgstr "Label:" +#: ../../include/js_strings.php:26 +msgid "about an hour" +msgstr "ongeveer een uur" -#: ../../include/conversation.php:1079 ../../mod/filer.php:49 -msgid "Save to Folder:" -msgstr "Bewaar in map: " +#: ../../include/js_strings.php:27 +#, php-format +msgid "about %d hours" +msgstr "ongeveer %d uren" -#: ../../include/conversation.php:1080 -msgid "Where are you right now?" -msgstr "Waar bevind je je op dit moment?" +#: ../../include/js_strings.php:28 +msgid "a day" +msgstr "een dag" -#: ../../include/conversation.php:1081 ../../mod/editpost.php:52 -#: ../../mod/mail.php:168 ../../mod/mail.php:280 -msgid "Expires YYYY-MM-DD HH:MM" -msgstr "Verloopt op DD-MM-YYYY om HH:MM" +#: ../../include/js_strings.php:29 +#, php-format +msgid "%d days" +msgstr "%d dagen" -#: ../../include/conversation.php:1105 ../../mod/photos.php:976 -#: ../../mod/layouts.php:113 -msgid "Share" -msgstr "Delen" +#: ../../include/js_strings.php:30 +msgid "about a month" +msgstr "ongeveer een maand" -#: ../../include/conversation.php:1107 ../../mod/editwebpage.php:139 -msgid "Page link title" -msgstr "Titel van paginalink" +#: ../../include/js_strings.php:31 +#, php-format +msgid "%d months" +msgstr "%d maanden" -#: ../../include/conversation.php:1110 -msgid "Post as" -msgstr "Bericht plaatsen als" +#: ../../include/js_strings.php:32 +msgid "about a year" +msgstr "ongeveer een jaar" -#: ../../include/conversation.php:1111 ../../mod/editpost.php:113 -#: ../../mod/editwebpage.php:144 ../../mod/mail.php:228 ../../mod/mail.php:342 -#: ../../mod/editblock.php:112 ../../mod/editlayout.php:107 -msgid "Upload photo" -msgstr "Foto uploaden" - -#: ../../include/conversation.php:1112 -msgid "upload photo" -msgstr "foto uploaden" +#: ../../include/js_strings.php:33 +#, php-format +msgid "%d years" +msgstr "%d jaren" -#: ../../include/conversation.php:1113 ../../mod/editpost.php:114 -#: ../../mod/editwebpage.php:145 ../../mod/mail.php:229 ../../mod/mail.php:343 -#: ../../mod/editblock.php:113 ../../mod/editlayout.php:108 -msgid "Attach file" -msgstr "Bestand toevoegen" +#: ../../include/js_strings.php:34 +msgid " " +msgstr " " -#: ../../include/conversation.php:1114 -msgid "attach file" -msgstr "bestand toevoegen" +#: ../../include/js_strings.php:35 +msgid "timeago.numbers" +msgstr "timeago.numbers" -#: ../../include/conversation.php:1115 ../../mod/editpost.php:115 -#: ../../mod/editwebpage.php:146 ../../mod/mail.php:230 ../../mod/mail.php:344 -#: ../../mod/editblock.php:114 ../../mod/editlayout.php:109 -msgid "Insert web link" -msgstr "Weblink invoegen" +#: ../../include/Contact.php:123 +msgid "New window" +msgstr "Nieuw venster" -#: ../../include/conversation.php:1116 -msgid "web link" -msgstr "Weblink" +#: ../../include/Contact.php:124 +msgid "Open the selected location in a different window or browser tab" +msgstr "Open de geselecteerde locatie in een ander venster of tab" -#: ../../include/conversation.php:1117 -msgid "Insert video link" -msgstr "Videolink invoegen" +#: ../../include/profile_selectors.php:6 +#: ../../include/profile_selectors.php:23 +msgid "Male" +msgstr "Man" -#: ../../include/conversation.php:1118 -msgid "video link" -msgstr "videolink" +#: ../../include/profile_selectors.php:6 +#: ../../include/profile_selectors.php:23 +msgid "Female" +msgstr "Vrouw" -#: ../../include/conversation.php:1119 -msgid "Insert audio link" -msgstr "Audiolink invoegen" +#: ../../include/profile_selectors.php:6 +msgid "Currently Male" +msgstr "Momenteel man" -#: ../../include/conversation.php:1120 -msgid "audio link" -msgstr "audiolink" +#: ../../include/profile_selectors.php:6 +msgid "Currently Female" +msgstr "Momenteel vrouw" -#: ../../include/conversation.php:1121 ../../mod/editpost.php:119 -#: ../../mod/editwebpage.php:150 ../../mod/editblock.php:118 -#: ../../mod/editlayout.php:113 -msgid "Set your location" -msgstr "Locatie instellen" +#: ../../include/profile_selectors.php:6 +msgid "Mostly Male" +msgstr "Voornamelijk man" -#: ../../include/conversation.php:1122 -msgid "set location" -msgstr "locatie instellen" +#: ../../include/profile_selectors.php:6 +msgid "Mostly Female" +msgstr "Voornamelijk vrouw" -#: ../../include/conversation.php:1123 ../../mod/editpost.php:120 -#: ../../mod/editwebpage.php:151 ../../mod/editblock.php:119 -#: ../../mod/editlayout.php:114 -msgid "Clear browser location" -msgstr "Locatie van webbrowser wissen" +#: ../../include/profile_selectors.php:6 +msgid "Transgender" +msgstr "Transgender" -#: ../../include/conversation.php:1124 -msgid "clear location" -msgstr "locatie wissen" +#: ../../include/profile_selectors.php:6 +msgid "Intersex" +msgstr "Interseksueel" -#: ../../include/conversation.php:1126 ../../mod/editpost.php:132 -#: ../../mod/editwebpage.php:167 ../../mod/editblock.php:132 -#: ../../mod/editlayout.php:126 -msgid "Set title" -msgstr "Titel instellen" +#: ../../include/profile_selectors.php:6 +msgid "Transsexual" +msgstr "Transseksueel" -#: ../../include/conversation.php:1129 ../../mod/editpost.php:134 -#: ../../mod/editwebpage.php:169 ../../mod/editblock.php:135 -#: ../../mod/editlayout.php:129 -msgid "Categories (comma-separated list)" -msgstr "Categorieën (door komma's gescheiden lijst)" +#: ../../include/profile_selectors.php:6 +msgid "Hermaphrodite" +msgstr "Hermafrodiet" -#: ../../include/conversation.php:1131 ../../mod/editpost.php:122 -#: ../../mod/editwebpage.php:153 ../../mod/editblock.php:121 -#: ../../mod/editlayout.php:116 -msgid "Permission settings" -msgstr "Privacy-rechten" +#: ../../include/profile_selectors.php:6 +msgid "Neuter" +msgstr "Genderneutraal" -#: ../../include/conversation.php:1132 -msgid "permissions" -msgstr "privacy-rechten" +#: ../../include/profile_selectors.php:6 +msgid "Non-specific" +msgstr "Niet gespecificeerd" -#: ../../include/conversation.php:1139 ../../mod/editpost.php:129 -#: ../../mod/editwebpage.php:162 ../../mod/editblock.php:129 -#: ../../mod/editlayout.php:123 -msgid "Public post" -msgstr "Openbaar bericht" +#: ../../include/profile_selectors.php:6 +#: ../../include/profile_selectors.php:23 +#: ../../include/profile_selectors.php:61 +#: ../../include/profile_selectors.php:97 +msgid "Other" +msgstr "Anders" -#: ../../include/conversation.php:1141 ../../mod/editpost.php:135 -#: ../../mod/editwebpage.php:170 ../../mod/editblock.php:136 -#: ../../mod/editlayout.php:130 -msgid "Example: bob@example.com, mary@example.com" -msgstr "Voorbeeld: bob@voorbeeld.nl, mary@voorbeeld.be" +#: ../../include/profile_selectors.php:6 +msgid "Undecided" +msgstr "Nog niet beslist" -#: ../../include/conversation.php:1154 ../../mod/editpost.php:146 -#: ../../mod/editwebpage.php:179 ../../mod/mail.php:235 ../../mod/mail.php:349 -#: ../../mod/editblock.php:146 ../../mod/editlayout.php:140 -msgid "Set expiration date" -msgstr "Verloopdatum instellen" +#: ../../include/profile_selectors.php:42 +#: ../../include/profile_selectors.php:61 +msgid "Males" +msgstr "Mannen" -#: ../../include/conversation.php:1158 ../../mod/editpost.php:150 -msgid "OK" -msgstr "OK" +#: ../../include/profile_selectors.php:42 +#: ../../include/profile_selectors.php:61 +msgid "Females" +msgstr "Vrouwen" -#: ../../include/conversation.php:1159 ../../mod/settings.php:517 -#: ../../mod/settings.php:543 ../../mod/fbrowser.php:82 -#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:151 -#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 -msgid "Cancel" -msgstr "Annuleren" +#: ../../include/profile_selectors.php:42 +msgid "Gay" +msgstr "Homoseksueel" -#: ../../include/conversation.php:1401 -msgid "Discover" -msgstr "Ontdekken" +#: ../../include/profile_selectors.php:42 +msgid "Lesbian" +msgstr "Lesbisch" -#: ../../include/conversation.php:1404 -msgid "Imported public streams" -msgstr "Openbare streams importeren" +#: ../../include/profile_selectors.php:42 +msgid "No Preference" +msgstr "Geen voorkeur" -#: ../../include/conversation.php:1409 -msgid "Commented Order" -msgstr "Nieuwe reacties bovenaan" +#: ../../include/profile_selectors.php:42 +msgid "Bisexual" +msgstr "Biseksueel" -#: ../../include/conversation.php:1412 -msgid "Sort by Comment Date" -msgstr "Berichten met nieuwe reacties bovenaan" +#: ../../include/profile_selectors.php:42 +msgid "Autosexual" +msgstr "Autoseksueel" -#: ../../include/conversation.php:1416 -msgid "Posted Order" -msgstr "Nieuwe berichten bovenaan" +#: ../../include/profile_selectors.php:42 +msgid "Abstinent" +msgstr "Seksuele onthouding" -#: ../../include/conversation.php:1419 -msgid "Sort by Post Date" -msgstr "Nieuwe berichten bovenaan" +#: ../../include/profile_selectors.php:42 +msgid "Virgin" +msgstr "Maagd" -#: ../../include/conversation.php:1424 ../../include/widgets.php:82 -msgid "Personal" -msgstr "Persoonlijk" +#: ../../include/profile_selectors.php:42 +msgid "Deviant" +msgstr "Afwijkend" -#: ../../include/conversation.php:1427 -msgid "Posts that mention or involve you" -msgstr "Alleen berichten die jou vermelden of waar je op een andere manier bij betrokken bent" +#: ../../include/profile_selectors.php:42 +msgid "Fetish" +msgstr "Fetisj" -#: ../../include/conversation.php:1433 ../../mod/connections.php:211 -#: ../../mod/connections.php:224 ../../mod/menu.php:61 -msgid "New" -msgstr "Nieuw" +#: ../../include/profile_selectors.php:42 +msgid "Oodles" +msgstr "Veel" -#: ../../include/conversation.php:1436 -msgid "Activity Stream - by date" -msgstr "Activiteitenstroom - volgens datum" +#: ../../include/profile_selectors.php:42 +msgid "Nonsexual" +msgstr "Aseksueel" -#: ../../include/conversation.php:1442 -msgid "Starred" -msgstr "Met ster" +#: ../../include/profile_selectors.php:80 +#: ../../include/profile_selectors.php:97 +msgid "Single" +msgstr "Alleen" -#: ../../include/conversation.php:1445 -msgid "Favourite Posts" -msgstr "Favoriete berichten" +#: ../../include/profile_selectors.php:80 +msgid "Lonely" +msgstr "Eenzaam" -#: ../../include/conversation.php:1452 -msgid "Spam" -msgstr "Spam" +#: ../../include/profile_selectors.php:80 +msgid "Available" +msgstr "Beschikbaar" -#: ../../include/conversation.php:1455 -msgid "Posts flagged as SPAM" -msgstr "Berichten gemarkeerd als SPAM" +#: ../../include/profile_selectors.php:80 +msgid "Unavailable" +msgstr "Niet beschikbaar" -#: ../../include/conversation.php:1491 ../../mod/admin.php:892 -msgid "Channel" -msgstr "Kanaal" +#: ../../include/profile_selectors.php:80 +msgid "Has crush" +msgstr "Heeft een oogje op iemand" -#: ../../include/conversation.php:1494 -msgid "Status Messages and Posts" -msgstr "Berichten in dit kanaal" +#: ../../include/profile_selectors.php:80 +msgid "Infatuated" +msgstr "Smoorverliefd" -#: ../../include/conversation.php:1503 -msgid "About" -msgstr "Over" +#: ../../include/profile_selectors.php:80 +#: ../../include/profile_selectors.php:97 +msgid "Dating" +msgstr "Aan het daten" -#: ../../include/conversation.php:1506 -msgid "Profile Details" -msgstr "Profiel" +#: ../../include/profile_selectors.php:80 +msgid "Unfaithful" +msgstr "Ontrouw" -#: ../../include/conversation.php:1524 -msgid "Files and Storage" -msgstr "Bestanden en opslagruimte" +#: ../../include/profile_selectors.php:80 +msgid "Sex Addict" +msgstr "Seksverslaafd" -#: ../../include/conversation.php:1533 ../../include/conversation.php:1536 -msgid "Chatrooms" -msgstr "Chatkanalen" +#: ../../include/profile_selectors.php:80 +msgid "Friends/Benefits" +msgstr "Vriendschap plus" -#: ../../include/conversation.php:1546 -msgid "Saved Bookmarks" -msgstr "Opgeslagen bladwijzers" +#: ../../include/profile_selectors.php:80 +msgid "Casual" +msgstr "Ongebonden/vluchtig" -#: ../../include/conversation.php:1557 -msgid "Manage Webpages" -msgstr "Webpagina's beheren" +#: ../../include/profile_selectors.php:80 +msgid "Engaged" +msgstr "Verloofd" -#: ../../include/acl_selectors.php:240 -msgid "Visible to your default audience" -msgstr "Voor iedereen zichtbaar, zoals dit van te voren is ingesteld" +#: ../../include/profile_selectors.php:80 +#: ../../include/profile_selectors.php:97 +msgid "Married" +msgstr "Getrouwd" -#: ../../include/acl_selectors.php:241 -msgid "Show" -msgstr "Tonen" +#: ../../include/profile_selectors.php:80 +msgid "Imaginarily married" +msgstr "Denkbeeldig getrouwd" -#: ../../include/acl_selectors.php:242 -msgid "Don't show" -msgstr "Niet tonen" +#: ../../include/profile_selectors.php:80 +msgid "Partners" +msgstr "Partners" -#: ../../include/acl_selectors.php:248 ../../mod/filestorage.php:128 -#: ../../mod/photos.php:604 ../../mod/photos.php:952 ../../mod/chat.php:209 -msgid "Permissions" -msgstr "Privacy-rechten" +#: ../../include/profile_selectors.php:80 +#: ../../include/profile_selectors.php:97 +msgid "Cohabiting" +msgstr "Samenwonend" -#: ../../include/widgets.php:80 -msgid "System" -msgstr "Systeem" +#: ../../include/profile_selectors.php:80 +msgid "Common law" +msgstr "Common-law-huwelijk" -#: ../../include/widgets.php:83 -msgid "Create Personal App" -msgstr "Persoonlijke app maken" +#: ../../include/profile_selectors.php:80 +msgid "Happy" +msgstr "Gelukkig" -#: ../../include/widgets.php:84 -msgid "Edit Personal App" -msgstr "Persoonlijke app bewerken" +#: ../../include/profile_selectors.php:80 +msgid "Not looking" +msgstr "Niet op zoek" -#: ../../include/widgets.php:130 ../../mod/suggest.php:53 -msgid "Ignore/Hide" -msgstr "Negeren/Verbergen" +#: ../../include/profile_selectors.php:80 +msgid "Swinger" +msgstr "Swinger" -#: ../../include/widgets.php:136 ../../mod/connections.php:267 -msgid "Suggestions" -msgstr "Voorgestelde kanalen" +#: ../../include/profile_selectors.php:80 +msgid "Betrayed" +msgstr "Verraden" -#: ../../include/widgets.php:137 -msgid "See more..." -msgstr "Meer..." +#: ../../include/profile_selectors.php:80 +#: ../../include/profile_selectors.php:97 +msgid "Separated" +msgstr "Uit elkaar" -#: ../../include/widgets.php:159 -#, php-format -msgid "You have %1$.0f of %2$.0f allowed connections." -msgstr "Je hebt %1$.0f van de %2$.0f toegestane connecties." +#: ../../include/profile_selectors.php:80 +msgid "Unstable" +msgstr "Onstabiel" -#: ../../include/widgets.php:165 -msgid "Add New Connection" -msgstr "Nieuwe connectie toevoegen" +#: ../../include/profile_selectors.php:80 +#: ../../include/profile_selectors.php:97 +msgid "Divorced" +msgstr "Gescheiden" -#: ../../include/widgets.php:166 -msgid "Enter the channel address" -msgstr "Vul het adres van het nieuwe kanaal in" +#: ../../include/profile_selectors.php:80 +msgid "Imaginarily divorced" +msgstr "Denkbeeldig gescheiden" -#: ../../include/widgets.php:167 -msgid "Example: bob@example.com, http://example.com/barbara" -msgstr "Voorbeeld: bob@example.com, http://example.com/barbara" +#: ../../include/profile_selectors.php:80 +#: ../../include/profile_selectors.php:97 +msgid "Widowed" +msgstr "Weduwnaar/weduwe" -#: ../../include/widgets.php:184 -msgid "Notes" -msgstr "Aantekeningen" +#: ../../include/profile_selectors.php:80 +msgid "Uncertain" +msgstr "Onzeker" -#: ../../include/widgets.php:256 -msgid "Remove term" -msgstr "Verwijder zoekterm" +#: ../../include/profile_selectors.php:80 +#: ../../include/profile_selectors.php:97 +msgid "It's complicated" +msgstr "Het is ingewikkeld" -#: ../../include/widgets.php:335 -msgid "Archives" -msgstr "Archieven" +#: ../../include/profile_selectors.php:80 +msgid "Don't care" +msgstr "Maakt mij niks uit" -#: ../../include/widgets.php:397 -msgid "Refresh" -msgstr "Vernieuwen" +#: ../../include/profile_selectors.php:80 +msgid "Ask me" +msgstr "Vraag het me" -#: ../../include/widgets.php:398 ../../mod/connedit.php:470 -msgid "Me" -msgstr "Ik" +#: ../../include/auth.php:90 +msgid "Logged out." +msgstr "Uitgelogd." -#: ../../include/widgets.php:399 ../../mod/connedit.php:472 -msgid "Best Friends" -msgstr "Goede vrienden" +#: ../../include/auth.php:236 +msgid "Failed authentication" +msgstr "Mislukte authenticatie" -#: ../../include/widgets.php:401 -msgid "Co-workers" -msgstr "Collega's" +#: ../../include/auth.php:251 ../../mod/openid.php:188 +msgid "Login failed." +msgstr "Inloggen mislukt." -#: ../../include/widgets.php:402 ../../mod/connedit.php:474 -msgid "Former Friends" -msgstr "Oude vrienden" +#: ../../include/permissions.php:13 +msgid "Can view my normal stream and posts" +msgstr "Kan mijn normale kanaalstream en berichten bekijken" -#: ../../include/widgets.php:403 ../../mod/connedit.php:475 -msgid "Acquaintances" -msgstr "Kennissen" +#: ../../include/permissions.php:14 +msgid "Can view my default channel profile" +msgstr "Kan mijn standaard kanaalprofiel bekijken" -#: ../../include/widgets.php:404 -msgid "Everybody" -msgstr "Iedereen" +#: ../../include/permissions.php:15 +msgid "Can view my photo albums" +msgstr "Kan mijn fotoalbums bekijken" -#: ../../include/widgets.php:436 -msgid "Account settings" -msgstr "Account" +#: ../../include/permissions.php:16 +msgid "Can view my connections" +msgstr "Kan een lijst met mijn connecties bekijken" -#: ../../include/widgets.php:442 -msgid "Channel settings" -msgstr "Kanaal" +#: ../../include/permissions.php:17 +msgid "Can view my file storage" +msgstr "Kan mijn bestanden bekijken" -#: ../../include/widgets.php:448 -msgid "Additional features" -msgstr "Extra functies" +#: ../../include/permissions.php:18 +msgid "Can view my webpages" +msgstr "Kan mijn pagina's bekijken" -#: ../../include/widgets.php:454 -msgid "Feature settings" -msgstr "Plug-ins" +#: ../../include/permissions.php:21 +msgid "Can send me their channel stream and posts" +msgstr "Kan mij de inhoud van hun kanaal en berichten sturen" -#: ../../include/widgets.php:460 -msgid "Display settings" -msgstr "Weergave" +#: ../../include/permissions.php:22 +msgid "Can post on my channel page (\"wall\")" +msgstr "Kan een bericht in mijn kanaal plaatsen" -#: ../../include/widgets.php:466 -msgid "Connected apps" -msgstr "Verbonden applicaties" +#: ../../include/permissions.php:23 +msgid "Can comment on or like my posts" +msgstr "Kan op mijn berichten reageren of deze (niet) leuk vinden" -#: ../../include/widgets.php:472 -msgid "Export channel" -msgstr "Kanaal exporteren" +#: ../../include/permissions.php:24 +msgid "Can send me private mail messages" +msgstr "Kan mij privéberichten sturen" -#: ../../include/widgets.php:484 -msgid "Automatic Permissions (Advanced)" -msgstr "Automatische privacy-rechten (geavanceerd)" +#: ../../include/permissions.php:25 +msgid "Can post photos to my photo albums" +msgstr "Kan foto's aan mijn fotoalbums toevoegen" -#: ../../include/widgets.php:494 -msgid "Premium Channel Settings" -msgstr "Instellingen premiumkanaal" +#: ../../include/permissions.php:26 +msgid "Can like/dislike stuff" +msgstr "Kan dingen leuk of niet leuk vinden" -#: ../../include/widgets.php:531 -msgid "Check Mail" -msgstr "Controleer op nieuwe berichten" +#: ../../include/permissions.php:26 +msgid "Profiles and things other than posts/comments" +msgstr "Profielen en dingen, buiten berichten en reacties" -#: ../../include/widgets.php:612 -msgid "Chat Rooms" -msgstr "Chatkanalen" +#: ../../include/permissions.php:28 +msgid "Can forward to all my channel contacts via post @mentions" +msgstr "Kan naar al mijn kanaalconnecties berichten doorsturen met behulp van @vermeldingen+" -#: ../../include/widgets.php:630 -msgid "Bookmarked Chatrooms" -msgstr "Bladwijzers van chatkanalen" +#: ../../include/permissions.php:28 +msgid "Advanced - useful for creating group forum channels" +msgstr "Geavanceerd - nuttig voor kanalen met een groep- cq. forumfunctie" -#: ../../include/widgets.php:648 -msgid "Suggested Chatrooms" -msgstr "Voorgestelde chatkanalen" +#: ../../include/permissions.php:29 +msgid "Can chat with me (when available)" +msgstr "Kan met mij chatten (wanneer beschikbaar)" -#: ../../include/follow.php:23 -msgid "Channel is blocked on this site." -msgstr "Kanaal is op deze hub geblokkeerd." +#: ../../include/permissions.php:30 +msgid "Can write to my file storage" +msgstr "Kan bestanden aan mijn bestandsopslag toevoegen" -#: ../../include/follow.php:28 -msgid "Channel location missing." -msgstr "Ontbrekende kanaallocatie." +#: ../../include/permissions.php:31 +msgid "Can edit my webpages" +msgstr "Kan mijn pagina's bewerken" -#: ../../include/follow.php:54 -msgid "Response from remote channel was incomplete." -msgstr "Antwoord van het kanaal op afstand was niet volledig." +#: ../../include/permissions.php:33 +msgid "Can source my public posts in derived channels" +msgstr "Kan mijn openbare berichten als bron voor andere kanalen gebruiken" -#: ../../include/follow.php:85 -msgid "Channel was deleted and no longer exists." -msgstr "Kanaal is verwijderd en bestaat niet meer." +#: ../../include/permissions.php:33 +msgid "Somewhat advanced - very useful in open communities" +msgstr "Enigszins geavanceerd (erg nuttig voor kanalen van forums/groepen)" -#: ../../include/follow.php:132 -msgid "Channel discovery failed." -msgstr "Kanaal ontdekken mislukt." +#: ../../include/permissions.php:35 +msgid "Can administer my channel resources" +msgstr "Kan mijn kanaal beheren" -#: ../../include/follow.php:149 -msgid "local account not found." -msgstr "lokale account niet gevonden." +#: ../../include/permissions.php:35 +msgid "" +"Extremely advanced. Leave this alone unless you know what you are doing" +msgstr "Zeer geavanceerd. Laat dit met rust, behalve als je weet wat je doet." -#: ../../include/follow.php:158 -msgid "Cannot connect to yourself." -msgstr "Kan niet met jezelf verbinden" +#: ../../mod/mood.php:132 +msgid "Set your current mood and tell your friends" +msgstr "Noteer je huidige stemming en toon het aan je connecties" -#: ../../include/plugin.php:504 ../../include/plugin.php:506 -msgid "Click here to upgrade." -msgstr "Klik hier om te upgraden." +#: ../../mod/mitem.php:14 ../../mod/menu.php:92 +msgid "Menu not found." +msgstr "Menu niet gevonden." -#: ../../include/plugin.php:512 -msgid "This action exceeds the limits set by your subscription plan." -msgstr "Deze handeling overschrijdt de beperkingen die voor jouw abonnement gelden." +#: ../../mod/mitem.php:47 +msgid "Menu element updated." +msgstr "Menu-onderdeel geüpdatet." -#: ../../include/plugin.php:517 -msgid "This action is not available under your subscription plan." -msgstr "Deze handeling is niet mogelijk met jouw abonnement." +#: ../../mod/mitem.php:51 +msgid "Unable to update menu element." +msgstr "Menu-onderdeel kan niet worden geüpdatet." -#: ../../mod/post.php:229 -msgid "" -"Remote authentication blocked. You are logged into this site locally. Please" -" logout and retry." -msgstr "Authenticatie op afstand geblokkeerd. Je bent lokaal op deze hub ingelogd. Uitloggen en opnieuw proberen." +#: ../../mod/mitem.php:57 +msgid "Menu element added." +msgstr "Menu-onderdeel toegevoegd" -#: ../../mod/post.php:261 ../../mod/openid.php:72 ../../mod/openid.php:178 -#, php-format -msgid "Welcome %s. Remote authentication successful." -msgstr "Welkom %s. Authenticatie op afstand geslaagd." +#: ../../mod/mitem.php:61 +msgid "Unable to add menu element." +msgstr "Menu-onderdeel kan niet worden toegevoegd." + +#: ../../mod/mitem.php:78 ../../mod/dirprofile.php:175 ../../mod/menu.php:120 +#: ../../mod/xchan.php:27 +msgid "Not found." +msgstr "Niet gevonden." + +#: ../../mod/mitem.php:96 +msgid "Manage Menu Elements" +msgstr "Menu-onderdelen beheren" + +#: ../../mod/mitem.php:99 +msgid "Edit menu" +msgstr "Menu bewerken" + +#: ../../mod/mitem.php:102 +msgid "Edit element" +msgstr "Onderdeel bewerken" + +#: ../../mod/mitem.php:103 +msgid "Drop element" +msgstr "Onderdeel verwijderen" + +#: ../../mod/mitem.php:104 +msgid "New element" +msgstr "Nieuw element" + +#: ../../mod/mitem.php:105 +msgid "Edit this menu container" +msgstr "Deze menu-container bewerken" + +#: ../../mod/mitem.php:106 +msgid "Add menu element" +msgstr "Menu-element toevoegen" + +#: ../../mod/mitem.php:107 +msgid "Delete this menu item" +msgstr "Dit menu-item verwijderen" + +#: ../../mod/mitem.php:108 +msgid "Edit this menu item" +msgstr "Dit menu-item bewerken" + +#: ../../mod/mitem.php:131 +msgid "New Menu Element" +msgstr "Nieuw menu-element" + +#: ../../mod/mitem.php:133 ../../mod/mitem.php:176 +msgid "Menu Item Permissions" +msgstr "Privacy-rechten menu-item" + +#: ../../mod/mitem.php:134 ../../mod/mitem.php:177 ../../mod/settings.php:967 +msgid "(click to open/close)" +msgstr "(klik om te openen/sluiten)" + +#: ../../mod/mitem.php:136 ../../mod/mitem.php:180 +msgid "Link text" +msgstr "Linktekst" + +#: ../../mod/mitem.php:137 ../../mod/mitem.php:181 +msgid "URL of link" +msgstr "URL of link" + +#: ../../mod/mitem.php:138 ../../mod/mitem.php:182 +msgid "Use Red magic-auth if available" +msgstr "Gebruik Reds magische authenticatie wanneer aanwezig" + +#: ../../mod/mitem.php:139 ../../mod/mitem.php:183 +msgid "Open link in new window" +msgstr "Open link in nieuw venster" + +#: ../../mod/mitem.php:141 ../../mod/mitem.php:185 +msgid "Order in list" +msgstr "Volgorde in lijst" + +#: ../../mod/mitem.php:141 ../../mod/mitem.php:185 +msgid "Higher numbers will sink to bottom of listing" +msgstr "Hogere nummers komen onderaan de lijst terecht" + +#: ../../mod/mitem.php:154 +msgid "Menu item not found." +msgstr "Menu-item niet gevonden." + +#: ../../mod/mitem.php:163 +msgid "Menu item deleted." +msgstr "Menu-item verwijderd." + +#: ../../mod/mitem.php:165 +msgid "Menu item could not be deleted." +msgstr "Menu-item kon niet worden verwijderd." + +#: ../../mod/mitem.php:174 +msgid "Edit Menu Element" +msgstr "Menu-element bewerken" + +#: ../../mod/mitem.php:186 ../../mod/menu.php:114 +msgid "Modify" +msgstr "Wijzigen" + +#: ../../mod/ping.php:237 +msgid "sent you a private message" +msgstr "stuurde jou een privébericht" + +#: ../../mod/ping.php:288 +msgid "added your channel" +msgstr "voegde jouw kanaal toe" + +#: ../../mod/ping.php:329 +msgid "posted an event" +msgstr "plaatste een gebeurtenis" + +#: ../../mod/acl.php:239 +msgid "network" +msgstr "netwerk" #: ../../mod/settings.php:71 msgid "Name is required" @@ -3704,1242 +3700,1278 @@ msgstr "Naam is vereist" msgid "Key and Secret are required" msgstr "Key en secret zijn vereist" -#: ../../mod/settings.php:195 +#: ../../mod/settings.php:196 msgid "Passwords do not match. Password unchanged." msgstr "Wachtwoorden komen niet overeen. Wachtwoord onveranderd." -#: ../../mod/settings.php:199 +#: ../../mod/settings.php:200 msgid "Empty passwords are not allowed. Password unchanged." msgstr "Lege wachtwoorden zijn niet toegestaan. Wachtwoord onveranderd." -#: ../../mod/settings.php:213 +#: ../../mod/settings.php:214 msgid "Password changed." msgstr "Wachtwoord veranderd." -#: ../../mod/settings.php:215 +#: ../../mod/settings.php:216 msgid "Password update failed. Please try again." msgstr "Bijwerken wachtwoord mislukt. Probeer opnieuw." -#: ../../mod/settings.php:229 +#: ../../mod/settings.php:230 msgid "Not valid email." msgstr "Geen geldig e-mailadres." -#: ../../mod/settings.php:232 +#: ../../mod/settings.php:233 msgid "Protected email address. Cannot change to that email." msgstr "Beschermd e-mailadres. Kan dat e-mailadres niet gebruiken." -#: ../../mod/settings.php:241 +#: ../../mod/settings.php:242 msgid "System failure storing new email. Please try again." msgstr "Systeemfout opslaan van nieuwe e-mail. Probeer het nog een keer." -#: ../../mod/settings.php:444 +#: ../../mod/settings.php:445 msgid "Settings updated." msgstr "Instellingen bijgewerkt." -#: ../../mod/settings.php:515 ../../mod/settings.php:541 -#: ../../mod/settings.php:577 +#: ../../mod/settings.php:516 ../../mod/settings.php:542 +#: ../../mod/settings.php:578 msgid "Add application" msgstr "Applicatie toevoegen" -#: ../../mod/settings.php:518 +#: ../../mod/settings.php:519 msgid "Name of application" msgstr "Naam van applicatie" -#: ../../mod/settings.php:519 ../../mod/settings.php:545 +#: ../../mod/settings.php:520 ../../mod/settings.php:546 msgid "Consumer Key" msgstr "Consumer key" -#: ../../mod/settings.php:519 ../../mod/settings.php:520 +#: ../../mod/settings.php:520 ../../mod/settings.php:521 msgid "Automatically generated - change if desired. Max length 20" msgstr "Automatische gegenereerd - verander wanneer gewenst. Maximale lengte is 20" -#: ../../mod/settings.php:520 ../../mod/settings.php:546 +#: ../../mod/settings.php:521 ../../mod/settings.php:547 msgid "Consumer Secret" msgstr "Consumer secret" -#: ../../mod/settings.php:521 ../../mod/settings.php:547 +#: ../../mod/settings.php:522 ../../mod/settings.php:548 msgid "Redirect" msgstr "Redirect/doorverwijzing" -#: ../../mod/settings.php:521 +#: ../../mod/settings.php:522 msgid "" "Redirect URI - leave blank unless your application specifically requires " "this" msgstr "URI voor redirect - laat leeg, behalve wanneer de applicatie dit vereist" -#: ../../mod/settings.php:522 ../../mod/settings.php:548 +#: ../../mod/settings.php:523 ../../mod/settings.php:549 msgid "Icon url" msgstr "URL van pictogram" -#: ../../mod/settings.php:522 +#: ../../mod/settings.php:523 msgid "Optional" msgstr "Optioneel" -#: ../../mod/settings.php:533 +#: ../../mod/settings.php:534 msgid "You can't edit this application." msgstr "Je kan deze applicatie niet bewerken" -#: ../../mod/settings.php:576 +#: ../../mod/settings.php:577 msgid "Connected Apps" msgstr "Verbonden applicaties" -#: ../../mod/settings.php:580 +#: ../../mod/settings.php:581 msgid "Client key starts with" msgstr "Client key begint met" -#: ../../mod/settings.php:581 +#: ../../mod/settings.php:582 msgid "No name" msgstr "Geen naam" -#: ../../mod/settings.php:582 +#: ../../mod/settings.php:583 msgid "Remove authorization" msgstr "Autorisatie verwijderen" -#: ../../mod/settings.php:593 +#: ../../mod/settings.php:594 msgid "No feature settings configured" msgstr "Geen plugin-instellingen ingesteld" -#: ../../mod/settings.php:601 +#: ../../mod/settings.php:602 msgid "Feature Settings" msgstr "Plugin-instellingen" -#: ../../mod/settings.php:624 +#: ../../mod/settings.php:625 msgid "Account Settings" msgstr "Account-instellingen" -#: ../../mod/settings.php:625 +#: ../../mod/settings.php:626 msgid "Password Settings" msgstr "Wachtwoord-instellingen" -#: ../../mod/settings.php:626 +#: ../../mod/settings.php:627 msgid "New Password:" msgstr "Nieuw wachtwoord:" -#: ../../mod/settings.php:627 +#: ../../mod/settings.php:628 msgid "Confirm:" msgstr "Bevestigen:" -#: ../../mod/settings.php:627 +#: ../../mod/settings.php:628 msgid "Leave password fields blank unless changing" msgstr "Laat de wachtwoordvelden leeg, behalve wanneer je deze wil veranderen" -#: ../../mod/settings.php:629 ../../mod/settings.php:937 +#: ../../mod/settings.php:630 ../../mod/settings.php:943 msgid "Email Address:" msgstr "E-mailadres:" -#: ../../mod/settings.php:630 +#: ../../mod/settings.php:631 ../../mod/removeaccount.php:61 msgid "Remove Account" -msgstr "Kanaal verwijderen (neem contact op met de beheerder van deze hub om je account te verwijderen)" +msgstr "Account verwijderen" -#: ../../mod/settings.php:631 ../../mod/settings.php:1000 +#: ../../mod/settings.php:632 ../../mod/settings.php:1006 msgid "Warning: This action is permanent and cannot be reversed." msgstr "Waarschuwing: Deze handeling is van permanente aard en kan niet meer worden teruggedraaid." -#: ../../mod/settings.php:647 +#: ../../mod/settings.php:648 msgid "Off" msgstr "Uit" -#: ../../mod/settings.php:647 +#: ../../mod/settings.php:648 msgid "On" msgstr "Aan" -#: ../../mod/settings.php:654 +#: ../../mod/settings.php:655 msgid "Additional Features" msgstr "Extra functies" -#: ../../mod/settings.php:679 +#: ../../mod/settings.php:680 msgid "Connector Settings" msgstr "Instellingen externe koppelingen" -#: ../../mod/settings.php:709 ../../mod/admin.php:390 +#: ../../mod/settings.php:710 ../../mod/admin.php:399 msgid "No special theme for mobile devices" msgstr "Geen speciaal thema voor mobiele apparaten" -#: ../../mod/settings.php:718 +#: ../../mod/settings.php:719 #, php-format msgid "%s - (Experimental)" msgstr "%s - (experimenteel)" -#: ../../mod/settings.php:748 +#: ../../mod/settings.php:752 msgid "Display Settings" msgstr "Weergave-instellingen" -#: ../../mod/settings.php:754 +#: ../../mod/settings.php:758 msgid "Display Theme:" msgstr "Gebruik thema:" -#: ../../mod/settings.php:755 +#: ../../mod/settings.php:759 msgid "Mobile Theme:" msgstr "Mobiel thema:" -#: ../../mod/settings.php:756 +#: ../../mod/settings.php:760 +msgid "Enable user zoom on mobile devices" +msgstr "Inzoomen op smartphones en tablets toestaan" + +#: ../../mod/settings.php:761 msgid "Update browser every xx seconds" msgstr "Ververs de webbrowser om de zoveel seconde" -#: ../../mod/settings.php:756 +#: ../../mod/settings.php:761 msgid "Minimum of 10 seconds, no maximum" msgstr "Minimaal 10 seconde, geen maximum" -#: ../../mod/settings.php:757 +#: ../../mod/settings.php:762 msgid "Maximum number of conversations to load at any time:" msgstr "Maximaal aantal conversaties die per keer geladen worden:" -#: ../../mod/settings.php:757 +#: ../../mod/settings.php:762 msgid "Maximum of 100 items" msgstr "Maximaal 100 conversaties" -#: ../../mod/settings.php:758 +#: ../../mod/settings.php:763 msgid "Don't show emoticons" msgstr "Geen emoticons weergeven" -#: ../../mod/settings.php:759 +#: ../../mod/settings.php:764 msgid "System Page Layout Editor - (advanced)" msgstr "Lay-out bewerken van systeempagina's (geavanceerd)" -#: ../../mod/settings.php:794 +#: ../../mod/settings.php:800 msgid "Nobody except yourself" msgstr "Niemand, behalve jezelf" -#: ../../mod/settings.php:795 +#: ../../mod/settings.php:801 msgid "Only those you specifically allow" msgstr "Alleen connecties met uitdrukkelijke toestemming" -#: ../../mod/settings.php:796 +#: ../../mod/settings.php:802 msgid "Approved connections" msgstr "Geaccepteerde connecties" -#: ../../mod/settings.php:797 +#: ../../mod/settings.php:803 msgid "Any connections" msgstr "Alle connecties" -#: ../../mod/settings.php:798 +#: ../../mod/settings.php:804 msgid "Anybody on this website" msgstr "Iedereen op deze hub" -#: ../../mod/settings.php:799 +#: ../../mod/settings.php:805 msgid "Anybody in this network" msgstr "Iedereen in dit netwerk" -#: ../../mod/settings.php:800 +#: ../../mod/settings.php:806 msgid "Anybody authenticated" msgstr "Geauthenticeerd" -#: ../../mod/settings.php:801 +#: ../../mod/settings.php:807 msgid "Anybody on the internet" msgstr "Iedereen op het internet" -#: ../../mod/settings.php:878 +#: ../../mod/settings.php:884 msgid "Publish your default profile in the network directory" msgstr "Publiceer je standaardprofiel in de kanalengids" -#: ../../mod/settings.php:878 ../../mod/settings.php:883 -#: ../../mod/settings.php:954 ../../mod/admin.php:420 -#: ../../mod/profiles.php:566 ../../mod/api.php:106 +#: ../../mod/settings.php:884 ../../mod/settings.php:889 +#: ../../mod/settings.php:960 ../../mod/api.php:106 ../../mod/profiles.php:566 +#: ../../mod/admin.php:429 msgid "No" msgstr "Nee" -#: ../../mod/settings.php:878 ../../mod/settings.php:883 -#: ../../mod/settings.php:954 ../../mod/admin.php:422 -#: ../../mod/profiles.php:565 ../../mod/api.php:105 +#: ../../mod/settings.php:884 ../../mod/settings.php:889 +#: ../../mod/settings.php:960 ../../mod/api.php:105 ../../mod/profiles.php:565 +#: ../../mod/admin.php:431 msgid "Yes" msgstr "Ja" -#: ../../mod/settings.php:883 +#: ../../mod/settings.php:889 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "Sta ons toe om jouw kanaal als mogelijke connectie voor te stellen aan nieuwe kanalen" -#: ../../mod/settings.php:887 ../../mod/profile_photo.php:365 +#: ../../mod/settings.php:893 ../../mod/profile_photo.php:365 msgid "or" msgstr "of" -#: ../../mod/settings.php:892 +#: ../../mod/settings.php:898 msgid "Your channel address is" msgstr "Jouw kanaaladres is" -#: ../../mod/settings.php:926 +#: ../../mod/settings.php:932 msgid "Channel Settings" msgstr "Kanaal-instellingen" -#: ../../mod/settings.php:935 +#: ../../mod/settings.php:941 msgid "Basic Settings" msgstr "Basis-instellingen" -#: ../../mod/settings.php:938 +#: ../../mod/settings.php:944 msgid "Your Timezone:" msgstr "Jouw tijdzone:" -#: ../../mod/settings.php:939 +#: ../../mod/settings.php:945 msgid "Default Post Location:" msgstr "Standaardlocatie bericht:" -#: ../../mod/settings.php:939 +#: ../../mod/settings.php:945 msgid "Geographical location to display on your posts" msgstr "Geografische locatie die bij het bericht moet worden vermeld" -#: ../../mod/settings.php:940 +#: ../../mod/settings.php:946 msgid "Use Browser Location:" msgstr "Locatie van webbrowser gebruiken:" -#: ../../mod/settings.php:942 +#: ../../mod/settings.php:948 msgid "Adult Content" msgstr "Inhoud voor volwassenen" -#: ../../mod/settings.php:942 +#: ../../mod/settings.php:948 msgid "" "This channel frequently or regularly publishes adult content. (Please tag " "any adult material and/or nudity with #NSFW)" msgstr "Dit kanaal publiceert regelmatig of vaak materiaal dat alleen geschikt is voor volwassen. (Gebruik de hashtag #NSFW in berichten met een seksueel getinte inhoud of ander voor minderjarigen ongeschikt materiaal)" -#: ../../mod/settings.php:944 +#: ../../mod/settings.php:950 msgid "Security and Privacy Settings" msgstr "Veiligheids- privacy-instellingen" -#: ../../mod/settings.php:946 +#: ../../mod/settings.php:952 msgid "Hide my online presence" msgstr "Verberg mijn aanwezigheid" -#: ../../mod/settings.php:946 +#: ../../mod/settings.php:952 msgid "Prevents displaying in your profile that you are online" msgstr "Voorkomt dat op je kanaal te zien valt dat je momenteel op de RedMatrix aanwezig bent" -#: ../../mod/settings.php:948 +#: ../../mod/settings.php:954 msgid "Simple Privacy Settings:" msgstr "Eenvoudige privacy-instellingen:" -#: ../../mod/settings.php:949 +#: ../../mod/settings.php:955 msgid "" "Very Public - extremely permissive (should be used with caution)" msgstr "Zeer openbaar (kanaal staat volledig open - moet met grote zorgvuldigheid gebruikt worden)" -#: ../../mod/settings.php:950 +#: ../../mod/settings.php:956 msgid "" "Typical - default public, privacy when desired (similar to social " "network permissions but with improved privacy)" msgstr "Normaal (standaard openbaar, maar privacy wanneer noodzakelijk - vergelijkbaar met die van sociale netwerken, maar met verbeterde privacy)" -#: ../../mod/settings.php:951 +#: ../../mod/settings.php:957 msgid "Private - default private, never open or public" msgstr "Privé (standaard privé en nooit openbaar)" -#: ../../mod/settings.php:952 +#: ../../mod/settings.php:958 msgid "Blocked - default blocked to/from everybody" msgstr "Geblokkeerd (standaard geblokkeerd naar/van iedereen)" -#: ../../mod/settings.php:954 +#: ../../mod/settings.php:960 msgid "Allow others to tag your posts" msgstr "Anderen toestaan om je berichten te labelen" -#: ../../mod/settings.php:954 +#: ../../mod/settings.php:960 msgid "" "Often used by the community to retro-actively flag inappropriate content" msgstr "Vaak in groepen/forums gebruikt om met terugwerkende kracht ongepast materiaal te markeren" -#: ../../mod/settings.php:956 +#: ../../mod/settings.php:962 msgid "Advanced Privacy Settings" msgstr "Geavanceerde privacy-instellingen" -#: ../../mod/settings.php:958 +#: ../../mod/settings.php:964 msgid "Expire other channel content after this many days" msgstr "Inhoud van andere kanalen na zoveel aantal dagen laten verlopen:" -#: ../../mod/settings.php:958 +#: ../../mod/settings.php:964 msgid "0 or blank prevents expiration" msgstr "0 of leeg voorkomt het verlopen" -#: ../../mod/settings.php:959 +#: ../../mod/settings.php:965 msgid "Maximum Friend Requests/Day:" msgstr "Maximum aantal connectieverzoeken per dag:" -#: ../../mod/settings.php:959 +#: ../../mod/settings.php:965 msgid "May reduce spam activity" msgstr "Kan eventuele spam verminderen" -#: ../../mod/settings.php:960 +#: ../../mod/settings.php:966 msgid "Default Post Permissions" msgstr "Standaard privacy-rechten voor nieuwe berichten" -#: ../../mod/settings.php:961 ../../mod/mitem.php:134 ../../mod/mitem.php:177 -msgid "(click to open/close)" -msgstr "(klik om te openen/sluiten)" - -#: ../../mod/settings.php:972 +#: ../../mod/settings.php:978 msgid "Maximum private messages per day from unknown people:" msgstr "Maximum aantal privé-berichten per dag van onbekende personen:" -#: ../../mod/settings.php:972 +#: ../../mod/settings.php:978 msgid "Useful to reduce spamming" msgstr "Kan eventuele spam verminderen" -#: ../../mod/settings.php:975 +#: ../../mod/settings.php:981 msgid "Notification Settings" msgstr "Notificatie-instellingen" -#: ../../mod/settings.php:976 +#: ../../mod/settings.php:982 msgid "By default post a status message when:" msgstr "Plaats automatisch een statusbericht wanneer:" -#: ../../mod/settings.php:977 +#: ../../mod/settings.php:983 msgid "accepting a friend request" msgstr "Een connectieverzoek wordt geaccepteerd" -#: ../../mod/settings.php:978 +#: ../../mod/settings.php:984 msgid "joining a forum/community" msgstr "Je lid wordt van een groep/forum" -#: ../../mod/settings.php:979 +#: ../../mod/settings.php:985 msgid "making an interesting profile change" msgstr "Er sprake is van een interessante profielwijziging" -#: ../../mod/settings.php:980 +#: ../../mod/settings.php:986 msgid "Send a notification email when:" msgstr "Verzend een notificatie per e-mail wanneer:" -#: ../../mod/settings.php:981 +#: ../../mod/settings.php:987 msgid "You receive a connection request" msgstr "Je een connectieverzoek ontvangt" -#: ../../mod/settings.php:982 +#: ../../mod/settings.php:988 msgid "Your connections are confirmed" msgstr "Jouw connecties zijn bevestigd" -#: ../../mod/settings.php:983 +#: ../../mod/settings.php:989 msgid "Someone writes on your profile wall" msgstr "Iemand iets op jouw kanaal heeft geschreven" -#: ../../mod/settings.php:984 +#: ../../mod/settings.php:990 msgid "Someone writes a followup comment" msgstr "Iemand een reactie schrijft" -#: ../../mod/settings.php:985 +#: ../../mod/settings.php:991 msgid "You receive a private message" msgstr "Je een privé-bericht ontvangt" -#: ../../mod/settings.php:986 +#: ../../mod/settings.php:992 msgid "You receive a friend suggestion" msgstr "Je een kanaalvoorstel ontvangt" -#: ../../mod/settings.php:987 +#: ../../mod/settings.php:993 msgid "You are tagged in a post" msgstr "Je expliciet in een bericht bent genoemd" -#: ../../mod/settings.php:988 +#: ../../mod/settings.php:994 msgid "You are poked/prodded/etc. in a post" msgstr "Je bent in een bericht aangestoten/gepord/etc." -#: ../../mod/settings.php:991 +#: ../../mod/settings.php:997 msgid "Advanced Account/Page Type Settings" msgstr "Instellingen geavanceerd account/paginatype" -#: ../../mod/settings.php:992 +#: ../../mod/settings.php:998 msgid "Change the behaviour of this account for special situations" msgstr "Verander het gedrag van dit account voor speciale situaties" -#: ../../mod/settings.php:995 +#: ../../mod/settings.php:1001 msgid "" "Please enable expert mode (in Settings > " "Additional features) to adjust!" msgstr "Schakel de expertmodus in (in Instellingen > Extra functies) om aan te kunnen passen!" -#: ../../mod/settings.php:996 +#: ../../mod/settings.php:1002 msgid "Miscellaneous Settings" msgstr "Diverse instellingen" -#: ../../mod/settings.php:998 +#: ../../mod/settings.php:1004 msgid "Personal menu to display in your channel pages" msgstr "Persoonlijk menu om op je kanaalpagina's weer te geven" -#: ../../mod/settings.php:999 +#: ../../mod/settings.php:1005 msgid "Remove this channel" msgstr "Verwijder dit kanaal" -#: ../../mod/filestorage.php:68 -msgid "Permission Denied." -msgstr "Toegang geweigerd" +#: ../../mod/poke.php:159 +msgid "Poke/Prod" +msgstr "Aanstoten/porren" -#: ../../mod/filestorage.php:85 -msgid "File not found." -msgstr "Bestand niet gevonden." +#: ../../mod/poke.php:160 +msgid "poke, prod or do other things to somebody" +msgstr "aanstoten, porren of andere dingen met iemand doen" -#: ../../mod/filestorage.php:122 -msgid "Edit file permissions" -msgstr "Bestandsrechten bewerken" +#: ../../mod/poke.php:161 +msgid "Recipient" +msgstr "Ontvanger" -#: ../../mod/filestorage.php:131 -msgid "Set/edit permissions" -msgstr "Rechten instellen/bewerken" +#: ../../mod/poke.php:162 +msgid "Choose what you wish to do to recipient" +msgstr "Kies wat je met de ontvanger wil doen" -#: ../../mod/filestorage.php:132 -msgid "Include all files and sub folders" -msgstr "Toepassen op alle bestanden en submappen" +#: ../../mod/poke.php:165 +msgid "Make this post private" +msgstr "Maak dit bericht privé" -#: ../../mod/filestorage.php:133 -msgid "Return to file list" -msgstr "Terugkeren naar bestandlijst " +#: ../../mod/api.php:76 ../../mod/api.php:102 +msgid "Authorize application connection" +msgstr "Geef toestemming voor applicatiekoppeling" -#: ../../mod/filestorage.php:135 -msgid "Copy/paste this code to attach file to a post" -msgstr "Kopieer/plak deze code om het bestand aan een bericht te koppelen" +#: ../../mod/api.php:77 +msgid "Return to your app and insert this Securty Code:" +msgstr "Ga terug naar je app en voeg deze beveiligingscode in:" -#: ../../mod/filestorage.php:136 -msgid "Copy/paste this URL to link file from a web page" -msgstr "Kopieer/plak deze URL om het bestand aan een externe webpagina te koppelen" +#: ../../mod/api.php:89 +msgid "Please login to continue." +msgstr "Inloggen om verder te kunnen gaan." -#: ../../mod/home.php:54 ../../mod/block.php:39 ../../mod/wall_upload.php:28 -#: ../../mod/page.php:47 ../../mod/chanview.php:77 -msgid "Channel not found." -msgstr "Kanaal niet gevonden." +#: ../../mod/api.php:104 +msgid "" +"Do you want to authorize this application to access your posts and contacts," +" and/or create new posts for you?" +msgstr "Wil je deze applicatie toestemming geven om jouw berichten en connecties te zien, en/of nieuwe berichten voor jou te plaatsen?" -#: ../../mod/home.php:81 -msgid "Red Matrix - "The Network"" -msgstr "RedMatrix - "The Network"" +#: ../../mod/post.php:229 +msgid "" +"Remote authentication blocked. You are logged into this site locally. Please" +" logout and retry." +msgstr "Authenticatie op afstand geblokkeerd. Je bent lokaal op deze hub ingelogd. Uitloggen en opnieuw proberen." -#: ../../mod/home.php:94 +#: ../../mod/post.php:261 ../../mod/openid.php:72 ../../mod/openid.php:178 #, php-format -msgid "Welcome to %s" -msgstr "Welkom op %s" +msgid "Welcome %s. Remote authentication successful." +msgstr "Welkom %s. Authenticatie op afstand geslaagd." + +#: ../../mod/attach.php:9 +msgid "Item not available." +msgstr "Item is niet aanwezig." #: ../../mod/probe.php:23 ../../mod/probe.php:29 #, php-format msgid "Fetching URL returns error: %1$s" msgstr "Ophalen URL gaf een foutmelding terug: %1$s" -#: ../../mod/update_network.php:23 ../../mod/update_display.php:25 -#: ../../mod/update_search.php:46 ../../mod/update_channel.php:43 -msgid "[Embedded content - reload page to view]" -msgstr "[Ingesloten inhoud - ververs pagina om te bekijken] " - -#: ../../mod/new_channel.php:107 -msgid "Add a Channel" -msgstr "Kanaal toevoegen" +#: ../../mod/block.php:27 ../../mod/page.php:35 +msgid "Invalid item." +msgstr "Ongeldig item." -#: ../../mod/new_channel.php:108 -msgid "" -"A channel is your own collection of related web pages. A channel can be used" -" to hold social network profiles, blogs, conversation groups and forums, " -"celebrity pages, and much more. You may create as many channels as your " -"service provider allows." -msgstr "Een kanaal is jouw eigen verzameling gerelateerde webpagina's. Een kanaal kan gebruikt worden voor een sociaal netwerk, weblog, discussiegroep of forum, een pagina over een beroemdheid, en voor veel meer. Je kan net zoveel kanalen aanmaken als dat de eigenaar/beheerder van jouw hub toestaat." +#: ../../mod/block.php:39 ../../mod/chanview.php:77 ../../mod/page.php:47 +#: ../../mod/home.php:54 ../../mod/wall_upload.php:28 +msgid "Channel not found." +msgstr "Kanaal niet gevonden." -#: ../../mod/new_channel.php:110 ../../mod/sources.php:103 -#: ../../mod/sources.php:137 -msgid "Channel Name" -msgstr "Kanaalnaam" +#: ../../mod/block.php:75 ../../mod/page.php:83 ../../mod/display.php:100 +#: ../../mod/help.php:72 ../../index.php:236 +msgid "Page not found." +msgstr "Pagina niet gevonden." -#: ../../mod/new_channel.php:111 -msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" " -msgstr "Voorbeelden: \"Bruce Springsteen\", \"Familiefoto's\", \"Voetbal\", \"Astronomie\"" +#: ../../mod/profile_photo.php:108 +msgid "Image uploaded but image cropping failed." +msgstr "Afbeelding geüpload, maar afbeelding kon niet worden bijgesneden. " -#: ../../mod/new_channel.php:112 -msgid "Choose a short nickname" -msgstr "Kies een korte bijnaam" +#: ../../mod/profile_photo.php:161 +msgid "Image resize failed." +msgstr "Afbeelding kon niet van grootte veranderd worden." -#: ../../mod/new_channel.php:113 +#: ../../mod/profile_photo.php:205 msgid "" -"Your nickname will be used to create an easily remembered channel address " -"(like an email address) which you can share with others." -msgstr "Jouw bijnaam wordt gebruikt om een makkelijk te onthouden kanaaladres (zoals een e-mailadres) aan te maken, die je dan kan delen met anderen." - -#: ../../mod/new_channel.php:114 -msgid "Or import an existing channel from another location" -msgstr "Of importeer een bestaand kanaal vanaf een andere locatie." +"Shift-reload the page or clear browser cache if the new photo does not " +"display immediately." +msgstr "Vernieuw de pagina met shift+R of shift+F5, of leeg je browserbuffer, wanneer de nieuwe foto niet meteen wordt weergegeven." -#: ../../mod/rmagic.php:38 -msgid "" -"We encountered a problem while logging in with the OpenID you provided. " -"Please check the correct spelling of the ID." -msgstr "We hebben een probleem ontdekt tijdens het inloggen met de OpenID die je hebt verstrekt. Controleer de ID op typefouten." +#: ../../mod/profile_photo.php:232 +#, php-format +msgid "Image exceeds size limit of %d" +msgstr "Afbeeldingsgrootte overschrijdt het limiet van %d" -#: ../../mod/rmagic.php:38 -msgid "The error message was:" -msgstr "Het foutbericht was:" +#: ../../mod/profile_photo.php:241 +msgid "Unable to process image." +msgstr "Niet in staat om afbeelding te verwerken." -#: ../../mod/rmagic.php:42 -msgid "Authentication failed." -msgstr "Authenticatie mislukt." +#: ../../mod/profile_photo.php:290 ../../mod/profile_photo.php:339 +msgid "Photo not available." +msgstr "Foto niet beschikbaar." -#: ../../mod/rmagic.php:82 -msgid "Remote Authentication" -msgstr "Authenticatie op afstand" +#: ../../mod/profile_photo.php:358 +msgid "Upload File:" +msgstr "Bestand uploaden:" -#: ../../mod/rmagic.php:83 -msgid "Enter your channel address (e.g. channel@example.com)" -msgstr "Vul jouw kanaaladres in (bijv. channel@example.com)" +#: ../../mod/profile_photo.php:359 +msgid "Select a profile:" +msgstr "Kies een profiel:" -#: ../../mod/rmagic.php:84 -msgid "Authenticate" -msgstr "Authenticeren" +#: ../../mod/profile_photo.php:360 +msgid "Upload Profile Photo" +msgstr "Profielfoto uploaden" -#: ../../mod/admin.php:52 -msgid "Theme settings updated." -msgstr "Thema-instellingen bijgewerkt." +#: ../../mod/profile_photo.php:365 +msgid "skip this step" +msgstr "sla deze stap over" -#: ../../mod/admin.php:92 ../../mod/admin.php:441 -msgid "Site" -msgstr "Hub-instellingen" +#: ../../mod/profile_photo.php:365 +msgid "select a photo from your photo albums" +msgstr "Kies een foto uit jouw fotoalbums" -#: ../../mod/admin.php:93 -msgid "Accounts" -msgstr "Accounts" +#: ../../mod/profile_photo.php:379 +msgid "Crop Image" +msgstr "Afbeelding bijsnijden" -#: ../../mod/admin.php:94 ../../mod/admin.php:885 -msgid "Channels" -msgstr "Kanalen" +#: ../../mod/profile_photo.php:380 +msgid "Please adjust the image cropping for optimum viewing." +msgstr "Snij de afbeelding zo uit dat deze optimaal wordt weergegeven." -#: ../../mod/admin.php:95 ../../mod/admin.php:976 ../../mod/admin.php:1018 -msgid "Plugins" -msgstr "Plug-ins" +#: ../../mod/profile_photo.php:382 +msgid "Done Editing" +msgstr "Klaar met bewerken" -#: ../../mod/admin.php:96 ../../mod/admin.php:1181 ../../mod/admin.php:1217 -msgid "Themes" -msgstr "Thema's" +#: ../../mod/profile_photo.php:425 +msgid "Image uploaded successfully." +msgstr "Uploaden afbeelding geslaagd" -#: ../../mod/admin.php:97 ../../mod/admin.php:541 -msgid "Server" -msgstr "Hubbeheer" +#: ../../mod/profile_photo.php:427 +msgid "Image upload failed." +msgstr "Uploaden afbeelding mislukt" -#: ../../mod/admin.php:98 -msgid "DB updates" -msgstr "Database-updates" +#: ../../mod/profile_photo.php:436 +#, php-format +msgid "Image size reduction [%s] failed." +msgstr "Verkleinen [%s] van afbeelding mislukt." -#: ../../mod/admin.php:112 ../../mod/admin.php:119 ../../mod/admin.php:1304 -msgid "Logs" -msgstr "Logboeken" +#: ../../mod/blocks.php:66 +msgid "Block Name" +msgstr "Bloknaam" -#: ../../mod/admin.php:118 -msgid "Plugin Features" -msgstr "Plug-in-opties" +#: ../../mod/profiles.php:18 ../../mod/profiles.php:165 +#: ../../mod/profiles.php:222 ../../mod/profiles.php:539 +msgid "Profile not found." +msgstr "Profiel niet gevonden." -#: ../../mod/admin.php:120 -msgid "User registrations waiting for confirmation" -msgstr "Accountregistraties die op goedkeuring wachten" +#: ../../mod/profiles.php:38 +msgid "Profile deleted." +msgstr "Profiel verwijderd." -#: ../../mod/admin.php:197 -msgid "Message queues" -msgstr "Berichtenwachtrij" +#: ../../mod/profiles.php:56 ../../mod/profiles.php:92 +msgid "Profile-" +msgstr "Profiel-" -#: ../../mod/admin.php:202 ../../mod/admin.php:440 ../../mod/admin.php:540 -#: ../../mod/admin.php:749 ../../mod/admin.php:884 ../../mod/admin.php:975 -#: ../../mod/admin.php:1017 ../../mod/admin.php:1180 ../../mod/admin.php:1216 -#: ../../mod/admin.php:1303 -msgid "Administration" -msgstr "Beheer" +#: ../../mod/profiles.php:77 ../../mod/profiles.php:120 +msgid "New profile created." +msgstr "Nieuw profiel aangemaakt." -#: ../../mod/admin.php:203 -msgid "Summary" -msgstr "Samenvatting" +#: ../../mod/profiles.php:98 +msgid "Profile unavailable to clone." +msgstr "Profiel niet beschikbaar om te klonen" -#: ../../mod/admin.php:205 -msgid "Registered users" -msgstr "Geregistreerde gebruikers" +#: ../../mod/profiles.php:136 +msgid "Profile unavailable to export." +msgstr "Geen profiel beschikbaar om te exporteren" -#: ../../mod/admin.php:207 ../../mod/admin.php:544 -msgid "Pending registrations" -msgstr "Accounts die op goedkeuring wachten" +#: ../../mod/profiles.php:232 +msgid "Profile Name is required." +msgstr "Profielnaam is vereist" -#: ../../mod/admin.php:208 -msgid "Version" -msgstr "Versie" +#: ../../mod/profiles.php:354 +msgid "Marital Status" +msgstr "Huwelijke status" -#: ../../mod/admin.php:210 ../../mod/admin.php:545 -msgid "Active plugins" -msgstr "Ingeschakelde plug-ins" +#: ../../mod/profiles.php:358 +msgid "Romantic Partner" +msgstr "Romantische partner" -#: ../../mod/admin.php:361 -msgid "Site settings updated." -msgstr "Hub-instellingen bijgewerkt." +#: ../../mod/profiles.php:362 +msgid "Likes" +msgstr "Houdt van" -#: ../../mod/admin.php:392 -msgid "No special theme for accessibility" -msgstr "Geen speciaal thema voor universele toegang" +#: ../../mod/profiles.php:366 +msgid "Dislikes" +msgstr "Houdt niet van" -#: ../../mod/admin.php:421 -msgid "Yes - with approval" -msgstr "Ja - met goedkeuring" +#: ../../mod/profiles.php:370 +msgid "Work/Employment" +msgstr "Werk/arbeid" -#: ../../mod/admin.php:427 -msgid "My site is not a public server" -msgstr "Mijn RedMatrix-hub is niet openbaar" +#: ../../mod/profiles.php:373 +msgid "Religion" +msgstr "Religie" -#: ../../mod/admin.php:428 -msgid "My site has paid access only" -msgstr "Mijn RedMatrix-hub kent alleen betaalde toegang" +#: ../../mod/profiles.php:377 +msgid "Political Views" +msgstr "Politieke overtuigingen" -#: ../../mod/admin.php:429 -msgid "My site has free access only" -msgstr "Mijn RedMatrix-hub kent alleen gratis toegang" +#: ../../mod/profiles.php:381 +msgid "Gender" +msgstr "Geslacht" -#: ../../mod/admin.php:430 -msgid "My site offers free accounts with optional paid upgrades" -msgstr "Mijn RedMatrix-hub biedt gratis accounts aan met betaalde uitbreidingen als optie" +#: ../../mod/profiles.php:385 +msgid "Sexual Preference" +msgstr "Seksuele voorkeur" -#: ../../mod/admin.php:443 ../../mod/register.php:204 -msgid "Registration" -msgstr "Registratie" +#: ../../mod/profiles.php:389 +msgid "Homepage" +msgstr "Homepage" -#: ../../mod/admin.php:444 -msgid "File upload" -msgstr "Bestand uploaden" +#: ../../mod/profiles.php:393 +msgid "Interests" +msgstr "Interesses" -#: ../../mod/admin.php:445 -msgid "Policies" -msgstr "Beleid" +#: ../../mod/profiles.php:397 ../../mod/admin.php:902 +msgid "Address" +msgstr "Kanaaladres" -#: ../../mod/admin.php:450 -msgid "Site name" -msgstr "Naam van deze RedMatrix-hub" +#: ../../mod/profiles.php:404 ../../mod/pubsites.php:25 +msgid "Location" +msgstr "Locatie" -#: ../../mod/admin.php:451 -msgid "Banner/Logo" -msgstr "Banner/logo" +#: ../../mod/profiles.php:487 +msgid "Profile updated." +msgstr "Profiel bijgewerkt" -#: ../../mod/admin.php:452 -msgid "Administrator Information" -msgstr "Informatie over de beheerder van deze hub" +#: ../../mod/profiles.php:564 +msgid "Hide your contact/friend list from viewers of this profile?" +msgstr "Laat de lijst met connecties niet aan bezoekers van dit profiel zien." -#: ../../mod/admin.php:452 -msgid "" -"Contact information for site administrators. Displayed on siteinfo page. " -"BBCode can be used here" -msgstr "Contactinformatie voor hub-beheerders. Getoond op pagina met hub-informatie. Er kan hier bbcode gebruikt worden." +#: ../../mod/profiles.php:588 +msgid "Edit Profile Details" +msgstr "Profiel bewerken" -#: ../../mod/admin.php:453 -msgid "System language" -msgstr "Standaardtaal" +#: ../../mod/profiles.php:590 +msgid "View this profile" +msgstr "Profiel weergeven" -#: ../../mod/admin.php:454 -msgid "System theme" -msgstr "Standaardthema" +#: ../../mod/profiles.php:592 +msgid "Change Profile Photo" +msgstr "Profielfoto wijzigen" -#: ../../mod/admin.php:454 -msgid "" -"Default system theme - may be over-ridden by user profiles - change theme settings" -msgstr "Standaardthema voor RedMatrix-hub (kan door gebruiker veranderd worden) - verander thema-instellingen" +#: ../../mod/profiles.php:593 +msgid "Create a new profile using these settings" +msgstr "Een nieuw profiel aanmaken met dit profiel als basis" -#: ../../mod/admin.php:455 -msgid "Mobile system theme" -msgstr "Standaardthema voor mobiel" +#: ../../mod/profiles.php:594 +msgid "Clone this profile" +msgstr "Dit profiel klonen" -#: ../../mod/admin.php:455 -msgid "Theme for mobile devices" -msgstr "Thema voor mobiele apparaten" +#: ../../mod/profiles.php:595 +msgid "Delete this profile" +msgstr "Dit profiel verwijderen" -#: ../../mod/admin.php:456 -msgid "Accessibility system theme" -msgstr "Standaardthema voor universele toegang" +#: ../../mod/profiles.php:597 +msgid "Import profile from file" +msgstr "Profiel vanuit bestand importeren" -#: ../../mod/admin.php:456 -msgid "Accessibility theme" -msgstr "Thema voor universele toegang" +#: ../../mod/profiles.php:598 +msgid "Export profile to file" +msgstr "Profiel naar bestand exporteren" -#: ../../mod/admin.php:457 -msgid "Channel to use for this website's static pages" -msgstr "Kanaal die op deze hub als statische pagina op de homepage gebruikt moet worden" +#: ../../mod/profiles.php:599 +msgid "Profile Name:" +msgstr "Profielnaam:" -#: ../../mod/admin.php:457 -msgid "Site Channel" -msgstr "Kanaal op deze RedMatrix-hub" +#: ../../mod/profiles.php:600 +msgid "Your Full Name:" +msgstr "Jouw volledige naam:" -#: ../../mod/admin.php:459 -msgid "Maximum image size" -msgstr "Maximale grootte van afbeeldingen" +#: ../../mod/profiles.php:601 +msgid "Title/Description:" +msgstr "Titel/omschrijving:" -#: ../../mod/admin.php:459 -msgid "" -"Maximum size in bytes of uploaded images. Default is 0, which means no " -"limits." -msgstr "Maximale grootte in bytes voor afbeeldingen die worden geüpload. Standaard is 0, wat geen limiet betekend." +#: ../../mod/profiles.php:602 +msgid "Your Gender:" +msgstr "Jouw geslacht" -#: ../../mod/admin.php:460 -msgid "Does this site allow new member registration?" -msgstr "Staat deze hub registratie van nieuwe accounts toe?" +#: ../../mod/profiles.php:603 +#, php-format +msgid "Birthday (%s):" +msgstr "Geboortedag (%s)" -#: ../../mod/admin.php:461 -msgid "Which best describes the types of account offered by this hub?" -msgstr "Wat voor soort accounts biedt deze RedMatrix-hub aan? Kies wat het meest in de buurt komt." +#: ../../mod/profiles.php:604 +msgid "Street Address:" +msgstr "Straat en huisnummer:" -#: ../../mod/admin.php:462 -msgid "Register text" -msgstr "Registratietekst" +#: ../../mod/profiles.php:605 +msgid "Locality/City:" +msgstr "Woonplaats:" -#: ../../mod/admin.php:462 -msgid "Will be displayed prominently on the registration page." -msgstr "Wordt prominent op de registratiepagina getoond." +#: ../../mod/profiles.php:606 +msgid "Postal/Zip Code:" +msgstr "Postcode:" -#: ../../mod/admin.php:463 -msgid "Accounts abandoned after x days" -msgstr "Accounts als verlaten beschouwen na zoveel aantal dagen:" +#: ../../mod/profiles.php:607 +msgid "Country:" +msgstr "Land:" -#: ../../mod/admin.php:463 -msgid "" -"Will not waste system resources polling external sites for abandonded " -"accounts. Enter 0 for no time limit." -msgstr "Zal geen systeembronnen verspillen door polling van externe hubs voor verlaten accounts. Vul 0 in voor geen tijdslimiet." +#: ../../mod/profiles.php:608 +msgid "Region/State:" +msgstr "Provincie/gewest/deelstaat:" -#: ../../mod/admin.php:464 -msgid "Allowed friend domains" -msgstr "Toegestane domeinen" +#: ../../mod/profiles.php:609 +msgid " Marital Status:" +msgstr " Huwelijkse staat:" -#: ../../mod/admin.php:464 -msgid "" -"Comma separated list of domains which are allowed to establish friendships " -"with this site. Wildcards are accepted. Empty to allow any domains" -msgstr "Komma-gescheiden lijst van domeinen waarvan kanalen connecties kunnen aangaan met kanalen op deze RedMatrix-hub. Wildcards zijn toegestaan.\nLaat leeg om alle domeinen toe te laten." +#: ../../mod/profiles.php:610 +msgid "Who: (if applicable)" +msgstr "Wie (wanneer toepasselijk):" -#: ../../mod/admin.php:465 -msgid "Allowed email domains" -msgstr "Toegestane e-maildomeinen" +#: ../../mod/profiles.php:611 +msgid "Examples: cathy123, Cathy Williams, cathy@example.com" +msgstr "Voorbeelden: karin123, Karin Jansen, cathy@voorbeeld.nl" -#: ../../mod/admin.php:465 -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 "Door komma's gescheiden lijst met e-maildomeinen die op deze hub mogen registeren. Wildcards zijn toegestaan.\nLaat leeg om alle domeinen toe te laten." +#: ../../mod/profiles.php:612 +msgid "Since [date]:" +msgstr "Sinds [datum]:" -#: ../../mod/admin.php:466 -msgid "Block public" -msgstr "Openbare toegang blokkeren" +#: ../../mod/profiles.php:614 +msgid "Homepage URL:" +msgstr "Adres homepage:" -#: ../../mod/admin.php:466 -msgid "" -"Check to block public access to all otherwise public personal pages on this " -"site unless you are currently logged in." -msgstr "Vink dit aan om alle normaliter openbare persoonlijke pagina's op deze hub alleen toegankelijk te maken voor ingelogde gebruikers." +#: ../../mod/profiles.php:617 +msgid "Religious Views:" +msgstr "Religieuze overtuigingen" -#: ../../mod/admin.php:467 -msgid "Force publish" -msgstr "Dwing kanaalvermelding af" +#: ../../mod/profiles.php:618 +msgid "Keywords:" +msgstr "Trefwoorden" -#: ../../mod/admin.php:467 -msgid "" -"Check to force all profiles on this site to be listed in the site directory." -msgstr "Vink dit aan om af te dwingen dat alle kanalen op deze hub in de kanalengids worden vermeld." +#: ../../mod/profiles.php:621 +msgid "Example: fishing photography software" +msgstr "Voorbeeld: muziek, fotografie, software" -#: ../../mod/admin.php:468 -msgid "Disable discovery tab" -msgstr "Ontdekkingstab" +#: ../../mod/profiles.php:622 +msgid "Used in directory listings" +msgstr "Wordt in de kanalengids gebruikt" -#: ../../mod/admin.php:468 -msgid "" -"Remove the tab in the network view with public content pulled from sources " -"chosen for this site." -msgstr "Verwijder de tab in de matrix-weergave waarin zich een selectie aan openbare berichten bevindt, die automatisch voor deze hub zijn uitgekozen." +#: ../../mod/profiles.php:623 +msgid "Tell us about yourself..." +msgstr "Vertel ons iets over jezelf..." -#: ../../mod/admin.php:469 -msgid "No login on Homepage" -msgstr "Geen inlogformulier op de homepage" +#: ../../mod/profiles.php:624 +msgid "Hobbies/Interests" +msgstr "Hobby's/interesses" -#: ../../mod/admin.php:469 -msgid "" -"Check to hide the login form from your sites homepage when visitors arrive " -"who are not logged in (e.g. when you put the content of the homepage in via " -"the site channel)." -msgstr "Vink dit aan om het inlogformulier op de homepage van deze hub, die niet-ingelogde gebruikers te zien krijgen, te verbergen. (bijvoorbeeld wanneer je een kanaal op deze RedMatrix-hub als homepage gebruikt)" +#: ../../mod/profiles.php:625 +msgid "Contact information and Social Networks" +msgstr "Contactinformatie en sociale netwerken" -#: ../../mod/admin.php:471 -msgid "Proxy user" -msgstr "Proxy-gebruiker" +#: ../../mod/profiles.php:626 +msgid "My other channels" +msgstr "Mijn andere kanalen" -#: ../../mod/admin.php:472 -msgid "Proxy URL" -msgstr "Proxy-URL" +#: ../../mod/profiles.php:627 +msgid "Musical interests" +msgstr "Muzikale interesses" -#: ../../mod/admin.php:473 -msgid "Network timeout" -msgstr "Netwerktimeout" +#: ../../mod/profiles.php:628 +msgid "Books, literature" +msgstr "Boeken/literatuur" -#: ../../mod/admin.php:473 -msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." -msgstr "Waarde is in seconden. Zet op 0 voor onbeperkt (niet aanbevolen)" +#: ../../mod/profiles.php:629 +msgid "Television" +msgstr "Televisie" -#: ../../mod/admin.php:474 -msgid "Delivery interval" -msgstr "Afleveringsinterval" +#: ../../mod/profiles.php:630 +msgid "Film/dance/culture/entertainment" +msgstr "Film/dans/cultuur/entertainment" -#: ../../mod/admin.php:474 -msgid "" -"Delay background delivery processes by this many seconds to reduce system " -"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " -"for large dedicated servers." -msgstr "Vertraag de achtergrondprocessen voor het afleveren met een aantal seconden om de systeembelasting te verminderen. Aanbevolen: 4-5 voor shared hosts, 2-3 voor virtual private servers (VPS) en 0-1 voor grote dedicated servers." +#: ../../mod/profiles.php:631 +msgid "Love/romance" +msgstr "Liefde/romantiek" -#: ../../mod/admin.php:475 -msgid "Poll interval" -msgstr "Poll-interval" +#: ../../mod/profiles.php:632 +msgid "Work/employment" +msgstr "Werk/arbeid" -#: ../../mod/admin.php:475 -msgid "" -"Delay background polling processes by this many seconds to reduce system " -"load. If 0, use delivery interval." -msgstr "De achtergrondprocessen voor het afleveren met zoveel seconden vertragen om de systeembelasting te verminderen. 0 om de afleveringsinterval te gebruiken." +#: ../../mod/profiles.php:633 +msgid "School/education" +msgstr "School/onderwijs" -#: ../../mod/admin.php:476 -msgid "Maximum Load Average" -msgstr "Maximaal gemiddelde systeembelasting" +#: ../../mod/profiles.php:639 +msgid "This is your default profile." +msgstr "Dit is jouw standaardprofiel" -#: ../../mod/admin.php:476 -msgid "" -"Maximum system load before delivery and poll processes are deferred - " -"default 50." -msgstr "Maximale systeembelasting voordat de afleverings- en polllingsprocessen worden uitgesteld. Standaard is 50." +#: ../../mod/profiles.php:650 ../../mod/directory.php:143 +#: ../../mod/dirprofile.php:92 +msgid "Age: " +msgstr "Leeftijd:" -#: ../../mod/admin.php:532 -msgid "No server found" -msgstr "Geen hub gevonden" +#: ../../mod/profiles.php:692 +msgid "Edit/Manage Profiles" +msgstr "Profielen bewerken/beheren" -#: ../../mod/admin.php:539 ../../mod/admin.php:763 -msgid "ID" -msgstr "ID" +#: ../../mod/profiles.php:693 +msgid "Add profile things" +msgstr "Dingen aan je profiel toevoegen" -#: ../../mod/admin.php:539 -msgid "for channel" -msgstr "voor kanaal" +#: ../../mod/profiles.php:694 +msgid "Include desirable objects in your profile" +msgstr "Voeg door jou gewenste dingen aan jouw profiel toe" -#: ../../mod/admin.php:539 -msgid "on server" -msgstr "op hub" +#: ../../mod/bookmarks.php:38 +msgid "Bookmark added" +msgstr "Bladwijzer toegevoegd" -#: ../../mod/admin.php:539 -msgid "Status" -msgstr "Status" +#: ../../mod/bookmarks.php:58 +msgid "My Bookmarks" +msgstr "Mijn bladwijzers" -#: ../../mod/admin.php:560 -msgid "Update has been marked successful" -msgstr "Update is als succesvol gemarkeerd" +#: ../../mod/bookmarks.php:69 +msgid "My Connections Bookmarks" +msgstr "Bladwijzers van mijn connecties" -#: ../../mod/admin.php:570 -#, php-format -msgid "Executing %s failed. Check system logs." -msgstr "Uitvoeren van %s is mislukt. Controleer systeemlogboek." +#: ../../mod/profperm.php:29 ../../mod/profperm.php:58 +msgid "Invalid profile identifier." +msgstr "Ongeldige profiel-identificator" -#: ../../mod/admin.php:573 -#, php-format -msgid "Update %s was successfully applied." -msgstr "Update %s was geslaagd." +#: ../../mod/profperm.php:110 +msgid "Profile Visibility Editor" +msgstr "Zichtbaarheid profiel " -#: ../../mod/admin.php:577 -#, php-format -msgid "Update %s did not return a status. Unknown if it succeeded." -msgstr "Update %s gaf geen melding. Het is daarom niet bekend of deze geslaagd is." +#: ../../mod/profperm.php:114 +msgid "Click on a contact to add or remove." +msgstr "Klik op een connectie om deze toe te voegen of te verwijderen" -#: ../../mod/admin.php:580 -#, php-format -msgid "Update function %s could not be found." -msgstr "Update-functie %s kon niet gevonden worden." +#: ../../mod/profperm.php:123 +msgid "Visible To" +msgstr "Zichtbaar voor" -#: ../../mod/admin.php:595 -msgid "No failed updates." -msgstr "Geen mislukte updates." +#: ../../mod/profperm.php:139 ../../mod/connections.php:279 +msgid "All Connections" +msgstr "Alle connecties" -#: ../../mod/admin.php:599 -msgid "Failed Updates" -msgstr "Mislukte updates" +#: ../../mod/pubsites.php:16 +msgid "Public Sites" +msgstr "Openbare hubs" -#: ../../mod/admin.php:601 -msgid "Mark success (if update was manually applied)" -msgstr "Markeer als geslaagd (wanneer de update handmatig was uitgevoerd)" +#: ../../mod/pubsites.php:19 +msgid "" +"The listed sites allow public registration into the Red Matrix. All sites in" +" the matrix are interlinked so membership on any of them conveys membership " +"in the matrix as a whole. Some sites may require subscription or provide " +"tiered service plans. The provider links may provide " +"additional details." +msgstr "Op de hier weergegeven hubs kan iedereen zich voor de RedMatrix aanmelden. Alle hubs in de Matrix zijn met elkaar verbonden, dus maakt het qua lidmaatschap niet uit waar je je aanmeldt. Op sommige hubs heb je eerst goedkeuring nodig en sommige hubs vereisen betaalde abonnementen voor uitbreidingen. Mogelijk wordt hierover op de hub zelf meer informatie gegeven." -#: ../../mod/admin.php:602 -msgid "Attempt to execute this update step automatically" -msgstr "Poging om deze stap van de update automatisch uit te voeren." +#: ../../mod/pubsites.php:25 +msgid "Site URL" +msgstr "URL hub" -#: ../../mod/admin.php:628 -#, php-format -msgid "%s user blocked/unblocked" -msgid_plural "%s users blocked/unblocked" -msgstr[0] "%s account geblokkeerd/gedeblokkeerd" -msgstr[1] "%s accounts geblokkeerd/gedeblokkeerd" +#: ../../mod/pubsites.php:25 +msgid "Access Type" +msgstr "Toegangstype" -#: ../../mod/admin.php:635 -#, php-format -msgid "%s user deleted" -msgid_plural "%s users deleted" -msgstr[0] "%s account verwijderd" -msgstr[1] "%s accounts verwijderd" +#: ../../mod/pubsites.php:25 +msgid "Registration Policy" +msgstr "Registratiebeleid" -#: ../../mod/admin.php:666 -msgid "Account not found" -msgstr "Account niet gevonden" +#: ../../mod/channel.php:25 ../../mod/chat.php:19 +msgid "You must be logged in to see this page." +msgstr "Je moet zijn ingelogd om deze pagina te kunnen bekijken." -#: ../../mod/admin.php:677 -#, php-format -msgid "User '%s' deleted" -msgstr "Account '%s' verwijderd" +#: ../../mod/channel.php:86 +msgid "Insufficient permissions. Request redirected to profile page." +msgstr "Onvoldoende privacy-rechten. Doorgestuurd naar profielpagina." -#: ../../mod/admin.php:686 -#, php-format -msgid "User '%s' unblocked" -msgstr "Account '%s' gedeblokkeerd" +#: ../../mod/rbmark.php:88 +msgid "Select a bookmark folder" +msgstr "Kies een bladwijzermap" -#: ../../mod/admin.php:686 -#, php-format -msgid "User '%s' blocked" -msgstr "Gebruiker '%s' geblokkeerd" +#: ../../mod/rbmark.php:93 +msgid "Save Bookmark" +msgstr "Bladwijzer opslaan" -#: ../../mod/admin.php:750 ../../mod/admin.php:762 -msgid "Users" -msgstr "Accounts" +#: ../../mod/rbmark.php:94 +msgid "URL of bookmark" +msgstr "URL van bladwijzer" -#: ../../mod/admin.php:752 ../../mod/admin.php:887 -msgid "select all" -msgstr "alles selecteren" +#: ../../mod/rbmark.php:95 ../../mod/appman.php:93 +msgid "Description" +msgstr "Omschrijving" -#: ../../mod/admin.php:753 -msgid "User registrations waiting for confirm" -msgstr "Accounts die op goedkeuring wachten" +#: ../../mod/rbmark.php:99 +msgid "Or enter new bookmark folder name" +msgstr "Of geef de naam op van een nieuwe bladwijzermap" -#: ../../mod/admin.php:754 -msgid "Request date" -msgstr "Tijd/datum verzoek" +#: ../../mod/chat.php:167 +msgid "Room not found" +msgstr "Chatkanaal niet gevonden" -#: ../../mod/admin.php:755 -msgid "No registrations." -msgstr "Geen verzoeken." +#: ../../mod/chat.php:178 +msgid "Leave Room" +msgstr "Chatkanaal verlaten" -#: ../../mod/admin.php:756 -msgid "Approve" -msgstr "Goedkeuren" +#: ../../mod/chat.php:179 +msgid "Delete This Room" +msgstr "Chatkanaal verwijderen" -#: ../../mod/admin.php:757 -msgid "Deny" -msgstr "Afkeuren" +#: ../../mod/chat.php:180 +msgid "I am away right now" +msgstr "Ik ben momenteel afwezig" -#: ../../mod/admin.php:759 ../../mod/connedit.php:414 -#: ../../mod/connedit.php:557 -msgid "Block" -msgstr "Blokkeren" +#: ../../mod/chat.php:181 +msgid "I am online" +msgstr "Ik ben online" -#: ../../mod/admin.php:760 ../../mod/connedit.php:414 -#: ../../mod/connedit.php:557 -msgid "Unblock" -msgstr "Deblokkeren" +#: ../../mod/chat.php:183 +msgid "Bookmark this room" +msgstr "Chatkanaal aan bladwijzers toevoegen" -#: ../../mod/admin.php:763 -msgid "Register date" -msgstr "Geregistreerd" +#: ../../mod/chat.php:207 ../../mod/chat.php:229 +msgid "New Chatroom" +msgstr "Nieuw chatkanaal" -#: ../../mod/admin.php:763 -msgid "Last login" -msgstr "Laatste keer ingelogd" +#: ../../mod/chat.php:208 +msgid "Chatroom Name" +msgstr "Naam chatkanaal" -#: ../../mod/admin.php:763 -msgid "Expires" -msgstr "Verloopt" +#: ../../mod/chat.php:225 +#, php-format +msgid "%1$s's Chatrooms" +msgstr "Chatkanalen van %1$s" -#: ../../mod/admin.php:763 -msgid "Service Class" -msgstr "Abonnementen" +#: ../../mod/register.php:43 +msgid "Maximum daily site registrations exceeded. Please try again tomorrow." +msgstr "Maximum toegestane dagelijkse registraties op deze RedMatrix-hub bereikt. Probeer het morgen (UTC) nogmaals." -#: ../../mod/admin.php:765 +#: ../../mod/register.php:49 msgid "" -"Selected users will be deleted!\\n\\nEverything these users had posted on " -"this site will be permanently deleted!\\n\\nAre you sure?" -msgstr "Geselecteerde accounts (met bijbehorende kanalen) worden verwijderd!\\n\\nAlles wat deze accounts op deze hub hebben gepubliceerd wordt definitief verwijderd!\\n\\Weet je het zeker?" +"Please indicate acceptance of the Terms of Service. Registration failed." +msgstr "Registratie mislukt. De gebruiksvoorwaarden dienen wel geaccepteerd te worden." -#: ../../mod/admin.php:766 -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 "Account {0} (met bijbehorende kanalen) wordt verwijderd !\\n\\nAlles wat dit account op deze hub heeft gepubliceerd wordt definitief verwijderd!\\n\\nWeet je het zeker?" - -#: ../../mod/admin.php:799 -#, php-format -msgid "%s channel censored/uncensored" -msgid_plural "%s channelss censored/uncensored" -msgstr[0] "%s kanalen gecensureerd/ongecensureerd" -msgstr[1] "%s kanaal gecensureerd/ongecensureerd" - -#: ../../mod/admin.php:806 -#, php-format -msgid "%s channel deleted" -msgid_plural "%s channels deleted" -msgstr[0] "%s kanaal verwijderd" -msgstr[1] "%s kanalen verwijderd" - -#: ../../mod/admin.php:825 -msgid "Channel not found" -msgstr "Kanaal niet gevonden" - -#: ../../mod/admin.php:836 -#, php-format -msgid "Channel '%s' deleted" -msgstr "Kanaal '%s' verwijderd" - -#: ../../mod/admin.php:846 -#, php-format -msgid "Channel '%s' uncensored" -msgstr "Kanaal '%s' ongecensureerd" +#: ../../mod/register.php:83 +msgid "Passwords do not match." +msgstr "Wachtwoorden komen niet met elkaar overeen." -#: ../../mod/admin.php:846 -#, php-format -msgid "Channel '%s' censored" -msgstr "Kanaal '%s' gecensureerd" +#: ../../mod/register.php:116 +msgid "" +"Registration successful. Please check your email for validation " +"instructions." +msgstr "Registratie geslaagd. Controleer je e-mail voor instructies om je e-mail te bevestigen." -#: ../../mod/admin.php:889 -msgid "Censor" -msgstr "Censureren" +#: ../../mod/register.php:122 +msgid "Your registration is pending approval by the site owner." +msgstr "Jouw accountregistratie wacht op goedkeuring van de beheerder van deze RedMatrix-hub." -#: ../../mod/admin.php:890 -msgid "Uncensor" -msgstr "Niet censureren" +#: ../../mod/register.php:125 +msgid "Your registration can not be processed." +msgstr "Jouw registratie kan niet verwerkt worden." -#: ../../mod/admin.php:893 -msgid "UID" -msgstr "UID" +#: ../../mod/register.php:162 +msgid "Registration on this site/hub is by approval only." +msgstr "Registraties op deze RedMatrix-hub moeten eerst worden goedgekeurd." -#: ../../mod/admin.php:893 ../../mod/profiles.php:397 -msgid "Address" -msgstr "Kanaaladres" +#: ../../mod/register.php:163 +msgid "Register at another affiliated site/hub" +msgstr "Registreer op een andere RedMatrix-hub" -#: ../../mod/admin.php:895 +#: ../../mod/register.php:171 msgid "" -"Selected channels will be deleted!\\n\\nEverything that was posted in these " -"channels on this site will be permanently deleted!\\n\\nAre you sure?" -msgstr "Geselecteerde kanalen worden verwijderd!\\n\\nAlles wat in deze kanalen op deze hub werd gepubliceerd wordt definitief verwijderd!\\n\\nWeet je het zeker?" +"This site has exceeded the number of allowed daily account registrations. " +"Please try again tomorrow." +msgstr "Deze RedMatrix-hub heeft het maximum aantal dagelijks toegestane registraties bereikt. Probeer het morgen (UTC) nogmaals." -#: ../../mod/admin.php:896 -msgid "" -"The channel {0} will be deleted!\\n\\nEverything that was posted in this " -"channel on this site will be permanently deleted!\\n\\nAre you sure?" -msgstr "Kanaal {0} wordt verwijderd!\\n\\nAlles wat in dit kanaal op deze hub werd gepubliceerd wordt definitief verwijderd!\\n\\nWeet je het zeker?" +#: ../../mod/register.php:182 +msgid "Terms of Service" +msgstr "Gebruiksvoorwaarden" -#: ../../mod/admin.php:935 +#: ../../mod/register.php:188 #, php-format -msgid "Plugin %s disabled." -msgstr "Plug-in %s uitgeschakeld." +msgid "I accept the %s for this website" +msgstr "Ik accepteer de %s van deze RedMatrix-hub" -#: ../../mod/admin.php:939 +#: ../../mod/register.php:190 #, php-format -msgid "Plugin %s enabled." -msgstr "Plug-in %s ingeschakeld" - -#: ../../mod/admin.php:949 ../../mod/admin.php:1151 -msgid "Disable" -msgstr "Uitschakelen" +msgid "I am over 13 years of age and accept the %s for this website" +msgstr "Ik accepteer de %s van deze RedMatrix-hub" -#: ../../mod/admin.php:951 ../../mod/admin.php:1153 -msgid "Enable" -msgstr "Inschakelen" +#: ../../mod/register.php:204 ../../mod/admin.php:452 +msgid "Registration" +msgstr "Registratie" -#: ../../mod/admin.php:977 ../../mod/admin.php:1182 -msgid "Toggle" -msgstr "Omschakelen" +#: ../../mod/register.php:209 +msgid "Membership on this site is by invitation only." +msgstr "Registreren op deze RedMatrix-hub kan alleen op uitnodiging." -#: ../../mod/admin.php:985 ../../mod/admin.php:1192 -msgid "Author: " -msgstr "Auteur: " +#: ../../mod/register.php:210 +msgid "Please enter your invitation code" +msgstr "Vul jouw uitnodigingscode in" -#: ../../mod/admin.php:986 ../../mod/admin.php:1193 -msgid "Maintainer: " -msgstr "Beheerder: " +#: ../../mod/register.php:213 +msgid "Your email address" +msgstr "Jouw e-mailadres" -#: ../../mod/admin.php:1115 -msgid "No themes found." -msgstr "Geen thema's gevonden" +#: ../../mod/register.php:214 +msgid "Choose a password" +msgstr "Geef een wachtwoord op" -#: ../../mod/admin.php:1174 -msgid "Screenshot" -msgstr "Schermafdruk" +#: ../../mod/register.php:215 +msgid "Please re-enter your password" +msgstr "Geef het wachtwoord opnieuw op" -#: ../../mod/admin.php:1222 -msgid "[Experimental]" -msgstr "[Experimenteel]" +#: ../../mod/chatsvc.php:111 +msgid "Away" +msgstr "Afwezig" -#: ../../mod/admin.php:1223 -msgid "[Unsupported]" -msgstr "[Niet ondersteund]" +#: ../../mod/chatsvc.php:115 +msgid "Online" +msgstr "Online" -#: ../../mod/admin.php:1250 -msgid "Log settings updated." -msgstr "Logboek-instellingen bijgewerkt." +#: ../../mod/regmod.php:12 +msgid "Please login." +msgstr "Inloggen." -#: ../../mod/admin.php:1306 -msgid "Clear" -msgstr "Leegmaken" +#: ../../mod/cloud.php:126 +msgid "Red Matrix - Guests: Username: {your email address}, Password: +++" +msgstr "RedMatrix - gasten: Gebruikersnaam: {jouw e-mailadres}, wachtwoord: +++" -#: ../../mod/admin.php:1312 -msgid "Debugging" -msgstr "Debuggen" +#: ../../mod/removeme.php:29 +msgid "" +"Channel removals are not allowed within 48 hours of changing the account " +"password." +msgstr "Het verwijderen van een kanaal is niet toegestaan binnen 48 uur nadat het wachtwoord van het account is veranderd." -#: ../../mod/admin.php:1313 -msgid "Log file" -msgstr "Logbestand" +#: ../../mod/removeme.php:57 +msgid "Remove This Channel" +msgstr "Verwijder dit kanaal" -#: ../../mod/admin.php:1313 +#: ../../mod/removeme.php:58 msgid "" -"Must be writable by web server. Relative to your Red top-level directory." -msgstr "Moet door de webserver beschrijfbaar zijn. Relatief ten opzichte van de bovenste map van je RedMatrix-installatie." +"This will completely remove this channel from the network. Once this has " +"been done it is not recoverable." +msgstr "Dit zal dit kanaal compleet van deze hub en uit het RedMatrix-netwerk verwijderen. Dit kan hierna niet meer te ongedaan gemaakt worden." -#: ../../mod/admin.php:1314 -msgid "Log level" -msgstr "Logniveau" +#: ../../mod/removeme.php:59 ../../mod/removeaccount.php:59 +msgid "Please enter your password for verification:" +msgstr "Vul je wachtwoord in ter verificatie:" -#: ../../mod/filer.php:49 -msgid "- select -" -msgstr "- kies map -" +#: ../../mod/removeme.php:60 +msgid "Remove this channel and all its clones from the network" +msgstr "Dit kanaal en alle klonen hiervan uit het RedMatrix-netwerk verwijderen" -#: ../../mod/connections.php:37 ../../mod/connedit.php:64 -msgid "Could not access contact record." -msgstr "Kon geen toegang krijgen tot de connectie-gegevens." +#: ../../mod/removeme.php:60 +msgid "" +"By default only the instance of the channel located on this hub will be " +"removed from the network" +msgstr "Standaard wordt alleen het kanaal dat zich op deze hub bevindt uit het RedMatrix-netwerk verwijderd." -#: ../../mod/connections.php:51 ../../mod/connedit.php:78 -msgid "Could not locate selected profile." -msgstr "Kon het gekozen profiel niet vinden." +#: ../../mod/removeme.php:61 +msgid "Remove Channel" +msgstr "Kanaal verwijderen" -#: ../../mod/connections.php:94 ../../mod/connedit.php:132 -msgid "Connection updated." -msgstr "Connectie bijgewerkt." +#: ../../mod/common.php:10 +msgid "No channel." +msgstr "Geen kanaal." -#: ../../mod/connections.php:96 ../../mod/connedit.php:134 -msgid "Failed to update connection record." -msgstr "Bijwerken van connectie-gegevens mislukt." +#: ../../mod/common.php:39 +msgid "Common connections" +msgstr "Veel voorkomende connecties" -#: ../../mod/connections.php:191 ../../mod/connections.php:292 -msgid "Blocked" -msgstr "Geblokkeerd" +#: ../../mod/common.php:44 +msgid "No connections in common." +msgstr "Geen gemeenschappelijke connecties." -#: ../../mod/connections.php:196 ../../mod/connections.php:299 -msgid "Ignored" -msgstr "Genegeerd" +#: ../../mod/rmagic.php:38 +msgid "" +"We encountered a problem while logging in with the OpenID you provided. " +"Please check the correct spelling of the ID." +msgstr "We hebben een probleem ontdekt tijdens het inloggen met de OpenID die je hebt verstrekt. Controleer de ID op typefouten." -#: ../../mod/connections.php:201 ../../mod/connections.php:313 -msgid "Hidden" -msgstr "Verborgen" +#: ../../mod/rmagic.php:38 +msgid "The error message was:" +msgstr "Het foutbericht was:" -#: ../../mod/connections.php:206 ../../mod/connections.php:306 -msgid "Archived" -msgstr "Gearchiveerd" +#: ../../mod/rmagic.php:42 +msgid "Authentication failed." +msgstr "Authenticatie mislukt." -#: ../../mod/connections.php:230 ../../mod/connections.php:245 -msgid "All" -msgstr "Alles" +#: ../../mod/rmagic.php:82 +msgid "Remote Authentication" +msgstr "Authenticatie op afstand" -#: ../../mod/connections.php:270 -msgid "Suggest new connections" -msgstr "Nieuwe kanalen voorstellen" +#: ../../mod/rmagic.php:83 +msgid "Enter your channel address (e.g. channel@example.com)" +msgstr "Vul jouw kanaaladres in (bijv. channel@example.com)" -#: ../../mod/connections.php:273 -msgid "New Connections" -msgstr "Nieuwe connecties" +#: ../../mod/rmagic.php:84 +msgid "Authenticate" +msgstr "Authenticeren" -#: ../../mod/connections.php:276 -msgid "Show pending (new) connections" -msgstr "Nog te accepteren (nieuwe) connecties weergeven" +#: ../../mod/connect.php:55 ../../mod/connect.php:103 +msgid "Continue" +msgstr "Ga verder" -#: ../../mod/connections.php:279 ../../mod/profperm.php:139 -msgid "All Connections" -msgstr "Alle connecties" +#: ../../mod/connect.php:84 +msgid "Premium Channel Setup" +msgstr "Instellen premiumkanaal " -#: ../../mod/connections.php:282 -msgid "Show all connections" -msgstr "Toon alle connecties" +#: ../../mod/connect.php:86 +msgid "Enable premium channel connection restrictions" +msgstr "Restricties voor connecties van premiumkanaal toestaan" -#: ../../mod/connections.php:285 -msgid "Unblocked" -msgstr "Niet geblokkeerd" +#: ../../mod/connect.php:87 +msgid "" +"Please enter your restrictions or conditions, such as paypal receipt, usage " +"guidelines, etc." +msgstr "Vul je restricties of voorwaarden in, zoals een paypal-afschrift, gebruikersvoorschriften, enz." -#: ../../mod/connections.php:288 +#: ../../mod/connect.php:89 ../../mod/connect.php:109 +msgid "" +"This channel may require additional steps or acknowledgement of the " +"following conditions prior to connecting:" +msgstr "Dit kanaal kan extra stappen of het accepteren van de volgende voorwaarden vereisen, voordat de connectie wordt geaccepteerd:" + +#: ../../mod/connect.php:90 +msgid "" +"Potential connections will then see the following text before proceeding:" +msgstr "Mogelijke connecties zullen dan de volgende tekst zien voordat ze verder kunnen:" + +#: ../../mod/connect.php:91 ../../mod/connect.php:112 +msgid "" +"By continuing, I certify that I have complied with any instructions provided" +" on this page." +msgstr "Door verder te gaan ga ik automatisch akkoord met alle voorwaarden en aanwijzingen op deze pagina." + +#: ../../mod/connect.php:100 +msgid "(No specific instructions have been provided by the channel owner.)" +msgstr "(Er zijn geen speciale voorwaarden en aanwijzingen door de kanaal-eigenaar verstrekt) " + +#: ../../mod/connect.php:108 +msgid "Restricted or Premium Channel" +msgstr "Beperkt of premiumkanaal" + +#: ../../mod/network.php:79 +msgid "No such group" +msgstr "Collectie niet gevonden" + +#: ../../mod/network.php:118 +msgid "Search Results For:" +msgstr "Zoekresultaten voor:" + +#: ../../mod/network.php:172 +msgid "Collection is empty" +msgstr "Collectie is leeg" + +#: ../../mod/network.php:180 +msgid "Collection: " +msgstr "Collectie: " + +#: ../../mod/network.php:193 +msgid "Connection: " +msgstr "Connectie: " + +#: ../../mod/network.php:196 +msgid "Invalid connection." +msgstr "Ongeldige connectie." + +#: ../../mod/connections.php:37 ../../mod/connedit.php:64 +msgid "Could not access contact record." +msgstr "Kon geen toegang krijgen tot de connectie-gegevens." + +#: ../../mod/connections.php:51 ../../mod/connedit.php:78 +msgid "Could not locate selected profile." +msgstr "Kon het gekozen profiel niet vinden." + +#: ../../mod/connections.php:94 ../../mod/connedit.php:132 +msgid "Connection updated." +msgstr "Connectie bijgewerkt." + +#: ../../mod/connections.php:96 ../../mod/connedit.php:134 +msgid "Failed to update connection record." +msgstr "Bijwerken van connectie-gegevens mislukt." + +#: ../../mod/connections.php:191 ../../mod/connections.php:292 +msgid "Blocked" +msgstr "Geblokkeerd" + +#: ../../mod/connections.php:196 ../../mod/connections.php:299 +msgid "Ignored" +msgstr "Genegeerd" + +#: ../../mod/connections.php:201 ../../mod/connections.php:313 +msgid "Hidden" +msgstr "Verborgen" + +#: ../../mod/connections.php:206 ../../mod/connections.php:306 +msgid "Archived" +msgstr "Gearchiveerd" + +#: ../../mod/connections.php:230 ../../mod/connections.php:245 +msgid "All" +msgstr "Alles" + +#: ../../mod/connections.php:270 +msgid "Suggest new connections" +msgstr "Nieuwe kanalen voorstellen" + +#: ../../mod/connections.php:273 +msgid "New Connections" +msgstr "Nieuwe connecties" + +#: ../../mod/connections.php:276 +msgid "Show pending (new) connections" +msgstr "Nog te accepteren (nieuwe) connecties weergeven" + +#: ../../mod/connections.php:282 +msgid "Show all connections" +msgstr "Toon alle connecties" + +#: ../../mod/connections.php:285 +msgid "Unblocked" +msgstr "Niet geblokkeerd" + +#: ../../mod/connections.php:288 msgid "Only show unblocked connections" msgstr "Toon alleen niet geblokkeerde connecties" @@ -4976,2082 +5008,1986 @@ msgstr "Doorzoek jouw connecties" msgid "Finding: " msgstr "Zoeken naar: " -#: ../../mod/dirprofile.php:9 ../../mod/photos.php:443 -#: ../../mod/viewconnections.php:17 ../../mod/directory.php:15 -#: ../../mod/display.php:9 ../../mod/search.php:13 -msgid "Public access denied." -msgstr "Openbare toegang geweigerd." - -#: ../../mod/dirprofile.php:92 ../../mod/directory.php:143 -#: ../../mod/profiles.php:650 -msgid "Age: " -msgstr "Leeftijd:" +#: ../../mod/rpost.php:97 ../../mod/editpost.php:42 +msgid "Edit post" +msgstr "Bericht bewerken" -#: ../../mod/dirprofile.php:95 ../../mod/directory.php:146 -msgid "Gender: " -msgstr "Geslacht:" +#: ../../mod/connedit.php:181 +msgid "is now connected to" +msgstr "is nu verbonden met" -#: ../../mod/dirprofile.php:108 -msgid "Status: " -msgstr "Status: " +#: ../../mod/connedit.php:274 +msgid "Could not access address book record." +msgstr "Kon geen toegang krijgen tot de record van de connectie." -#: ../../mod/dirprofile.php:109 -msgid "Sexual Preference: " -msgstr "Seksuele voorkeur: " +#: ../../mod/connedit.php:288 +msgid "Refresh failed - channel is currently unavailable." +msgstr "Vernieuwen mislukt - kanaal is momenteel niet beschikbaar" -#: ../../mod/dirprofile.php:111 -msgid "Homepage: " -msgstr "Homepage: " +#: ../../mod/connedit.php:295 +msgid "Channel has been unblocked" +msgstr "Kanaal is gedeblokkeerd" -#: ../../mod/dirprofile.php:112 -msgid "Hometown: " -msgstr "Oorspronkelijk uit: " +#: ../../mod/connedit.php:296 +msgid "Channel has been blocked" +msgstr "Kanaal is geblokkeerd" -#: ../../mod/dirprofile.php:114 -msgid "About: " -msgstr "Over: " +#: ../../mod/connedit.php:300 ../../mod/connedit.php:312 +#: ../../mod/connedit.php:324 ../../mod/connedit.php:336 +#: ../../mod/connedit.php:352 +msgid "Unable to set address book parameters." +msgstr "Niet in staat om de parameters van connecties in te stellen." -#: ../../mod/dirprofile.php:162 -msgid "Keywords: " -msgstr "Trefwoorden: " +#: ../../mod/connedit.php:307 +msgid "Channel has been unignored" +msgstr "Kanaal wordt niet meer genegeerd" -#: ../../mod/dirprofile.php:175 ../../mod/mitem.php:78 ../../mod/xchan.php:27 -#: ../../mod/menu.php:120 -msgid "Not found." -msgstr "Niet gevonden." +#: ../../mod/connedit.php:308 +msgid "Channel has been ignored" +msgstr "Kanaal wordt genegeerd" -#: ../../mod/photos.php:77 -msgid "Page owner information could not be retrieved." -msgstr "Informatie over de pagina-eigenaar werd niet ontvangen." +#: ../../mod/connedit.php:319 +msgid "Channel has been unarchived" +msgstr "Kanaal is niet meer gearchiveerd" -#: ../../mod/photos.php:97 -msgid "Album not found." -msgstr "Album niet gevonden." +#: ../../mod/connedit.php:320 +msgid "Channel has been archived" +msgstr "Kanaal is gearchiveerd" -#: ../../mod/photos.php:119 ../../mod/photos.php:669 -msgid "Delete Album" -msgstr "Verwijder album" +#: ../../mod/connedit.php:331 +msgid "Channel has been unhidden" +msgstr "Kanaal is niet meer verborgen" -#: ../../mod/photos.php:159 ../../mod/photos.php:957 -msgid "Delete Photo" -msgstr "Verwijder foto" +#: ../../mod/connedit.php:332 +msgid "Channel has been hidden" +msgstr "Kanaal is verborgen" -#: ../../mod/photos.php:453 -msgid "No photos selected" -msgstr "Geen foto's geselecteerd" +#: ../../mod/connedit.php:347 +msgid "Channel has been approved" +msgstr "Connectie/kanaal is geaccepteerd" -#: ../../mod/photos.php:500 -msgid "Access to this item is restricted." -msgstr "Toegang tot dit item is beperkt." +#: ../../mod/connedit.php:348 +msgid "Channel has been unapproved" +msgstr "Connectie/kanaal is afgewezen" -#: ../../mod/photos.php:574 -#, php-format -msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." -msgstr "Je gebruiker %1$.2f MB van totaal %2$.2f MB foto-opslagruimte." +#: ../../mod/connedit.php:376 +msgid "Connection has been removed." +msgstr "Connectie is verwijderd" -#: ../../mod/photos.php:577 +#: ../../mod/connedit.php:396 #, php-format -msgid "You have used %1$.2f Mbytes of photo storage." -msgstr "Je gebruikt %1$.2f MB aan foto-opslagruimte." +msgid "View %s's profile" +msgstr "Profiel van %s weergeven" -#: ../../mod/photos.php:596 -msgid "Upload Photos" -msgstr "Foto's uploaden" +#: ../../mod/connedit.php:400 +msgid "Refresh Permissions" +msgstr "Privacy-rechten vernieuwen" -#: ../../mod/photos.php:600 ../../mod/photos.php:664 -msgid "New album name: " -msgstr "Nieuwe albumnaam: " +#: ../../mod/connedit.php:403 +msgid "Fetch updated permissions" +msgstr "Aangepaste privacy-rechten ophalen" -#: ../../mod/photos.php:601 -msgid "or existing album name: " -msgstr "of een bestaande albumnaam: " +#: ../../mod/connedit.php:407 +msgid "Recent Activity" +msgstr "Recente activiteit" -#: ../../mod/photos.php:602 -msgid "Do not show a status post for this upload" -msgstr "Plaats geen bericht voor deze upload." +#: ../../mod/connedit.php:410 +msgid "View recent posts and comments" +msgstr "Recente berichten en reacties weergeven" -#: ../../mod/photos.php:653 ../../mod/photos.php:675 ../../mod/photos.php:1129 -#: ../../mod/photos.php:1144 -msgid "Contact Photos" -msgstr "Connectiefoto's" +#: ../../mod/connedit.php:414 ../../mod/connedit.php:557 +#: ../../mod/admin.php:769 +msgid "Unblock" +msgstr "Deblokkeren" -#: ../../mod/photos.php:679 -msgid "Edit Album" -msgstr "Album bewerken" +#: ../../mod/connedit.php:414 ../../mod/connedit.php:557 +#: ../../mod/admin.php:768 +msgid "Block" +msgstr "Blokkeren" -#: ../../mod/photos.php:685 -msgid "Show Newest First" -msgstr "Nieuwste eerst weergeven" +#: ../../mod/connedit.php:417 +msgid "Block or Unblock this connection" +msgstr "Deze connectie blokkeren of deblokkeren" -#: ../../mod/photos.php:687 -msgid "Show Oldest First" -msgstr "Oudste eerst weergeven" +#: ../../mod/connedit.php:421 ../../mod/connedit.php:558 +msgid "Unignore" +msgstr "Niet meer negeren" -#: ../../mod/photos.php:730 ../../mod/photos.php:1176 -msgid "View Photo" -msgstr "Foto weergeven" +#: ../../mod/connedit.php:421 ../../mod/connedit.php:558 +#: ../../mod/notifications.php:51 +msgid "Ignore" +msgstr "Negeren" -#: ../../mod/photos.php:776 -msgid "Permission denied. Access to this item may be restricted." -msgstr "Toegang geweigerd. Toegang tot dit item kan zijn beperkt." +#: ../../mod/connedit.php:424 +msgid "Ignore or Unignore this connection" +msgstr "Deze connectie negeren of niet meer negeren" -#: ../../mod/photos.php:778 -msgid "Photo not available" -msgstr "Foto niet aanwezig" +#: ../../mod/connedit.php:427 +msgid "Unarchive" +msgstr "Niet meer archiveren" -#: ../../mod/photos.php:838 -msgid "Use as profile photo" -msgstr "Als profielfoto gebruiken" +#: ../../mod/connedit.php:427 +msgid "Archive" +msgstr "Archiveren" -#: ../../mod/photos.php:862 -msgid "View Full Size" -msgstr "Volledige grootte weergeven" +#: ../../mod/connedit.php:430 +msgid "Archive or Unarchive this connection" +msgstr "Deze connectie archiveren of niet meer archiveren" -#: ../../mod/photos.php:906 ../../mod/delegate.php:130 ../../mod/tagrm.php:93 -msgid "Remove" -msgstr "Verwijderen" +#: ../../mod/connedit.php:433 +msgid "Unhide" +msgstr "Niet meer verbergen" -#: ../../mod/photos.php:940 -msgid "Edit photo" -msgstr "Foto bewerken" +#: ../../mod/connedit.php:433 +msgid "Hide" +msgstr "Verbergen" -#: ../../mod/photos.php:942 -msgid "Rotate CW (right)" -msgstr "Draai met de klok mee (naar rechts)" +#: ../../mod/connedit.php:436 +msgid "Hide or Unhide this connection" +msgstr "Deze connectie verbergen of niet meer verbergen" -#: ../../mod/photos.php:943 -msgid "Rotate CCW (left)" -msgstr "Draai tegen de klok in (naar links)" +#: ../../mod/connedit.php:443 +msgid "Delete this connection" +msgstr "Deze connectie verwijderen" -#: ../../mod/photos.php:946 -msgid "New album name" -msgstr "Nieuwe albumnaam" +#: ../../mod/connedit.php:486 ../../mod/connedit.php:515 +msgid "Approve this connection" +msgstr "Deze connectie accepteren" -#: ../../mod/photos.php:949 -msgid "Caption" -msgstr "Bijschrift" +#: ../../mod/connedit.php:486 +msgid "Accept connection to allow communication" +msgstr "Keur deze connectie goed om communicatie toe te staan" -#: ../../mod/photos.php:951 -msgid "Add a Tag" -msgstr "Label toevoegen" +#: ../../mod/connedit.php:502 +msgid "Automatic Permissions Settings" +msgstr "Automatische privacy-rechten" + +#: ../../mod/connedit.php:502 +#, php-format +msgid "Connections: settings for %s" +msgstr "Connecties: instellingen voor %s" -#: ../../mod/photos.php:954 +#: ../../mod/connedit.php:506 msgid "" -"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" -msgstr "Voorbeeld: @bob, @Barbara_Jansen, @jan@example.com, #Friesland, #camping" +"When receiving a channel introduction, any permissions provided here will be" +" applied to the new connection automatically and the introduction approved. " +"Leave this page if you do not wish to use this feature." +msgstr "Wanneer je een connectieverzoek voor een kanaal ontvangt, zullen alle privacy-rechten hier automatisch op de nieuwe connectie worden toegepast en het connectieverzoek worden geaccepteerd. Verlaat deze pagina wanneer je geen gebruik wil maken van deze functie." -#: ../../mod/photos.php:1107 -msgid "In This Photo:" -msgstr "Op deze foto:" +#: ../../mod/connedit.php:508 +msgid "Slide to adjust your degree of friendship" +msgstr "Schuif om te bepalen hoe goed je iemand kent en/of mag" -#: ../../mod/photos.php:1182 -msgid "View Album" -msgstr "Album weergeven" +#: ../../mod/connedit.php:514 +msgid "inherited" +msgstr "geërfd" -#: ../../mod/photos.php:1191 -msgid "Recent Photos" -msgstr "Recente foto's" +#: ../../mod/connedit.php:516 +msgid "Connection has no individual permissions!" +msgstr "Connectie heeft geen individuele privacy-rechten!" -#: ../../mod/mitem.php:14 ../../mod/menu.php:92 -msgid "Menu not found." -msgstr "Menu niet gevonden." +#: ../../mod/connedit.php:517 +msgid "" +"This may be appropriate based on your privacy " +"settings, though you may wish to review the \"Advanced Permissions\"." +msgstr "Dit is mogelijk voldoende, wanneer er naar jouw privacy-instellingen wordt gekeken. Hoewel je wellicht de geavanceerde rechten wil nagaan." -#: ../../mod/mitem.php:47 -msgid "Menu element updated." -msgstr "Menu-onderdeel geüpdatet." +#: ../../mod/connedit.php:519 +msgid "Profile Visibility" +msgstr "Zichtbaarheid profiel" -#: ../../mod/mitem.php:51 -msgid "Unable to update menu element." -msgstr "Menu-onderdeel kan niet worden geüpdatet." +#: ../../mod/connedit.php:520 +#, php-format +msgid "" +"Please choose the profile you would like to display to %s when viewing your " +"profile securely." +msgstr "Kies het profiel dat je aan %s wil tonen wanneer hij/zij ingelogd jouw profiel wil bekijken." -#: ../../mod/mitem.php:57 -msgid "Menu element added." -msgstr "Menu-onderdeel toegevoegd" +#: ../../mod/connedit.php:521 +msgid "Contact Information / Notes" +msgstr "Informatie/aantekeningen over connectie" -#: ../../mod/mitem.php:61 -msgid "Unable to add menu element." -msgstr "Menu-onderdeel kan niet worden toegevoegd." +#: ../../mod/connedit.php:522 +msgid "Edit contact notes" +msgstr "Bewerk aantekeningen over contact" -#: ../../mod/mitem.php:96 -msgid "Manage Menu Elements" -msgstr "Menu-onderdelen beheren" +#: ../../mod/connedit.php:524 +msgid "Their Settings" +msgstr "Hun instellingen" -#: ../../mod/mitem.php:99 -msgid "Edit menu" -msgstr "Menu bewerken" +#: ../../mod/connedit.php:525 +msgid "My Settings" +msgstr "Mijn instellingen" -#: ../../mod/mitem.php:102 -msgid "Edit element" -msgstr "Onderdeel bewerken" +#: ../../mod/connedit.php:527 +msgid "Clear/Disable Automatic Permissions" +msgstr "Verwijderen/uitschakelen automatische privacy-rechten" -#: ../../mod/mitem.php:103 -msgid "Drop element" -msgstr "Onderdeel verwijderen" +#: ../../mod/connedit.php:528 +msgid "Forum Members" +msgstr "Forum/groepsleden" -#: ../../mod/mitem.php:104 -msgid "New element" -msgstr "Nieuw element" +#: ../../mod/connedit.php:529 +msgid "Soapbox" +msgstr "Zeepkist" -#: ../../mod/mitem.php:105 -msgid "Edit this menu container" -msgstr "Deze menu-container bewerken" +#: ../../mod/connedit.php:530 +msgid "Full Sharing (typical social network permissions)" +msgstr "Voluit delen (vergelijkbaar met die van sociale netwerken)" -#: ../../mod/mitem.php:106 -msgid "Add menu element" -msgstr "Menu-element toevoegen" +#: ../../mod/connedit.php:531 +msgid "Cautious Sharing " +msgstr "Voorzichtig delen" -#: ../../mod/mitem.php:107 -msgid "Delete this menu item" -msgstr "Dit menu-item verwijderen" +#: ../../mod/connedit.php:532 +msgid "Follow Only" +msgstr "Alleen volgen" -#: ../../mod/mitem.php:108 -msgid "Edit this menu item" -msgstr "Dit menu-item bewerken" +#: ../../mod/connedit.php:533 +msgid "Individual Permissions" +msgstr "Individuele privacy-rechten" -#: ../../mod/mitem.php:131 -msgid "New Menu Element" -msgstr "Nieuw menu-element" +#: ../../mod/connedit.php:534 +msgid "" +"Some permissions may be inherited from your channel privacy settings, which have higher priority than " +"individual settings. Changing those inherited settings on this page will " +"have no effect." +msgstr "Sommige privacy-rechten kunnen worden overgeërfd van de privacy-instellingen van jouw kanaal. Wanneer je deze geërfde instellingen op deze pagina veranderd heeft dat geen effect." -#: ../../mod/mitem.php:133 ../../mod/mitem.php:176 -msgid "Menu Item Permissions" -msgstr "Privacy-rechten menu-item" +#: ../../mod/connedit.php:535 +msgid "Advanced Permissions" +msgstr "Geavanceerde privacy-rechten" -#: ../../mod/mitem.php:136 ../../mod/mitem.php:180 -msgid "Link text" -msgstr "Linktekst" +#: ../../mod/connedit.php:536 +msgid "Simple Permissions (select one and submit)" +msgstr "Eenvoudige privacy-rechten (selecteer er één en opslaan)" -#: ../../mod/mitem.php:137 ../../mod/mitem.php:181 -msgid "URL of link" -msgstr "URL of link" +#: ../../mod/connedit.php:540 +#, php-format +msgid "Visit %s's profile - %s" +msgstr "Profiel van %s bezoeken - %s" -#: ../../mod/mitem.php:138 ../../mod/mitem.php:182 -msgid "Use Red magic-auth if available" -msgstr "Gebruik Reds magische authenticatie wanneer aanwezig" +#: ../../mod/connedit.php:541 +msgid "Block/Unblock contact" +msgstr "Connectie blokkeren/deblokkeren" -#: ../../mod/mitem.php:139 ../../mod/mitem.php:183 -msgid "Open link in new window" -msgstr "Open link in nieuw venster" +#: ../../mod/connedit.php:542 +msgid "Ignore contact" +msgstr "Connectie negeren" -#: ../../mod/mitem.php:141 ../../mod/mitem.php:185 -msgid "Order in list" -msgstr "Volgorde in lijst" +#: ../../mod/connedit.php:543 +msgid "Repair URL settings" +msgstr "URL-instellingen repareren" -#: ../../mod/mitem.php:141 ../../mod/mitem.php:185 -msgid "Higher numbers will sink to bottom of listing" -msgstr "Hogere nummers komen onderaan de lijst terecht" +#: ../../mod/connedit.php:544 +msgid "View conversations" +msgstr "Conversaties weergeven" -#: ../../mod/mitem.php:154 -msgid "Menu item not found." -msgstr "Menu-item niet gevonden." +#: ../../mod/connedit.php:546 +msgid "Delete contact" +msgstr "Connectie verwijderen" -#: ../../mod/mitem.php:163 -msgid "Menu item deleted." -msgstr "Menu-item verwijderd." +#: ../../mod/connedit.php:549 +msgid "Last update:" +msgstr "Laatste wijziging:" -#: ../../mod/mitem.php:165 -msgid "Menu item could not be deleted." -msgstr "Menu-item kon niet worden verwijderd." +#: ../../mod/connedit.php:551 +msgid "Update public posts" +msgstr "Openbare berichten updaten" -#: ../../mod/mitem.php:174 -msgid "Edit Menu Element" -msgstr "Menu-element bewerken" +#: ../../mod/connedit.php:553 +msgid "Update now" +msgstr "Nu updaten" -#: ../../mod/mitem.php:186 ../../mod/menu.php:114 -msgid "Modify" -msgstr "Wijzigen" +#: ../../mod/connedit.php:559 +msgid "Currently blocked" +msgstr "Momenteel geblokkeerd" -#: ../../mod/subthread.php:103 -#, php-format -msgid "%1$s is following %2$s's %3$s" -msgstr "%1$s volgt het %3$s van %2$s" +#: ../../mod/connedit.php:560 +msgid "Currently ignored" +msgstr "Momenteel genegeerd" -#: ../../mod/regmod.php:12 -msgid "Please login." -msgstr "Inloggen." +#: ../../mod/connedit.php:561 +msgid "Currently archived" +msgstr "Momenteel gearchiveerd" -#: ../../mod/mood.php:132 -msgid "Set your current mood and tell your friends" -msgstr "Noteer je huidige stemming en toon het aan je connecties" +#: ../../mod/connedit.php:562 +msgid "Currently pending" +msgstr "Moeten nog geaccepteerd of afgewezen worden" -#: ../../mod/lockview.php:35 ../../mod/lockview.php:41 -msgid "Remote privacy information not available." -msgstr "Privacy-informatie op afstand niet beschikbaar." +#: ../../mod/connedit.php:563 +msgid "Hide this contact from others" +msgstr "Verberg deze connectie voor anderen" -#: ../../mod/lockview.php:50 -msgid "Visible to:" -msgstr "Zichtbaar voor:" +#: ../../mod/connedit.php:563 +msgid "" +"Replies/likes to your public posts may still be visible" +msgstr "Reacties/vind-ik-leuks op jouw openbare berichten kunnen zichtbaar blijven" -#: ../../mod/rbmark.php:88 -msgid "Select a bookmark folder" -msgstr "Kies een bladwijzermap" +#: ../../mod/delegate.php:95 +msgid "No potential page delegates located." +msgstr "Geen gevolmachtigde personen gevonden waaraan mogelijk het accountbeheer kan worden uitbesteed." -#: ../../mod/rbmark.php:93 -msgid "Save Bookmark" -msgstr "Bladwijzer opslaan" +#: ../../mod/delegate.php:121 +msgid "Delegate Page Management" +msgstr "Accountbeheer uitbesteden" -#: ../../mod/rbmark.php:94 -msgid "URL of bookmark" -msgstr "URL van bladwijzer" +#: ../../mod/delegate.php:123 +msgid "" +"Delegates are able to manage all aspects of this account/page except for " +"basic account settings. Please do not delegate your personal account to " +"anybody that you do not trust completely." +msgstr "Gevolmachtigde personen zijn in staat om alle aspecten van dit account te beheren, behalve enkele basisinstellingen. Besteed het beheer van je persoonlijke account niet aan iemand uit die je niet volledig vertrouwd." -#: ../../mod/rbmark.php:95 ../../mod/appman.php:93 -msgid "Description" -msgstr "Omschrijving" +#: ../../mod/delegate.php:124 +msgid "Existing Page Managers" +msgstr "Bestaande accountbeheerders" -#: ../../mod/rbmark.php:99 -msgid "Or enter new bookmark folder name" -msgstr "Of geef de naam op van een nieuwe bladwijzermap" +#: ../../mod/delegate.php:126 +msgid "Existing Page Delegates" +msgstr "Bestaande gevolmachtigde accountbeheerders" -#: ../../mod/pdledit.php:13 -msgid "Layout updated." -msgstr "Layout bijgewerkt." +#: ../../mod/delegate.php:128 +msgid "Potential Delegates" +msgstr "Gevolmachtigde personen waaraan mogelijk het accountbeheer kan worden uitbesteed." -#: ../../mod/pdledit.php:28 ../../mod/pdledit.php:53 -msgid "Edit System Page Description" -msgstr "Systeempagina's bewerken" +#: ../../mod/delegate.php:130 ../../mod/photos.php:912 ../../mod/tagrm.php:93 +msgid "Remove" +msgstr "Verwijderen" -#: ../../mod/pdledit.php:48 -msgid "Layout not found." -msgstr "Lay-out niet gevonden." +#: ../../mod/delegate.php:131 +msgid "Add" +msgstr "Toevoegen" -#: ../../mod/pdledit.php:54 -msgid "Module Name:" -msgstr "Modulenaam:" +#: ../../mod/delegate.php:132 +msgid "No entries." +msgstr "Geen" -#: ../../mod/pdledit.php:55 ../../mod/layouts.php:59 -msgid "Layout Help" -msgstr "Lay-out-hulp" +#: ../../mod/search.php:13 ../../mod/directory.php:15 +#: ../../mod/dirprofile.php:9 ../../mod/display.php:9 ../../mod/photos.php:443 +#: ../../mod/viewconnections.php:17 +msgid "Public access denied." +msgstr "Openbare toegang geweigerd." -#: ../../mod/profile_photo.php:108 -msgid "Image uploaded but image cropping failed." -msgstr "Afbeelding geüpload, maar afbeelding kon niet worden bijgesneden. " +#: ../../mod/directory.php:146 ../../mod/dirprofile.php:95 +msgid "Gender: " +msgstr "Geslacht:" -#: ../../mod/profile_photo.php:161 -msgid "Image resize failed." -msgstr "Afbeelding kon niet van grootte veranderd worden." +#: ../../mod/directory.php:223 +msgid "Finding:" +msgstr "Gezocht naar:" -#: ../../mod/profile_photo.php:205 -msgid "" -"Shift-reload the page or clear browser cache if the new photo does not " -"display immediately." -msgstr "Vernieuw de pagina met shift+R of shift+F5, of leeg je browserbuffer, wanneer de nieuwe foto niet meteen wordt weergegeven." +#: ../../mod/directory.php:239 +msgid "No entries (some entries may be hidden)." +msgstr "Niets gevonden (sommige kanalen kunnen verborgen zijn)." -#: ../../mod/profile_photo.php:232 -#, php-format -msgid "Image exceeds size limit of %d" -msgstr "Afbeeldingsgrootte overschrijdt het limiet van %d" +#: ../../mod/dirprofile.php:108 +msgid "Status: " +msgstr "Status: " -#: ../../mod/profile_photo.php:241 -msgid "Unable to process image." -msgstr "Niet in staat om afbeelding te verwerken." +#: ../../mod/dirprofile.php:109 +msgid "Sexual Preference: " +msgstr "Seksuele voorkeur: " -#: ../../mod/profile_photo.php:290 ../../mod/profile_photo.php:339 -msgid "Photo not available." -msgstr "Foto niet beschikbaar." +#: ../../mod/dirprofile.php:111 +msgid "Homepage: " +msgstr "Homepage: " -#: ../../mod/profile_photo.php:358 -msgid "Upload File:" -msgstr "Bestand uploaden:" +#: ../../mod/dirprofile.php:112 +msgid "Hometown: " +msgstr "Oorspronkelijk uit: " -#: ../../mod/profile_photo.php:359 -msgid "Select a profile:" -msgstr "Kies een profiel:" +#: ../../mod/dirprofile.php:114 +msgid "About: " +msgstr "Over: " -#: ../../mod/profile_photo.php:360 -msgid "Upload Profile Photo" -msgstr "Profielfoto uploaden" +#: ../../mod/dirprofile.php:162 +msgid "Keywords: " +msgstr "Trefwoorden: " -#: ../../mod/profile_photo.php:365 -msgid "skip this step" -msgstr "sla deze stap over" +#: ../../mod/dirsearch.php:21 +msgid "This site is not a directory server" +msgstr "Deze hub is geen kanalengidshub (directoryserver)" -#: ../../mod/profile_photo.php:365 -msgid "select a photo from your photo albums" -msgstr "Kies een foto uit jouw fotoalbums" +#: ../../mod/home.php:81 +msgid "Red Matrix - "The Network"" +msgstr "RedMatrix - "The Network"" -#: ../../mod/profile_photo.php:379 -msgid "Crop Image" -msgstr "Afbeelding bijsnijden" +#: ../../mod/home.php:94 +#, php-format +msgid "Welcome to %s" +msgstr "Welkom op %s" -#: ../../mod/profile_photo.php:380 -msgid "Please adjust the image cropping for optimum viewing." -msgstr "Snij de afbeelding zo uit dat deze optimaal wordt weergegeven." +#: ../../mod/setup.php:162 +msgid "Red Matrix Server - Setup" +msgstr "RedMatrix Server - Setup" -#: ../../mod/profile_photo.php:382 -msgid "Done Editing" -msgstr "Klaar met bewerken" +#: ../../mod/setup.php:168 +msgid "Could not connect to database." +msgstr "Could not connect to database." -#: ../../mod/profile_photo.php:425 -msgid "Image uploaded successfully." -msgstr "Uploaden afbeelding geslaagd" +#: ../../mod/setup.php:172 +msgid "" +"Could not connect to specified site URL. Possible SSL certificate or DNS " +"issue." +msgstr "Could not connect to specified hub URL. Possible SSL certificate or DNS issue." -#: ../../mod/profile_photo.php:427 -msgid "Image upload failed." -msgstr "Uploaden afbeelding mislukt" +#: ../../mod/setup.php:179 +msgid "Could not create table." +msgstr "Could not create table." -#: ../../mod/profile_photo.php:436 -#, php-format -msgid "Image size reduction [%s] failed." -msgstr "Verkleinen [%s] van afbeelding mislukt." +#: ../../mod/setup.php:185 +msgid "Your site database has been installed." +msgstr "Your hub database has been installed." -#: ../../mod/acl.php:239 -msgid "network" -msgstr "netwerk" +#: ../../mod/setup.php:190 +msgid "" +"You may need to import the file \"install/database.sql\" manually using " +"phpmyadmin or mysql." +msgstr "You may need to import the file \"install/database.sql\" manually using phpmyadmin or mysql." -#: ../../mod/menu.php:21 -msgid "Menu updated." -msgstr "Menu aangepast. " +#: ../../mod/setup.php:191 ../../mod/setup.php:260 ../../mod/setup.php:655 +msgid "Please see the file \"install/INSTALL.txt\"." +msgstr "Please see the file \"install/INSTALL.txt\"." -#: ../../mod/menu.php:25 -msgid "Unable to update menu." -msgstr "Niet in staat om menu aan te passen" +#: ../../mod/setup.php:257 +msgid "System check" +msgstr "System check" -#: ../../mod/menu.php:30 -msgid "Menu created." -msgstr "Menu aangemaakt." +#: ../../mod/setup.php:261 ../../mod/events.php:399 +msgid "Next" +msgstr "Volgende" -#: ../../mod/menu.php:34 -msgid "Unable to create menu." -msgstr "Niet in staat om menu aan te maken." +#: ../../mod/setup.php:262 +msgid "Check again" +msgstr "Check again" -#: ../../mod/menu.php:57 -msgid "Manage Menus" -msgstr "Menu's beheren" +#: ../../mod/setup.php:284 +msgid "Database connection" +msgstr "Database connection" -#: ../../mod/menu.php:60 -msgid "Drop" -msgstr "Verwijderen" +#: ../../mod/setup.php:285 +msgid "" +"In order to install Red Matrix we need to know how to connect to your " +"database." +msgstr "In order to install RedMatrix we need to know how to connect to your database." -#: ../../mod/menu.php:62 -msgid "Create a new menu" -msgstr "Een nieuwe menu aanmaken" +#: ../../mod/setup.php:286 +msgid "" +"Please contact your hosting provider or site administrator if you have " +"questions about these settings." +msgstr "Please contact your hosting provider or site administrator if you have questions about these settings." -#: ../../mod/menu.php:63 -msgid "Delete this menu" -msgstr "Menu verwijderen" +#: ../../mod/setup.php:287 +msgid "" +"The database you specify below should already exist. If it does not, please " +"create it before continuing." +msgstr "The database you specify below should already exist. If it does not, please create it before continuing." -#: ../../mod/menu.php:64 ../../mod/menu.php:109 -msgid "Edit menu contents" -msgstr "Bewerk de inhoud van het menu" +#: ../../mod/setup.php:291 +msgid "Database Server Name" +msgstr "Database Server Name" -#: ../../mod/menu.php:65 -msgid "Edit this menu" -msgstr "Dit menu bewerken" +#: ../../mod/setup.php:291 +msgid "Default is localhost" +msgstr "Default is localhost" -#: ../../mod/menu.php:80 -msgid "New Menu" -msgstr "Nieuw menu" +#: ../../mod/setup.php:292 +msgid "Database Port" +msgstr "Database Port" -#: ../../mod/menu.php:81 ../../mod/menu.php:110 -msgid "Menu name" -msgstr "Naam van menu" +#: ../../mod/setup.php:292 +msgid "Communication port number - use 0 for default" +msgstr "Communication port number - use 0 for default" -#: ../../mod/menu.php:81 ../../mod/menu.php:110 -msgid "Must be unique, only seen by you" -msgstr "Moet uniek zijn en is alleen zichtbaar voor jou." +#: ../../mod/setup.php:293 +msgid "Database Login Name" +msgstr "Database Login Name" -#: ../../mod/menu.php:82 ../../mod/menu.php:111 -msgid "Menu title" -msgstr "Titel van menu" +#: ../../mod/setup.php:294 +msgid "Database Login Password" +msgstr "Database Login Password" -#: ../../mod/menu.php:82 ../../mod/menu.php:111 -msgid "Menu title as seen by others" -msgstr "Titel van menu zoals anderen dat zien." +#: ../../mod/setup.php:295 +msgid "Database Name" +msgstr "Database Name" -#: ../../mod/menu.php:83 ../../mod/menu.php:112 -msgid "Allow bookmarks" -msgstr "Bladwijzers toestaan" +#: ../../mod/setup.php:297 ../../mod/setup.php:339 +msgid "Site administrator email address" +msgstr "Hub administrator email address" -#: ../../mod/menu.php:83 ../../mod/menu.php:112 -msgid "Menu may be used to store saved bookmarks" -msgstr "Menu kan gebruikt worden om bladwijzers in op te slaan" +#: ../../mod/setup.php:297 ../../mod/setup.php:339 +msgid "" +"Your account email address must match this in order to use the web admin " +"panel." +msgstr "Your account email address must match this in order to use the web admin panel." -#: ../../mod/menu.php:98 -msgid "Menu deleted." -msgstr "Menu verwijderd." +#: ../../mod/setup.php:298 ../../mod/setup.php:341 +msgid "Website URL" +msgstr "Hub URL" -#: ../../mod/menu.php:100 -msgid "Menu could not be deleted." -msgstr "Menu kon niet verwijderd worden." +#: ../../mod/setup.php:298 ../../mod/setup.php:341 +msgid "Please use SSL (https) URL if available." +msgstr "Please use SSL (https) URL if available." -#: ../../mod/menu.php:106 -msgid "Edit Menu" -msgstr "Menu bewerken" +#: ../../mod/setup.php:301 ../../mod/setup.php:344 +msgid "Please select a default timezone for your website" +msgstr "Please select a default timezone for your hub" -#: ../../mod/menu.php:108 -msgid "Add or remove entries to this menu" -msgstr "Items aan dit menu toevoegen of verwijder" +#: ../../mod/setup.php:328 +msgid "Site settings" +msgstr "Hub settings" -#: ../../mod/block.php:27 ../../mod/page.php:35 -msgid "Invalid item." -msgstr "Ongeldig item." +#: ../../mod/setup.php:387 +msgid "Could not find a command line version of PHP in the web server PATH." +msgstr "Could not find a command line version of PHP in the web server PATH." -#: ../../mod/block.php:75 ../../mod/help.php:72 ../../mod/display.php:100 -#: ../../mod/page.php:83 ../../index.php:236 -msgid "Page not found." -msgstr "Pagina niet gevonden." +#: ../../mod/setup.php:388 +msgid "" +"If you don't have a command line version of PHP installed on server, you " +"will not be able to run background polling via cron." +msgstr "If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron." -#: ../../mod/tagger.php:98 -#, php-format -msgid "%1$s tagged %2$s's %3$s with %4$s" -msgstr "%1$s labelde het %3$s van %2$s met %4$s" +#: ../../mod/setup.php:392 +msgid "PHP executable path" +msgstr "PHP executable path" -#: ../../mod/wall_upload.php:34 -msgid "Wall Photos" -msgstr "Kanaalfoto's" +#: ../../mod/setup.php:392 +msgid "" +"Enter full path to php executable. You can leave this blank to continue the " +"installation." +msgstr "Enter full path to php executable. You can leave this blank to continue the installation." -#: ../../mod/openid.php:26 -msgid "OpenID protocol error. No ID returned." -msgstr "OpenID-protocolfout. Geen ID terugontvangen." +#: ../../mod/setup.php:397 +msgid "Command line PHP" +msgstr "Command line PHP" -#: ../../mod/suggest.php:35 +#: ../../mod/setup.php:406 msgid "" -"No suggestions available. If this is a new site, please try again in 24 " -"hours." -msgstr "Geen voorgestelde kanalen gevonden. Wanneer dit een nieuwe hub is, probeer het dan over 24 uur weer." +"The command line version of PHP on your system does not have " +"\"register_argc_argv\" enabled." +msgstr "The command line version of PHP on your system does not have \"register_argc_argv\" enabled." -#: ../../mod/connedit.php:181 -msgid "is now connected to" -msgstr "is nu verbonden met" +#: ../../mod/setup.php:407 +msgid "This is required for message delivery to work." +msgstr "This is required for message delivery to work." -#: ../../mod/connedit.php:274 -msgid "Could not access address book record." -msgstr "Kon geen toegang krijgen tot de record van de connectie." +#: ../../mod/setup.php:409 +msgid "PHP register_argc_argv" +msgstr "PHP register_argc_argv" -#: ../../mod/connedit.php:288 -msgid "Refresh failed - channel is currently unavailable." -msgstr "Vernieuwen mislukt - kanaal is momenteel niet beschikbaar" +#: ../../mod/setup.php:430 +msgid "" +"Error: the \"openssl_pkey_new\" function on this system is not able to " +"generate encryption keys" +msgstr "Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys" -#: ../../mod/connedit.php:295 -msgid "Channel has been unblocked" -msgstr "Kanaal is gedeblokkeerd" +#: ../../mod/setup.php:431 +msgid "" +"If running under Windows, please see " +"\"http://www.php.net/manual/en/openssl.installation.php\"." +msgstr "If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"." -#: ../../mod/connedit.php:296 -msgid "Channel has been blocked" -msgstr "Kanaal is geblokkeerd" +#: ../../mod/setup.php:433 +msgid "Generate encryption keys" +msgstr "Generate encryption keys" -#: ../../mod/connedit.php:300 ../../mod/connedit.php:312 -#: ../../mod/connedit.php:324 ../../mod/connedit.php:336 -#: ../../mod/connedit.php:352 -msgid "Unable to set address book parameters." -msgstr "Niet in staat om de parameters van connecties in te stellen." +#: ../../mod/setup.php:440 +msgid "libCurl PHP module" +msgstr "libCurl PHP module" -#: ../../mod/connedit.php:307 -msgid "Channel has been unignored" -msgstr "Kanaal wordt niet meer genegeerd" +#: ../../mod/setup.php:441 +msgid "GD graphics PHP module" +msgstr "GD graphics PHP module" -#: ../../mod/connedit.php:308 -msgid "Channel has been ignored" -msgstr "Kanaal wordt genegeerd" +#: ../../mod/setup.php:442 +msgid "OpenSSL PHP module" +msgstr "OpenSSL PHP module" -#: ../../mod/connedit.php:319 -msgid "Channel has been unarchived" -msgstr "Kanaal is niet meer gearchiveerd" +#: ../../mod/setup.php:443 +msgid "mysqli PHP module" +msgstr "mysqli PHP module" -#: ../../mod/connedit.php:320 -msgid "Channel has been archived" -msgstr "Kanaal is gearchiveerd" +#: ../../mod/setup.php:444 +msgid "mb_string PHP module" +msgstr "mb_string PHP module" -#: ../../mod/connedit.php:331 -msgid "Channel has been unhidden" -msgstr "Kanaal is niet meer verborgen" +#: ../../mod/setup.php:445 +msgid "mcrypt PHP module" +msgstr "mcrypt PHP module" -#: ../../mod/connedit.php:332 -msgid "Channel has been hidden" -msgstr "Kanaal is verborgen" +#: ../../mod/setup.php:450 ../../mod/setup.php:452 +msgid "Apache mod_rewrite module" +msgstr "Apache mod_rewrite module" -#: ../../mod/connedit.php:347 -msgid "Channel has been approved" -msgstr "Connectie/kanaal is geaccepteerd" +#: ../../mod/setup.php:450 +msgid "" +"Error: Apache webserver mod-rewrite module is required but not installed." +msgstr "Error: Apache webserver mod-rewrite module is required but not installed." -#: ../../mod/connedit.php:348 -msgid "Channel has been unapproved" -msgstr "Connectie/kanaal is afgewezen" +#: ../../mod/setup.php:456 ../../mod/setup.php:459 +msgid "proc_open" +msgstr "proc_open" -#: ../../mod/connedit.php:376 -msgid "Connection has been removed." -msgstr "Connectie is verwijderd" +#: ../../mod/setup.php:456 +msgid "" +"Error: proc_open is required but is either not installed or has been " +"disabled in php.ini" +msgstr "Error: proc_open is required but is either not installed or has been disabled in php.ini" -#: ../../mod/connedit.php:396 -#, php-format -msgid "View %s's profile" -msgstr "Profiel van %s weergeven" +#: ../../mod/setup.php:464 +msgid "Error: libCURL PHP module required but not installed." +msgstr "Error: libCURL PHP module required but not installed." -#: ../../mod/connedit.php:400 -msgid "Refresh Permissions" -msgstr "Privacy-rechten vernieuwen" +#: ../../mod/setup.php:468 +msgid "" +"Error: GD graphics PHP module with JPEG support required but not installed." +msgstr "Error: GD graphics PHP module with JPEG support required but not installed." -#: ../../mod/connedit.php:403 -msgid "Fetch updated permissions" -msgstr "Aangepaste privacy-rechten ophalen" +#: ../../mod/setup.php:472 +msgid "Error: openssl PHP module required but not installed." +msgstr "Error: openssl PHP module required but not installed." -#: ../../mod/connedit.php:407 -msgid "Recent Activity" -msgstr "Recente activiteit" +#: ../../mod/setup.php:476 +msgid "Error: mysqli PHP module required but not installed." +msgstr "Error: mysqli PHP module required but not installed." -#: ../../mod/connedit.php:410 -msgid "View recent posts and comments" -msgstr "Recente berichten en reacties weergeven" - -#: ../../mod/connedit.php:417 -msgid "Block or Unblock this connection" -msgstr "Deze connectie blokkeren of deblokkeren" - -#: ../../mod/connedit.php:421 ../../mod/connedit.php:558 -msgid "Unignore" -msgstr "Niet meer negeren" - -#: ../../mod/connedit.php:421 ../../mod/connedit.php:558 -#: ../../mod/notifications.php:51 -msgid "Ignore" -msgstr "Negeren" - -#: ../../mod/connedit.php:424 -msgid "Ignore or Unignore this connection" -msgstr "Deze connectie negeren of niet meer negeren" - -#: ../../mod/connedit.php:427 -msgid "Unarchive" -msgstr "Niet meer archiveren" - -#: ../../mod/connedit.php:427 -msgid "Archive" -msgstr "Archiveren" - -#: ../../mod/connedit.php:430 -msgid "Archive or Unarchive this connection" -msgstr "Deze connectie archiveren of niet meer archiveren" - -#: ../../mod/connedit.php:433 -msgid "Unhide" -msgstr "Niet meer verbergen" - -#: ../../mod/connedit.php:433 -msgid "Hide" -msgstr "Verbergen" - -#: ../../mod/connedit.php:436 -msgid "Hide or Unhide this connection" -msgstr "Deze connectie verbergen of niet meer verbergen" - -#: ../../mod/connedit.php:443 -msgid "Delete this connection" -msgstr "Deze connectie verwijderen" - -#: ../../mod/connedit.php:486 ../../mod/connedit.php:515 -msgid "Approve this connection" -msgstr "Deze connectie accepteren" - -#: ../../mod/connedit.php:486 -msgid "Accept connection to allow communication" -msgstr "Keur deze connectie goed om communicatie toe te staan" +#: ../../mod/setup.php:480 +msgid "Error: mb_string PHP module required but not installed." +msgstr "Error: mb_string PHP module required but not installed." -#: ../../mod/connedit.php:502 -msgid "Automatic Permissions Settings" -msgstr "Automatische privacy-rechten" +#: ../../mod/setup.php:484 +msgid "Error: mcrypt PHP module required but not installed." +msgstr "Error: mcrypt PHP module required but not installed." -#: ../../mod/connedit.php:502 -#, php-format -msgid "Connections: settings for %s" -msgstr "Connecties: instellingen voor %s" +#: ../../mod/setup.php:500 +msgid "" +"The web installer needs to be able to create a file called \".htconfig.php\"" +" in the top folder of your web server and it is unable to do so." +msgstr "The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so." -#: ../../mod/connedit.php:506 +#: ../../mod/setup.php:501 msgid "" -"When receiving a channel introduction, any permissions provided here will be" -" applied to the new connection automatically and the introduction approved. " -"Leave this page if you do not wish to use this feature." -msgstr "Wanneer je een connectieverzoek voor een kanaal ontvangt, zullen alle privacy-rechten hier automatisch op de nieuwe connectie worden toegepast en het connectieverzoek worden geaccepteerd. Verlaat deze pagina wanneer je geen gebruik wil maken van deze functie." +"This is most often a permission setting, as the web server may not be able " +"to write files in your folder - even if you can." +msgstr "This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can." -#: ../../mod/connedit.php:508 -msgid "Slide to adjust your degree of friendship" -msgstr "Schuif om te bepalen hoe goed je iemand kent en/of mag" +#: ../../mod/setup.php:502 +msgid "" +"At the end of this procedure, we will give you a text to save in a file " +"named .htconfig.php in your Red top folder." +msgstr "At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Red top folder." -#: ../../mod/connedit.php:514 -msgid "inherited" -msgstr "geërfd" +#: ../../mod/setup.php:503 +msgid "" +"You can alternatively skip this procedure and perform a manual installation." +" Please see the file \"install/INSTALL.txt\" for instructions." +msgstr "You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions." -#: ../../mod/connedit.php:516 -msgid "Connection has no individual permissions!" -msgstr "Connectie heeft geen individuele privacy-rechten!" +#: ../../mod/setup.php:506 +msgid ".htconfig.php is writable" +msgstr ".htconfig.php is writable" -#: ../../mod/connedit.php:517 +#: ../../mod/setup.php:516 msgid "" -"This may be appropriate based on your privacy " -"settings, though you may wish to review the \"Advanced Permissions\"." -msgstr "Dit is mogelijk voldoende, wanneer er naar jouw privacy-instellingen wordt gekeken. Hoewel je wellicht de geavanceerde rechten wil nagaan." - -#: ../../mod/connedit.php:519 -msgid "Profile Visibility" -msgstr "Zichtbaarheid profiel" +"Red uses the Smarty3 template engine to render its web views. Smarty3 " +"compiles templates to PHP to speed up rendering." +msgstr "Red uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering." -#: ../../mod/connedit.php:520 +#: ../../mod/setup.php:517 #, php-format msgid "" -"Please choose the profile you would like to display to %s when viewing your " -"profile securely." -msgstr "Kies het profiel dat je aan %s wil tonen wanneer hij/zij ingelogd jouw profiel wil bekijken." - -#: ../../mod/connedit.php:521 -msgid "Contact Information / Notes" -msgstr "Informatie/aantekeningen over connectie" - -#: ../../mod/connedit.php:522 -msgid "Edit contact notes" -msgstr "Bewerk aantekeningen over contact" - -#: ../../mod/connedit.php:524 -msgid "Their Settings" -msgstr "Hun instellingen" - -#: ../../mod/connedit.php:525 -msgid "My Settings" -msgstr "Mijn instellingen" - -#: ../../mod/connedit.php:527 -msgid "Clear/Disable Automatic Permissions" -msgstr "Verwijderen/uitschakelen automatische privacy-rechten" - -#: ../../mod/connedit.php:528 -msgid "Forum Members" -msgstr "Forum/groepsleden" - -#: ../../mod/connedit.php:529 -msgid "Soapbox" -msgstr "Zeepkist" - -#: ../../mod/connedit.php:530 -msgid "Full Sharing (typical social network permissions)" -msgstr "Voluit delen (vergelijkbaar met die van sociale netwerken)" - -#: ../../mod/connedit.php:531 -msgid "Cautious Sharing " -msgstr "Voorzichtig delen" - -#: ../../mod/connedit.php:532 -msgid "Follow Only" -msgstr "Alleen volgen" - -#: ../../mod/connedit.php:533 -msgid "Individual Permissions" -msgstr "Individuele privacy-rechten" +"In order to store these compiled templates, the web server needs to have " +"write access to the directory %s under the Red top level folder." +msgstr "In order to store these compiled templates, the web server needs to have write access to the directory %s under the Red top level folder." -#: ../../mod/connedit.php:534 +#: ../../mod/setup.php:518 ../../mod/setup.php:536 msgid "" -"Some permissions may be inherited from your channel privacy settings, which have higher priority than " -"individual settings. Changing those inherited settings on this page will " -"have no effect." -msgstr "Sommige privacy-rechten kunnen worden overgeërfd van de privacy-instellingen van jouw kanaal. Wanneer je deze geërfde instellingen op deze pagina veranderd heeft dat geen effect." - -#: ../../mod/connedit.php:535 -msgid "Advanced Permissions" -msgstr "Geavanceerde privacy-rechten" - -#: ../../mod/connedit.php:536 -msgid "Simple Permissions (select one and submit)" -msgstr "Eenvoudige privacy-rechten (selecteer er één en opslaan)" +"Please ensure that the user that your web server runs as (e.g. www-data) has" +" write access to this folder." +msgstr "Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder." -#: ../../mod/connedit.php:540 +#: ../../mod/setup.php:519 #, php-format -msgid "Visit %s's profile - %s" -msgstr "Profiel van %s bezoeken - %s" - -#: ../../mod/connedit.php:541 -msgid "Block/Unblock contact" -msgstr "Connectie blokkeren/deblokkeren" - -#: ../../mod/connedit.php:542 -msgid "Ignore contact" -msgstr "Connectie negeren" - -#: ../../mod/connedit.php:543 -msgid "Repair URL settings" -msgstr "URL-instellingen repareren" - -#: ../../mod/connedit.php:544 -msgid "View conversations" -msgstr "Conversaties weergeven" - -#: ../../mod/connedit.php:546 -msgid "Delete contact" -msgstr "Connectie verwijderen" - -#: ../../mod/connedit.php:549 -msgid "Last update:" -msgstr "Laatste wijziging:" - -#: ../../mod/connedit.php:551 -msgid "Update public posts" -msgstr "Openbare berichten updaten" - -#: ../../mod/connedit.php:553 -msgid "Update now" -msgstr "Nu updaten" - -#: ../../mod/connedit.php:559 -msgid "Currently blocked" -msgstr "Momenteel geblokkeerd" - -#: ../../mod/connedit.php:560 -msgid "Currently ignored" -msgstr "Momenteel genegeerd" - -#: ../../mod/connedit.php:561 -msgid "Currently archived" -msgstr "Momenteel gearchiveerd" - -#: ../../mod/connedit.php:562 -msgid "Currently pending" -msgstr "Moeten nog geaccepteerd of afgewezen worden" - -#: ../../mod/connedit.php:563 -msgid "Hide this contact from others" -msgstr "Verberg deze connectie voor anderen" - -#: ../../mod/connedit.php:563 msgid "" -"Replies/likes to your public posts may still be visible" -msgstr "Reacties/vind-ik-leuks op jouw openbare berichten kunnen zichtbaar blijven" - -#: ../../mod/message.php:31 ../../mod/mail.php:121 -msgid "Messages" -msgstr "Berichten" - -#: ../../mod/message.php:41 -msgid "Conversation removed." -msgstr "Conversatie verwijderd" - -#: ../../mod/message.php:56 -msgid "No messages." -msgstr "Geen berichten" +"Note: as a security measure, you should give the web server write access to " +"%s only--not the template files (.tpl) that it contains." +msgstr "Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains." -#: ../../mod/message.php:72 ../../mod/mail.php:302 -msgid "Delete message" -msgstr "Bericht verwijderen" +#: ../../mod/setup.php:522 +#, php-format +msgid "%s is writable" +msgstr "%s is writable" -#: ../../mod/message.php:74 -msgid "D, d M Y - g:i A" -msgstr "D, j M Y - G:i" +#: ../../mod/setup.php:535 +msgid "" +"Red uses the store directory to save uploaded files. The web server needs to" +" have write access to the store directory under the Red top level folder" +msgstr "Red uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the Red top level folder" -#: ../../mod/ping.php:237 -msgid "sent you a private message" -msgstr "stuurde jou een privébericht" +#: ../../mod/setup.php:539 +msgid "store is writable" +msgstr "store is writable" -#: ../../mod/ping.php:288 -msgid "added your channel" -msgstr "voegde jouw kanaal toe" +#: ../../mod/setup.php:569 +msgid "" +"SSL certificate cannot be validated. Fix certificate or disable https access" +" to this site." +msgstr "SSL certificate cannot be validated. Fix certificate or disable https access to this hub." -#: ../../mod/ping.php:329 -msgid "posted an event" -msgstr "plaatste een gebeurtenis" +#: ../../mod/setup.php:570 +msgid "" +"If you have https access to your website or allow connections to TCP port " +"443 (the https: port), you MUST use a browser-valid certificate. You MUST " +"NOT use self-signed certificates!" +msgstr "If you have https access to your hub or allow connections to TCP port 443 (the https: port), you MUST use a browser-valid certificate. You MUST NOT use self-signed certificates!" -#: ../../mod/setup.php:162 -msgid "Red Matrix Server - Setup" -msgstr "RedMatrix Server - Setup" +#: ../../mod/setup.php:571 +msgid "" +"This restriction is incorporated because public posts from you may for " +"example contain references to images on your own hub." +msgstr "This restriction is incorporated because public posts from you may for example contain references to images on your own hub." -#: ../../mod/setup.php:168 -msgid "Could not connect to database." -msgstr "Could not connect to database." +#: ../../mod/setup.php:572 +msgid "" +"If your certificate is not recognized, members of other sites (who may " +"themselves have valid certificates) will get a warning message on their own " +"site complaining about security issues." +msgstr "If your certificate is not recognized, members of other hubs (who may themselves have valid certificates) will get a warning message on their own hub complaining about security issues." -#: ../../mod/setup.php:172 +#: ../../mod/setup.php:573 msgid "" -"Could not connect to specified site URL. Possible SSL certificate or DNS " -"issue." -msgstr "Could not connect to specified hub URL. Possible SSL certificate or DNS issue." +"This can cause usability issues elsewhere (not just on your own site) so we " +"must insist on this requirement." +msgstr "This can cause usability issues elsewhere (not just on your own hub) so we must insist on this requirement." -#: ../../mod/setup.php:179 -msgid "Could not create table." -msgstr "Could not create table." +#: ../../mod/setup.php:574 +msgid "" +"Providers are available that issue free certificates which are browser-" +"valid." +msgstr "Providers are available that issue free certificates which are browser-valid." -#: ../../mod/setup.php:185 -msgid "Your site database has been installed." -msgstr "Your hub database has been installed." +#: ../../mod/setup.php:576 +msgid "SSL certificate validation" +msgstr "SSL certificate validation" -#: ../../mod/setup.php:190 +#: ../../mod/setup.php:582 msgid "" -"You may need to import the file \"install/database.sql\" manually using " -"phpmyadmin or mysql." -msgstr "You may need to import the file \"install/database.sql\" manually using phpmyadmin or mysql." - -#: ../../mod/setup.php:191 ../../mod/setup.php:260 ../../mod/setup.php:655 -msgid "Please see the file \"install/INSTALL.txt\"." -msgstr "Please see the file \"install/INSTALL.txt\"." +"Url rewrite in .htaccess is not working. Check your server configuration." +msgstr "Url rewrite in .htaccess is not working. Check your server configuration." -#: ../../mod/setup.php:257 -msgid "System check" -msgstr "System check" +#: ../../mod/setup.php:584 +msgid "Url rewrite is working" +msgstr "Url rewrite is working" -#: ../../mod/setup.php:261 ../../mod/events.php:399 -msgid "Next" -msgstr "Volgende" +#: ../../mod/setup.php:594 +msgid "" +"The database configuration file \".htconfig.php\" could not be written. " +"Please use the enclosed text to create a configuration file in your web " +"server root." +msgstr "The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root." -#: ../../mod/setup.php:262 -msgid "Check again" -msgstr "Check again" +#: ../../mod/setup.php:618 +msgid "Errors encountered creating database tables." +msgstr "Errors encountered creating database tables." -#: ../../mod/setup.php:284 -msgid "Database connection" -msgstr "Database connection" +#: ../../mod/setup.php:653 +msgid "

    What next

    " +msgstr "

    Wat nu

    " -#: ../../mod/setup.php:285 +#: ../../mod/setup.php:654 msgid "" -"In order to install Red Matrix we need to know how to connect to your " -"database." -msgstr "In order to install RedMatrix we need to know how to connect to your database." +"IMPORTANT: You will need to [manually] setup a scheduled task for the " +"poller." +msgstr "IMPORTANT: You will need to [manually] setup a scheduled task for the poller." -#: ../../mod/setup.php:286 -msgid "" -"Please contact your hosting provider or site administrator if you have " -"questions about these settings." -msgstr "Please contact your hosting provider or site administrator if you have questions about these settings." +#: ../../mod/editblock.php:8 ../../mod/editblock.php:27 +#: ../../mod/editblock.php:53 ../../mod/editlayout.php:36 +#: ../../mod/editpost.php:20 ../../mod/editwebpage.php:32 +msgid "Item not found" +msgstr "Item niet gevonden" -#: ../../mod/setup.php:287 -msgid "" -"The database you specify below should already exist. If it does not, please " -"create it before continuing." -msgstr "The database you specify below should already exist. If it does not, please create it before continuing." +#: ../../mod/editblock.php:77 +msgid "Edit Block" +msgstr "Blok bewerken" -#: ../../mod/setup.php:291 -msgid "Database Server Name" -msgstr "Database Server Name" +#: ../../mod/editblock.php:87 +msgid "Delete block?" +msgstr "Blok verwijderen" -#: ../../mod/setup.php:291 -msgid "Default is localhost" -msgstr "Default is localhost" +#: ../../mod/editblock.php:115 ../../mod/editlayout.php:110 +#: ../../mod/editpost.php:116 ../../mod/editwebpage.php:147 +msgid "Insert YouTube video" +msgstr "YouTube-video invoegen" -#: ../../mod/setup.php:292 -msgid "Database Port" -msgstr "Database Port" +#: ../../mod/editblock.php:116 ../../mod/editlayout.php:111 +#: ../../mod/editpost.php:117 ../../mod/editwebpage.php:148 +msgid "Insert Vorbis [.ogg] video" +msgstr "Vorbis-video [.ogg] invoegen" -#: ../../mod/setup.php:292 -msgid "Communication port number - use 0 for default" -msgstr "Communication port number - use 0 for default" +#: ../../mod/editblock.php:117 ../../mod/editlayout.php:112 +#: ../../mod/editpost.php:118 ../../mod/editwebpage.php:149 +msgid "Insert Vorbis [.ogg] audio" +msgstr "Vorbis-audio [.ogg] invoegen" -#: ../../mod/setup.php:293 -msgid "Database Login Name" -msgstr "Database Login Name" +#: ../../mod/editblock.php:153 +msgid "Delete Block" +msgstr "Blok verwijderen" -#: ../../mod/setup.php:294 -msgid "Database Login Password" -msgstr "Database Login Password" +#: ../../mod/pdledit.php:13 +msgid "Layout updated." +msgstr "Layout bijgewerkt." -#: ../../mod/setup.php:295 -msgid "Database Name" -msgstr "Database Name" +#: ../../mod/pdledit.php:28 ../../mod/pdledit.php:53 +msgid "Edit System Page Description" +msgstr "Systeempagina's bewerken" -#: ../../mod/setup.php:297 ../../mod/setup.php:339 -msgid "Site administrator email address" -msgstr "Hub administrator email address" +#: ../../mod/pdledit.php:48 +msgid "Layout not found." +msgstr "Lay-out niet gevonden." -#: ../../mod/setup.php:297 ../../mod/setup.php:339 -msgid "" -"Your account email address must match this in order to use the web admin " -"panel." -msgstr "Your account email address must match this in order to use the web admin panel." +#: ../../mod/pdledit.php:54 +msgid "Module Name:" +msgstr "Modulenaam:" -#: ../../mod/setup.php:298 ../../mod/setup.php:341 -msgid "Website URL" -msgstr "Hub URL" +#: ../../mod/pdledit.php:55 ../../mod/layouts.php:59 +msgid "Layout Help" +msgstr "Lay-out-hulp" + +#: ../../mod/editlayout.php:72 +msgid "Edit Layout" +msgstr "Lay-out bewerken" -#: ../../mod/setup.php:298 ../../mod/setup.php:341 -msgid "Please use SSL (https) URL if available." -msgstr "Please use SSL (https) URL if available." +#: ../../mod/editlayout.php:82 +msgid "Delete layout?" +msgstr "Lay-out verwijderen?" -#: ../../mod/setup.php:301 ../../mod/setup.php:344 -msgid "Please select a default timezone for your website" -msgstr "Please select a default timezone for your hub" +#: ../../mod/editlayout.php:146 +msgid "Delete Layout" +msgstr "Lay-out verwijderen" -#: ../../mod/setup.php:328 -msgid "Site settings" -msgstr "Hub settings" +#: ../../mod/editpost.php:31 +msgid "Item is not editable" +msgstr "Item is niet te bewerken" -#: ../../mod/setup.php:387 -msgid "Could not find a command line version of PHP in the web server PATH." -msgstr "Could not find a command line version of PHP in the web server PATH." +#: ../../mod/editpost.php:53 +msgid "Delete item?" +msgstr "Item verwijderen?" -#: ../../mod/setup.php:388 -msgid "" -"If you don't have a command line version of PHP installed on server, you " -"will not be able to run background polling via cron." -msgstr "If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron." +#: ../../mod/editwebpage.php:106 +msgid "Edit Webpage" +msgstr "Webpagina bewerken" -#: ../../mod/setup.php:392 -msgid "PHP executable path" -msgstr "PHP executable path" +#: ../../mod/editwebpage.php:116 +msgid "Delete webpage?" +msgstr "Webpagina verwijderen?" -#: ../../mod/setup.php:392 -msgid "" -"Enter full path to php executable. You can leave this blank to continue the " -"installation." -msgstr "Enter full path to php executable. You can leave this blank to continue the installation." +#: ../../mod/editwebpage.php:186 +msgid "Delete Webpage" +msgstr "Webpagina verwijderen" -#: ../../mod/setup.php:397 -msgid "Command line PHP" -msgstr "Command line PHP" +#: ../../mod/siteinfo.php:57 +#, php-format +msgid "Version %s" +msgstr "Versie %s" -#: ../../mod/setup.php:406 -msgid "" -"The command line version of PHP on your system does not have " -"\"register_argc_argv\" enabled." -msgstr "The command line version of PHP on your system does not have \"register_argc_argv\" enabled." +#: ../../mod/siteinfo.php:76 +msgid "Installed plugins/addons/apps:" +msgstr "Ingeschakelde plug-ins/add-ons/apps:" -#: ../../mod/setup.php:407 -msgid "This is required for message delivery to work." -msgstr "This is required for message delivery to work." +#: ../../mod/siteinfo.php:89 +msgid "No installed plugins/addons/apps" +msgstr "Geen ingeschakelde plug-ins/add-ons/apps" -#: ../../mod/setup.php:409 -msgid "PHP register_argc_argv" -msgstr "PHP register_argc_argv" +#: ../../mod/siteinfo.php:97 +msgid "Red" +msgstr "Red" -#: ../../mod/setup.php:430 +#: ../../mod/siteinfo.php:98 msgid "" -"Error: the \"openssl_pkey_new\" function on this system is not able to " -"generate encryption keys" -msgstr "Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys" +"This is a hub of the Red Matrix - a global cooperative network of " +"decentralized privacy enhanced websites." +msgstr "Dit is een hub van de RedMatrix - een wereldwijd coöperatief netwerk van gedecentraliseerde websites met verbeterde privacy." -#: ../../mod/setup.php:431 +#: ../../mod/siteinfo.php:101 +msgid "Running at web location" +msgstr "Draaiend op weblocatie" + +#: ../../mod/siteinfo.php:102 msgid "" -"If running under Windows, please see " -"\"http://www.php.net/manual/en/openssl.installation.php\"." -msgstr "If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"." +"Please visit GetZot.com to learn more " +"about the Red Matrix." +msgstr "Bezoek RedMatrix.me om meer te leren over de RedMatrix." -#: ../../mod/setup.php:433 -msgid "Generate encryption keys" -msgstr "Generate encryption keys" +#: ../../mod/siteinfo.php:103 +msgid "Bug reports and issues: please visit" +msgstr "Bugrapporten en andere kwesties: bezoek" -#: ../../mod/setup.php:440 -msgid "libCurl PHP module" -msgstr "libCurl PHP module" +#: ../../mod/siteinfo.php:106 +msgid "" +"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot " +"com" +msgstr "Voorstellen, lofbetuigingen, enz. - e-mail \"redmatrix\" at librelist - dot com" -#: ../../mod/setup.php:441 -msgid "GD graphics PHP module" -msgstr "GD graphics PHP module" +#: ../../mod/siteinfo.php:108 +msgid "Site Administrators" +msgstr "Hubbeheerders" -#: ../../mod/setup.php:442 -msgid "OpenSSL PHP module" -msgstr "OpenSSL PHP module" +#: ../../mod/photos.php:77 +msgid "Page owner information could not be retrieved." +msgstr "Informatie over de pagina-eigenaar werd niet ontvangen." -#: ../../mod/setup.php:443 -msgid "mysqli PHP module" -msgstr "mysqli PHP module" +#: ../../mod/photos.php:97 +msgid "Album not found." +msgstr "Album niet gevonden." -#: ../../mod/setup.php:444 -msgid "mb_string PHP module" -msgstr "mb_string PHP module" +#: ../../mod/photos.php:119 ../../mod/photos.php:675 +msgid "Delete Album" +msgstr "Verwijder album" -#: ../../mod/setup.php:445 -msgid "mcrypt PHP module" -msgstr "mcrypt PHP module" +#: ../../mod/photos.php:159 ../../mod/photos.php:963 +msgid "Delete Photo" +msgstr "Verwijder foto" -#: ../../mod/setup.php:450 ../../mod/setup.php:452 -msgid "Apache mod_rewrite module" -msgstr "Apache mod_rewrite module" +#: ../../mod/photos.php:453 +msgid "No photos selected" +msgstr "Geen foto's geselecteerd" -#: ../../mod/setup.php:450 -msgid "" -"Error: Apache webserver mod-rewrite module is required but not installed." -msgstr "Error: Apache webserver mod-rewrite module is required but not installed." +#: ../../mod/photos.php:500 +msgid "Access to this item is restricted." +msgstr "Toegang tot dit item is beperkt." -#: ../../mod/setup.php:456 ../../mod/setup.php:459 -msgid "proc_open" -msgstr "proc_open" +#: ../../mod/photos.php:574 +#, php-format +msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." +msgstr "Je gebruiker %1$.2f MB van totaal %2$.2f MB foto-opslagruimte." -#: ../../mod/setup.php:456 -msgid "" -"Error: proc_open is required but is either not installed or has been " -"disabled in php.ini" -msgstr "Error: proc_open is required but is either not installed or has been disabled in php.ini" +#: ../../mod/photos.php:577 +#, php-format +msgid "You have used %1$.2f Mbytes of photo storage." +msgstr "Je gebruikt %1$.2f MB aan foto-opslagruimte." -#: ../../mod/setup.php:464 -msgid "Error: libCURL PHP module required but not installed." -msgstr "Error: libCURL PHP module required but not installed." +#: ../../mod/photos.php:596 +msgid "Upload Photos" +msgstr "Foto's uploaden" -#: ../../mod/setup.php:468 -msgid "" -"Error: GD graphics PHP module with JPEG support required but not installed." -msgstr "Error: GD graphics PHP module with JPEG support required but not installed." +#: ../../mod/photos.php:600 ../../mod/photos.php:670 +msgid "New album name: " +msgstr "Nieuwe albumnaam: " -#: ../../mod/setup.php:472 -msgid "Error: openssl PHP module required but not installed." -msgstr "Error: openssl PHP module required but not installed." +#: ../../mod/photos.php:601 +msgid "or existing album name: " +msgstr "of een bestaande albumnaam: " -#: ../../mod/setup.php:476 -msgid "Error: mysqli PHP module required but not installed." -msgstr "Error: mysqli PHP module required but not installed." +#: ../../mod/photos.php:602 +msgid "Do not show a status post for this upload" +msgstr "Plaats geen bericht voor deze upload." -#: ../../mod/setup.php:480 -msgid "Error: mb_string PHP module required but not installed." -msgstr "Error: mb_string PHP module required but not installed." +#: ../../mod/photos.php:622 +msgid "Album name could not be decoded" +msgstr "Albumnaam kon niet gedecodeerd worden" -#: ../../mod/setup.php:484 -msgid "Error: mcrypt PHP module required but not installed." -msgstr "Error: mcrypt PHP module required but not installed." +#: ../../mod/photos.php:659 ../../mod/photos.php:681 ../../mod/photos.php:1135 +#: ../../mod/photos.php:1150 +msgid "Contact Photos" +msgstr "Connectiefoto's" -#: ../../mod/setup.php:500 -msgid "" -"The web installer needs to be able to create a file called \".htconfig.php\"" -" in the top folder of your web server and it is unable to do so." -msgstr "The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so." +#: ../../mod/photos.php:685 +msgid "Edit Album" +msgstr "Album bewerken" -#: ../../mod/setup.php:501 -msgid "" -"This is most often a permission setting, as the web server may not be able " -"to write files in your folder - even if you can." -msgstr "This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can." +#: ../../mod/photos.php:691 +msgid "Show Newest First" +msgstr "Nieuwste eerst weergeven" -#: ../../mod/setup.php:502 -msgid "" -"At the end of this procedure, we will give you a text to save in a file " -"named .htconfig.php in your Red top folder." -msgstr "At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Red top folder." +#: ../../mod/photos.php:693 +msgid "Show Oldest First" +msgstr "Oudste eerst weergeven" -#: ../../mod/setup.php:503 -msgid "" -"You can alternatively skip this procedure and perform a manual installation." -" Please see the file \"install/INSTALL.txt\" for instructions." -msgstr "You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions." +#: ../../mod/photos.php:736 ../../mod/photos.php:1182 +msgid "View Photo" +msgstr "Foto weergeven" -#: ../../mod/setup.php:506 -msgid ".htconfig.php is writable" -msgstr ".htconfig.php is writable" +#: ../../mod/photos.php:782 +msgid "Permission denied. Access to this item may be restricted." +msgstr "Toegang geweigerd. Toegang tot dit item kan zijn beperkt." -#: ../../mod/setup.php:516 -msgid "" -"Red uses the Smarty3 template engine to render its web views. Smarty3 " -"compiles templates to PHP to speed up rendering." -msgstr "Red uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering." +#: ../../mod/photos.php:784 +msgid "Photo not available" +msgstr "Foto niet aanwezig" -#: ../../mod/setup.php:517 -#, php-format -msgid "" -"In order to store these compiled templates, the web server needs to have " -"write access to the directory %s under the Red top level folder." -msgstr "In order to store these compiled templates, the web server needs to have write access to the directory %s under the Red top level folder." +#: ../../mod/photos.php:844 +msgid "Use as profile photo" +msgstr "Als profielfoto gebruiken" -#: ../../mod/setup.php:518 ../../mod/setup.php:536 -msgid "" -"Please ensure that the user that your web server runs as (e.g. www-data) has" -" write access to this folder." -msgstr "Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder." +#: ../../mod/photos.php:868 +msgid "View Full Size" +msgstr "Volledige grootte weergeven" + +#: ../../mod/photos.php:946 +msgid "Edit photo" +msgstr "Foto bewerken" -#: ../../mod/setup.php:519 -#, php-format -msgid "" -"Note: as a security measure, you should give the web server write access to " -"%s only--not the template files (.tpl) that it contains." -msgstr "Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains." +#: ../../mod/photos.php:948 +msgid "Rotate CW (right)" +msgstr "Draai met de klok mee (naar rechts)" -#: ../../mod/setup.php:522 -#, php-format -msgid "%s is writable" -msgstr "%s is writable" +#: ../../mod/photos.php:949 +msgid "Rotate CCW (left)" +msgstr "Draai tegen de klok in (naar links)" -#: ../../mod/setup.php:535 -msgid "" -"Red uses the store directory to save uploaded files. The web server needs to" -" have write access to the store directory under the Red top level folder" -msgstr "Red uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the Red top level folder" +#: ../../mod/photos.php:952 +msgid "New album name" +msgstr "Nieuwe albumnaam" -#: ../../mod/setup.php:539 -msgid "store is writable" -msgstr "store is writable" +#: ../../mod/photos.php:955 +msgid "Caption" +msgstr "Bijschrift" -#: ../../mod/setup.php:569 -msgid "" -"SSL certificate cannot be validated. Fix certificate or disable https access" -" to this site." -msgstr "SSL certificate cannot be validated. Fix certificate or disable https access to this hub." +#: ../../mod/photos.php:957 +msgid "Add a Tag" +msgstr "Label toevoegen" -#: ../../mod/setup.php:570 +#: ../../mod/photos.php:960 msgid "" -"If you have https access to your website or allow connections to TCP port " -"443 (the https: port), you MUST use a browser-valid certificate. You MUST " -"NOT use self-signed certificates!" -msgstr "If you have https access to your hub or allow connections to TCP port 443 (the https: port), you MUST use a browser-valid certificate. You MUST NOT use self-signed certificates!" +"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" +msgstr "Voorbeeld: @bob, @Barbara_Jansen, @jan@example.com, #Friesland, #camping" -#: ../../mod/setup.php:571 -msgid "" -"This restriction is incorporated because public posts from you may for " -"example contain references to images on your own hub." -msgstr "This restriction is incorporated because public posts from you may for example contain references to images on your own hub." +#: ../../mod/photos.php:1113 +msgid "In This Photo:" +msgstr "Op deze foto:" -#: ../../mod/setup.php:572 -msgid "" -"If your certificate is not recognized, members of other sites (who may " -"themselves have valid certificates) will get a warning message on their own " -"site complaining about security issues." -msgstr "If your certificate is not recognized, members of other hubs (who may themselves have valid certificates) will get a warning message on their own hub complaining about security issues." +#: ../../mod/photos.php:1188 +msgid "View Album" +msgstr "Album weergeven" -#: ../../mod/setup.php:573 -msgid "" -"This can cause usability issues elsewhere (not just on your own site) so we " -"must insist on this requirement." -msgstr "This can cause usability issues elsewhere (not just on your own hub) so we must insist on this requirement." +#: ../../mod/photos.php:1197 +msgid "Recent Photos" +msgstr "Recente foto's" -#: ../../mod/setup.php:574 -msgid "" -"Providers are available that issue free certificates which are browser-" -"valid." -msgstr "Providers are available that issue free certificates which are browser-valid." +#: ../../mod/sources.php:32 +msgid "Failed to create source. No channel selected." +msgstr "Aanmaken bron mislukt. Geen kanaal geselecteerd." -#: ../../mod/setup.php:576 -msgid "SSL certificate validation" -msgstr "SSL certificate validation" +#: ../../mod/sources.php:45 +msgid "Source created." +msgstr "Bron aangemaakt." -#: ../../mod/setup.php:582 -msgid "" -"Url rewrite in .htaccess is not working. Check your server configuration." -msgstr "Url rewrite in .htaccess is not working. Check your server configuration." +#: ../../mod/sources.php:57 +msgid "Source updated." +msgstr "Bron aangemaakt." -#: ../../mod/setup.php:584 -msgid "Url rewrite is working" -msgstr "Url rewrite is working" +#: ../../mod/sources.php:82 +msgid "*" +msgstr "*" -#: ../../mod/setup.php:594 +#: ../../mod/sources.php:89 +msgid "Manage remote sources of content for your channel." +msgstr "Beheer externe bronnen met inhoud voor jouw kanaal" + +#: ../../mod/sources.php:90 ../../mod/sources.php:100 +msgid "New Source" +msgstr "Nieuwe bron" + +#: ../../mod/sources.php:101 ../../mod/sources.php:133 msgid "" -"The database configuration file \".htconfig.php\" could not be written. " -"Please use the enclosed text to create a configuration file in your web " -"server root." -msgstr "The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root." +"Import all or selected content from the following channel into this channel " +"and distribute it according to your channel settings." +msgstr "Importeer complete of gedeelde inhoud vanuit het volgende kanaal naar dit kanaal, en verdeel het vervolgens volgens jouw kanaalinstellingen." -#: ../../mod/setup.php:618 -msgid "Errors encountered creating database tables." -msgstr "Errors encountered creating database tables." +#: ../../mod/sources.php:102 ../../mod/sources.php:134 +msgid "Only import content with these words (one per line)" +msgstr "Importeer alleen inhoud met deze woorden (één per regel)" -#: ../../mod/setup.php:653 -msgid "

    What next

    " -msgstr "

    Wat nu

    " +#: ../../mod/sources.php:102 ../../mod/sources.php:134 +msgid "Leave blank to import all public content" +msgstr "Laat leeg om alle openbare inhoud te importeren" -#: ../../mod/setup.php:654 -msgid "" -"IMPORTANT: You will need to [manually] setup a scheduled task for the " -"poller." -msgstr "IMPORTANT: You will need to [manually] setup a scheduled task for the poller." +#: ../../mod/sources.php:103 ../../mod/sources.php:137 +#: ../../mod/new_channel.php:110 +msgid "Channel Name" +msgstr "Kanaalnaam" -#: ../../mod/magic.php:70 -msgid "Hub not found." -msgstr "Hub niet gevonden." +#: ../../mod/sources.php:123 ../../mod/sources.php:150 +msgid "Source not found." +msgstr "Bron niet gevonden" -#: ../../mod/invite.php:25 -msgid "Total invitation limit exceeded." -msgstr "Limiet voor aantal uitnodigingen overschreden." +#: ../../mod/sources.php:130 +msgid "Edit Source" +msgstr "Bron bewerken" -#: ../../mod/invite.php:49 -#, php-format -msgid "%s : Not a valid email address." -msgstr "%s : Geen geldig e-mailadres." +#: ../../mod/sources.php:131 +msgid "Delete Source" +msgstr "Bron verwijderen" -#: ../../mod/invite.php:76 -msgid "Please join us on Red" -msgstr "Kom op de RedMatrix" +#: ../../mod/sources.php:158 +msgid "Source removed" +msgstr "Bron verwijderd" -#: ../../mod/invite.php:87 -msgid "Invitation limit exceeded. Please contact your site administrator." -msgstr "Limiet voor aantal uitnodigingen overschreden. Neem contact op met je hub-beheerder." +#: ../../mod/sources.php:160 +msgid "Unable to remove source." +msgstr "Verwijderen bron mislukt." -#: ../../mod/invite.php:92 -#, php-format -msgid "%s : Message delivery failed." -msgstr "%s: Aflevering bericht mislukt." +#: ../../mod/filer.php:49 +msgid "- select -" +msgstr "- kies map -" -#: ../../mod/invite.php:96 -#, php-format -msgid "%d message sent." -msgid_plural "%d messages sent." -msgstr[0] "%d bericht verzonden." -msgstr[1] "%d berichten verzonden." +#: ../../mod/events.php:72 +msgid "Event title and start time are required." +msgstr "Titel en begintijd van gebeurtenis zijn vereist." -#: ../../mod/invite.php:115 -msgid "You have no more invitations available" -msgstr "Je hebt geen uitnodigingen meer beschikbaar" +#: ../../mod/events.php:86 +msgid "Event not found." +msgstr "Gebeurtenis niet gevonden" -#: ../../mod/invite.php:141 -msgid "Send invitations" -msgstr "Uitnodigingen verzenden" +#: ../../mod/events.php:329 +msgid "l, F j" +msgstr "l j F" -#: ../../mod/invite.php:142 -msgid "Enter email addresses, one per line:" -msgstr "Voer e-mailadressen in, één per regel:" +#: ../../mod/events.php:351 +msgid "Edit event" +msgstr "Gebeurtenis bewerken" -#: ../../mod/invite.php:143 ../../mod/mail.php:225 ../../mod/mail.php:338 -msgid "Your message:" -msgstr "Jouw bericht:" +#: ../../mod/events.php:397 +msgid "Create New Event" +msgstr "Nieuwe gebeurtenis aanmaken" -#: ../../mod/invite.php:144 -msgid "" -"You are cordially invited to join me and some other close friends on the Red" -" Matrix - a revolutionary new decentralized communication and information " -"tool." -msgstr "Je bent hierbij uitgenodigd om mij, en enkele goede vrienden, te komen vergezellen op de RedMatrix - een revolutionaire nieuwe communicatie- en informatietool." +#: ../../mod/events.php:398 +msgid "Previous" +msgstr "Vorige" -#: ../../mod/invite.php:146 -msgid "You will need to supply this invitation code: $invite_code" -msgstr "Je moet deze uitnodigingscode geven: $invite_code" +#: ../../mod/events.php:469 +msgid "hour:minute" +msgstr "uur:minuut" -#: ../../mod/invite.php:147 -msgid "Please visit my channel at" -msgstr "Bezoek mijn kanaal op" +#: ../../mod/events.php:489 +msgid "Event details" +msgstr "Details van gebeurtenis" -#: ../../mod/invite.php:151 -msgid "" -"Once you have registered (on ANY Red Matrix site - they are all inter-" -"connected), please connect with my Red Matrix channel address:" -msgstr "Wanneer je je eenmaal hebt geregistreerd (maakt niet uit op welke RedMatrix-hub, want ze zijn allemaal met elkaar verbonden), kan je je met mijn RedMatrix-kanaal verbinden:" +#: ../../mod/events.php:490 +#, php-format +msgid "Format is %s %s. Starting date and Title are required." +msgstr "Volgorde is %s %s. Begintijd en titel zijn vereist." -#: ../../mod/invite.php:153 -msgid "Click the [Register] link on the following page to join." -msgstr "Klik op de link [Registreren] op de volgende pagina om je aan te melden." +#: ../../mod/events.php:492 +msgid "Event Starts:" +msgstr "Begin gebeurtenis:" -#: ../../mod/invite.php:155 -msgid "" -"For more information about the Red Matrix Project and why it has the " -"potential to change the internet as we know it, please visit " -"http://getzot.com" -msgstr "Bezoek http://getzot.com voor meer informatie over het RedMatrix-project en waarom het de potentie heeft het internet voor altijd te veranderen." +#: ../../mod/events.php:492 ../../mod/events.php:506 ../../mod/appman.php:91 +#: ../../mod/appman.php:92 +msgid "Required" +msgstr "Vereist" -#: ../../mod/thing.php:98 -msgid "Thing updated" -msgstr "Ding bijgewerkt" +#: ../../mod/events.php:495 +msgid "Finish date/time is not known or not relevant" +msgstr "Einddatum/-tijd is niet bekend of niet relevant" -#: ../../mod/thing.php:158 -msgid "Object store: failed" -msgstr "Opslaan van ding mislukt" +#: ../../mod/events.php:497 +msgid "Event Finishes:" +msgstr "Einde gebeurtenis:" -#: ../../mod/thing.php:162 -msgid "Thing added" -msgstr "Ding toegevoegd" +#: ../../mod/events.php:500 +msgid "Adjust for viewer timezone" +msgstr "Aanpassen aan de tijdzone van wie deze gebeurtenis bekijkt" -#: ../../mod/thing.php:182 -#, php-format -msgid "OBJ: %1$s %2$s %3$s" -msgstr "OBJ: %1$s %2$s %3$s" +#: ../../mod/events.php:502 +msgid "Description:" +msgstr "Omschrijving:" -#: ../../mod/thing.php:234 -msgid "Show Thing" -msgstr "Ding weergeven" +#: ../../mod/events.php:506 +msgid "Title:" +msgstr "Titel:" -#: ../../mod/thing.php:241 -msgid "item not found." -msgstr "Item niet gevonden" +#: ../../mod/events.php:508 +msgid "Share this event" +msgstr "Deel deze gebeurtenis" -#: ../../mod/thing.php:272 -msgid "Edit Thing" -msgstr "Ding bewerken" +#: ../../mod/filestorage.php:68 +msgid "Permission Denied." +msgstr "Toegang geweigerd" -#: ../../mod/thing.php:274 ../../mod/thing.php:321 -msgid "Select a profile" -msgstr "Kies een profiel" +#: ../../mod/filestorage.php:85 +msgid "File not found." +msgstr "Bestand niet gevonden." -#: ../../mod/thing.php:278 ../../mod/thing.php:324 -msgid "Post an activity" -msgstr "Plaats een bericht" +#: ../../mod/filestorage.php:122 +msgid "Edit file permissions" +msgstr "Bestandsrechten bewerken" -#: ../../mod/thing.php:278 ../../mod/thing.php:324 -msgid "Only sends to viewers of the applicable profile" -msgstr "Toont dit alleen aan diegene die het gekozen profiel mogen zien." +#: ../../mod/filestorage.php:131 +msgid "Set/edit permissions" +msgstr "Rechten instellen/bewerken" -#: ../../mod/thing.php:280 ../../mod/thing.php:326 -msgid "Name of thing e.g. something" -msgstr "Naam van ding" +#: ../../mod/filestorage.php:132 +msgid "Include all files and sub folders" +msgstr "Toepassen op alle bestanden en submappen" -#: ../../mod/thing.php:282 ../../mod/thing.php:327 -msgid "URL of thing (optional)" -msgstr "URL van ding (optioneel)" +#: ../../mod/filestorage.php:133 +msgid "Return to file list" +msgstr "Terugkeren naar bestandlijst " -#: ../../mod/thing.php:284 ../../mod/thing.php:328 -msgid "URL for photo of thing (optional)" -msgstr "URL van foto van ding (optioneel)" +#: ../../mod/filestorage.php:135 +msgid "Copy/paste this code to attach file to a post" +msgstr "Kopieer/plak deze code om het bestand aan een bericht te koppelen" -#: ../../mod/thing.php:319 -msgid "Add Thing to your Profile" -msgstr "Ding aan je profiel toevoegen" +#: ../../mod/filestorage.php:136 +msgid "Copy/paste this URL to link file from a web page" +msgstr "Kopieer/plak deze URL om het bestand aan een externe webpagina te koppelen" -#: ../../mod/oexchange.php:23 -msgid "Unable to find your hub." -msgstr "Niet in staat om je hub te vinden" +#: ../../mod/follow.php:25 +msgid "Channel added." +msgstr "Kanaal toegevoegd." -#: ../../mod/oexchange.php:37 -msgid "Post successful." -msgstr "Verzenden bericht geslaagd." +#: ../../mod/subthread.php:103 +#, php-format +msgid "%1$s is following %2$s's %3$s" +msgstr "%1$s volgt het %3$s van %2$s" -#: ../../mod/help.php:43 ../../mod/help.php:49 ../../mod/help.php:55 -msgid "Help:" -msgstr "Hulp:" +#: ../../mod/fsuggest.php:20 ../../mod/fsuggest.php:92 +msgid "Contact not found." +msgstr "Contact niet gevonden" -#: ../../mod/help.php:69 ../../index.php:233 -msgid "Not Found" -msgstr "Niet gevonden" +#: ../../mod/fsuggest.php:63 +msgid "Friend suggestion sent." +msgstr "Kanaalvoorstel verzonden." -#: ../../mod/viewconnections.php:58 -msgid "No connections." -msgstr "Geen connecties." +#: ../../mod/fsuggest.php:97 +msgid "Suggest Friends" +msgstr "Kanalen voorstellen" -#: ../../mod/viewconnections.php:71 +#: ../../mod/fsuggest.php:99 #, php-format -msgid "Visit %s's profile [%s]" -msgstr "Bezoek het profiel van %s [%s]" +msgid "Suggest a friend for %s" +msgstr "Stel een kanaal voor aan %s" -#: ../../mod/viewconnections.php:86 -msgid "View Connnections" -msgstr "Connecties weergeven" +#: ../../mod/suggest.php:35 +msgid "" +"No suggestions available. If this is a new site, please try again in 24 " +"hours." +msgstr "Geen voorgestelde kanalen gevonden. Wanneer dit een nieuwe hub is, probeer het dan over 24 uur weer." -#: ../../mod/profperm.php:29 ../../mod/profperm.php:58 -msgid "Invalid profile identifier." -msgstr "Ongeldige profiel-identificator" +#: ../../mod/group.php:20 +msgid "Collection created." +msgstr "Collectie aangemaakt" -#: ../../mod/profperm.php:110 -msgid "Profile Visibility Editor" -msgstr "Zichtbaarheid profiel " +#: ../../mod/group.php:26 +msgid "Could not create collection." +msgstr "Collectie kon niet aangemaakt worden" -#: ../../mod/profperm.php:114 -msgid "Click on a contact to add or remove." -msgstr "Klik op een connectie om deze toe te voegen of te verwijderen" +#: ../../mod/group.php:54 +msgid "Collection updated." +msgstr "Collectie bijgewerkt." -#: ../../mod/profperm.php:123 -msgid "Visible To" -msgstr "Zichtbaar voor" +#: ../../mod/group.php:86 +msgid "Create a collection of channels." +msgstr "Kanaalcollectie aanmaken" -#: ../../mod/register.php:43 -msgid "Maximum daily site registrations exceeded. Please try again tomorrow." -msgstr "Maximum toegestane dagelijkse registraties op deze RedMatrix-hub bereikt. Probeer het morgen (UTC) nogmaals." +#: ../../mod/group.php:87 ../../mod/group.php:183 +msgid "Collection Name: " +msgstr "Naam collectie:" -#: ../../mod/register.php:49 -msgid "" -"Please indicate acceptance of the Terms of Service. Registration failed." -msgstr "Registratie mislukt. De gebruiksvoorwaarden dienen wel geaccepteerd te worden." +#: ../../mod/group.php:89 ../../mod/group.php:186 +msgid "Members are visible to other channels" +msgstr "Kanalen in deze collectie zijn zichtbaar voor andere kanalen" -#: ../../mod/register.php:83 -msgid "Passwords do not match." -msgstr "Wachtwoorden komen niet met elkaar overeen." +#: ../../mod/group.php:107 +msgid "Collection removed." +msgstr "Collectie verwijderd" -#: ../../mod/register.php:116 -msgid "" -"Registration successful. Please check your email for validation " -"instructions." -msgstr "Registratie geslaagd. Controleer je e-mail voor instructies om je e-mail te bevestigen." +#: ../../mod/group.php:109 +msgid "Unable to remove collection." +msgstr "Verwijderen collectie mislukt" -#: ../../mod/register.php:122 -msgid "Your registration is pending approval by the site owner." -msgstr "Jouw accountregistratie wacht op goedkeuring van de beheerder van deze RedMatrix-hub." +#: ../../mod/group.php:182 +msgid "Collection Editor" +msgstr "Collectiebewerker" -#: ../../mod/register.php:125 -msgid "Your registration can not be processed." -msgstr "Jouw registratie kan niet verwerkt worden." +#: ../../mod/group.php:196 +msgid "Members" +msgstr "Kanalen" -#: ../../mod/register.php:162 -msgid "Registration on this site/hub is by approval only." -msgstr "Registraties op deze RedMatrix-hub moeten eerst worden goedgekeurd." +#: ../../mod/group.php:198 +msgid "All Connected Channels" +msgstr "Alle kanaalconnecties" -#: ../../mod/register.php:163 -msgid "Register at another affiliated site/hub" -msgstr "Registreer op een andere RedMatrix-hub" +#: ../../mod/group.php:233 +msgid "Click on a channel to add or remove." +msgstr "Klik op een kanaal om deze toe te voegen of te verwijderen." -#: ../../mod/register.php:171 -msgid "" -"This site has exceeded the number of allowed daily account registrations. " -"Please try again tomorrow." -msgstr "Deze RedMatrix-hub heeft het maximum aantal dagelijks toegestane registraties bereikt. Probeer het morgen (UTC) nogmaals." +#: ../../mod/tagger.php:98 +#, php-format +msgid "%1$s tagged %2$s's %3$s with %4$s" +msgstr "%1$s labelde het %3$s van %2$s met %4$s" -#: ../../mod/register.php:182 -msgid "Terms of Service" -msgstr "Gebruiksvoorwaarden" +#: ../../mod/help.php:43 ../../mod/help.php:49 ../../mod/help.php:55 +msgid "Help:" +msgstr "Hulp:" -#: ../../mod/register.php:188 -#, php-format -msgid "I accept the %s for this website" -msgstr "Ik accepteer de %s van deze RedMatrix-hub" +#: ../../mod/help.php:69 ../../index.php:233 +msgid "Not Found" +msgstr "Niet gevonden" -#: ../../mod/register.php:190 -#, php-format -msgid "I am over 13 years of age and accept the %s for this website" -msgstr "Ik accepteer de %s van deze RedMatrix-hub" +#: ../../mod/tagrm.php:41 +msgid "Tag removed" +msgstr "Label verwijderd" -#: ../../mod/register.php:209 -msgid "Membership on this site is by invitation only." -msgstr "Registreren op deze RedMatrix-hub kan alleen op uitnodiging." +#: ../../mod/tagrm.php:79 +msgid "Remove Item Tag" +msgstr "Verwijder itemlabel" -#: ../../mod/register.php:210 -msgid "Please enter your invitation code" -msgstr "Vul jouw uitnodigingscode in" +#: ../../mod/tagrm.php:81 +msgid "Select a tag to remove: " +msgstr "Kies een label om te verwijderen" -#: ../../mod/register.php:213 -msgid "Your email address" -msgstr "Jouw e-mailadres" +#: ../../mod/admin.php:52 +msgid "Theme settings updated." +msgstr "Thema-instellingen bijgewerkt." -#: ../../mod/register.php:214 -msgid "Choose a password" -msgstr "Geef een wachtwoord op" +#: ../../mod/admin.php:97 ../../mod/admin.php:450 +msgid "Site" +msgstr "Hub-instellingen" -#: ../../mod/register.php:215 -msgid "Please re-enter your password" -msgstr "Geef het wachtwoord opnieuw op" +#: ../../mod/admin.php:98 +msgid "Accounts" +msgstr "Accounts" -#: ../../mod/network.php:79 -msgid "No such group" -msgstr "Collectie niet gevonden" +#: ../../mod/admin.php:99 ../../mod/admin.php:894 +msgid "Channels" +msgstr "Kanalen" -#: ../../mod/network.php:118 -msgid "Search Results For:" -msgstr "Zoekresultaten voor:" +#: ../../mod/admin.php:100 ../../mod/admin.php:985 ../../mod/admin.php:1027 +msgid "Plugins" +msgstr "Plug-ins" -#: ../../mod/network.php:172 -msgid "Collection is empty" -msgstr "Collectie is leeg" +#: ../../mod/admin.php:101 ../../mod/admin.php:1190 ../../mod/admin.php:1226 +msgid "Themes" +msgstr "Thema's" -#: ../../mod/network.php:180 -msgid "Collection: " -msgstr "Collectie: " +#: ../../mod/admin.php:102 ../../mod/admin.php:550 +msgid "Server" +msgstr "Hubbeheer" -#: ../../mod/network.php:193 -msgid "Connection: " -msgstr "Connectie: " +#: ../../mod/admin.php:103 +msgid "Profile Config" +msgstr "Profielconfiguratie" + +#: ../../mod/admin.php:104 +msgid "DB updates" +msgstr "Database-updates" + +#: ../../mod/admin.php:118 ../../mod/admin.php:125 ../../mod/admin.php:1313 +msgid "Logs" +msgstr "Logboeken" + +#: ../../mod/admin.php:124 +msgid "Plugin Features" +msgstr "Plug-in-opties" -#: ../../mod/network.php:196 -msgid "Invalid connection." -msgstr "Ongeldige connectie." +#: ../../mod/admin.php:126 +msgid "User registrations waiting for confirmation" +msgstr "Accountregistraties die op goedkeuring wachten" -#: ../../mod/delegate.php:95 -msgid "No potential page delegates located." -msgstr "Geen gevolmachtigde personen gevonden waaraan mogelijk het accountbeheer kan worden uitbesteed." +#: ../../mod/admin.php:206 +msgid "Message queues" +msgstr "Berichtenwachtrij" -#: ../../mod/delegate.php:121 -msgid "Delegate Page Management" -msgstr "Accountbeheer uitbesteden" +#: ../../mod/admin.php:211 ../../mod/admin.php:449 ../../mod/admin.php:549 +#: ../../mod/admin.php:758 ../../mod/admin.php:893 ../../mod/admin.php:984 +#: ../../mod/admin.php:1026 ../../mod/admin.php:1189 ../../mod/admin.php:1225 +#: ../../mod/admin.php:1312 +msgid "Administration" +msgstr "Beheer" -#: ../../mod/delegate.php:123 -msgid "" -"Delegates are able to manage all aspects of this account/page except for " -"basic account settings. Please do not delegate your personal account to " -"anybody that you do not trust completely." -msgstr "Gevolmachtigde personen zijn in staat om alle aspecten van dit account te beheren, behalve enkele basisinstellingen. Besteed het beheer van je persoonlijke account niet aan iemand uit die je niet volledig vertrouwd." +#: ../../mod/admin.php:212 +msgid "Summary" +msgstr "Samenvatting" -#: ../../mod/delegate.php:124 -msgid "Existing Page Managers" -msgstr "Bestaande accountbeheerders" +#: ../../mod/admin.php:214 +msgid "Registered users" +msgstr "Geregistreerde gebruikers" -#: ../../mod/delegate.php:126 -msgid "Existing Page Delegates" -msgstr "Bestaande gevolmachtigde accountbeheerders" +#: ../../mod/admin.php:216 ../../mod/admin.php:553 +msgid "Pending registrations" +msgstr "Accounts die op goedkeuring wachten" -#: ../../mod/delegate.php:128 -msgid "Potential Delegates" -msgstr "Gevolmachtigde personen waaraan mogelijk het accountbeheer kan worden uitbesteed." +#: ../../mod/admin.php:217 +msgid "Version" +msgstr "Versie" -#: ../../mod/delegate.php:131 -msgid "Add" -msgstr "Toevoegen" +#: ../../mod/admin.php:219 ../../mod/admin.php:554 +msgid "Active plugins" +msgstr "Ingeschakelde plug-ins" -#: ../../mod/delegate.php:132 -msgid "No entries." -msgstr "Geen" +#: ../../mod/admin.php:370 +msgid "Site settings updated." +msgstr "Hub-instellingen bijgewerkt." -#: ../../mod/connect.php:55 ../../mod/connect.php:103 -msgid "Continue" -msgstr "Ga verder" +#: ../../mod/admin.php:401 +msgid "No special theme for accessibility" +msgstr "Geen speciaal thema voor universele toegang" -#: ../../mod/connect.php:84 -msgid "Premium Channel Setup" -msgstr "Instellen premiumkanaal " +#: ../../mod/admin.php:430 +msgid "Yes - with approval" +msgstr "Ja - met goedkeuring" -#: ../../mod/connect.php:86 -msgid "Enable premium channel connection restrictions" -msgstr "Restricties voor connecties van premiumkanaal toestaan" +#: ../../mod/admin.php:436 +msgid "My site is not a public server" +msgstr "Mijn RedMatrix-hub is niet openbaar" -#: ../../mod/connect.php:87 -msgid "" -"Please enter your restrictions or conditions, such as paypal receipt, usage " -"guidelines, etc." -msgstr "Vul je restricties of voorwaarden in, zoals een paypal-afschrift, gebruikersvoorschriften, enz." +#: ../../mod/admin.php:437 +msgid "My site has paid access only" +msgstr "Mijn RedMatrix-hub kent alleen betaalde toegang" -#: ../../mod/connect.php:89 ../../mod/connect.php:109 -msgid "" -"This channel may require additional steps or acknowledgement of the " -"following conditions prior to connecting:" -msgstr "Dit kanaal kan extra stappen of het accepteren van de volgende voorwaarden vereisen, voordat de connectie wordt geaccepteerd:" +#: ../../mod/admin.php:438 +msgid "My site has free access only" +msgstr "Mijn RedMatrix-hub kent alleen gratis toegang" -#: ../../mod/connect.php:90 -msgid "" -"Potential connections will then see the following text before proceeding:" -msgstr "Mogelijke connecties zullen dan de volgende tekst zien voordat ze verder kunnen:" +#: ../../mod/admin.php:439 +msgid "My site offers free accounts with optional paid upgrades" +msgstr "Mijn RedMatrix-hub biedt gratis accounts aan met betaalde uitbreidingen als optie" -#: ../../mod/connect.php:91 ../../mod/connect.php:112 -msgid "" -"By continuing, I certify that I have complied with any instructions provided" -" on this page." -msgstr "Door verder te gaan ga ik automatisch akkoord met alle voorwaarden en aanwijzingen op deze pagina." +#: ../../mod/admin.php:453 +msgid "File upload" +msgstr "Bestand uploaden" -#: ../../mod/connect.php:100 -msgid "(No specific instructions have been provided by the channel owner.)" -msgstr "(Er zijn geen speciale voorwaarden en aanwijzingen door de kanaal-eigenaar verstrekt) " +#: ../../mod/admin.php:454 +msgid "Policies" +msgstr "Beleid" -#: ../../mod/connect.php:108 -msgid "Restricted or Premium Channel" -msgstr "Beperkt of premiumkanaal" +#: ../../mod/admin.php:459 +msgid "Site name" +msgstr "Naam van deze RedMatrix-hub" -#: ../../mod/fsuggest.php:20 ../../mod/fsuggest.php:92 -msgid "Contact not found." -msgstr "Contact niet gevonden" +#: ../../mod/admin.php:460 +msgid "Banner/Logo" +msgstr "Banner/logo" -#: ../../mod/fsuggest.php:63 -msgid "Friend suggestion sent." -msgstr "Kanaalvoorstel verzonden." +#: ../../mod/admin.php:461 +msgid "Administrator Information" +msgstr "Informatie over de beheerder van deze hub" -#: ../../mod/fsuggest.php:97 -msgid "Suggest Friends" -msgstr "Kanalen voorstellen" +#: ../../mod/admin.php:461 +msgid "" +"Contact information for site administrators. Displayed on siteinfo page. " +"BBCode can be used here" +msgstr "Contactinformatie voor hub-beheerders. Getoond op pagina met hub-informatie. Er kan hier bbcode gebruikt worden." -#: ../../mod/fsuggest.php:99 -#, php-format -msgid "Suggest a friend for %s" -msgstr "Stel een kanaal voor aan %s" +#: ../../mod/admin.php:462 +msgid "System language" +msgstr "Standaardtaal" -#: ../../mod/manage.php:136 -#, php-format -msgid "You have created %1$.0f of %2$.0f allowed channels." -msgstr "Je hebt %1$.0f van totaal %2$.0f toegestane kanalen aangemaakt." +#: ../../mod/admin.php:463 +msgid "System theme" +msgstr "Standaardthema" -#: ../../mod/manage.php:144 -msgid "Create a new channel" -msgstr "Nieuw kanaal aanmaken" +#: ../../mod/admin.php:463 +msgid "" +"Default system theme - may be over-ridden by user profiles - change theme settings" +msgstr "Standaardthema voor RedMatrix-hub (kan door gebruiker veranderd worden) - verander thema-instellingen" -#: ../../mod/manage.php:148 -msgid "Channel Manager" -msgstr "Kanaalbeheerder" +#: ../../mod/admin.php:464 +msgid "Mobile system theme" +msgstr "Standaardthema voor mobiel" -#: ../../mod/manage.php:149 -msgid "Current Channel" -msgstr "Huidig kanaal" +#: ../../mod/admin.php:464 +msgid "Theme for mobile devices" +msgstr "Thema voor mobiele apparaten" -#: ../../mod/manage.php:151 -msgid "Attach to one of your channels by selecting it." -msgstr "Gebruik een van jouw kanalen door op een te klikken." +#: ../../mod/admin.php:465 +msgid "Accessibility system theme" +msgstr "Standaardthema voor universele toegang" -#: ../../mod/manage.php:152 -msgid "Default Channel" -msgstr "Standaardkanaal" +#: ../../mod/admin.php:465 +msgid "Accessibility theme" +msgstr "Thema voor universele toegang" -#: ../../mod/manage.php:153 -msgid "Make Default" -msgstr "Als standaard instellen" +#: ../../mod/admin.php:466 +msgid "Channel to use for this website's static pages" +msgstr "Kanaal die op deze hub als statische pagina op de homepage gebruikt moet worden" -#: ../../mod/removeme.php:29 -msgid "" -"Channel removals are not allowed within 48 hours of changing the account " -"password." -msgstr "Het verwijderen van een kanaal is niet toegestaan binnen 48 uur nadat het wachtwoord van het account is veranderd." +#: ../../mod/admin.php:466 +msgid "Site Channel" +msgstr "Kanaal op deze RedMatrix-hub" -#: ../../mod/removeme.php:57 -msgid "Remove This Channel" -msgstr "Verwijder dit kanaal" +#: ../../mod/admin.php:468 +msgid "Maximum image size" +msgstr "Maximale grootte van afbeeldingen" -#: ../../mod/removeme.php:58 +#: ../../mod/admin.php:468 msgid "" -"This will completely remove this channel from the network. Once this has " -"been done it is not recoverable." -msgstr "Dit zal dit kanaal compleet van deze hub en uit het RedMatrix-netwerk verwijderen. Dit kan hierna niet meer te ongedaan gemaakt worden." +"Maximum size in bytes of uploaded images. Default is 0, which means no " +"limits." +msgstr "Maximale grootte in bytes voor afbeeldingen die worden geüpload. Standaard is 0, wat geen limiet betekend." -#: ../../mod/removeme.php:59 -msgid "Please enter your password for verification:" -msgstr "Vul je wachtwoord in voor verificatie:" +#: ../../mod/admin.php:469 +msgid "Does this site allow new member registration?" +msgstr "Staat deze hub registratie van nieuwe accounts toe?" -#: ../../mod/removeme.php:60 -msgid "Remove this channel and all its clones from the network" -msgstr "Dit kanaal en alle klonen hiervan uit het RedMatrix-netwerk verwijderen" +#: ../../mod/admin.php:470 +msgid "Which best describes the types of account offered by this hub?" +msgstr "Wat voor soort accounts biedt deze RedMatrix-hub aan? Kies wat het meest in de buurt komt." -#: ../../mod/removeme.php:60 -msgid "" -"By default only the instance of the channel located on this hub will be " -"removed from the network" -msgstr "Standaard wordt alleen het kanaal dat zich op deze hub bevindt uit het RedMatrix-netwerk verwijderd." +#: ../../mod/admin.php:471 +msgid "Register text" +msgstr "Registratietekst" -#: ../../mod/removeme.php:61 -msgid "Remove Channel" -msgstr "Kanaal verwijderen" +#: ../../mod/admin.php:471 +msgid "Will be displayed prominently on the registration page." +msgstr "Wordt prominent op de registratiepagina getoond." -#: ../../mod/editpost.php:20 ../../mod/editwebpage.php:32 -#: ../../mod/editblock.php:8 ../../mod/editblock.php:27 -#: ../../mod/editblock.php:53 ../../mod/editlayout.php:36 -msgid "Item not found" -msgstr "Item niet gevonden" +#: ../../mod/admin.php:472 +msgid "Accounts abandoned after x days" +msgstr "Accounts als verlaten beschouwen na zoveel aantal dagen:" -#: ../../mod/editpost.php:31 -msgid "Item is not editable" -msgstr "Item is niet te bewerken" +#: ../../mod/admin.php:472 +msgid "" +"Will not waste system resources polling external sites for abandonded " +"accounts. Enter 0 for no time limit." +msgstr "Zal geen systeembronnen verspillen door polling van externe hubs voor verlaten accounts. Vul 0 in voor geen tijdslimiet." -#: ../../mod/editpost.php:42 ../../mod/rpost.php:97 -msgid "Edit post" -msgstr "Bericht bewerken" +#: ../../mod/admin.php:473 +msgid "Allowed friend domains" +msgstr "Toegestane domeinen" -#: ../../mod/editpost.php:53 -msgid "Delete item?" -msgstr "Item verwijderen?" +#: ../../mod/admin.php:473 +msgid "" +"Comma separated list of domains which are allowed to establish friendships " +"with this site. Wildcards are accepted. Empty to allow any domains" +msgstr "Komma-gescheiden lijst van domeinen waarvan kanalen connecties kunnen aangaan met kanalen op deze RedMatrix-hub. Wildcards zijn toegestaan.\nLaat leeg om alle domeinen toe te laten." + +#: ../../mod/admin.php:474 +msgid "Allowed email domains" +msgstr "Toegestane e-maildomeinen" -#: ../../mod/editpost.php:116 ../../mod/editwebpage.php:147 -#: ../../mod/editblock.php:115 ../../mod/editlayout.php:110 -msgid "Insert YouTube video" -msgstr "YouTube-video invoegen" +#: ../../mod/admin.php:474 +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 "Door komma's gescheiden lijst met e-maildomeinen die op deze hub mogen registeren. Wildcards zijn toegestaan.\nLaat leeg om alle domeinen toe te laten." -#: ../../mod/editpost.php:117 ../../mod/editwebpage.php:148 -#: ../../mod/editblock.php:116 ../../mod/editlayout.php:111 -msgid "Insert Vorbis [.ogg] video" -msgstr "Vorbis-video [.ogg] invoegen" +#: ../../mod/admin.php:475 +msgid "Block public" +msgstr "Openbare toegang blokkeren" -#: ../../mod/editpost.php:118 ../../mod/editwebpage.php:149 -#: ../../mod/editblock.php:117 ../../mod/editlayout.php:112 -msgid "Insert Vorbis [.ogg] audio" -msgstr "Vorbis-audio [.ogg] invoegen" +#: ../../mod/admin.php:475 +msgid "" +"Check to block public access to all otherwise public personal pages on this " +"site unless you are currently logged in." +msgstr "Vink dit aan om alle normaliter openbare persoonlijke pagina's op deze hub alleen toegankelijk te maken voor ingelogde gebruikers." -#: ../../mod/editwebpage.php:106 -msgid "Edit Webpage" -msgstr "Webpagina bewerken" +#: ../../mod/admin.php:476 +msgid "Force publish" +msgstr "Dwing kanaalvermelding af" -#: ../../mod/editwebpage.php:116 -msgid "Delete webpage?" -msgstr "Webpagina verwijderen?" +#: ../../mod/admin.php:476 +msgid "" +"Check to force all profiles on this site to be listed in the site directory." +msgstr "Vink dit aan om af te dwingen dat alle kanalen op deze hub in de kanalengids worden vermeld." -#: ../../mod/editwebpage.php:186 -msgid "Delete Webpage" -msgstr "Webpagina verwijderen" +#: ../../mod/admin.php:477 +msgid "Disable discovery tab" +msgstr "Ontdekkingstab" -#: ../../mod/poke.php:159 -msgid "Poke/Prod" -msgstr "Aanstoten/porren" +#: ../../mod/admin.php:477 +msgid "" +"Remove the tab in the network view with public content pulled from sources " +"chosen for this site." +msgstr "Verwijder de tab in de matrix-weergave waarin zich een selectie aan openbare berichten bevindt, die automatisch voor deze hub zijn uitgekozen." -#: ../../mod/poke.php:160 -msgid "poke, prod or do other things to somebody" -msgstr "aanstoten, porren of andere dingen met iemand doen" +#: ../../mod/admin.php:478 +msgid "No login on Homepage" +msgstr "Geen inlogformulier op de homepage" -#: ../../mod/poke.php:161 -msgid "Recipient" -msgstr "Ontvanger" +#: ../../mod/admin.php:478 +msgid "" +"Check to hide the login form from your sites homepage when visitors arrive " +"who are not logged in (e.g. when you put the content of the homepage in via " +"the site channel)." +msgstr "Vink dit aan om het inlogformulier op de homepage van deze hub, die niet-ingelogde gebruikers te zien krijgen, te verbergen. (bijvoorbeeld wanneer je een kanaal op deze RedMatrix-hub als homepage gebruikt)" -#: ../../mod/poke.php:162 -msgid "Choose what you wish to do to recipient" -msgstr "Kies wat je met de ontvanger wil doen" +#: ../../mod/admin.php:480 +msgid "Proxy user" +msgstr "Proxy-gebruiker" -#: ../../mod/poke.php:165 -msgid "Make this post private" -msgstr "Maak dit bericht privé" +#: ../../mod/admin.php:481 +msgid "Proxy URL" +msgstr "Proxy-URL" -#: ../../mod/blocks.php:66 -msgid "Block Name" -msgstr "Bloknaam" +#: ../../mod/admin.php:482 +msgid "Network timeout" +msgstr "Netwerktimeout" -#: ../../mod/group.php:20 -msgid "Collection created." -msgstr "Collectie aangemaakt" +#: ../../mod/admin.php:482 +msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." +msgstr "Waarde is in seconden. Zet op 0 voor onbeperkt (niet aanbevolen)" -#: ../../mod/group.php:26 -msgid "Could not create collection." -msgstr "Collectie kon niet aangemaakt worden" +#: ../../mod/admin.php:483 +msgid "Delivery interval" +msgstr "Afleveringsinterval" -#: ../../mod/group.php:54 -msgid "Collection updated." -msgstr "Collectie bijgewerkt." +#: ../../mod/admin.php:483 +msgid "" +"Delay background delivery processes by this many seconds to reduce system " +"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " +"for large dedicated servers." +msgstr "Vertraag de achtergrondprocessen voor het afleveren met een aantal seconden om de systeembelasting te verminderen. Aanbevolen: 4-5 voor shared hosts, 2-3 voor virtual private servers (VPS) en 0-1 voor grote dedicated servers." -#: ../../mod/group.php:86 -msgid "Create a collection of channels." -msgstr "Kanaalcollectie aanmaken" +#: ../../mod/admin.php:484 +msgid "Poll interval" +msgstr "Poll-interval" -#: ../../mod/group.php:87 ../../mod/group.php:183 -msgid "Collection Name: " -msgstr "Naam collectie:" +#: ../../mod/admin.php:484 +msgid "" +"Delay background polling processes by this many seconds to reduce system " +"load. If 0, use delivery interval." +msgstr "De achtergrondprocessen voor het afleveren met zoveel seconden vertragen om de systeembelasting te verminderen. 0 om de afleveringsinterval te gebruiken." -#: ../../mod/group.php:89 ../../mod/group.php:186 -msgid "Members are visible to other channels" -msgstr "Kanalen in deze collectie zijn zichtbaar voor andere kanalen" +#: ../../mod/admin.php:485 +msgid "Maximum Load Average" +msgstr "Maximaal gemiddelde systeembelasting" -#: ../../mod/group.php:107 -msgid "Collection removed." -msgstr "Collectie verwijderd" +#: ../../mod/admin.php:485 +msgid "" +"Maximum system load before delivery and poll processes are deferred - " +"default 50." +msgstr "Maximale systeembelasting voordat de afleverings- en polllingsprocessen worden uitgesteld. Standaard is 50." -#: ../../mod/group.php:109 -msgid "Unable to remove collection." -msgstr "Verwijderen collectie mislukt" +#: ../../mod/admin.php:541 +msgid "No server found" +msgstr "Geen hub gevonden" -#: ../../mod/group.php:182 -msgid "Collection Editor" -msgstr "Collectiebewerker" +#: ../../mod/admin.php:548 ../../mod/admin.php:772 +msgid "ID" +msgstr "ID" -#: ../../mod/group.php:196 -msgid "Members" -msgstr "Kanalen" +#: ../../mod/admin.php:548 +msgid "for channel" +msgstr "voor kanaal" -#: ../../mod/group.php:198 -msgid "All Connected Channels" -msgstr "Alle kanaalconnecties" +#: ../../mod/admin.php:548 +msgid "on server" +msgstr "op hub" -#: ../../mod/group.php:233 -msgid "Click on a channel to add or remove." -msgstr "Klik op een kanaal om deze toe te voegen of te verwijderen." +#: ../../mod/admin.php:548 +msgid "Status" +msgstr "Status" -#: ../../mod/tagrm.php:41 -msgid "Tag removed" -msgstr "Label verwijderd" +#: ../../mod/admin.php:569 +msgid "Update has been marked successful" +msgstr "Update is als succesvol gemarkeerd" -#: ../../mod/tagrm.php:79 -msgid "Remove Item Tag" -msgstr "Verwijder itemlabel" +#: ../../mod/admin.php:579 +#, php-format +msgid "Executing %s failed. Check system logs." +msgstr "Uitvoeren van %s is mislukt. Controleer systeemlogboek." -#: ../../mod/tagrm.php:81 -msgid "Select a tag to remove: " -msgstr "Kies een label om te verwijderen" +#: ../../mod/admin.php:582 +#, php-format +msgid "Update %s was successfully applied." +msgstr "Update %s was geslaagd." -#: ../../mod/attach.php:9 -msgid "Item not available." -msgstr "Item is niet aanwezig." +#: ../../mod/admin.php:586 +#, php-format +msgid "Update %s did not return a status. Unknown if it succeeded." +msgstr "Update %s gaf geen melding. Het is daarom niet bekend of deze geslaagd is." -#: ../../mod/item.php:146 -msgid "Unable to locate original post." -msgstr "Niet in staat om de originele locatie van het bericht te vinden. " +#: ../../mod/admin.php:589 +#, php-format +msgid "Update function %s could not be found." +msgstr "Update-functie %s kon niet gevonden worden." -#: ../../mod/item.php:379 -msgid "Empty post discarded." -msgstr "Leeg bericht geannuleerd" +#: ../../mod/admin.php:604 +msgid "No failed updates." +msgstr "Geen mislukte updates." -#: ../../mod/item.php:421 -msgid "Executable content type not permitted to this channel." -msgstr "Uitvoerbare bestanden zijn niet toegestaan op dit kanaal." +#: ../../mod/admin.php:608 +msgid "Failed Updates" +msgstr "Mislukte updates" -#: ../../mod/item.php:850 -msgid "System error. Post not saved." -msgstr "Systeemfout. Bericht niet opgeslagen." +#: ../../mod/admin.php:610 +msgid "Mark success (if update was manually applied)" +msgstr "Markeer als geslaagd (wanneer de update handmatig was uitgevoerd)" -#: ../../mod/item.php:1302 +#: ../../mod/admin.php:611 +msgid "Attempt to execute this update step automatically" +msgstr "Poging om deze stap van de update automatisch uit te voeren." + +#: ../../mod/admin.php:637 #, php-format -msgid "You have reached your limit of %1$.0f top level posts." -msgstr "Je hebt jouw limiet van %1$.0f berichten bereikt." +msgid "%s user blocked/unblocked" +msgid_plural "%s users blocked/unblocked" +msgstr[0] "%s account geblokkeerd/gedeblokkeerd" +msgstr[1] "%s accounts geblokkeerd/gedeblokkeerd" -#: ../../mod/item.php:1308 +#: ../../mod/admin.php:644 #, php-format -msgid "You have reached your limit of %1$.0f webpages." -msgstr "Je hebt jouw limiet van %1$.0f webpagina's bereikt." +msgid "%s user deleted" +msgid_plural "%s users deleted" +msgstr[0] "%s account verwijderd" +msgstr[1] "%s accounts verwijderd" -#: ../../mod/cloud.php:126 -msgid "Red Matrix - Guests: Username: {your email address}, Password: +++" -msgstr "RedMatrix - gasten: Gebruikersnaam: {jouw e-mailadres}, wachtwoord: +++" +#: ../../mod/admin.php:675 +msgid "Account not found" +msgstr "Account niet gevonden" -#: ../../mod/chatsvc.php:111 -msgid "Away" -msgstr "Afwezig" +#: ../../mod/admin.php:686 +#, php-format +msgid "User '%s' deleted" +msgstr "Account '%s' verwijderd" -#: ../../mod/chatsvc.php:115 -msgid "Online" -msgstr "Online" +#: ../../mod/admin.php:695 +#, php-format +msgid "User '%s' unblocked" +msgstr "Account '%s' gedeblokkeerd" -#: ../../mod/directory.php:223 -msgid "Finding:" -msgstr "Gezocht naar:" +#: ../../mod/admin.php:695 +#, php-format +msgid "User '%s' blocked" +msgstr "Gebruiker '%s' geblokkeerd" -#: ../../mod/directory.php:239 -msgid "No entries (some entries may be hidden)." -msgstr "Niets gevonden (sommige kanalen kunnen verborgen zijn)." +#: ../../mod/admin.php:759 ../../mod/admin.php:771 +msgid "Users" +msgstr "Accounts" -#: ../../mod/match.php:16 -msgid "Profile Match" -msgstr "Profielovereenkomst" +#: ../../mod/admin.php:761 ../../mod/admin.php:896 +msgid "select all" +msgstr "alles selecteren" -#: ../../mod/match.php:24 -msgid "No keywords to match. Please add keywords to your default profile." -msgstr "Je hebt geen trefwoorden waarmee overeenkomsten gevonden kunnen worden. Voeg enkele trefwoorden aan je standaardprofiel toe." +#: ../../mod/admin.php:762 +msgid "User registrations waiting for confirm" +msgstr "Accounts die op goedkeuring wachten" -#: ../../mod/match.php:61 -msgid "is interested in:" -msgstr "is geïnteresseerd in:" +#: ../../mod/admin.php:763 +msgid "Request date" +msgstr "Tijd/datum verzoek" + +#: ../../mod/admin.php:764 +msgid "No registrations." +msgstr "Geen verzoeken." -#: ../../mod/match.php:69 -msgid "No matches" -msgstr "Geen overeenkomsten" +#: ../../mod/admin.php:765 +msgid "Approve" +msgstr "Goedkeuren" -#: ../../mod/dirsearch.php:21 -msgid "This site is not a directory server" -msgstr "Deze hub is geen kanalengidshub (directoryserver)" +#: ../../mod/admin.php:766 +msgid "Deny" +msgstr "Afkeuren" -#: ../../mod/siteinfo.php:57 -#, php-format -msgid "Version %s" -msgstr "Versie %s" +#: ../../mod/admin.php:772 +msgid "Register date" +msgstr "Geregistreerd" -#: ../../mod/siteinfo.php:76 -msgid "Installed plugins/addons/apps:" -msgstr "Ingeschakelde plug-ins/add-ons/apps:" +#: ../../mod/admin.php:772 +msgid "Last login" +msgstr "Laatste keer ingelogd" -#: ../../mod/siteinfo.php:89 -msgid "No installed plugins/addons/apps" -msgstr "Geen ingeschakelde plug-ins/add-ons/apps" +#: ../../mod/admin.php:772 +msgid "Expires" +msgstr "Verloopt" -#: ../../mod/siteinfo.php:97 -msgid "Red" -msgstr "Red" +#: ../../mod/admin.php:772 +msgid "Service Class" +msgstr "Abonnementen" -#: ../../mod/siteinfo.php:98 +#: ../../mod/admin.php:774 msgid "" -"This is a hub of the Red Matrix - a global cooperative network of " -"decentralized privacy enhanced websites." -msgstr "Dit is een hub van de RedMatrix - een wereldwijd coöperatief netwerk van gedecentraliseerde websites met verbeterde privacy." - -#: ../../mod/siteinfo.php:101 -msgid "Running at web location" -msgstr "Draaiend op weblocatie" +"Selected users will be deleted!\\n\\nEverything these users had posted on " +"this site will be permanently deleted!\\n\\nAre you sure?" +msgstr "Geselecteerde accounts (met bijbehorende kanalen) worden verwijderd!\\n\\nAlles wat deze accounts op deze hub hebben gepubliceerd wordt definitief verwijderd!\\n\\Weet je het zeker?" -#: ../../mod/siteinfo.php:102 +#: ../../mod/admin.php:775 msgid "" -"Please visit GetZot.com to learn more " -"about the Red Matrix." -msgstr "Bezoek RedMatrix.me om meer te leren over de RedMatrix." +"The user {0} will be deleted!\\n\\nEverything this user has posted on this " +"site will be permanently deleted!\\n\\nAre you sure?" +msgstr "Account {0} (met bijbehorende kanalen) wordt verwijderd !\\n\\nAlles wat dit account op deze hub heeft gepubliceerd wordt definitief verwijderd!\\n\\nWeet je het zeker?" -#: ../../mod/siteinfo.php:103 -msgid "Bug reports and issues: please visit" -msgstr "Bugrapporten en andere kwesties: bezoek" +#: ../../mod/admin.php:808 +#, php-format +msgid "%s channel censored/uncensored" +msgid_plural "%s channelss censored/uncensored" +msgstr[0] "%s kanalen gecensureerd/ongecensureerd" +msgstr[1] "%s kanaal gecensureerd/ongecensureerd" -#: ../../mod/siteinfo.php:106 -msgid "" -"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot " -"com" -msgstr "Voorstellen, lofbetuigingen, enz. - e-mail \"redmatrix\" at librelist - dot com" +#: ../../mod/admin.php:815 +#, php-format +msgid "%s channel deleted" +msgid_plural "%s channels deleted" +msgstr[0] "%s kanaal verwijderd" +msgstr[1] "%s kanalen verwijderd" -#: ../../mod/siteinfo.php:108 -msgid "Site Administrators" -msgstr "Hubbeheerders" +#: ../../mod/admin.php:834 +msgid "Channel not found" +msgstr "Kanaal niet gevonden" -#: ../../mod/appman.php:28 ../../mod/appman.php:44 -msgid "App installed." -msgstr "App geïnstalleerd" +#: ../../mod/admin.php:845 +#, php-format +msgid "Channel '%s' deleted" +msgstr "Kanaal '%s' verwijderd" -#: ../../mod/appman.php:37 -msgid "Malformed app." -msgstr "Misvormde app." +#: ../../mod/admin.php:855 +#, php-format +msgid "Channel '%s' uncensored" +msgstr "Kanaal '%s' ongecensureerd" -#: ../../mod/appman.php:80 -msgid "Embed code" -msgstr "Insluitcode" +#: ../../mod/admin.php:855 +#, php-format +msgid "Channel '%s' censored" +msgstr "Kanaal '%s' gecensureerd" -#: ../../mod/appman.php:86 -msgid "Edit App" -msgstr "App bewerken" +#: ../../mod/admin.php:898 +msgid "Censor" +msgstr "Censureren" -#: ../../mod/appman.php:86 -msgid "Create App" -msgstr "App maken" +#: ../../mod/admin.php:899 +msgid "Uncensor" +msgstr "Niet censureren" -#: ../../mod/appman.php:91 -msgid "Name of app" -msgstr "Naam van app" +#: ../../mod/admin.php:902 +msgid "UID" +msgstr "UID" -#: ../../mod/appman.php:91 ../../mod/appman.php:92 ../../mod/events.php:492 -#: ../../mod/events.php:506 -msgid "Required" -msgstr "Vereist" +#: ../../mod/admin.php:904 +msgid "" +"Selected channels will be deleted!\\n\\nEverything that was posted in these " +"channels on this site will be permanently deleted!\\n\\nAre you sure?" +msgstr "Geselecteerde kanalen worden verwijderd!\\n\\nAlles wat in deze kanalen op deze hub werd gepubliceerd wordt definitief verwijderd!\\n\\nWeet je het zeker?" -#: ../../mod/appman.php:92 -msgid "Location (URL) of app" -msgstr "Locatie (URL) van app" +#: ../../mod/admin.php:905 +msgid "" +"The channel {0} will be deleted!\\n\\nEverything that was posted in this " +"channel on this site will be permanently deleted!\\n\\nAre you sure?" +msgstr "Kanaal {0} wordt verwijderd!\\n\\nAlles wat in dit kanaal op deze hub werd gepubliceerd wordt definitief verwijderd!\\n\\nWeet je het zeker?" -#: ../../mod/appman.php:94 -msgid "Photo icon URL" -msgstr "URL van pictogram" +#: ../../mod/admin.php:944 +#, php-format +msgid "Plugin %s disabled." +msgstr "Plug-in %s uitgeschakeld." -#: ../../mod/appman.php:94 -msgid "80 x 80 pixels - optional" -msgstr "80 x 80 pixels (optioneel)" +#: ../../mod/admin.php:948 +#, php-format +msgid "Plugin %s enabled." +msgstr "Plug-in %s ingeschakeld" -#: ../../mod/appman.php:95 -msgid "Version ID" -msgstr "Versie-ID" +#: ../../mod/admin.php:958 ../../mod/admin.php:1160 +msgid "Disable" +msgstr "Uitschakelen" -#: ../../mod/appman.php:96 -msgid "Price of app" -msgstr "Prijs van de app" +#: ../../mod/admin.php:960 ../../mod/admin.php:1162 +msgid "Enable" +msgstr "Inschakelen" -#: ../../mod/appman.php:97 -msgid "Location (URL) to purchase app" -msgstr "Locatie (URL) om de app aan te schaffen" +#: ../../mod/admin.php:986 ../../mod/admin.php:1191 +msgid "Toggle" +msgstr "Omschakelen" -#: ../../mod/sources.php:32 -msgid "Failed to create source. No channel selected." -msgstr "Aanmaken bron mislukt. Geen kanaal geselecteerd." +#: ../../mod/admin.php:994 ../../mod/admin.php:1201 +msgid "Author: " +msgstr "Auteur: " -#: ../../mod/sources.php:45 -msgid "Source created." -msgstr "Bron aangemaakt." +#: ../../mod/admin.php:995 ../../mod/admin.php:1202 +msgid "Maintainer: " +msgstr "Beheerder: " -#: ../../mod/sources.php:57 -msgid "Source updated." -msgstr "Bron aangemaakt." +#: ../../mod/admin.php:1124 +msgid "No themes found." +msgstr "Geen thema's gevonden" -#: ../../mod/sources.php:82 -msgid "*" -msgstr "*" +#: ../../mod/admin.php:1183 +msgid "Screenshot" +msgstr "Schermafdruk" -#: ../../mod/sources.php:89 -msgid "Manage remote sources of content for your channel." -msgstr "Beheer externe bronnen met inhoud voor jouw kanaal" +#: ../../mod/admin.php:1231 +msgid "[Experimental]" +msgstr "[Experimenteel]" -#: ../../mod/sources.php:90 ../../mod/sources.php:100 -msgid "New Source" -msgstr "Nieuwe bron" +#: ../../mod/admin.php:1232 +msgid "[Unsupported]" +msgstr "[Niet ondersteund]" -#: ../../mod/sources.php:101 ../../mod/sources.php:133 +#: ../../mod/admin.php:1259 +msgid "Log settings updated." +msgstr "Logboek-instellingen bijgewerkt." + +#: ../../mod/admin.php:1315 +msgid "Clear" +msgstr "Leegmaken" + +#: ../../mod/admin.php:1321 +msgid "Debugging" +msgstr "Debuggen" + +#: ../../mod/admin.php:1322 +msgid "Log file" +msgstr "Logbestand" + +#: ../../mod/admin.php:1322 msgid "" -"Import all or selected content from the following channel into this channel " -"and distribute it according to your channel settings." -msgstr "Importeer complete of gedeelde inhoud vanuit het volgende kanaal naar dit kanaal, en verdeel het vervolgens volgens jouw kanaalinstellingen." +"Must be writable by web server. Relative to your Red top-level directory." +msgstr "Moet door de webserver beschrijfbaar zijn. Relatief ten opzichte van de bovenste map van je RedMatrix-installatie." -#: ../../mod/sources.php:102 ../../mod/sources.php:134 -msgid "Only import content with these words (one per line)" -msgstr "Importeer alleen inhoud met deze woorden (één per regel)" +#: ../../mod/admin.php:1323 +msgid "Log level" +msgstr "Logniveau" -#: ../../mod/sources.php:102 ../../mod/sources.php:134 -msgid "Leave blank to import all public content" -msgstr "Laat leeg om alle openbare inhoud te importeren" +#: ../../mod/thing.php:98 +msgid "Thing updated" +msgstr "Ding bijgewerkt" -#: ../../mod/sources.php:123 ../../mod/sources.php:150 -msgid "Source not found." -msgstr "Bron niet gevonden" +#: ../../mod/thing.php:158 +msgid "Object store: failed" +msgstr "Opslaan van ding mislukt" -#: ../../mod/sources.php:130 -msgid "Edit Source" -msgstr "Bron bewerken" +#: ../../mod/thing.php:162 +msgid "Thing added" +msgstr "Ding toegevoegd" -#: ../../mod/sources.php:131 -msgid "Delete Source" -msgstr "Bron verwijderen" +#: ../../mod/thing.php:182 +#, php-format +msgid "OBJ: %1$s %2$s %3$s" +msgstr "OBJ: %1$s %2$s %3$s" -#: ../../mod/sources.php:158 -msgid "Source removed" -msgstr "Bron verwijderd" +#: ../../mod/thing.php:234 +msgid "Show Thing" +msgstr "Ding weergeven" -#: ../../mod/sources.php:160 -msgid "Unable to remove source." -msgstr "Verwijderen bron mislukt." +#: ../../mod/thing.php:241 +msgid "item not found." +msgstr "Item niet gevonden" -#: ../../mod/pubsites.php:16 -msgid "Public Sites" -msgstr "Openbare hubs" +#: ../../mod/thing.php:272 +msgid "Edit Thing" +msgstr "Ding bewerken" -#: ../../mod/pubsites.php:19 -msgid "" -"The listed sites allow public registration into the Red Matrix. All sites in" -" the matrix are interlinked so membership on any of them conveys membership " -"in the matrix as a whole. Some sites may require subscription or provide " -"tiered service plans. The provider links may provide " -"additional details." -msgstr "Op de hier weergegeven hubs kan iedereen zich voor de RedMatrix aanmelden. Alle hubs in de Matrix zijn met elkaar verbonden, dus maakt het qua lidmaatschap niet uit waar je je aanmeldt. Op sommige hubs heb je eerst goedkeuring nodig en sommige hubs vereisen betaalde abonnementen voor uitbreidingen. Mogelijk wordt hierover op de hub zelf meer informatie gegeven." +#: ../../mod/thing.php:274 ../../mod/thing.php:321 +msgid "Select a profile" +msgstr "Kies een profiel" -#: ../../mod/pubsites.php:25 -msgid "Site URL" -msgstr "URL hub" +#: ../../mod/thing.php:278 ../../mod/thing.php:324 +msgid "Post an activity" +msgstr "Plaats een bericht" -#: ../../mod/pubsites.php:25 -msgid "Access Type" -msgstr "Toegangstype" +#: ../../mod/thing.php:278 ../../mod/thing.php:324 +msgid "Only sends to viewers of the applicable profile" +msgstr "Toont dit alleen aan diegene die het gekozen profiel mogen zien." -#: ../../mod/pubsites.php:25 -msgid "Registration Policy" -msgstr "Registratiebeleid" +#: ../../mod/thing.php:280 ../../mod/thing.php:326 +msgid "Name of thing e.g. something" +msgstr "Naam van ding" -#: ../../mod/pubsites.php:25 ../../mod/profiles.php:404 -msgid "Location" -msgstr "Locatie" +#: ../../mod/thing.php:282 ../../mod/thing.php:327 +msgid "URL of thing (optional)" +msgstr "URL van ding (optioneel)" + +#: ../../mod/thing.php:284 ../../mod/thing.php:328 +msgid "URL for photo of thing (optional)" +msgstr "URL van foto van ding (optioneel)" + +#: ../../mod/thing.php:319 +msgid "Add Thing to your Profile" +msgstr "Ding aan je profiel toevoegen" #: ../../mod/import.php:36 msgid "Nothing to import." @@ -7130,9 +7066,257 @@ msgstr "Voor elke optie geldt dat je moet kiezen of je jouw primaire kanaaladres msgid "Make this hub my primary location" msgstr "Stel deze hub als mijn primaire locatie in" -#: ../../mod/zfinger.php:23 -msgid "invalid target signature" -msgstr "ongeldig doel-kenmerk (target signature)" +#: ../../mod/invite.php:25 +msgid "Total invitation limit exceeded." +msgstr "Limiet voor aantal uitnodigingen overschreden." + +#: ../../mod/invite.php:49 +#, php-format +msgid "%s : Not a valid email address." +msgstr "%s : Geen geldig e-mailadres." + +#: ../../mod/invite.php:76 +msgid "Please join us on Red" +msgstr "Kom op de RedMatrix" + +#: ../../mod/invite.php:87 +msgid "Invitation limit exceeded. Please contact your site administrator." +msgstr "Limiet voor aantal uitnodigingen overschreden. Neem contact op met je hub-beheerder." + +#: ../../mod/invite.php:92 +#, php-format +msgid "%s : Message delivery failed." +msgstr "%s: Aflevering bericht mislukt." + +#: ../../mod/invite.php:96 +#, php-format +msgid "%d message sent." +msgid_plural "%d messages sent." +msgstr[0] "%d bericht verzonden." +msgstr[1] "%d berichten verzonden." + +#: ../../mod/invite.php:115 +msgid "You have no more invitations available" +msgstr "Je hebt geen uitnodigingen meer beschikbaar" + +#: ../../mod/invite.php:129 +msgid "Send invitations" +msgstr "Uitnodigingen verzenden" + +#: ../../mod/invite.php:130 +msgid "Enter email addresses, one per line:" +msgstr "Voer e-mailadressen in, één per regel:" + +#: ../../mod/invite.php:131 ../../mod/mail.php:225 ../../mod/mail.php:338 +msgid "Your message:" +msgstr "Jouw bericht:" + +#: ../../mod/invite.php:132 +msgid "Please join my community on RedMatrix." +msgstr "Vergezel ons op de RedMatrix." + +#: ../../mod/invite.php:134 +msgid "You will need to supply this invitation code: " +msgstr "Je moet deze uitnodigingscode opgeven:" + +#: ../../mod/invite.php:135 +msgid "1. Register at any RedMatrix location (they are all inter-connected)" +msgstr "1. Registreer je op een willekeurige RedMatrix-hub (ze zijn allemaal onderling met elkaar verbonden)" + +#: ../../mod/invite.php:137 +msgid "2. Enter my RedMatrix network address into the site searchbar." +msgstr "2. Nadat je bent ingelogd en een kanaal hebt aangemaakt kan je mijn kanaaladres in het zoekveld invullen." + +#: ../../mod/invite.php:138 +msgid "or visit " +msgstr "of bezoek" + +#: ../../mod/invite.php:140 +msgid "3. Click [Connect]" +msgstr "3. Klik [+ Verbinden]" + +#: ../../mod/item.php:146 +msgid "Unable to locate original post." +msgstr "Niet in staat om de originele locatie van het bericht te vinden. " + +#: ../../mod/item.php:379 +msgid "Empty post discarded." +msgstr "Leeg bericht geannuleerd" + +#: ../../mod/item.php:421 +msgid "Executable content type not permitted to this channel." +msgstr "Uitvoerbare bestanden zijn niet toegestaan op dit kanaal." + +#: ../../mod/item.php:850 +msgid "System error. Post not saved." +msgstr "Systeemfout. Bericht niet opgeslagen." + +#: ../../mod/item.php:1302 +#, php-format +msgid "You have reached your limit of %1$.0f top level posts." +msgstr "Je hebt jouw limiet van %1$.0f berichten bereikt." + +#: ../../mod/item.php:1308 +#, php-format +msgid "You have reached your limit of %1$.0f webpages." +msgstr "Je hebt jouw limiet van %1$.0f webpagina's bereikt." + +#: ../../mod/update_channel.php:43 ../../mod/update_display.php:25 +#: ../../mod/update_network.php:23 ../../mod/update_search.php:46 +msgid "[Embedded content - reload page to view]" +msgstr "[Ingesloten inhoud - ververs pagina om te bekijken] " + +#: ../../mod/layouts.php:62 +msgid "Help with this feature" +msgstr "Hulp voor dit onderdeel" + +#: ../../mod/layouts.php:84 +msgid "Layout Name" +msgstr "Naam layout" + +#: ../../mod/like.php:15 +msgid "Like/Dislike" +msgstr "Leuk/niet leuk" + +#: ../../mod/like.php:20 +msgid "This action is restricted to members." +msgstr "Deze actie kan alleen door mensen met een RedMatrix-account worden uitgevoerd." + +#: ../../mod/like.php:21 +msgid "" +"Please login with your RedMatrix ID or register as a new RedMatrix member to continue." +msgstr "Je dient in te loggen met je RedMatrix-account of een nieuw RedMatrix-account te registreren om verder te kunnen gaan." + +#: ../../mod/like.php:77 ../../mod/like.php:104 ../../mod/like.php:142 +msgid "Invalid request." +msgstr "Ongeldig verzoek" + +#: ../../mod/like.php:119 +msgid "thing" +msgstr "ding" + +#: ../../mod/like.php:165 +msgid "Channel unavailable." +msgstr "Kanaal niet beschikbaar." + +#: ../../mod/like.php:204 +msgid "Previous action reversed." +msgstr "Vorige actie omgedraaid" + +#: ../../mod/like.php:417 +msgid "Action completed." +msgstr "Actie voltooid" + +#: ../../mod/like.php:418 +msgid "Thank you." +msgstr "Bedankt" + +#: ../../mod/lockview.php:35 ../../mod/lockview.php:41 +msgid "Remote privacy information not available." +msgstr "Privacy-informatie op afstand niet beschikbaar." + +#: ../../mod/lockview.php:50 +msgid "Visible to:" +msgstr "Zichtbaar voor:" + +#: ../../mod/viewconnections.php:58 +msgid "No connections." +msgstr "Geen connecties." + +#: ../../mod/viewconnections.php:71 +#, php-format +msgid "Visit %s's profile [%s]" +msgstr "Bezoek het profiel van %s [%s]" + +#: ../../mod/viewconnections.php:86 +msgid "View Connnections" +msgstr "Connecties weergeven" + +#: ../../mod/lostpass.php:15 +msgid "No valid account found." +msgstr "Geen geldige account gevonden." + +#: ../../mod/lostpass.php:29 +msgid "Password reset request issued. Check your email." +msgstr "Het verzoek om je wachtwoord opnieuw in te stellen is behandeld. Controleer je e-mail." + +#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:102 +#, php-format +msgid "Site Member (%s)" +msgstr "Lid van hub (%s)" + +#: ../../mod/lostpass.php:40 +#, php-format +msgid "Password reset requested at %s" +msgstr "Verzoek tot het opnieuw instellen van een wachtwoord op %s is ingediend" + +#: ../../mod/lostpass.php:63 +msgid "" +"Request could not be verified. (You may have previously submitted it.) " +"Password reset failed." +msgstr "Het verzoek kon niet worden geverifieerd. (Mogelijk heb je al eerder een verzoek ingediend.) Opnieuw instellen van wachtwoord is mislukt." + +#: ../../mod/lostpass.php:85 ../../boot.php:1508 +msgid "Password Reset" +msgstr "Wachtwoord vergeten?" + +#: ../../mod/lostpass.php:86 +msgid "Your password has been reset as requested." +msgstr "Jouw wachtwoord is opnieuw ingesteld zoals je had verzocht." + +#: ../../mod/lostpass.php:87 +msgid "Your new password is" +msgstr "Jouw nieuwe wachtwoord is" + +#: ../../mod/lostpass.php:88 +msgid "Save or copy your new password - and then" +msgstr "Kopieer of sla je nieuwe wachtwoord op - en" + +#: ../../mod/lostpass.php:89 +msgid "click here to login" +msgstr "klik dan hier om in te loggen" + +#: ../../mod/lostpass.php:90 +msgid "" +"Your password may be changed from the Settings page after " +"successful login." +msgstr "Jouw wachtwoord kan worden veranderd onder instellingen, nadat je succesvol bent ingelogd." + +#: ../../mod/lostpass.php:107 +#, php-format +msgid "Your password has changed at %s" +msgstr "Jouw wachtwoord op %s is veranderd" + +#: ../../mod/lostpass.php:122 +msgid "Forgot your Password?" +msgstr "Wachtwoord vergeten?" + +#: ../../mod/lostpass.php:123 +msgid "" +"Enter your email address and submit to have your password reset. Then check " +"your email for further instructions." +msgstr "Voer je e-mailadres in en verstuur deze om je wachtwoord opnieuw in te stellen. Controleer hierna hier je e-mail voor verdere instructies." + +#: ../../mod/lostpass.php:124 +msgid "Email Address" +msgstr "E-mailadres" + +#: ../../mod/lostpass.php:125 +msgid "Reset" +msgstr "Opnieuw instellen" + +#: ../../mod/magic.php:70 +msgid "Hub not found." +msgstr "Hub niet gevonden." + +#: ../../mod/vote.php:97 +msgid "Total votes" +msgstr "Totaal aantal stemmen" + +#: ../../mod/vote.php:98 +msgid "Average Rating" +msgstr "Gemiddeld cijfer" #: ../../mod/mail.php:33 msgid "Unable to lookup recipient." @@ -7150,6 +7334,10 @@ msgstr "Kan opgevraagd kanaal niet verifieren" msgid "Selected channel has private message restrictions. Send failed." msgstr "Gekozen kanaal heeft restricties voor privéberichten. Verzenden mislukt." +#: ../../mod/mail.php:121 ../../mod/message.php:31 +msgid "Messages" +msgstr "Berichten" + #: ../../mod/mail.php:132 msgid "Message deleted." msgstr "Bericht verwijderd." @@ -7178,6 +7366,10 @@ msgstr "Verzenden" msgid "Message not found." msgstr "Bericht niet gevonden" +#: ../../mod/mail.php:302 ../../mod/message.php:72 +msgid "Delete message" +msgstr "Bericht verwijderen" + #: ../../mod/mail.php:303 msgid "Recall message" msgstr "Bericht intrekken" @@ -7204,563 +7396,637 @@ msgstr "Geen veilige communicatie beschikbaar. Mogelijk kan je msgid "Send Reply" msgstr "Antwoord versturen" -#: ../../mod/channel.php:25 ../../mod/chat.php:19 -msgid "You must be logged in to see this page." -msgstr "Je moet zijn ingelogd om deze pagina te kunnen bekijken." +#: ../../mod/manage.php:136 +#, php-format +msgid "You have created %1$.0f of %2$.0f allowed channels." +msgstr "Je hebt %1$.0f van totaal %2$.0f toegestane kanalen aangemaakt." -#: ../../mod/channel.php:86 -msgid "Insufficient permissions. Request redirected to profile page." -msgstr "Onvoldoende privacy-rechten. Doorgestuurd naar profielpagina." +#: ../../mod/manage.php:144 +msgid "Create a new channel" +msgstr "Nieuw kanaal aanmaken" -#: ../../mod/profiles.php:18 ../../mod/profiles.php:165 -#: ../../mod/profiles.php:222 ../../mod/profiles.php:539 -msgid "Profile not found." -msgstr "Profiel niet gevonden." +#: ../../mod/manage.php:148 +msgid "Channel Manager" +msgstr "Kanaalbeheerder" -#: ../../mod/profiles.php:38 -msgid "Profile deleted." -msgstr "Profiel verwijderd." +#: ../../mod/manage.php:149 +msgid "Current Channel" +msgstr "Huidig kanaal" -#: ../../mod/profiles.php:56 ../../mod/profiles.php:92 -msgid "Profile-" -msgstr "Profiel-" +#: ../../mod/manage.php:151 +msgid "Attach to one of your channels by selecting it." +msgstr "Gebruik een van jouw kanalen door op een te klikken." -#: ../../mod/profiles.php:77 ../../mod/profiles.php:120 -msgid "New profile created." -msgstr "Nieuw profiel aangemaakt." +#: ../../mod/manage.php:152 +msgid "Default Channel" +msgstr "Standaardkanaal" -#: ../../mod/profiles.php:98 -msgid "Profile unavailable to clone." -msgstr "Profiel niet beschikbaar om te klonen" +#: ../../mod/manage.php:153 +msgid "Make Default" +msgstr "Als standaard instellen" -#: ../../mod/profiles.php:136 -msgid "Profile unavailable to export." -msgstr "Geen profiel beschikbaar om te exporteren" +#: ../../mod/wall_upload.php:34 +msgid "Wall Photos" +msgstr "Kanaalfoto's" -#: ../../mod/profiles.php:232 -msgid "Profile Name is required." -msgstr "Profielnaam is vereist" +#: ../../mod/match.php:16 +msgid "Profile Match" +msgstr "Profielovereenkomst" -#: ../../mod/profiles.php:354 -msgid "Marital Status" -msgstr "Huwelijke status" +#: ../../mod/match.php:24 +msgid "No keywords to match. Please add keywords to your default profile." +msgstr "Je hebt geen trefwoorden waarmee overeenkomsten gevonden kunnen worden. Voeg enkele trefwoorden aan je standaardprofiel toe." -#: ../../mod/profiles.php:358 -msgid "Romantic Partner" -msgstr "Romantische partner" +#: ../../mod/match.php:61 +msgid "is interested in:" +msgstr "is geïnteresseerd in:" -#: ../../mod/profiles.php:362 -msgid "Likes" -msgstr "Houdt van" +#: ../../mod/match.php:69 +msgid "No matches" +msgstr "Geen overeenkomsten" -#: ../../mod/profiles.php:366 -msgid "Dislikes" -msgstr "Houdt niet van" +#: ../../mod/menu.php:21 +msgid "Menu updated." +msgstr "Menu aangepast. " -#: ../../mod/profiles.php:370 -msgid "Work/Employment" -msgstr "Werk/arbeid" +#: ../../mod/menu.php:25 +msgid "Unable to update menu." +msgstr "Niet in staat om menu aan te passen" -#: ../../mod/profiles.php:373 -msgid "Religion" -msgstr "Religie" +#: ../../mod/menu.php:30 +msgid "Menu created." +msgstr "Menu aangemaakt." -#: ../../mod/profiles.php:377 -msgid "Political Views" -msgstr "Politieke overtuigingen" +#: ../../mod/menu.php:34 +msgid "Unable to create menu." +msgstr "Niet in staat om menu aan te maken." -#: ../../mod/profiles.php:381 -msgid "Gender" -msgstr "Geslacht" +#: ../../mod/menu.php:57 +msgid "Manage Menus" +msgstr "Menu's beheren" -#: ../../mod/profiles.php:385 -msgid "Sexual Preference" -msgstr "Seksuele voorkeur" +#: ../../mod/menu.php:60 +msgid "Drop" +msgstr "Verwijderen" -#: ../../mod/profiles.php:389 -msgid "Homepage" -msgstr "Homepage" +#: ../../mod/menu.php:62 +msgid "Create a new menu" +msgstr "Een nieuwe menu aanmaken" -#: ../../mod/profiles.php:393 -msgid "Interests" -msgstr "Interesses" +#: ../../mod/menu.php:63 +msgid "Delete this menu" +msgstr "Menu verwijderen" -#: ../../mod/profiles.php:487 -msgid "Profile updated." -msgstr "Profiel bijgewerkt" +#: ../../mod/menu.php:64 ../../mod/menu.php:109 +msgid "Edit menu contents" +msgstr "Bewerk de inhoud van het menu" -#: ../../mod/profiles.php:564 -msgid "Hide your contact/friend list from viewers of this profile?" -msgstr "Laat de lijst met connecties niet aan bezoekers van dit profiel zien." +#: ../../mod/menu.php:65 +msgid "Edit this menu" +msgstr "Dit menu bewerken" -#: ../../mod/profiles.php:588 -msgid "Edit Profile Details" -msgstr "Profiel bewerken" +#: ../../mod/menu.php:80 +msgid "New Menu" +msgstr "Nieuw menu" -#: ../../mod/profiles.php:590 -msgid "View this profile" -msgstr "Profiel weergeven" +#: ../../mod/menu.php:81 ../../mod/menu.php:110 +msgid "Menu name" +msgstr "Naam van menu" -#: ../../mod/profiles.php:592 -msgid "Change Profile Photo" -msgstr "Profielfoto wijzigen" +#: ../../mod/menu.php:81 ../../mod/menu.php:110 +msgid "Must be unique, only seen by you" +msgstr "Moet uniek zijn en is alleen zichtbaar voor jou." -#: ../../mod/profiles.php:593 -msgid "Create a new profile using these settings" -msgstr "Een nieuw profiel aanmaken met dit profiel als basis" +#: ../../mod/menu.php:82 ../../mod/menu.php:111 +msgid "Menu title" +msgstr "Titel van menu" -#: ../../mod/profiles.php:594 -msgid "Clone this profile" -msgstr "Dit profiel klonen" +#: ../../mod/menu.php:82 ../../mod/menu.php:111 +msgid "Menu title as seen by others" +msgstr "Titel van menu zoals anderen dat zien." -#: ../../mod/profiles.php:595 -msgid "Delete this profile" -msgstr "Dit profiel verwijderen" +#: ../../mod/menu.php:83 ../../mod/menu.php:112 +msgid "Allow bookmarks" +msgstr "Bladwijzers toestaan" -#: ../../mod/profiles.php:597 -msgid "Import profile from file" -msgstr "Profiel vanuit bestand importeren" +#: ../../mod/menu.php:83 ../../mod/menu.php:112 +msgid "Menu may be used to store saved bookmarks" +msgstr "Menu kan gebruikt worden om bladwijzers in op te slaan" -#: ../../mod/profiles.php:598 -msgid "Export profile to file" -msgstr "Profiel naar bestand exporteren" +#: ../../mod/menu.php:98 +msgid "Menu deleted." +msgstr "Menu verwijderd." -#: ../../mod/profiles.php:599 -msgid "Profile Name:" -msgstr "Profielnaam:" +#: ../../mod/menu.php:100 +msgid "Menu could not be deleted." +msgstr "Menu kon niet verwijderd worden." + +#: ../../mod/menu.php:106 +msgid "Edit Menu" +msgstr "Menu bewerken" + +#: ../../mod/menu.php:108 +msgid "Add or remove entries to this menu" +msgstr "Items aan dit menu toevoegen of verwijder" + +#: ../../mod/message.php:41 +msgid "Conversation removed." +msgstr "Conversatie verwijderd" + +#: ../../mod/message.php:56 +msgid "No messages." +msgstr "Geen berichten" + +#: ../../mod/message.php:74 +msgid "D, d M Y - g:i A" +msgstr "D, j M Y - G:i" + +#: ../../mod/new_channel.php:107 +msgid "Add a Channel" +msgstr "Kanaal toevoegen" + +#: ../../mod/new_channel.php:108 +msgid "" +"A channel is your own collection of related web pages. A channel can be used" +" to hold social network profiles, blogs, conversation groups and forums, " +"celebrity pages, and much more. You may create as many channels as your " +"service provider allows." +msgstr "Een kanaal is jouw eigen verzameling gerelateerde webpagina's. Een kanaal kan gebruikt worden voor een sociaal netwerk, weblog, discussiegroep of forum, een pagina over een beroemdheid, en voor veel meer. Je kan net zoveel kanalen aanmaken als dat de eigenaar/beheerder van jouw hub toestaat." + +#: ../../mod/new_channel.php:111 +msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" " +msgstr "Voorbeelden: \"Bruce Springsteen\", \"Familiefoto's\", \"Voetbal\", \"Astronomie\"" + +#: ../../mod/new_channel.php:112 +msgid "Choose a short nickname" +msgstr "Kies een korte bijnaam" + +#: ../../mod/new_channel.php:113 +msgid "" +"Your nickname will be used to create an easily remembered channel address " +"(like an email address) which you can share with others." +msgstr "Jouw bijnaam wordt gebruikt om een makkelijk te onthouden kanaaladres (zoals een e-mailadres) aan te maken, die je dan kan delen met anderen." + +#: ../../mod/new_channel.php:114 +msgid "Or import an existing channel from another location" +msgstr "Of importeer een bestaand kanaal vanaf een andere locatie." + +#: ../../mod/notifications.php:26 +msgid "Invalid request identifier." +msgstr "Ongeldige verzoek identificator (request identifier)" + +#: ../../mod/notifications.php:35 +msgid "Discard" +msgstr "Annuleren" + +#: ../../mod/notifications.php:94 ../../mod/notify.php:53 +msgid "No more system notifications." +msgstr "Geen systeemnotificaties meer." + +#: ../../mod/notifications.php:98 ../../mod/notify.php:57 +msgid "System Notifications" +msgstr "Systeemnotificaties" -#: ../../mod/profiles.php:600 -msgid "Your Full Name:" -msgstr "Jouw volledige naam:" +#: ../../mod/oexchange.php:23 +msgid "Unable to find your hub." +msgstr "Niet in staat om je hub te vinden" -#: ../../mod/profiles.php:601 -msgid "Title/Description:" -msgstr "Titel/omschrijving:" +#: ../../mod/oexchange.php:37 +msgid "Post successful." +msgstr "Verzenden bericht geslaagd." -#: ../../mod/profiles.php:602 -msgid "Your Gender:" -msgstr "Jouw geslacht" +#: ../../mod/zfinger.php:23 +msgid "invalid target signature" +msgstr "ongeldig doel-kenmerk (target signature)" -#: ../../mod/profiles.php:603 -#, php-format -msgid "Birthday (%s):" -msgstr "Geboortedag (%s)" +#: ../../mod/openid.php:26 +msgid "OpenID protocol error. No ID returned." +msgstr "OpenID-protocolfout. Geen ID terugontvangen." -#: ../../mod/profiles.php:604 -msgid "Street Address:" -msgstr "Straat en huisnummer:" +#: ../../mod/appman.php:28 ../../mod/appman.php:44 +msgid "App installed." +msgstr "App geïnstalleerd" -#: ../../mod/profiles.php:605 -msgid "Locality/City:" -msgstr "Woonplaats:" +#: ../../mod/appman.php:37 +msgid "Malformed app." +msgstr "Misvormde app." -#: ../../mod/profiles.php:606 -msgid "Postal/Zip Code:" -msgstr "Postcode:" +#: ../../mod/appman.php:80 +msgid "Embed code" +msgstr "Insluitcode" -#: ../../mod/profiles.php:607 -msgid "Country:" -msgstr "Land:" +#: ../../mod/appman.php:86 +msgid "Edit App" +msgstr "App bewerken" -#: ../../mod/profiles.php:608 -msgid "Region/State:" -msgstr "Provincie/gewest/deelstaat:" +#: ../../mod/appman.php:86 +msgid "Create App" +msgstr "App maken" -#: ../../mod/profiles.php:609 -msgid " Marital Status:" -msgstr " Huwelijkse staat:" +#: ../../mod/appman.php:91 +msgid "Name of app" +msgstr "Naam van app" -#: ../../mod/profiles.php:610 -msgid "Who: (if applicable)" -msgstr "Wie (wanneer toepasselijk):" +#: ../../mod/appman.php:92 +msgid "Location (URL) of app" +msgstr "Locatie (URL) van app" -#: ../../mod/profiles.php:611 -msgid "Examples: cathy123, Cathy Williams, cathy@example.com" -msgstr "Voorbeelden: karin123, Karin Jansen, cathy@voorbeeld.nl" +#: ../../mod/appman.php:94 +msgid "Photo icon URL" +msgstr "URL van pictogram" -#: ../../mod/profiles.php:612 -msgid "Since [date]:" -msgstr "Sinds [datum]:" +#: ../../mod/appman.php:94 +msgid "80 x 80 pixels - optional" +msgstr "80 x 80 pixels (optioneel)" -#: ../../mod/profiles.php:614 -msgid "Homepage URL:" -msgstr "Adres homepage:" +#: ../../mod/appman.php:95 +msgid "Version ID" +msgstr "Versie-ID" -#: ../../mod/profiles.php:617 -msgid "Religious Views:" -msgstr "Religieuze overtuigingen" +#: ../../mod/appman.php:96 +msgid "Price of app" +msgstr "Prijs van de app" -#: ../../mod/profiles.php:618 -msgid "Keywords:" -msgstr "Trefwoorden" +#: ../../mod/appman.php:97 +msgid "Location (URL) to purchase app" +msgstr "Locatie (URL) om de app aan te schaffen" -#: ../../mod/profiles.php:621 -msgid "Example: fishing photography software" -msgstr "Voorbeeld: muziek, fotografie, software" +#: ../../mod/poll.php:64 +msgid "Poll" +msgstr "Poll" -#: ../../mod/profiles.php:622 -msgid "Used in directory listings" -msgstr "Wordt in de kanalengids gebruikt" +#: ../../mod/poll.php:69 +msgid "View Results" +msgstr "Bekijk resultaten" -#: ../../mod/profiles.php:623 -msgid "Tell us about yourself..." -msgstr "Vertel ons iets over jezelf..." +#: ../../mod/frphotos.php:79 +msgid "Friendica Photo Album Import" +msgstr "Fotoalbums importeren vanuit Friendica" -#: ../../mod/profiles.php:624 -msgid "Hobbies/Interests" -msgstr "Hobby's/interesses" +#: ../../mod/frphotos.php:80 +msgid "This will import all your Friendica photo albums to this Red channel." +msgstr "Hiermee importeer je al jouw Friendica-fotoalbums in dit RedMatrix-kanaal." -#: ../../mod/profiles.php:625 -msgid "Contact information and Social Networks" -msgstr "Contactinformatie en sociale netwerken" +#: ../../mod/frphotos.php:81 +msgid "Friendica Server base URL" +msgstr "Basis-URL van Friendica-server" -#: ../../mod/profiles.php:626 -msgid "My other channels" -msgstr "Mijn andere kanalen" +#: ../../mod/frphotos.php:82 +msgid "Friendica Login Username" +msgstr "Gebruikersnaam Friendica-account" -#: ../../mod/profiles.php:627 -msgid "Musical interests" -msgstr "Muzikale interesses" +#: ../../mod/frphotos.php:83 +msgid "Friendica Login Password" +msgstr "Wachtwoord Friendica-account" -#: ../../mod/profiles.php:628 -msgid "Books, literature" -msgstr "Boeken/literatuur" +#: ../../mod/removeaccount.php:30 +msgid "" +"Account removals are not allowed within 48 hours of changing the account " +"password." +msgstr "Het verwijderen van een account is niet toegestaan binnen 48 uur nadat het wachtwoord is veranderd." -#: ../../mod/profiles.php:629 -msgid "Television" -msgstr "Televisie" +#: ../../mod/removeaccount.php:57 +msgid "Remove This Account" +msgstr "Verwijder dit account" -#: ../../mod/profiles.php:630 -msgid "Film/dance/culture/entertainment" -msgstr "Film/dans/cultuur/entertainment" +#: ../../mod/removeaccount.php:58 +msgid "" +"This will completely remove this account including all its channels from the" +" network. Once this has been done it is not recoverable." +msgstr "Deze actie verwijderd dit account volledig, inclusief al zijn kanalen. Dit kan hierna op geen enkele manier ongedaan gemaakt worden." -#: ../../mod/profiles.php:631 -msgid "Love/romance" -msgstr "Liefde/romantiek" +#: ../../mod/removeaccount.php:60 +msgid "" +"Remove this account, all its channels and all its channel clones from the " +"network" +msgstr "Dit account, al zijn kanalen en alle klonen van zijn kanalen uit het RedMatrix-netwerk verwijderen" -#: ../../mod/profiles.php:632 -msgid "Work/employment" -msgstr "Werk/arbeid" +#: ../../mod/removeaccount.php:60 +msgid "" +"By default only the instances of the channels located on this hub will be " +"removed from the network" +msgstr "Standaard worden alleen de kanalen die zich op deze hub bevinden uit het RedMatrix-netwerk verwijderd." -#: ../../mod/profiles.php:633 -msgid "School/education" -msgstr "School/onderwijs" +#: ../../view/theme/apw/php/config.php:202 +#: ../../view/theme/apw/php/config.php:236 +msgid "Schema Default" +msgstr "Standaardschema" -#: ../../mod/profiles.php:639 -msgid "This is your default profile." -msgstr "Dit is jouw standaardprofiel" +#: ../../view/theme/apw/php/config.php:203 +msgid "Sans-Serif" +msgstr "Schreefloos" -#: ../../mod/profiles.php:692 -msgid "Edit/Manage Profiles" -msgstr "Profielen bewerken/beheren" +#: ../../view/theme/apw/php/config.php:204 +msgid "Monospace" +msgstr "Monospace" -#: ../../mod/profiles.php:693 -msgid "Add profile things" -msgstr "Dingen aan je profiel toevoegen" +#: ../../view/theme/apw/php/config.php:259 +#: ../../view/theme/blogga/php/config.php:69 +#: ../../view/theme/blogga/view/theme/blog/config.php:69 +#: ../../view/theme/redbasic/php/config.php:102 +msgid "Theme settings" +msgstr "Thema-instellingen" -#: ../../mod/profiles.php:694 -msgid "Include desirable objects in your profile" -msgstr "Voeg door jou gewenste dingen aan jouw profiel toe" +#: ../../view/theme/apw/php/config.php:260 +#: ../../view/theme/redbasic/php/config.php:103 +msgid "Set scheme" +msgstr "Schema van thema instellen" -#: ../../mod/bookmarks.php:38 -msgid "Bookmark added" -msgstr "Bladwijzer toegevoegd" +#: ../../view/theme/apw/php/config.php:261 +#: ../../view/theme/redbasic/php/config.php:124 +msgid "Set font-size for posts and comments" +msgstr "Lettergrootte voor berichten en reacties instellen" -#: ../../mod/bookmarks.php:58 -msgid "My Bookmarks" -msgstr "Mijn bladwijzers" +#: ../../view/theme/apw/php/config.php:262 +msgid "Set font face" +msgstr "Lettertypefamilie instellen" -#: ../../mod/bookmarks.php:69 -msgid "My Connections Bookmarks" -msgstr "Bladwijzers van mijn connecties" +#: ../../view/theme/apw/php/config.php:263 +msgid "Set iconset" +msgstr "Pictogrammenset instellen" -#: ../../mod/common.php:10 -msgid "No channel." -msgstr "Geen kanaal." +#: ../../view/theme/apw/php/config.php:264 +msgid "Set big shadow size, default 15px 15px 15px" +msgstr "Een grote schaduwgrootte instellen (standaard 15px 15px 15px)" -#: ../../mod/common.php:39 -msgid "Common connections" -msgstr "Veel voorkomende connecties" +#: ../../view/theme/apw/php/config.php:265 +msgid "Set small shadow size, default 5px 5px 5px" +msgstr "Een kleine schaduwgrootte instellen (standaard 5px 5px 5px)" -#: ../../mod/common.php:44 -msgid "No connections in common." -msgstr "Geen gemeenschappelijke connecties." +#: ../../view/theme/apw/php/config.php:266 +msgid "Set shadow color, default #000" +msgstr "Schaduwkleur instellen (standaard #000)" -#: ../../mod/like.php:15 -msgid "Like/Dislike" -msgstr "Leuk/niet leuk" +#: ../../view/theme/apw/php/config.php:267 +msgid "Set radius size, default 5px" +msgstr "Radius instellen, standaard 5px" -#: ../../mod/like.php:20 -msgid "This action is restricted to members." -msgstr "Deze actie kan alleen door mensen met een RedMatrix-account worden uitgevoerd." +#: ../../view/theme/apw/php/config.php:268 +msgid "Set line-height for posts and comments" +msgstr "Lijnhoogte voor berichten en reacties instellen" -#: ../../mod/like.php:21 -msgid "" -"Please login with your RedMatrix ID or register as a new RedMatrix member to continue." -msgstr "Je dient in te loggen met je RedMatrix-account of een nieuw RedMatrix-account te registreren om verder te kunnen gaan." +#: ../../view/theme/apw/php/config.php:269 +msgid "Set background image" +msgstr "Achtergrondafbeelding instellen" -#: ../../mod/like.php:77 ../../mod/like.php:104 ../../mod/like.php:142 -msgid "Invalid request." -msgstr "Ongeldig verzoek" +#: ../../view/theme/apw/php/config.php:270 +msgid "Set background attachment" +msgstr "Gedrag achtergrondafbeelding instellen" -#: ../../mod/like.php:119 -msgid "thing" -msgstr "ding" +#: ../../view/theme/apw/php/config.php:271 +msgid "Set background color" +msgstr "Achtergrondkleur instellen" -#: ../../mod/like.php:165 -msgid "Channel unavailable." -msgstr "Kanaal niet beschikbaar." +#: ../../view/theme/apw/php/config.php:272 +msgid "Set section background image" +msgstr "Achtergrondafbeelding van sectie instellen" -#: ../../mod/like.php:204 -msgid "Previous action reversed." -msgstr "Vorige actie omgedraaid" +#: ../../view/theme/apw/php/config.php:273 +msgid "Set section background color" +msgstr "Achtergrondkleur van sectie instellen" -#: ../../mod/like.php:417 -msgid "Action completed." -msgstr "Actie voltooid" +#: ../../view/theme/apw/php/config.php:274 +msgid "Set color of items - use hex" +msgstr "Tekstkleur van items instellen (gebruik hexadecimaal)" -#: ../../mod/like.php:418 -msgid "Thank you." -msgstr "Bedankt" +#: ../../view/theme/apw/php/config.php:275 +msgid "Set color of links - use hex" +msgstr "Kleur van links instellen (gebruik hexadecimaal)" -#: ../../mod/notify.php:53 ../../mod/notifications.php:94 -msgid "No more system notifications." -msgstr "Geen systeemnotificaties meer." +#: ../../view/theme/apw/php/config.php:276 +msgid "Set max-width for items. Default 400px" +msgstr "Maximale breedte van items instellen (standaard 400px)" -#: ../../mod/notify.php:57 ../../mod/notifications.php:98 -msgid "System Notifications" -msgstr "Systeemnotificaties" +#: ../../view/theme/apw/php/config.php:277 +msgid "Set min-width for items. Default 240px" +msgstr "Minimale breedte van items instellen (standaard 240px)" -#: ../../mod/api.php:76 ../../mod/api.php:102 -msgid "Authorize application connection" -msgstr "Geef toestemming voor applicatiekoppeling" +#: ../../view/theme/apw/php/config.php:278 +msgid "Set the generic content wrapper width. Default 48%" +msgstr "Breedte van de generieke content-wrapper instellen (standaard 48%)" -#: ../../mod/api.php:77 -msgid "Return to your app and insert this Securty Code:" -msgstr "Ga terug naar je app en voeg deze beveiligingscode in:" +#: ../../view/theme/apw/php/config.php:279 +msgid "Set color of fonts - use hex" +msgstr "Tekstkleur instellen (gebruik hexadecimaal)" -#: ../../mod/api.php:89 -msgid "Please login to continue." -msgstr "Inloggen om verder te kunnen gaan." +#: ../../view/theme/apw/php/config.php:280 +msgid "Set background-size element" +msgstr "Grootte achtergrondafbeelding instellen" -#: ../../mod/api.php:104 -msgid "" -"Do you want to authorize this application to access your posts and contacts," -" and/or create new posts for you?" -msgstr "Wil je deze applicatie toestemming geven om jouw berichten en connecties te zien, en/of nieuwe berichten voor jou te plaatsen?" +#: ../../view/theme/apw/php/config.php:281 +msgid "Item opacity" +msgstr "Ondoorzichtigheid item" -#: ../../mod/chat.php:167 -msgid "Room not found" -msgstr "Chatkanaal niet gevonden" +#: ../../view/theme/apw/php/config.php:282 +msgid "Display post previews only" +msgstr "Alleen voorvertoning berichten weergeven" -#: ../../mod/chat.php:178 -msgid "Leave Room" -msgstr "Chatkanaal verlaten" +#: ../../view/theme/apw/php/config.php:283 +msgid "Display side bar on channel page" +msgstr "Zijbalk op kanaalpagina weergeven" -#: ../../mod/chat.php:179 -msgid "Delete This Room" -msgstr "Chatkanaal verwijderen" +#: ../../view/theme/apw/php/config.php:284 +msgid "Colour of the navigation bar" +msgstr "Kleur van de navigatiebalk" -#: ../../mod/chat.php:180 -msgid "I am away right now" -msgstr "Ik ben momenteel afwezig" +#: ../../view/theme/apw/php/config.php:285 +msgid "Item float" +msgstr "Item float" -#: ../../mod/chat.php:181 -msgid "I am online" -msgstr "Ik ben online" +#: ../../view/theme/apw/php/config.php:286 +msgid "Left offset of the section element" +msgstr "Linker offset van het sectie-element" -#: ../../mod/chat.php:183 -msgid "Bookmark this room" -msgstr "Chatkanaal aan bladwijzers toevoegen" +#: ../../view/theme/apw/php/config.php:287 +msgid "Right offset of the section element" +msgstr "Rechter offset van het sectie-element" -#: ../../mod/chat.php:207 ../../mod/chat.php:229 -msgid "New Chatroom" -msgstr "Nieuw chatkanaal" +#: ../../view/theme/apw/php/config.php:288 +msgid "Section width" +msgstr "Breedte van sectie" -#: ../../mod/chat.php:208 -msgid "Chatroom Name" -msgstr "Naam chatkanaal" +#: ../../view/theme/apw/php/config.php:289 +msgid "Left offset of the aside" +msgstr "Rechter offset van aside (zijbalk)" + +#: ../../view/theme/apw/php/config.php:290 +msgid "Right offset of the aside element" +msgstr "Rechter offset van het aside-element" -#: ../../mod/chat.php:225 -#, php-format -msgid "%1$s's Chatrooms" -msgstr "Chatkanalen van %1$s" +#: ../../view/theme/blogga/php/config.php:47 +#: ../../view/theme/blogga/view/theme/blog/config.php:47 +msgid "None" +msgstr "Geen" -#: ../../mod/events.php:72 -msgid "Event title and start time are required." -msgstr "Titel en begintijd van gebeurtenis zijn vereist." +#: ../../view/theme/blogga/php/config.php:70 +#: ../../view/theme/blogga/view/theme/blog/config.php:70 +msgid "Header image" +msgstr "Header-afbeelding" -#: ../../mod/events.php:86 -msgid "Event not found." -msgstr "Gebeurtenis niet gevonden" +#: ../../view/theme/blogga/php/config.php:71 +#: ../../view/theme/blogga/view/theme/blog/config.php:71 +msgid "Header image only on profile pages" +msgstr "Header-afbeelding alleen op profielpagina's weergeven" -#: ../../mod/events.php:329 -msgid "l, F j" -msgstr "l j F" +#: ../../view/theme/redbasic/php/config.php:84 +msgid "Light (Red Matrix default)" +msgstr "Light (RedMatrix-standaard)" -#: ../../mod/events.php:351 -msgid "Edit event" -msgstr "Gebeurtenis bewerken" +#: ../../view/theme/redbasic/php/config.php:104 +msgid "Narrow navbar" +msgstr "Smalle navigatiebalk" -#: ../../mod/events.php:397 -msgid "Create New Event" -msgstr "Nieuwe gebeurtenis aanmaken" +#: ../../view/theme/redbasic/php/config.php:105 +msgid "Navigation bar background color" +msgstr "Achtergrondkleur navigatiebalk" -#: ../../mod/events.php:398 -msgid "Previous" -msgstr "Vorige" +#: ../../view/theme/redbasic/php/config.php:106 +msgid "Navigation bar gradient top color" +msgstr "Bovenste gradiëntkleur navigatiebalk" -#: ../../mod/events.php:469 -msgid "hour:minute" -msgstr "uur:minuut" +#: ../../view/theme/redbasic/php/config.php:107 +msgid "Navigation bar gradient bottom color" +msgstr "Onderste gradiëntkleur navigatiebalk" -#: ../../mod/events.php:489 -msgid "Event details" -msgstr "Details van gebeurtenis" +#: ../../view/theme/redbasic/php/config.php:108 +msgid "Navigation active button gradient top color" +msgstr "Bovenste gradiëntkleur actieve knop navigatiebalk" -#: ../../mod/events.php:490 -#, php-format -msgid "Format is %s %s. Starting date and Title are required." -msgstr "Volgorde is %s %s. Begintijd en titel zijn vereist." +#: ../../view/theme/redbasic/php/config.php:109 +msgid "Navigation active button gradient bottom color" +msgstr "Onderste gradiëntkleur actieve knop op navigatiebalk" -#: ../../mod/events.php:492 -msgid "Event Starts:" -msgstr "Begin gebeurtenis:" +#: ../../view/theme/redbasic/php/config.php:110 +msgid "Navigation bar border color " +msgstr "Randkleur navigatiebalk " -#: ../../mod/events.php:495 -msgid "Finish date/time is not known or not relevant" -msgstr "Einddatum/-tijd is niet bekend of niet relevant" +#: ../../view/theme/redbasic/php/config.php:111 +msgid "Navigation bar icon color " +msgstr "Pictogramkleur navigatiebalk" -#: ../../mod/events.php:497 -msgid "Event Finishes:" -msgstr "Einde gebeurtenis:" +#: ../../view/theme/redbasic/php/config.php:112 +msgid "Navigation bar active icon color " +msgstr "Actieve pictogramkleur navigatiebalk" -#: ../../mod/events.php:500 -msgid "Adjust for viewer timezone" -msgstr "Aanpassen aan de tijdzone van wie deze gebeurtenis bekijkt" +#: ../../view/theme/redbasic/php/config.php:113 +msgid "link color" +msgstr "Linkkleur instellen" -#: ../../mod/events.php:502 -msgid "Description:" -msgstr "Omschrijving:" +#: ../../view/theme/redbasic/php/config.php:114 +msgid "Set font-color for banner" +msgstr "Tekstkleur van banner instellen" -#: ../../mod/events.php:506 -msgid "Title:" -msgstr "Titel:" +#: ../../view/theme/redbasic/php/config.php:115 +msgid "Set the background color" +msgstr "Achtergrondkleur instellen" -#: ../../mod/events.php:508 -msgid "Share this event" -msgstr "Deel deze gebeurtenis" +#: ../../view/theme/redbasic/php/config.php:116 +msgid "Set the background image" +msgstr "Achtergrondafbeelding instellen" -#: ../../mod/notifications.php:26 -msgid "Invalid request identifier." -msgstr "Ongeldige verzoek identificator (request identifier)" +#: ../../view/theme/redbasic/php/config.php:117 +msgid "Set the background color of items" +msgstr "Achtergrondkleur items instellen" -#: ../../mod/notifications.php:35 -msgid "Discard" -msgstr "Annuleren" +#: ../../view/theme/redbasic/php/config.php:118 +msgid "Set the background color of comments" +msgstr "Achtergrondkleur reacties instellen" -#: ../../mod/lostpass.php:15 -msgid "No valid account found." -msgstr "Geen geldige account gevonden." +#: ../../view/theme/redbasic/php/config.php:119 +msgid "Set the border color of comments" +msgstr "Randkleur reacties instellen" -#: ../../mod/lostpass.php:29 -msgid "Password reset request issued. Check your email." -msgstr "Het verzoek om je wachtwoord opnieuw in te stellen is behandeld. Controleer je e-mail." +#: ../../view/theme/redbasic/php/config.php:120 +msgid "Set the indent for comments" +msgstr "Inspringen reacties instellen" -#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:102 -#, php-format -msgid "Site Member (%s)" -msgstr "Lid van hub (%s)" +#: ../../view/theme/redbasic/php/config.php:121 +msgid "Set the basic color for item icons" +msgstr "Basiskleur itempictogrammen instellen" -#: ../../mod/lostpass.php:40 -#, php-format -msgid "Password reset requested at %s" -msgstr "Verzoek tot het opnieuw instellen van een wachtwoord op %s is ingediend" +#: ../../view/theme/redbasic/php/config.php:122 +msgid "Set the hover color for item icons" +msgstr "Hoverkleur itempictogrammen instellen" -#: ../../mod/lostpass.php:63 -msgid "" -"Request could not be verified. (You may have previously submitted it.) " -"Password reset failed." -msgstr "Het verzoek kon niet worden geverifieerd. (Mogelijk heb je al eerder een verzoek ingediend.) Opnieuw instellen van wachtwoord is mislukt." +#: ../../view/theme/redbasic/php/config.php:123 +msgid "Set font-size for the entire application" +msgstr "Tekstgrootte van de volledige applicatie instellen" -#: ../../mod/lostpass.php:86 -msgid "Your password has been reset as requested." -msgstr "Jouw wachtwoord is opnieuw ingesteld zoals je had verzocht." +#: ../../view/theme/redbasic/php/config.php:125 +msgid "Set font-color for posts and comments" +msgstr "Tekstkleur van berichten en reacties" -#: ../../mod/lostpass.php:87 -msgid "Your new password is" -msgstr "Jouw nieuwe wachtwoord is" +#: ../../view/theme/redbasic/php/config.php:126 +msgid "Set radius of corners" +msgstr "Radius van hoeken instellen" -#: ../../mod/lostpass.php:88 -msgid "Save or copy your new password - and then" -msgstr "Kopieer of sla je nieuwe wachtwoord op - en" +#: ../../view/theme/redbasic/php/config.php:127 +msgid "Set shadow depth of photos" +msgstr "Schaduwdiepte van foto's instellen" -#: ../../mod/lostpass.php:89 -msgid "click here to login" -msgstr "klik dan hier om in te loggen" +#: ../../view/theme/redbasic/php/config.php:128 +msgid "Set maximum width of conversation regions" +msgstr "Maximumbreedte conversatieruimte instellen" -#: ../../mod/lostpass.php:90 -msgid "" -"Your password may be changed from the Settings page after " -"successful login." -msgstr "Jouw wachtwoord kan worden veranderd onder instellingen, nadat je succesvol bent ingelogd." +#: ../../view/theme/redbasic/php/config.php:129 +msgid "Center conversation regions" +msgstr "Centreer conversatieruimte" -#: ../../mod/lostpass.php:107 -#, php-format -msgid "Your password has changed at %s" -msgstr "Jouw wachtwoord op %s is veranderd" +#: ../../view/theme/redbasic/php/config.php:130 +msgid "Set minimum opacity of nav bar - to hide it" +msgstr "Minimale ondoorzichtigheid navigatiebalk (- om te verbergen)" -#: ../../mod/lostpass.php:122 -msgid "Forgot your Password?" -msgstr "Wachtwoord vergeten?" +#: ../../view/theme/redbasic/php/config.php:131 +msgid "Set size of conversation author photo" +msgstr "Grootte profielfoto's van berichten instellen" -#: ../../mod/lostpass.php:123 -msgid "" -"Enter your email address and submit to have your password reset. Then check " -"your email for further instructions." -msgstr "Voer je e-mailadres in en verstuur deze om je wachtwoord opnieuw in te stellen. Controleer hierna hier je e-mail voor verdere instructies." +#: ../../view/theme/redbasic/php/config.php:132 +msgid "Set size of followup author photos" +msgstr "Grootte profielfoto's van reacties instellen" -#: ../../mod/lostpass.php:124 -msgid "Email Address" -msgstr "E-mailadres" +#: ../../view/theme/redbasic/php/config.php:133 +msgid "Sloppy photo albums" +msgstr "Rommelig vormgegeven fotoalbums" -#: ../../mod/lostpass.php:125 -msgid "Reset" -msgstr "Opnieuw instellen" +#: ../../view/theme/redbasic/php/config.php:133 +msgid "Are you a clean desk or a messy desk person?" +msgstr "Ben je iemand die van een opgeruimd bureau houdt of van een rommelig bureau?" -#: ../../mod/layouts.php:62 -msgid "Help with this feature" -msgstr "Hulp voor dit onderdeel" +#: ../../boot.php:1296 +#, php-format +msgid "Update %s failed. See error logs." +msgstr "Update %s mislukt. Zie foutenlogboek." -#: ../../mod/layouts.php:84 -msgid "Layout Name" -msgstr "Naam layout" +#: ../../boot.php:1299 +#, php-format +msgid "Update Error at %s" +msgstr "Update-fout op %s" -#: ../../mod/editblock.php:77 -msgid "Edit Block" -msgstr "Blok bewerken" +#: ../../boot.php:1473 +msgid "" +"Create an account to access services and applications within the Red Matrix" +msgstr "Maak een account aan om toegang te krijgen tot diensten en toepassingen van de RedMatrix" -#: ../../mod/editblock.php:87 -msgid "Delete block?" -msgstr "Blok verwijderen" +#: ../../boot.php:1501 +msgid "Password" +msgstr "Wachtwoord" -#: ../../mod/editblock.php:153 -msgid "Delete Block" -msgstr "Blok verwijderen" +#: ../../boot.php:1502 +msgid "Remember me" +msgstr "Aangemeld blijven" -#: ../../mod/editlayout.php:72 -msgid "Edit Layout" -msgstr "Lay-out bewerken" +#: ../../boot.php:1507 +msgid "Forgot your password?" +msgstr "Wachtwoord vergeten?" -#: ../../mod/editlayout.php:82 -msgid "Delete layout?" -msgstr "Lay-out verwijderen?" +#: ../../boot.php:1572 +msgid "permission denied" +msgstr "toegang geweigerd" -#: ../../mod/editlayout.php:146 -msgid "Delete Layout" -msgstr "Lay-out verwijderen" +#: ../../boot.php:1573 +msgid "Got Zot?" +msgstr "Heb je Zot?" -#: ../../mod/follow.php:25 -msgid "Channel added." -msgstr "Kanaal toegevoegd." +#: ../../boot.php:2003 +msgid "toggle mobile" +msgstr "mobiele weergave omschakelen" diff --git a/view/nl/strings.php b/view/nl/strings.php index 2a4375444..472a69829 100644 --- a/view/nl/strings.php +++ b/view/nl/strings.php @@ -5,231 +5,249 @@ function string_plural_select_nl($n){ return ($n != 1);; }} ; -$a->strings["Light (Red Matrix default)"] = "Light (RedMatrix-standaard)"; -$a->strings["Submit"] = "Opslaan"; -$a->strings["Theme settings"] = "Thema-instellingen"; -$a->strings["Set scheme"] = "Schema van thema instellen"; -$a->strings["Narrow navbar"] = "Smalle navigatiebalk"; -$a->strings["Navigation bar background color"] = "Achtergrondkleur navigatiebalk"; -$a->strings["Navigation bar gradient top color"] = "Bovenste gradiëntkleur navigatiebalk"; -$a->strings["Navigation bar gradient bottom color"] = "Onderste gradiëntkleur navigatiebalk"; -$a->strings["Navigation active button gradient top color"] = "Bovenste gradiëntkleur actieve knop navigatiebalk"; -$a->strings["Navigation active button gradient bottom color"] = "Onderste gradiëntkleur actieve knop op navigatiebalk"; -$a->strings["Navigation bar border color "] = "Randkleur navigatiebalk "; -$a->strings["Navigation bar icon color "] = "Pictogramkleur navigatiebalk"; -$a->strings["Navigation bar active icon color "] = "Actieve pictogramkleur navigatiebalk"; -$a->strings["link color"] = "Linkkleur instellen"; -$a->strings["Set font-color for banner"] = "Tekstkleur van banner instellen"; -$a->strings["Set the background color"] = "Achtergrondkleur instellen"; -$a->strings["Set the background image"] = "Achtergrondafbeelding instellen"; -$a->strings["Set the background color of items"] = "Achtergrondkleur items instellen"; -$a->strings["Set the background color of comments"] = "Achtergrondkleur reacties instellen"; -$a->strings["Set the border color of comments"] = "Randkleur reacties instellen"; -$a->strings["Set the indent for comments"] = "Inspringen reacties instellen"; -$a->strings["Set the basic color for item icons"] = "Basiskleur itempictogrammen instellen"; -$a->strings["Set the hover color for item icons"] = "Hoverkleur itempictogrammen instellen"; -$a->strings["Set font-size for the entire application"] = "Tekstgrootte van de volledige applicatie instellen"; -$a->strings["Set font-size for posts and comments"] = "Lettergrootte voor berichten en reacties instellen"; -$a->strings["Set font-color for posts and comments"] = "Tekstkleur van berichten en reacties"; -$a->strings["Set radius of corners"] = "Radius van hoeken instellen"; -$a->strings["Set shadow depth of photos"] = "Schaduwdiepte van foto's instellen"; -$a->strings["Set maximum width of conversation regions"] = "Maximumbreedte conversatieruimte instellen"; -$a->strings["Center conversation regions"] = "Centreer conversatieruimte"; -$a->strings["Set minimum opacity of nav bar - to hide it"] = "Minimale ondoorzichtigheid navigatiebalk (- om te verbergen)"; -$a->strings["Set size of conversation author photo"] = "Grootte profielfoto's van berichten instellen"; -$a->strings["Set size of followup author photos"] = "Grootte profielfoto's van reacties instellen"; -$a->strings["Sloppy photo albums"] = "Rommelig vormgegeven fotoalbums"; -$a->strings["Are you a clean desk or a messy desk person?"] = "Ben je iemand die van een opgeruimd bureau houdt of van een rommelig bureau?"; -$a->strings["Update %s failed. See error logs."] = "Update %s mislukt. Zie foutenlogboek."; -$a->strings["Update Error at %s"] = "Update-fout op %s"; -$a->strings["Create an account to access services and applications within the Red Matrix"] = "Maak een account aan om toegang te krijgen tot diensten en toepassingen van de RedMatrix"; -$a->strings["Register"] = "Registreren "; -$a->strings["Logout"] = "Uitloggen"; +$a->strings["Cannot locate DNS info for database server '%s'"] = "Kan DNS-informatie voor databaseserver '%s' niet vinden"; +$a->strings["Profile Photos"] = "Profielfoto's"; +$a->strings["%1\$s is now friends with %2\$s"] = "%1\$s is nu bevriend met %2\$s"; +$a->strings["Sharing notification from Diaspora network"] = "Notificatie delen vanuit het Diaspora-netwerk"; +$a->strings["photo"] = "foto"; +$a->strings["status"] = "status"; +$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s vindt %3\$s van %2\$s leuk"; +$a->strings["Attachments:"] = "Bijlagen:"; +$a->strings["Embedded content"] = "Ingesloten inhoud"; +$a->strings["Embedding disabled"] = "Insluiten uitgeschakeld"; +$a->strings["created a new post"] = "maakte een nieuw bericht aan"; +$a->strings["commented on %s's post"] = "gaf een reactie op een bericht van %s"; +$a->strings["Site Admin"] = "Hubbeheerder"; +$a->strings["Bookmarks"] = "Bladwijzers"; +$a->strings["Address Book"] = "Connecties"; $a->strings["Login"] = "Inloggen"; -$a->strings["Email"] = "E-mail"; -$a->strings["Password"] = "Wachtwoord"; -$a->strings["Remember me"] = "Aangemeld blijven"; -$a->strings["Forgot your password?"] = "Wachtwoord vergeten?"; -$a->strings["Password Reset"] = "Wachtwoord vergeten?"; -$a->strings["permission denied"] = "toegang geweigerd"; -$a->strings["Got Zot?"] = "Heb je Zot?"; -$a->strings["toggle mobile"] = "mobiele weergave omschakelen"; -$a->strings["Logged out."] = "Uitgelogd."; -$a->strings["Failed authentication"] = "Mislukte authenticatie"; -$a->strings["Login failed."] = "Inloggen mislukt."; -$a->strings["Default"] = "Standaard"; +$a->strings["Channel Select"] = "Kanaalkiezer"; +$a->strings["Matrix"] = "Matrix"; +$a->strings["Settings"] = "Instellingen"; +$a->strings["Files"] = "Bestanden"; +$a->strings["Webpages"] = "Webpagina's"; +$a->strings["Channel Home"] = "Tijdlijn kanaal"; +$a->strings["Profile"] = "Profiel"; +$a->strings["Photos"] = "Foto's"; +$a->strings["Events"] = "Gebeurtenissen"; +$a->strings["Directory"] = "Gids"; +$a->strings["Help"] = "Hulp"; +$a->strings["Mail"] = "Privéberichten"; +$a->strings["Mood"] = "Stemming"; +$a->strings["Poke"] = "Aanstoten"; +$a->strings["Chat"] = "Chatten"; +$a->strings["Search"] = "Zoeken"; +$a->strings["Probe"] = "Onderzoeken"; +$a->strings["Suggest"] = "Voorstellen"; +$a->strings["Random Channel"] = "Willekeurig kanaal"; +$a->strings["Invite"] = "Uitnodigen "; +$a->strings["Features"] = "Extra functies"; +$a->strings["Language"] = "Taal"; +$a->strings["Post"] = "Bericht"; +$a->strings["Profile Photo"] = "Profielfoto"; +$a->strings["Update"] = "Bijwerken"; +$a->strings["Install"] = "Installeren"; +$a->strings["Purchase"] = "Aanschaffen"; +$a->strings["Edit"] = "Bewerken"; +$a->strings["Delete"] = "Verwijderen"; +$a->strings["Unknown"] = "Onbekend"; +$a->strings["prev"] = "vorige"; +$a->strings["first"] = "eerste"; +$a->strings["last"] = "laatste"; +$a->strings["next"] = "volgende"; +$a->strings["older"] = "ouder"; +$a->strings["newer"] = "nieuwer"; +$a->strings["No connections"] = "Geen connecties"; +$a->strings["%d Connection"] = array( + 0 => "%d connectie", + 1 => "%d connecties", +); +$a->strings["View Connections"] = "Connecties weergeven"; +$a->strings["Save"] = "Opslaan"; +$a->strings["poke"] = "aanstoten"; +$a->strings["poked"] = "aangestoten"; +$a->strings["ping"] = "ping"; +$a->strings["pinged"] = "gepingd"; +$a->strings["prod"] = "por"; +$a->strings["prodded"] = "gepord"; +$a->strings["slap"] = "slaan"; +$a->strings["slapped"] = "sloeg"; +$a->strings["finger"] = "finger"; +$a->strings["fingered"] = "gefingerd"; +$a->strings["rebuff"] = "afpoeieren"; +$a->strings["rebuffed"] = "afgepoeierd"; +$a->strings["happy"] = "gelukkig"; +$a->strings["sad"] = "bedroefd"; +$a->strings["mellow"] = "mellow"; +$a->strings["tired"] = "moe"; +$a->strings["perky"] = "parmantig"; +$a->strings["angry"] = "boos"; +$a->strings["stupified"] = "beteuterd"; +$a->strings["puzzled"] = "verward"; +$a->strings["interested"] = "geïnteresseerd"; +$a->strings["bitter"] = "verbitterd"; +$a->strings["cheerful"] = "vrolijk"; +$a->strings["alive"] = "levendig"; +$a->strings["annoyed"] = "geërgerd"; +$a->strings["anxious"] = "bezorgd"; +$a->strings["cranky"] = "humeurig"; +$a->strings["disturbed"] = "verontrust"; +$a->strings["frustrated"] = "gefrustreerd "; +$a->strings["depressed"] = "gedeprimeerd"; +$a->strings["motivated"] = "gemotiveerd"; +$a->strings["relaxed"] = "ontspannen"; +$a->strings["surprised"] = "verrast"; +$a->strings["Monday"] = "maandag"; +$a->strings["Tuesday"] = "dinsdag"; +$a->strings["Wednesday"] = "woensdag"; +$a->strings["Thursday"] = "donderdag"; +$a->strings["Friday"] = "vrijdag"; +$a->strings["Saturday"] = "zaterdag"; +$a->strings["Sunday"] = "zondag"; +$a->strings["January"] = "januari"; +$a->strings["February"] = "februari"; +$a->strings["March"] = "maart"; +$a->strings["April"] = "april"; +$a->strings["May"] = "mei"; +$a->strings["June"] = "juni"; +$a->strings["July"] = "juli"; +$a->strings["August"] = "augustus"; +$a->strings["September"] = "september"; +$a->strings["October"] = "oktober"; +$a->strings["November"] = "november"; +$a->strings["December"] = "december"; +$a->strings["unknown.???"] = "onbekend.???"; +$a->strings["bytes"] = "bytes"; +$a->strings["remove category"] = "categorie verwijderen"; +$a->strings["remove from file"] = "uit map verwijderen"; +$a->strings["Click to open/close"] = "Klik om te openen of te sluiten"; +$a->strings["Link to Source"] = "Originele locatie"; +$a->strings["Select a page layout: "] = "Kies een paginalayout: "; +$a->strings["default"] = "standaard"; +$a->strings["Page content type: "] = "Opmaakcode pagina"; +$a->strings["Select an alternate language"] = "Kies een andere taal"; +$a->strings["event"] = "gebeurtenis"; +$a->strings["comment"] = "reactie"; +$a->strings["activity"] = "activiteit"; +$a->strings["Design"] = "Ontwerp"; +$a->strings["Blocks"] = "Blokken"; +$a->strings["Menus"] = "Menu's"; +$a->strings["Layouts"] = "Layouts"; +$a->strings["Pages"] = "Pagina's"; +$a->strings["New Page"] = "Nieuwe pagina"; +$a->strings["View"] = "Weergeven"; +$a->strings["Preview"] = "Voorvertoning"; +$a->strings["Actions"] = "Acties"; +$a->strings["Page Link"] = "Paginalink"; +$a->strings["Title"] = "Titel"; +$a->strings["Created"] = "Aangemaakt"; +$a->strings["Edited"] = "Bewerkt"; +$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "De beveiligings-token van het tekstvak was ongeldig. Dit is mogelijk het gevolg van dat er te lang (meer dan 3 uur) gewacht is om de tekst op te slaan. "; +$a->strings["Not a valid email address"] = "Geen geldig e-mailadres"; +$a->strings["Your email domain is not among those allowed on this site"] = "Jouw e-maildomein is op deze RedMatrix-hub niet toegestaan"; +$a->strings["Your email address is already registered at this site."] = "Jouw e-mailadres is al op deze RedMatrix-hub geregistreerd ."; +$a->strings["An invitation is required."] = "Een uitnodiging is vereist"; +$a->strings["Invitation could not be verified."] = "Uitnodiging kon niet geverifieerd worden"; +$a->strings["Please enter the required information."] = "Vul de vereiste informatie in."; +$a->strings["Failed to store account information."] = "Account-informatie kon niet opgeslagen worden."; +$a->strings["Registration confirmation for %s"] = "Registratiebevestiging voor %s"; +$a->strings["Registration request at %s"] = "Registratieverzoek op %s"; +$a->strings["Administrator"] = "Beheerder"; +$a->strings["your registration password"] = "jouw registratiewachtwoord"; +$a->strings["Registration details for %s"] = "Registratiedetails voor %s"; +$a->strings["Account approved."] = "Account goedgekeurd"; +$a->strings["Registration revoked for %s"] = "Registratie ingetrokken voor %s"; +$a->strings["Account verified. Please login."] = "Account is geverifieerd. Je kan inloggen."; $a->strings["Permission denied."] = "Toegang geweigerd"; -$a->strings["Profile Photos"] = "Profielfoto's"; $a->strings["Image exceeds website size limit of %lu bytes"] = "Afbeelding is groter dan op deze hub toegestane limiet van %lu bytes"; $a->strings["Image file is empty."] = "Afbeeldingsbestand is leeg"; $a->strings["Unable to process image"] = "Afbeelding kan niet verwerkt worden"; $a->strings["Photo storage failed."] = "Foto kan niet worden opgeslagen"; $a->strings["Photo Albums"] = "Fotoalbums"; $a->strings["Upload New Photos"] = "Nieuwe foto's uploaden"; -$a->strings["%d invitation available"] = array( - 0 => "%d uitnodiging beschikbaar", - 1 => "%d uitnodigingen beschikbaar", -); -$a->strings["Advanced"] = "Geavanceerd"; -$a->strings["Find Channels"] = "Kanalen vinden"; -$a->strings["Enter name or interest"] = "Vul naam of interesse in"; -$a->strings["Connect/Follow"] = "Verbinden/volgen"; -$a->strings["Examples: Robert Morgenstein, Fishing"] = "Voorbeeld: Robert Morgenstein, vissen"; -$a->strings["Find"] = "Vinden"; -$a->strings["Channel Suggestions"] = "Voorgestelde kanalen"; -$a->strings["Random Profile"] = "Willekeurig profiel"; -$a->strings["Invite Friends"] = "Vrienden uitnodigen"; -$a->strings["Exammple: name=fred and country=iceland"] = "Voorbeeld: (voor naam) name=herman en (voor land) country=nederland"; -$a->strings["Advanced Find"] = "Geavanceerd zoeken"; -$a->strings["Saved Folders"] = "Bewaarde mappen"; -$a->strings["Everything"] = "Alles"; -$a->strings["Categories"] = "Categorieën"; -$a->strings["%d connection in common"] = array( - 0 => "%d gemeenschappelijke connectie", - 1 => "%d gemeenschappelijke connecties", -); -$a->strings["show more"] = "meer connecties weergeven"; +$a->strings["Visible to your default audience"] = "Voor iedereen zichtbaar, zoals dit van te voren is ingesteld"; +$a->strings["Show"] = "Tonen"; +$a->strings["Don't show"] = "Niet tonen"; +$a->strings["Permissions"] = "Privacy-rechten"; +$a->strings["Close"] = "Sluiten"; $a->strings[" and "] = " en "; $a->strings["public profile"] = "openbaar profiel"; $a->strings["%1\$s changed %2\$s to “%3\$s”"] = "%1\$s veranderde %2\$s naar “%3\$s”"; $a->strings["Visit %1\$s's %2\$s"] = "Bezoek het %2\$s van %1\$s"; $a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s heeft een aangepaste %2\$s, %3\$s veranderd."; -$a->strings["Permission denied"] = "Toegang geweigerd"; -$a->strings["(Unknown)"] = "(Onbekend)"; -$a->strings["Visible to anybody on the internet."] = "Voor iedereen op het internet zichtbaar."; -$a->strings["Visible to you only."] = "Alleen voor jou zichtbaar."; -$a->strings["Visible to anybody in this network."] = "Voor iedereen in dit netwerk zichtbaar."; -$a->strings["Visible to anybody authenticated."] = "Voor iedereen die geauthenticeerd is zichtbaar."; -$a->strings["Visible to anybody on %s."] = "Voor iedereen op %s zichtbaar."; -$a->strings["Visible to all connections."] = "Voor alle connecties zichtbaar."; -$a->strings["Visible to approved connections."] = "Voor alle goedgekeurde connecties zichtbaar."; -$a->strings["Item not found."] = "Item niet gevonden."; -$a->strings["Collection not found."] = "Collectie niet gevonden."; -$a->strings["Collection is empty."] = "Collectie is leeg"; -$a->strings["Collection: %s"] = "Collectie: %s"; -$a->strings["Connection: %s"] = "Connectie: %s"; -$a->strings["Connection not found."] = "Connectie niet gevonden."; -$a->strings["Connect"] = "Verbinden"; -$a->strings["New window"] = "Nieuw venster"; -$a->strings["Open the selected location in a different window or browser tab"] = "Open de geselecteerde locatie in een ander venster of tab"; -$a->strings["Miscellaneous"] = "Diversen"; -$a->strings["year"] = "jaar"; -$a->strings["month"] = "maand"; -$a->strings["day"] = "dag"; -$a->strings["never"] = "nooit"; -$a->strings["less than a second ago"] = "minder dan een seconde geleden"; -$a->strings["years"] = "jaren"; -$a->strings["months"] = "maanden"; -$a->strings["week"] = "week"; -$a->strings["weeks"] = "weken"; -$a->strings["days"] = "dagen"; -$a->strings["hour"] = "uur"; -$a->strings["hours"] = "uren"; -$a->strings["minute"] = "minuut"; -$a->strings["minutes"] = "minuten"; -$a->strings["second"] = "seconde"; -$a->strings["seconds"] = "seconden"; -$a->strings["%1\$d %2\$s ago"] = "%1\$d %2\$s geleden"; -$a->strings["%1\$s's birthday"] = "Verjaardag van %1\$s"; -$a->strings["Happy Birthday %1\$s"] = "Gefeliciteerd met je verjaardag %1\$s"; -$a->strings["Unable to obtain identity information from database"] = "Niet in staat om identiteitsinformatie uit de database te verkrijgen"; -$a->strings["Empty name"] = "Ontbrekende naam"; -$a->strings["Name too long"] = "Naam te lang"; -$a->strings["No account identifier"] = "Geen account-identificator"; -$a->strings["Nickname is required."] = "Bijnaam is verplicht"; -$a->strings["Reserved nickname. Please choose another."] = "Deze naam is gereserveerd. Kies een andere."; -$a->strings["Nickname has unsupported characters or is already being used on this site."] = "Deze naam heeft niet ondersteunde karakters of is al op deze hub in gebruik."; -$a->strings["Unable to retrieve created identity"] = "Niet in staat om aangemaakte identiteit te vinden"; -$a->strings["Default Profile"] = "Standaardprofiel"; -$a->strings["Friends"] = "Vrienden"; -$a->strings["Requested channel is not available."] = "Opgevraagd kanaal is niet beschikbaar."; -$a->strings["Requested profile is not available."] = "Opgevraagd profiel is niet beschikbaar"; -$a->strings["Change profile photo"] = "Profielfoto veranderen"; -$a->strings["Profiles"] = "Profielen"; -$a->strings["Manage/edit profiles"] = "Profielen beheren/bewerken"; -$a->strings["Create New Profile"] = "Nieuw profiel aanmaken"; -$a->strings["Edit Profile"] = "Profiel bewerken"; -$a->strings["Profile Image"] = "Profielfoto"; -$a->strings["visible to everybody"] = "Voor iedereen zichtbaar"; -$a->strings["Edit visibility"] = "Zichtbaarheid bewerken"; +$a->strings["Public Timeline"] = "Openbare tijdlijn"; +$a->strings["Item was not found."] = "Item niet gevonden"; +$a->strings["No source file."] = "Geen bronbestand."; +$a->strings["Cannot locate file to replace"] = "Kan het te vervangen bestand niet vinden"; +$a->strings["Cannot locate file to revise/update"] = "Kan het bestand wat aangepast moet worden niet vinden"; +$a->strings["File exceeds size limit of %d"] = "Bestand is groter dan de toegelaten %d"; +$a->strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Je hebt jouw limiet van %1$.0f MB opslagruimte voor bijlagen bereikt."; +$a->strings["File upload failed. Possible system limit or action terminated."] = "Uploaden van bestand mislukt. Mogelijk systeemlimiet bereikt of actie afgebroken."; +$a->strings["Stored file could not be verified. Upload failed."] = "Opgeslagen bestand kon niet worden geverifieerd. Uploaden mislukt."; +$a->strings["Path not available."] = "Pad niet beschikbaar."; +$a->strings["Empty pathname"] = "Padnaam leeg"; +$a->strings["duplicate filename or path"] = "dubbele bestandsnaam of pad"; +$a->strings["Path not found."] = "Pad niet gevonden"; +$a->strings["mkdir failed."] = "directory aanmaken (mkdir) mislukt."; +$a->strings["database storage failed."] = "opslag in database mislukt."; +$a->strings["Click here to upgrade."] = "Klik hier om te upgraden."; +$a->strings["This action exceeds the limits set by your subscription plan."] = "Deze handeling overschrijdt de beperkingen die voor jouw abonnement gelden."; +$a->strings["This action is not available under your subscription plan."] = "Deze handeling is niet mogelijk met jouw abonnement."; +$a->strings["l F d, Y \\@ g:i A"] = "l d F Y \\@ G:i"; +$a->strings["Starts:"] = "Start:"; +$a->strings["Finishes:"] = "Einde:"; $a->strings["Location:"] = "Plaats:"; -$a->strings["Gender:"] = "Geslacht:"; -$a->strings["Status:"] = "Status:"; -$a->strings["Homepage:"] = "Homepagina:"; -$a->strings["Online Now"] = "Nu online"; -$a->strings["g A l F d"] = "G:i, l d F"; -$a->strings["F d"] = "d F"; -$a->strings["[today]"] = "[vandaag]"; -$a->strings["Birthday Reminders"] = "Verjaardagsherinneringen"; -$a->strings["Birthdays this week:"] = "Verjaardagen deze week:"; -$a->strings["[No description]"] = "[Geen omschrijving]"; -$a->strings["Event Reminders"] = "Herinneringen voor gebeurtenissen"; -$a->strings["Events this week:"] = "Gebeurtenissen deze week:"; -$a->strings["Profile"] = "Profiel"; -$a->strings["Full Name:"] = "Volledige naam:"; -$a->strings["Like this channel"] = "Vind dit kanaal leuk"; -$a->strings["__ctx:noun__ Like"] = array( - 0 => "vindt dit leuk", - 1 => "vinden dit leuk", -); -$a->strings["j F, Y"] = "F j Y"; -$a->strings["j F"] = "F j"; -$a->strings["Birthday:"] = "Geboortedatum:"; -$a->strings["Age:"] = "Leeftijd:"; -$a->strings["for %1\$d %2\$s"] = "voor %1\$d %2\$s"; -$a->strings["Sexual Preference:"] = "Seksuele voorkeur:"; -$a->strings["Hometown:"] = "Oorspronkelijk uit:"; -$a->strings["Tags:"] = "Trefwoorden:"; -$a->strings["Political Views:"] = "Politieke overtuigingen:"; -$a->strings["Religion:"] = "Religie:"; -$a->strings["About:"] = "Over:"; -$a->strings["Hobbies/Interests:"] = "Hobby's/interesses:"; -$a->strings["Likes:"] = "Houdt van:"; -$a->strings["Dislikes:"] = "Houdt niet van:"; -$a->strings["Contact information and Social Networks:"] = "Contactinformatie en sociale netwerken:"; -$a->strings["My other channels:"] = "Mijn andere kanalen"; -$a->strings["Musical interests:"] = "Muzikale interesses:"; -$a->strings["Books, literature:"] = "Boeken, literatuur:"; -$a->strings["Television:"] = "Televisie:"; -$a->strings["Film/dance/culture/entertainment:"] = "Films/dansen/cultuur/vermaak:"; -$a->strings["Love/Romance:"] = "Liefde/romantiek:"; -$a->strings["Work/employment:"] = "Werk/beroep:"; -$a->strings["School/education:"] = "School/opleiding:"; -$a->strings["Like this thing"] = "Vind dit ding leuk"; -$a->strings["New Page"] = "Nieuwe pagina"; -$a->strings["Edit"] = "Bewerken"; -$a->strings["View"] = "Weergeven"; -$a->strings["Preview"] = "Voorvertoning"; -$a->strings["Actions"] = "Acties"; -$a->strings["Page Link"] = "Paginalink"; -$a->strings["Title"] = "Titel"; -$a->strings["Created"] = "Aangemaakt"; -$a->strings["Edited"] = "Bewerkt"; -$a->strings["parent"] = "omhoog"; -$a->strings["Collection"] = "map"; -$a->strings["Principal"] = "principal"; -$a->strings["Addressbook"] = "Adresboek"; -$a->strings["Calendar"] = "Agenda"; -$a->strings["Schedule Inbox"] = "Planning-postvak IN"; -$a->strings["Schedule Outbox"] = "Planning-postvak UIT"; -$a->strings["Unknown"] = "Onbekend"; -$a->strings["%1\$s used"] = "%1\$s gebruikt"; -$a->strings["%1\$s used of %2\$s (%3\$s%)"] = "%1\$s van %2\$s gebruikt (%3\$s%)"; -$a->strings["Files"] = "Bestanden"; -$a->strings["Name"] = "Naam"; -$a->strings["Type"] = "Type"; -$a->strings["Size"] = "Grootte"; -$a->strings["Last Modified"] = "Laatst gewijzigd"; -$a->strings["Delete"] = "Verwijderen"; -$a->strings["Total"] = "Totaal"; -$a->strings["Create new folder"] = "Nieuwe map aanmaken"; -$a->strings["Create"] = "Aanmaken"; -$a->strings["Upload file"] = "Bestand uploaden"; -$a->strings["Upload"] = "Uploaden"; -$a->strings["No recipient provided."] = "Geen ontvanger opgegeven."; -$a->strings["[no subject]"] = "[geen onderwerp]"; -$a->strings["Unable to determine sender."] = "Afzender kan niet bepaald worden."; -$a->strings["Stored post could not be verified."] = "Opgeslagen bericht kon niet worden geverifieerd."; +$a->strings["Logout"] = "Uitloggen"; +$a->strings["End this session"] = "Beëindig deze sessie"; +$a->strings["Home"] = "Home"; +$a->strings["Your posts and conversations"] = "Jouw berichten en conversaties"; +$a->strings["View Profile"] = "Profiel weergeven"; +$a->strings["Your profile page"] = "Jouw profielpagina"; +$a->strings["Edit Profiles"] = "Bewerk profielen"; +$a->strings["Manage/Edit profiles"] = "Beheer/wijzig profielen"; +$a->strings["Edit Profile"] = "Profiel bewerken"; +$a->strings["Edit your profile"] = "Jouw profiel bewerken"; +$a->strings["Your photos"] = "Jouw foto's"; +$a->strings["Your files"] = "Jouw bestanden"; +$a->strings["Your chatrooms"] = "Jouw chatkanalen"; +$a->strings["Your bookmarks"] = "Jouw bladwijzers"; +$a->strings["Your webpages"] = "Jouw webpagina's"; +$a->strings["Sign in"] = "Inloggen"; +$a->strings["%s - click to logout"] = "%s - klik om uit te loggen"; +$a->strings["Click to authenticate to your home hub"] = "Klik om jezelf te authenticeren via jouw eigen RedMatrix-hub"; +$a->strings["Home Page"] = "Homepage"; +$a->strings["Register"] = "Registreren "; +$a->strings["Create an account"] = "Maak een account aan"; +$a->strings["Help and documentation"] = "Hulp en documentatie"; +$a->strings["Apps"] = "Apps"; +$a->strings["Applications, utilities, links, games"] = "Apps"; +$a->strings["Search site content"] = "Inhoud van deze RedMatrix-hub doorzoeken"; +$a->strings["Channel Locator"] = "Kanalengids"; +$a->strings["Your matrix"] = "Jouw matrix"; +$a->strings["Mark all matrix notifications seen"] = "Markeer alle matrixnotificaties als bekeken"; +$a->strings["Channel home"] = "Tijdlijn kanaal"; +$a->strings["Mark all channel notifications seen"] = "Alle kanaalnotificaties als gelezen markeren"; +$a->strings["Connections"] = "Connecties"; +$a->strings["Notices"] = "Notificaties"; +$a->strings["Notifications"] = "Notificaties"; +$a->strings["See all notifications"] = "Alle notificaties weergeven"; +$a->strings["Mark all system notifications seen"] = "Markeer alle systeemnotificaties als bekeken"; +$a->strings["Private mail"] = "Privéberichten"; +$a->strings["See all private messages"] = "Alle privéberichten weergeven"; +$a->strings["Mark all private messages seen"] = "Markeer alle privéberichten als bekeken"; +$a->strings["Inbox"] = "Postvak IN"; +$a->strings["Outbox"] = "Postvak UIT"; +$a->strings["New Message"] = "Nieuw bericht"; +$a->strings["Event Calendar"] = "Agenda"; +$a->strings["See all events"] = "Alle gebeurtenissen weergeven"; +$a->strings["Mark all events seen"] = "Markeer alle gebeurtenissen als bekeken"; +$a->strings["Manage Your Channels"] = "Beheer je kanalen"; +$a->strings["Account/Channel Settings"] = "Account-/kanaal-instellingen"; +$a->strings["Admin"] = "Beheer"; +$a->strings["Site Setup and Configuration"] = "Hub instellen en beheren"; +$a->strings["Nothing new here"] = "Niets nieuw hier"; +$a->strings["Please wait..."] = "Wachten aub..."; +$a->strings["%1\$s's bookmarks"] = "Bladwijzers van %1\$s"; $a->strings["Tags"] = "Labels"; $a->strings["Keywords"] = "Trefwoorden"; $a->strings["have"] = "heb"; @@ -240,57 +258,11 @@ $a->strings["like"] = "vind dit leuk"; $a->strings["likes"] = "vindt dit leuk"; $a->strings["dislike"] = "vind dit niet leuk"; $a->strings["dislikes"] = "vindt dit niet leuk"; -$a->strings["Delete this item?"] = "Dit item verwijderen?"; -$a->strings["Comment"] = "Reactie"; -$a->strings["[+] show all"] = "[+] alle"; -$a->strings["[-] show less"] = "[-] minder reacties weergeven"; -$a->strings["[+] expand"] = "[+] uitklappen"; -$a->strings["[-] collapse"] = "[-] inklappen"; -$a->strings["Password too short"] = "Wachtwoord te kort"; -$a->strings["Passwords do not match"] = "Wachtwoorden komen niet overeen"; -$a->strings["everybody"] = "iedereen"; -$a->strings["Secret Passphrase"] = "Geheim wachtwoord"; -$a->strings["Passphrase hint"] = "Wachtwoordhint"; -$a->strings["Notice: Permissions have changed but have not yet been submitted."] = "Mededeling: de privacy-rechten zijn veranderd, maar zijn nog niet opgeslagen."; -$a->strings["close all"] = "Alles sluiten"; -$a->strings["timeago.prefixAgo"] = "timeago.prefixAgo"; -$a->strings["timeago.prefixFromNow"] = "timeago.prefixFromNow"; -$a->strings["ago"] = "geleden"; -$a->strings["from now"] = "vanaf nu"; -$a->strings["less than a minute"] = "minder dan een minuut"; -$a->strings["about a minute"] = "ongeveer een minuut"; -$a->strings["%d minutes"] = "%d minuten"; -$a->strings["about an hour"] = "ongeveer een uur"; -$a->strings["about %d hours"] = "ongeveer %d uren"; -$a->strings["a day"] = "een dag"; -$a->strings["%d days"] = "%d dagen"; -$a->strings["about a month"] = "ongeveer een maand"; -$a->strings["%d months"] = "%d maanden"; -$a->strings["about a year"] = "ongeveer een jaar"; -$a->strings["%d years"] = "%d jaren"; -$a->strings[" "] = " "; -$a->strings["timeago.numbers"] = "timeago.numbers"; -$a->strings["Can view my normal stream and posts"] = "Kan mijn normale kanaalstream en berichten bekijken"; -$a->strings["Can view my default channel profile"] = "Kan mijn standaard kanaalprofiel bekijken"; -$a->strings["Can view my photo albums"] = "Kan mijn fotoalbums bekijken"; -$a->strings["Can view my connections"] = "Kan een lijst met mijn connecties bekijken"; -$a->strings["Can view my file storage"] = "Kan mijn bestanden bekijken"; -$a->strings["Can view my webpages"] = "Kan mijn pagina's bekijken"; -$a->strings["Can send me their channel stream and posts"] = "Kan mij de inhoud van hun kanaal en berichten sturen"; -$a->strings["Can post on my channel page (\"wall\")"] = "Kan een bericht in mijn kanaal (\"wall\") plaatsen"; -$a->strings["Can comment on or like my posts"] = "Kan op mijn berichten reageren of deze (niet) leuk vinden"; -$a->strings["Can send me private mail messages"] = "Kan mij privéberichten sturen"; -$a->strings["Can post photos to my photo albums"] = "Kan foto's aan mijn fotoalbums toevoegen"; -$a->strings["Can like/dislike stuff"] = "Kan dingen leuk of niet leuk vinden"; -$a->strings["Can forward to all my channel contacts via post @mentions"] = "Kan naar al mijn kanaalconnecties berichten doorsturen met behulp van @vermeldingen+"; -$a->strings["Advanced - useful for creating group forum channels"] = "Geavanceerd - nuttig voor kanalen met een groep- cq. forumfunctie"; -$a->strings["Can chat with me (when available)"] = "Kan met mij chatten (wanneer beschikbaar)"; -$a->strings["Can write to my file storage"] = "Kan bestanden aan mijn bestandsopslag toevoegen"; -$a->strings["Can edit my webpages"] = "Kan mijn pagina's bewerken"; -$a->strings["Can source my public posts in derived channels"] = "Kan mijn openbare berichten als bron voor andere kanalen gebruiken"; -$a->strings["Somewhat advanced - very useful in open communities"] = "Enigszins geavanceerd (erg nuttig voor kanalen van forums/groepen)"; -$a->strings["Can administer my channel resources"] = "Kan mijn kanaal beheren"; -$a->strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Zeer geavanceerd. Laat dit met rust, behalve als je weet wat je doet."; +$a->strings["__ctx:noun__ Like"] = array( + 0 => "vindt dit leuk", + 1 => "vinden dit leuk", +); +$a->strings["Default"] = "Standaard"; $a->strings["Frequently"] = "Regelmatig"; $a->strings["Hourly"] = "Elk uur"; $a->strings["Twice daily"] = "Twee keer per dag"; @@ -300,251 +272,60 @@ $a->strings["Monthly"] = "Maandelijks"; $a->strings["Friendica"] = "Friendica"; $a->strings["OStatus"] = "OStatus"; $a->strings["RSS/Atom"] = "RSS/Atom"; +$a->strings["Email"] = "E-mail"; $a->strings["Diaspora"] = "Diaspora"; $a->strings["Facebook"] = "Facebook"; $a->strings["Zot!"] = "Zot!"; $a->strings["LinkedIn"] = "LinkedIn"; $a->strings["XMPP/IM"] = "XMPP/IM"; $a->strings["MySpace"] = "MySpace"; -$a->strings["l F d, Y \\@ g:i A"] = "l d F Y \\@ G:i"; -$a->strings["Starts:"] = "Start:"; -$a->strings["Finishes:"] = "Einde:"; -$a->strings["This event has been added to your calendar."] = "Dit evenement is aan jouw agenda toegevoegd."; -$a->strings["Male"] = "Man"; -$a->strings["Female"] = "Vrouw"; -$a->strings["Currently Male"] = "Momenteel man"; -$a->strings["Currently Female"] = "Momenteel vrouw"; -$a->strings["Mostly Male"] = "Voornamelijk man"; -$a->strings["Mostly Female"] = "Voornamelijk vrouw"; -$a->strings["Transgender"] = "Transgender"; -$a->strings["Intersex"] = "Interseksueel"; -$a->strings["Transsexual"] = "Transseksueel"; -$a->strings["Hermaphrodite"] = "Hermafrodiet"; -$a->strings["Neuter"] = "Genderneutraal"; -$a->strings["Non-specific"] = "Niet gespecificeerd"; -$a->strings["Other"] = "Anders"; -$a->strings["Undecided"] = "Nog niet beslist"; -$a->strings["Males"] = "Mannen"; -$a->strings["Females"] = "Vrouwen"; -$a->strings["Gay"] = "Homoseksueel"; -$a->strings["Lesbian"] = "Lesbisch"; -$a->strings["No Preference"] = "Geen voorkeur"; -$a->strings["Bisexual"] = "Biseksueel"; -$a->strings["Autosexual"] = "Autoseksueel"; -$a->strings["Abstinent"] = "Seksuele onthouding"; -$a->strings["Virgin"] = "Maagd"; -$a->strings["Deviant"] = "Afwijkend"; -$a->strings["Fetish"] = "Fetisj"; -$a->strings["Oodles"] = "Veel"; -$a->strings["Nonsexual"] = "Aseksueel"; -$a->strings["Single"] = "Alleen"; -$a->strings["Lonely"] = "Eenzaam"; -$a->strings["Available"] = "Beschikbaar"; -$a->strings["Unavailable"] = "Niet beschikbaar"; -$a->strings["Has crush"] = "Heeft een oogje op iemand"; -$a->strings["Infatuated"] = "Smoorverliefd"; -$a->strings["Dating"] = "Aan het daten"; -$a->strings["Unfaithful"] = "Ontrouw"; -$a->strings["Sex Addict"] = "Seksverslaafd"; -$a->strings["Friends/Benefits"] = "Vriendschap plus"; -$a->strings["Casual"] = "Ongebonden/vluchtig"; -$a->strings["Engaged"] = "Verloofd"; -$a->strings["Married"] = "Getrouwd"; -$a->strings["Imaginarily married"] = "Denkbeeldig getrouwd"; -$a->strings["Partners"] = "Partners"; -$a->strings["Cohabiting"] = "Samenwonend"; -$a->strings["Common law"] = "Common-law-huwelijk"; -$a->strings["Happy"] = "Gelukkig"; -$a->strings["Not looking"] = "Niet op zoek"; -$a->strings["Swinger"] = "Swinger"; -$a->strings["Betrayed"] = "Verraden"; -$a->strings["Separated"] = "Uit elkaar"; -$a->strings["Unstable"] = "Onstabiel"; -$a->strings["Divorced"] = "Gescheiden"; -$a->strings["Imaginarily divorced"] = "Denkbeeldig gescheiden"; -$a->strings["Widowed"] = "Weduwnaar/weduwe"; -$a->strings["Uncertain"] = "Onzeker"; -$a->strings["It's complicated"] = "Het is ingewikkeld"; -$a->strings["Don't care"] = "Maakt mij niks uit"; -$a->strings["Ask me"] = "Vraag het me"; -$a->strings["Not a valid email address"] = "Geen geldig e-mailadres"; -$a->strings["Your email domain is not among those allowed on this site"] = "Jouw e-maildomein is op deze RedMatrix-hub niet toegestaan"; -$a->strings["Your email address is already registered at this site."] = "Jouw e-mailadres is al op deze RedMatrix-hub geregistreerd ."; -$a->strings["An invitation is required."] = "Een uitnodiging is vereist"; -$a->strings["Invitation could not be verified."] = "Uitnodiging kon niet geverifieerd worden"; -$a->strings["Please enter the required information."] = "Vul de vereiste informatie in."; -$a->strings["Failed to store account information."] = "Account-informatie kon niet opgeslagen worden."; -$a->strings["Registration confirmation for %s"] = "Registratiebevestiging voor %s"; -$a->strings["Registration request at %s"] = "Registratieverzoek op %s"; -$a->strings["Administrator"] = "Beheerder"; -$a->strings["your registration password"] = "jouw registratiewachtwoord"; -$a->strings["Registration details for %s"] = "Registratiedetails voor %s"; -$a->strings["Account approved."] = "Account goedgekeurd"; -$a->strings["Registration revoked for %s"] = "Registratie ingetrokken voor %s"; -$a->strings["Account verified. Please login."] = "Account is geverifieerd. Je kan inloggen."; -$a->strings["Embedded content"] = "Ingesloten inhoud"; -$a->strings["Embedding disabled"] = "Insluiten uitgeschakeld"; +$a->strings["%d invitation available"] = array( + 0 => "%d uitnodiging beschikbaar", + 1 => "%d uitnodigingen beschikbaar", +); +$a->strings["Advanced"] = "Geavanceerd"; +$a->strings["Find Channels"] = "Kanalen vinden"; +$a->strings["Enter name or interest"] = "Vul naam of interesse in"; +$a->strings["Connect/Follow"] = "Verbinden/volgen"; +$a->strings["Examples: Robert Morgenstein, Fishing"] = "Voorbeeld: Robert Morgenstein, vissen"; +$a->strings["Find"] = "Vinden"; +$a->strings["Channel Suggestions"] = "Voorgestelde kanalen"; +$a->strings["Random Profile"] = "Willekeurig profiel"; +$a->strings["Invite Friends"] = "Vrienden uitnodigen"; +$a->strings["Exammple: name=fred and country=iceland"] = "Voorbeeld: (voor naam) name=herman en (voor land) country=nederland"; +$a->strings["Advanced Find"] = "Geavanceerd zoeken"; +$a->strings["Saved Folders"] = "Bewaarde mappen"; +$a->strings["Everything"] = "Alles"; +$a->strings["Categories"] = "Categorieën"; +$a->strings["%d connection in common"] = array( + 0 => "%d gemeenschappelijke connectie", + 1 => "%d gemeenschappelijke connecties", +); +$a->strings["show more"] = "meer connecties weergeven"; +$a->strings["This event has been added to your calendar."] = "Dit evenement is aan jouw agenda toegevoegd."; $a->strings["Invalid data packet"] = "Datapakket ongeldig"; $a->strings["Unable to verify channel signature"] = "Kanaal-kenmerk (channel signature) kon niet worden geverifieerd. "; $a->strings["Unable to verify site signature for %s"] = "Hub-kenmerk (site signature) voor %s kon niet worden geverifieerd"; -$a->strings["view full size"] = "volledige grootte tonen"; -$a->strings["Cannot locate DNS info for database server '%s'"] = "Kan DNS-informatie voor databaseserver '%s' niet vinden"; -$a->strings["A deleted group with this name was revived. Existing item permissions may apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Een verwijderde collectie met deze naam is gereactiveerd. Bestaande itemrechten kunnen van toepassing zijn op deze collectie en toekomstige leden. Wanneer je dit niet zo bedoeld hebt, moet je een nieuwe collectie met een andere naam aanmaken."; -$a->strings["Default privacy group for new contacts"] = "Standaard privacy-collectie voor nieuwe kanalen"; -$a->strings["All Channels"] = "Alle kanalen"; -$a->strings["edit"] = "bewerken"; -$a->strings["Collections"] = "Collecties"; -$a->strings["Edit collection"] = "Collectie bewerken"; -$a->strings["Create a new collection"] = "Nieuwe collectie aanmaken"; -$a->strings["Channels not in any collection"] = "Kanalen die zich in geen enkele collectie bevinden"; -$a->strings["add"] = "toevoegen"; -$a->strings["Item was not found."] = "Item niet gevonden"; -$a->strings["No source file."] = "Geen bronbestand."; -$a->strings["Cannot locate file to replace"] = "Kan het te vervangen bestand niet vinden"; -$a->strings["Cannot locate file to revise/update"] = "Kan het bestand wat aangepast moet worden niet vinden"; -$a->strings["File exceeds size limit of %d"] = "Bestand is groter dan de toegelaten %d"; -$a->strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Je hebt jouw limiet van %1$.0f MB opslagruimte voor bijlagen bereikt."; -$a->strings["File upload failed. Possible system limit or action terminated."] = "Uploaden van bestand mislukt. Mogelijk systeemlimiet bereikt of actie afgebroken."; -$a->strings["Stored file could not be verified. Upload failed."] = "Opgeslagen bestand kon niet worden geverifieerd. Uploaden mislukt."; -$a->strings["Path not available."] = "Pad niet beschikbaar."; -$a->strings["Empty pathname"] = "Padnaam leeg"; -$a->strings["duplicate filename or path"] = "dubbele bestandsnaam of pad"; -$a->strings["Path not found."] = "Pad niet gevonden"; -$a->strings["mkdir failed."] = "directory aanmaken (mkdir) mislukt."; -$a->strings["database storage failed."] = "opslag in database mislukt."; -$a->strings["Private Message"] = "Privébericht"; -$a->strings["Select"] = "Kies"; -$a->strings["Save to Folder"] = "In map opslaan"; -$a->strings["View all"] = "Toon alles"; -$a->strings["__ctx:noun__ Dislike"] = array( - 0 => "vindt dit niet leuk", - 1 => "vinden dit niet leuk", -); -$a->strings["Add Star"] = "Ster toevoegen"; -$a->strings["Remove Star"] = "Ster verwijderen"; -$a->strings["Toggle Star Status"] = "Ster toevoegen of verwijderen"; -$a->strings["starred"] = "met ster"; -$a->strings["Message is verified"] = "Bericht is geverifieerd"; -$a->strings["Add Tag"] = "Label toevoegen"; -$a->strings["I like this (toggle)"] = "Vind ik leuk"; -$a->strings["I don't like this (toggle)"] = "Vind ik niet leuk"; -$a->strings["Share This"] = "Delen"; -$a->strings["share"] = "delen"; -$a->strings["View %s's profile - %s"] = "Profiel van %s bekijken - %s"; -$a->strings["to"] = "aan"; -$a->strings["via"] = "via"; -$a->strings["Wall-to-Wall"] = "Kanaal-naar-kanaal"; -$a->strings["via Wall-To-Wall:"] = "via kanaal-naar-kanaal"; -$a->strings[" from %s"] = " van %s"; -$a->strings["last edited: %s"] = "laatst bewerkt: %s"; -$a->strings["Expires: %s"] = "Verloopt: %s"; -$a->strings["Save Bookmarks"] = "Bladwijzers opslaan"; -$a->strings["Add to Calendar"] = "Aan agenda toevoegen"; -$a->strings["__ctx:noun__ Likes"] = "vinden dit leuk"; -$a->strings["__ctx:noun__ Dislikes"] = "vinden dit niet leuk"; -$a->strings["Close"] = "Sluiten"; -$a->strings["Please wait"] = "Even wachten"; -$a->strings["%d comment"] = array( - 0 => "%d reactie", - 1 => "%d reacties weergeven", -); -$a->strings["This is you"] = "Dit ben jij"; -$a->strings["Bold"] = "Vet"; -$a->strings["Italic"] = "Cursief"; -$a->strings["Underline"] = "Onderstrepen"; -$a->strings["Quote"] = "Citeren"; -$a->strings["Code"] = "Broncode"; -$a->strings["Image"] = "Afbeelding"; -$a->strings["Link"] = "Link"; -$a->strings["Video"] = "Video"; -$a->strings["Encrypt text"] = "Tekst versleutelen"; -$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "De beveiligings-token van het tekstvak was ongeldig. Dit is mogelijk het gevolg van dat er te lang (meer dan 3 uur) gewacht is om de tekst op te slaan. "; -$a->strings["prev"] = "vorige"; -$a->strings["first"] = "eerste"; -$a->strings["last"] = "laatste"; -$a->strings["next"] = "volgende"; -$a->strings["older"] = "ouder"; -$a->strings["newer"] = "nieuwer"; -$a->strings["No connections"] = "Geen connecties"; -$a->strings["%d Connection"] = array( - 0 => "%d connectie", - 1 => "%d connecties", -); -$a->strings["View Connections"] = "Connecties weergeven"; -$a->strings["Search"] = "Zoeken"; -$a->strings["Save"] = "Opslaan"; -$a->strings["poke"] = "aanstoten"; -$a->strings["poked"] = "aangestoten"; -$a->strings["ping"] = "ping"; -$a->strings["pinged"] = "gepingd"; -$a->strings["prod"] = "por"; -$a->strings["prodded"] = "gepord"; -$a->strings["slap"] = "slaan"; -$a->strings["slapped"] = "sloeg"; -$a->strings["finger"] = "finger"; -$a->strings["fingered"] = "gefingerd"; -$a->strings["rebuff"] = "afpoeieren"; -$a->strings["rebuffed"] = "afgepoeierd"; -$a->strings["happy"] = "gelukkig"; -$a->strings["sad"] = "bedroefd"; -$a->strings["mellow"] = "mellow"; -$a->strings["tired"] = "moe"; -$a->strings["perky"] = "parmantig"; -$a->strings["angry"] = "boos"; -$a->strings["stupified"] = "beteuterd"; -$a->strings["puzzled"] = "verward"; -$a->strings["interested"] = "geïnteresseerd"; -$a->strings["bitter"] = "verbitterd"; -$a->strings["cheerful"] = "vrolijk"; -$a->strings["alive"] = "levendig"; -$a->strings["annoyed"] = "geërgerd"; -$a->strings["anxious"] = "bezorgd"; -$a->strings["cranky"] = "humeurig"; -$a->strings["disturbed"] = "verontrust"; -$a->strings["frustrated"] = "gefrustreerd "; -$a->strings["depressed"] = "gedeprimeerd"; -$a->strings["motivated"] = "gemotiveerd"; -$a->strings["relaxed"] = "ontspannen"; -$a->strings["surprised"] = "verrast"; -$a->strings["Monday"] = "maandag"; -$a->strings["Tuesday"] = "dinsdag"; -$a->strings["Wednesday"] = "woensdag"; -$a->strings["Thursday"] = "donderdag"; -$a->strings["Friday"] = "vrijdag"; -$a->strings["Saturday"] = "zaterdag"; -$a->strings["Sunday"] = "zondag"; -$a->strings["January"] = "januari"; -$a->strings["February"] = "februari"; -$a->strings["March"] = "maart"; -$a->strings["April"] = "april"; -$a->strings["May"] = "mei"; -$a->strings["June"] = "juni"; -$a->strings["July"] = "juli"; -$a->strings["August"] = "augustus"; -$a->strings["September"] = "september"; -$a->strings["October"] = "oktober"; -$a->strings["November"] = "november"; -$a->strings["December"] = "december"; -$a->strings["unknown.???"] = "onbekend.???"; -$a->strings["bytes"] = "bytes"; -$a->strings["remove category"] = "categorie verwijderen"; -$a->strings["remove from file"] = "uit map verwijderen"; -$a->strings["Click to open/close"] = "Klik om te openen of te sluiten"; -$a->strings["Link to Source"] = "Originele locatie"; -$a->strings["Select a page layout: "] = "Kies een paginalayout: "; -$a->strings["default"] = "standaard"; -$a->strings["Page content type: "] = "Opmaakcode pagina"; -$a->strings["Select an alternate language"] = "Kies een andere taal"; -$a->strings["photo"] = "foto"; -$a->strings["event"] = "gebeurtenis"; -$a->strings["status"] = "status"; -$a->strings["comment"] = "reactie"; -$a->strings["activity"] = "activiteit"; -$a->strings["Design"] = "Ontwerp"; -$a->strings["Blocks"] = "Blokken"; -$a->strings["Menus"] = "Menu's"; -$a->strings["Layouts"] = "Layouts"; -$a->strings["Pages"] = "Pagina's"; +$a->strings["Miscellaneous"] = "Diversen"; +$a->strings["year"] = "jaar"; +$a->strings["month"] = "maand"; +$a->strings["day"] = "dag"; +$a->strings["never"] = "nooit"; +$a->strings["less than a second ago"] = "minder dan een seconde geleden"; +$a->strings["years"] = "jaren"; +$a->strings["months"] = "maanden"; +$a->strings["week"] = "week"; +$a->strings["weeks"] = "weken"; +$a->strings["days"] = "dagen"; +$a->strings["hour"] = "uur"; +$a->strings["hours"] = "uren"; +$a->strings["minute"] = "minuut"; +$a->strings["minutes"] = "minuten"; +$a->strings["second"] = "seconde"; +$a->strings["seconds"] = "seconden"; +$a->strings["%1\$d %2\$s ago"] = "%1\$d %2\$s geleden"; +$a->strings["%1\$s's birthday"] = "Verjaardag van %1\$s"; +$a->strings["Happy Birthday %1\$s"] = "Gefeliciteerd met je verjaardag %1\$s"; $a->strings["Sort Options"] = "Sorteeropties"; $a->strings["Alphabetic"] = "Alfabetisch"; $a->strings["Reverse Alphabetic"] = "Omgekeerd alfabetisch"; @@ -552,12 +333,6 @@ $a->strings["Newest to Oldest"] = "Nieuw naar oud"; $a->strings["Enable Safe Search"] = "Veilig zoeken inschakelen"; $a->strings["Disable Safe Search"] = "Veilig zoeken uitschakelen"; $a->strings["Safe Mode"] = "Veilig zoeken"; -$a->strings["Image/photo"] = "Afbeelding/foto"; -$a->strings["Encrypted content"] = "Versleutelde inhoud"; -$a->strings["QR code"] = "QR-code"; -$a->strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s schreef het volgende %2\$s %3\$s"; -$a->strings["post"] = "bericht"; -$a->strings["$1 wrote:"] = "$1 schreef:"; $a->strings["Red Matrix Notification"] = "RedMatrix-notificatie"; $a->strings["redmatrix"] = "RedMatrix"; $a->strings["Thank You,"] = "Bedankt,"; @@ -597,150 +372,41 @@ $a->strings["%1\$s, you've received [zrl=%2\$s]a friend suggestion[/zrl] for %3\ $a->strings["Name:"] = "Naam:"; $a->strings["Photo:"] = "Foto:"; $a->strings["Please visit %s to approve or reject the suggestion."] = "Bezoek %s om het voorstel te accepteren of af te wijzen."; -$a->strings["%1\$s's bookmarks"] = "Bladwijzers van %1\$s"; -$a->strings["End this session"] = "Beëindig deze sessie"; -$a->strings["Home"] = "Home"; -$a->strings["Your posts and conversations"] = "Jouw berichten en conversaties"; -$a->strings["View Profile"] = "Profiel weergeven"; -$a->strings["Your profile page"] = "Jouw profielpagina"; -$a->strings["Edit Profiles"] = "Bewerk profielen"; -$a->strings["Manage/Edit profiles"] = "Beheer/wijzig profielen"; -$a->strings["Edit your profile"] = "Jouw profiel bewerken"; -$a->strings["Photos"] = "Foto's"; -$a->strings["Your photos"] = "Jouw foto's"; -$a->strings["Your files"] = "Jouw bestanden"; -$a->strings["Chat"] = "Chatten"; -$a->strings["Your chatrooms"] = "Jouw chatkanalen"; -$a->strings["Bookmarks"] = "Bladwijzers"; -$a->strings["Your bookmarks"] = "Jouw bladwijzers"; -$a->strings["Webpages"] = "Webpagina's"; -$a->strings["Your webpages"] = "Jouw webpagina's"; -$a->strings["Sign in"] = "Inloggen"; -$a->strings["%s - click to logout"] = "%s - klik om uit te loggen"; -$a->strings["Click to authenticate to your home hub"] = "Klik om jezelf te authenticeren via jouw eigen RedMatrix-hub"; -$a->strings["Home Page"] = "Homepage"; -$a->strings["Create an account"] = "Maak een account aan"; -$a->strings["Help"] = "Hulp"; -$a->strings["Help and documentation"] = "Hulp en documentatie"; -$a->strings["Apps"] = "Apps"; -$a->strings["Applications, utilities, links, games"] = "Apps"; -$a->strings["Search site content"] = "Inhoud van deze RedMatrix-hub doorzoeken"; -$a->strings["Directory"] = "Gids"; -$a->strings["Channel Locator"] = "Kanalengids"; -$a->strings["Matrix"] = "Matrix"; -$a->strings["Your matrix"] = "Jouw matrix"; -$a->strings["Mark all matrix notifications seen"] = "Markeer alle matrixnotificaties als bekeken"; -$a->strings["Channel Home"] = "Tijdlijn kanaal"; -$a->strings["Channel home"] = "Tijdlijn kanaal"; -$a->strings["Mark all channel notifications seen"] = "Alle kanaalnotificaties als gelezen markeren"; -$a->strings["Connections"] = "Connecties"; -$a->strings["Notices"] = "Notificaties"; -$a->strings["Notifications"] = "Notificaties"; -$a->strings["See all notifications"] = "Alle notificaties weergeven"; -$a->strings["Mark all system notifications seen"] = "Markeer alle systeemnotificaties als bekeken"; -$a->strings["Mail"] = "Privéberichten"; -$a->strings["Private mail"] = "Privéberichten"; -$a->strings["See all private messages"] = "Alle privéberichten weergeven"; -$a->strings["Mark all private messages seen"] = "Markeer alle privéberichten als bekeken"; -$a->strings["Inbox"] = "Postvak IN"; -$a->strings["Outbox"] = "Postvak UIT"; -$a->strings["New Message"] = "Nieuw bericht"; -$a->strings["Events"] = "Gebeurtenissen"; -$a->strings["Event Calendar"] = "Agenda"; -$a->strings["See all events"] = "Alle gebeurtenissen weergeven"; -$a->strings["Mark all events seen"] = "Markeer alle gebeurtenissen als bekeken"; -$a->strings["Channel Select"] = "Kanaalkiezer"; -$a->strings["Manage Your Channels"] = "Beheer je kanalen"; -$a->strings["Settings"] = "Instellingen"; -$a->strings["Account/Channel Settings"] = "Account-/kanaal-instellingen"; -$a->strings["Admin"] = "Beheer"; -$a->strings["Site Setup and Configuration"] = "Hub instellen en beheren"; -$a->strings["Nothing new here"] = "Niets nieuw hier"; -$a->strings["Please wait..."] = "Wachten aub..."; -$a->strings["General Features"] = "Algemene functies"; -$a->strings["Content Expiration"] = "Inhoud laten verlopen"; -$a->strings["Remove posts/comments and/or private messages at a future time"] = "Berichten, reacties en/of privéberichten na een bepaalde tijd verwijderen"; -$a->strings["Multiple Profiles"] = "Meerdere profielen"; -$a->strings["Ability to create multiple profiles"] = "Mogelijkheid om meerdere profielen aan te maken"; -$a->strings["Advanced Profiles"] = "Geavanceerde profielen"; -$a->strings["Additional profile sections and selections"] = "Extra onderdelen en keuzes voor je profiel"; -$a->strings["Profile Import/Export"] = "Profiel importen/exporteren"; -$a->strings["Save and load profile details across sites/channels"] = "Profielgegevens opslaan en in andere hubs/kanalen gebruiken."; -$a->strings["Web Pages"] = "Webpagina's"; -$a->strings["Provide managed web pages on your channel"] = "Sta beheerde webpagina's op jouw kanaal toe"; -$a->strings["Private Notes"] = "Privé-aantekeningen"; -$a->strings["Enables a tool to store notes and reminders"] = "Schakelt een eenvoudige toepassing in om aantekeningen en herinneringen in op te slaan"; -$a->strings["Extended Identity Sharing"] = "Uitgebreid identiteit delen"; -$a->strings["Share your identity with all websites on the internet. When disabled, identity is only shared with sites in the matrix."] = "Deel jouw RedMatrix-identiteit met alle websites op het internet. Wanneer dit is uitgeschakeld wordt je identiteit alleen binnen het RedMatrix-netwerk gedeeld. Schakel dit alleen als je weet wat je doet."; -$a->strings["Expert Mode"] = "Expertmodus"; -$a->strings["Enable Expert Mode to provide advanced configuration options"] = "Schakel de expertmodus in voor geavanceerde instellingen"; -$a->strings["Premium Channel"] = "Premiumkanaal"; -$a->strings["Allows you to set restrictions and terms on those that connect with your channel"] = "Stelt je in staat om beperkingen en voorwaarden in te stellen voor jouw kanaal"; -$a->strings["Post Composition Features"] = "Functies voor het opstellen van berichten"; -$a->strings["Use Markdown"] = "Markdown gebruiken"; -$a->strings["Allow use of \"Markdown\" to format posts"] = "Sta het gebruik van \"markdown\" toe om berichten mee op te maken."; -$a->strings["Post Preview"] = "Voorvertoning"; -$a->strings["Allow previewing posts and comments before publishing them"] = "Een optie om je berichten en reacties voor het definitief publiceren voor te vertonen"; -$a->strings["Channel Sources"] = "Kanaalbronnen"; -$a->strings["Automatically import channel content from other channels or feeds"] = "Automatisch inhoud uit andere kanalen of feeds importeren."; -$a->strings["Even More Encryption"] = "Extra encryptie"; -$a->strings["Allow optional encryption of content end-to-end with a shared secret key"] = "Sta toe dat inhoud extra end-to-end wordt versleuteld met een gedeelde geheime sleutel."; -$a->strings["Network and Stream Filtering"] = "Netwerk- en streamfilter"; -$a->strings["Search by Date"] = "Zoek op datum"; -$a->strings["Ability to select posts by date ranges"] = "Mogelijkheid om berichten op datum te filteren "; -$a->strings["Collections Filter"] = "Filter op collecties"; -$a->strings["Enable widget to display Network posts only from selected collections"] = "Sta de widget toe om netwerkberichten te tonen van bepaalde collecties"; -$a->strings["Saved Searches"] = "Opgeslagen zoekopdrachten"; -$a->strings["Save search terms for re-use"] = "Sla zoekopdrachten op voor hergebruik"; -$a->strings["Network Personal Tab"] = "Persoonlijke netwerktab"; -$a->strings["Enable tab to display only Network posts that you've interacted on"] = "Sta het toe dat de tab netwerkberichten toont waarmee je interactie had"; -$a->strings["Network New Tab"] = "Nieuwe netwerktab"; -$a->strings["Enable tab to display all new Network activity"] = "Laat de tab alle nieuwe netwerkactiviteit tonen"; -$a->strings["Affinity Tool"] = "Verwantschapsfilter"; -$a->strings["Filter stream activity by depth of relationships"] = "Filter wat je in de Matrix ziet op hoe goed je iemand kent of mag"; -$a->strings["Suggest Channels"] = "Kanalen voorstellen"; -$a->strings["Show channel suggestions"] = "Voor jou mogelijk interessante kanalen voorstellen"; -$a->strings["Post/Comment Tools"] = "Bericht- en reactiehulpmiddelen"; -$a->strings["Edit Sent Posts"] = "Bewerk verzonden berichten"; -$a->strings["Edit and correct posts and comments after sending"] = "Bewerk en corrigeer berichten en reacties nadat deze zijn verzonden"; -$a->strings["Tagging"] = "Labelen"; -$a->strings["Ability to tag existing posts"] = "Mogelijkheid om bestaande berichten te labelen"; -$a->strings["Post Categories"] = "Categorieën berichten"; -$a->strings["Add categories to your posts"] = "Voeg categorieën toe aan je berichten"; -$a->strings["Ability to file posts under folders"] = "Mogelijkheid om berichten in mappen op te slaan"; -$a->strings["Dislike Posts"] = "Vind berichten niet leuk"; -$a->strings["Ability to dislike posts/comments"] = "Mogelijkheid om berichten en reacties niet leuk te vinden"; -$a->strings["Star Posts"] = "Geef berichten een ster"; -$a->strings["Ability to mark special posts with a star indicator"] = "Mogelijkheid om speciale berichten met een ster te markeren"; -$a->strings["Tag Cloud"] = "Wolk met trefwoorden/labels"; -$a->strings["Provide a personal tag cloud on your channel page"] = "Zorgt voor een persoonlijke wolk met trefwoorden of labels op jouw kanaalpagina"; -$a->strings["created a new post"] = "maakte een nieuw bericht aan"; -$a->strings["commented on %s's post"] = "gaf een reactie op een bericht van %s"; -$a->strings["Site Admin"] = "Hubbeheerder"; -$a->strings["Address Book"] = "Connecties"; -$a->strings["Mood"] = "Stemming"; -$a->strings["Poke"] = "Aanstoten"; -$a->strings["Probe"] = "Onderzoeken"; -$a->strings["Suggest"] = "Voorstellen"; -$a->strings["Update"] = "Bijwerken"; -$a->strings["Install"] = "Installeren"; -$a->strings["Purchase"] = "Aanschaffen"; -$a->strings["Public Timeline"] = "Openbare tijdlijn"; -$a->strings["Missing room name"] = "Naam chatkanaal ontbreekt"; -$a->strings["Duplicate room name"] = "Naam chatkanaal bestaat al"; -$a->strings["Invalid room specifier."] = "Ongeldige omschrijving chatkanaal"; -$a->strings["Room not found."] = "Chatkanaal niet gevonden"; -$a->strings["Room is full"] = "Chatkanaal is vol"; +$a->strings["[Red:Notify]"] = "[Red:Notificatie]"; +$a->strings["parent"] = "omhoog"; +$a->strings["Collection"] = "map"; +$a->strings["Principal"] = "principal"; +$a->strings["Addressbook"] = "Adresboek"; +$a->strings["Calendar"] = "Agenda"; +$a->strings["Schedule Inbox"] = "Planning-postvak IN"; +$a->strings["Schedule Outbox"] = "Planning-postvak UIT"; +$a->strings["%1\$s used"] = "%1\$s gebruikt"; +$a->strings["%1\$s used of %2\$s (%3\$s%)"] = "%1\$s van %2\$s gebruikt (%3\$s%)"; +$a->strings["Name"] = "Naam"; +$a->strings["Type"] = "Type"; +$a->strings["Size"] = "Grootte"; +$a->strings["Last Modified"] = "Laatst gewijzigd"; +$a->strings["Total"] = "Totaal"; +$a->strings["Create new folder"] = "Nieuwe map aanmaken"; +$a->strings["Create"] = "Aanmaken"; +$a->strings["Upload file"] = "Bestand uploaden"; +$a->strings["Upload"] = "Uploaden"; $a->strings["channel"] = "kanaal"; -$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s vindt %3\$s van %2\$s leuk"; $a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s vindt %3\$s van %2\$s niet leuk"; $a->strings["%1\$s is now connected with %2\$s"] = "%1\$s is nu met %2\$s verbonden"; $a->strings["%1\$s poked %2\$s"] = "%1\$s heeft %2\$s aangestoten"; $a->strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s is %2\$s"; +$a->strings["Select"] = "Kies"; +$a->strings["Private Message"] = "Privébericht"; +$a->strings["Message is verified"] = "Bericht is geverifieerd"; $a->strings["View %s's profile @ %s"] = "Bekijk het profiel van %s @ %s"; $a->strings["Categories:"] = "Categorieën:"; $a->strings["Filed under:"] = "Bewaard onder:"; +$a->strings[" from %s"] = " van %s"; +$a->strings["last edited: %s"] = "laatst bewerkt: %s"; +$a->strings["Expires: %s"] = "Verloopt: %s"; $a->strings["View in context"] = "In context bekijken"; +$a->strings["Please wait"] = "Even wachten"; $a->strings["remove"] = "verwijderen"; $a->strings["Loading..."] = "Aan het laden..."; $a->strings["Delete Selected Items"] = "Verwijder de geselecteerde items"; @@ -800,6 +466,7 @@ $a->strings["permissions"] = "privacy-rechten"; $a->strings["Public post"] = "Openbaar bericht"; $a->strings["Example: bob@example.com, mary@example.com"] = "Voorbeeld: bob@voorbeeld.nl, mary@voorbeeld.be"; $a->strings["Set expiration date"] = "Verloopdatum instellen"; +$a->strings["Encrypt text"] = "Tekst versleutelen"; $a->strings["OK"] = "OK"; $a->strings["Cancel"] = "Annuleren"; $a->strings["Discover"] = "Ontdekken"; @@ -824,881 +491,531 @@ $a->strings["Files and Storage"] = "Bestanden en opslagruimte"; $a->strings["Chatrooms"] = "Chatkanalen"; $a->strings["Saved Bookmarks"] = "Opgeslagen bladwijzers"; $a->strings["Manage Webpages"] = "Webpagina's beheren"; -$a->strings["Visible to your default audience"] = "Voor iedereen zichtbaar, zoals dit van te voren is ingesteld"; -$a->strings["Show"] = "Tonen"; -$a->strings["Don't show"] = "Niet tonen"; -$a->strings["Permissions"] = "Privacy-rechten"; -$a->strings["System"] = "Systeem"; -$a->strings["Create Personal App"] = "Persoonlijke app maken"; -$a->strings["Edit Personal App"] = "Persoonlijke app bewerken"; -$a->strings["Ignore/Hide"] = "Negeren/Verbergen"; -$a->strings["Suggestions"] = "Voorgestelde kanalen"; -$a->strings["See more..."] = "Meer..."; -$a->strings["You have %1$.0f of %2$.0f allowed connections."] = "Je hebt %1$.0f van de %2$.0f toegestane connecties."; -$a->strings["Add New Connection"] = "Nieuwe connectie toevoegen"; -$a->strings["Enter the channel address"] = "Vul het adres van het nieuwe kanaal in"; -$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Voorbeeld: bob@example.com, http://example.com/barbara"; -$a->strings["Notes"] = "Aantekeningen"; -$a->strings["Remove term"] = "Verwijder zoekterm"; -$a->strings["Archives"] = "Archieven"; -$a->strings["Refresh"] = "Vernieuwen"; -$a->strings["Me"] = "Ik"; -$a->strings["Best Friends"] = "Goede vrienden"; -$a->strings["Co-workers"] = "Collega's"; -$a->strings["Former Friends"] = "Oude vrienden"; -$a->strings["Acquaintances"] = "Kennissen"; -$a->strings["Everybody"] = "Iedereen"; -$a->strings["Account settings"] = "Account"; -$a->strings["Channel settings"] = "Kanaal"; -$a->strings["Additional features"] = "Extra functies"; -$a->strings["Feature settings"] = "Plug-ins"; -$a->strings["Display settings"] = "Weergave"; -$a->strings["Connected apps"] = "Verbonden applicaties"; -$a->strings["Export channel"] = "Kanaal exporteren"; -$a->strings["Automatic Permissions (Advanced)"] = "Automatische privacy-rechten (geavanceerd)"; -$a->strings["Premium Channel Settings"] = "Instellingen premiumkanaal"; -$a->strings["Check Mail"] = "Controleer op nieuwe berichten"; -$a->strings["Chat Rooms"] = "Chatkanalen"; -$a->strings["Bookmarked Chatrooms"] = "Bladwijzers van chatkanalen"; -$a->strings["Suggested Chatrooms"] = "Voorgestelde chatkanalen"; -$a->strings["Channel is blocked on this site."] = "Kanaal is op deze hub geblokkeerd."; -$a->strings["Channel location missing."] = "Ontbrekende kanaallocatie."; -$a->strings["Response from remote channel was incomplete."] = "Antwoord van het kanaal op afstand was niet volledig."; -$a->strings["Channel was deleted and no longer exists."] = "Kanaal is verwijderd en bestaat niet meer."; -$a->strings["Channel discovery failed."] = "Kanaal ontdekken mislukt."; -$a->strings["local account not found."] = "lokale account niet gevonden."; -$a->strings["Cannot connect to yourself."] = "Kan niet met jezelf verbinden"; -$a->strings["Click here to upgrade."] = "Klik hier om te upgraden."; -$a->strings["This action exceeds the limits set by your subscription plan."] = "Deze handeling overschrijdt de beperkingen die voor jouw abonnement gelden."; -$a->strings["This action is not available under your subscription plan."] = "Deze handeling is niet mogelijk met jouw abonnement."; -$a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "Authenticatie op afstand geblokkeerd. Je bent lokaal op deze hub ingelogd. Uitloggen en opnieuw proberen."; -$a->strings["Welcome %s. Remote authentication successful."] = "Welkom %s. Authenticatie op afstand geslaagd."; -$a->strings["Name is required"] = "Naam is vereist"; -$a->strings["Key and Secret are required"] = "Key en secret zijn vereist"; -$a->strings["Passwords do not match. Password unchanged."] = "Wachtwoorden komen niet overeen. Wachtwoord onveranderd."; -$a->strings["Empty passwords are not allowed. Password unchanged."] = "Lege wachtwoorden zijn niet toegestaan. Wachtwoord onveranderd."; -$a->strings["Password changed."] = "Wachtwoord veranderd."; -$a->strings["Password update failed. Please try again."] = "Bijwerken wachtwoord mislukt. Probeer opnieuw."; -$a->strings["Not valid email."] = "Geen geldig e-mailadres."; -$a->strings["Protected email address. Cannot change to that email."] = "Beschermd e-mailadres. Kan dat e-mailadres niet gebruiken."; -$a->strings["System failure storing new email. Please try again."] = "Systeemfout opslaan van nieuwe e-mail. Probeer het nog een keer."; -$a->strings["Settings updated."] = "Instellingen bijgewerkt."; -$a->strings["Add application"] = "Applicatie toevoegen"; -$a->strings["Name of application"] = "Naam van applicatie"; -$a->strings["Consumer Key"] = "Consumer key"; -$a->strings["Automatically generated - change if desired. Max length 20"] = "Automatische gegenereerd - verander wanneer gewenst. Maximale lengte is 20"; -$a->strings["Consumer Secret"] = "Consumer secret"; -$a->strings["Redirect"] = "Redirect/doorverwijzing"; -$a->strings["Redirect URI - leave blank unless your application specifically requires this"] = "URI voor redirect - laat leeg, behalve wanneer de applicatie dit vereist"; -$a->strings["Icon url"] = "URL van pictogram"; -$a->strings["Optional"] = "Optioneel"; -$a->strings["You can't edit this application."] = "Je kan deze applicatie niet bewerken"; -$a->strings["Connected Apps"] = "Verbonden applicaties"; -$a->strings["Client key starts with"] = "Client key begint met"; -$a->strings["No name"] = "Geen naam"; -$a->strings["Remove authorization"] = "Autorisatie verwijderen"; -$a->strings["No feature settings configured"] = "Geen plugin-instellingen ingesteld"; -$a->strings["Feature Settings"] = "Plugin-instellingen"; -$a->strings["Account Settings"] = "Account-instellingen"; -$a->strings["Password Settings"] = "Wachtwoord-instellingen"; -$a->strings["New Password:"] = "Nieuw wachtwoord:"; -$a->strings["Confirm:"] = "Bevestigen:"; -$a->strings["Leave password fields blank unless changing"] = "Laat de wachtwoordvelden leeg, behalve wanneer je deze wil veranderen"; -$a->strings["Email Address:"] = "E-mailadres:"; -$a->strings["Remove Account"] = "Kanaal verwijderen (neem contact op met de beheerder van deze hub om je account te verwijderen)"; -$a->strings["Warning: This action is permanent and cannot be reversed."] = "Waarschuwing: Deze handeling is van permanente aard en kan niet meer worden teruggedraaid."; -$a->strings["Off"] = "Uit"; -$a->strings["On"] = "Aan"; -$a->strings["Additional Features"] = "Extra functies"; -$a->strings["Connector Settings"] = "Instellingen externe koppelingen"; -$a->strings["No special theme for mobile devices"] = "Geen speciaal thema voor mobiele apparaten"; -$a->strings["%s - (Experimental)"] = "%s - (experimenteel)"; -$a->strings["Display Settings"] = "Weergave-instellingen"; -$a->strings["Display Theme:"] = "Gebruik thema:"; -$a->strings["Mobile Theme:"] = "Mobiel thema:"; -$a->strings["Update browser every xx seconds"] = "Ververs de webbrowser om de zoveel seconde"; -$a->strings["Minimum of 10 seconds, no maximum"] = "Minimaal 10 seconde, geen maximum"; -$a->strings["Maximum number of conversations to load at any time:"] = "Maximaal aantal conversaties die per keer geladen worden:"; -$a->strings["Maximum of 100 items"] = "Maximaal 100 conversaties"; -$a->strings["Don't show emoticons"] = "Geen emoticons weergeven"; -$a->strings["System Page Layout Editor - (advanced)"] = "Lay-out bewerken van systeempagina's (geavanceerd)"; -$a->strings["Nobody except yourself"] = "Niemand, behalve jezelf"; -$a->strings["Only those you specifically allow"] = "Alleen connecties met uitdrukkelijke toestemming"; -$a->strings["Approved connections"] = "Geaccepteerde connecties"; -$a->strings["Any connections"] = "Alle connecties"; -$a->strings["Anybody on this website"] = "Iedereen op deze hub"; -$a->strings["Anybody in this network"] = "Iedereen in dit netwerk"; -$a->strings["Anybody authenticated"] = "Geauthenticeerd"; -$a->strings["Anybody on the internet"] = "Iedereen op het internet"; -$a->strings["Publish your default profile in the network directory"] = "Publiceer je standaardprofiel in de kanalengids"; -$a->strings["No"] = "Nee"; -$a->strings["Yes"] = "Ja"; -$a->strings["Allow us to suggest you as a potential friend to new members?"] = "Sta ons toe om jouw kanaal als mogelijke connectie voor te stellen aan nieuwe kanalen"; -$a->strings["or"] = "of"; -$a->strings["Your channel address is"] = "Jouw kanaaladres is"; -$a->strings["Channel Settings"] = "Kanaal-instellingen"; -$a->strings["Basic Settings"] = "Basis-instellingen"; -$a->strings["Your Timezone:"] = "Jouw tijdzone:"; -$a->strings["Default Post Location:"] = "Standaardlocatie bericht:"; -$a->strings["Geographical location to display on your posts"] = "Geografische locatie die bij het bericht moet worden vermeld"; -$a->strings["Use Browser Location:"] = "Locatie van webbrowser gebruiken:"; -$a->strings["Adult Content"] = "Inhoud voor volwassenen"; -$a->strings["This channel frequently or regularly publishes adult content. (Please tag any adult material and/or nudity with #NSFW)"] = "Dit kanaal publiceert regelmatig of vaak materiaal dat alleen geschikt is voor volwassen. (Gebruik de hashtag #NSFW in berichten met een seksueel getinte inhoud of ander voor minderjarigen ongeschikt materiaal)"; -$a->strings["Security and Privacy Settings"] = "Veiligheids- privacy-instellingen"; -$a->strings["Hide my online presence"] = "Verberg mijn aanwezigheid"; -$a->strings["Prevents displaying in your profile that you are online"] = "Voorkomt dat op je kanaal te zien valt dat je momenteel op de RedMatrix aanwezig bent"; -$a->strings["Simple Privacy Settings:"] = "Eenvoudige privacy-instellingen:"; -$a->strings["Very Public - extremely permissive (should be used with caution)"] = "Zeer openbaar (kanaal staat volledig open - moet met grote zorgvuldigheid gebruikt worden)"; -$a->strings["Typical - default public, privacy when desired (similar to social network permissions but with improved privacy)"] = "Normaal (standaard openbaar, maar privacy wanneer noodzakelijk - vergelijkbaar met die van sociale netwerken, maar met verbeterde privacy)"; -$a->strings["Private - default private, never open or public"] = "Privé (standaard privé en nooit openbaar)"; -$a->strings["Blocked - default blocked to/from everybody"] = "Geblokkeerd (standaard geblokkeerd naar/van iedereen)"; -$a->strings["Allow others to tag your posts"] = "Anderen toestaan om je berichten te labelen"; -$a->strings["Often used by the community to retro-actively flag inappropriate content"] = "Vaak in groepen/forums gebruikt om met terugwerkende kracht ongepast materiaal te markeren"; -$a->strings["Advanced Privacy Settings"] = "Geavanceerde privacy-instellingen"; -$a->strings["Expire other channel content after this many days"] = "Inhoud van andere kanalen na zoveel aantal dagen laten verlopen:"; -$a->strings["0 or blank prevents expiration"] = "0 of leeg voorkomt het verlopen"; -$a->strings["Maximum Friend Requests/Day:"] = "Maximum aantal connectieverzoeken per dag:"; -$a->strings["May reduce spam activity"] = "Kan eventuele spam verminderen"; -$a->strings["Default Post Permissions"] = "Standaard privacy-rechten voor nieuwe berichten"; -$a->strings["(click to open/close)"] = "(klik om te openen/sluiten)"; -$a->strings["Maximum private messages per day from unknown people:"] = "Maximum aantal privé-berichten per dag van onbekende personen:"; -$a->strings["Useful to reduce spamming"] = "Kan eventuele spam verminderen"; -$a->strings["Notification Settings"] = "Notificatie-instellingen"; -$a->strings["By default post a status message when:"] = "Plaats automatisch een statusbericht wanneer:"; -$a->strings["accepting a friend request"] = "Een connectieverzoek wordt geaccepteerd"; -$a->strings["joining a forum/community"] = "Je lid wordt van een groep/forum"; -$a->strings["making an interesting profile change"] = "Er sprake is van een interessante profielwijziging"; -$a->strings["Send a notification email when:"] = "Verzend een notificatie per e-mail wanneer:"; -$a->strings["You receive a connection request"] = "Je een connectieverzoek ontvangt"; -$a->strings["Your connections are confirmed"] = "Jouw connecties zijn bevestigd"; -$a->strings["Someone writes on your profile wall"] = "Iemand iets op jouw kanaal heeft geschreven"; -$a->strings["Someone writes a followup comment"] = "Iemand een reactie schrijft"; -$a->strings["You receive a private message"] = "Je een privé-bericht ontvangt"; -$a->strings["You receive a friend suggestion"] = "Je een kanaalvoorstel ontvangt"; -$a->strings["You are tagged in a post"] = "Je expliciet in een bericht bent genoemd"; -$a->strings["You are poked/prodded/etc. in a post"] = "Je bent in een bericht aangestoten/gepord/etc."; -$a->strings["Advanced Account/Page Type Settings"] = "Instellingen geavanceerd account/paginatype"; -$a->strings["Change the behaviour of this account for special situations"] = "Verander het gedrag van dit account voor speciale situaties"; -$a->strings["Please enable expert mode (in Settings > Additional features) to adjust!"] = "Schakel de expertmodus in (in Instellingen > Extra functies) om aan te kunnen passen!"; -$a->strings["Miscellaneous Settings"] = "Diverse instellingen"; -$a->strings["Personal menu to display in your channel pages"] = "Persoonlijk menu om op je kanaalpagina's weer te geven"; -$a->strings["Remove this channel"] = "Verwijder dit kanaal"; -$a->strings["Permission Denied."] = "Toegang geweigerd"; -$a->strings["File not found."] = "Bestand niet gevonden."; -$a->strings["Edit file permissions"] = "Bestandsrechten bewerken"; -$a->strings["Set/edit permissions"] = "Rechten instellen/bewerken"; -$a->strings["Include all files and sub folders"] = "Toepassen op alle bestanden en submappen"; -$a->strings["Return to file list"] = "Terugkeren naar bestandlijst "; -$a->strings["Copy/paste this code to attach file to a post"] = "Kopieer/plak deze code om het bestand aan een bericht te koppelen"; -$a->strings["Copy/paste this URL to link file from a web page"] = "Kopieer/plak deze URL om het bestand aan een externe webpagina te koppelen"; -$a->strings["Channel not found."] = "Kanaal niet gevonden."; -$a->strings["Red Matrix - "The Network""] = "RedMatrix - "The Network""; -$a->strings["Welcome to %s"] = "Welkom op %s"; -$a->strings["Fetching URL returns error: %1\$s"] = "Ophalen URL gaf een foutmelding terug: %1\$s"; -$a->strings["[Embedded content - reload page to view]"] = "[Ingesloten inhoud - ververs pagina om te bekijken] "; -$a->strings["Add a Channel"] = "Kanaal toevoegen"; -$a->strings["A channel is your own collection of related web pages. A channel can be used to hold social network profiles, blogs, conversation groups and forums, celebrity pages, and much more. You may create as many channels as your service provider allows."] = "Een kanaal is jouw eigen verzameling gerelateerde webpagina's. Een kanaal kan gebruikt worden voor een sociaal netwerk, weblog, discussiegroep of forum, een pagina over een beroemdheid, en voor veel meer. Je kan net zoveel kanalen aanmaken als dat de eigenaar/beheerder van jouw hub toestaat."; -$a->strings["Channel Name"] = "Kanaalnaam"; -$a->strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "] = "Voorbeelden: \"Bruce Springsteen\", \"Familiefoto's\", \"Voetbal\", \"Astronomie\""; -$a->strings["Choose a short nickname"] = "Kies een korte bijnaam"; -$a->strings["Your nickname will be used to create an easily remembered channel address (like an email address) which you can share with others."] = "Jouw bijnaam wordt gebruikt om een makkelijk te onthouden kanaaladres (zoals een e-mailadres) aan te maken, die je dan kan delen met anderen."; -$a->strings["Or import an existing channel from another location"] = "Of importeer een bestaand kanaal vanaf een andere locatie."; -$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "We hebben een probleem ontdekt tijdens het inloggen met de OpenID die je hebt verstrekt. Controleer de ID op typefouten."; -$a->strings["The error message was:"] = "Het foutbericht was:"; -$a->strings["Authentication failed."] = "Authenticatie mislukt."; -$a->strings["Remote Authentication"] = "Authenticatie op afstand"; -$a->strings["Enter your channel address (e.g. channel@example.com)"] = "Vul jouw kanaaladres in (bijv. channel@example.com)"; -$a->strings["Authenticate"] = "Authenticeren"; -$a->strings["Theme settings updated."] = "Thema-instellingen bijgewerkt."; -$a->strings["Site"] = "Hub-instellingen"; -$a->strings["Accounts"] = "Accounts"; -$a->strings["Channels"] = "Kanalen"; -$a->strings["Plugins"] = "Plug-ins"; -$a->strings["Themes"] = "Thema's"; -$a->strings["Server"] = "Hubbeheer"; -$a->strings["DB updates"] = "Database-updates"; -$a->strings["Logs"] = "Logboeken"; -$a->strings["Plugin Features"] = "Plug-in-opties"; -$a->strings["User registrations waiting for confirmation"] = "Accountregistraties die op goedkeuring wachten"; -$a->strings["Message queues"] = "Berichtenwachtrij"; -$a->strings["Administration"] = "Beheer"; -$a->strings["Summary"] = "Samenvatting"; -$a->strings["Registered users"] = "Geregistreerde gebruikers"; -$a->strings["Pending registrations"] = "Accounts die op goedkeuring wachten"; -$a->strings["Version"] = "Versie"; -$a->strings["Active plugins"] = "Ingeschakelde plug-ins"; -$a->strings["Site settings updated."] = "Hub-instellingen bijgewerkt."; -$a->strings["No special theme for accessibility"] = "Geen speciaal thema voor universele toegang"; -$a->strings["Yes - with approval"] = "Ja - met goedkeuring"; -$a->strings["My site is not a public server"] = "Mijn RedMatrix-hub is niet openbaar"; -$a->strings["My site has paid access only"] = "Mijn RedMatrix-hub kent alleen betaalde toegang"; -$a->strings["My site has free access only"] = "Mijn RedMatrix-hub kent alleen gratis toegang"; -$a->strings["My site offers free accounts with optional paid upgrades"] = "Mijn RedMatrix-hub biedt gratis accounts aan met betaalde uitbreidingen als optie"; -$a->strings["Registration"] = "Registratie"; -$a->strings["File upload"] = "Bestand uploaden"; -$a->strings["Policies"] = "Beleid"; -$a->strings["Site name"] = "Naam van deze RedMatrix-hub"; -$a->strings["Banner/Logo"] = "Banner/logo"; -$a->strings["Administrator Information"] = "Informatie over de beheerder van deze hub"; -$a->strings["Contact information for site administrators. Displayed on siteinfo page. BBCode can be used here"] = "Contactinformatie voor hub-beheerders. Getoond op pagina met hub-informatie. Er kan hier bbcode gebruikt worden."; -$a->strings["System language"] = "Standaardtaal"; -$a->strings["System theme"] = "Standaardthema"; -$a->strings["Default system theme - may be over-ridden by user profiles - change theme settings"] = "Standaardthema voor RedMatrix-hub (kan door gebruiker veranderd worden) - verander thema-instellingen"; -$a->strings["Mobile system theme"] = "Standaardthema voor mobiel"; -$a->strings["Theme for mobile devices"] = "Thema voor mobiele apparaten"; -$a->strings["Accessibility system theme"] = "Standaardthema voor universele toegang"; -$a->strings["Accessibility theme"] = "Thema voor universele toegang"; -$a->strings["Channel to use for this website's static pages"] = "Kanaal die op deze hub als statische pagina op de homepage gebruikt moet worden"; -$a->strings["Site Channel"] = "Kanaal op deze RedMatrix-hub"; -$a->strings["Maximum image size"] = "Maximale grootte van afbeeldingen"; -$a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Maximale grootte in bytes voor afbeeldingen die worden geüpload. Standaard is 0, wat geen limiet betekend."; -$a->strings["Does this site allow new member registration?"] = "Staat deze hub registratie van nieuwe accounts toe?"; -$a->strings["Which best describes the types of account offered by this hub?"] = "Wat voor soort accounts biedt deze RedMatrix-hub aan? Kies wat het meest in de buurt komt."; -$a->strings["Register text"] = "Registratietekst"; -$a->strings["Will be displayed prominently on the registration page."] = "Wordt prominent op de registratiepagina getoond."; -$a->strings["Accounts abandoned after x days"] = "Accounts als verlaten beschouwen na zoveel aantal dagen:"; -$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Zal geen systeembronnen verspillen door polling van externe hubs voor verlaten accounts. Vul 0 in voor geen tijdslimiet."; -$a->strings["Allowed friend domains"] = "Toegestane domeinen"; -$a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Komma-gescheiden lijst van domeinen waarvan kanalen connecties kunnen aangaan met kanalen op deze RedMatrix-hub. Wildcards zijn toegestaan.\nLaat leeg om alle domeinen toe te laten."; -$a->strings["Allowed email domains"] = "Toegestane e-maildomeinen"; -$a->strings["Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"] = "Door komma's gescheiden lijst met e-maildomeinen die op deze hub mogen registeren. Wildcards zijn toegestaan.\nLaat leeg om alle domeinen toe te laten."; -$a->strings["Block public"] = "Openbare toegang blokkeren"; -$a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "Vink dit aan om alle normaliter openbare persoonlijke pagina's op deze hub alleen toegankelijk te maken voor ingelogde gebruikers."; -$a->strings["Force publish"] = "Dwing kanaalvermelding af"; -$a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Vink dit aan om af te dwingen dat alle kanalen op deze hub in de kanalengids worden vermeld."; -$a->strings["Disable discovery tab"] = "Ontdekkingstab"; -$a->strings["Remove the tab in the network view with public content pulled from sources chosen for this site."] = "Verwijder de tab in de matrix-weergave waarin zich een selectie aan openbare berichten bevindt, die automatisch voor deze hub zijn uitgekozen."; -$a->strings["No login on Homepage"] = "Geen inlogformulier op de homepage"; -$a->strings["Check to hide the login form from your sites homepage when visitors arrive who are not logged in (e.g. when you put the content of the homepage in via the site channel)."] = "Vink dit aan om het inlogformulier op de homepage van deze hub, die niet-ingelogde gebruikers te zien krijgen, te verbergen. (bijvoorbeeld wanneer je een kanaal op deze RedMatrix-hub als homepage gebruikt)"; -$a->strings["Proxy user"] = "Proxy-gebruiker"; -$a->strings["Proxy URL"] = "Proxy-URL"; -$a->strings["Network timeout"] = "Netwerktimeout"; -$a->strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = "Waarde is in seconden. Zet op 0 voor onbeperkt (niet aanbevolen)"; -$a->strings["Delivery interval"] = "Afleveringsinterval"; -$a->strings["Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers."] = "Vertraag de achtergrondprocessen voor het afleveren met een aantal seconden om de systeembelasting te verminderen. Aanbevolen: 4-5 voor shared hosts, 2-3 voor virtual private servers (VPS) en 0-1 voor grote dedicated servers."; -$a->strings["Poll interval"] = "Poll-interval"; -$a->strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "De achtergrondprocessen voor het afleveren met zoveel seconden vertragen om de systeembelasting te verminderen. 0 om de afleveringsinterval te gebruiken."; -$a->strings["Maximum Load Average"] = "Maximaal gemiddelde systeembelasting"; -$a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Maximale systeembelasting voordat de afleverings- en polllingsprocessen worden uitgesteld. Standaard is 50."; -$a->strings["No server found"] = "Geen hub gevonden"; -$a->strings["ID"] = "ID"; -$a->strings["for channel"] = "voor kanaal"; -$a->strings["on server"] = "op hub"; -$a->strings["Status"] = "Status"; -$a->strings["Update has been marked successful"] = "Update is als succesvol gemarkeerd"; -$a->strings["Executing %s failed. Check system logs."] = "Uitvoeren van %s is mislukt. Controleer systeemlogboek."; -$a->strings["Update %s was successfully applied."] = "Update %s was geslaagd."; -$a->strings["Update %s did not return a status. Unknown if it succeeded."] = "Update %s gaf geen melding. Het is daarom niet bekend of deze geslaagd is."; -$a->strings["Update function %s could not be found."] = "Update-functie %s kon niet gevonden worden."; -$a->strings["No failed updates."] = "Geen mislukte updates."; -$a->strings["Failed Updates"] = "Mislukte updates"; -$a->strings["Mark success (if update was manually applied)"] = "Markeer als geslaagd (wanneer de update handmatig was uitgevoerd)"; -$a->strings["Attempt to execute this update step automatically"] = "Poging om deze stap van de update automatisch uit te voeren."; -$a->strings["%s user blocked/unblocked"] = array( - 0 => "%s account geblokkeerd/gedeblokkeerd", - 1 => "%s accounts geblokkeerd/gedeblokkeerd", -); -$a->strings["%s user deleted"] = array( - 0 => "%s account verwijderd", - 1 => "%s accounts verwijderd", -); -$a->strings["Account not found"] = "Account niet gevonden"; -$a->strings["User '%s' deleted"] = "Account '%s' verwijderd"; -$a->strings["User '%s' unblocked"] = "Account '%s' gedeblokkeerd"; -$a->strings["User '%s' blocked"] = "Gebruiker '%s' geblokkeerd"; -$a->strings["Users"] = "Accounts"; -$a->strings["select all"] = "alles selecteren"; -$a->strings["User registrations waiting for confirm"] = "Accounts die op goedkeuring wachten"; -$a->strings["Request date"] = "Tijd/datum verzoek"; -$a->strings["No registrations."] = "Geen verzoeken."; -$a->strings["Approve"] = "Goedkeuren"; -$a->strings["Deny"] = "Afkeuren"; -$a->strings["Block"] = "Blokkeren"; -$a->strings["Unblock"] = "Deblokkeren"; -$a->strings["Register date"] = "Geregistreerd"; -$a->strings["Last login"] = "Laatste keer ingelogd"; -$a->strings["Expires"] = "Verloopt"; -$a->strings["Service Class"] = "Abonnementen"; -$a->strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Geselecteerde accounts (met bijbehorende kanalen) worden verwijderd!\\n\\nAlles wat deze accounts op deze hub hebben gepubliceerd wordt definitief verwijderd!\\n\\Weet je het zeker?"; -$a->strings["The user {0} will be deleted!\\n\\nEverything this user has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Account {0} (met bijbehorende kanalen) wordt verwijderd !\\n\\nAlles wat dit account op deze hub heeft gepubliceerd wordt definitief verwijderd!\\n\\nWeet je het zeker?"; -$a->strings["%s channel censored/uncensored"] = array( - 0 => "%s kanalen gecensureerd/ongecensureerd", - 1 => "%s kanaal gecensureerd/ongecensureerd", -); -$a->strings["%s channel deleted"] = array( - 0 => "%s kanaal verwijderd", - 1 => "%s kanalen verwijderd", -); -$a->strings["Channel not found"] = "Kanaal niet gevonden"; -$a->strings["Channel '%s' deleted"] = "Kanaal '%s' verwijderd"; -$a->strings["Channel '%s' uncensored"] = "Kanaal '%s' ongecensureerd"; -$a->strings["Channel '%s' censored"] = "Kanaal '%s' gecensureerd"; -$a->strings["Censor"] = "Censureren"; -$a->strings["Uncensor"] = "Niet censureren"; -$a->strings["UID"] = "UID"; -$a->strings["Address"] = "Kanaaladres"; -$a->strings["Selected channels will be deleted!\\n\\nEverything that was posted in these channels on this site will be permanently deleted!\\n\\nAre you sure?"] = "Geselecteerde kanalen worden verwijderd!\\n\\nAlles wat in deze kanalen op deze hub werd gepubliceerd wordt definitief verwijderd!\\n\\nWeet je het zeker?"; -$a->strings["The channel {0} will be deleted!\\n\\nEverything that was posted in this channel on this site will be permanently deleted!\\n\\nAre you sure?"] = "Kanaal {0} wordt verwijderd!\\n\\nAlles wat in dit kanaal op deze hub werd gepubliceerd wordt definitief verwijderd!\\n\\nWeet je het zeker?"; -$a->strings["Plugin %s disabled."] = "Plug-in %s uitgeschakeld."; -$a->strings["Plugin %s enabled."] = "Plug-in %s ingeschakeld"; -$a->strings["Disable"] = "Uitschakelen"; -$a->strings["Enable"] = "Inschakelen"; -$a->strings["Toggle"] = "Omschakelen"; -$a->strings["Author: "] = "Auteur: "; -$a->strings["Maintainer: "] = "Beheerder: "; -$a->strings["No themes found."] = "Geen thema's gevonden"; -$a->strings["Screenshot"] = "Schermafdruk"; -$a->strings["[Experimental]"] = "[Experimenteel]"; -$a->strings["[Unsupported]"] = "[Niet ondersteund]"; -$a->strings["Log settings updated."] = "Logboek-instellingen bijgewerkt."; -$a->strings["Clear"] = "Leegmaken"; -$a->strings["Debugging"] = "Debuggen"; -$a->strings["Log file"] = "Logbestand"; -$a->strings["Must be writable by web server. Relative to your Red top-level directory."] = "Moet door de webserver beschrijfbaar zijn. Relatief ten opzichte van de bovenste map van je RedMatrix-installatie."; -$a->strings["Log level"] = "Logniveau"; -$a->strings["- select -"] = "- kies map -"; -$a->strings["Could not access contact record."] = "Kon geen toegang krijgen tot de connectie-gegevens."; -$a->strings["Could not locate selected profile."] = "Kon het gekozen profiel niet vinden."; -$a->strings["Connection updated."] = "Connectie bijgewerkt."; -$a->strings["Failed to update connection record."] = "Bijwerken van connectie-gegevens mislukt."; -$a->strings["Blocked"] = "Geblokkeerd"; -$a->strings["Ignored"] = "Genegeerd"; -$a->strings["Hidden"] = "Verborgen"; -$a->strings["Archived"] = "Gearchiveerd"; -$a->strings["All"] = "Alles"; -$a->strings["Suggest new connections"] = "Nieuwe kanalen voorstellen"; -$a->strings["New Connections"] = "Nieuwe connecties"; -$a->strings["Show pending (new) connections"] = "Nog te accepteren (nieuwe) connecties weergeven"; -$a->strings["All Connections"] = "Alle connecties"; -$a->strings["Show all connections"] = "Toon alle connecties"; -$a->strings["Unblocked"] = "Niet geblokkeerd"; -$a->strings["Only show unblocked connections"] = "Toon alleen niet geblokkeerde connecties"; -$a->strings["Only show blocked connections"] = "Toon alleen geblokkeerde connecties"; -$a->strings["Only show ignored connections"] = "Toon alleen genegeerde connecties"; -$a->strings["Only show archived connections"] = "Toon alleen gearchiveerde connecties"; -$a->strings["Only show hidden connections"] = "Toon alleen verborgen connecties"; -$a->strings["%1\$s [%2\$s]"] = "%1\$s [%2\$s]"; -$a->strings["Edit contact"] = "Connectie bewerken"; -$a->strings["Search your connections"] = "Doorzoek jouw connecties"; -$a->strings["Finding: "] = "Zoeken naar: "; -$a->strings["Public access denied."] = "Openbare toegang geweigerd."; -$a->strings["Age: "] = "Leeftijd:"; -$a->strings["Gender: "] = "Geslacht:"; -$a->strings["Status: "] = "Status: "; -$a->strings["Sexual Preference: "] = "Seksuele voorkeur: "; -$a->strings["Homepage: "] = "Homepage: "; -$a->strings["Hometown: "] = "Oorspronkelijk uit: "; -$a->strings["About: "] = "Over: "; -$a->strings["Keywords: "] = "Trefwoorden: "; -$a->strings["Not found."] = "Niet gevonden."; -$a->strings["Page owner information could not be retrieved."] = "Informatie over de pagina-eigenaar werd niet ontvangen."; -$a->strings["Album not found."] = "Album niet gevonden."; -$a->strings["Delete Album"] = "Verwijder album"; -$a->strings["Delete Photo"] = "Verwijder foto"; -$a->strings["No photos selected"] = "Geen foto's geselecteerd"; -$a->strings["Access to this item is restricted."] = "Toegang tot dit item is beperkt."; -$a->strings["You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."] = "Je gebruiker %1$.2f MB van totaal %2$.2f MB foto-opslagruimte."; -$a->strings["You have used %1$.2f Mbytes of photo storage."] = "Je gebruikt %1$.2f MB aan foto-opslagruimte."; -$a->strings["Upload Photos"] = "Foto's uploaden"; -$a->strings["New album name: "] = "Nieuwe albumnaam: "; -$a->strings["or existing album name: "] = "of een bestaande albumnaam: "; -$a->strings["Do not show a status post for this upload"] = "Plaats geen bericht voor deze upload."; -$a->strings["Contact Photos"] = "Connectiefoto's"; -$a->strings["Edit Album"] = "Album bewerken"; -$a->strings["Show Newest First"] = "Nieuwste eerst weergeven"; -$a->strings["Show Oldest First"] = "Oudste eerst weergeven"; -$a->strings["View Photo"] = "Foto weergeven"; -$a->strings["Permission denied. Access to this item may be restricted."] = "Toegang geweigerd. Toegang tot dit item kan zijn beperkt."; -$a->strings["Photo not available"] = "Foto niet aanwezig"; -$a->strings["Use as profile photo"] = "Als profielfoto gebruiken"; -$a->strings["View Full Size"] = "Volledige grootte weergeven"; -$a->strings["Remove"] = "Verwijderen"; -$a->strings["Edit photo"] = "Foto bewerken"; -$a->strings["Rotate CW (right)"] = "Draai met de klok mee (naar rechts)"; -$a->strings["Rotate CCW (left)"] = "Draai tegen de klok in (naar links)"; -$a->strings["New album name"] = "Nieuwe albumnaam"; -$a->strings["Caption"] = "Bijschrift"; -$a->strings["Add a Tag"] = "Label toevoegen"; -$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "Voorbeeld: @bob, @Barbara_Jansen, @jan@example.com, #Friesland, #camping"; -$a->strings["In This Photo:"] = "Op deze foto:"; -$a->strings["View Album"] = "Album weergeven"; -$a->strings["Recent Photos"] = "Recente foto's"; -$a->strings["Menu not found."] = "Menu niet gevonden."; -$a->strings["Menu element updated."] = "Menu-onderdeel geüpdatet."; -$a->strings["Unable to update menu element."] = "Menu-onderdeel kan niet worden geüpdatet."; -$a->strings["Menu element added."] = "Menu-onderdeel toegevoegd"; -$a->strings["Unable to add menu element."] = "Menu-onderdeel kan niet worden toegevoegd."; -$a->strings["Manage Menu Elements"] = "Menu-onderdelen beheren"; -$a->strings["Edit menu"] = "Menu bewerken"; -$a->strings["Edit element"] = "Onderdeel bewerken"; -$a->strings["Drop element"] = "Onderdeel verwijderen"; -$a->strings["New element"] = "Nieuw element"; -$a->strings["Edit this menu container"] = "Deze menu-container bewerken"; -$a->strings["Add menu element"] = "Menu-element toevoegen"; -$a->strings["Delete this menu item"] = "Dit menu-item verwijderen"; -$a->strings["Edit this menu item"] = "Dit menu-item bewerken"; -$a->strings["New Menu Element"] = "Nieuw menu-element"; -$a->strings["Menu Item Permissions"] = "Privacy-rechten menu-item"; -$a->strings["Link text"] = "Linktekst"; -$a->strings["URL of link"] = "URL of link"; -$a->strings["Use Red magic-auth if available"] = "Gebruik Reds magische authenticatie wanneer aanwezig"; -$a->strings["Open link in new window"] = "Open link in nieuw venster"; -$a->strings["Order in list"] = "Volgorde in lijst"; -$a->strings["Higher numbers will sink to bottom of listing"] = "Hogere nummers komen onderaan de lijst terecht"; -$a->strings["Menu item not found."] = "Menu-item niet gevonden."; -$a->strings["Menu item deleted."] = "Menu-item verwijderd."; -$a->strings["Menu item could not be deleted."] = "Menu-item kon niet worden verwijderd."; -$a->strings["Edit Menu Element"] = "Menu-element bewerken"; -$a->strings["Modify"] = "Wijzigen"; -$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s volgt het %3\$s van %2\$s"; -$a->strings["Please login."] = "Inloggen."; -$a->strings["Set your current mood and tell your friends"] = "Noteer je huidige stemming en toon het aan je connecties"; -$a->strings["Remote privacy information not available."] = "Privacy-informatie op afstand niet beschikbaar."; -$a->strings["Visible to:"] = "Zichtbaar voor:"; -$a->strings["Select a bookmark folder"] = "Kies een bladwijzermap"; -$a->strings["Save Bookmark"] = "Bladwijzer opslaan"; -$a->strings["URL of bookmark"] = "URL van bladwijzer"; -$a->strings["Description"] = "Omschrijving"; -$a->strings["Or enter new bookmark folder name"] = "Of geef de naam op van een nieuwe bladwijzermap"; -$a->strings["Layout updated."] = "Layout bijgewerkt."; -$a->strings["Edit System Page Description"] = "Systeempagina's bewerken"; -$a->strings["Layout not found."] = "Lay-out niet gevonden."; -$a->strings["Module Name:"] = "Modulenaam:"; -$a->strings["Layout Help"] = "Lay-out-hulp"; -$a->strings["Image uploaded but image cropping failed."] = "Afbeelding geüpload, maar afbeelding kon niet worden bijgesneden. "; -$a->strings["Image resize failed."] = "Afbeelding kon niet van grootte veranderd worden."; -$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Vernieuw de pagina met shift+R of shift+F5, of leeg je browserbuffer, wanneer de nieuwe foto niet meteen wordt weergegeven."; -$a->strings["Image exceeds size limit of %d"] = "Afbeeldingsgrootte overschrijdt het limiet van %d"; -$a->strings["Unable to process image."] = "Niet in staat om afbeelding te verwerken."; -$a->strings["Photo not available."] = "Foto niet beschikbaar."; -$a->strings["Upload File:"] = "Bestand uploaden:"; -$a->strings["Select a profile:"] = "Kies een profiel:"; -$a->strings["Upload Profile Photo"] = "Profielfoto uploaden"; -$a->strings["skip this step"] = "sla deze stap over"; -$a->strings["select a photo from your photo albums"] = "Kies een foto uit jouw fotoalbums"; -$a->strings["Crop Image"] = "Afbeelding bijsnijden"; -$a->strings["Please adjust the image cropping for optimum viewing."] = "Snij de afbeelding zo uit dat deze optimaal wordt weergegeven."; -$a->strings["Done Editing"] = "Klaar met bewerken"; -$a->strings["Image uploaded successfully."] = "Uploaden afbeelding geslaagd"; -$a->strings["Image upload failed."] = "Uploaden afbeelding mislukt"; -$a->strings["Image size reduction [%s] failed."] = "Verkleinen [%s] van afbeelding mislukt."; -$a->strings["network"] = "netwerk"; -$a->strings["Menu updated."] = "Menu aangepast. "; -$a->strings["Unable to update menu."] = "Niet in staat om menu aan te passen"; -$a->strings["Menu created."] = "Menu aangemaakt."; -$a->strings["Unable to create menu."] = "Niet in staat om menu aan te maken."; -$a->strings["Manage Menus"] = "Menu's beheren"; -$a->strings["Drop"] = "Verwijderen"; -$a->strings["Create a new menu"] = "Een nieuwe menu aanmaken"; -$a->strings["Delete this menu"] = "Menu verwijderen"; -$a->strings["Edit menu contents"] = "Bewerk de inhoud van het menu"; -$a->strings["Edit this menu"] = "Dit menu bewerken"; -$a->strings["New Menu"] = "Nieuw menu"; -$a->strings["Menu name"] = "Naam van menu"; -$a->strings["Must be unique, only seen by you"] = "Moet uniek zijn en is alleen zichtbaar voor jou."; -$a->strings["Menu title"] = "Titel van menu"; -$a->strings["Menu title as seen by others"] = "Titel van menu zoals anderen dat zien."; -$a->strings["Allow bookmarks"] = "Bladwijzers toestaan"; -$a->strings["Menu may be used to store saved bookmarks"] = "Menu kan gebruikt worden om bladwijzers in op te slaan"; -$a->strings["Menu deleted."] = "Menu verwijderd."; -$a->strings["Menu could not be deleted."] = "Menu kon niet verwijderd worden."; -$a->strings["Edit Menu"] = "Menu bewerken"; -$a->strings["Add or remove entries to this menu"] = "Items aan dit menu toevoegen of verwijder"; -$a->strings["Invalid item."] = "Ongeldig item."; -$a->strings["Page not found."] = "Pagina niet gevonden."; -$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s labelde het %3\$s van %2\$s met %4\$s"; -$a->strings["Wall Photos"] = "Kanaalfoto's"; -$a->strings["OpenID protocol error. No ID returned."] = "OpenID-protocolfout. Geen ID terugontvangen."; -$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Geen voorgestelde kanalen gevonden. Wanneer dit een nieuwe hub is, probeer het dan over 24 uur weer."; -$a->strings["is now connected to"] = "is nu verbonden met"; -$a->strings["Could not access address book record."] = "Kon geen toegang krijgen tot de record van de connectie."; -$a->strings["Refresh failed - channel is currently unavailable."] = "Vernieuwen mislukt - kanaal is momenteel niet beschikbaar"; -$a->strings["Channel has been unblocked"] = "Kanaal is gedeblokkeerd"; -$a->strings["Channel has been blocked"] = "Kanaal is geblokkeerd"; -$a->strings["Unable to set address book parameters."] = "Niet in staat om de parameters van connecties in te stellen."; -$a->strings["Channel has been unignored"] = "Kanaal wordt niet meer genegeerd"; -$a->strings["Channel has been ignored"] = "Kanaal wordt genegeerd"; -$a->strings["Channel has been unarchived"] = "Kanaal is niet meer gearchiveerd"; -$a->strings["Channel has been archived"] = "Kanaal is gearchiveerd"; -$a->strings["Channel has been unhidden"] = "Kanaal is niet meer verborgen"; -$a->strings["Channel has been hidden"] = "Kanaal is verborgen"; -$a->strings["Channel has been approved"] = "Connectie/kanaal is geaccepteerd"; -$a->strings["Channel has been unapproved"] = "Connectie/kanaal is afgewezen"; -$a->strings["Connection has been removed."] = "Connectie is verwijderd"; -$a->strings["View %s's profile"] = "Profiel van %s weergeven"; -$a->strings["Refresh Permissions"] = "Privacy-rechten vernieuwen"; -$a->strings["Fetch updated permissions"] = "Aangepaste privacy-rechten ophalen"; -$a->strings["Recent Activity"] = "Recente activiteit"; -$a->strings["View recent posts and comments"] = "Recente berichten en reacties weergeven"; -$a->strings["Block or Unblock this connection"] = "Deze connectie blokkeren of deblokkeren"; -$a->strings["Unignore"] = "Niet meer negeren"; -$a->strings["Ignore"] = "Negeren"; -$a->strings["Ignore or Unignore this connection"] = "Deze connectie negeren of niet meer negeren"; -$a->strings["Unarchive"] = "Niet meer archiveren"; -$a->strings["Archive"] = "Archiveren"; -$a->strings["Archive or Unarchive this connection"] = "Deze connectie archiveren of niet meer archiveren"; -$a->strings["Unhide"] = "Niet meer verbergen"; -$a->strings["Hide"] = "Verbergen"; -$a->strings["Hide or Unhide this connection"] = "Deze connectie verbergen of niet meer verbergen"; -$a->strings["Delete this connection"] = "Deze connectie verwijderen"; -$a->strings["Approve this connection"] = "Deze connectie accepteren"; -$a->strings["Accept connection to allow communication"] = "Keur deze connectie goed om communicatie toe te staan"; -$a->strings["Automatic Permissions Settings"] = "Automatische privacy-rechten"; -$a->strings["Connections: settings for %s"] = "Connecties: instellingen voor %s"; -$a->strings["When receiving a channel introduction, any permissions provided here will be applied to the new connection automatically and the introduction approved. Leave this page if you do not wish to use this feature."] = "Wanneer je een connectieverzoek voor een kanaal ontvangt, zullen alle privacy-rechten hier automatisch op de nieuwe connectie worden toegepast en het connectieverzoek worden geaccepteerd. Verlaat deze pagina wanneer je geen gebruik wil maken van deze functie."; -$a->strings["Slide to adjust your degree of friendship"] = "Schuif om te bepalen hoe goed je iemand kent en/of mag"; -$a->strings["inherited"] = "geërfd"; -$a->strings["Connection has no individual permissions!"] = "Connectie heeft geen individuele privacy-rechten!"; -$a->strings["This may be appropriate based on your privacy settings, though you may wish to review the \"Advanced Permissions\"."] = "Dit is mogelijk voldoende, wanneer er naar jouw privacy-instellingen wordt gekeken. Hoewel je wellicht de geavanceerde rechten wil nagaan."; -$a->strings["Profile Visibility"] = "Zichtbaarheid profiel"; -$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Kies het profiel dat je aan %s wil tonen wanneer hij/zij ingelogd jouw profiel wil bekijken."; -$a->strings["Contact Information / Notes"] = "Informatie/aantekeningen over connectie"; -$a->strings["Edit contact notes"] = "Bewerk aantekeningen over contact"; -$a->strings["Their Settings"] = "Hun instellingen"; -$a->strings["My Settings"] = "Mijn instellingen"; -$a->strings["Clear/Disable Automatic Permissions"] = "Verwijderen/uitschakelen automatische privacy-rechten"; -$a->strings["Forum Members"] = "Forum/groepsleden"; -$a->strings["Soapbox"] = "Zeepkist"; -$a->strings["Full Sharing (typical social network permissions)"] = "Voluit delen (vergelijkbaar met die van sociale netwerken)"; -$a->strings["Cautious Sharing "] = "Voorzichtig delen"; -$a->strings["Follow Only"] = "Alleen volgen"; -$a->strings["Individual Permissions"] = "Individuele privacy-rechten"; -$a->strings["Some permissions may be inherited from your channel privacy settings, which have higher priority than individual settings. Changing those inherited settings on this page will have no effect."] = "Sommige privacy-rechten kunnen worden overgeërfd van de privacy-instellingen van jouw kanaal. Wanneer je deze geërfde instellingen op deze pagina veranderd heeft dat geen effect."; -$a->strings["Advanced Permissions"] = "Geavanceerde privacy-rechten"; -$a->strings["Simple Permissions (select one and submit)"] = "Eenvoudige privacy-rechten (selecteer er één en opslaan)"; -$a->strings["Visit %s's profile - %s"] = "Profiel van %s bezoeken - %s"; -$a->strings["Block/Unblock contact"] = "Connectie blokkeren/deblokkeren"; -$a->strings["Ignore contact"] = "Connectie negeren"; -$a->strings["Repair URL settings"] = "URL-instellingen repareren"; -$a->strings["View conversations"] = "Conversaties weergeven"; -$a->strings["Delete contact"] = "Connectie verwijderen"; -$a->strings["Last update:"] = "Laatste wijziging:"; -$a->strings["Update public posts"] = "Openbare berichten updaten"; -$a->strings["Update now"] = "Nu updaten"; -$a->strings["Currently blocked"] = "Momenteel geblokkeerd"; -$a->strings["Currently ignored"] = "Momenteel genegeerd"; -$a->strings["Currently archived"] = "Momenteel gearchiveerd"; -$a->strings["Currently pending"] = "Moeten nog geaccepteerd of afgewezen worden"; -$a->strings["Hide this contact from others"] = "Verberg deze connectie voor anderen"; -$a->strings["Replies/likes to your public posts may still be visible"] = "Reacties/vind-ik-leuks op jouw openbare berichten kunnen zichtbaar blijven"; -$a->strings["Messages"] = "Berichten"; -$a->strings["Conversation removed."] = "Conversatie verwijderd"; -$a->strings["No messages."] = "Geen berichten"; -$a->strings["Delete message"] = "Bericht verwijderen"; -$a->strings["D, d M Y - g:i A"] = "D, j M Y - G:i"; -$a->strings["sent you a private message"] = "stuurde jou een privébericht"; -$a->strings["added your channel"] = "voegde jouw kanaal toe"; -$a->strings["posted an event"] = "plaatste een gebeurtenis"; -$a->strings["Red Matrix Server - Setup"] = "RedMatrix Server - Setup"; -$a->strings["Could not connect to database."] = "Could not connect to database."; -$a->strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = "Could not connect to specified hub URL. Possible SSL certificate or DNS issue."; -$a->strings["Could not create table."] = "Could not create table."; -$a->strings["Your site database has been installed."] = "Your hub database has been installed."; -$a->strings["You may need to import the file \"install/database.sql\" manually using phpmyadmin or mysql."] = "You may need to import the file \"install/database.sql\" manually using phpmyadmin or mysql."; -$a->strings["Please see the file \"install/INSTALL.txt\"."] = "Please see the file \"install/INSTALL.txt\"."; -$a->strings["System check"] = "System check"; -$a->strings["Next"] = "Volgende"; -$a->strings["Check again"] = "Check again"; -$a->strings["Database connection"] = "Database connection"; -$a->strings["In order to install Red Matrix we need to know how to connect to your database."] = "In order to install RedMatrix we need to know how to connect to your database."; -$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Please contact your hosting provider or site administrator if you have questions about these settings."; -$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "The database you specify below should already exist. If it does not, please create it before continuing."; -$a->strings["Database Server Name"] = "Database Server Name"; -$a->strings["Default is localhost"] = "Default is localhost"; -$a->strings["Database Port"] = "Database Port"; -$a->strings["Communication port number - use 0 for default"] = "Communication port number - use 0 for default"; -$a->strings["Database Login Name"] = "Database Login Name"; -$a->strings["Database Login Password"] = "Database Login Password"; -$a->strings["Database Name"] = "Database Name"; -$a->strings["Site administrator email address"] = "Hub administrator email address"; -$a->strings["Your account email address must match this in order to use the web admin panel."] = "Your account email address must match this in order to use the web admin panel."; -$a->strings["Website URL"] = "Hub URL"; -$a->strings["Please use SSL (https) URL if available."] = "Please use SSL (https) URL if available."; -$a->strings["Please select a default timezone for your website"] = "Please select a default timezone for your hub"; -$a->strings["Site settings"] = "Hub settings"; -$a->strings["Could not find a command line version of PHP in the web server PATH."] = "Could not find a command line version of PHP in the web server PATH."; -$a->strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron."] = "If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron."; -$a->strings["PHP executable path"] = "PHP executable path"; -$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Enter full path to php executable. You can leave this blank to continue the installation."; -$a->strings["Command line PHP"] = "Command line PHP"; -$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "The command line version of PHP on your system does not have \"register_argc_argv\" enabled."; -$a->strings["This is required for message delivery to work."] = "This is required for message delivery to work."; -$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv"; -$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"; -$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."; -$a->strings["Generate encryption keys"] = "Generate encryption keys"; -$a->strings["libCurl PHP module"] = "libCurl PHP module"; -$a->strings["GD graphics PHP module"] = "GD graphics PHP module"; -$a->strings["OpenSSL PHP module"] = "OpenSSL PHP module"; -$a->strings["mysqli PHP module"] = "mysqli PHP module"; -$a->strings["mb_string PHP module"] = "mb_string PHP module"; -$a->strings["mcrypt PHP module"] = "mcrypt PHP module"; -$a->strings["Apache mod_rewrite module"] = "Apache mod_rewrite module"; -$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Error: Apache webserver mod-rewrite module is required but not installed."; -$a->strings["proc_open"] = "proc_open"; -$a->strings["Error: proc_open is required but is either not installed or has been disabled in php.ini"] = "Error: proc_open is required but is either not installed or has been disabled in php.ini"; -$a->strings["Error: libCURL PHP module required but not installed."] = "Error: libCURL PHP module required but not installed."; -$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Error: GD graphics PHP module with JPEG support required but not installed."; -$a->strings["Error: openssl PHP module required but not installed."] = "Error: openssl PHP module required but not installed."; -$a->strings["Error: mysqli PHP module required but not installed."] = "Error: mysqli PHP module required but not installed."; -$a->strings["Error: mb_string PHP module required but not installed."] = "Error: mb_string PHP module required but not installed."; -$a->strings["Error: mcrypt PHP module required but not installed."] = "Error: mcrypt PHP module required but not installed."; -$a->strings["The web installer needs to be able to create a file called \".htconfig.php\ in the top folder of your web server and it is unable to do so."] = "The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."; -$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."; -$a->strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Red top folder."] = "At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Red top folder."; -$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions."] = "You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions."; -$a->strings[".htconfig.php is writable"] = ".htconfig.php is writable"; -$a->strings["Red uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Red uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."; -$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory %s under the Red top level folder."] = "In order to store these compiled templates, the web server needs to have write access to the directory %s under the Red top level folder."; -$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."; -$a->strings["Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains."] = "Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains."; -$a->strings["%s is writable"] = "%s is writable"; -$a->strings["Red uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the Red top level folder"] = "Red uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the Red top level folder"; -$a->strings["store is writable"] = "store is writable"; -$a->strings["SSL certificate cannot be validated. Fix certificate or disable https access to this site."] = "SSL certificate cannot be validated. Fix certificate or disable https access to this hub."; -$a->strings["If you have https access to your website or allow connections to TCP port 443 (the https: port), you MUST use a browser-valid certificate. You MUST NOT use self-signed certificates!"] = "If you have https access to your hub or allow connections to TCP port 443 (the https: port), you MUST use a browser-valid certificate. You MUST NOT use self-signed certificates!"; -$a->strings["This restriction is incorporated because public posts from you may for example contain references to images on your own hub."] = "This restriction is incorporated because public posts from you may for example contain references to images on your own hub."; -$a->strings["If your certificate is not recognized, members of other sites (who may themselves have valid certificates) will get a warning message on their own site complaining about security issues."] = "If your certificate is not recognized, members of other hubs (who may themselves have valid certificates) will get a warning message on their own hub complaining about security issues."; -$a->strings["This can cause usability issues elsewhere (not just on your own site) so we must insist on this requirement."] = "This can cause usability issues elsewhere (not just on your own hub) so we must insist on this requirement."; -$a->strings["Providers are available that issue free certificates which are browser-valid."] = "Providers are available that issue free certificates which are browser-valid."; -$a->strings["SSL certificate validation"] = "SSL certificate validation"; -$a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "Url rewrite in .htaccess is not working. Check your server configuration."; -$a->strings["Url rewrite is working"] = "Url rewrite is working"; -$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."; -$a->strings["Errors encountered creating database tables."] = "Errors encountered creating database tables."; -$a->strings["

    What next

    "] = "

    Wat nu

    "; -$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANT: You will need to [manually] setup a scheduled task for the poller."; -$a->strings["Hub not found."] = "Hub niet gevonden."; -$a->strings["Total invitation limit exceeded."] = "Limiet voor aantal uitnodigingen overschreden."; -$a->strings["%s : Not a valid email address."] = "%s : Geen geldig e-mailadres."; -$a->strings["Please join us on Red"] = "Kom op de RedMatrix"; -$a->strings["Invitation limit exceeded. Please contact your site administrator."] = "Limiet voor aantal uitnodigingen overschreden. Neem contact op met je hub-beheerder."; -$a->strings["%s : Message delivery failed."] = "%s: Aflevering bericht mislukt."; -$a->strings["%d message sent."] = array( - 0 => "%d bericht verzonden.", - 1 => "%d berichten verzonden.", +$a->strings["General Features"] = "Algemene functies"; +$a->strings["Content Expiration"] = "Inhoud laten verlopen"; +$a->strings["Remove posts/comments and/or private messages at a future time"] = "Berichten, reacties en/of privéberichten na een bepaalde tijd verwijderen"; +$a->strings["Multiple Profiles"] = "Meerdere profielen"; +$a->strings["Ability to create multiple profiles"] = "Mogelijkheid om meerdere profielen aan te maken"; +$a->strings["Advanced Profiles"] = "Geavanceerde profielen"; +$a->strings["Additional profile sections and selections"] = "Extra onderdelen en keuzes voor je profiel"; +$a->strings["Profile Import/Export"] = "Profiel importen/exporteren"; +$a->strings["Save and load profile details across sites/channels"] = "Profielgegevens opslaan en in andere hubs/kanalen gebruiken."; +$a->strings["Web Pages"] = "Webpagina's"; +$a->strings["Provide managed web pages on your channel"] = "Sta beheerde webpagina's op jouw kanaal toe"; +$a->strings["Private Notes"] = "Privé-aantekeningen"; +$a->strings["Enables a tool to store notes and reminders"] = "Schakelt een eenvoudige toepassing in om aantekeningen en herinneringen in op te slaan"; +$a->strings["Extended Identity Sharing"] = "Uitgebreid identiteit delen"; +$a->strings["Share your identity with all websites on the internet. When disabled, identity is only shared with sites in the matrix."] = "Deel jouw RedMatrix-identiteit met alle websites op het internet. Wanneer dit is uitgeschakeld wordt je identiteit alleen binnen het RedMatrix-netwerk gedeeld. Schakel dit alleen als je weet wat je doet."; +$a->strings["Expert Mode"] = "Expertmodus"; +$a->strings["Enable Expert Mode to provide advanced configuration options"] = "Schakel de expertmodus in voor geavanceerde instellingen"; +$a->strings["Premium Channel"] = "Premiumkanaal"; +$a->strings["Allows you to set restrictions and terms on those that connect with your channel"] = "Stelt je in staat om beperkingen en voorwaarden in te stellen voor jouw kanaal"; +$a->strings["Post Composition Features"] = "Functies voor het opstellen van berichten"; +$a->strings["Use Markdown"] = "Markdown gebruiken"; +$a->strings["Allow use of \"Markdown\" to format posts"] = "Sta het gebruik van \"markdown\" toe om berichten mee op te maken."; +$a->strings["Post Preview"] = "Voorvertoning"; +$a->strings["Allow previewing posts and comments before publishing them"] = "Een optie om je berichten en reacties voor het definitief publiceren voor te vertonen"; +$a->strings["Channel Sources"] = "Kanaalbronnen"; +$a->strings["Automatically import channel content from other channels or feeds"] = "Automatisch inhoud uit andere kanalen of feeds importeren."; +$a->strings["Even More Encryption"] = "Extra encryptie"; +$a->strings["Allow optional encryption of content end-to-end with a shared secret key"] = "Sta toe dat inhoud extra end-to-end wordt versleuteld met een gedeelde geheime sleutel."; +$a->strings["Network and Stream Filtering"] = "Netwerk- en streamfilter"; +$a->strings["Search by Date"] = "Zoek op datum"; +$a->strings["Ability to select posts by date ranges"] = "Mogelijkheid om berichten op datum te filteren "; +$a->strings["Collections Filter"] = "Filter op collecties"; +$a->strings["Enable widget to display Network posts only from selected collections"] = "Sta de widget toe om netwerkberichten te tonen van bepaalde collecties"; +$a->strings["Saved Searches"] = "Opgeslagen zoekopdrachten"; +$a->strings["Save search terms for re-use"] = "Sla zoekopdrachten op voor hergebruik"; +$a->strings["Network Personal Tab"] = "Persoonlijke netwerktab"; +$a->strings["Enable tab to display only Network posts that you've interacted on"] = "Sta het toe dat de tab netwerkberichten toont waarmee je interactie had"; +$a->strings["Network New Tab"] = "Nieuwe netwerktab"; +$a->strings["Enable tab to display all new Network activity"] = "Laat de tab alle nieuwe netwerkactiviteit tonen"; +$a->strings["Affinity Tool"] = "Verwantschapsfilter"; +$a->strings["Filter stream activity by depth of relationships"] = "Filter wat je in de Matrix ziet op hoe goed je iemand kent of mag"; +$a->strings["Suggest Channels"] = "Kanalen voorstellen"; +$a->strings["Show channel suggestions"] = "Voor jou mogelijk interessante kanalen voorstellen"; +$a->strings["Post/Comment Tools"] = "Bericht- en reactiehulpmiddelen"; +$a->strings["Edit Sent Posts"] = "Bewerk verzonden berichten"; +$a->strings["Edit and correct posts and comments after sending"] = "Bewerk en corrigeer berichten en reacties nadat deze zijn verzonden"; +$a->strings["Tagging"] = "Labelen"; +$a->strings["Ability to tag existing posts"] = "Mogelijkheid om bestaande berichten te labelen"; +$a->strings["Post Categories"] = "Categorieën berichten"; +$a->strings["Add categories to your posts"] = "Voeg categorieën toe aan je berichten"; +$a->strings["Ability to file posts under folders"] = "Mogelijkheid om berichten in mappen op te slaan"; +$a->strings["Dislike Posts"] = "Vind berichten niet leuk"; +$a->strings["Ability to dislike posts/comments"] = "Mogelijkheid om berichten en reacties niet leuk te vinden"; +$a->strings["Star Posts"] = "Geef berichten een ster"; +$a->strings["Ability to mark special posts with a star indicator"] = "Mogelijkheid om speciale berichten met een ster te markeren"; +$a->strings["Tag Cloud"] = "Wolk met trefwoorden/labels"; +$a->strings["Provide a personal tag cloud on your channel page"] = "Zorgt voor een persoonlijke wolk met trefwoorden of labels op jouw kanaalpagina"; +$a->strings["Channel is blocked on this site."] = "Kanaal is op deze hub geblokkeerd."; +$a->strings["Channel location missing."] = "Ontbrekende kanaallocatie."; +$a->strings["Response from remote channel was incomplete."] = "Antwoord van het kanaal op afstand was niet volledig."; +$a->strings["Channel was deleted and no longer exists."] = "Kanaal is verwijderd en bestaat niet meer."; +$a->strings["Channel discovery failed."] = "Kanaal ontdekken mislukt."; +$a->strings["local account not found."] = "lokale account niet gevonden."; +$a->strings["Cannot connect to yourself."] = "Kan niet met jezelf verbinden"; +$a->strings["Missing room name"] = "Naam chatkanaal ontbreekt"; +$a->strings["Duplicate room name"] = "Naam chatkanaal bestaat al"; +$a->strings["Invalid room specifier."] = "Ongeldige omschrijving chatkanaal"; +$a->strings["Room not found."] = "Chatkanaal niet gevonden"; +$a->strings["Room is full"] = "Chatkanaal is vol"; +$a->strings["Permission denied"] = "Toegang geweigerd"; +$a->strings["(Unknown)"] = "(Onbekend)"; +$a->strings["Visible to anybody on the internet."] = "Voor iedereen op het internet zichtbaar."; +$a->strings["Visible to you only."] = "Alleen voor jou zichtbaar."; +$a->strings["Visible to anybody in this network."] = "Voor iedereen in dit netwerk zichtbaar."; +$a->strings["Visible to anybody authenticated."] = "Voor iedereen die geauthenticeerd is zichtbaar."; +$a->strings["Visible to anybody on %s."] = "Voor iedereen op %s zichtbaar."; +$a->strings["Visible to all connections."] = "Voor alle connecties zichtbaar."; +$a->strings["Visible to approved connections."] = "Voor alle goedgekeurde connecties zichtbaar."; +$a->strings["Item not found."] = "Item niet gevonden."; +$a->strings["Collection not found."] = "Collectie niet gevonden."; +$a->strings["Collection is empty."] = "Collectie is leeg"; +$a->strings["Collection: %s"] = "Collectie: %s"; +$a->strings["Connection: %s"] = "Connectie: %s"; +$a->strings["Connection not found."] = "Connectie niet gevonden."; +$a->strings["A deleted group with this name was revived. Existing item permissions may apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Een verwijderde collectie met deze naam is gereactiveerd. Bestaande itemrechten kunnen van toepassing zijn op deze collectie en toekomstige leden. Wanneer je dit niet zo bedoeld hebt, moet je een nieuwe collectie met een andere naam aanmaken."; +$a->strings["Default privacy group for new contacts"] = "Standaard privacy-collectie voor nieuwe kanalen"; +$a->strings["All Channels"] = "Alle kanalen"; +$a->strings["edit"] = "bewerken"; +$a->strings["Collections"] = "Collecties"; +$a->strings["Edit collection"] = "Collectie bewerken"; +$a->strings["Create a new collection"] = "Nieuwe collectie aanmaken"; +$a->strings["Channels not in any collection"] = "Kanalen die zich in geen enkele collectie bevinden"; +$a->strings["add"] = "toevoegen"; +$a->strings["Unable to obtain identity information from database"] = "Niet in staat om identiteitsinformatie uit de database te verkrijgen"; +$a->strings["Empty name"] = "Ontbrekende naam"; +$a->strings["Name too long"] = "Naam te lang"; +$a->strings["No account identifier"] = "Geen account-identificator"; +$a->strings["Nickname is required."] = "Bijnaam is verplicht"; +$a->strings["Reserved nickname. Please choose another."] = "Deze naam is gereserveerd. Kies een andere."; +$a->strings["Nickname has unsupported characters or is already being used on this site."] = "Deze naam heeft niet ondersteunde karakters of is al op deze hub in gebruik."; +$a->strings["Unable to retrieve created identity"] = "Niet in staat om aangemaakte identiteit te vinden"; +$a->strings["Default Profile"] = "Standaardprofiel"; +$a->strings["Friends"] = "Vrienden"; +$a->strings["Requested channel is not available."] = "Opgevraagd kanaal is niet beschikbaar."; +$a->strings["Requested profile is not available."] = "Opgevraagd profiel is niet beschikbaar"; +$a->strings["Connect"] = "Verbinden"; +$a->strings["Change profile photo"] = "Profielfoto veranderen"; +$a->strings["Profiles"] = "Profielen"; +$a->strings["Manage/edit profiles"] = "Profielen beheren/bewerken"; +$a->strings["Create New Profile"] = "Nieuw profiel aanmaken"; +$a->strings["Profile Image"] = "Profielfoto"; +$a->strings["visible to everybody"] = "Voor iedereen zichtbaar"; +$a->strings["Edit visibility"] = "Zichtbaarheid bewerken"; +$a->strings["Gender:"] = "Geslacht:"; +$a->strings["Status:"] = "Status:"; +$a->strings["Homepage:"] = "Homepagina:"; +$a->strings["Online Now"] = "Nu online"; +$a->strings["g A l F d"] = "G:i, l d F"; +$a->strings["F d"] = "d F"; +$a->strings["[today]"] = "[vandaag]"; +$a->strings["Birthday Reminders"] = "Verjaardagsherinneringen"; +$a->strings["Birthdays this week:"] = "Verjaardagen deze week:"; +$a->strings["[No description]"] = "[Geen omschrijving]"; +$a->strings["Event Reminders"] = "Herinneringen voor gebeurtenissen"; +$a->strings["Events this week:"] = "Gebeurtenissen deze week:"; +$a->strings["Full Name:"] = "Volledige naam:"; +$a->strings["Like this channel"] = "Vind dit kanaal leuk"; +$a->strings["j F, Y"] = "F j Y"; +$a->strings["j F"] = "F j"; +$a->strings["Birthday:"] = "Geboortedatum:"; +$a->strings["Age:"] = "Leeftijd:"; +$a->strings["for %1\$d %2\$s"] = "voor %1\$d %2\$s"; +$a->strings["Sexual Preference:"] = "Seksuele voorkeur:"; +$a->strings["Hometown:"] = "Oorspronkelijk uit:"; +$a->strings["Tags:"] = "Trefwoorden:"; +$a->strings["Political Views:"] = "Politieke overtuigingen:"; +$a->strings["Religion:"] = "Religie:"; +$a->strings["About:"] = "Over:"; +$a->strings["Hobbies/Interests:"] = "Hobby's/interesses:"; +$a->strings["Likes:"] = "Houdt van:"; +$a->strings["Dislikes:"] = "Houdt niet van:"; +$a->strings["Contact information and Social Networks:"] = "Contactinformatie en sociale netwerken:"; +$a->strings["My other channels:"] = "Mijn andere kanalen"; +$a->strings["Musical interests:"] = "Muzikale interesses:"; +$a->strings["Books, literature:"] = "Boeken, literatuur:"; +$a->strings["Television:"] = "Televisie:"; +$a->strings["Film/dance/culture/entertainment:"] = "Films/dansen/cultuur/vermaak:"; +$a->strings["Love/Romance:"] = "Liefde/romantiek:"; +$a->strings["Work/employment:"] = "Werk/beroep:"; +$a->strings["School/education:"] = "School/opleiding:"; +$a->strings["Like this thing"] = "Vind dit ding leuk"; +$a->strings["view full size"] = "volledige grootte tonen"; +$a->strings["Image/photo"] = "Afbeelding/foto"; +$a->strings["Encrypted content"] = "Versleutelde inhoud"; +$a->strings["QR code"] = "QR-code"; +$a->strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s schreef het volgende %2\$s %3\$s"; +$a->strings["post"] = "bericht"; +$a->strings["$1 wrote:"] = "$1 schreef:"; +$a->strings["No recipient provided."] = "Geen ontvanger opgegeven."; +$a->strings["[no subject]"] = "[geen onderwerp]"; +$a->strings["Unable to determine sender."] = "Afzender kan niet bepaald worden."; +$a->strings["Stored post could not be verified."] = "Opgeslagen bericht kon niet worden geverifieerd."; +$a->strings["System"] = "Systeem"; +$a->strings["Create Personal App"] = "Persoonlijke app maken"; +$a->strings["Edit Personal App"] = "Persoonlijke app bewerken"; +$a->strings["Ignore/Hide"] = "Negeren/Verbergen"; +$a->strings["Suggestions"] = "Voorgestelde kanalen"; +$a->strings["See more..."] = "Meer..."; +$a->strings["You have %1$.0f of %2$.0f allowed connections."] = "Je hebt %1$.0f van de %2$.0f toegestane connecties."; +$a->strings["Add New Connection"] = "Nieuwe connectie toevoegen"; +$a->strings["Enter the channel address"] = "Vul het adres van het nieuwe kanaal in"; +$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Voorbeeld: bob@example.com, http://example.com/barbara"; +$a->strings["Notes"] = "Aantekeningen"; +$a->strings["Remove term"] = "Verwijder zoekterm"; +$a->strings["Archives"] = "Archieven"; +$a->strings["Refresh"] = "Vernieuwen"; +$a->strings["Me"] = "Ik"; +$a->strings["Best Friends"] = "Goede vrienden"; +$a->strings["Co-workers"] = "Collega's"; +$a->strings["Former Friends"] = "Oude vrienden"; +$a->strings["Acquaintances"] = "Kennissen"; +$a->strings["Everybody"] = "Iedereen"; +$a->strings["Account settings"] = "Account"; +$a->strings["Channel settings"] = "Kanaal"; +$a->strings["Additional features"] = "Extra functies"; +$a->strings["Feature settings"] = "Plug-ins"; +$a->strings["Display settings"] = "Weergave"; +$a->strings["Connected apps"] = "Verbonden applicaties"; +$a->strings["Export channel"] = "Kanaal exporteren"; +$a->strings["Automatic Permissions (Advanced)"] = "Automatische privacy-rechten (geavanceerd)"; +$a->strings["Premium Channel Settings"] = "Instellingen premiumkanaal"; +$a->strings["Check Mail"] = "Controleer op nieuwe berichten"; +$a->strings["Chat Rooms"] = "Chatkanalen"; +$a->strings["Bookmarked Chatrooms"] = "Bladwijzers van chatkanalen"; +$a->strings["Suggested Chatrooms"] = "Voorgestelde chatkanalen"; +$a->strings["Save to Folder"] = "In map opslaan"; +$a->strings["View all"] = "Toon alles"; +$a->strings["__ctx:noun__ Dislike"] = array( + 0 => "vindt dit niet leuk", + 1 => "vinden dit niet leuk", +); +$a->strings["Add Star"] = "Ster toevoegen"; +$a->strings["Remove Star"] = "Ster verwijderen"; +$a->strings["Toggle Star Status"] = "Ster toevoegen of verwijderen"; +$a->strings["starred"] = "met ster"; +$a->strings["Add Tag"] = "Label toevoegen"; +$a->strings["I like this (toggle)"] = "Vind ik leuk"; +$a->strings["I don't like this (toggle)"] = "Vind ik niet leuk"; +$a->strings["Share This"] = "Delen"; +$a->strings["share"] = "delen"; +$a->strings["View %s's profile - %s"] = "Profiel van %s bekijken - %s"; +$a->strings["to"] = "aan"; +$a->strings["via"] = "via"; +$a->strings["Wall-to-Wall"] = "Kanaal-naar-kanaal"; +$a->strings["via Wall-To-Wall:"] = "via kanaal-naar-kanaal"; +$a->strings["Save Bookmarks"] = "Bladwijzers opslaan"; +$a->strings["Add to Calendar"] = "Aan agenda toevoegen"; +$a->strings["__ctx:noun__ Likes"] = "vinden dit leuk"; +$a->strings["__ctx:noun__ Dislikes"] = "vinden dit niet leuk"; +$a->strings["%d comment"] = array( + 0 => "%d reactie", + 1 => "%d reacties weergeven", ); -$a->strings["You have no more invitations available"] = "Je hebt geen uitnodigingen meer beschikbaar"; -$a->strings["Send invitations"] = "Uitnodigingen verzenden"; -$a->strings["Enter email addresses, one per line:"] = "Voer e-mailadressen in, één per regel:"; -$a->strings["Your message:"] = "Jouw bericht:"; -$a->strings["You are cordially invited to join me and some other close friends on the Red Matrix - a revolutionary new decentralized communication and information tool."] = "Je bent hierbij uitgenodigd om mij, en enkele goede vrienden, te komen vergezellen op de RedMatrix - een revolutionaire nieuwe communicatie- en informatietool."; -$a->strings["You will need to supply this invitation code: \$invite_code"] = "Je moet deze uitnodigingscode geven: \$invite_code"; -$a->strings["Please visit my channel at"] = "Bezoek mijn kanaal op"; -$a->strings["Once you have registered (on ANY Red Matrix site - they are all inter-connected), please connect with my Red Matrix channel address:"] = "Wanneer je je eenmaal hebt geregistreerd (maakt niet uit op welke RedMatrix-hub, want ze zijn allemaal met elkaar verbonden), kan je je met mijn RedMatrix-kanaal verbinden:"; -$a->strings["Click the [Register] link on the following page to join."] = "Klik op de link [Registreren] op de volgende pagina om je aan te melden."; -$a->strings["For more information about the Red Matrix Project and why it has the potential to change the internet as we know it, please visit http://getzot.com"] = "Bezoek http://getzot.com voor meer informatie over het RedMatrix-project en waarom het de potentie heeft het internet voor altijd te veranderen."; -$a->strings["Thing updated"] = "Ding bijgewerkt"; -$a->strings["Object store: failed"] = "Opslaan van ding mislukt"; -$a->strings["Thing added"] = "Ding toegevoegd"; -$a->strings["OBJ: %1\$s %2\$s %3\$s"] = "OBJ: %1\$s %2\$s %3\$s"; -$a->strings["Show Thing"] = "Ding weergeven"; -$a->strings["item not found."] = "Item niet gevonden"; -$a->strings["Edit Thing"] = "Ding bewerken"; -$a->strings["Select a profile"] = "Kies een profiel"; -$a->strings["Post an activity"] = "Plaats een bericht"; -$a->strings["Only sends to viewers of the applicable profile"] = "Toont dit alleen aan diegene die het gekozen profiel mogen zien."; -$a->strings["Name of thing e.g. something"] = "Naam van ding"; -$a->strings["URL of thing (optional)"] = "URL van ding (optioneel)"; -$a->strings["URL for photo of thing (optional)"] = "URL van foto van ding (optioneel)"; -$a->strings["Add Thing to your Profile"] = "Ding aan je profiel toevoegen"; -$a->strings["Unable to find your hub."] = "Niet in staat om je hub te vinden"; -$a->strings["Post successful."] = "Verzenden bericht geslaagd."; -$a->strings["Help:"] = "Hulp:"; -$a->strings["Not Found"] = "Niet gevonden"; -$a->strings["No connections."] = "Geen connecties."; -$a->strings["Visit %s's profile [%s]"] = "Bezoek het profiel van %s [%s]"; -$a->strings["View Connnections"] = "Connecties weergeven"; -$a->strings["Invalid profile identifier."] = "Ongeldige profiel-identificator"; -$a->strings["Profile Visibility Editor"] = "Zichtbaarheid profiel "; -$a->strings["Click on a contact to add or remove."] = "Klik op een connectie om deze toe te voegen of te verwijderen"; -$a->strings["Visible To"] = "Zichtbaar voor"; -$a->strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Maximum toegestane dagelijkse registraties op deze RedMatrix-hub bereikt. Probeer het morgen (UTC) nogmaals."; -$a->strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Registratie mislukt. De gebruiksvoorwaarden dienen wel geaccepteerd te worden."; -$a->strings["Passwords do not match."] = "Wachtwoorden komen niet met elkaar overeen."; -$a->strings["Registration successful. Please check your email for validation instructions."] = "Registratie geslaagd. Controleer je e-mail voor instructies om je e-mail te bevestigen."; -$a->strings["Your registration is pending approval by the site owner."] = "Jouw accountregistratie wacht op goedkeuring van de beheerder van deze RedMatrix-hub."; -$a->strings["Your registration can not be processed."] = "Jouw registratie kan niet verwerkt worden."; -$a->strings["Registration on this site/hub is by approval only."] = "Registraties op deze RedMatrix-hub moeten eerst worden goedgekeurd."; -$a->strings["Register at another affiliated site/hub"] = "Registreer op een andere RedMatrix-hub"; -$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Deze RedMatrix-hub heeft het maximum aantal dagelijks toegestane registraties bereikt. Probeer het morgen (UTC) nogmaals."; -$a->strings["Terms of Service"] = "Gebruiksvoorwaarden"; -$a->strings["I accept the %s for this website"] = "Ik accepteer de %s van deze RedMatrix-hub"; -$a->strings["I am over 13 years of age and accept the %s for this website"] = "Ik accepteer de %s van deze RedMatrix-hub"; -$a->strings["Membership on this site is by invitation only."] = "Registreren op deze RedMatrix-hub kan alleen op uitnodiging."; -$a->strings["Please enter your invitation code"] = "Vul jouw uitnodigingscode in"; -$a->strings["Your email address"] = "Jouw e-mailadres"; -$a->strings["Choose a password"] = "Geef een wachtwoord op"; -$a->strings["Please re-enter your password"] = "Geef het wachtwoord opnieuw op"; -$a->strings["No such group"] = "Collectie niet gevonden"; -$a->strings["Search Results For:"] = "Zoekresultaten voor:"; -$a->strings["Collection is empty"] = "Collectie is leeg"; -$a->strings["Collection: "] = "Collectie: "; -$a->strings["Connection: "] = "Connectie: "; -$a->strings["Invalid connection."] = "Ongeldige connectie."; -$a->strings["No potential page delegates located."] = "Geen gevolmachtigde personen gevonden waaraan mogelijk het accountbeheer kan worden uitbesteed."; -$a->strings["Delegate Page Management"] = "Accountbeheer uitbesteden"; -$a->strings["Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely."] = "Gevolmachtigde personen zijn in staat om alle aspecten van dit account te beheren, behalve enkele basisinstellingen. Besteed het beheer van je persoonlijke account niet aan iemand uit die je niet volledig vertrouwd."; -$a->strings["Existing Page Managers"] = "Bestaande accountbeheerders"; -$a->strings["Existing Page Delegates"] = "Bestaande gevolmachtigde accountbeheerders"; -$a->strings["Potential Delegates"] = "Gevolmachtigde personen waaraan mogelijk het accountbeheer kan worden uitbesteed."; -$a->strings["Add"] = "Toevoegen"; -$a->strings["No entries."] = "Geen"; -$a->strings["Continue"] = "Ga verder"; -$a->strings["Premium Channel Setup"] = "Instellen premiumkanaal "; -$a->strings["Enable premium channel connection restrictions"] = "Restricties voor connecties van premiumkanaal toestaan"; -$a->strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = "Vul je restricties of voorwaarden in, zoals een paypal-afschrift, gebruikersvoorschriften, enz."; -$a->strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = "Dit kanaal kan extra stappen of het accepteren van de volgende voorwaarden vereisen, voordat de connectie wordt geaccepteerd:"; -$a->strings["Potential connections will then see the following text before proceeding:"] = "Mogelijke connecties zullen dan de volgende tekst zien voordat ze verder kunnen:"; -$a->strings["By continuing, I certify that I have complied with any instructions provided on this page."] = "Door verder te gaan ga ik automatisch akkoord met alle voorwaarden en aanwijzingen op deze pagina."; -$a->strings["(No specific instructions have been provided by the channel owner.)"] = "(Er zijn geen speciale voorwaarden en aanwijzingen door de kanaal-eigenaar verstrekt) "; -$a->strings["Restricted or Premium Channel"] = "Beperkt of premiumkanaal"; -$a->strings["Contact not found."] = "Contact niet gevonden"; -$a->strings["Friend suggestion sent."] = "Kanaalvoorstel verzonden."; -$a->strings["Suggest Friends"] = "Kanalen voorstellen"; -$a->strings["Suggest a friend for %s"] = "Stel een kanaal voor aan %s"; -$a->strings["You have created %1$.0f of %2$.0f allowed channels."] = "Je hebt %1$.0f van totaal %2$.0f toegestane kanalen aangemaakt."; -$a->strings["Create a new channel"] = "Nieuw kanaal aanmaken"; -$a->strings["Channel Manager"] = "Kanaalbeheerder"; -$a->strings["Current Channel"] = "Huidig kanaal"; -$a->strings["Attach to one of your channels by selecting it."] = "Gebruik een van jouw kanalen door op een te klikken."; -$a->strings["Default Channel"] = "Standaardkanaal"; -$a->strings["Make Default"] = "Als standaard instellen"; -$a->strings["Channel removals are not allowed within 48 hours of changing the account password."] = "Het verwijderen van een kanaal is niet toegestaan binnen 48 uur nadat het wachtwoord van het account is veranderd."; -$a->strings["Remove This Channel"] = "Verwijder dit kanaal"; -$a->strings["This will completely remove this channel from the network. Once this has been done it is not recoverable."] = "Dit zal dit kanaal compleet van deze hub en uit het RedMatrix-netwerk verwijderen. Dit kan hierna niet meer te ongedaan gemaakt worden."; -$a->strings["Please enter your password for verification:"] = "Vul je wachtwoord in voor verificatie:"; -$a->strings["Remove this channel and all its clones from the network"] = "Dit kanaal en alle klonen hiervan uit het RedMatrix-netwerk verwijderen"; -$a->strings["By default only the instance of the channel located on this hub will be removed from the network"] = "Standaard wordt alleen het kanaal dat zich op deze hub bevindt uit het RedMatrix-netwerk verwijderd."; -$a->strings["Remove Channel"] = "Kanaal verwijderen"; -$a->strings["Item not found"] = "Item niet gevonden"; -$a->strings["Item is not editable"] = "Item is niet te bewerken"; -$a->strings["Edit post"] = "Bericht bewerken"; -$a->strings["Delete item?"] = "Item verwijderen?"; -$a->strings["Insert YouTube video"] = "YouTube-video invoegen"; -$a->strings["Insert Vorbis [.ogg] video"] = "Vorbis-video [.ogg] invoegen"; -$a->strings["Insert Vorbis [.ogg] audio"] = "Vorbis-audio [.ogg] invoegen"; -$a->strings["Edit Webpage"] = "Webpagina bewerken"; -$a->strings["Delete webpage?"] = "Webpagina verwijderen?"; -$a->strings["Delete Webpage"] = "Webpagina verwijderen"; +$a->strings["[+] show all"] = "[+] alle"; +$a->strings["This is you"] = "Dit ben jij"; +$a->strings["Comment"] = "Reactie"; +$a->strings["Submit"] = "Opslaan"; +$a->strings["Bold"] = "Vet"; +$a->strings["Italic"] = "Cursief"; +$a->strings["Underline"] = "Onderstrepen"; +$a->strings["Quote"] = "Citeren"; +$a->strings["Code"] = "Broncode"; +$a->strings["Image"] = "Afbeelding"; +$a->strings["Link"] = "Link"; +$a->strings["Video"] = "Video"; +$a->strings["Delete this item?"] = "Dit item verwijderen?"; +$a->strings["[-] show less"] = "[-] minder reacties weergeven"; +$a->strings["[+] expand"] = "[+] uitklappen"; +$a->strings["[-] collapse"] = "[-] inklappen"; +$a->strings["Password too short"] = "Wachtwoord te kort"; +$a->strings["Passwords do not match"] = "Wachtwoorden komen niet overeen"; +$a->strings["everybody"] = "iedereen"; +$a->strings["Secret Passphrase"] = "Geheim wachtwoord"; +$a->strings["Passphrase hint"] = "Wachtwoordhint"; +$a->strings["Notice: Permissions have changed but have not yet been submitted."] = "Mededeling: de privacy-rechten zijn veranderd, maar zijn nog niet opgeslagen."; +$a->strings["close all"] = "Alles sluiten"; +$a->strings["timeago.prefixAgo"] = "timeago.prefixAgo"; +$a->strings["timeago.prefixFromNow"] = "timeago.prefixFromNow"; +$a->strings["ago"] = "geleden"; +$a->strings["from now"] = "vanaf nu"; +$a->strings["less than a minute"] = "minder dan een minuut"; +$a->strings["about a minute"] = "ongeveer een minuut"; +$a->strings["%d minutes"] = "%d minuten"; +$a->strings["about an hour"] = "ongeveer een uur"; +$a->strings["about %d hours"] = "ongeveer %d uren"; +$a->strings["a day"] = "een dag"; +$a->strings["%d days"] = "%d dagen"; +$a->strings["about a month"] = "ongeveer een maand"; +$a->strings["%d months"] = "%d maanden"; +$a->strings["about a year"] = "ongeveer een jaar"; +$a->strings["%d years"] = "%d jaren"; +$a->strings[" "] = " "; +$a->strings["timeago.numbers"] = "timeago.numbers"; +$a->strings["New window"] = "Nieuw venster"; +$a->strings["Open the selected location in a different window or browser tab"] = "Open de geselecteerde locatie in een ander venster of tab"; +$a->strings["Male"] = "Man"; +$a->strings["Female"] = "Vrouw"; +$a->strings["Currently Male"] = "Momenteel man"; +$a->strings["Currently Female"] = "Momenteel vrouw"; +$a->strings["Mostly Male"] = "Voornamelijk man"; +$a->strings["Mostly Female"] = "Voornamelijk vrouw"; +$a->strings["Transgender"] = "Transgender"; +$a->strings["Intersex"] = "Interseksueel"; +$a->strings["Transsexual"] = "Transseksueel"; +$a->strings["Hermaphrodite"] = "Hermafrodiet"; +$a->strings["Neuter"] = "Genderneutraal"; +$a->strings["Non-specific"] = "Niet gespecificeerd"; +$a->strings["Other"] = "Anders"; +$a->strings["Undecided"] = "Nog niet beslist"; +$a->strings["Males"] = "Mannen"; +$a->strings["Females"] = "Vrouwen"; +$a->strings["Gay"] = "Homoseksueel"; +$a->strings["Lesbian"] = "Lesbisch"; +$a->strings["No Preference"] = "Geen voorkeur"; +$a->strings["Bisexual"] = "Biseksueel"; +$a->strings["Autosexual"] = "Autoseksueel"; +$a->strings["Abstinent"] = "Seksuele onthouding"; +$a->strings["Virgin"] = "Maagd"; +$a->strings["Deviant"] = "Afwijkend"; +$a->strings["Fetish"] = "Fetisj"; +$a->strings["Oodles"] = "Veel"; +$a->strings["Nonsexual"] = "Aseksueel"; +$a->strings["Single"] = "Alleen"; +$a->strings["Lonely"] = "Eenzaam"; +$a->strings["Available"] = "Beschikbaar"; +$a->strings["Unavailable"] = "Niet beschikbaar"; +$a->strings["Has crush"] = "Heeft een oogje op iemand"; +$a->strings["Infatuated"] = "Smoorverliefd"; +$a->strings["Dating"] = "Aan het daten"; +$a->strings["Unfaithful"] = "Ontrouw"; +$a->strings["Sex Addict"] = "Seksverslaafd"; +$a->strings["Friends/Benefits"] = "Vriendschap plus"; +$a->strings["Casual"] = "Ongebonden/vluchtig"; +$a->strings["Engaged"] = "Verloofd"; +$a->strings["Married"] = "Getrouwd"; +$a->strings["Imaginarily married"] = "Denkbeeldig getrouwd"; +$a->strings["Partners"] = "Partners"; +$a->strings["Cohabiting"] = "Samenwonend"; +$a->strings["Common law"] = "Common-law-huwelijk"; +$a->strings["Happy"] = "Gelukkig"; +$a->strings["Not looking"] = "Niet op zoek"; +$a->strings["Swinger"] = "Swinger"; +$a->strings["Betrayed"] = "Verraden"; +$a->strings["Separated"] = "Uit elkaar"; +$a->strings["Unstable"] = "Onstabiel"; +$a->strings["Divorced"] = "Gescheiden"; +$a->strings["Imaginarily divorced"] = "Denkbeeldig gescheiden"; +$a->strings["Widowed"] = "Weduwnaar/weduwe"; +$a->strings["Uncertain"] = "Onzeker"; +$a->strings["It's complicated"] = "Het is ingewikkeld"; +$a->strings["Don't care"] = "Maakt mij niks uit"; +$a->strings["Ask me"] = "Vraag het me"; +$a->strings["Logged out."] = "Uitgelogd."; +$a->strings["Failed authentication"] = "Mislukte authenticatie"; +$a->strings["Login failed."] = "Inloggen mislukt."; +$a->strings["Can view my normal stream and posts"] = "Kan mijn normale kanaalstream en berichten bekijken"; +$a->strings["Can view my default channel profile"] = "Kan mijn standaard kanaalprofiel bekijken"; +$a->strings["Can view my photo albums"] = "Kan mijn fotoalbums bekijken"; +$a->strings["Can view my connections"] = "Kan een lijst met mijn connecties bekijken"; +$a->strings["Can view my file storage"] = "Kan mijn bestanden bekijken"; +$a->strings["Can view my webpages"] = "Kan mijn pagina's bekijken"; +$a->strings["Can send me their channel stream and posts"] = "Kan mij de inhoud van hun kanaal en berichten sturen"; +$a->strings["Can post on my channel page (\"wall\")"] = "Kan een bericht in mijn kanaal plaatsen"; +$a->strings["Can comment on or like my posts"] = "Kan op mijn berichten reageren of deze (niet) leuk vinden"; +$a->strings["Can send me private mail messages"] = "Kan mij privéberichten sturen"; +$a->strings["Can post photos to my photo albums"] = "Kan foto's aan mijn fotoalbums toevoegen"; +$a->strings["Can like/dislike stuff"] = "Kan dingen leuk of niet leuk vinden"; +$a->strings["Profiles and things other than posts/comments"] = "Profielen en dingen, buiten berichten en reacties"; +$a->strings["Can forward to all my channel contacts via post @mentions"] = "Kan naar al mijn kanaalconnecties berichten doorsturen met behulp van @vermeldingen+"; +$a->strings["Advanced - useful for creating group forum channels"] = "Geavanceerd - nuttig voor kanalen met een groep- cq. forumfunctie"; +$a->strings["Can chat with me (when available)"] = "Kan met mij chatten (wanneer beschikbaar)"; +$a->strings["Can write to my file storage"] = "Kan bestanden aan mijn bestandsopslag toevoegen"; +$a->strings["Can edit my webpages"] = "Kan mijn pagina's bewerken"; +$a->strings["Can source my public posts in derived channels"] = "Kan mijn openbare berichten als bron voor andere kanalen gebruiken"; +$a->strings["Somewhat advanced - very useful in open communities"] = "Enigszins geavanceerd (erg nuttig voor kanalen van forums/groepen)"; +$a->strings["Can administer my channel resources"] = "Kan mijn kanaal beheren"; +$a->strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Zeer geavanceerd. Laat dit met rust, behalve als je weet wat je doet."; +$a->strings["Set your current mood and tell your friends"] = "Noteer je huidige stemming en toon het aan je connecties"; +$a->strings["Menu not found."] = "Menu niet gevonden."; +$a->strings["Menu element updated."] = "Menu-onderdeel geüpdatet."; +$a->strings["Unable to update menu element."] = "Menu-onderdeel kan niet worden geüpdatet."; +$a->strings["Menu element added."] = "Menu-onderdeel toegevoegd"; +$a->strings["Unable to add menu element."] = "Menu-onderdeel kan niet worden toegevoegd."; +$a->strings["Not found."] = "Niet gevonden."; +$a->strings["Manage Menu Elements"] = "Menu-onderdelen beheren"; +$a->strings["Edit menu"] = "Menu bewerken"; +$a->strings["Edit element"] = "Onderdeel bewerken"; +$a->strings["Drop element"] = "Onderdeel verwijderen"; +$a->strings["New element"] = "Nieuw element"; +$a->strings["Edit this menu container"] = "Deze menu-container bewerken"; +$a->strings["Add menu element"] = "Menu-element toevoegen"; +$a->strings["Delete this menu item"] = "Dit menu-item verwijderen"; +$a->strings["Edit this menu item"] = "Dit menu-item bewerken"; +$a->strings["New Menu Element"] = "Nieuw menu-element"; +$a->strings["Menu Item Permissions"] = "Privacy-rechten menu-item"; +$a->strings["(click to open/close)"] = "(klik om te openen/sluiten)"; +$a->strings["Link text"] = "Linktekst"; +$a->strings["URL of link"] = "URL of link"; +$a->strings["Use Red magic-auth if available"] = "Gebruik Reds magische authenticatie wanneer aanwezig"; +$a->strings["Open link in new window"] = "Open link in nieuw venster"; +$a->strings["Order in list"] = "Volgorde in lijst"; +$a->strings["Higher numbers will sink to bottom of listing"] = "Hogere nummers komen onderaan de lijst terecht"; +$a->strings["Menu item not found."] = "Menu-item niet gevonden."; +$a->strings["Menu item deleted."] = "Menu-item verwijderd."; +$a->strings["Menu item could not be deleted."] = "Menu-item kon niet worden verwijderd."; +$a->strings["Edit Menu Element"] = "Menu-element bewerken"; +$a->strings["Modify"] = "Wijzigen"; +$a->strings["sent you a private message"] = "stuurde jou een privébericht"; +$a->strings["added your channel"] = "voegde jouw kanaal toe"; +$a->strings["posted an event"] = "plaatste een gebeurtenis"; +$a->strings["network"] = "netwerk"; +$a->strings["Name is required"] = "Naam is vereist"; +$a->strings["Key and Secret are required"] = "Key en secret zijn vereist"; +$a->strings["Passwords do not match. Password unchanged."] = "Wachtwoorden komen niet overeen. Wachtwoord onveranderd."; +$a->strings["Empty passwords are not allowed. Password unchanged."] = "Lege wachtwoorden zijn niet toegestaan. Wachtwoord onveranderd."; +$a->strings["Password changed."] = "Wachtwoord veranderd."; +$a->strings["Password update failed. Please try again."] = "Bijwerken wachtwoord mislukt. Probeer opnieuw."; +$a->strings["Not valid email."] = "Geen geldig e-mailadres."; +$a->strings["Protected email address. Cannot change to that email."] = "Beschermd e-mailadres. Kan dat e-mailadres niet gebruiken."; +$a->strings["System failure storing new email. Please try again."] = "Systeemfout opslaan van nieuwe e-mail. Probeer het nog een keer."; +$a->strings["Settings updated."] = "Instellingen bijgewerkt."; +$a->strings["Add application"] = "Applicatie toevoegen"; +$a->strings["Name of application"] = "Naam van applicatie"; +$a->strings["Consumer Key"] = "Consumer key"; +$a->strings["Automatically generated - change if desired. Max length 20"] = "Automatische gegenereerd - verander wanneer gewenst. Maximale lengte is 20"; +$a->strings["Consumer Secret"] = "Consumer secret"; +$a->strings["Redirect"] = "Redirect/doorverwijzing"; +$a->strings["Redirect URI - leave blank unless your application specifically requires this"] = "URI voor redirect - laat leeg, behalve wanneer de applicatie dit vereist"; +$a->strings["Icon url"] = "URL van pictogram"; +$a->strings["Optional"] = "Optioneel"; +$a->strings["You can't edit this application."] = "Je kan deze applicatie niet bewerken"; +$a->strings["Connected Apps"] = "Verbonden applicaties"; +$a->strings["Client key starts with"] = "Client key begint met"; +$a->strings["No name"] = "Geen naam"; +$a->strings["Remove authorization"] = "Autorisatie verwijderen"; +$a->strings["No feature settings configured"] = "Geen plugin-instellingen ingesteld"; +$a->strings["Feature Settings"] = "Plugin-instellingen"; +$a->strings["Account Settings"] = "Account-instellingen"; +$a->strings["Password Settings"] = "Wachtwoord-instellingen"; +$a->strings["New Password:"] = "Nieuw wachtwoord:"; +$a->strings["Confirm:"] = "Bevestigen:"; +$a->strings["Leave password fields blank unless changing"] = "Laat de wachtwoordvelden leeg, behalve wanneer je deze wil veranderen"; +$a->strings["Email Address:"] = "E-mailadres:"; +$a->strings["Remove Account"] = "Account verwijderen"; +$a->strings["Warning: This action is permanent and cannot be reversed."] = "Waarschuwing: Deze handeling is van permanente aard en kan niet meer worden teruggedraaid."; +$a->strings["Off"] = "Uit"; +$a->strings["On"] = "Aan"; +$a->strings["Additional Features"] = "Extra functies"; +$a->strings["Connector Settings"] = "Instellingen externe koppelingen"; +$a->strings["No special theme for mobile devices"] = "Geen speciaal thema voor mobiele apparaten"; +$a->strings["%s - (Experimental)"] = "%s - (experimenteel)"; +$a->strings["Display Settings"] = "Weergave-instellingen"; +$a->strings["Display Theme:"] = "Gebruik thema:"; +$a->strings["Mobile Theme:"] = "Mobiel thema:"; +$a->strings["Enable user zoom on mobile devices"] = "Inzoomen op smartphones en tablets toestaan"; +$a->strings["Update browser every xx seconds"] = "Ververs de webbrowser om de zoveel seconde"; +$a->strings["Minimum of 10 seconds, no maximum"] = "Minimaal 10 seconde, geen maximum"; +$a->strings["Maximum number of conversations to load at any time:"] = "Maximaal aantal conversaties die per keer geladen worden:"; +$a->strings["Maximum of 100 items"] = "Maximaal 100 conversaties"; +$a->strings["Don't show emoticons"] = "Geen emoticons weergeven"; +$a->strings["System Page Layout Editor - (advanced)"] = "Lay-out bewerken van systeempagina's (geavanceerd)"; +$a->strings["Nobody except yourself"] = "Niemand, behalve jezelf"; +$a->strings["Only those you specifically allow"] = "Alleen connecties met uitdrukkelijke toestemming"; +$a->strings["Approved connections"] = "Geaccepteerde connecties"; +$a->strings["Any connections"] = "Alle connecties"; +$a->strings["Anybody on this website"] = "Iedereen op deze hub"; +$a->strings["Anybody in this network"] = "Iedereen in dit netwerk"; +$a->strings["Anybody authenticated"] = "Geauthenticeerd"; +$a->strings["Anybody on the internet"] = "Iedereen op het internet"; +$a->strings["Publish your default profile in the network directory"] = "Publiceer je standaardprofiel in de kanalengids"; +$a->strings["No"] = "Nee"; +$a->strings["Yes"] = "Ja"; +$a->strings["Allow us to suggest you as a potential friend to new members?"] = "Sta ons toe om jouw kanaal als mogelijke connectie voor te stellen aan nieuwe kanalen"; +$a->strings["or"] = "of"; +$a->strings["Your channel address is"] = "Jouw kanaaladres is"; +$a->strings["Channel Settings"] = "Kanaal-instellingen"; +$a->strings["Basic Settings"] = "Basis-instellingen"; +$a->strings["Your Timezone:"] = "Jouw tijdzone:"; +$a->strings["Default Post Location:"] = "Standaardlocatie bericht:"; +$a->strings["Geographical location to display on your posts"] = "Geografische locatie die bij het bericht moet worden vermeld"; +$a->strings["Use Browser Location:"] = "Locatie van webbrowser gebruiken:"; +$a->strings["Adult Content"] = "Inhoud voor volwassenen"; +$a->strings["This channel frequently or regularly publishes adult content. (Please tag any adult material and/or nudity with #NSFW)"] = "Dit kanaal publiceert regelmatig of vaak materiaal dat alleen geschikt is voor volwassen. (Gebruik de hashtag #NSFW in berichten met een seksueel getinte inhoud of ander voor minderjarigen ongeschikt materiaal)"; +$a->strings["Security and Privacy Settings"] = "Veiligheids- privacy-instellingen"; +$a->strings["Hide my online presence"] = "Verberg mijn aanwezigheid"; +$a->strings["Prevents displaying in your profile that you are online"] = "Voorkomt dat op je kanaal te zien valt dat je momenteel op de RedMatrix aanwezig bent"; +$a->strings["Simple Privacy Settings:"] = "Eenvoudige privacy-instellingen:"; +$a->strings["Very Public - extremely permissive (should be used with caution)"] = "Zeer openbaar (kanaal staat volledig open - moet met grote zorgvuldigheid gebruikt worden)"; +$a->strings["Typical - default public, privacy when desired (similar to social network permissions but with improved privacy)"] = "Normaal (standaard openbaar, maar privacy wanneer noodzakelijk - vergelijkbaar met die van sociale netwerken, maar met verbeterde privacy)"; +$a->strings["Private - default private, never open or public"] = "Privé (standaard privé en nooit openbaar)"; +$a->strings["Blocked - default blocked to/from everybody"] = "Geblokkeerd (standaard geblokkeerd naar/van iedereen)"; +$a->strings["Allow others to tag your posts"] = "Anderen toestaan om je berichten te labelen"; +$a->strings["Often used by the community to retro-actively flag inappropriate content"] = "Vaak in groepen/forums gebruikt om met terugwerkende kracht ongepast materiaal te markeren"; +$a->strings["Advanced Privacy Settings"] = "Geavanceerde privacy-instellingen"; +$a->strings["Expire other channel content after this many days"] = "Inhoud van andere kanalen na zoveel aantal dagen laten verlopen:"; +$a->strings["0 or blank prevents expiration"] = "0 of leeg voorkomt het verlopen"; +$a->strings["Maximum Friend Requests/Day:"] = "Maximum aantal connectieverzoeken per dag:"; +$a->strings["May reduce spam activity"] = "Kan eventuele spam verminderen"; +$a->strings["Default Post Permissions"] = "Standaard privacy-rechten voor nieuwe berichten"; +$a->strings["Maximum private messages per day from unknown people:"] = "Maximum aantal privé-berichten per dag van onbekende personen:"; +$a->strings["Useful to reduce spamming"] = "Kan eventuele spam verminderen"; +$a->strings["Notification Settings"] = "Notificatie-instellingen"; +$a->strings["By default post a status message when:"] = "Plaats automatisch een statusbericht wanneer:"; +$a->strings["accepting a friend request"] = "Een connectieverzoek wordt geaccepteerd"; +$a->strings["joining a forum/community"] = "Je lid wordt van een groep/forum"; +$a->strings["making an interesting profile change"] = "Er sprake is van een interessante profielwijziging"; +$a->strings["Send a notification email when:"] = "Verzend een notificatie per e-mail wanneer:"; +$a->strings["You receive a connection request"] = "Je een connectieverzoek ontvangt"; +$a->strings["Your connections are confirmed"] = "Jouw connecties zijn bevestigd"; +$a->strings["Someone writes on your profile wall"] = "Iemand iets op jouw kanaal heeft geschreven"; +$a->strings["Someone writes a followup comment"] = "Iemand een reactie schrijft"; +$a->strings["You receive a private message"] = "Je een privé-bericht ontvangt"; +$a->strings["You receive a friend suggestion"] = "Je een kanaalvoorstel ontvangt"; +$a->strings["You are tagged in a post"] = "Je expliciet in een bericht bent genoemd"; +$a->strings["You are poked/prodded/etc. in a post"] = "Je bent in een bericht aangestoten/gepord/etc."; +$a->strings["Advanced Account/Page Type Settings"] = "Instellingen geavanceerd account/paginatype"; +$a->strings["Change the behaviour of this account for special situations"] = "Verander het gedrag van dit account voor speciale situaties"; +$a->strings["Please enable expert mode (in Settings > Additional features) to adjust!"] = "Schakel de expertmodus in (in Instellingen > Extra functies) om aan te kunnen passen!"; +$a->strings["Miscellaneous Settings"] = "Diverse instellingen"; +$a->strings["Personal menu to display in your channel pages"] = "Persoonlijk menu om op je kanaalpagina's weer te geven"; +$a->strings["Remove this channel"] = "Verwijder dit kanaal"; $a->strings["Poke/Prod"] = "Aanstoten/porren"; $a->strings["poke, prod or do other things to somebody"] = "aanstoten, porren of andere dingen met iemand doen"; $a->strings["Recipient"] = "Ontvanger"; $a->strings["Choose what you wish to do to recipient"] = "Kies wat je met de ontvanger wil doen"; $a->strings["Make this post private"] = "Maak dit bericht privé"; -$a->strings["Block Name"] = "Bloknaam"; -$a->strings["Collection created."] = "Collectie aangemaakt"; -$a->strings["Could not create collection."] = "Collectie kon niet aangemaakt worden"; -$a->strings["Collection updated."] = "Collectie bijgewerkt."; -$a->strings["Create a collection of channels."] = "Kanaalcollectie aanmaken"; -$a->strings["Collection Name: "] = "Naam collectie:"; -$a->strings["Members are visible to other channels"] = "Kanalen in deze collectie zijn zichtbaar voor andere kanalen"; -$a->strings["Collection removed."] = "Collectie verwijderd"; -$a->strings["Unable to remove collection."] = "Verwijderen collectie mislukt"; -$a->strings["Collection Editor"] = "Collectiebewerker"; -$a->strings["Members"] = "Kanalen"; -$a->strings["All Connected Channels"] = "Alle kanaalconnecties"; -$a->strings["Click on a channel to add or remove."] = "Klik op een kanaal om deze toe te voegen of te verwijderen."; -$a->strings["Tag removed"] = "Label verwijderd"; -$a->strings["Remove Item Tag"] = "Verwijder itemlabel"; -$a->strings["Select a tag to remove: "] = "Kies een label om te verwijderen"; +$a->strings["Authorize application connection"] = "Geef toestemming voor applicatiekoppeling"; +$a->strings["Return to your app and insert this Securty Code:"] = "Ga terug naar je app en voeg deze beveiligingscode in:"; +$a->strings["Please login to continue."] = "Inloggen om verder te kunnen gaan."; +$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Wil je deze applicatie toestemming geven om jouw berichten en connecties te zien, en/of nieuwe berichten voor jou te plaatsen?"; +$a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "Authenticatie op afstand geblokkeerd. Je bent lokaal op deze hub ingelogd. Uitloggen en opnieuw proberen."; +$a->strings["Welcome %s. Remote authentication successful."] = "Welkom %s. Authenticatie op afstand geslaagd."; $a->strings["Item not available."] = "Item is niet aanwezig."; -$a->strings["Unable to locate original post."] = "Niet in staat om de originele locatie van het bericht te vinden. "; -$a->strings["Empty post discarded."] = "Leeg bericht geannuleerd"; -$a->strings["Executable content type not permitted to this channel."] = "Uitvoerbare bestanden zijn niet toegestaan op dit kanaal."; -$a->strings["System error. Post not saved."] = "Systeemfout. Bericht niet opgeslagen."; -$a->strings["You have reached your limit of %1$.0f top level posts."] = "Je hebt jouw limiet van %1$.0f berichten bereikt."; -$a->strings["You have reached your limit of %1$.0f webpages."] = "Je hebt jouw limiet van %1$.0f webpagina's bereikt."; -$a->strings["Red Matrix - Guests: Username: {your email address}, Password: +++"] = "RedMatrix - gasten: Gebruikersnaam: {jouw e-mailadres}, wachtwoord: +++"; -$a->strings["Away"] = "Afwezig"; -$a->strings["Online"] = "Online"; -$a->strings["Finding:"] = "Gezocht naar:"; -$a->strings["No entries (some entries may be hidden)."] = "Niets gevonden (sommige kanalen kunnen verborgen zijn)."; -$a->strings["Profile Match"] = "Profielovereenkomst"; -$a->strings["No keywords to match. Please add keywords to your default profile."] = "Je hebt geen trefwoorden waarmee overeenkomsten gevonden kunnen worden. Voeg enkele trefwoorden aan je standaardprofiel toe."; -$a->strings["is interested in:"] = "is geïnteresseerd in:"; -$a->strings["No matches"] = "Geen overeenkomsten"; -$a->strings["This site is not a directory server"] = "Deze hub is geen kanalengidshub (directoryserver)"; -$a->strings["Version %s"] = "Versie %s"; -$a->strings["Installed plugins/addons/apps:"] = "Ingeschakelde plug-ins/add-ons/apps:"; -$a->strings["No installed plugins/addons/apps"] = "Geen ingeschakelde plug-ins/add-ons/apps"; -$a->strings["Red"] = "Red"; -$a->strings["This is a hub of the Red Matrix - a global cooperative network of decentralized privacy enhanced websites."] = "Dit is een hub van de RedMatrix - een wereldwijd coöperatief netwerk van gedecentraliseerde websites met verbeterde privacy."; -$a->strings["Running at web location"] = "Draaiend op weblocatie"; -$a->strings["Please visit GetZot.com to learn more about the Red Matrix."] = "Bezoek RedMatrix.me om meer te leren over de RedMatrix."; -$a->strings["Bug reports and issues: please visit"] = "Bugrapporten en andere kwesties: bezoek"; -$a->strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "Voorstellen, lofbetuigingen, enz. - e-mail \"redmatrix\" at librelist - dot com"; -$a->strings["Site Administrators"] = "Hubbeheerders"; -$a->strings["App installed."] = "App geïnstalleerd"; -$a->strings["Malformed app."] = "Misvormde app."; -$a->strings["Embed code"] = "Insluitcode"; -$a->strings["Edit App"] = "App bewerken"; -$a->strings["Create App"] = "App maken"; -$a->strings["Name of app"] = "Naam van app"; -$a->strings["Required"] = "Vereist"; -$a->strings["Location (URL) of app"] = "Locatie (URL) van app"; -$a->strings["Photo icon URL"] = "URL van pictogram"; -$a->strings["80 x 80 pixels - optional"] = "80 x 80 pixels (optioneel)"; -$a->strings["Version ID"] = "Versie-ID"; -$a->strings["Price of app"] = "Prijs van de app"; -$a->strings["Location (URL) to purchase app"] = "Locatie (URL) om de app aan te schaffen"; -$a->strings["Failed to create source. No channel selected."] = "Aanmaken bron mislukt. Geen kanaal geselecteerd."; -$a->strings["Source created."] = "Bron aangemaakt."; -$a->strings["Source updated."] = "Bron aangemaakt."; -$a->strings["*"] = "*"; -$a->strings["Manage remote sources of content for your channel."] = "Beheer externe bronnen met inhoud voor jouw kanaal"; -$a->strings["New Source"] = "Nieuwe bron"; -$a->strings["Import all or selected content from the following channel into this channel and distribute it according to your channel settings."] = "Importeer complete of gedeelde inhoud vanuit het volgende kanaal naar dit kanaal, en verdeel het vervolgens volgens jouw kanaalinstellingen."; -$a->strings["Only import content with these words (one per line)"] = "Importeer alleen inhoud met deze woorden (één per regel)"; -$a->strings["Leave blank to import all public content"] = "Laat leeg om alle openbare inhoud te importeren"; -$a->strings["Source not found."] = "Bron niet gevonden"; -$a->strings["Edit Source"] = "Bron bewerken"; -$a->strings["Delete Source"] = "Bron verwijderen"; -$a->strings["Source removed"] = "Bron verwijderd"; -$a->strings["Unable to remove source."] = "Verwijderen bron mislukt."; -$a->strings["Public Sites"] = "Openbare hubs"; -$a->strings["The listed sites allow public registration into the Red Matrix. All sites in the matrix are interlinked so membership on any of them conveys membership in the matrix as a whole. Some sites may require subscription or provide tiered service plans. The provider links may provide additional details."] = "Op de hier weergegeven hubs kan iedereen zich voor de RedMatrix aanmelden. Alle hubs in de Matrix zijn met elkaar verbonden, dus maakt het qua lidmaatschap niet uit waar je je aanmeldt. Op sommige hubs heb je eerst goedkeuring nodig en sommige hubs vereisen betaalde abonnementen voor uitbreidingen. Mogelijk wordt hierover op de hub zelf meer informatie gegeven."; -$a->strings["Site URL"] = "URL hub"; -$a->strings["Access Type"] = "Toegangstype"; -$a->strings["Registration Policy"] = "Registratiebeleid"; -$a->strings["Location"] = "Locatie"; -$a->strings["Nothing to import."] = "Niets gevonden om te importeren"; -$a->strings["Unable to download data from old server"] = "Niet in staat om gegevens van de oude hub te downloaden"; -$a->strings["Imported file is empty."] = "Geïmporteerde bestand is leeg"; -$a->strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "Kan geen dubbele kanaal-identificator op deze hub aanmaken. Importeren mislukt."; -$a->strings["Channel clone failed. Import failed."] = "Het klonen van het kanaal is mislukt. Importeren mislukt."; -$a->strings["Cloned channel not found. Import failed."] = "Gekloond kanaal niet gevonden. Importeren mislukt."; -$a->strings["Import completed."] = "Import voltooid."; -$a->strings["You must be logged in to use this feature."] = "Je moet ingelogd zijn om dit onderdeel te kunnen gebruiken."; -$a->strings["Import Channel"] = "Kanaal importeren"; -$a->strings["Use this form to import an existing channel from a different server/hub. You may retrieve the channel identity from the old server/hub via the network or provide an export file. Only identity and connections/relationships will be imported. Importation of content is not yet available."] = "Gebruik dit formulier om een bestaand kanaal te importeren van een andere hub. Je kan de kanaal-identiteit van de oude hub via het netwerk ontvangen of een exportbestand verstrekken. Alleen de identiteit en de connecties zullen geïmporteerd worden. Het importeren van inhoud is nog niet beschikbaar."; -$a->strings["File to Upload"] = "Bestand om te uploaden"; -$a->strings["Or provide the old server/hub details"] = "Of vul de gegevens van de oude hub in"; -$a->strings["Your old identity address (xyz@example.com)"] = "Jouw oude kanaaladres (xyz@example.com)"; -$a->strings["Your old login email address"] = "Het e-mailadres van je oude account"; -$a->strings["Your old login password"] = "Wachtwoord van jouw oude account"; -$a->strings["For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media."] = "Voor elke optie geldt dat je moet kiezen of je jouw primaire kanaaladres op deze hub wil instellen of dat jouw oude hub deze rol blijft vervullen."; -$a->strings["Make this hub my primary location"] = "Stel deze hub als mijn primaire locatie in"; -$a->strings["invalid target signature"] = "ongeldig doel-kenmerk (target signature)"; -$a->strings["Unable to lookup recipient."] = "Niet in staat om ontvanger op te zoeken."; -$a->strings["Unable to communicate with requested channel."] = "Niet in staat om met het aangevraagde kanaal te communiceren."; -$a->strings["Cannot verify requested channel."] = "Kan opgevraagd kanaal niet verifieren"; -$a->strings["Selected channel has private message restrictions. Send failed."] = "Gekozen kanaal heeft restricties voor privéberichten. Verzenden mislukt."; -$a->strings["Message deleted."] = "Bericht verwijderd."; -$a->strings["Message recalled."] = "Bericht ingetrokken."; -$a->strings["Send Private Message"] = "Privébericht versturen"; -$a->strings["To:"] = "Aan:"; -$a->strings["Subject:"] = "Onderwerp:"; -$a->strings["Send"] = "Verzenden"; -$a->strings["Message not found."] = "Bericht niet gevonden"; -$a->strings["Recall message"] = "Bericht intrekken"; -$a->strings["Message has been recalled."] = "Bericht is ingetrokken."; -$a->strings["Private Conversation"] = "Privéconversatie"; -$a->strings["Delete conversation"] = "Verwijder conversatie"; -$a->strings["No secure communications available. You may be able to respond from the sender's profile page."] = "Geen veilige communicatie beschikbaar. Mogelijk kan je reageren op de kanaalpagina van de afzender."; -$a->strings["Send Reply"] = "Antwoord versturen"; -$a->strings["You must be logged in to see this page."] = "Je moet zijn ingelogd om deze pagina te kunnen bekijken."; -$a->strings["Insufficient permissions. Request redirected to profile page."] = "Onvoldoende privacy-rechten. Doorgestuurd naar profielpagina."; +$a->strings["Fetching URL returns error: %1\$s"] = "Ophalen URL gaf een foutmelding terug: %1\$s"; +$a->strings["Invalid item."] = "Ongeldig item."; +$a->strings["Channel not found."] = "Kanaal niet gevonden."; +$a->strings["Page not found."] = "Pagina niet gevonden."; +$a->strings["Image uploaded but image cropping failed."] = "Afbeelding geüpload, maar afbeelding kon niet worden bijgesneden. "; +$a->strings["Image resize failed."] = "Afbeelding kon niet van grootte veranderd worden."; +$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Vernieuw de pagina met shift+R of shift+F5, of leeg je browserbuffer, wanneer de nieuwe foto niet meteen wordt weergegeven."; +$a->strings["Image exceeds size limit of %d"] = "Afbeeldingsgrootte overschrijdt het limiet van %d"; +$a->strings["Unable to process image."] = "Niet in staat om afbeelding te verwerken."; +$a->strings["Photo not available."] = "Foto niet beschikbaar."; +$a->strings["Upload File:"] = "Bestand uploaden:"; +$a->strings["Select a profile:"] = "Kies een profiel:"; +$a->strings["Upload Profile Photo"] = "Profielfoto uploaden"; +$a->strings["skip this step"] = "sla deze stap over"; +$a->strings["select a photo from your photo albums"] = "Kies een foto uit jouw fotoalbums"; +$a->strings["Crop Image"] = "Afbeelding bijsnijden"; +$a->strings["Please adjust the image cropping for optimum viewing."] = "Snij de afbeelding zo uit dat deze optimaal wordt weergegeven."; +$a->strings["Done Editing"] = "Klaar met bewerken"; +$a->strings["Image uploaded successfully."] = "Uploaden afbeelding geslaagd"; +$a->strings["Image upload failed."] = "Uploaden afbeelding mislukt"; +$a->strings["Image size reduction [%s] failed."] = "Verkleinen [%s] van afbeelding mislukt."; +$a->strings["Block Name"] = "Bloknaam"; $a->strings["Profile not found."] = "Profiel niet gevonden."; $a->strings["Profile deleted."] = "Profiel verwijderd."; $a->strings["Profile-"] = "Profiel-"; @@ -1717,6 +1034,8 @@ $a->strings["Gender"] = "Geslacht"; $a->strings["Sexual Preference"] = "Seksuele voorkeur"; $a->strings["Homepage"] = "Homepage"; $a->strings["Interests"] = "Interesses"; +$a->strings["Address"] = "Kanaaladres"; +$a->strings["Location"] = "Locatie"; $a->strings["Profile updated."] = "Profiel bijgewerkt"; $a->strings["Hide your contact/friend list from viewers of this profile?"] = "Laat de lijst met connecties niet aan bezoekers van dit profiel zien."; $a->strings["Edit Profile Details"] = "Profiel bewerken"; @@ -1758,15 +1077,621 @@ $a->strings["Love/romance"] = "Liefde/romantiek"; $a->strings["Work/employment"] = "Werk/arbeid"; $a->strings["School/education"] = "School/onderwijs"; $a->strings["This is your default profile."] = "Dit is jouw standaardprofiel"; +$a->strings["Age: "] = "Leeftijd:"; $a->strings["Edit/Manage Profiles"] = "Profielen bewerken/beheren"; $a->strings["Add profile things"] = "Dingen aan je profiel toevoegen"; $a->strings["Include desirable objects in your profile"] = "Voeg door jou gewenste dingen aan jouw profiel toe"; $a->strings["Bookmark added"] = "Bladwijzer toegevoegd"; $a->strings["My Bookmarks"] = "Mijn bladwijzers"; $a->strings["My Connections Bookmarks"] = "Bladwijzers van mijn connecties"; +$a->strings["Invalid profile identifier."] = "Ongeldige profiel-identificator"; +$a->strings["Profile Visibility Editor"] = "Zichtbaarheid profiel "; +$a->strings["Click on a contact to add or remove."] = "Klik op een connectie om deze toe te voegen of te verwijderen"; +$a->strings["Visible To"] = "Zichtbaar voor"; +$a->strings["All Connections"] = "Alle connecties"; +$a->strings["Public Sites"] = "Openbare hubs"; +$a->strings["The listed sites allow public registration into the Red Matrix. All sites in the matrix are interlinked so membership on any of them conveys membership in the matrix as a whole. Some sites may require subscription or provide tiered service plans. The provider links may provide additional details."] = "Op de hier weergegeven hubs kan iedereen zich voor de RedMatrix aanmelden. Alle hubs in de Matrix zijn met elkaar verbonden, dus maakt het qua lidmaatschap niet uit waar je je aanmeldt. Op sommige hubs heb je eerst goedkeuring nodig en sommige hubs vereisen betaalde abonnementen voor uitbreidingen. Mogelijk wordt hierover op de hub zelf meer informatie gegeven."; +$a->strings["Site URL"] = "URL hub"; +$a->strings["Access Type"] = "Toegangstype"; +$a->strings["Registration Policy"] = "Registratiebeleid"; +$a->strings["You must be logged in to see this page."] = "Je moet zijn ingelogd om deze pagina te kunnen bekijken."; +$a->strings["Insufficient permissions. Request redirected to profile page."] = "Onvoldoende privacy-rechten. Doorgestuurd naar profielpagina."; +$a->strings["Select a bookmark folder"] = "Kies een bladwijzermap"; +$a->strings["Save Bookmark"] = "Bladwijzer opslaan"; +$a->strings["URL of bookmark"] = "URL van bladwijzer"; +$a->strings["Description"] = "Omschrijving"; +$a->strings["Or enter new bookmark folder name"] = "Of geef de naam op van een nieuwe bladwijzermap"; +$a->strings["Room not found"] = "Chatkanaal niet gevonden"; +$a->strings["Leave Room"] = "Chatkanaal verlaten"; +$a->strings["Delete This Room"] = "Chatkanaal verwijderen"; +$a->strings["I am away right now"] = "Ik ben momenteel afwezig"; +$a->strings["I am online"] = "Ik ben online"; +$a->strings["Bookmark this room"] = "Chatkanaal aan bladwijzers toevoegen"; +$a->strings["New Chatroom"] = "Nieuw chatkanaal"; +$a->strings["Chatroom Name"] = "Naam chatkanaal"; +$a->strings["%1\$s's Chatrooms"] = "Chatkanalen van %1\$s"; +$a->strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Maximum toegestane dagelijkse registraties op deze RedMatrix-hub bereikt. Probeer het morgen (UTC) nogmaals."; +$a->strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Registratie mislukt. De gebruiksvoorwaarden dienen wel geaccepteerd te worden."; +$a->strings["Passwords do not match."] = "Wachtwoorden komen niet met elkaar overeen."; +$a->strings["Registration successful. Please check your email for validation instructions."] = "Registratie geslaagd. Controleer je e-mail voor instructies om je e-mail te bevestigen."; +$a->strings["Your registration is pending approval by the site owner."] = "Jouw accountregistratie wacht op goedkeuring van de beheerder van deze RedMatrix-hub."; +$a->strings["Your registration can not be processed."] = "Jouw registratie kan niet verwerkt worden."; +$a->strings["Registration on this site/hub is by approval only."] = "Registraties op deze RedMatrix-hub moeten eerst worden goedgekeurd."; +$a->strings["Register at another affiliated site/hub"] = "Registreer op een andere RedMatrix-hub"; +$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Deze RedMatrix-hub heeft het maximum aantal dagelijks toegestane registraties bereikt. Probeer het morgen (UTC) nogmaals."; +$a->strings["Terms of Service"] = "Gebruiksvoorwaarden"; +$a->strings["I accept the %s for this website"] = "Ik accepteer de %s van deze RedMatrix-hub"; +$a->strings["I am over 13 years of age and accept the %s for this website"] = "Ik accepteer de %s van deze RedMatrix-hub"; +$a->strings["Registration"] = "Registratie"; +$a->strings["Membership on this site is by invitation only."] = "Registreren op deze RedMatrix-hub kan alleen op uitnodiging."; +$a->strings["Please enter your invitation code"] = "Vul jouw uitnodigingscode in"; +$a->strings["Your email address"] = "Jouw e-mailadres"; +$a->strings["Choose a password"] = "Geef een wachtwoord op"; +$a->strings["Please re-enter your password"] = "Geef het wachtwoord opnieuw op"; +$a->strings["Away"] = "Afwezig"; +$a->strings["Online"] = "Online"; +$a->strings["Please login."] = "Inloggen."; +$a->strings["Red Matrix - Guests: Username: {your email address}, Password: +++"] = "RedMatrix - gasten: Gebruikersnaam: {jouw e-mailadres}, wachtwoord: +++"; +$a->strings["Channel removals are not allowed within 48 hours of changing the account password."] = "Het verwijderen van een kanaal is niet toegestaan binnen 48 uur nadat het wachtwoord van het account is veranderd."; +$a->strings["Remove This Channel"] = "Verwijder dit kanaal"; +$a->strings["This will completely remove this channel from the network. Once this has been done it is not recoverable."] = "Dit zal dit kanaal compleet van deze hub en uit het RedMatrix-netwerk verwijderen. Dit kan hierna niet meer te ongedaan gemaakt worden."; +$a->strings["Please enter your password for verification:"] = "Vul je wachtwoord in ter verificatie:"; +$a->strings["Remove this channel and all its clones from the network"] = "Dit kanaal en alle klonen hiervan uit het RedMatrix-netwerk verwijderen"; +$a->strings["By default only the instance of the channel located on this hub will be removed from the network"] = "Standaard wordt alleen het kanaal dat zich op deze hub bevindt uit het RedMatrix-netwerk verwijderd."; +$a->strings["Remove Channel"] = "Kanaal verwijderen"; $a->strings["No channel."] = "Geen kanaal."; $a->strings["Common connections"] = "Veel voorkomende connecties"; $a->strings["No connections in common."] = "Geen gemeenschappelijke connecties."; +$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "We hebben een probleem ontdekt tijdens het inloggen met de OpenID die je hebt verstrekt. Controleer de ID op typefouten."; +$a->strings["The error message was:"] = "Het foutbericht was:"; +$a->strings["Authentication failed."] = "Authenticatie mislukt."; +$a->strings["Remote Authentication"] = "Authenticatie op afstand"; +$a->strings["Enter your channel address (e.g. channel@example.com)"] = "Vul jouw kanaaladres in (bijv. channel@example.com)"; +$a->strings["Authenticate"] = "Authenticeren"; +$a->strings["Continue"] = "Ga verder"; +$a->strings["Premium Channel Setup"] = "Instellen premiumkanaal "; +$a->strings["Enable premium channel connection restrictions"] = "Restricties voor connecties van premiumkanaal toestaan"; +$a->strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = "Vul je restricties of voorwaarden in, zoals een paypal-afschrift, gebruikersvoorschriften, enz."; +$a->strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = "Dit kanaal kan extra stappen of het accepteren van de volgende voorwaarden vereisen, voordat de connectie wordt geaccepteerd:"; +$a->strings["Potential connections will then see the following text before proceeding:"] = "Mogelijke connecties zullen dan de volgende tekst zien voordat ze verder kunnen:"; +$a->strings["By continuing, I certify that I have complied with any instructions provided on this page."] = "Door verder te gaan ga ik automatisch akkoord met alle voorwaarden en aanwijzingen op deze pagina."; +$a->strings["(No specific instructions have been provided by the channel owner.)"] = "(Er zijn geen speciale voorwaarden en aanwijzingen door de kanaal-eigenaar verstrekt) "; +$a->strings["Restricted or Premium Channel"] = "Beperkt of premiumkanaal"; +$a->strings["No such group"] = "Collectie niet gevonden"; +$a->strings["Search Results For:"] = "Zoekresultaten voor:"; +$a->strings["Collection is empty"] = "Collectie is leeg"; +$a->strings["Collection: "] = "Collectie: "; +$a->strings["Connection: "] = "Connectie: "; +$a->strings["Invalid connection."] = "Ongeldige connectie."; +$a->strings["Could not access contact record."] = "Kon geen toegang krijgen tot de connectie-gegevens."; +$a->strings["Could not locate selected profile."] = "Kon het gekozen profiel niet vinden."; +$a->strings["Connection updated."] = "Connectie bijgewerkt."; +$a->strings["Failed to update connection record."] = "Bijwerken van connectie-gegevens mislukt."; +$a->strings["Blocked"] = "Geblokkeerd"; +$a->strings["Ignored"] = "Genegeerd"; +$a->strings["Hidden"] = "Verborgen"; +$a->strings["Archived"] = "Gearchiveerd"; +$a->strings["All"] = "Alles"; +$a->strings["Suggest new connections"] = "Nieuwe kanalen voorstellen"; +$a->strings["New Connections"] = "Nieuwe connecties"; +$a->strings["Show pending (new) connections"] = "Nog te accepteren (nieuwe) connecties weergeven"; +$a->strings["Show all connections"] = "Toon alle connecties"; +$a->strings["Unblocked"] = "Niet geblokkeerd"; +$a->strings["Only show unblocked connections"] = "Toon alleen niet geblokkeerde connecties"; +$a->strings["Only show blocked connections"] = "Toon alleen geblokkeerde connecties"; +$a->strings["Only show ignored connections"] = "Toon alleen genegeerde connecties"; +$a->strings["Only show archived connections"] = "Toon alleen gearchiveerde connecties"; +$a->strings["Only show hidden connections"] = "Toon alleen verborgen connecties"; +$a->strings["%1\$s [%2\$s]"] = "%1\$s [%2\$s]"; +$a->strings["Edit contact"] = "Connectie bewerken"; +$a->strings["Search your connections"] = "Doorzoek jouw connecties"; +$a->strings["Finding: "] = "Zoeken naar: "; +$a->strings["Edit post"] = "Bericht bewerken"; +$a->strings["is now connected to"] = "is nu verbonden met"; +$a->strings["Could not access address book record."] = "Kon geen toegang krijgen tot de record van de connectie."; +$a->strings["Refresh failed - channel is currently unavailable."] = "Vernieuwen mislukt - kanaal is momenteel niet beschikbaar"; +$a->strings["Channel has been unblocked"] = "Kanaal is gedeblokkeerd"; +$a->strings["Channel has been blocked"] = "Kanaal is geblokkeerd"; +$a->strings["Unable to set address book parameters."] = "Niet in staat om de parameters van connecties in te stellen."; +$a->strings["Channel has been unignored"] = "Kanaal wordt niet meer genegeerd"; +$a->strings["Channel has been ignored"] = "Kanaal wordt genegeerd"; +$a->strings["Channel has been unarchived"] = "Kanaal is niet meer gearchiveerd"; +$a->strings["Channel has been archived"] = "Kanaal is gearchiveerd"; +$a->strings["Channel has been unhidden"] = "Kanaal is niet meer verborgen"; +$a->strings["Channel has been hidden"] = "Kanaal is verborgen"; +$a->strings["Channel has been approved"] = "Connectie/kanaal is geaccepteerd"; +$a->strings["Channel has been unapproved"] = "Connectie/kanaal is afgewezen"; +$a->strings["Connection has been removed."] = "Connectie is verwijderd"; +$a->strings["View %s's profile"] = "Profiel van %s weergeven"; +$a->strings["Refresh Permissions"] = "Privacy-rechten vernieuwen"; +$a->strings["Fetch updated permissions"] = "Aangepaste privacy-rechten ophalen"; +$a->strings["Recent Activity"] = "Recente activiteit"; +$a->strings["View recent posts and comments"] = "Recente berichten en reacties weergeven"; +$a->strings["Unblock"] = "Deblokkeren"; +$a->strings["Block"] = "Blokkeren"; +$a->strings["Block or Unblock this connection"] = "Deze connectie blokkeren of deblokkeren"; +$a->strings["Unignore"] = "Niet meer negeren"; +$a->strings["Ignore"] = "Negeren"; +$a->strings["Ignore or Unignore this connection"] = "Deze connectie negeren of niet meer negeren"; +$a->strings["Unarchive"] = "Niet meer archiveren"; +$a->strings["Archive"] = "Archiveren"; +$a->strings["Archive or Unarchive this connection"] = "Deze connectie archiveren of niet meer archiveren"; +$a->strings["Unhide"] = "Niet meer verbergen"; +$a->strings["Hide"] = "Verbergen"; +$a->strings["Hide or Unhide this connection"] = "Deze connectie verbergen of niet meer verbergen"; +$a->strings["Delete this connection"] = "Deze connectie verwijderen"; +$a->strings["Approve this connection"] = "Deze connectie accepteren"; +$a->strings["Accept connection to allow communication"] = "Keur deze connectie goed om communicatie toe te staan"; +$a->strings["Automatic Permissions Settings"] = "Automatische privacy-rechten"; +$a->strings["Connections: settings for %s"] = "Connecties: instellingen voor %s"; +$a->strings["When receiving a channel introduction, any permissions provided here will be applied to the new connection automatically and the introduction approved. Leave this page if you do not wish to use this feature."] = "Wanneer je een connectieverzoek voor een kanaal ontvangt, zullen alle privacy-rechten hier automatisch op de nieuwe connectie worden toegepast en het connectieverzoek worden geaccepteerd. Verlaat deze pagina wanneer je geen gebruik wil maken van deze functie."; +$a->strings["Slide to adjust your degree of friendship"] = "Schuif om te bepalen hoe goed je iemand kent en/of mag"; +$a->strings["inherited"] = "geërfd"; +$a->strings["Connection has no individual permissions!"] = "Connectie heeft geen individuele privacy-rechten!"; +$a->strings["This may be appropriate based on your privacy settings, though you may wish to review the \"Advanced Permissions\"."] = "Dit is mogelijk voldoende, wanneer er naar jouw privacy-instellingen wordt gekeken. Hoewel je wellicht de geavanceerde rechten wil nagaan."; +$a->strings["Profile Visibility"] = "Zichtbaarheid profiel"; +$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Kies het profiel dat je aan %s wil tonen wanneer hij/zij ingelogd jouw profiel wil bekijken."; +$a->strings["Contact Information / Notes"] = "Informatie/aantekeningen over connectie"; +$a->strings["Edit contact notes"] = "Bewerk aantekeningen over contact"; +$a->strings["Their Settings"] = "Hun instellingen"; +$a->strings["My Settings"] = "Mijn instellingen"; +$a->strings["Clear/Disable Automatic Permissions"] = "Verwijderen/uitschakelen automatische privacy-rechten"; +$a->strings["Forum Members"] = "Forum/groepsleden"; +$a->strings["Soapbox"] = "Zeepkist"; +$a->strings["Full Sharing (typical social network permissions)"] = "Voluit delen (vergelijkbaar met die van sociale netwerken)"; +$a->strings["Cautious Sharing "] = "Voorzichtig delen"; +$a->strings["Follow Only"] = "Alleen volgen"; +$a->strings["Individual Permissions"] = "Individuele privacy-rechten"; +$a->strings["Some permissions may be inherited from your channel privacy settings, which have higher priority than individual settings. Changing those inherited settings on this page will have no effect."] = "Sommige privacy-rechten kunnen worden overgeërfd van de privacy-instellingen van jouw kanaal. Wanneer je deze geërfde instellingen op deze pagina veranderd heeft dat geen effect."; +$a->strings["Advanced Permissions"] = "Geavanceerde privacy-rechten"; +$a->strings["Simple Permissions (select one and submit)"] = "Eenvoudige privacy-rechten (selecteer er één en opslaan)"; +$a->strings["Visit %s's profile - %s"] = "Profiel van %s bezoeken - %s"; +$a->strings["Block/Unblock contact"] = "Connectie blokkeren/deblokkeren"; +$a->strings["Ignore contact"] = "Connectie negeren"; +$a->strings["Repair URL settings"] = "URL-instellingen repareren"; +$a->strings["View conversations"] = "Conversaties weergeven"; +$a->strings["Delete contact"] = "Connectie verwijderen"; +$a->strings["Last update:"] = "Laatste wijziging:"; +$a->strings["Update public posts"] = "Openbare berichten updaten"; +$a->strings["Update now"] = "Nu updaten"; +$a->strings["Currently blocked"] = "Momenteel geblokkeerd"; +$a->strings["Currently ignored"] = "Momenteel genegeerd"; +$a->strings["Currently archived"] = "Momenteel gearchiveerd"; +$a->strings["Currently pending"] = "Moeten nog geaccepteerd of afgewezen worden"; +$a->strings["Hide this contact from others"] = "Verberg deze connectie voor anderen"; +$a->strings["Replies/likes to your public posts may still be visible"] = "Reacties/vind-ik-leuks op jouw openbare berichten kunnen zichtbaar blijven"; +$a->strings["No potential page delegates located."] = "Geen gevolmachtigde personen gevonden waaraan mogelijk het accountbeheer kan worden uitbesteed."; +$a->strings["Delegate Page Management"] = "Accountbeheer uitbesteden"; +$a->strings["Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely."] = "Gevolmachtigde personen zijn in staat om alle aspecten van dit account te beheren, behalve enkele basisinstellingen. Besteed het beheer van je persoonlijke account niet aan iemand uit die je niet volledig vertrouwd."; +$a->strings["Existing Page Managers"] = "Bestaande accountbeheerders"; +$a->strings["Existing Page Delegates"] = "Bestaande gevolmachtigde accountbeheerders"; +$a->strings["Potential Delegates"] = "Gevolmachtigde personen waaraan mogelijk het accountbeheer kan worden uitbesteed."; +$a->strings["Remove"] = "Verwijderen"; +$a->strings["Add"] = "Toevoegen"; +$a->strings["No entries."] = "Geen"; +$a->strings["Public access denied."] = "Openbare toegang geweigerd."; +$a->strings["Gender: "] = "Geslacht:"; +$a->strings["Finding:"] = "Gezocht naar:"; +$a->strings["No entries (some entries may be hidden)."] = "Niets gevonden (sommige kanalen kunnen verborgen zijn)."; +$a->strings["Status: "] = "Status: "; +$a->strings["Sexual Preference: "] = "Seksuele voorkeur: "; +$a->strings["Homepage: "] = "Homepage: "; +$a->strings["Hometown: "] = "Oorspronkelijk uit: "; +$a->strings["About: "] = "Over: "; +$a->strings["Keywords: "] = "Trefwoorden: "; +$a->strings["This site is not a directory server"] = "Deze hub is geen kanalengidshub (directoryserver)"; +$a->strings["Red Matrix - "The Network""] = "RedMatrix - "The Network""; +$a->strings["Welcome to %s"] = "Welkom op %s"; +$a->strings["Red Matrix Server - Setup"] = "RedMatrix Server - Setup"; +$a->strings["Could not connect to database."] = "Could not connect to database."; +$a->strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = "Could not connect to specified hub URL. Possible SSL certificate or DNS issue."; +$a->strings["Could not create table."] = "Could not create table."; +$a->strings["Your site database has been installed."] = "Your hub database has been installed."; +$a->strings["You may need to import the file \"install/database.sql\" manually using phpmyadmin or mysql."] = "You may need to import the file \"install/database.sql\" manually using phpmyadmin or mysql."; +$a->strings["Please see the file \"install/INSTALL.txt\"."] = "Please see the file \"install/INSTALL.txt\"."; +$a->strings["System check"] = "System check"; +$a->strings["Next"] = "Volgende"; +$a->strings["Check again"] = "Check again"; +$a->strings["Database connection"] = "Database connection"; +$a->strings["In order to install Red Matrix we need to know how to connect to your database."] = "In order to install RedMatrix we need to know how to connect to your database."; +$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Please contact your hosting provider or site administrator if you have questions about these settings."; +$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "The database you specify below should already exist. If it does not, please create it before continuing."; +$a->strings["Database Server Name"] = "Database Server Name"; +$a->strings["Default is localhost"] = "Default is localhost"; +$a->strings["Database Port"] = "Database Port"; +$a->strings["Communication port number - use 0 for default"] = "Communication port number - use 0 for default"; +$a->strings["Database Login Name"] = "Database Login Name"; +$a->strings["Database Login Password"] = "Database Login Password"; +$a->strings["Database Name"] = "Database Name"; +$a->strings["Site administrator email address"] = "Hub administrator email address"; +$a->strings["Your account email address must match this in order to use the web admin panel."] = "Your account email address must match this in order to use the web admin panel."; +$a->strings["Website URL"] = "Hub URL"; +$a->strings["Please use SSL (https) URL if available."] = "Please use SSL (https) URL if available."; +$a->strings["Please select a default timezone for your website"] = "Please select a default timezone for your hub"; +$a->strings["Site settings"] = "Hub settings"; +$a->strings["Could not find a command line version of PHP in the web server PATH."] = "Could not find a command line version of PHP in the web server PATH."; +$a->strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron."] = "If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron."; +$a->strings["PHP executable path"] = "PHP executable path"; +$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Enter full path to php executable. You can leave this blank to continue the installation."; +$a->strings["Command line PHP"] = "Command line PHP"; +$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "The command line version of PHP on your system does not have \"register_argc_argv\" enabled."; +$a->strings["This is required for message delivery to work."] = "This is required for message delivery to work."; +$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv"; +$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"; +$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."; +$a->strings["Generate encryption keys"] = "Generate encryption keys"; +$a->strings["libCurl PHP module"] = "libCurl PHP module"; +$a->strings["GD graphics PHP module"] = "GD graphics PHP module"; +$a->strings["OpenSSL PHP module"] = "OpenSSL PHP module"; +$a->strings["mysqli PHP module"] = "mysqli PHP module"; +$a->strings["mb_string PHP module"] = "mb_string PHP module"; +$a->strings["mcrypt PHP module"] = "mcrypt PHP module"; +$a->strings["Apache mod_rewrite module"] = "Apache mod_rewrite module"; +$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Error: Apache webserver mod-rewrite module is required but not installed."; +$a->strings["proc_open"] = "proc_open"; +$a->strings["Error: proc_open is required but is either not installed or has been disabled in php.ini"] = "Error: proc_open is required but is either not installed or has been disabled in php.ini"; +$a->strings["Error: libCURL PHP module required but not installed."] = "Error: libCURL PHP module required but not installed."; +$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Error: GD graphics PHP module with JPEG support required but not installed."; +$a->strings["Error: openssl PHP module required but not installed."] = "Error: openssl PHP module required but not installed."; +$a->strings["Error: mysqli PHP module required but not installed."] = "Error: mysqli PHP module required but not installed."; +$a->strings["Error: mb_string PHP module required but not installed."] = "Error: mb_string PHP module required but not installed."; +$a->strings["Error: mcrypt PHP module required but not installed."] = "Error: mcrypt PHP module required but not installed."; +$a->strings["The web installer needs to be able to create a file called \".htconfig.php\ in the top folder of your web server and it is unable to do so."] = "The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."; +$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."; +$a->strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Red top folder."] = "At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Red top folder."; +$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions."] = "You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions."; +$a->strings[".htconfig.php is writable"] = ".htconfig.php is writable"; +$a->strings["Red uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Red uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."; +$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory %s under the Red top level folder."] = "In order to store these compiled templates, the web server needs to have write access to the directory %s under the Red top level folder."; +$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."; +$a->strings["Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains."] = "Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains."; +$a->strings["%s is writable"] = "%s is writable"; +$a->strings["Red uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the Red top level folder"] = "Red uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the Red top level folder"; +$a->strings["store is writable"] = "store is writable"; +$a->strings["SSL certificate cannot be validated. Fix certificate or disable https access to this site."] = "SSL certificate cannot be validated. Fix certificate or disable https access to this hub."; +$a->strings["If you have https access to your website or allow connections to TCP port 443 (the https: port), you MUST use a browser-valid certificate. You MUST NOT use self-signed certificates!"] = "If you have https access to your hub or allow connections to TCP port 443 (the https: port), you MUST use a browser-valid certificate. You MUST NOT use self-signed certificates!"; +$a->strings["This restriction is incorporated because public posts from you may for example contain references to images on your own hub."] = "This restriction is incorporated because public posts from you may for example contain references to images on your own hub."; +$a->strings["If your certificate is not recognized, members of other sites (who may themselves have valid certificates) will get a warning message on their own site complaining about security issues."] = "If your certificate is not recognized, members of other hubs (who may themselves have valid certificates) will get a warning message on their own hub complaining about security issues."; +$a->strings["This can cause usability issues elsewhere (not just on your own site) so we must insist on this requirement."] = "This can cause usability issues elsewhere (not just on your own hub) so we must insist on this requirement."; +$a->strings["Providers are available that issue free certificates which are browser-valid."] = "Providers are available that issue free certificates which are browser-valid."; +$a->strings["SSL certificate validation"] = "SSL certificate validation"; +$a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "Url rewrite in .htaccess is not working. Check your server configuration."; +$a->strings["Url rewrite is working"] = "Url rewrite is working"; +$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."; +$a->strings["Errors encountered creating database tables."] = "Errors encountered creating database tables."; +$a->strings["

    What next

    "] = "

    Wat nu

    "; +$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANT: You will need to [manually] setup a scheduled task for the poller."; +$a->strings["Item not found"] = "Item niet gevonden"; +$a->strings["Edit Block"] = "Blok bewerken"; +$a->strings["Delete block?"] = "Blok verwijderen"; +$a->strings["Insert YouTube video"] = "YouTube-video invoegen"; +$a->strings["Insert Vorbis [.ogg] video"] = "Vorbis-video [.ogg] invoegen"; +$a->strings["Insert Vorbis [.ogg] audio"] = "Vorbis-audio [.ogg] invoegen"; +$a->strings["Delete Block"] = "Blok verwijderen"; +$a->strings["Layout updated."] = "Layout bijgewerkt."; +$a->strings["Edit System Page Description"] = "Systeempagina's bewerken"; +$a->strings["Layout not found."] = "Lay-out niet gevonden."; +$a->strings["Module Name:"] = "Modulenaam:"; +$a->strings["Layout Help"] = "Lay-out-hulp"; +$a->strings["Edit Layout"] = "Lay-out bewerken"; +$a->strings["Delete layout?"] = "Lay-out verwijderen?"; +$a->strings["Delete Layout"] = "Lay-out verwijderen"; +$a->strings["Item is not editable"] = "Item is niet te bewerken"; +$a->strings["Delete item?"] = "Item verwijderen?"; +$a->strings["Edit Webpage"] = "Webpagina bewerken"; +$a->strings["Delete webpage?"] = "Webpagina verwijderen?"; +$a->strings["Delete Webpage"] = "Webpagina verwijderen"; +$a->strings["Version %s"] = "Versie %s"; +$a->strings["Installed plugins/addons/apps:"] = "Ingeschakelde plug-ins/add-ons/apps:"; +$a->strings["No installed plugins/addons/apps"] = "Geen ingeschakelde plug-ins/add-ons/apps"; +$a->strings["Red"] = "Red"; +$a->strings["This is a hub of the Red Matrix - a global cooperative network of decentralized privacy enhanced websites."] = "Dit is een hub van de RedMatrix - een wereldwijd coöperatief netwerk van gedecentraliseerde websites met verbeterde privacy."; +$a->strings["Running at web location"] = "Draaiend op weblocatie"; +$a->strings["Please visit GetZot.com to learn more about the Red Matrix."] = "Bezoek RedMatrix.me om meer te leren over de RedMatrix."; +$a->strings["Bug reports and issues: please visit"] = "Bugrapporten en andere kwesties: bezoek"; +$a->strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "Voorstellen, lofbetuigingen, enz. - e-mail \"redmatrix\" at librelist - dot com"; +$a->strings["Site Administrators"] = "Hubbeheerders"; +$a->strings["Page owner information could not be retrieved."] = "Informatie over de pagina-eigenaar werd niet ontvangen."; +$a->strings["Album not found."] = "Album niet gevonden."; +$a->strings["Delete Album"] = "Verwijder album"; +$a->strings["Delete Photo"] = "Verwijder foto"; +$a->strings["No photos selected"] = "Geen foto's geselecteerd"; +$a->strings["Access to this item is restricted."] = "Toegang tot dit item is beperkt."; +$a->strings["You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."] = "Je gebruiker %1$.2f MB van totaal %2$.2f MB foto-opslagruimte."; +$a->strings["You have used %1$.2f Mbytes of photo storage."] = "Je gebruikt %1$.2f MB aan foto-opslagruimte."; +$a->strings["Upload Photos"] = "Foto's uploaden"; +$a->strings["New album name: "] = "Nieuwe albumnaam: "; +$a->strings["or existing album name: "] = "of een bestaande albumnaam: "; +$a->strings["Do not show a status post for this upload"] = "Plaats geen bericht voor deze upload."; +$a->strings["Album name could not be decoded"] = "Albumnaam kon niet gedecodeerd worden"; +$a->strings["Contact Photos"] = "Connectiefoto's"; +$a->strings["Edit Album"] = "Album bewerken"; +$a->strings["Show Newest First"] = "Nieuwste eerst weergeven"; +$a->strings["Show Oldest First"] = "Oudste eerst weergeven"; +$a->strings["View Photo"] = "Foto weergeven"; +$a->strings["Permission denied. Access to this item may be restricted."] = "Toegang geweigerd. Toegang tot dit item kan zijn beperkt."; +$a->strings["Photo not available"] = "Foto niet aanwezig"; +$a->strings["Use as profile photo"] = "Als profielfoto gebruiken"; +$a->strings["View Full Size"] = "Volledige grootte weergeven"; +$a->strings["Edit photo"] = "Foto bewerken"; +$a->strings["Rotate CW (right)"] = "Draai met de klok mee (naar rechts)"; +$a->strings["Rotate CCW (left)"] = "Draai tegen de klok in (naar links)"; +$a->strings["New album name"] = "Nieuwe albumnaam"; +$a->strings["Caption"] = "Bijschrift"; +$a->strings["Add a Tag"] = "Label toevoegen"; +$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "Voorbeeld: @bob, @Barbara_Jansen, @jan@example.com, #Friesland, #camping"; +$a->strings["In This Photo:"] = "Op deze foto:"; +$a->strings["View Album"] = "Album weergeven"; +$a->strings["Recent Photos"] = "Recente foto's"; +$a->strings["Failed to create source. No channel selected."] = "Aanmaken bron mislukt. Geen kanaal geselecteerd."; +$a->strings["Source created."] = "Bron aangemaakt."; +$a->strings["Source updated."] = "Bron aangemaakt."; +$a->strings["*"] = "*"; +$a->strings["Manage remote sources of content for your channel."] = "Beheer externe bronnen met inhoud voor jouw kanaal"; +$a->strings["New Source"] = "Nieuwe bron"; +$a->strings["Import all or selected content from the following channel into this channel and distribute it according to your channel settings."] = "Importeer complete of gedeelde inhoud vanuit het volgende kanaal naar dit kanaal, en verdeel het vervolgens volgens jouw kanaalinstellingen."; +$a->strings["Only import content with these words (one per line)"] = "Importeer alleen inhoud met deze woorden (één per regel)"; +$a->strings["Leave blank to import all public content"] = "Laat leeg om alle openbare inhoud te importeren"; +$a->strings["Channel Name"] = "Kanaalnaam"; +$a->strings["Source not found."] = "Bron niet gevonden"; +$a->strings["Edit Source"] = "Bron bewerken"; +$a->strings["Delete Source"] = "Bron verwijderen"; +$a->strings["Source removed"] = "Bron verwijderd"; +$a->strings["Unable to remove source."] = "Verwijderen bron mislukt."; +$a->strings["- select -"] = "- kies map -"; +$a->strings["Event title and start time are required."] = "Titel en begintijd van gebeurtenis zijn vereist."; +$a->strings["Event not found."] = "Gebeurtenis niet gevonden"; +$a->strings["l, F j"] = "l j F"; +$a->strings["Edit event"] = "Gebeurtenis bewerken"; +$a->strings["Create New Event"] = "Nieuwe gebeurtenis aanmaken"; +$a->strings["Previous"] = "Vorige"; +$a->strings["hour:minute"] = "uur:minuut"; +$a->strings["Event details"] = "Details van gebeurtenis"; +$a->strings["Format is %s %s. Starting date and Title are required."] = "Volgorde is %s %s. Begintijd en titel zijn vereist."; +$a->strings["Event Starts:"] = "Begin gebeurtenis:"; +$a->strings["Required"] = "Vereist"; +$a->strings["Finish date/time is not known or not relevant"] = "Einddatum/-tijd is niet bekend of niet relevant"; +$a->strings["Event Finishes:"] = "Einde gebeurtenis:"; +$a->strings["Adjust for viewer timezone"] = "Aanpassen aan de tijdzone van wie deze gebeurtenis bekijkt"; +$a->strings["Description:"] = "Omschrijving:"; +$a->strings["Title:"] = "Titel:"; +$a->strings["Share this event"] = "Deel deze gebeurtenis"; +$a->strings["Permission Denied."] = "Toegang geweigerd"; +$a->strings["File not found."] = "Bestand niet gevonden."; +$a->strings["Edit file permissions"] = "Bestandsrechten bewerken"; +$a->strings["Set/edit permissions"] = "Rechten instellen/bewerken"; +$a->strings["Include all files and sub folders"] = "Toepassen op alle bestanden en submappen"; +$a->strings["Return to file list"] = "Terugkeren naar bestandlijst "; +$a->strings["Copy/paste this code to attach file to a post"] = "Kopieer/plak deze code om het bestand aan een bericht te koppelen"; +$a->strings["Copy/paste this URL to link file from a web page"] = "Kopieer/plak deze URL om het bestand aan een externe webpagina te koppelen"; +$a->strings["Channel added."] = "Kanaal toegevoegd."; +$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s volgt het %3\$s van %2\$s"; +$a->strings["Contact not found."] = "Contact niet gevonden"; +$a->strings["Friend suggestion sent."] = "Kanaalvoorstel verzonden."; +$a->strings["Suggest Friends"] = "Kanalen voorstellen"; +$a->strings["Suggest a friend for %s"] = "Stel een kanaal voor aan %s"; +$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Geen voorgestelde kanalen gevonden. Wanneer dit een nieuwe hub is, probeer het dan over 24 uur weer."; +$a->strings["Collection created."] = "Collectie aangemaakt"; +$a->strings["Could not create collection."] = "Collectie kon niet aangemaakt worden"; +$a->strings["Collection updated."] = "Collectie bijgewerkt."; +$a->strings["Create a collection of channels."] = "Kanaalcollectie aanmaken"; +$a->strings["Collection Name: "] = "Naam collectie:"; +$a->strings["Members are visible to other channels"] = "Kanalen in deze collectie zijn zichtbaar voor andere kanalen"; +$a->strings["Collection removed."] = "Collectie verwijderd"; +$a->strings["Unable to remove collection."] = "Verwijderen collectie mislukt"; +$a->strings["Collection Editor"] = "Collectiebewerker"; +$a->strings["Members"] = "Kanalen"; +$a->strings["All Connected Channels"] = "Alle kanaalconnecties"; +$a->strings["Click on a channel to add or remove."] = "Klik op een kanaal om deze toe te voegen of te verwijderen."; +$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s labelde het %3\$s van %2\$s met %4\$s"; +$a->strings["Help:"] = "Hulp:"; +$a->strings["Not Found"] = "Niet gevonden"; +$a->strings["Tag removed"] = "Label verwijderd"; +$a->strings["Remove Item Tag"] = "Verwijder itemlabel"; +$a->strings["Select a tag to remove: "] = "Kies een label om te verwijderen"; +$a->strings["Theme settings updated."] = "Thema-instellingen bijgewerkt."; +$a->strings["Site"] = "Hub-instellingen"; +$a->strings["Accounts"] = "Accounts"; +$a->strings["Channels"] = "Kanalen"; +$a->strings["Plugins"] = "Plug-ins"; +$a->strings["Themes"] = "Thema's"; +$a->strings["Server"] = "Hubbeheer"; +$a->strings["Profile Config"] = "Profielconfiguratie"; +$a->strings["DB updates"] = "Database-updates"; +$a->strings["Logs"] = "Logboeken"; +$a->strings["Plugin Features"] = "Plug-in-opties"; +$a->strings["User registrations waiting for confirmation"] = "Accountregistraties die op goedkeuring wachten"; +$a->strings["Message queues"] = "Berichtenwachtrij"; +$a->strings["Administration"] = "Beheer"; +$a->strings["Summary"] = "Samenvatting"; +$a->strings["Registered users"] = "Geregistreerde gebruikers"; +$a->strings["Pending registrations"] = "Accounts die op goedkeuring wachten"; +$a->strings["Version"] = "Versie"; +$a->strings["Active plugins"] = "Ingeschakelde plug-ins"; +$a->strings["Site settings updated."] = "Hub-instellingen bijgewerkt."; +$a->strings["No special theme for accessibility"] = "Geen speciaal thema voor universele toegang"; +$a->strings["Yes - with approval"] = "Ja - met goedkeuring"; +$a->strings["My site is not a public server"] = "Mijn RedMatrix-hub is niet openbaar"; +$a->strings["My site has paid access only"] = "Mijn RedMatrix-hub kent alleen betaalde toegang"; +$a->strings["My site has free access only"] = "Mijn RedMatrix-hub kent alleen gratis toegang"; +$a->strings["My site offers free accounts with optional paid upgrades"] = "Mijn RedMatrix-hub biedt gratis accounts aan met betaalde uitbreidingen als optie"; +$a->strings["File upload"] = "Bestand uploaden"; +$a->strings["Policies"] = "Beleid"; +$a->strings["Site name"] = "Naam van deze RedMatrix-hub"; +$a->strings["Banner/Logo"] = "Banner/logo"; +$a->strings["Administrator Information"] = "Informatie over de beheerder van deze hub"; +$a->strings["Contact information for site administrators. Displayed on siteinfo page. BBCode can be used here"] = "Contactinformatie voor hub-beheerders. Getoond op pagina met hub-informatie. Er kan hier bbcode gebruikt worden."; +$a->strings["System language"] = "Standaardtaal"; +$a->strings["System theme"] = "Standaardthema"; +$a->strings["Default system theme - may be over-ridden by user profiles - change theme settings"] = "Standaardthema voor RedMatrix-hub (kan door gebruiker veranderd worden) - verander thema-instellingen"; +$a->strings["Mobile system theme"] = "Standaardthema voor mobiel"; +$a->strings["Theme for mobile devices"] = "Thema voor mobiele apparaten"; +$a->strings["Accessibility system theme"] = "Standaardthema voor universele toegang"; +$a->strings["Accessibility theme"] = "Thema voor universele toegang"; +$a->strings["Channel to use for this website's static pages"] = "Kanaal die op deze hub als statische pagina op de homepage gebruikt moet worden"; +$a->strings["Site Channel"] = "Kanaal op deze RedMatrix-hub"; +$a->strings["Maximum image size"] = "Maximale grootte van afbeeldingen"; +$a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Maximale grootte in bytes voor afbeeldingen die worden geüpload. Standaard is 0, wat geen limiet betekend."; +$a->strings["Does this site allow new member registration?"] = "Staat deze hub registratie van nieuwe accounts toe?"; +$a->strings["Which best describes the types of account offered by this hub?"] = "Wat voor soort accounts biedt deze RedMatrix-hub aan? Kies wat het meest in de buurt komt."; +$a->strings["Register text"] = "Registratietekst"; +$a->strings["Will be displayed prominently on the registration page."] = "Wordt prominent op de registratiepagina getoond."; +$a->strings["Accounts abandoned after x days"] = "Accounts als verlaten beschouwen na zoveel aantal dagen:"; +$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Zal geen systeembronnen verspillen door polling van externe hubs voor verlaten accounts. Vul 0 in voor geen tijdslimiet."; +$a->strings["Allowed friend domains"] = "Toegestane domeinen"; +$a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Komma-gescheiden lijst van domeinen waarvan kanalen connecties kunnen aangaan met kanalen op deze RedMatrix-hub. Wildcards zijn toegestaan.\nLaat leeg om alle domeinen toe te laten."; +$a->strings["Allowed email domains"] = "Toegestane e-maildomeinen"; +$a->strings["Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"] = "Door komma's gescheiden lijst met e-maildomeinen die op deze hub mogen registeren. Wildcards zijn toegestaan.\nLaat leeg om alle domeinen toe te laten."; +$a->strings["Block public"] = "Openbare toegang blokkeren"; +$a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "Vink dit aan om alle normaliter openbare persoonlijke pagina's op deze hub alleen toegankelijk te maken voor ingelogde gebruikers."; +$a->strings["Force publish"] = "Dwing kanaalvermelding af"; +$a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Vink dit aan om af te dwingen dat alle kanalen op deze hub in de kanalengids worden vermeld."; +$a->strings["Disable discovery tab"] = "Ontdekkingstab"; +$a->strings["Remove the tab in the network view with public content pulled from sources chosen for this site."] = "Verwijder de tab in de matrix-weergave waarin zich een selectie aan openbare berichten bevindt, die automatisch voor deze hub zijn uitgekozen."; +$a->strings["No login on Homepage"] = "Geen inlogformulier op de homepage"; +$a->strings["Check to hide the login form from your sites homepage when visitors arrive who are not logged in (e.g. when you put the content of the homepage in via the site channel)."] = "Vink dit aan om het inlogformulier op de homepage van deze hub, die niet-ingelogde gebruikers te zien krijgen, te verbergen. (bijvoorbeeld wanneer je een kanaal op deze RedMatrix-hub als homepage gebruikt)"; +$a->strings["Proxy user"] = "Proxy-gebruiker"; +$a->strings["Proxy URL"] = "Proxy-URL"; +$a->strings["Network timeout"] = "Netwerktimeout"; +$a->strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = "Waarde is in seconden. Zet op 0 voor onbeperkt (niet aanbevolen)"; +$a->strings["Delivery interval"] = "Afleveringsinterval"; +$a->strings["Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers."] = "Vertraag de achtergrondprocessen voor het afleveren met een aantal seconden om de systeembelasting te verminderen. Aanbevolen: 4-5 voor shared hosts, 2-3 voor virtual private servers (VPS) en 0-1 voor grote dedicated servers."; +$a->strings["Poll interval"] = "Poll-interval"; +$a->strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "De achtergrondprocessen voor het afleveren met zoveel seconden vertragen om de systeembelasting te verminderen. 0 om de afleveringsinterval te gebruiken."; +$a->strings["Maximum Load Average"] = "Maximaal gemiddelde systeembelasting"; +$a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Maximale systeembelasting voordat de afleverings- en polllingsprocessen worden uitgesteld. Standaard is 50."; +$a->strings["No server found"] = "Geen hub gevonden"; +$a->strings["ID"] = "ID"; +$a->strings["for channel"] = "voor kanaal"; +$a->strings["on server"] = "op hub"; +$a->strings["Status"] = "Status"; +$a->strings["Update has been marked successful"] = "Update is als succesvol gemarkeerd"; +$a->strings["Executing %s failed. Check system logs."] = "Uitvoeren van %s is mislukt. Controleer systeemlogboek."; +$a->strings["Update %s was successfully applied."] = "Update %s was geslaagd."; +$a->strings["Update %s did not return a status. Unknown if it succeeded."] = "Update %s gaf geen melding. Het is daarom niet bekend of deze geslaagd is."; +$a->strings["Update function %s could not be found."] = "Update-functie %s kon niet gevonden worden."; +$a->strings["No failed updates."] = "Geen mislukte updates."; +$a->strings["Failed Updates"] = "Mislukte updates"; +$a->strings["Mark success (if update was manually applied)"] = "Markeer als geslaagd (wanneer de update handmatig was uitgevoerd)"; +$a->strings["Attempt to execute this update step automatically"] = "Poging om deze stap van de update automatisch uit te voeren."; +$a->strings["%s user blocked/unblocked"] = array( + 0 => "%s account geblokkeerd/gedeblokkeerd", + 1 => "%s accounts geblokkeerd/gedeblokkeerd", +); +$a->strings["%s user deleted"] = array( + 0 => "%s account verwijderd", + 1 => "%s accounts verwijderd", +); +$a->strings["Account not found"] = "Account niet gevonden"; +$a->strings["User '%s' deleted"] = "Account '%s' verwijderd"; +$a->strings["User '%s' unblocked"] = "Account '%s' gedeblokkeerd"; +$a->strings["User '%s' blocked"] = "Gebruiker '%s' geblokkeerd"; +$a->strings["Users"] = "Accounts"; +$a->strings["select all"] = "alles selecteren"; +$a->strings["User registrations waiting for confirm"] = "Accounts die op goedkeuring wachten"; +$a->strings["Request date"] = "Tijd/datum verzoek"; +$a->strings["No registrations."] = "Geen verzoeken."; +$a->strings["Approve"] = "Goedkeuren"; +$a->strings["Deny"] = "Afkeuren"; +$a->strings["Register date"] = "Geregistreerd"; +$a->strings["Last login"] = "Laatste keer ingelogd"; +$a->strings["Expires"] = "Verloopt"; +$a->strings["Service Class"] = "Abonnementen"; +$a->strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Geselecteerde accounts (met bijbehorende kanalen) worden verwijderd!\\n\\nAlles wat deze accounts op deze hub hebben gepubliceerd wordt definitief verwijderd!\\n\\Weet je het zeker?"; +$a->strings["The user {0} will be deleted!\\n\\nEverything this user has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Account {0} (met bijbehorende kanalen) wordt verwijderd !\\n\\nAlles wat dit account op deze hub heeft gepubliceerd wordt definitief verwijderd!\\n\\nWeet je het zeker?"; +$a->strings["%s channel censored/uncensored"] = array( + 0 => "%s kanalen gecensureerd/ongecensureerd", + 1 => "%s kanaal gecensureerd/ongecensureerd", +); +$a->strings["%s channel deleted"] = array( + 0 => "%s kanaal verwijderd", + 1 => "%s kanalen verwijderd", +); +$a->strings["Channel not found"] = "Kanaal niet gevonden"; +$a->strings["Channel '%s' deleted"] = "Kanaal '%s' verwijderd"; +$a->strings["Channel '%s' uncensored"] = "Kanaal '%s' ongecensureerd"; +$a->strings["Channel '%s' censored"] = "Kanaal '%s' gecensureerd"; +$a->strings["Censor"] = "Censureren"; +$a->strings["Uncensor"] = "Niet censureren"; +$a->strings["UID"] = "UID"; +$a->strings["Selected channels will be deleted!\\n\\nEverything that was posted in these channels on this site will be permanently deleted!\\n\\nAre you sure?"] = "Geselecteerde kanalen worden verwijderd!\\n\\nAlles wat in deze kanalen op deze hub werd gepubliceerd wordt definitief verwijderd!\\n\\nWeet je het zeker?"; +$a->strings["The channel {0} will be deleted!\\n\\nEverything that was posted in this channel on this site will be permanently deleted!\\n\\nAre you sure?"] = "Kanaal {0} wordt verwijderd!\\n\\nAlles wat in dit kanaal op deze hub werd gepubliceerd wordt definitief verwijderd!\\n\\nWeet je het zeker?"; +$a->strings["Plugin %s disabled."] = "Plug-in %s uitgeschakeld."; +$a->strings["Plugin %s enabled."] = "Plug-in %s ingeschakeld"; +$a->strings["Disable"] = "Uitschakelen"; +$a->strings["Enable"] = "Inschakelen"; +$a->strings["Toggle"] = "Omschakelen"; +$a->strings["Author: "] = "Auteur: "; +$a->strings["Maintainer: "] = "Beheerder: "; +$a->strings["No themes found."] = "Geen thema's gevonden"; +$a->strings["Screenshot"] = "Schermafdruk"; +$a->strings["[Experimental]"] = "[Experimenteel]"; +$a->strings["[Unsupported]"] = "[Niet ondersteund]"; +$a->strings["Log settings updated."] = "Logboek-instellingen bijgewerkt."; +$a->strings["Clear"] = "Leegmaken"; +$a->strings["Debugging"] = "Debuggen"; +$a->strings["Log file"] = "Logbestand"; +$a->strings["Must be writable by web server. Relative to your Red top-level directory."] = "Moet door de webserver beschrijfbaar zijn. Relatief ten opzichte van de bovenste map van je RedMatrix-installatie."; +$a->strings["Log level"] = "Logniveau"; +$a->strings["Thing updated"] = "Ding bijgewerkt"; +$a->strings["Object store: failed"] = "Opslaan van ding mislukt"; +$a->strings["Thing added"] = "Ding toegevoegd"; +$a->strings["OBJ: %1\$s %2\$s %3\$s"] = "OBJ: %1\$s %2\$s %3\$s"; +$a->strings["Show Thing"] = "Ding weergeven"; +$a->strings["item not found."] = "Item niet gevonden"; +$a->strings["Edit Thing"] = "Ding bewerken"; +$a->strings["Select a profile"] = "Kies een profiel"; +$a->strings["Post an activity"] = "Plaats een bericht"; +$a->strings["Only sends to viewers of the applicable profile"] = "Toont dit alleen aan diegene die het gekozen profiel mogen zien."; +$a->strings["Name of thing e.g. something"] = "Naam van ding"; +$a->strings["URL of thing (optional)"] = "URL van ding (optioneel)"; +$a->strings["URL for photo of thing (optional)"] = "URL van foto van ding (optioneel)"; +$a->strings["Add Thing to your Profile"] = "Ding aan je profiel toevoegen"; +$a->strings["Nothing to import."] = "Niets gevonden om te importeren"; +$a->strings["Unable to download data from old server"] = "Niet in staat om gegevens van de oude hub te downloaden"; +$a->strings["Imported file is empty."] = "Geïmporteerde bestand is leeg"; +$a->strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "Kan geen dubbele kanaal-identificator op deze hub aanmaken. Importeren mislukt."; +$a->strings["Channel clone failed. Import failed."] = "Het klonen van het kanaal is mislukt. Importeren mislukt."; +$a->strings["Cloned channel not found. Import failed."] = "Gekloond kanaal niet gevonden. Importeren mislukt."; +$a->strings["Import completed."] = "Import voltooid."; +$a->strings["You must be logged in to use this feature."] = "Je moet ingelogd zijn om dit onderdeel te kunnen gebruiken."; +$a->strings["Import Channel"] = "Kanaal importeren"; +$a->strings["Use this form to import an existing channel from a different server/hub. You may retrieve the channel identity from the old server/hub via the network or provide an export file. Only identity and connections/relationships will be imported. Importation of content is not yet available."] = "Gebruik dit formulier om een bestaand kanaal te importeren van een andere hub. Je kan de kanaal-identiteit van de oude hub via het netwerk ontvangen of een exportbestand verstrekken. Alleen de identiteit en de connecties zullen geïmporteerd worden. Het importeren van inhoud is nog niet beschikbaar."; +$a->strings["File to Upload"] = "Bestand om te uploaden"; +$a->strings["Or provide the old server/hub details"] = "Of vul de gegevens van de oude hub in"; +$a->strings["Your old identity address (xyz@example.com)"] = "Jouw oude kanaaladres (xyz@example.com)"; +$a->strings["Your old login email address"] = "Het e-mailadres van je oude account"; +$a->strings["Your old login password"] = "Wachtwoord van jouw oude account"; +$a->strings["For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media."] = "Voor elke optie geldt dat je moet kiezen of je jouw primaire kanaaladres op deze hub wil instellen of dat jouw oude hub deze rol blijft vervullen."; +$a->strings["Make this hub my primary location"] = "Stel deze hub als mijn primaire locatie in"; +$a->strings["Total invitation limit exceeded."] = "Limiet voor aantal uitnodigingen overschreden."; +$a->strings["%s : Not a valid email address."] = "%s : Geen geldig e-mailadres."; +$a->strings["Please join us on Red"] = "Kom op de RedMatrix"; +$a->strings["Invitation limit exceeded. Please contact your site administrator."] = "Limiet voor aantal uitnodigingen overschreden. Neem contact op met je hub-beheerder."; +$a->strings["%s : Message delivery failed."] = "%s: Aflevering bericht mislukt."; +$a->strings["%d message sent."] = array( + 0 => "%d bericht verzonden.", + 1 => "%d berichten verzonden.", +); +$a->strings["You have no more invitations available"] = "Je hebt geen uitnodigingen meer beschikbaar"; +$a->strings["Send invitations"] = "Uitnodigingen verzenden"; +$a->strings["Enter email addresses, one per line:"] = "Voer e-mailadressen in, één per regel:"; +$a->strings["Your message:"] = "Jouw bericht:"; +$a->strings["Please join my community on RedMatrix."] = "Vergezel ons op de RedMatrix."; +$a->strings["You will need to supply this invitation code: "] = "Je moet deze uitnodigingscode opgeven:"; +$a->strings["1. Register at any RedMatrix location (they are all inter-connected)"] = "1. Registreer je op een willekeurige RedMatrix-hub (ze zijn allemaal onderling met elkaar verbonden)"; +$a->strings["2. Enter my RedMatrix network address into the site searchbar."] = "2. Nadat je bent ingelogd en een kanaal hebt aangemaakt kan je mijn kanaaladres in het zoekveld invullen."; +$a->strings["or visit "] = "of bezoek"; +$a->strings["3. Click [Connect]"] = "3. Klik [+ Verbinden]"; +$a->strings["Unable to locate original post."] = "Niet in staat om de originele locatie van het bericht te vinden. "; +$a->strings["Empty post discarded."] = "Leeg bericht geannuleerd"; +$a->strings["Executable content type not permitted to this channel."] = "Uitvoerbare bestanden zijn niet toegestaan op dit kanaal."; +$a->strings["System error. Post not saved."] = "Systeemfout. Bericht niet opgeslagen."; +$a->strings["You have reached your limit of %1$.0f top level posts."] = "Je hebt jouw limiet van %1$.0f berichten bereikt."; +$a->strings["You have reached your limit of %1$.0f webpages."] = "Je hebt jouw limiet van %1$.0f webpagina's bereikt."; +$a->strings["[Embedded content - reload page to view]"] = "[Ingesloten inhoud - ververs pagina om te bekijken] "; +$a->strings["Help with this feature"] = "Hulp voor dit onderdeel"; +$a->strings["Layout Name"] = "Naam layout"; $a->strings["Like/Dislike"] = "Leuk/niet leuk"; $a->strings["This action is restricted to members."] = "Deze actie kan alleen door mensen met een RedMatrix-account worden uitgevoerd."; $a->strings["Please login with your RedMatrix ID or register as a new RedMatrix member to continue."] = "Je dient in te loggen met je RedMatrix-account of een nieuw RedMatrix-account te registreren om verder te kunnen gaan."; @@ -1776,44 +1701,17 @@ $a->strings["Channel unavailable."] = "Kanaal niet beschikbaar."; $a->strings["Previous action reversed."] = "Vorige actie omgedraaid"; $a->strings["Action completed."] = "Actie voltooid"; $a->strings["Thank you."] = "Bedankt"; -$a->strings["No more system notifications."] = "Geen systeemnotificaties meer."; -$a->strings["System Notifications"] = "Systeemnotificaties"; -$a->strings["Authorize application connection"] = "Geef toestemming voor applicatiekoppeling"; -$a->strings["Return to your app and insert this Securty Code:"] = "Ga terug naar je app en voeg deze beveiligingscode in:"; -$a->strings["Please login to continue."] = "Inloggen om verder te kunnen gaan."; -$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Wil je deze applicatie toestemming geven om jouw berichten en connecties te zien, en/of nieuwe berichten voor jou te plaatsen?"; -$a->strings["Room not found"] = "Chatkanaal niet gevonden"; -$a->strings["Leave Room"] = "Chatkanaal verlaten"; -$a->strings["Delete This Room"] = "Chatkanaal verwijderen"; -$a->strings["I am away right now"] = "Ik ben momenteel afwezig"; -$a->strings["I am online"] = "Ik ben online"; -$a->strings["Bookmark this room"] = "Chatkanaal aan bladwijzers toevoegen"; -$a->strings["New Chatroom"] = "Nieuw chatkanaal"; -$a->strings["Chatroom Name"] = "Naam chatkanaal"; -$a->strings["%1\$s's Chatrooms"] = "Chatkanalen van %1\$s"; -$a->strings["Event title and start time are required."] = "Titel en begintijd van gebeurtenis zijn vereist."; -$a->strings["Event not found."] = "Gebeurtenis niet gevonden"; -$a->strings["l, F j"] = "l j F"; -$a->strings["Edit event"] = "Gebeurtenis bewerken"; -$a->strings["Create New Event"] = "Nieuwe gebeurtenis aanmaken"; -$a->strings["Previous"] = "Vorige"; -$a->strings["hour:minute"] = "uur:minuut"; -$a->strings["Event details"] = "Details van gebeurtenis"; -$a->strings["Format is %s %s. Starting date and Title are required."] = "Volgorde is %s %s. Begintijd en titel zijn vereist."; -$a->strings["Event Starts:"] = "Begin gebeurtenis:"; -$a->strings["Finish date/time is not known or not relevant"] = "Einddatum/-tijd is niet bekend of niet relevant"; -$a->strings["Event Finishes:"] = "Einde gebeurtenis:"; -$a->strings["Adjust for viewer timezone"] = "Aanpassen aan de tijdzone van wie deze gebeurtenis bekijkt"; -$a->strings["Description:"] = "Omschrijving:"; -$a->strings["Title:"] = "Titel:"; -$a->strings["Share this event"] = "Deel deze gebeurtenis"; -$a->strings["Invalid request identifier."] = "Ongeldige verzoek identificator (request identifier)"; -$a->strings["Discard"] = "Annuleren"; +$a->strings["Remote privacy information not available."] = "Privacy-informatie op afstand niet beschikbaar."; +$a->strings["Visible to:"] = "Zichtbaar voor:"; +$a->strings["No connections."] = "Geen connecties."; +$a->strings["Visit %s's profile [%s]"] = "Bezoek het profiel van %s [%s]"; +$a->strings["View Connnections"] = "Connecties weergeven"; $a->strings["No valid account found."] = "Geen geldige account gevonden."; $a->strings["Password reset request issued. Check your email."] = "Het verzoek om je wachtwoord opnieuw in te stellen is behandeld. Controleer je e-mail."; $a->strings["Site Member (%s)"] = "Lid van hub (%s)"; $a->strings["Password reset requested at %s"] = "Verzoek tot het opnieuw instellen van een wachtwoord op %s is ingediend"; $a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Het verzoek kon niet worden geverifieerd. (Mogelijk heb je al eerder een verzoek ingediend.) Opnieuw instellen van wachtwoord is mislukt."; +$a->strings["Password Reset"] = "Wachtwoord vergeten?"; $a->strings["Your password has been reset as requested."] = "Jouw wachtwoord is opnieuw ingesteld zoals je had verzocht."; $a->strings["Your new password is"] = "Jouw nieuwe wachtwoord is"; $a->strings["Save or copy your new password - and then"] = "Kopieer of sla je nieuwe wachtwoord op - en"; @@ -1824,12 +1722,177 @@ $a->strings["Forgot your Password?"] = "Wachtwoord vergeten?"; $a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Voer je e-mailadres in en verstuur deze om je wachtwoord opnieuw in te stellen. Controleer hierna hier je e-mail voor verdere instructies."; $a->strings["Email Address"] = "E-mailadres"; $a->strings["Reset"] = "Opnieuw instellen"; -$a->strings["Help with this feature"] = "Hulp voor dit onderdeel"; -$a->strings["Layout Name"] = "Naam layout"; -$a->strings["Edit Block"] = "Blok bewerken"; -$a->strings["Delete block?"] = "Blok verwijderen"; -$a->strings["Delete Block"] = "Blok verwijderen"; -$a->strings["Edit Layout"] = "Lay-out bewerken"; -$a->strings["Delete layout?"] = "Lay-out verwijderen?"; -$a->strings["Delete Layout"] = "Lay-out verwijderen"; -$a->strings["Channel added."] = "Kanaal toegevoegd."; +$a->strings["Hub not found."] = "Hub niet gevonden."; +$a->strings["Total votes"] = "Totaal aantal stemmen"; +$a->strings["Average Rating"] = "Gemiddeld cijfer"; +$a->strings["Unable to lookup recipient."] = "Niet in staat om ontvanger op te zoeken."; +$a->strings["Unable to communicate with requested channel."] = "Niet in staat om met het aangevraagde kanaal te communiceren."; +$a->strings["Cannot verify requested channel."] = "Kan opgevraagd kanaal niet verifieren"; +$a->strings["Selected channel has private message restrictions. Send failed."] = "Gekozen kanaal heeft restricties voor privéberichten. Verzenden mislukt."; +$a->strings["Messages"] = "Berichten"; +$a->strings["Message deleted."] = "Bericht verwijderd."; +$a->strings["Message recalled."] = "Bericht ingetrokken."; +$a->strings["Send Private Message"] = "Privébericht versturen"; +$a->strings["To:"] = "Aan:"; +$a->strings["Subject:"] = "Onderwerp:"; +$a->strings["Send"] = "Verzenden"; +$a->strings["Message not found."] = "Bericht niet gevonden"; +$a->strings["Delete message"] = "Bericht verwijderen"; +$a->strings["Recall message"] = "Bericht intrekken"; +$a->strings["Message has been recalled."] = "Bericht is ingetrokken."; +$a->strings["Private Conversation"] = "Privéconversatie"; +$a->strings["Delete conversation"] = "Verwijder conversatie"; +$a->strings["No secure communications available. You may be able to respond from the sender's profile page."] = "Geen veilige communicatie beschikbaar. Mogelijk kan je reageren op de kanaalpagina van de afzender."; +$a->strings["Send Reply"] = "Antwoord versturen"; +$a->strings["You have created %1$.0f of %2$.0f allowed channels."] = "Je hebt %1$.0f van totaal %2$.0f toegestane kanalen aangemaakt."; +$a->strings["Create a new channel"] = "Nieuw kanaal aanmaken"; +$a->strings["Channel Manager"] = "Kanaalbeheerder"; +$a->strings["Current Channel"] = "Huidig kanaal"; +$a->strings["Attach to one of your channels by selecting it."] = "Gebruik een van jouw kanalen door op een te klikken."; +$a->strings["Default Channel"] = "Standaardkanaal"; +$a->strings["Make Default"] = "Als standaard instellen"; +$a->strings["Wall Photos"] = "Kanaalfoto's"; +$a->strings["Profile Match"] = "Profielovereenkomst"; +$a->strings["No keywords to match. Please add keywords to your default profile."] = "Je hebt geen trefwoorden waarmee overeenkomsten gevonden kunnen worden. Voeg enkele trefwoorden aan je standaardprofiel toe."; +$a->strings["is interested in:"] = "is geïnteresseerd in:"; +$a->strings["No matches"] = "Geen overeenkomsten"; +$a->strings["Menu updated."] = "Menu aangepast. "; +$a->strings["Unable to update menu."] = "Niet in staat om menu aan te passen"; +$a->strings["Menu created."] = "Menu aangemaakt."; +$a->strings["Unable to create menu."] = "Niet in staat om menu aan te maken."; +$a->strings["Manage Menus"] = "Menu's beheren"; +$a->strings["Drop"] = "Verwijderen"; +$a->strings["Create a new menu"] = "Een nieuwe menu aanmaken"; +$a->strings["Delete this menu"] = "Menu verwijderen"; +$a->strings["Edit menu contents"] = "Bewerk de inhoud van het menu"; +$a->strings["Edit this menu"] = "Dit menu bewerken"; +$a->strings["New Menu"] = "Nieuw menu"; +$a->strings["Menu name"] = "Naam van menu"; +$a->strings["Must be unique, only seen by you"] = "Moet uniek zijn en is alleen zichtbaar voor jou."; +$a->strings["Menu title"] = "Titel van menu"; +$a->strings["Menu title as seen by others"] = "Titel van menu zoals anderen dat zien."; +$a->strings["Allow bookmarks"] = "Bladwijzers toestaan"; +$a->strings["Menu may be used to store saved bookmarks"] = "Menu kan gebruikt worden om bladwijzers in op te slaan"; +$a->strings["Menu deleted."] = "Menu verwijderd."; +$a->strings["Menu could not be deleted."] = "Menu kon niet verwijderd worden."; +$a->strings["Edit Menu"] = "Menu bewerken"; +$a->strings["Add or remove entries to this menu"] = "Items aan dit menu toevoegen of verwijder"; +$a->strings["Conversation removed."] = "Conversatie verwijderd"; +$a->strings["No messages."] = "Geen berichten"; +$a->strings["D, d M Y - g:i A"] = "D, j M Y - G:i"; +$a->strings["Add a Channel"] = "Kanaal toevoegen"; +$a->strings["A channel is your own collection of related web pages. A channel can be used to hold social network profiles, blogs, conversation groups and forums, celebrity pages, and much more. You may create as many channels as your service provider allows."] = "Een kanaal is jouw eigen verzameling gerelateerde webpagina's. Een kanaal kan gebruikt worden voor een sociaal netwerk, weblog, discussiegroep of forum, een pagina over een beroemdheid, en voor veel meer. Je kan net zoveel kanalen aanmaken als dat de eigenaar/beheerder van jouw hub toestaat."; +$a->strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "] = "Voorbeelden: \"Bruce Springsteen\", \"Familiefoto's\", \"Voetbal\", \"Astronomie\""; +$a->strings["Choose a short nickname"] = "Kies een korte bijnaam"; +$a->strings["Your nickname will be used to create an easily remembered channel address (like an email address) which you can share with others."] = "Jouw bijnaam wordt gebruikt om een makkelijk te onthouden kanaaladres (zoals een e-mailadres) aan te maken, die je dan kan delen met anderen."; +$a->strings["Or import an existing channel from another location"] = "Of importeer een bestaand kanaal vanaf een andere locatie."; +$a->strings["Invalid request identifier."] = "Ongeldige verzoek identificator (request identifier)"; +$a->strings["Discard"] = "Annuleren"; +$a->strings["No more system notifications."] = "Geen systeemnotificaties meer."; +$a->strings["System Notifications"] = "Systeemnotificaties"; +$a->strings["Unable to find your hub."] = "Niet in staat om je hub te vinden"; +$a->strings["Post successful."] = "Verzenden bericht geslaagd."; +$a->strings["invalid target signature"] = "ongeldig doel-kenmerk (target signature)"; +$a->strings["OpenID protocol error. No ID returned."] = "OpenID-protocolfout. Geen ID terugontvangen."; +$a->strings["App installed."] = "App geïnstalleerd"; +$a->strings["Malformed app."] = "Misvormde app."; +$a->strings["Embed code"] = "Insluitcode"; +$a->strings["Edit App"] = "App bewerken"; +$a->strings["Create App"] = "App maken"; +$a->strings["Name of app"] = "Naam van app"; +$a->strings["Location (URL) of app"] = "Locatie (URL) van app"; +$a->strings["Photo icon URL"] = "URL van pictogram"; +$a->strings["80 x 80 pixels - optional"] = "80 x 80 pixels (optioneel)"; +$a->strings["Version ID"] = "Versie-ID"; +$a->strings["Price of app"] = "Prijs van de app"; +$a->strings["Location (URL) to purchase app"] = "Locatie (URL) om de app aan te schaffen"; +$a->strings["Poll"] = "Poll"; +$a->strings["View Results"] = "Bekijk resultaten"; +$a->strings["Friendica Photo Album Import"] = "Fotoalbums importeren vanuit Friendica"; +$a->strings["This will import all your Friendica photo albums to this Red channel."] = "Hiermee importeer je al jouw Friendica-fotoalbums in dit RedMatrix-kanaal."; +$a->strings["Friendica Server base URL"] = "Basis-URL van Friendica-server"; +$a->strings["Friendica Login Username"] = "Gebruikersnaam Friendica-account"; +$a->strings["Friendica Login Password"] = "Wachtwoord Friendica-account"; +$a->strings["Account removals are not allowed within 48 hours of changing the account password."] = "Het verwijderen van een account is niet toegestaan binnen 48 uur nadat het wachtwoord is veranderd."; +$a->strings["Remove This Account"] = "Verwijder dit account"; +$a->strings["This will completely remove this account including all its channels from the network. Once this has been done it is not recoverable."] = "Deze actie verwijderd dit account volledig, inclusief al zijn kanalen. Dit kan hierna op geen enkele manier ongedaan gemaakt worden."; +$a->strings["Remove this account, all its channels and all its channel clones from the network"] = "Dit account, al zijn kanalen en alle klonen van zijn kanalen uit het RedMatrix-netwerk verwijderen"; +$a->strings["By default only the instances of the channels located on this hub will be removed from the network"] = "Standaard worden alleen de kanalen die zich op deze hub bevinden uit het RedMatrix-netwerk verwijderd."; +$a->strings["Schema Default"] = "Standaardschema"; +$a->strings["Sans-Serif"] = "Schreefloos"; +$a->strings["Monospace"] = "Monospace"; +$a->strings["Theme settings"] = "Thema-instellingen"; +$a->strings["Set scheme"] = "Schema van thema instellen"; +$a->strings["Set font-size for posts and comments"] = "Lettergrootte voor berichten en reacties instellen"; +$a->strings["Set font face"] = "Lettertypefamilie instellen"; +$a->strings["Set iconset"] = "Pictogrammenset instellen"; +$a->strings["Set big shadow size, default 15px 15px 15px"] = "Een grote schaduwgrootte instellen (standaard 15px 15px 15px)"; +$a->strings["Set small shadow size, default 5px 5px 5px"] = "Een kleine schaduwgrootte instellen (standaard 5px 5px 5px)"; +$a->strings["Set shadow color, default #000"] = "Schaduwkleur instellen (standaard #000)"; +$a->strings["Set radius size, default 5px"] = "Radius instellen, standaard 5px"; +$a->strings["Set line-height for posts and comments"] = "Lijnhoogte voor berichten en reacties instellen"; +$a->strings["Set background image"] = "Achtergrondafbeelding instellen"; +$a->strings["Set background attachment"] = "Gedrag achtergrondafbeelding instellen"; +$a->strings["Set background color"] = "Achtergrondkleur instellen"; +$a->strings["Set section background image"] = "Achtergrondafbeelding van sectie instellen"; +$a->strings["Set section background color"] = "Achtergrondkleur van sectie instellen"; +$a->strings["Set color of items - use hex"] = "Tekstkleur van items instellen (gebruik hexadecimaal)"; +$a->strings["Set color of links - use hex"] = "Kleur van links instellen (gebruik hexadecimaal)"; +$a->strings["Set max-width for items. Default 400px"] = "Maximale breedte van items instellen (standaard 400px)"; +$a->strings["Set min-width for items. Default 240px"] = "Minimale breedte van items instellen (standaard 240px)"; +$a->strings["Set the generic content wrapper width. Default 48%"] = "Breedte van de generieke content-wrapper instellen (standaard 48%)"; +$a->strings["Set color of fonts - use hex"] = "Tekstkleur instellen (gebruik hexadecimaal)"; +$a->strings["Set background-size element"] = "Grootte achtergrondafbeelding instellen"; +$a->strings["Item opacity"] = "Ondoorzichtigheid item"; +$a->strings["Display post previews only"] = "Alleen voorvertoning berichten weergeven"; +$a->strings["Display side bar on channel page"] = "Zijbalk op kanaalpagina weergeven"; +$a->strings["Colour of the navigation bar"] = "Kleur van de navigatiebalk"; +$a->strings["Item float"] = "Item float"; +$a->strings["Left offset of the section element"] = "Linker offset van het sectie-element"; +$a->strings["Right offset of the section element"] = "Rechter offset van het sectie-element"; +$a->strings["Section width"] = "Breedte van sectie"; +$a->strings["Left offset of the aside"] = "Rechter offset van aside (zijbalk)"; +$a->strings["Right offset of the aside element"] = "Rechter offset van het aside-element"; +$a->strings["None"] = "Geen"; +$a->strings["Header image"] = "Header-afbeelding"; +$a->strings["Header image only on profile pages"] = "Header-afbeelding alleen op profielpagina's weergeven"; +$a->strings["Light (Red Matrix default)"] = "Light (RedMatrix-standaard)"; +$a->strings["Narrow navbar"] = "Smalle navigatiebalk"; +$a->strings["Navigation bar background color"] = "Achtergrondkleur navigatiebalk"; +$a->strings["Navigation bar gradient top color"] = "Bovenste gradiëntkleur navigatiebalk"; +$a->strings["Navigation bar gradient bottom color"] = "Onderste gradiëntkleur navigatiebalk"; +$a->strings["Navigation active button gradient top color"] = "Bovenste gradiëntkleur actieve knop navigatiebalk"; +$a->strings["Navigation active button gradient bottom color"] = "Onderste gradiëntkleur actieve knop op navigatiebalk"; +$a->strings["Navigation bar border color "] = "Randkleur navigatiebalk "; +$a->strings["Navigation bar icon color "] = "Pictogramkleur navigatiebalk"; +$a->strings["Navigation bar active icon color "] = "Actieve pictogramkleur navigatiebalk"; +$a->strings["link color"] = "Linkkleur instellen"; +$a->strings["Set font-color for banner"] = "Tekstkleur van banner instellen"; +$a->strings["Set the background color"] = "Achtergrondkleur instellen"; +$a->strings["Set the background image"] = "Achtergrondafbeelding instellen"; +$a->strings["Set the background color of items"] = "Achtergrondkleur items instellen"; +$a->strings["Set the background color of comments"] = "Achtergrondkleur reacties instellen"; +$a->strings["Set the border color of comments"] = "Randkleur reacties instellen"; +$a->strings["Set the indent for comments"] = "Inspringen reacties instellen"; +$a->strings["Set the basic color for item icons"] = "Basiskleur itempictogrammen instellen"; +$a->strings["Set the hover color for item icons"] = "Hoverkleur itempictogrammen instellen"; +$a->strings["Set font-size for the entire application"] = "Tekstgrootte van de volledige applicatie instellen"; +$a->strings["Set font-color for posts and comments"] = "Tekstkleur van berichten en reacties"; +$a->strings["Set radius of corners"] = "Radius van hoeken instellen"; +$a->strings["Set shadow depth of photos"] = "Schaduwdiepte van foto's instellen"; +$a->strings["Set maximum width of conversation regions"] = "Maximumbreedte conversatieruimte instellen"; +$a->strings["Center conversation regions"] = "Centreer conversatieruimte"; +$a->strings["Set minimum opacity of nav bar - to hide it"] = "Minimale ondoorzichtigheid navigatiebalk (- om te verbergen)"; +$a->strings["Set size of conversation author photo"] = "Grootte profielfoto's van berichten instellen"; +$a->strings["Set size of followup author photos"] = "Grootte profielfoto's van reacties instellen"; +$a->strings["Sloppy photo albums"] = "Rommelig vormgegeven fotoalbums"; +$a->strings["Are you a clean desk or a messy desk person?"] = "Ben je iemand die van een opgeruimd bureau houdt of van een rommelig bureau?"; +$a->strings["Update %s failed. See error logs."] = "Update %s mislukt. Zie foutenlogboek."; +$a->strings["Update Error at %s"] = "Update-fout op %s"; +$a->strings["Create an account to access services and applications within the Red Matrix"] = "Maak een account aan om toegang te krijgen tot diensten en toepassingen van de RedMatrix"; +$a->strings["Password"] = "Wachtwoord"; +$a->strings["Remember me"] = "Aangemeld blijven"; +$a->strings["Forgot your password?"] = "Wachtwoord vergeten?"; +$a->strings["permission denied"] = "toegang geweigerd"; +$a->strings["Got Zot?"] = "Heb je Zot?"; +$a->strings["toggle mobile"] = "mobiele weergave omschakelen"; -- cgit v1.2.3 From 341892a7affb64eb55a83c2ead766ce2fac0a908 Mon Sep 17 00:00:00 2001 From: Jeroen Date: Tue, 19 Aug 2014 21:48:49 +0000 Subject: fix nl --- view/nl/messages.po | 4 ++-- view/nl/strings.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/view/nl/messages.po b/view/nl/messages.po index 48ed857b6..451b492a7 100644 --- a/view/nl/messages.po +++ b/view/nl/messages.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Red Matrix\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-08-15 00:03-0700\n" -"PO-Revision-Date: 2014-08-19 20:17+0000\n" +"PO-Revision-Date: 2014-08-19 21:46+0000\n" "Last-Translator: jeroenpraat <>\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/red-matrix/language/nl/)\n" "MIME-Version: 1.0\n" @@ -49,7 +49,7 @@ msgstr "foto" #: ../../include/conversation.php:148 ../../mod/subthread.php:72 #: ../../mod/subthread.php:174 ../../mod/tagger.php:53 ../../mod/like.php:294 msgid "status" -msgstr "status" +msgstr "bericht" #: ../../include/diaspora.php:1926 ../../include/conversation.php:164 #: ../../mod/like.php:331 diff --git a/view/nl/strings.php b/view/nl/strings.php index 472a69829..7be347e53 100644 --- a/view/nl/strings.php +++ b/view/nl/strings.php @@ -10,7 +10,7 @@ $a->strings["Profile Photos"] = "Profielfoto's"; $a->strings["%1\$s is now friends with %2\$s"] = "%1\$s is nu bevriend met %2\$s"; $a->strings["Sharing notification from Diaspora network"] = "Notificatie delen vanuit het Diaspora-netwerk"; $a->strings["photo"] = "foto"; -$a->strings["status"] = "status"; +$a->strings["status"] = "bericht"; $a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s vindt %3\$s van %2\$s leuk"; $a->strings["Attachments:"] = "Bijlagen:"; $a->strings["Embedded content"] = "Ingesloten inhoud"; -- cgit v1.2.3 From 82389f8c1b9e43050589da6ea3dda8cac399db9b Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 19 Aug 2014 16:04:38 -0700 Subject: really really fix lockview (cross fingers) ;-) --- mod/lockview.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/mod/lockview.php b/mod/lockview.php index 7d39f9e2f..6673ae709 100644 --- a/mod/lockview.php +++ b/mod/lockview.php @@ -33,7 +33,13 @@ function lockview_content(&$a) { if(($item['item_private'] == 1) && (! strlen($item['allow_cid'])) && (! strlen($item['allow_gid'])) && (! strlen($item['deny_cid'])) && (! strlen($item['deny_gid']))) { - echo '
  • ' . translate_scope($item['public_policy']) . '
  • '; + + // if the post is private, but public_policy is blank ("visible to the internet"), and there aren't any + // specific recipients, we're the recipient of a post with "bcc" or targeted recipients; so we'll just show it + // as unknown specific recipients. The sender will have the visibility list and will fall through to the + // next section. + + echo '
  • ' . translate_scope((! $item['public_policy']) ? PERMS_SPECIFIC : $item['public_policy']) . '
  • '; killme(); } @@ -78,9 +84,5 @@ function lockview_content(&$a) { echo $o . implode($l); killme(); - if(array_key_exists('public_policy',$item) && $item['public_policy']) { - echo '
  • ' . translate_scope($item['public_policy']) . '
  • '; - killme(); - } } -- cgit v1.2.3 From 6feaa2689d5cc30ef52a1b2e8ff82a8253aa5afb Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 19 Aug 2014 16:26:46 -0700 Subject: follow => connect --- include/conversation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/conversation.php b/include/conversation.php index 836bd1b24..daf1c723f 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -944,7 +944,7 @@ function item_photo_menu($item){ t("View Profile") => $profile_link, t("View Photos") => $photos_link, t("Matrix Activity") => $posts_link, - t("Follow") => $follow_url, + t("Connect") => $follow_url, t("Edit Contact") => $contact_url, t("Send PM") => $pm_url, t("Poke") => $poke_link -- cgit v1.2.3 From 8b5627e77773e40ee95e0ef18808ebbf3b61e094 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 19 Aug 2014 17:47:32 -0700 Subject: make sure privacy scope is completely reset on second delivery chain - revert if there are forum issues, this is subtle and complicated --- include/items.php | 70 ++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 62 insertions(+), 8 deletions(-) diff --git a/include/items.php b/include/items.php index 05ff1b078..2b9c937bb 100755 --- a/include/items.php +++ b/include/items.php @@ -2462,9 +2462,12 @@ function tag_deliver($uid,$item_id) { $private = (($u[0]['channel_allow_cid'] || $u[0]['channel_allow_gid'] || $u[0]['channel_deny_cid'] || $u[0]['channel_deny_gid']) ? 1 : 0); -//FIXME - add check for public_policy + $new_public_policy = map_scope($u[0]['channel_r_stream'],true); - $flag_bits = ITEM_WALL|ITEM_ORIGIN; + if((! $private) && $new_public_policy) + $private = 1; + + $flag_bits = $item['item_flags'] | ITEM_WALL|ITEM_ORIGIN; // maintain the original source, which will be the original item owner and was stored in source_xchan // when we created the delivery fork @@ -2474,8 +2477,28 @@ function tag_deliver($uid,$item_id) { intval($item_id) ); - $r = q("update item set item_flags = ( item_flags | %d ), owner_xchan = '%s', allow_cid = '%s', allow_gid = '%s', - deny_cid = '%s', deny_gid = '%s', item_private = %d where id = %d limit 1", + $title = $item['title']; + $body = $item['body']; + + if($private) { + if(!($flag_bits & ITEM_OBSCURED)) { + $key = get_config('system','pubkey'); + $flag_bits = $flag_bits|ITEM_OBSCURED; + $title = json_encode(aes_encapsulate($title,$key)); + $body = json_encode(aes_encapsulate($body,$key)); + } + } + else { + if($flag_bits & ITEM_OBSCURED) { + $key = get_config('system','prvkey'); + $flag_bits = $flag_bits ^ ITEM_OBSCURED; + $title = json_encode(aes_unencapsulate($title,$key)); + $body = json_encode(aes_unencapsulate($body,$key)); + } + } + + $r = q("update item set item_flags = %d, owner_xchan = '%s', allow_cid = '%s', allow_gid = '%s', + deny_cid = '%s', deny_gid = '%s', item_private = %d, public_policy = '%s', title = '%s', body = '%s' where id = %d limit 1", intval($flag_bits), dbesc($u[0]['channel_hash']), dbesc($u[0]['channel_allow_cid']), @@ -2483,6 +2506,9 @@ function tag_deliver($uid,$item_id) { dbesc($u[0]['channel_deny_cid']), dbesc($u[0]['channel_deny_gid']), intval($private), + dbesc($new_public_policy), + dbesc($title), + dbesc($body), intval($item_id) ); if($r) @@ -2604,9 +2630,12 @@ function tag_deliver($uid,$item_id) { $private = (($u[0]['channel_allow_cid'] || $u[0]['channel_allow_gid'] || $u[0]['channel_deny_cid'] || $u[0]['channel_deny_gid']) ? 1 : 0); -// FIXME set public_policy and recheck private + $new_public_policy = map_scope($u[0]['channel_r_stream'],true); + + if((! $private) && $new_public_policy) + $private = 1; - $flag_bits = ITEM_WALL|ITEM_ORIGIN|ITEM_UPLINK; + $flag_bits = $item['item_flags'] | ITEM_WALL|ITEM_ORIGIN|ITEM_UPLINK; // preserve the source @@ -2614,8 +2643,30 @@ function tag_deliver($uid,$item_id) { intval($item_id) ); - $r = q("update item set item_flags = ( item_flags | %d ), owner_xchan = '%s', allow_cid = '%s', allow_gid = '%s', - deny_cid = '%s', deny_gid = '%s', item_private = %d where id = %d limit 1", + // make sure encryption matches the new scope + + $title = $item['title']; + $body = $item['body']; + + if($private) { + if(!($flag_bits & ITEM_OBSCURED)) { + $key = get_config('system','pubkey'); + $flag_bits = $flag_bits|ITEM_OBSCURED; + $title = json_encode(aes_encapsulate($title,$key)); + $body = json_encode(aes_encapsulate($body,$key)); + } + } + else { + if($flag_bits & ITEM_OBSCURED) { + $key = get_config('system','prvkey'); + $flag_bits = $flag_bits ^ ITEM_OBSCURED; + $title = json_encode(aes_unencapsulate($title,$key)); + $body = json_encode(aes_unencapsulate($body,$key)); + } + } + + $r = q("update item set item_flags = %d, owner_xchan = '%s', allow_cid = '%s', allow_gid = '%s', + deny_cid = '%s', deny_gid = '%s', item_private = %d, public_policy = '%s', title = '%s', body = '%s' where id = %d limit 1", intval($flag_bits), dbesc($u[0]['channel_hash']), dbesc($u[0]['channel_allow_cid']), @@ -2623,6 +2674,9 @@ function tag_deliver($uid,$item_id) { dbesc($u[0]['channel_deny_cid']), dbesc($u[0]['channel_deny_gid']), intval($private), + dbesc($new_public_policy), + dbesc($title), + dbesc($body), intval($item_id) ); if($r) -- cgit v1.2.3 From 55d4ceb7e0c249eff337cb303c555bfa5d5bd2a0 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 19 Aug 2014 17:51:45 -0700 Subject: also reset comment policy on alternate delivery chains --- include/items.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/items.php b/include/items.php index 2b9c937bb..50ce9d3f5 100755 --- a/include/items.php +++ b/include/items.php @@ -2498,7 +2498,7 @@ function tag_deliver($uid,$item_id) { } $r = q("update item set item_flags = %d, owner_xchan = '%s', allow_cid = '%s', allow_gid = '%s', - deny_cid = '%s', deny_gid = '%s', item_private = %d, public_policy = '%s', title = '%s', body = '%s' where id = %d limit 1", + deny_cid = '%s', deny_gid = '%s', item_private = %d, public_policy = '%s', comment_policy = '%s', title = '%s', body = '%s' where id = %d limit 1", intval($flag_bits), dbesc($u[0]['channel_hash']), dbesc($u[0]['channel_allow_cid']), @@ -2507,6 +2507,7 @@ function tag_deliver($uid,$item_id) { dbesc($u[0]['channel_deny_gid']), intval($private), dbesc($new_public_policy), + dbesc(map_scope($u[0]['channel_w_comment'])), dbesc($title), dbesc($body), intval($item_id) @@ -2666,7 +2667,7 @@ function tag_deliver($uid,$item_id) { } $r = q("update item set item_flags = %d, owner_xchan = '%s', allow_cid = '%s', allow_gid = '%s', - deny_cid = '%s', deny_gid = '%s', item_private = %d, public_policy = '%s', title = '%s', body = '%s' where id = %d limit 1", + deny_cid = '%s', deny_gid = '%s', item_private = %d, public_policy = '%s', comment_policy = '%s', title = '%s', body = '%s' where id = %d limit 1", intval($flag_bits), dbesc($u[0]['channel_hash']), dbesc($u[0]['channel_allow_cid']), @@ -2675,6 +2676,7 @@ function tag_deliver($uid,$item_id) { dbesc($u[0]['channel_deny_gid']), intval($private), dbesc($new_public_policy), + dbesc(map_scope($u[0]['channel_w_comment'])), dbesc($title), dbesc($body), intval($item_id) -- cgit v1.2.3 From c7fe071a1fda1779ecb2a45016ea59b347695b67 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 19 Aug 2014 19:38:42 -0700 Subject: some work on network discovery --- include/diaspora.php | 91 ++++--------------- include/network.php | 244 +++++++++++++++++++++++++++++++-------------------- 2 files changed, 167 insertions(+), 168 deletions(-) diff --git a/include/diaspora.php b/include/diaspora.php index 02d479d95..dda552536 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -140,85 +140,30 @@ function find_diaspora_person_by_handle($handle) { $endlessloop = 0; $maxloops = 10; - do { - $r = q("select * from xchan where xchan_addr = '%s' limit 1", - dbesc($handle) - ); - if($r) { - $person = $r[0]; - logger('find_diaspora_person_by handle: in cache ' . print_r($r,true), LOGGER_DEBUG); + + $r = q("select * from xchan where xchan_addr = '%s' limit 1", + dbesc($handle) + ); + if($r) { + $person = $r[0]; + logger('find_diaspora_person_by handle: in cache ' . print_r($r,true), LOGGER_DATA); // update record occasionally so it doesn't get stale - $d = strtotime($person['updated'] . ' +00:00'); - if($d < strtotime('now - 14 days')) - $update = true; - } +// $d = strtotime($person['updated'] . ' +00:00'); +// if($d < strtotime('now - 14 days')) +// $update = true; + } + if((! $person) || ($update)) { - // FETCHING PERSON INFORMATION FROM REMOTE SERVER - // - // If the person isn't in our 'fcontact' table, or if he/she is but - // his/her information hasn't been updated for more than 14 days, then - // we want to fetch the person's information from the remote server. - // - // Note that $person isn't changed by this block of code unless the - // person's information has been successfully fetched from the remote - // server. So if $person was 'false' to begin with (because he/she wasn't - // in the local cache), it'll stay false, and if $person held the local - // cache information to begin with, it'll keep that information. That way - // if there's a problem with the remote fetch, we can at least use our - // cached information--it's better than nothing. - -//fixme!!! - - if((! $person) || ($update)) { - // Lock the function to prevent race conditions if multiple items - // come in at the same time from a person who doesn't exist in - // fcontact - // - // Don't loop forever. On the last loop, try to create the contact - // whether the function is locked or not. Maybe the locking thread - // has died or something. At any rate, a duplicate in 'fcontact' - // is a much smaller problem than a deadlocked thread -// $got_lock = lock_function('find_diaspora_person_by_handle', false); - if(($endlessloop + 1) >= $maxloops) - $got_lock = true; - - if($got_lock) { - logger('find_diaspora_person_by_handle: create or refresh', LOGGER_DEBUG); - require_once('include/Scrape.php'); - $r = probe_url($handle, PROBE_DIASPORA); - - // Note that Friendica contacts can return a "Diaspora person" - // if Diaspora connectivity is enabled on their server - if((count($r)) && ($r['network'] === NETWORK_DIASPORA)) { - add_fcontact($r,$update); - $person = ($r); - } + // try webfinger. Make sure to distinguish between diaspora, + // redmatrix w/diaspora protocol and friendica w/diaspora protocol. -// unlock_function('find_diaspora_person_by_handle'); - } - else { - logger('find_diaspora_person_by_handle: couldn\'t lock function', LOGGER_DEBUG); -// if(! $person) -// block_on_function_lock('find_diaspora_person_by_handle'); - } - } - } while((! $person) && (! $got_lock) && (++$endlessloop < $maxloops)); + $result = discover_by_webbie($handle); + + + } - // We need to try again if the person wasn't in 'fcontact' but the function was locked. - // The fact that the function was locked may mean that another process was creating the - // person's record. It could also mean another process was creating or updating an unrelated - // person. - // - // At any rate, we need to keep trying until we've either got the person or had a chance to - // try to fetch his/her remote information. But we don't want to block on locking the - // function, because if the other process is creating the record, then when we acquire the lock - // we'll dive right into creating another, duplicate record. We DO want to at least wait - // until the lock is released, so we don't flood the database with requests. - // - // If the person was in the 'fcontact' table, don't try again. It's not worth the time, since - // we do have some information for the person return $person; } diff --git a/include/network.php b/include/network.php index 66bba5b38..1a974a681 100644 --- a/include/network.php +++ b/include/network.php @@ -337,101 +337,6 @@ function convert_xml_element_to_array($xml_element, &$recursion_depth=0) { } } -// Given an email style address, perform webfinger lookup and -// return the resulting DFRN profile URL, or if no DFRN profile URL -// is located, returns an OStatus subscription template (prefixed -// with the string 'stat:' to identify it as on OStatus template). -// If this isn't an email style address just return $s. -// Return an empty string if email-style addresses but webfinger fails, -// or if the resultant personal XRD doesn't contain a supported -// subscription/friend-request attribute. - -// amended 7/9/2011 to return an hcard which could save potentially loading -// a lengthy content page to scrape dfrn attributes - - -function webfinger_dfrn($s,&$hcard) { - if(! strstr($s,'@')) { - return $s; - } - $profile_link = ''; - - $links = webfinger($s); - logger('webfinger_dfrn: ' . $s . ':' . print_r($links,true), LOGGER_DATA); - if(count($links)) { - foreach($links as $link) { - if($link['@attributes']['rel'] === NAMESPACE_DFRN) - $profile_link = $link['@attributes']['href']; - if($link['@attributes']['rel'] === NAMESPACE_OSTATUSSUB) - $profile_link = 'stat:' . $link['@attributes']['template']; - if($link['@attributes']['rel'] === 'http://microformats.org/profile/hcard') - $hcard = $link['@attributes']['href']; - } - } - return $profile_link; -} - -// Given an email style address, perform webfinger lookup and -// return the array of link attributes from the personal XRD file. -// On error/failure return an empty array. - - - -function webfinger($s, $debug = false) { - $host = ''; - if(strstr($s,'@')) { - $host = substr($s,strpos($s,'@') + 1); - } - if(strlen($host)) { - $tpl = fetch_lrdd_template($host); - logger('webfinger: lrdd template: ' . $tpl); - if(strlen($tpl)) { - $pxrd = str_replace('{uri}', urlencode('acct:' . $s), $tpl); - logger('webfinger: pxrd: ' . $pxrd); - $links = fetch_xrd_links($pxrd); - if(! count($links)) { - // try with double slashes - $pxrd = str_replace('{uri}', urlencode('acct://' . $s), $tpl); - logger('webfinger: pxrd: ' . $pxrd); - $links = fetch_xrd_links($pxrd); - } - return $links; - } - } - return array(); -} - - - - -// Given a host name, locate the LRDD template from that -// host. Returns the LRDD template or an empty string on -// error/failure. - - -function fetch_lrdd_template($host) { - $tpl = ''; - - $url1 = 'https://' . $host . '/.well-known/host-meta' ; - $url2 = 'http://' . $host . '/.well-known/host-meta' ; - $links = fetch_xrd_links($url1); - logger('fetch_lrdd_template from: ' . $url1); - logger('template (https): ' . print_r($links,true)); - if(! count($links)) { - logger('fetch_lrdd_template from: ' . $url2); - $links = fetch_xrd_links($url2); - logger('template (http): ' . print_r($links,true)); - } - if(count($links)) { - foreach($links as $link) - if($link['@attributes']['rel'] && $link['@attributes']['rel'] === 'lrdd') - $tpl = $link['@attributes']['template']; - } - if(! strpos($tpl,'{uri}')) - $tpl = ''; - return $tpl; -} - // Take a URL from the wild, prepend http:// if necessary // and check DNS to see if it's real (or check if is a valid IP address) // return true if it's OK, false if something is wrong with it @@ -912,3 +817,152 @@ function email_send($addr, $subject, $headers, $item) { logger('notifier: email delivery to ' . $addr); mail($addr, $subject, $body, $headers); } + + +function discover_by_webbie($webbie) { + + $x = webfinger_rfc7033($webbie); + if($x && array_key_exists('links',$x) && $x['links']) { + foreach($x['links'] as $link) { + if(array_key_exists('rel',$link) && $link['rel'] == 'http://purl.org/zot/protocol') { + logger('discover_by_webbie: zot found for ' . $webbie); + $z = z_fetch_url($link['href']); + if($z['success']) { + $j = json_decode($z['body'],true); + $i = import_xchan($j); + return true; + } + } + } + } + + $x = old_webfinger($webbie); + if($x) { + logger('old_webfinger: ' . print_r($x,true)); + } +} + + +function webfinger_rfc7033($webbie) { + + + if(! strpos($webbie,'@')) + return false; + $lhs = substr($webbie,0,strpos($webbie,'@')); + $rhs = substr($webbie,strpos($webbie,'@')+1); + + $resource = 'acct:' . $webbie; + + $s = z_fetch_url('https://' . $rhs . '/.well-known/webfinger?resource=' . $resource); + + if($s['success']) + $j = json_decode($s['body'],true); + else + return false; + return($j); +} + + +function old_webfinger($webbie) { + + $host = ''; + if(strstr($webbie,'@')) + $host = substr($webbie,strpos($webbie,'@') + 1); + + if(strlen($host)) { + $tpl = fetch_lrdd_template($host); + logger('old_webfinger: lrdd template: ' . $tpl,LOGGER_DATA); + if(strlen($tpl)) { + $pxrd = str_replace('{uri}', urlencode('acct:' . $webbie), $tpl); + logger('old_webfinger: pxrd: ' . $pxrd,LOGGER_DATA); + $links = fetch_xrd_links($pxrd); + if(! count($links)) { + // try with double slashes + $pxrd = str_replace('{uri}', urlencode('acct://' . $webbie), $tpl); + logger('old_webfinger: pxrd: ' . $pxrd,LOGGER_DATA); + $links = fetch_xrd_links($pxrd); + } + return $links; + } + } + return array(); +} + + +function fetch_lrdd_template($host) { + $tpl = ''; + + $url1 = 'https://' . $host . '/.well-known/host-meta' ; + $url2 = 'http://' . $host . '/.well-known/host-meta' ; + $links = fetch_xrd_links($url1); + logger('fetch_lrdd_template from: ' . $url1, LOGGER_DEBUG); + logger('template (https): ' . print_r($links,true),LOGGER_DEBUG); + if(! count($links)) { + logger('fetch_lrdd_template from: ' . $url2); + $links = fetch_xrd_links($url2); + logger('template (http): ' . print_r($links,true),LOGGER_DEBUG); + } + if(count($links)) { + foreach($links as $link) + if($link['@attributes']['rel'] && $link['@attributes']['rel'] === 'lrdd' && (!$link['@attributes']['type'] || $link['@attributes']['type'] === 'application/xrd+xml')) + $tpl = $link['@attributes']['template']; + } + if(! strpos($tpl,'{uri}')) + $tpl = ''; + return $tpl; + +} + + +function fetch_xrd_links($url) { + +logger('fetch_xrd_links: ' . $url); + + $redirects = 0; + $x = z_fetch_url($url,false,$redirects,array('timeout' => 20)); + + if(! $x['success']) + return array(); + + $xml = $x['body']; + logger('fetch_xrd_links: ' . $xml, LOGGER_DATA); + + if ((! $xml) || (! stristr($xml,''),array('href="','"/>'),$xml); + + $h = parse_xml_string($xml); + if(! $h) + return array(); + + $arr = convert_xml_element_to_array($h); + + $links = array(); + + if(isset($arr['xrd']['link'])) { + $link = $arr['xrd']['link']; + + if(! isset($link[0])) + $links = array($link); + else + $links = $link; + } + if(isset($arr['xrd']['alias'])) { + $alias = $arr['xrd']['alias']; + if(! isset($alias[0])) + $aliases = array($alias); + else + $aliases = $alias; + if(is_array($aliases) && count($aliases)) { + foreach($aliases as $alias) { + $links[]['@attributes'] = array('rel' => 'alias' , 'href' => $alias); + } + } + } + + logger('fetch_xrd_links: ' . print_r($links,true), LOGGER_DATA); + + return $links; +} \ No newline at end of file -- cgit v1.2.3 From 0c8866acdec1cef35ab5ac0e449f10a50e59a60e Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 19 Aug 2014 21:31:33 -0700 Subject: snakebite continued --- include/items.php | 161 ++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 108 insertions(+), 53 deletions(-) diff --git a/include/items.php b/include/items.php index 50ce9d3f5..0392e07a0 100755 --- a/include/items.php +++ b/include/items.php @@ -1233,13 +1233,14 @@ function get_atom_elements($feed,$item) { $author = $item->get_author(); if($author) { - $res['author-name'] = unxmlify($author->get_name()); - $res['author-link'] = unxmlify($author->get_link()); + $res['author_name'] = unxmlify($author->get_name()); + $res['author_link'] = unxmlify($author->get_link()); } else { - $res['author-name'] = unxmlify($feed->get_title()); - $res['author-link'] = unxmlify($feed->get_permalink()); + $res['author_name'] = unxmlify($feed->get_title()); + $res['author_link'] = unxmlify($feed->get_permalink()); } + $res['mid'] = unxmlify($item->get_id()); $res['title'] = unxmlify($item->get_title()); $res['body'] = unxmlify($item->get_content()); @@ -1264,9 +1265,9 @@ function get_atom_elements($feed,$item) { if($rawauthor && $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) { $base = $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']; foreach($base as $link) { - if(!x($res, 'author-avatar') || !$res['author-avatar']) { + if(!x($res, 'author_photo') || !$res['author_photo']) { if($link['attribs']['']['rel'] === 'photo' || $link['attribs']['']['rel'] === 'avatar') - $res['author-avatar'] = unxmlify($link['attribs']['']['href']); + $res['author_photo'] = unxmlify($link['attribs']['']['href']); } } } @@ -1277,11 +1278,11 @@ function get_atom_elements($feed,$item) { $base = $rawactor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']; if($base && count($base)) { foreach($base as $link) { - if($link['attribs']['']['rel'] === 'alternate' && (! $res['author-link'])) - $res['author-link'] = unxmlify($link['attribs']['']['href']); - if(!x($res, 'author-avatar') || !$res['author-avatar']) { + if($link['attribs']['']['rel'] === 'alternate' && (! $res['author_link'])) + $res['author_link'] = unxmlify($link['attribs']['']['href']); + if(!x($res, 'author_photo') || !$res['author_photo']) { if($link['attribs']['']['rel'] === 'avatar' || $link['attribs']['']['rel'] === 'photo') - $res['author-avatar'] = unxmlify($link['attribs']['']['href']); + $res['author_photo'] = unxmlify($link['attribs']['']['href']); } } } @@ -1289,16 +1290,16 @@ function get_atom_elements($feed,$item) { // No photo/profile-link on the item - look at the feed level - if((! (x($res,'author-link'))) || (! (x($res,'author-avatar')))) { + if((! (x($res,'author_link'))) || (! (x($res,'author_photo')))) { $rawauthor = $feed->get_feed_tags(SIMPLEPIE_NAMESPACE_ATOM_10,'author'); if($rawauthor && $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) { $base = $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']; foreach($base as $link) { - if($link['attribs']['']['rel'] === 'alternate' && (! $res['author-link'])) - $res['author-link'] = unxmlify($link['attribs']['']['href']); - if(! $res['author-avatar']) { + if($link['attribs']['']['rel'] === 'alternate' && (! $res['author_link'])) + $res['author_link'] = unxmlify($link['attribs']['']['href']); + if(! $res['author_photo']) { if($link['attribs']['']['rel'] === 'photo' || $link['attribs']['']['rel'] === 'avatar') - $res['author-avatar'] = unxmlify($link['attribs']['']['href']); + $res['author_photo'] = unxmlify($link['attribs']['']['href']); } } } @@ -1310,11 +1311,11 @@ function get_atom_elements($feed,$item) { if($base && count($base)) { foreach($base as $link) { - if($link['attribs']['']['rel'] === 'alternate' && (! $res['author-link'])) - $res['author-link'] = unxmlify($link['attribs']['']['href']); - if(! (x($res,'author-avatar'))) { + if($link['attribs']['']['rel'] === 'alternate' && (! $res['author_link'])) + $res['author_link'] = unxmlify($link['attribs']['']['href']); + if(! (x($res,'author_photo'))) { if($link['attribs']['']['rel'] === 'avatar' || $link['attribs']['']['rel'] === 'photo') - $res['author-avatar'] = unxmlify($link['attribs']['']['href']); + $res['author_photo'] = unxmlify($link['attribs']['']['href']); } } } @@ -1378,9 +1379,9 @@ function get_atom_elements($feed,$item) { $private = $item->get_item_tags(NAMESPACE_DFRN,'private'); if($private && intval($private[0]['data']) > 0) - $res['private'] = intval($private[0]['data']); + $res['item_private'] = ((intval($private[0]['data'])) ? 1 : 0); else - $res['private'] = 0; + $res['item_private'] = 0; $rawlocation = $item->get_item_tags(NAMESPACE_DFRN, 'location'); if($rawlocation) @@ -1419,21 +1420,21 @@ function get_atom_elements($feed,$item) { $rawowner = $item->get_item_tags(NAMESPACE_DFRN, 'owner'); if($rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data']) - $res['owner-name'] = unxmlify($rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data']); + $res['owner_name'] = unxmlify($rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data']); elseif($rawowner[0]['child'][NAMESPACE_DFRN]['name'][0]['data']) - $res['owner-name'] = unxmlify($rawowner[0]['child'][NAMESPACE_DFRN]['name'][0]['data']); + $res['owner_name'] = unxmlify($rawowner[0]['child'][NAMESPACE_DFRN]['name'][0]['data']); if($rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data']) - $res['owner-link'] = unxmlify($rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data']); + $res['owner_link'] = unxmlify($rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data']); elseif($rawowner[0]['child'][NAMESPACE_DFRN]['uri'][0]['data']) - $res['owner-link'] = unxmlify($rawowner[0]['child'][NAMESPACE_DFRN]['uri'][0]['data']); + $res['owner_link'] = unxmlify($rawowner[0]['child'][NAMESPACE_DFRN]['uri'][0]['data']); if($rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) { $base = $rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']; foreach($base as $link) { - if(!x($res, 'owner-avatar') || !$res['owner-avatar']) { + if(!x($res, 'owner_photo') || !$res['owner_photo']) { if($link['attribs']['']['rel'] === 'photo' || $link['attribs']['']['rel'] === 'avatar') - $res['owner-avatar'] = unxmlify($link['attribs']['']['href']); + $res['owner_photo'] = unxmlify($link['attribs']['']['href']); } } } @@ -1488,6 +1489,7 @@ function get_atom_elements($feed,$item) { $attach = $item->get_enclosures(); if($attach) { + $res['attach'] = array(); $att_arr = array(); foreach($attach as $att) { $len = intval($att->get_length()); @@ -1503,33 +1505,32 @@ function get_atom_elements($feed,$item) { $title = ' '; if(! $type) $type = 'application/octet-stream'; - - $att_arr[] = '[attach]href="' . $link . '" length="' . $len . '" type="' . $type . '" title="' . $title . '"[/attach]'; } - $res['attach'] = implode(',', $att_arr); + $res['attach'][] = array('href' => $link, 'length' => $len, 'type' => $type, 'title' => $title ); } $rawobj = $item->get_item_tags(NAMESPACE_ACTIVITY, 'object'); if($rawobj) { - $res['object'] = '' . "\n"; + $obj = array(); + $child = $rawobj[0]['child']; if($child[NAMESPACE_ACTIVITY]['obj_type'][0]['data']) { $res['obj_type'] = $child[NAMESPACE_ACTIVITY]['obj_type'][0]['data']; - $res['object'] .= '' . $child[NAMESPACE_ACTIVITY]['obj_type'][0]['data'] . '' . "\n"; + $obj['type'] = $child[NAMESPACE_ACTIVITY]['obj_type'][0]['data']; } if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'id') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data']) - $res['object'] .= '' . $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'] . '' . "\n"; + $obj['id'] = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data']; if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'link') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['link']) - $res['object'] .= '' . encode_rel_links($child[SIMPLEPIE_NAMESPACE_ATOM_10]['link']) . '' . "\n"; + $obj['link'] = encode_rel_links($child[SIMPLEPIE_NAMESPACE_ATOM_10]['link']); if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'title') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data']) - $res['object'] .= '' . $child[SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'] . '' . "\n"; + $obj['title'] = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data']; if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'content') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data']) { $body = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data']; if(! $body) $body = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['summary'][0]['data']; // preserve a copy of the original body content in case we later need to parse out any microformat information, e.g. events - $res['object'] .= '' . xmlify($body) . '' . "\n"; + $obj['orig'] = xmlify($body); if((strpos($body,'<') !== false) || (strpos($body,'>') !== false)) { $body = purify_html($body); @@ -1537,48 +1538,52 @@ function get_atom_elements($feed,$item) { } - $res['object'] .= '' . $body . '' . "\n"; + $obj['content'] = $body; } - $res['object'] .= '' . "\n"; + $res['object'] = $obj; } $rawobj = $item->get_item_tags(NAMESPACE_ACTIVITY, 'target'); if($rawobj) { - $res['target'] = '' . "\n"; + $obj = array(); + $child = $rawobj[0]['child']; if($child[NAMESPACE_ACTIVITY]['obj_type'][0]['data']) { - $res['target'] .= '' . $child[NAMESPACE_ACTIVITY]['obj_type'][0]['data'] . '' . "\n"; + $res['tgt_type'] = $child[NAMESPACE_ACTIVITY]['obj_type'][0]['data']; + $obj['type'] = $child[NAMESPACE_ACTIVITY]['obj_type'][0]['data']; } if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'id') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data']) - $res['target'] .= '' . $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'] . '' . "\n"; + $obj['id'] = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data']; if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'link') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['link']) - $res['target'] .= '' . encode_rel_links($child[SIMPLEPIE_NAMESPACE_ATOM_10]['link']) . '' . "\n"; - if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'data') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data']) - $res['target'] .= '' . $child[SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'] . '' . "\n"; - if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'data') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data']) { + $obj['link'] = encode_rel_links($child[SIMPLEPIE_NAMESPACE_ATOM_10]['link']); + if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'title') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data']) + $obj['title'] = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data']; + if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'content') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data']) { $body = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data']; if(! $body) $body = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['summary'][0]['data']; // preserve a copy of the original body content in case we later need to parse out any microformat information, e.g. events - $res['target'] .= '' . xmlify($body) . '' . "\n"; + $obj['orig'] = xmlify($body); if((strpos($body,'<') !== false) || (strpos($body,'>') !== false)) { $body = purify_html($body); $body = html2bbcode($body); + } - $res['target'] .= '' . $body . '' . "\n"; + $obj['content'] = $body; } - $res['target'] .= '' . "\n"; + $res['target'] = $obj; } // This is some experimental stuff. By now retweets are shown with "RT:" // But: There is data so that the message could be shown similar to native retweets // There is some better way to parse this array - but it didn't worked for me. +/* $child = $item->feed->data["child"][SIMPLEPIE_NAMESPACE_ATOM_10]["feed"][0]["child"][SIMPLEPIE_NAMESPACE_ATOM_10]["entry"][0]["child"]["http://activitystrea.ms/spec/1.0/"][object][0]["child"]; if (is_array($child)) { $message = $child["http://activitystrea.ms/spec/1.0/"]["object"][0]["child"][SIMPLEPIE_NAMESPACE_ATOM_10]["content"][0]["data"]; @@ -1601,6 +1606,8 @@ function get_atom_elements($feed,$item) { } } +*/ + $arr = array('feed' => $feed, 'item' => $item, 'result' => $res); call_hooks('parse_atom', $arr); @@ -1613,6 +1620,10 @@ function encode_rel_links($links) { $o = ''; if(! ((is_array($links)) && (count($links)))) return $o; + +//fixme + return ''; + foreach($links as $link) { $o .= ' $uid, 'item' => $item, 'body' => $body); call_hooks('tagged',$arr); - // Valid tag. Send a notification + /** + * Kill two birds with one stone. As long as we're here, send a mention notification. + */ require_once('include/enotify.php'); notification(array( @@ -2624,6 +2660,10 @@ function tag_deliver($uid,$item_id) { return; } + /** + * At this point we're committed to setting up a second delivery chain. We just have to mangle some bits first. + */ + logger('tag_deliver: creating second delivery chain.'); // now change this copy of the post to a forum head message and deliver to all the tgroup members @@ -2688,6 +2728,16 @@ function tag_deliver($uid,$item_id) { } +/** + * @function tgroup_check($uid,$item) + * + * This function is called pre-deliver to see if a post matches the criteria to be tag delivered. + * We don't actually do anything except check that it matches the criteria. + * This is so that the channel with tag_delivery enabled can receive the post even if they turn off + * permissions for the sender to send their stream. tag_deliver() can't be called until the post is actually stored. + * By then it would be too late to reject it. + */ + function tgroup_check($uid,$item) { @@ -2999,8 +3049,11 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) else $when = datetime_convert('UTC','UTC','now','Y-m-d H:i:s'); } + + if($deleted && is_array($contact)) { -/* $r = q("SELECT `item`.*, `contact`.`self` FROM `item` left join `contact` on `item`.`contact-id` = `contact`.`id` +/* + $r = q("SELECT `item`.*, `contact`.`self` FROM `item` left join `contact` on `item`.`contact-id` = `contact`.`id` WHERE `mid` = '%s' AND `item`.`uid` = %d AND `contact-id` = %d AND NOT `item`.`file` LIKE '%%[%%' LIMIT 1", dbesc($mid), intval($importer['channel_id']), @@ -3077,14 +3130,15 @@ logger('consume_feed: processing ' . $item_id); $item_id = $item->get_id(); $datarray = get_atom_elements($feed,$item); +/* if((! x($datarray,'author-name')) && ($contact['network'] != NETWORK_DFRN)) $datarray['author-name'] = $contact['name']; if((! x($datarray,'author-link')) && ($contact['network'] != NETWORK_DFRN)) $datarray['author-link'] = $contact['url']; if((! x($datarray,'author-avatar')) && ($contact['network'] != NETWORK_DFRN)) $datarray['author-avatar'] = $contact['thumb']; - - if((! x($datarray,'author-name')) || (! x($datarray,'author-link'))) { +*/ + if((! x($datarray,'author_name')) || (! x($datarray,'author_link'))) { logger('consume_feed: no author information! ' . print_r($datarray,true)); continue; } @@ -3119,7 +3173,8 @@ logger('consume_feed: processing ' . $item_id); $datarray['parent_mid'] = $parent_mid; $datarray['uid'] = $importer['channel_id']; - $datarray['contact-id'] = $contact['id']; +// $datarray['contact-id'] = $contact['id']; + if((activity_match($datarray['verb'],ACTIVITY_LIKE)) || (activity_match($datarray['verb'],ACTIVITY_DISLIKE))) { $datarray['type'] = 'activity'; $datarray['gravity'] = GRAVITY_LIKE; -- cgit v1.2.3 From 0fef39a3265602905d1f629c1209e8279c54f0d9 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 19 Aug 2014 22:47:11 -0700 Subject: fangs bared --- include/items.php | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/include/items.php b/include/items.php index 0392e07a0..30a685ed3 100755 --- a/include/items.php +++ b/include/items.php @@ -3005,7 +3005,7 @@ function mail_store($arr) { * recursion. */ -function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) { +function consume_feed($xml,$importer,&$contact,$pass = 0) { require_once('library/simplepie/simplepie.inc'); @@ -3361,6 +3361,28 @@ logger('consume_feed: ' . print_r($datarray,true)); } +function handle_feed($uid,$abook_id,$url) { + + require_once('include/Contact.php'); + $channel = channelx_by_n($uid); + if(! $channel) + return; + $x = q("select * from abook left join xchan on abook_xchan = xchan_hash where abook_id = %d and abook_channel = %d limit 1", + dbesc($abook_id), + intval($uid) + ); + + $recurse = 0; + $z = z_fetch_url($url,false,$recurse,array('novalidate' => true)); + +logger('handle_feed:' . print_r($z,true)); + + if($z['success']) { + consume_feed($z['body'],$channel,$x[0],0); + consume_feed($z['body'],$channel,$x[0],1); + } +} + function atom_author($tag,$name,$uri,$h,$w,$type,$photo) { $o = ''; -- cgit v1.2.3 From b1029869295e50040dba2cdc33c9ca797ca76ffb Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 20 Aug 2014 04:38:17 -0700 Subject: greatly simplify consume_feed() - a lot of this was friendica specific and somebody may want to put some of it back in, but we'd be much better off building a zot compatible feed for friendica (hint,hint) - even if it didn't support the other protocol bits. Special purpose feed handlers for things like likes, dislikes, events, and community tags are better handled as zot arrays. We have all those handlers. We just need to pass them a JSON message instead of an XML/Atom message. Handlers for statusnet follow messages are another casualty. That's easy to bring back - but we need to keep driving nails into the XML coffin or the damn zombies will get out. --- include/items.php | 244 +++++++++++------------------------------------------- version.inc | 2 +- 2 files changed, 50 insertions(+), 196 deletions(-) diff --git a/include/items.php b/include/items.php index 30a685ed3..03b493bc3 100755 --- a/include/items.php +++ b/include/items.php @@ -3019,10 +3019,6 @@ function consume_feed($xml,$importer,&$contact,$pass = 0) { $feed = new SimplePie(); $feed->set_raw_data($xml); - if($datedir) - $feed->enable_order_by_date(true); - else - $feed->enable_order_by_date(false); $feed->init(); if($feed->error()) @@ -3032,7 +3028,6 @@ function consume_feed($xml,$importer,&$contact,$pass = 0) { // Check at the feed level for updated contact name and/or photo - // process any deleted entries $del_entries = $feed->get_feed_tags(NAMESPACE_TOMB, 'deleted-entry'); @@ -3052,41 +3047,18 @@ function consume_feed($xml,$importer,&$contact,$pass = 0) { if($deleted && is_array($contact)) { -/* - $r = q("SELECT `item`.*, `contact`.`self` FROM `item` left join `contact` on `item`.`contact-id` = `contact`.`id` - WHERE `mid` = '%s' AND `item`.`uid` = %d AND `contact-id` = %d AND NOT `item`.`file` LIKE '%%[%%' LIMIT 1", + $r = q("SELECT * from item where mid = '%s' and author_xchan = '%s' and uid = %d limit 1", dbesc($mid), - intval($importer['channel_id']), - intval($contact['id']) + dbesc($contact['xchan_hash']), + intval($importer['channel_id']) ); -*/ - if(count($r)) { + + if($r) { $item = $r[0]; - if(! $item['deleted']) + if(! ($item['item_restrict'] & ITEM_DELETED)) { logger('consume_feed: deleting item ' . $item['id'] . ' mid=' . $item['mid'], LOGGER_DEBUG); - - if($item['mid'] == $item['parent_mid']) { - $r = q("UPDATE `item` SET item_restrict = (item_restrict | %d), `edited` = '%s', `changed` = '%s', - `body` = '', `title` = '' - WHERE `parent_mid` = '%s' AND `uid` = %d", - intval(ITEM_DELETED), - dbesc($when), - dbesc(datetime_convert()), - dbesc($item['mid']), - intval($importer['channel_id']) - ); - } - else { - $r = q("UPDATE `item` SET item_restrict = ( item_restrict | %d ), `edited` = '%s', `changed` = '%s', - `body` = '', `title` = '' - WHERE `mid` = '%s' AND `uid` = %d LIMIT 1", - intval(ITEM_DELETED), - dbesc($when), - dbesc(datetime_convert()), - dbesc($mid), - intval($importer['channel_id']) - ); + drop_item($item['id'],false); } } } @@ -3097,21 +3069,16 @@ function consume_feed($xml,$importer,&$contact,$pass = 0) { if($feed->get_item_quantity()) { - logger('consume_feed: feed item count = ' . $feed->get_item_quantity()); - - // in inverse date order - if ($datedir) - $items = array_reverse($feed->get_items()); - else - $items = $feed->get_items(); + logger('consume_feed: feed item count = ' . $feed->get_item_quantity(), LOGGER_DEBUG); + $items = $feed->get_items(); foreach($items as $item) { $is_reply = false; $item_id = $item->get_id(); -logger('consume_feed: processing ' . $item_id); + logger('consume_feed: processing ' . $item_id, LOGGER_DEBUG); $rawthread = $item->get_item_tags( NAMESPACE_THREAD,'in-reply-to'); if(isset($rawthread[0]['attribs']['']['ref'])) { @@ -3130,21 +3097,14 @@ logger('consume_feed: processing ' . $item_id); $item_id = $item->get_id(); $datarray = get_atom_elements($feed,$item); -/* - if((! x($datarray,'author-name')) && ($contact['network'] != NETWORK_DFRN)) - $datarray['author-name'] = $contact['name']; - if((! x($datarray,'author-link')) && ($contact['network'] != NETWORK_DFRN)) - $datarray['author-link'] = $contact['url']; - if((! x($datarray,'author-avatar')) && ($contact['network'] != NETWORK_DFRN)) - $datarray['author-avatar'] = $contact['thumb']; -*/ - if((! x($datarray,'author_name')) || (! x($datarray,'author_link'))) { - logger('consume_feed: no author information! ' . print_r($datarray,true)); - continue; - } + if(! x($datarray,'author_name')) + $datarray['author_name'] = $contact['xchan_name']; + if(! x($datarray,'author_link')) + $datarray['author_link'] = $contact['xchan_url']; + if(! x($datarray,'author_photo')) + $datarray['author_photo'] = $contact['xchan_photo_m']; - - $r = q("SELECT `uid`, `edited`, `body` FROM `item` WHERE `mid` = '%s' AND `uid` = %d LIMIT 1", + $r = q("SELECT edited FROM item WHERE mid = '%s' AND uid = %d LIMIT 1", dbesc($item_id), intval($importer['channel_id']) ); @@ -3152,70 +3112,26 @@ logger('consume_feed: processing ' . $item_id); // Update content if 'updated' changes if($r) { - if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) { + if((x($datarray,'edited') !== false) + && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) { // do not accept (ignore) an earlier edit than one we currently have. if(datetime_convert('UTC','UTC',$datarray['edited']) < $r[0]['edited']) continue; - $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `edited` = '%s' WHERE `mid` = '%s' AND `uid` = %d LIMIT 1", - dbesc($datarray['title']), - dbesc($datarray['body']), - dbesc(datetime_convert('UTC','UTC',$datarray['edited'])), - dbesc($item_id), - intval($importer['channel_id']) - ); + update_feed_item($importer['channel_id'],$datarray); } - continue; } - $datarray['parent_mid'] = $parent_mid; $datarray['uid'] = $importer['channel_id']; -// $datarray['contact-id'] = $contact['id']; - - if((activity_match($datarray['verb'],ACTIVITY_LIKE)) || (activity_match($datarray['verb'],ACTIVITY_DISLIKE))) { - $datarray['type'] = 'activity'; - $datarray['gravity'] = GRAVITY_LIKE; - // only one like or dislike per person - $r = q("select id from item where uid = %d and `contact-id` = %d and verb ='%s' and deleted = 0 and (`parent_mid` = '%s' OR `thr_parent` = '%s') limit 1", - intval($datarray['uid']), - intval($datarray['contact-id']), - dbesc($datarray['verb']), - dbesc($parent_mid), - dbesc($parent_mid) - ); - if($r && count($r)) - continue; - } - - if(($datarray['verb'] === ACTIVITY_TAG) && ($datarray['obj_type'] === ACTIVITY_OBJ_TAGTERM)) { - $xo = parse_xml_string($datarray['object'],false); - $xt = parse_xml_string($datarray['target'],false); + $datarray['author_xchan'] = $contact['xchan_hash']; - if($xt->type == ACTIVITY_OBJ_NOTE) { - $r = q("select * from item where `mid` = '%s' AND `uid` = %d limit 1", - dbesc($xt->id), - intval($importer['channel_id']) - ); - if(! count($r)) - continue; + // FIXME pull out the author and owner - // extract tag, if not duplicate, add to parent item - if($xo->id && $xo->content) { - $newtag = '#[zrl=' . $xo->id . ']'. $xo->content . '[/zrl]'; - if(! (stristr($r[0]['tag'],$newtag))) { - q("UPDATE item SET tag = '%s' WHERE id = %d LIMIT 1", - dbesc($r[0]['tag'] . (strlen($r[0]['tag']) ? ',' : '') . $newtag), - intval($r[0]['id']) - ); - } - } - } - } -logger('consume_feed: ' . print_r($datarray,true)); + logger('consume_feed: ' . print_r($datarray,true),LOGGER_DATA); // $xx = item_store($datarray); $r = $xx['item_id']; @@ -3231,43 +3147,21 @@ logger('consume_feed: ' . print_r($datarray,true)); $datarray = get_atom_elements($feed,$item); if(is_array($contact)) { - if((! x($datarray,'author-name')) && ($contact['network'] != NETWORK_DFRN)) - $datarray['author-name'] = $contact['name']; - if((! x($datarray,'author-link')) && ($contact['network'] != NETWORK_DFRN)) - $datarray['author-link'] = $contact['url']; - if((! x($datarray,'author-avatar')) && ($contact['network'] != NETWORK_DFRN)) - $datarray['author-avatar'] = $contact['thumb']; + if(! x($datarray,'author_name')) + $datarray['author_name'] = $contact['xchan_name']; + if(! x($datarray,'author_link')) + $datarray['author_link'] = $contact['xchan_url']; + if(! x($datarray,'author_photo')) + $datarray['author_photo'] = $contact['xchan_photo_m']; } - if((! x($datarray,'author-name')) || (! x($datarray,'author-link'))) { + if((! x($datarray,'author_name')) || (! x($datarray,'author_link'))) { logger('consume_feed: no author information! ' . print_r($datarray,true)); continue; } - // special handling for events - - if((x($datarray,'obj_type')) && ($datarray['obj_type'] === ACTIVITY_OBJ_EVENT)) { - $ev = bbtoevent($datarray['body']); - if(x($ev,'desc') && x($ev,'start')) { - $ev['uid'] = $importer['channel_id']; - $ev['mid'] = $item_id; - $ev['edited'] = $datarray['edited']; - $ev['private'] = $datarray['private']; - - if(is_array($contact)) - $ev['cid'] = $contact['id']; - $r = q("SELECT * FROM `event` WHERE `mid` = '%s' AND `uid` = %d LIMIT 1", - dbesc($item_id), - intval($importer['channel_id']) - ); - if(count($r)) - $ev['id'] = $r[0]['id']; -// $xyz = event_store($ev); - continue; - } - } - $r = q("SELECT `uid`, `edited`, `body` FROM `item` WHERE `mid` = '%s' AND `uid` = %d LIMIT 1", + $r = q("SELECT edited FROM item WHERE mid = '%s' AND uid = %d LIMIT 1", dbesc($item_id), intval($importer['channel_id']) ); @@ -3275,79 +3169,32 @@ logger('consume_feed: ' . print_r($datarray,true)); // Update content if 'updated' changes if($r) { - if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) { + if((x($datarray,'edited') !== false) + && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) { // do not accept (ignore) an earlier edit than one we currently have. if(datetime_convert('UTC','UTC',$datarray['edited']) < $r[0]['edited']) continue; - $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `edited` = '%s' WHERE `mid` = '%s' AND `uid` = %d LIMIT 1", - dbesc($datarray['title']), - dbesc($datarray['body']), - dbesc(datetime_convert('UTC','UTC',$datarray['edited'])), - dbesc($item_id), - intval($importer['channel_id']) - ); + update_feed_item($importer['channel_id'],$datarray); } continue; } - if(activity_match($datarray['verb'],ACTIVITY_FOLLOW)) { - logger('consume-feed: New follower'); - new_follower($importer,$contact,$datarray,$item); - return; - } - if(activity_match($datarray['verb'],ACTIVITY_UNFOLLOW)) { - lose_follower($importer,$contact,$datarray,$item); - return; - } - - if(activity_match($datarray['verb'],ACTIVITY_REQ_FRIEND)) { - logger('consume-feed: New friend request'); - new_follower($importer,$contact,$datarray,$item,true); - return; - } - if(activity_match($datarray['verb'],ACTIVITY_UNFRIEND)) { - lose_sharer($importer,$contact,$datarray,$item); - return; - } - - -// if(! is_array($contact)) -// return; - - - // This is my contact on another system, but it's really me. - // Turn this into a wall post. - - if($contact['remote_self']) { - $datarray['wall'] = 1; - } $datarray['parent_mid'] = $item_id; $datarray['uid'] = $importer['channel_id']; - $datarray['contact-id'] = $contact['id']; - - if(! link_compare($datarray['owner-link'],$contact['url'])) { - // The item owner info is not our contact. It's OK and is to be expected if this is a tgroup delivery, - // but otherwise there's a possible data mixup on the sender's system. - // the tgroup delivery code called from item_store will correct it if it's a forum, - // but we're going to unconditionally correct it here so that the post will always be owned by our contact. - logger('consume_feed: Correcting item owner.', LOGGER_DEBUG); - $datarray['owner-name'] = $contact['name']; - $datarray['owner-link'] = $contact['url']; - $datarray['owner-avatar'] = $contact['thumb']; - } + $datarray['author_xchan'] = $contact['author_xchan']; - // We've allowed "followers" to reach this point so we can decide if they are - // posting an @-tag delivery, which followers are allowed to do for certain - // page types. Now that we've parsed the post, let's check if it is legit. Otherwise ignore it. +// if(! link_compare($datarray['owner_link'],$contact['xchan_url'])) { +// logger('consume_feed: Correcting item owner.', LOGGER_DEBUG); +// $datarray['owner-name'] = $contact['name']; +// $datarray['owner-link'] = $contact['url']; +// $datarray['owner-avatar'] = $contact['thumb']; +// } - if(($contact['rel'] == CONTACT_IS_FOLLOWER) && (! tgroup_check($importer['channel_id'],$datarray))) - continue; - -logger('consume_feed: ' . print_r($datarray,true)); + logger('consume_feed: ' . print_r($datarray,true),LOGGER_DATA); // $xx = item_store($datarray); $r = $xx['item_id']; @@ -3358,6 +3205,13 @@ logger('consume_feed: ' . print_r($datarray,true)); } +} + +function update_feed_item($uid,$datarray) { + + logger('update_feed_item: ' . $uid . ' ' . print_r($datarray,true), LOGGER_DATA); + + } diff --git a/version.inc b/version.inc index 6ca87b875..ed8a8be13 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-08-19.772 +2014-08-20.773 -- cgit v1.2.3 From ecf8b707943351387720c39c0c67b056e070039e Mon Sep 17 00:00:00 2001 From: zottel Date: Wed, 20 Aug 2014 14:44:55 +0200 Subject: updated German main.bb doco file --- doc/de/main.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/de/main.bb b/doc/de/main.bb index 1c8031c3e..7a4c8ebe2 100644 --- a/doc/de/main.bb +++ b/doc/de/main.bb @@ -58,6 +58,7 @@ Zot ist das großartige neue Kommunikationsprotokoll, das extra für die Red-Mat [zrl=[baseurl]/help/developers]Entwickler[/zrl] [zrl=[baseurl]/help/intro_for_developers]Einführung für Entwickler[/zrl] [zrl=[baseurl]/help/api_functions]API-Funktionen[/zrl] +[zrl=[baseurl]/help/api_posting]Mit der API einen Beitrag erstellen[/zrl] [zrl=[baseurl]/help/developer_function_primer]Übersicht der wichtigsten Red-Funktionen[/zrl] [zrl=[baseurl]/doc/html/]Code-Referenz (mit doxygen generiert - setzt Cookies)[/zrl] [zrl=[baseurl]/help/to_do_doco]To-Do-Liste für das Projekt Red-Dokumentation[/zrl] -- cgit v1.2.3 From f7895d322e30ce3d69689c1646fd0056d195e5a8 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 20 Aug 2014 16:10:57 -0700 Subject: provide admin option for allowing rss/atom feed connections. Need to do this now before the feature is complete so that public sites don't get borked. We also will need a service class for this. --- mod/admin.php | 50 +++++-------------------------------------------- view/tpl/admin_site.tpl | 1 + 2 files changed, 6 insertions(+), 45 deletions(-) diff --git a/mod/admin.php b/mod/admin.php index 14657bd1a..5df63636a 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -265,50 +265,10 @@ function admin_page_site_post(&$a){ $delivery_interval = ((x($_POST,'delivery_interval'))? intval(trim($_POST['delivery_interval'])) : 0); $poll_interval = ((x($_POST,'poll_interval'))? intval(trim($_POST['poll_interval'])) : 0); $maxloadavg = ((x($_POST,'maxloadavg'))? intval(trim($_POST['maxloadavg'])) : 50); -// $ssl_policy = ((x($_POST,'ssl_policy')) ? intval($_POST['ssl_policy']) : 0); -/* - if($ssl_policy != intval(get_config('system','ssl_policy'))) { - if($ssl_policy == SSL_POLICY_FULL) { - q("update `contact` set - `url` = replace(`url` , 'http:' , 'https:'), - `photo` = replace(`photo` , 'http:' , 'https:'), - `thumb` = replace(`thumb` , 'http:' , 'https:'), - `micro` = replace(`micro` , 'http:' , 'https:'), - `request` = replace(`request`, 'http:' , 'https:'), - `notify` = replace(`notify` , 'http:' , 'https:'), - `poll` = replace(`poll` , 'http:' , 'https:'), - `confirm` = replace(`confirm`, 'http:' , 'https:'), - `poco` = replace(`poco` , 'http:' , 'https:') - where `self` = 1" - ); - q("update `profile` set - `photo` = replace(`photo` , 'http:' , 'https:'), - `thumb` = replace(`thumb` , 'http:' , 'https:') - where 1 " - ); - } - elseif($ssl_policy == SSL_POLICY_SELFSIGN) { - q("update `contact` set - `url` = replace(`url` , 'https:' , 'http:'), - `photo` = replace(`photo` , 'https:' , 'http:'), - `thumb` = replace(`thumb` , 'https:' , 'http:'), - `micro` = replace(`micro` , 'https:' , 'http:'), - `request` = replace(`request`, 'https:' , 'http:'), - `notify` = replace(`notify` , 'https:' , 'http:'), - `poll` = replace(`poll` , 'https:' , 'http:'), - `confirm` = replace(`confirm`, 'https:' , 'http:'), - `poco` = replace(`poco` , 'https:' , 'http:') - where `self` = 1" - ); - q("update `profile` set - `photo` = replace(`photo` , 'https:' , 'http:'), - `thumb` = replace(`thumb` , 'https:' , 'http:') - where 1 " - ); - } - } -*/ -// set_config('system','ssl_policy',$ssl_policy); + $feed_contacts = ((x($_POST,'feed_contacts')) ? intval($_POST['feed_contacts']) : 0); + + + set_config('system','feed_contacts',$feed_contacts); set_config('system','delivery_interval',$delivery_interval); set_config('system','poll_interval',$poll_interval); set_config('system','maxloadavg',$maxloadavg); @@ -464,7 +424,7 @@ function admin_page_site(&$a) { '$theme_mobile' => array('theme_mobile', t("Mobile system theme"), get_config('system','mobile_theme'), t("Theme for mobile devices"), $theme_choices_mobile), '$theme_accessibility' => array('theme_accessibility', t("Accessibility system theme"), get_config('system','accessibility_theme'), t("Accessibility theme"), $theme_choices_accessibility), '$site_channel' => array('site_channel', t("Channel to use for this website's static pages"), get_config('system','site_channel'), t("Site Channel")), -// '$ssl_policy' => array('ssl_policy', t("SSL link policy"), (string) intval(get_config('system','ssl_policy')), t("Determines whether generated links should be forced to use SSL"), $ssl_choices), + '$feed_contacts' => array('feed_contacts', t('Allow Feeds as Connections'),get_config('system','feed_contacts'),t('(Heavy system resource usage)')), '$maximagesize' => array('maximagesize', t("Maximum image size"), intval(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("Does this site allow new member registration?"), get_config('system','register_policy'), "", $register_choices), '$access_policy' => array('access_policy', t("Which best describes the types of account offered by this hub?"), get_config('system','access_policy'), "This is displayed on the public server site list.", $access_choices), diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index c6c15cec4..2a7742a3e 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -65,6 +65,7 @@

    {{$corporate}}

    {{include file="field_checkbox.tpl" field=$block_public}} + {{include file="field_checkbox.tpl" field=$feed_contacts}} {{include file="field_checkbox.tpl" field=$force_publish}} {{include file="field_checkbox.tpl" field=$disable_discover_tab}} -- cgit v1.2.3 From a6829f7dcb6735ee0b2f003647cc168e55002a5f Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 20 Aug 2014 17:15:13 -0700 Subject: move Friendica photo migrator to addons, bring back a few XML scraping functions that we're going to require (unfortunately) --- include/network.php | 166 ++++++++++++++++++++++++++++++++++++++++++++++++- mod/frphotos.php | 87 -------------------------- util/frphotohelper.php | 75 ---------------------- view/tpl/frphotos.tpl | 13 ---- 4 files changed, 165 insertions(+), 176 deletions(-) delete mode 100644 mod/frphotos.php delete mode 100644 util/frphotohelper.php delete mode 100644 view/tpl/frphotos.tpl diff --git a/include/network.php b/include/network.php index 1a974a681..614049299 100644 --- a/include/network.php +++ b/include/network.php @@ -965,4 +965,168 @@ logger('fetch_xrd_links: ' . $url); logger('fetch_xrd_links: ' . print_r($links,true), LOGGER_DATA); return $links; -} \ No newline at end of file +} + + +function scrape_vcard($url) { + + $a = get_app(); + + $ret = array(); + + logger('scrape_vcard: url=' . $url); + + $x = z_fetch_url($url); + if(! $x['success']) + return $ret; + + $s = $x['body']; + + if(! $s) + return $ret; + + $headers = $x['header']; + $lines = explode("\n",$headers); + if(count($lines)) { + foreach($lines as $line) { + // don't try and run feeds through the html5 parser + if(stristr($line,'content-type:') && ((stristr($line,'application/atom+xml')) || (stristr($line,'application/rss+xml')))) + return ret; + } + } + + try { + $dom = HTML5_Parser::parse($s); + } catch (DOMException $e) { + logger('scrape_vcard: parse error: ' . $e); + } + + if(! $dom) + return $ret; + + // Pull out hCard profile elements + + $largest_photo = 0; + + $items = $dom->getElementsByTagName('*'); + foreach($items as $item) { + if(attribute_contains($item->getAttribute('class'), 'vcard')) { + $level2 = $item->getElementsByTagName('*'); + foreach($level2 as $x) { + if(attribute_contains($x->getAttribute('class'),'fn')) + $ret['fn'] = $x->textContent; + if((attribute_contains($x->getAttribute('class'),'photo')) + || (attribute_contains($x->getAttribute('class'),'avatar'))) { + $size = intval($x->getAttribute('width')); + if(($size > $largest_photo) || (! $largest_photo)) { + $ret['photo'] = $x->getAttribute('src'); + $largest_photo = $size; + } + } + if((attribute_contains($x->getAttribute('class'),'nickname')) + || (attribute_contains($x->getAttribute('class'),'uid'))) { + $ret['nick'] = $x->textContent; + } + } + } + } + + return $ret; +} + + + +function scrape_feed($url) { + + $a = get_app(); + + $ret = array(); + $level = 0; + $x = z_fetch_url($url,false,$level,array('novalidate' => true)); + + if(! $x['success']) + return $ret; + + $headers = $x['header']; + $code = $x['return_code']; + $s = $x['body']; + + logger('scrape_feed: returns: ' . $code . ' headers=' . $headers, LOGGER_DEBUG); + + if(! $s) { + logger('scrape_feed: no data returned for ' . $url); + return $ret; + } + + + $lines = explode("\n",$headers); + if(count($lines)) { + foreach($lines as $line) { + if(stristr($line,'content-type:')) { + if(stristr($line,'application/atom+xml') || stristr($s,'')) { + $ret['feed_rss'] = $url; + return $ret; + } + } + + try { + $dom = HTML5_Parser::parse($s); + } catch (DOMException $e) { + logger('scrape_feed: parse error: ' . $e); + } + + if(! $dom) { + logger('scrape_feed: failed to parse.'); + return $ret; + } + + + $head = $dom->getElementsByTagName('base'); + if($head) { + foreach($head as $head0) { + $basename = $head0->getAttribute('href'); + break; + } + } + if(! $basename) + $basename = implode('/', array_slice(explode('/',$url),0,3)) . '/'; + + $items = $dom->getElementsByTagName('link'); + + // get Atom/RSS link elements, take the first one of either. + + if($items) { + foreach($items as $item) { + $x = $item->getAttribute('rel'); + if(($x === 'alternate') && ($item->getAttribute('type') === 'application/atom+xml')) { + if(! x($ret,'feed_atom')) + $ret['feed_atom'] = $item->getAttribute('href'); + } + if(($x === 'alternate') && ($item->getAttribute('type') === 'application/rss+xml')) { + if(! x($ret,'feed_rss')) + $ret['feed_rss'] = $item->getAttribute('href'); + } + } + } + + // Drupal and perhaps others only provide relative URL's. Turn them into absolute. + + if(x($ret,'feed_atom') && (! strstr($ret['feed_atom'],'://'))) + $ret['feed_atom'] = $basename . $ret['feed_atom']; + if(x($ret,'feed_rss') && (! strstr($ret['feed_rss'],'://'))) + $ret['feed_rss'] = $basename . $ret['feed_rss']; + + return $ret; +} + diff --git a/mod/frphotos.php b/mod/frphotos.php deleted file mode 100644 index 8d6197fa3..000000000 --- a/mod/frphotos.php +++ /dev/null @@ -1,87 +0,0 @@ -get_channel(); - - $fr_server = $_REQUEST['fr_server']; - $fr_username = $_REQUEST['fr_username']; - $fr_password = $_REQUEST['fr_password']; - - $cookies = 'store/[data]/frphoto_cookie_' . $channel['channel_address']; - - if($fr_server && $fr_username && $fr_password) { - - $ch = curl_init($fr_server . '/api/friendica/photos/list'); - - curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); - curl_setopt ($ch, CURLOPT_COOKIEFILE, $cookies); - curl_setopt ($ch, CURLOPT_COOKIEJAR, $cookies); - curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_BASIC); - curl_setopt($ch, CURLOPT_USERPWD, $fr_username . ':' . $fr_password); - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); - curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); - curl_setopt($ch, CURLOPT_USERAGENT, 'RedMatrix'); - - $output = curl_exec($ch); - curl_close($ch); - - $j = json_decode($output,true); - -// echo print_r($j,true); - - $total = 0; - if(count($j)) { - foreach($j as $jj) { - - $r = q("select uid from photo where resource_id = '%s' and uid = %d limit 1", - dbesc($jj), - intval($channel['channel_id']) - ); - if($r) - continue; - - $total ++; - proc_run('php','util/frphotohelper.php',$jj, $channel['channel_address'], urlencode($fr_server)); - sleep(3); - } - } - if($total) { - set_pconfig(local_user(),'frphotos','complete','1'); - } - @unlink($cookies); - goaway(z_root() . '/photos/' . $channel['channel_address']); - } -} - - -function frphotos_content(&$a) { - - if(! local_user()) { - notice( t('Permission denied') . EOL); - return; - } - - if(intval(get_pconfig(local_user(),'frphotos','complete'))) { - info('Friendica photos have already been imported into this channel.'); - return; - } - - $o = replace_macros(get_markup_template('frphotos.tpl'),array( - '$header' => t('Friendica Photo Album Import'), - '$desc' => t('This will import all your Friendica photo albums to this Red channel.'), - '$fr_server' => array('fr_server', t('Friendica Server base URL'),'',''), - '$fr_username' => array('fr_username', t('Friendica Login Username'),'',''), - '$fr_password' => array('fr_password', t('Friendica Login Password'),'',''), - '$submit' => t('Submit'), - )); - return $o; -} diff --git a/util/frphotohelper.php b/util/frphotohelper.php deleted file mode 100644 index 484e7fcaf..000000000 --- a/util/frphotohelper.php +++ /dev/null @@ -1,75 +0,0 @@ -{{$header}} - -

    {{$desc}}

    - -
    - -{{include file="field_input.tpl" field=$fr_server}} -{{include file="field_input.tpl" field=$fr_username}} -{{include file="field_password.tpl" field=$fr_password}} - - -
    - -- cgit v1.2.3 From a169e5c4f3b54003a6a4dfaf61269eb18f34f17a Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 20 Aug 2014 18:35:36 -0700 Subject: restructure the author and owner info from feeds --- include/items.php | 143 ++++++++++++++++++++++-------------------------------- 1 file changed, 58 insertions(+), 85 deletions(-) diff --git a/include/items.php b/include/items.php index 03b493bc3..e5c9549e2 100755 --- a/include/items.php +++ b/include/items.php @@ -1224,21 +1224,21 @@ function get_profile_elements($x) { -function get_atom_elements($feed,$item) { +function get_atom_elements($feed,$item,&$author) { $best_photo = array(); $res = array(); - $author = $item->get_author(); - if($author) { - $res['author_name'] = unxmlify($author->get_name()); - $res['author_link'] = unxmlify($author->get_link()); + $found_author = $item->get_author(); + if($found_author) { + $author['author_name'] = unxmlify($found_author->get_name()); + $author['author_link'] = unxmlify($found_author->get_link()); } else { - $res['author_name'] = unxmlify($feed->get_title()); - $res['author_link'] = unxmlify($feed->get_permalink()); + $author['author_name'] = unxmlify($feed->get_title()); + $author['author_link'] = unxmlify($feed->get_permalink()); } $res['mid'] = unxmlify($item->get_id()); @@ -1265,9 +1265,9 @@ function get_atom_elements($feed,$item) { if($rawauthor && $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) { $base = $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']; foreach($base as $link) { - if(!x($res, 'author_photo') || !$res['author_photo']) { + if(!x($author, 'author_photo') || ! $author['author_photo']) { if($link['attribs']['']['rel'] === 'photo' || $link['attribs']['']['rel'] === 'avatar') - $res['author_photo'] = unxmlify($link['attribs']['']['href']); + $author['author_photo'] = unxmlify($link['attribs']['']['href']); } } } @@ -1279,10 +1279,10 @@ function get_atom_elements($feed,$item) { if($base && count($base)) { foreach($base as $link) { if($link['attribs']['']['rel'] === 'alternate' && (! $res['author_link'])) - $res['author_link'] = unxmlify($link['attribs']['']['href']); - if(!x($res, 'author_photo') || !$res['author_photo']) { + $author['author_link'] = unxmlify($link['attribs']['']['href']); + if(!x($author, 'author_photo') || ! $author['author_photo']) { if($link['attribs']['']['rel'] === 'avatar' || $link['attribs']['']['rel'] === 'photo') - $res['author_photo'] = unxmlify($link['attribs']['']['href']); + $author['author_photo'] = unxmlify($link['attribs']['']['href']); } } } @@ -1290,16 +1290,16 @@ function get_atom_elements($feed,$item) { // No photo/profile-link on the item - look at the feed level - if((! (x($res,'author_link'))) || (! (x($res,'author_photo')))) { + if((! (x($author,'author_link'))) || (! (x($author,'author_photo')))) { $rawauthor = $feed->get_feed_tags(SIMPLEPIE_NAMESPACE_ATOM_10,'author'); if($rawauthor && $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) { $base = $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']; foreach($base as $link) { - if($link['attribs']['']['rel'] === 'alternate' && (! $res['author_link'])) - $res['author_link'] = unxmlify($link['attribs']['']['href']); - if(! $res['author_photo']) { + if($link['attribs']['']['rel'] === 'alternate' && (! $author['author_link'])) + $author['author_link'] = unxmlify($link['attribs']['']['href']); + if(! $author['author_photo']) { if($link['attribs']['']['rel'] === 'photo' || $link['attribs']['']['rel'] === 'avatar') - $res['author_photo'] = unxmlify($link['attribs']['']['href']); + $author['author_photo'] = unxmlify($link['attribs']['']['href']); } } } @@ -1312,10 +1312,10 @@ function get_atom_elements($feed,$item) { if($base && count($base)) { foreach($base as $link) { if($link['attribs']['']['rel'] === 'alternate' && (! $res['author_link'])) - $res['author_link'] = unxmlify($link['attribs']['']['href']); - if(! (x($res,'author_photo'))) { + $author['author_link'] = unxmlify($link['attribs']['']['href']); + if(! (x($author,'author_photo'))) { if($link['attribs']['']['rel'] === 'avatar' || $link['attribs']['']['rel'] === 'photo') - $res['author_photo'] = unxmlify($link['attribs']['']['href']); + $author['author_photo'] = unxmlify($link['attribs']['']['href']); } } } @@ -1419,22 +1419,25 @@ function get_atom_elements($feed,$item) { $res['edited'] = datetime_convert(); $rawowner = $item->get_item_tags(NAMESPACE_DFRN, 'owner'); + if(! $rawowner) + $rawowner = $item->get_item_tags(NAMESPACE_ZOT,'owner'); + if($rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data']) - $res['owner_name'] = unxmlify($rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data']); + $author['owner_name'] = unxmlify($rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data']); elseif($rawowner[0]['child'][NAMESPACE_DFRN]['name'][0]['data']) - $res['owner_name'] = unxmlify($rawowner[0]['child'][NAMESPACE_DFRN]['name'][0]['data']); + $author['owner_name'] = unxmlify($rawowner[0]['child'][NAMESPACE_DFRN]['name'][0]['data']); if($rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data']) - $res['owner_link'] = unxmlify($rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data']); + $author['owner_link'] = unxmlify($rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data']); elseif($rawowner[0]['child'][NAMESPACE_DFRN]['uri'][0]['data']) - $res['owner_link'] = unxmlify($rawowner[0]['child'][NAMESPACE_DFRN]['uri'][0]['data']); + $author['owner_link'] = unxmlify($rawowner[0]['child'][NAMESPACE_DFRN]['uri'][0]['data']); if($rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) { $base = $rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']; foreach($base as $link) { - if(!x($res, 'owner_photo') || !$res['owner_photo']) { + if(!x($author, 'owner_photo') || ! $author['owner_photo']) { if($link['attribs']['']['rel'] === 'photo' || $link['attribs']['']['rel'] === 'avatar') - $res['owner_photo'] = unxmlify($link['attribs']['']['href']); + $author['owner_photo'] = unxmlify($link['attribs']['']['href']); } } } @@ -1579,39 +1582,11 @@ function get_atom_elements($feed,$item) { $res['target'] = $obj; } - // This is some experimental stuff. By now retweets are shown with "RT:" - // But: There is data so that the message could be shown similar to native retweets - // There is some better way to parse this array - but it didn't worked for me. - -/* - $child = $item->feed->data["child"][SIMPLEPIE_NAMESPACE_ATOM_10]["feed"][0]["child"][SIMPLEPIE_NAMESPACE_ATOM_10]["entry"][0]["child"]["http://activitystrea.ms/spec/1.0/"][object][0]["child"]; - if (is_array($child)) { - $message = $child["http://activitystrea.ms/spec/1.0/"]["object"][0]["child"][SIMPLEPIE_NAMESPACE_ATOM_10]["content"][0]["data"]; - $author = $child[SIMPLEPIE_NAMESPACE_ATOM_10]["author"][0]["child"][SIMPLEPIE_NAMESPACE_ATOM_10]; - $uri = $author["uri"][0]["data"]; - $name = $author["name"][0]["data"]; - $avatar = @array_shift($author["link"][2]["attribs"]); - $avatar = $avatar["href"]; - - if (($name != "") and ($uri != "") and ($avatar != "") and ($message != "")) { - $res["owner-name"] = $res["author-name"]; - $res["owner-link"] = $res["author-link"]; - $res["owner-avatar"] = $res["author-avatar"]; - - $res["author-name"] = $name; - $res["author-link"] = $uri; - $res["author-avatar"] = $avatar; - - $res["body"] = html2bbcode($message); - } - } - -*/ - $arr = array('feed' => $feed, 'item' => $item, 'result' => $res); call_hooks('parse_atom', $arr); - logger('get_atom_elements: ' . print_r($res,true)); + logger('get_atom_elements: author: ' . print_r($author,true),LOGGER_DATA); + logger('get_atom_elements: ' . print_r($res,true),LOGGER_DATA); return $res; } @@ -1621,9 +1596,6 @@ function encode_rel_links($links) { if(! ((is_array($links)) && (count($links)))) return $o; -//fixme - return ''; - foreach($links as $link) { $o .= 'set_raw_data($xml); $feed->init(); @@ -3095,14 +3064,15 @@ function consume_feed($xml,$importer,&$contact,$pass = 0) { // Have we seen it? If not, import it. $item_id = $item->get_id(); - $datarray = get_atom_elements($feed,$item); + $author = array(); + $datarray = get_atom_elements($feed,$item,$author); - if(! x($datarray,'author_name')) - $datarray['author_name'] = $contact['xchan_name']; - if(! x($datarray,'author_link')) - $datarray['author_link'] = $contact['xchan_url']; - if(! x($datarray,'author_photo')) - $datarray['author_photo'] = $contact['xchan_photo_m']; + if(! x($author,'author_name')) + $author['author_name'] = $contact['xchan_name']; + if(! x($author,'author_link')) + $author['author_link'] = $contact['xchan_url']; + if(! x($author,'author_photo')) + $author['author_photo'] = $contact['xchan_photo_m']; $r = q("SELECT edited FROM item WHERE mid = '%s' AND uid = %d LIMIT 1", dbesc($item_id), @@ -3126,6 +3096,8 @@ function consume_feed($xml,$importer,&$contact,$pass = 0) { $datarray['parent_mid'] = $parent_mid; $datarray['uid'] = $importer['channel_id']; + +//FIXME $datarray['author_xchan'] = $contact['xchan_hash']; // FIXME pull out the author and owner @@ -3143,20 +3115,20 @@ function consume_feed($xml,$importer,&$contact,$pass = 0) { // Head post of a conversation. Have we seen it? If not, import it. $item_id = $item->get_id(); - - $datarray = get_atom_elements($feed,$item); + $author = array(); + $datarray = get_atom_elements($feed,$item,$author); if(is_array($contact)) { - if(! x($datarray,'author_name')) - $datarray['author_name'] = $contact['xchan_name']; - if(! x($datarray,'author_link')) - $datarray['author_link'] = $contact['xchan_url']; - if(! x($datarray,'author_photo')) - $datarray['author_photo'] = $contact['xchan_photo_m']; + if(! x($author,'author_name')) + $author['author_name'] = $contact['xchan_name']; + if(! x($author,'author_link')) + $author['author_link'] = $contact['xchan_url']; + if(! x($author,'author_photo')) + $author['author_photo'] = $contact['xchan_photo_m']; } - if((! x($datarray,'author_name')) || (! x($datarray,'author_link'))) { - logger('consume_feed: no author information! ' . print_r($datarray,true)); + if((! x($author,'author_name')) || (! x($author,'author_link'))) { + logger('consume_feed: no author information! ' . print_r($author,true)); continue; } @@ -3185,14 +3157,15 @@ function consume_feed($xml,$importer,&$contact,$pass = 0) { $datarray['parent_mid'] = $item_id; $datarray['uid'] = $importer['channel_id']; +//FIXME $datarray['author_xchan'] = $contact['author_xchan']; -// if(! link_compare($datarray['owner_link'],$contact['xchan_url'])) { -// logger('consume_feed: Correcting item owner.', LOGGER_DEBUG); -// $datarray['owner-name'] = $contact['name']; -// $datarray['owner-link'] = $contact['url']; -// $datarray['owner-avatar'] = $contact['thumb']; -// } + if(! link_compare($author['owner_link'],$contact['xchan_url'])) { + logger('consume_feed: Correcting item owner.', LOGGER_DEBUG); + $author['owner-name'] = $contact['name']; + $author['owner-link'] = $contact['url']; + $author['owner-avatar'] = $contact['thumb']; + } logger('consume_feed: ' . print_r($datarray,true),LOGGER_DATA); -- cgit v1.2.3 From b8a5b7a610fa940297b4bd3f66c912c3f3e7e161 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 20 Aug 2014 19:36:01 -0700 Subject: restrict returned directory contents to xchans in the zot network. We could probably add other networks to this and create a distributed directory for the free web. It's highly unlikely we would do this but we *could*. --- mod/dirsearch.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mod/dirsearch.php b/mod/dirsearch.php index b72d303b7..96e576a19 100644 --- a/mod/dirsearch.php +++ b/mod/dirsearch.php @@ -154,7 +154,7 @@ function dirsearch_content(&$a) { else { $qlimit = " LIMIT " . intval($startrec) . " , " . intval($perpage); if($return_total) { - $r = q("SELECT COUNT(xchan_hash) AS `total` FROM xchan left join xprof on xchan_hash = xprof_hash where $logic $sql_extra and not ( xchan_flags & %d) and not ( xchan_flags & %d ) and not ( xchan_flags & %d ) $safesql ", + $r = q("SELECT COUNT(xchan_hash) AS `total` FROM xchan left join xprof on xchan_hash = xprof_hash where $logic $sql_extra and xchan_network = 'zot' and not ( xchan_flags & %d) and not ( xchan_flags & %d ) and not ( xchan_flags & %d ) $safesql ", intval(XCHAN_FLAGS_HIDDEN), intval(XCHAN_FLAGS_ORPHAN), intval(XCHAN_FLAGS_DELETED) @@ -199,7 +199,7 @@ function dirsearch_content(&$a) { json_return_and_die($spkt); } else { - $r = q("SELECT xchan.*, xprof.* from xchan left join xprof on xchan_hash = xprof_hash where ( $logic $sql_extra ) and not ( xchan_flags & %d ) and not ( xchan_flags & %d ) and not ( xchan_flags & %d ) $safesql $order $qlimit ", + $r = q("SELECT xchan.*, xprof.* from xchan left join xprof on xchan_hash = xprof_hash where ( $logic $sql_extra ) and xchan_network = 'zot' and not ( xchan_flags & %d ) and not ( xchan_flags & %d ) and not ( xchan_flags & %d ) $safesql $order $qlimit ", intval(XCHAN_FLAGS_HIDDEN), intval(XCHAN_FLAGS_ORPHAN), intval(XCHAN_FLAGS_DELETED) -- cgit v1.2.3 From af45b34ee044966210e6101585fe362acf1ca098 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 20 Aug 2014 20:49:03 -0700 Subject: verified that chatroom expire is working, so doing away with the second function to do the same thing. If you have a problem with chatroom expiration, check that it was created with cr_expire set to 120 (minutes). Chatrooms created during the first couple of days of the chat feature didn't have this. You can set the DB value manually. --- boot.php | 5 ----- include/chat.php | 23 ++++------------------- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/boot.php b/boot.php index 267999d07..f8bd29f37 100755 --- a/boot.php +++ b/boot.php @@ -358,11 +358,6 @@ define ( 'MAX_LIKERS', 10); define ( 'ZCURL_TIMEOUT' , (-1)); -/** - * Hours before chat lines are deleted - */ - -define ( 'MAX_CHATROOM_HOURS' , 36); /** * email notification options diff --git a/include/chat.php b/include/chat.php index 5f69853e7..b8fb185df 100644 --- a/include/chat.php +++ b/include/chat.php @@ -128,8 +128,10 @@ function chatroom_enter($observer_xchan,$room_id,$status,$client) { } } - if(intval($x[0]['cr_expire'])) - $r = q("delete from chat where created < UTC_TIMESTAMP() - INTERVAL " . intval($x[0]['cr_expire']) . " MINUTE and chat_room = " . intval($x[0]['cr_id'])); + if(intval($x[0]['cr_expire'])) { + $sql = "delete from chat where created < UTC_TIMESTAMP() - INTERVAL " . intval($x[0]['cr_expire']) . " MINUTE and chat_room = " . intval($x[0]['cr_id']); + $r = q($sql); + } $r = q("select * from chatpresence where cp_xchan = '%s' and cp_room = %d limit 1", dbesc($observer_xchan), @@ -153,7 +155,6 @@ function chatroom_enter($observer_xchan,$room_id,$status,$client) { dbesc($client) ); - chatroom_flush($room_id,$xchan); return $r; } @@ -226,21 +227,5 @@ function chat_message($uid,$room_id,$xchan,$text) { ); $ret['success'] = true; - chatroom_flush($room_id,$xchan); return $ret; } - -/** - * Reduces the number of lines shown in chat by removing those older than MAX_CHATROOM_HOURS - */ - -function chatroom_flush($room_id,$xchan) { - - - $date_limit = date('Y-m-d H:i:s', time() - 3600 * MAX_CHATROOM_HOURS); - $d = q("delete from chat where chat_room = %d and chat_xchan = '%s' and created < '%s'", - intval($room_id), - dbesc($xchan), - datetime_convert('','', $date_limit)); - return true; -} -- cgit v1.2.3 From b4aed1212930e40377665dc45271f2b1f428511f Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 20 Aug 2014 23:01:25 -0700 Subject: extensible profiles - add the input form elements. Still needs styling and we're not yet storing the results. And right now we're ignoring the type and only doing type=string. Oh yeah - and I split off starting the second delivery chain into its own function in tag_deliver since it was largely duplicate code. --- include/items.php | 234 ++++++++++++++++++++-------------------------- mod/profiles.php | 19 ++++ view/tpl/profile_edit.tpl | 5 + 3 files changed, 123 insertions(+), 135 deletions(-) diff --git a/include/items.php b/include/items.php index e5c9549e2..fbe67817d 100755 --- a/include/items.php +++ b/include/items.php @@ -1340,6 +1340,12 @@ function get_atom_elements($feed,$item,&$author) { $res['body'] = str_replace(array(' ',"\t","\r","\n"), array('','','',''),$res['body']); // make sure nobody is trying to sneak some html tags by us $res['body'] = notags(base64url_decode($res['body'])); + + // We could probably turn these old Friendica bbcode bookmarks into bookmark tags but we'd have to + // create a term table item for them. For now just make sure they stay as links. + + $res['body'] = preg_replace('/\[bookmark(.*?)\](.*?)\[\/bookmark\]','[url$1]$2[/url]',$res['body']); + } @@ -2346,8 +2352,9 @@ function tag_deliver($uid,$item_id) { $item = $i[0]; - if(($item['source_xchan']) && ($item['item_flags'] & ITEM_UPLINK) && ($item['item_flags'] & ITEM_THREAD_TOP) && ($item['edited'] != $item['created'])) { - // this is an update to a post which was already processed by us and has a second delivery chain + if(($item['source_xchan']) && ($item['item_flags'] & ITEM_UPLINK) + && ($item['item_flags'] & ITEM_THREAD_TOP) && ($item['edited'] != $item['created'])) { + // this is an update (edit) to a post which was already processed by us and has a second delivery chain // Just start the second delivery chain to deliver the updated post proc_run('php','include/notifier.php','tgroup',$item['id']); return; @@ -2444,78 +2451,14 @@ function tag_deliver($uid,$item_id) { // This might be a followup (e.g. comment) by the original post author to a tagged forum // If so setup a second delivery chain - $r = null; - if( ! ($item['item_flags'] & ITEM_THREAD_TOP)) { $x = q("select * from item where id = parent and parent = %d and uid = %d limit 1", intval($item['parent']), intval($uid) ); - if(($x) && ($x[0]['item_flags'] & ITEM_UPLINK)) { - - logger('tag_deliver: creating second delivery chain for comment to tagged post.'); - - // now change this copy of the post to a forum head message and deliver to all the tgroup members - // also reset all the privacy bits to the forum default permissions - - $private = (($u[0]['channel_allow_cid'] || $u[0]['channel_allow_gid'] || $u[0]['channel_deny_cid'] || $u[0]['channel_deny_gid']) ? 1 : 0); - - $new_public_policy = map_scope($u[0]['channel_r_stream'],true); - - if((! $private) && $new_public_policy) - $private = 1; - - $flag_bits = $item['item_flags'] | ITEM_WALL|ITEM_ORIGIN; - - // maintain the original source, which will be the original item owner and was stored in source_xchan - // when we created the delivery fork - - $r = q("update item set source_xchan = '%s' where id = %d limit 1", - dbesc($x[0]['source_xchan']), - intval($item_id) - ); - - $title = $item['title']; - $body = $item['body']; - - if($private) { - if(!($flag_bits & ITEM_OBSCURED)) { - $key = get_config('system','pubkey'); - $flag_bits = $flag_bits|ITEM_OBSCURED; - $title = json_encode(aes_encapsulate($title,$key)); - $body = json_encode(aes_encapsulate($body,$key)); - } - } - else { - if($flag_bits & ITEM_OBSCURED) { - $key = get_config('system','prvkey'); - $flag_bits = $flag_bits ^ ITEM_OBSCURED; - $title = json_encode(aes_unencapsulate($title,$key)); - $body = json_encode(aes_unencapsulate($body,$key)); - } - } - - $r = q("update item set item_flags = %d, owner_xchan = '%s', allow_cid = '%s', allow_gid = '%s', - deny_cid = '%s', deny_gid = '%s', item_private = %d, public_policy = '%s', comment_policy = '%s', title = '%s', body = '%s' where id = %d limit 1", - intval($flag_bits), - dbesc($u[0]['channel_hash']), - dbesc($u[0]['channel_allow_cid']), - dbesc($u[0]['channel_allow_gid']), - dbesc($u[0]['channel_deny_cid']), - dbesc($u[0]['channel_deny_gid']), - intval($private), - dbesc($new_public_policy), - dbesc(map_scope($u[0]['channel_w_comment'])), - dbesc($title), - dbesc($body), - intval($item_id) - ); - if($r) - proc_run('php','include/notifier.php','tgroup',$item_id); - else - logger('tag_deliver: failed to update item'); + start_delivery_chain($u[0],$item,$item_id,$x[0]); } } @@ -2549,8 +2492,6 @@ function tag_deliver($uid,$item_id) { intval($item_id) ); - - // At this point we've determined that the person receiving this post was mentioned in it or it is a union. // Now let's check if this mention was inside a reshare so we don't spam a forum // If it's private we may have to unobscure it momentarily so that we can parse it. @@ -2622,81 +2563,20 @@ function tag_deliver($uid,$item_id) { return; } - // tgroup delivery - setup a second delivery chain // prevent delivery looping - only proceed // if the message originated elsewhere and is a top-level post - if(($item['item_flags'] & ITEM_WALL) || ($item['item_flags'] & ITEM_ORIGIN) || (!($item['item_flags'] & ITEM_THREAD_TOP)) || ($item['id'] != $item['parent'])) { + if(($item['item_flags'] & ITEM_WALL) + || ($item['item_flags'] & ITEM_ORIGIN) + || (!($item['item_flags'] & ITEM_THREAD_TOP)) + || ($item['id'] != $item['parent'])) { logger('tag_deliver: item was local or a comment. rejected.'); return; } - /** - * At this point we're committed to setting up a second delivery chain. We just have to mangle some bits first. - */ - logger('tag_deliver: creating second delivery chain.'); - - // now change this copy of the post to a forum head message and deliver to all the tgroup members - // also reset all the privacy bits to the forum default permissions - - $private = (($u[0]['channel_allow_cid'] || $u[0]['channel_allow_gid'] || $u[0]['channel_deny_cid'] || $u[0]['channel_deny_gid']) ? 1 : 0); - - $new_public_policy = map_scope($u[0]['channel_r_stream'],true); - - if((! $private) && $new_public_policy) - $private = 1; - - $flag_bits = $item['item_flags'] | ITEM_WALL|ITEM_ORIGIN|ITEM_UPLINK; - - // preserve the source - - $r = q("update item set source_xchan = owner_xchan where id = %d limit 1", - intval($item_id) - ); - - // make sure encryption matches the new scope - - $title = $item['title']; - $body = $item['body']; - - if($private) { - if(!($flag_bits & ITEM_OBSCURED)) { - $key = get_config('system','pubkey'); - $flag_bits = $flag_bits|ITEM_OBSCURED; - $title = json_encode(aes_encapsulate($title,$key)); - $body = json_encode(aes_encapsulate($body,$key)); - } - } - else { - if($flag_bits & ITEM_OBSCURED) { - $key = get_config('system','prvkey'); - $flag_bits = $flag_bits ^ ITEM_OBSCURED; - $title = json_encode(aes_unencapsulate($title,$key)); - $body = json_encode(aes_unencapsulate($body,$key)); - } - } - - $r = q("update item set item_flags = %d, owner_xchan = '%s', allow_cid = '%s', allow_gid = '%s', - deny_cid = '%s', deny_gid = '%s', item_private = %d, public_policy = '%s', comment_policy = '%s', title = '%s', body = '%s' where id = %d limit 1", - intval($flag_bits), - dbesc($u[0]['channel_hash']), - dbesc($u[0]['channel_allow_cid']), - dbesc($u[0]['channel_allow_gid']), - dbesc($u[0]['channel_deny_cid']), - dbesc($u[0]['channel_deny_gid']), - intval($private), - dbesc($new_public_policy), - dbesc(map_scope($u[0]['channel_w_comment'])), - dbesc($title), - dbesc($body), - intval($item_id) - ); - if($r) - proc_run('php','include/notifier.php','tgroup',$item_id); - else - logger('tag_deliver: failed to update item'); + start_delivery_chain($u[0],$item,$item_id,null); } @@ -2780,6 +2660,90 @@ function tgroup_check($uid,$item) { } +/** + * Sourced and tag-delivered posts are re-targetted for delivery to the connections of the channel + * receiving the post. This starts the second delivery chain, by resetting permissions and ensuring + * that ITEM_UPLINK is set on the parent post, and storing the current owner_xchan as the source_xchan. + * We'll become the new owner. If called without $parent, this *is* the parent post. + */ + +function start_delivery_chain($channel,$item,$item_id,$parent) { + + + // Change this copy of the post to a forum head message and deliver to all the tgroup members + // also reset all the privacy bits to the forum default permissions + + $private = (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] + || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 1 : 0); + + $new_public_policy = map_scope($channel['channel_r_stream'],true); + + if((! $private) && $new_public_policy) + $private = 1; + + $flag_bits = $item['item_flags'] | ITEM_WALL|ITEM_ORIGIN; + + // maintain the original source, which will be the original item owner and was stored in source_xchan + // when we created the delivery fork + + if($parent) { + $r = q("update item set source_xchan = '%s' where id = %d limit 1", + dbesc($parent['source_xchan']), + intval($item_id) + ); + } + else { + $flag_bits = $flag_bits | ITEM_UPLINK; + $r = q("update item set source_xchan = owner_xchan where id = %d limit 1", + intval($item_id) + ); + } + + $title = $item['title']; + $body = $item['body']; + + if($private) { + if(!($flag_bits & ITEM_OBSCURED)) { + $key = get_config('system','pubkey'); + $flag_bits = $flag_bits|ITEM_OBSCURED; + $title = json_encode(aes_encapsulate($title,$key)); + $body = json_encode(aes_encapsulate($body,$key)); + } + } + else { + if($flag_bits & ITEM_OBSCURED) { + $key = get_config('system','prvkey'); + $flag_bits = $flag_bits ^ ITEM_OBSCURED; + $title = json_encode(aes_unencapsulate($title,$key)); + $body = json_encode(aes_unencapsulate($body,$key)); + } + } + + $r = q("update item set item_flags = %d, owner_xchan = '%s', allow_cid = '%s', allow_gid = '%s', + deny_cid = '%s', deny_gid = '%s', item_private = %d, public_policy = '%s', comment_policy = '%s', title = '%s', body = '%s' where id = %d limit 1", + intval($flag_bits), + dbesc($channel['channel_hash']), + dbesc($channel['channel_allow_cid']), + dbesc($channel['channel_allow_gid']), + dbesc($channel['channel_deny_cid']), + dbesc($channel['channel_deny_gid']), + intval($private), + dbesc($new_public_policy), + dbesc(map_scope($channel['channel_w_comment'])), + dbesc($title), + dbesc($body), + intval($item_id) + ); + + if($r) + proc_run('php','include/notifier.php','tgroup',$item_id); + else + logger('start_delivery_chain: failed to update item'); + + return; +} + + /** * @function check_item_source($uid,$item) diff --git a/mod/profiles.php b/mod/profiles.php index b938e836b..d6df09e9a 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -568,6 +568,24 @@ function profiles_content(&$a) { '$no_selected' => (($r[0]['hide_friends'] == 0) ? " checked=\"checked\" " : "") )); + $q = q("select * from profdef where true"); + if($q) { + $extra_fields = array(); + + foreach($q as $qq) { + $mine = q("select v from profext where k = '%s' and hash = '%s' and channel_id = %d limit 1", + dbesc($qq['field_name']), + dbesc($r[0]['profile_guid']), + intval(local_user()) + ); + + if(array_key_exists($qq['field_name'],$fields)) { + $extra_fields[] = array($qq['field_name'],$qq['field_desc'],(($mine) ? $mine[0]['v'] : ''), $qq['field_help']); + } + } + } + +logger('extra_fields: ' . print_r($extra_fields,true)); $f = get_config('system','birthday_input_format'); if(! $f) @@ -674,6 +692,7 @@ function profiles_content(&$a) { '$education' => $r[0]['education'], '$contact' => $r[0]['contact'], '$channels' => $r[0]['channels'], + '$extra_fields' => $extra_fields, )); $arr = array('profile' => $r[0], 'entry' => $o); diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl index 0e902e9e2..87582da56 100755 --- a/view/tpl/profile_edit.tpl +++ b/view/tpl/profile_edit.tpl @@ -349,6 +349,11 @@
    {{/if}} +{{if $extra_fields}} +{{foreach $extra_fields as $field }} +{{include file="field_input.tpl" field=$field}} +{{/foreach}} +{{/if}}
    -- cgit v1.2.3 From a59a6fbd90d115cf9e9836c986c81541a88697ee Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 21 Aug 2014 01:41:15 -0700 Subject: abook-edit-me class lost during some edit - we need this to reset the permission fields --- version.inc | 2 +- view/tpl/field_acheckbox.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/version.inc b/version.inc index ed8a8be13..8936c7bc8 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-08-20.773 +2014-08-21.774 diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl index 342491ded..89de170b7 100755 --- a/view/tpl/field_acheckbox.tpl +++ b/view/tpl/field_acheckbox.tpl @@ -6,7 +6,7 @@ - + {{if $field.5}}{{$inherited}} {{/if}} -- cgit v1.2.3 From 831714f0f0e5bd9a17c760a2476a12603be5d089 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 21 Aug 2014 16:46:24 -0700 Subject: profile edit - missing visibility and drop link on non-default profiles, re-arrange order of replacing red#matrix smilie so it works correctly, accept a post with body content of '0' which was interpreted by x() as nothing (was treated as integer). --- include/items.php | 8 ++++---- include/text.php | 8 ++++---- mod/item.php | 1 - view/tpl/profile_edit.tpl | 4 ++-- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/include/items.php b/include/items.php index fbe67817d..783c67752 100755 --- a/include/items.php +++ b/include/items.php @@ -1664,8 +1664,8 @@ function item_store($arr,$allow_exec = false) { } - $arr['title'] = ((x($arr,'title')) ? trim($arr['title']) : ''); - $arr['body'] = ((x($arr,'body')) ? trim($arr['body']) : ''); + $arr['title'] = ((array_key_exists('title',$arr) && strlen($arr['title'])) ? trim($arr['title']) : ''); + $arr['body'] = ((array_key_exists('body',$arr) && strlen($arr['body'])) ? trim($arr['body']) : ''); $arr['allow_cid'] = ((x($arr,'allow_cid')) ? trim($arr['allow_cid']) : ''); $arr['allow_gid'] = ((x($arr,'allow_gid')) ? trim($arr['allow_gid']) : ''); @@ -2136,7 +2136,6 @@ function item_store_update($arr,$allow_exec = false) { $arr['commented'] = $orig[0]['commented']; $arr['received'] = datetime_convert(); $arr['changed'] = datetime_convert(); - $arr['title'] = ((x($arr,'title')) ? notags(trim($arr['title'])) : ''); $arr['location'] = ((x($arr,'location')) ? notags(trim($arr['location'])) : $orig[0]['location']); $arr['coord'] = ((x($arr,'coord')) ? notags(trim($arr['coord'])) : $orig[0]['coord']); $arr['verb'] = ((x($arr,'verb')) ? notags(trim($arr['verb'])) : $orig[0]['verb']); @@ -2152,7 +2151,8 @@ function item_store_update($arr,$allow_exec = false) { $arr['deny_gid'] = ((array_key_exists('deny_gid',$arr)) ? trim($arr['deny_gid']) : $orig[0]['deny_gid']); $arr['item_private'] = ((array_key_exists('item_private',$arr)) ? intval($arr['item_private']) : $orig[0]['item_private']); - $arr['body'] = ((x($arr,'body')) ? trim($arr['body']) : ''); + $arr['title'] = ((array_key_exists('title',$arr) && strlen($arr['title'])) ? trim($arr['title']) : ''); + $arr['body'] = ((array_key_exists('body',$arr) && strlen($arr['body'])) ? trim($arr['body']) : ''); $arr['attach'] = ((x($arr,'attach')) ? notags(trim($arr['attach'])) : $orig[0]['attach']); $arr['app'] = ((x($arr,'app')) ? notags(trim($arr['app'])) : $orig[0]['app']); // $arr['item_restrict'] = ((x($arr,'item_restrict')) ? intval($arr['item_restrict']) : $orig[0]['item_restrict'] ); diff --git a/include/text.php b/include/text.php index 680e6fe95..d3d8b84a6 100755 --- a/include/text.php +++ b/include/text.php @@ -1002,9 +1002,9 @@ function smilies($s, $sample = false) { ':facepalm', ':like', ':dislike', + 'red#matrix', 'red#', - 'r#', - 'red#matrix' + 'r#' ); $icons = array( @@ -1040,9 +1040,9 @@ function smilies($s, $sample = false) { ':facepalm', ':like', ':dislike', + 'redred#matrixmatrix', 'redred#matrix', - 'redr#matrix', - 'redred#matrixmatrix' + 'redr#matrix' ); diff --git a/mod/item.php b/mod/item.php index 92dc3e7c6..27691eb4f 100644 --- a/mod/item.php +++ b/mod/item.php @@ -790,7 +790,6 @@ function item_post(&$a) { else $post_id = 0; - $post = item_store($datarray,$execflag); $post_id = $post['item_id']; diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl index 87582da56..b453b1cfa 100755 --- a/view/tpl/profile_edit.tpl +++ b/view/tpl/profile_edit.tpl @@ -9,12 +9,12 @@ -- cgit v1.2.3 From 921799b045c376c2ffe80a0c4fe0dc6c2c78e854 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 21 Aug 2014 17:42:19 -0700 Subject: make the old personal xrd interface (old webfinger) work again --- include/crypto.php | 5 +++-- mod/xrd.php | 21 +++++++++++++++++---- view/tpl/xrd_diaspora.tpl | 8 ++++++++ view/tpl/xrd_person.tpl | 10 +++++++++- 4 files changed, 37 insertions(+), 7 deletions(-) create mode 100644 view/tpl/xrd_diaspora.tpl diff --git a/include/crypto.php b/include/crypto.php index c053dfae2..07655e24f 100644 --- a/include/crypto.php +++ b/include/crypto.php @@ -1,5 +1,8 @@ $a->get_baseurl(), + '$dspr_guid' => $r[0]['channel_guid'], + '$dspr_key' => base64_encode(pemtorsa($r[0]['channel_pubkey'])) + )); + } + else + $dspr = ''; + + + + $salmon_key = salmon_key($r[0]['channel_pubkey']); header('Access-Control-Allow-Origin: *'); header("Content-type: text/xml"); @@ -34,15 +47,15 @@ function xrd_init(&$a) { '$nick' => $r[0]['channel_address'], '$accturi' => $uri, '$profile_url' => $a->get_baseurl() . '/channel/' . $r[0]['channel_address'], -// '$hcard_url' => $a->get_baseurl() . '/hcard/' . $r[0]['channel_address'], + '$hcard_url' => $a->get_baseurl() . '/hcard/' . $r[0]['channel_address'], '$atom' => $a->get_baseurl() . '/feed/' . $r[0]['channel_address'], '$zot_post' => $a->get_baseurl() . '/post/' . $r[0]['channel_address'], '$poco_url' => $a->get_baseurl() . '/poco/' . $r[0]['channel_address'], '$photo' => $a->get_baseurl() . '/photo/profile/l/' . $r[0]['channel_id'], -// '$dspr' => $dspr, + '$dspr' => $dspr, // '$salmon' => $a->get_baseurl() . '/salmon/' . $r[0]['channel_address'], // '$salmen' => $a->get_baseurl() . '/salmon/' . $r[0]['channel_address'] . '/mention', -// '$modexp' => 'data:application/magic-public-key,' . $salmon_key, + '$modexp' => 'data:application/magic-public-key,' . $salmon_key, // '$bigkey' => salmon_key($r[0]['pubkey']) )); diff --git a/view/tpl/xrd_diaspora.tpl b/view/tpl/xrd_diaspora.tpl new file mode 100644 index 000000000..143980bcc --- /dev/null +++ b/view/tpl/xrd_diaspora.tpl @@ -0,0 +1,8 @@ +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} + + + diff --git a/view/tpl/xrd_person.tpl b/view/tpl/xrd_person.tpl index 20d438dd5..631ed3f18 100755 --- a/view/tpl/xrd_person.tpl +++ b/view/tpl/xrd_person.tpl @@ -14,5 +14,13 @@ - + + + + + {{$dspr}} + -- cgit v1.2.3 From e524835463fa0411723d2ec57276d1ac13c3aca6 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 21 Aug 2014 20:31:55 -0700 Subject: the rest of the diaspora local discovery stuff --- include/identity.php | 24 +++++++++++++++++++++--- view/tpl/profile_vcard.tpl | 3 +++ 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/include/identity.php b/include/identity.php index 9335673a0..8b742f53e 100644 --- a/include/identity.php +++ b/include/identity.php @@ -770,9 +770,26 @@ logger('online: ' . $profile['online']); $location = $pdesc = $gender = $marital = $homepage = $online = False; } - $firstname = ((strpos($profile['name'],' ')) - ? trim(substr($profile['name'],0,strpos($profile['name'],' '))) : $profile['name']); - $lastname = (($firstname === $profile['name']) ? '' : trim(substr($profile['name'],strlen($firstname)))); + $firstname = ((strpos($profile['channel_name'],' ')) + ? trim(substr($profile['channel_name'],0,strpos($profile['channel_name'],' '))) : $profile['channel_name']); + $lastname = (($firstname === $profile['channel_name']) ? '' : trim(substr($profile['channel_name'],strlen($firstname)))); + + if(get_config('system','diaspora_enabled')) { + $diaspora = array( + 'podloc' => z_root(), + 'searchable' => (($block) ? 'false' : 'true'), + 'nickname' => $profile['channel_address'], + 'fullname' => $profile['channel_name'], + 'firstname' => $firstname, + 'lastname' => $lastname, + 'photo300' => z_root() . '/photo/profile/300/' . $profile['uid'] . '.jpg', + 'photo100' => z_root() . '/photo/profile/100/' . $profile['uid'] . '.jpg', + 'photo50' => z_root() . '/photo/profile/50/' . $profile['uid'] . '.jpg', + ); + } + else + $diaspora = null; + $contact_block = contact_block(); @@ -802,6 +819,7 @@ logger('online: ' . $profile['online']); '$marital' => $marital, '$homepage' => $homepage, '$chanmenu' => $channel_menu, + '$diaspora' => $diaspora, '$contact_block' => $contact_block, )); diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index a653dca7d..7dff8fdeb 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -43,6 +43,9 @@ {{if $homepage}}
    {{$homepage}}
    {{$profile.homepage}}
    {{/if}} + {{if $diaspora}} + {{include file="diaspora_vcard.tpl"}} + {{/if}} {{if $connect}} {{$connect}} -- cgit v1.2.3 From 05515e3b10d2dcc6cf306e1749c1717e96dfcff2 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 21 Aug 2014 20:42:55 -0700 Subject: D* receive endpoint is receive/users/$guid - where $guid is really the channel_guid, not the channel_hash. We'll allow this to be truncated for older D* sites or those that can't process our 64 character guids. --- mod/receive.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mod/receive.php b/mod/receive.php index c5a2dc4e0..4071b169b 100644 --- a/mod/receive.php +++ b/mod/receive.php @@ -4,8 +4,6 @@ * Diaspora endpoint */ - -//require_once('include/salmon.php'); require_once('include/crypto.php'); require_once('include/diaspora.php'); @@ -31,8 +29,11 @@ function receive_post(&$a) { $guid = argv(2); - $r = q("SELECT * FROM channel left join account on account_id = channel_account_id WHERE channel_guid = '%s' AND account_flags = 0 LIMIT 1", - dbesc($guid) + // Diaspora sites *may* provide a truncated guid. + + $r = q("SELECT * FROM channel left join xchan on channel_hash = xchan_hash WHERE channel_guid like '%s' AND NOT (channel_pageflags & %d ) LIMIT 1", + dbesc($guid . '%'), + intval(PAGE_REMOVED) ); if(! $r) http_status_exit(500); -- cgit v1.2.3 From 72a766432d90f6eec44641466e77567808f61aca Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 21 Aug 2014 20:45:15 -0700 Subject: missing template file --- view/tpl/diaspora_vcard.tpl | 57 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 view/tpl/diaspora_vcard.tpl diff --git a/view/tpl/diaspora_vcard.tpl b/view/tpl/diaspora_vcard.tpl new file mode 100644 index 000000000..9d234a398 --- /dev/null +++ b/view/tpl/diaspora_vcard.tpl @@ -0,0 +1,57 @@ +
    +
    +
    Nickname
    +
    + {{$diaspora.nickname}} +
    +
    +
    +
    Full name
    +
    + {{$diaspora.fullname}} +
    +
    + +
    +
    First name
    +
    + {{$diaspora.firstname}} +
    +
    +
    +
    Family name
    +
    + {{$diaspora.lastname}} +
    +
    +
    +
    URL
    +
    + {{$diaspora.podloc}}/ +
    +
    +
    +
    Photo
    +
    + +
    +
    +
    +
    Photo
    +
    + +
    +
    +
    +
    Photo
    +
    + +
    +
    +
    +
    Searchable
    +
    + {{$diaspora.searchable}} +
    +
    +
    -- cgit v1.2.3 From 69d3e5468d970633412cbdc731a4e477181dbc8c Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 21 Aug 2014 21:07:32 -0700 Subject: provide the site blacklist everywhere it is needed --- include/diaspora.php | 26 ++++++++++++++++++++++++++ include/externals.php | 2 +- include/zot.php | 16 ++++++++++++++++ 3 files changed, 43 insertions(+), 1 deletion(-) diff --git a/include/diaspora.php b/include/diaspora.php index dda552536..2010b1494 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -106,6 +106,26 @@ function diaspora_dispatch($importer,$msg,$attempt=1) { return $ret; } + +function diaspora_is_blacklisted($s) { + + $bl1 = get_config('system','blacklisted_sites'); + if(is_array($bl1) && $bl1) { + foreach($bl1 as $bl) { + if($bl && strpos($s,$bl) !== false) { + logger('diaspora_is_blacklisted: blacklisted ' . $s); + return true; + } + } + } + return false; +} + + + + + + function diaspora_handle_from_contact($contact_id) { $handle = false; @@ -122,6 +142,10 @@ function diaspora_handle_from_contact($contact_id) { } function diaspora_get_contact_by_handle($uid,$handle) { + + if(diaspora_is_blacklisted($handle)) + return false; + $r = q("SELECT * FROM abook left join xchan on xchan_hash = abook_xchan where xchan_addr = '%s' and abook_channel = %d limit 1", dbesc($handle), intval($uid) @@ -140,6 +164,8 @@ function find_diaspora_person_by_handle($handle) { $endlessloop = 0; $maxloops = 10; + if(diaspora_is_blacklisted($handle)) + return false; $r = q("select * from xchan where xchan_addr = '%s' limit 1", dbesc($handle) diff --git a/include/externals.php b/include/externals.php index a96bf7c97..8944524b7 100644 --- a/include/externals.php +++ b/include/externals.php @@ -41,7 +41,7 @@ function externals_run($argv, $argc){ $bl1 = get_config('system','blacklisted_sites'); if(is_array($bl1) && $bl1) { foreach($bl1 as $bl) { - if(strpos($url,$bl) !== false) { + if($bl && strpos($url,$bl) !== false) { $blacklisted = true; break; } diff --git a/include/zot.php b/include/zot.php index 8b0efe09d..41d0bc1eb 100644 --- a/include/zot.php +++ b/include/zot.php @@ -507,6 +507,22 @@ function zot_refresh($them,$channel = null, $force = false) { function zot_gethub($arr) { if($arr['guid'] && $arr['guid_sig'] && $arr['url'] && $arr['url_sig']) { + + $blacklisted = false; + $bl1 = get_config('system','blacklisted_sites'); + if(is_array($bl1) && $bl1) { + foreach($bl1 as $bl) { + if($bl && strpos($arr['url'],$bl) !== false) { + $blacklisted = true; + break; + } + } + } + if($blacklisted) { + logger('zot_gethub: blacklisted site: ' . $arr['url']); + return null; + } + $r = q("select * from hubloc where hubloc_guid = '%s' and hubloc_guid_sig = '%s' and hubloc_url = '%s' and hubloc_url_sig = '%s' -- cgit v1.2.3 From 1abd2a2917504d102a6e4c6a9c34fa4a5fba4937 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 21 Aug 2014 22:28:09 -0700 Subject: another round of heavy lifting --- include/diaspora.php | 211 ++++++++++++++++++++++++--------------------------- 1 file changed, 99 insertions(+), 112 deletions(-) diff --git a/include/diaspora.php b/include/diaspora.php index 2010b1494..982e40f2f 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -126,19 +126,17 @@ function diaspora_is_blacklisted($s) { -function diaspora_handle_from_contact($contact_id) { - $handle = false; +function diaspora_handle_from_contact($contact_hash) { - logger("diaspora_handle_from_contact: contact id is " . $contact_id, LOGGER_DEBUG); + logger("diaspora_handle_from_contact: contact id is " . $contact_hash, LOGGER_DEBUG); - $r = q("SELECT * from abook left join xchan on abook_xchan = xchan_hash where abook_id = %d", - intval($contact_id) + $r = q("SELECT * from abook left join xchan on abook_xchan = xchan_hash where abook_xchan = '%s' limit 1", + intval($contact_hash) ); if($r) { - $contact = $r[0]; + return $r[0]['xchan_addr']; } - $handle = $contact['xchan_addr']; - return $handle; + return false; } function diaspora_get_contact_by_handle($uid,$handle) { @@ -150,9 +148,7 @@ function diaspora_get_contact_by_handle($uid,$handle) { dbesc($handle), intval($uid) ); - if($r) - return $r[0]; - return false; + return (($r) ? $r[0] : false); } function find_diaspora_person_by_handle($handle) { @@ -188,6 +184,7 @@ function find_diaspora_person_by_handle($handle) { $result = discover_by_webbie($handle); + } @@ -195,13 +192,10 @@ function find_diaspora_person_by_handle($handle) { } -function get_diaspora_key($uri) { - logger('Fetching diaspora key for: ' . $uri); - - $r = find_diaspora_person_by_handle($uri); - if($r) - return $r['pubkey']; - return ''; +function get_diaspora_key($handle) { + logger('Fetching diaspora key for: ' . $handle, LOGGER_DEBUG); + $r = find_diaspora_person_by_handle($handle); + return(($r) ? $r['xchan_pubkey'] : ''); } @@ -376,7 +370,7 @@ function diaspora_decode($importer,$xml) { $ciphertext = base64_decode($encrypted_header->ciphertext); $outer_key_bundle = ''; - openssl_private_decrypt($encrypted_aes_key_bundle,$outer_key_bundle,$importer['prvkey']); + openssl_private_decrypt($encrypted_aes_key_bundle,$outer_key_bundle,$importer['channel_prvkey']); $j_outer_key_bundle = json_decode($outer_key_bundle); @@ -454,7 +448,6 @@ function diaspora_decode($importer,$xml) { $encoding = $base->encoding; $alg = $base->alg; - $signed_data = $data . '.' . base64url_encode($type) . '.' . base64url_encode($encoding) . '.' . base64url_encode($alg); @@ -606,15 +599,14 @@ function diaspora_request($importer,$xml) { return; } -//FIXME -// $g = q("select def_gid from user where uid = %d limit 1", -// intval($importer['channel_id']) -// ); -// if($g && intval($g[0]['def_gid'])) { -// require_once('include/group.php'); -// group_add_member($importer['channel_id'],'',$contact_record['id'],$g[0]['def_gid']); -// } + /** If there is a default group for this channel, add this member to it */ + if($importer['channel_default_group']) { + require_once('include/group.php'); + $g = group_rec_byhash($importer['channel_id'],$importer['channel_default_group']); + if($g) + group_add_member($importer['channel_id'],'',$contact_record['xchan_hash'],$g['id']); + } return; } @@ -706,9 +698,6 @@ function diaspora_post($importer,$xml,$msg) { $datarray['uid'] = $importer['channel_id']; // FIXME - $datarray['contact-id'] = $contact['id']; - $datarray['wall'] = 0; - $datarray['network'] = NETWORK_DIASPORA; $datarray['verb'] = ACTIVITY_POST; @@ -717,7 +706,6 @@ function diaspora_post($importer,$xml,$msg) { $datarray['changed'] = $datarray['created'] = $datarray['edited'] = datetime_convert('UTC','UTC',$created); $datarray['item_private'] = $private; - $datarray['plink'] = $plink; $datarray['author_xchan'] = $contact['xchan_hash']; @@ -2055,8 +2043,8 @@ function diaspora_profile($importer,$xml,$msg) { function diaspora_share($me,$contact) { $a = get_app(); - $myaddr = $me['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3); - $theiraddr = $contact['addr']; + $myaddr = $me['channel_address'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3); + $theiraddr = $contact['xchan_addr']; $tpl = get_markup_template('diaspora_share.tpl'); $msg = replace_macros($tpl, array( @@ -2093,8 +2081,8 @@ function diaspora_unshare($me,$contact) { function diaspora_send_status($item,$owner,$contact,$public_batch = false) { $a = get_app(); - $myaddr = $owner['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3); - $theiraddr = $contact['addr']; + $myaddr = $owner['channel_address'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3); + $theiraddr = $contact['xchan_addr']; $images = array(); @@ -2146,44 +2134,44 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) { } - $public = (($item['private']) ? 'false' : 'true'); + $public = (($item['item_private']) ? 'false' : 'true'); require_once('include/datetime.php'); $created = datetime_convert('UTC','UTC',$item['created'],'Y-m-d H:i:s \U\T\C'); // Detect a share element and do a reshare // see: https://github.com/Raven24/diaspora-federation/blob/master/lib/diaspora-federation/entities/reshare.rb - if (!$item['private'] AND ($ret = diaspora_is_reshare($item["body"]))) { + if (!$item['item_private'] AND ($ret = diaspora_is_reshare($item["body"]))) { $tpl = get_markup_template('diaspora_reshare.tpl'); $msg = replace_macros($tpl, array( '$root_handle' => xmlify($ret['root_handle']), '$root_guid' => $ret['root_guid'], - '$guid' => $item['guid'], + '$guid' => $item['mid'], '$handle' => xmlify($myaddr), '$public' => $public, '$created' => $created, - '$provider' => $item["app"] + '$provider' => $item['app'] )); } else { $tpl = get_markup_template('diaspora_post.tpl'); $msg = replace_macros($tpl, array( '$body' => $body, - '$guid' => $item['guid'], + '$guid' => $item['mid'], '$handle' => xmlify($myaddr), '$public' => $public, '$created' => $created, - '$provider' => $item["app"] + '$provider' => $item['app'] )); } - logger('diaspora_send_status: '.$owner['username'].' -> '.$contact['name'].' base message: '.$msg, LOGGER_DATA); + logger('diaspora_send_status: '.$owner['channel_name'].' -> '.$contact['xchan_name'].' base message: '.$msg, LOGGER_DATA); - $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],$public_batch))); + $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['channel_prvkey'],$contact['xchan_pubkey'],$public_batch))); //$slap = 'xml=' . urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],$public_batch)); $return_code = diaspora_transmit($owner,$contact,$slap,$public_batch); - logger('diaspora_send_status: guid: '.$item['guid'].' result '.$return_code, LOGGER_DEBUG); + logger('diaspora_send_status: guid: '.$item['mid'].' result '.$return_code, LOGGER_DEBUG); if(count($images)) { diaspora_send_images($item,$owner,$contact,$images,$public_batch); @@ -2193,51 +2181,52 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) { } function diaspora_is_reshare($body) { + $body = trim($body); - // Skip if it isn't a pure repeated messages - // Does it start with a share? - if (strpos($body, "[share") > 0) - return(false); + // Skip if it isn't a pure repeated messages + // Does it start with a share? + if(strpos($body, "[share") > 0) + return(false); - // Does it end with a share? - if (strlen($body) > (strrpos($body, "[/share]") + 8)) - return(false); + // Does it end with a share? + if(strlen($body) > (strrpos($body, "[/share]") + 8)) + return(false); - $attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$1",$body); - // Skip if there is no shared message in there - if ($body == $attributes) - return(false); + $attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$1",$body); + // Skip if there is no shared message in there + if ($body == $attributes) + return(false); - $profile = ""; - preg_match("/profile='(.*?)'/ism", $attributes, $matches); - if ($matches[1] != "") - $profile = $matches[1]; + $profile = ""; + preg_match("/profile='(.*?)'/ism", $attributes, $matches); + if ($matches[1] != "") + $profile = $matches[1]; - preg_match('/profile="(.*?)"/ism', $attributes, $matches); - if ($matches[1] != "") - $profile = $matches[1]; + preg_match('/profile="(.*?)"/ism', $attributes, $matches); + if ($matches[1] != "") + $profile = $matches[1]; - $ret= array(); + $ret= array(); - $ret["root_handle"] = preg_replace("=https?://(.*)/u/(.*)=ism", "$2@$1", $profile); - if (($ret["root_handle"] == $profile) OR ($ret["root_handle"] == "")) - return(false); + $ret["root_handle"] = preg_replace("=https?://(.*)/u/(.*)=ism", "$2@$1", $profile); + if (($ret["root_handle"] == $profile) OR ($ret["root_handle"] == "")) + return(false); - $link = ""; - preg_match("/link='(.*?)'/ism", $attributes, $matches); - if ($matches[1] != "") - $link = $matches[1]; + $link = ""; + preg_match("/link='(.*?)'/ism", $attributes, $matches); + if ($matches[1] != "") + $link = $matches[1]; - preg_match('/link="(.*?)"/ism', $attributes, $matches); - if ($matches[1] != "") - $link = $matches[1]; + preg_match('/link="(.*?)"/ism', $attributes, $matches); + if ($matches[1] != "") + $link = $matches[1]; - $ret["root_guid"] = preg_replace("=https?://(.*)/posts/(.*)=ism", "$2", $link); - if (($ret["root_guid"] == $link) OR ($ret["root_guid"] == "")) - return(false); + $ret["root_guid"] = preg_replace("=https?://(.*)/posts/(.*)=ism", "$2", $link); + if (($ret["root_guid"] == $link) OR ($ret["root_guid"] == "")) + return(false); - return($ret); + return($ret); } function diaspora_send_images($item,$owner,$contact,$images,$public_batch = false) { @@ -2253,18 +2242,18 @@ function diaspora_send_images($item,$owner,$contact,$images,$public_batch = fals $resource = str_replace('.jpg','',$image['file']); $resource = substr($resource,0,strpos($resource,'-')); - $r = q("select * from photo where `resource-id` = '%s' and `uid` = %d limit 1", + $r = q("select * from photo where `resource_id` = '%s' and `uid` = %d limit 1", dbesc($resource), intval($owner['uid']) ); - if(! count($r)) + if(! $r) continue; $public = (($r[0]['allow_cid'] || $r[0]['allow_gid'] || $r[0]['deny_cid'] || $r[0]['deny_gid']) ? 'false' : 'true' ); $msg = replace_macros($tpl,array( '$path' => xmlify($image['path']), '$filename' => xmlify($image['file']), '$msg_guid' => xmlify($image['guid']), - '$guid' => xmlify($r[0]['guid']), + '$guid' => xmlify($r[0]['resource_id']), '$handle' => xmlify($image['handle']), '$public' => xmlify($public), '$created_at' => xmlify(datetime_convert('UTC','UTC',$r[0]['created'],'Y-m-d H:i:s \U\T\C')) @@ -2272,7 +2261,7 @@ function diaspora_send_images($item,$owner,$contact,$images,$public_batch = fals logger('diaspora_send_photo: base message: ' . $msg, LOGGER_DATA); - $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],$public_batch))); + $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['channel_prvkey'],$contact['xchan_pubkey'],$public_batch))); //$slap = 'xml=' . urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],$public_batch)); diaspora_transmit($owner,$contact,$slap,$public_batch); @@ -2283,27 +2272,27 @@ function diaspora_send_images($item,$owner,$contact,$images,$public_batch = fals function diaspora_send_followup($item,$owner,$contact,$public_batch = false) { $a = get_app(); - $myaddr = $owner['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3); -// $theiraddr = $contact['addr']; + $myaddr = $owner['channel_address'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3); + $theiraddr = $contact['xchan_addr']; // Diaspora doesn't support threaded comments, but some // versions of Diaspora (i.e. Diaspora-pistos) support // likes on comments - if($item['verb'] === ACTIVITY_LIKE && $item['thr-parent']) { - $p = q("select guid, type, uri, `parent-uri` from item where uri = '%s' limit 1", - dbesc($item['thr-parent']) - ); + if($item['verb'] === ACTIVITY_LIKE && $item['thr_parent']) { + $p = q("select mid, parent_mid from item where mid = '%s' limit 1", + dbesc($item['thr_parent']) + ); } else { // The first item in the `item` table with the parent id is the parent. However, MySQL doesn't always // return the items ordered by `item`.`id`, in which case the wrong item is chosen as the parent. // The only item with `parent` and `id` as the parent id is the parent item. - $p = q("select guid, type, uri, `parent-uri` from item where parent = %d and id = %d limit 1", + $p = q("select * from item where parent = %d and id = %d limit 1", intval($item['parent']), intval($item['parent']) ); } - if(count($p)) + if($p) $parent = $p[0]; else return; @@ -2311,12 +2300,10 @@ function diaspora_send_followup($item,$owner,$contact,$public_batch = false) { if($item['verb'] === ACTIVITY_LIKE) { $tpl = get_markup_template('diaspora_like.tpl'); $like = true; - $target_type = ( $parent['uri'] === $parent['parent-uri'] ? 'Post' : 'Comment'); -// $target_type = (strpos($parent['type'], 'comment') ? 'Comment' : 'Post'); -// $positive = (($item['deleted']) ? 'false' : 'true'); + $target_type = ( $parent['mid'] === $parent['parent_mid'] ? 'Post' : 'Comment'); $positive = 'true'; - if(($item['deleted'])) + if(($item_['item_restrict'] & ITEM_DELETED)) logger('diaspora_send_followup: received deleted "like". Those should go to diaspora_send_retraction'); } else { @@ -2329,15 +2316,15 @@ function diaspora_send_followup($item,$owner,$contact,$public_batch = false) { // sign it if($like) - $signed_text = $item['guid'] . ';' . $target_type . ';' . $parent['guid'] . ';' . $positive . ';' . $myaddr; + $signed_text = $item['mid'] . ';' . $target_type . ';' . $parent['mid'] . ';' . $positive . ';' . $myaddr; else - $signed_text = $item['guid'] . ';' . $parent['guid'] . ';' . $text . ';' . $myaddr; + $signed_text = $item['mid'] . ';' . $parent['mid'] . ';' . $text . ';' . $myaddr; - $authorsig = base64_encode(rsa_sign($signed_text,$owner['uprvkey'],'sha256')); + $authorsig = base64_encode(rsa_sign($signed_text,$owner['channel_prvkey'],'sha256')); $msg = replace_macros($tpl,array( - '$guid' => xmlify($item['guid']), - '$parent_guid' => xmlify($parent['guid']), + '$guid' => xmlify($item['mid']), + '$parent_guid' => xmlify($parent['mid']), '$target_type' =>xmlify($target_type), '$authorsig' => xmlify($authorsig), '$body' => xmlify($text), @@ -2347,8 +2334,8 @@ function diaspora_send_followup($item,$owner,$contact,$public_batch = false) { logger('diaspora_followup: base message: ' . $msg, LOGGER_DATA); - $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],$public_batch))); - //$slap = 'xml=' . urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],$public_batch)); + $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['channel_prvkey'],$contact['xchan_pubkey'],$public_batch))); + return(diaspora_transmit($owner,$contact,$slap,$public_batch)); } @@ -2358,7 +2345,7 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) { $a = get_app(); - $myaddr = $owner['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3); + $myaddr = $owner['channel_address'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3); // $theiraddr = $contact['addr']; $body = $item['body']; @@ -2367,21 +2354,21 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) { // Diaspora doesn't support threaded comments, but some // versions of Diaspora (i.e. Diaspora-pistos) support // likes on comments - if($item['verb'] === ACTIVITY_LIKE && $item['thr-parent']) { - $p = q("select guid, type, uri, `parent-uri` from item where uri = '%s' limit 1", - dbesc($item['thr-parent']) - ); + if($item['verb'] === ACTIVITY_LIKE && $item['thr_parent']) { + $p = q("select * from item where mid = '%s' limit 1", + dbesc($item['thr_parent']) + ); } else { // The first item in the `item` table with the parent id is the parent. However, MySQL doesn't always // return the items ordered by `item`.`id`, in which case the wrong item is chosen as the parent. // The only item with `parent` and `id` as the parent id is the parent item. - $p = q("select guid, type, uri, `parent-uri` from item where parent = %d and id = %d limit 1", + $p = q("select * from item where parent = %d and id = %d limit 1", intval($item['parent']), intval($item['parent']) ); } - if(count($p)) + if($p) $parent = $p[0]; else return; @@ -2389,7 +2376,7 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) { $like = false; $relay_retract = false; $sql_sign_id = 'iid'; - if( $item['deleted']) { + if( $item['item_restrict'] & ITEM_DELETED) { $relay_retract = true; $target_type = ( ($item['verb'] === ACTIVITY_LIKE) ? 'Like' : 'Comment'); @@ -2400,8 +2387,8 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) { elseif($item['verb'] === ACTIVITY_LIKE) { $like = true; - $target_type = ( $parent['uri'] === $parent['parent-uri'] ? 'Post' : 'Comment'); -// $positive = (($item['deleted']) ? 'false' : 'true'); + $target_type = ( $parent['mid'] === $parent['parent_mid'] ? 'Post' : 'Comment'); +// $positive = (($item['item_restrict'] & ITEM_DELETED) ? 'false' : 'true'); $positive = 'true'; $tpl = get_markup_template('diaspora_like_relay.tpl'); @@ -2445,7 +2432,7 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) { * been done yet */ - $handle = diaspora_handle_from_contact($item['contact-id']); + $handle = diaspora_handle_from_contact($item['author_xchan']); if(! $handle) return; -- cgit v1.2.3 From a328fc4865175d4ac4c9b2956c5c2213830fff2e Mon Sep 17 00:00:00 2001 From: Jeroen Date: Fri, 22 Aug 2014 21:42:33 +0000 Subject: fix nl --- view/nl/messages.po | 6 +++--- view/nl/strings.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/view/nl/messages.po b/view/nl/messages.po index 451b492a7..42d1113d1 100644 --- a/view/nl/messages.po +++ b/view/nl/messages.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Red Matrix\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-08-15 00:03-0700\n" -"PO-Revision-Date: 2014-08-19 21:46+0000\n" +"PO-Revision-Date: 2014-08-22 14:38+0000\n" "Last-Translator: jeroenpraat <>\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/red-matrix/language/nl/)\n" "MIME-Version: 1.0\n" @@ -1508,7 +1508,7 @@ msgstr "[Red:Notificatie] %s heeft je genoemd" #: ../../include/enotify.php:211 #, php-format msgid "%1$s, %2$s tagged you at %3$s" -msgstr "%1$s, %2$s noemde jou om %3$s" +msgstr "%1$s, %2$s noemde jou op %3$s" #: ../../include/enotify.php:212 #, php-format @@ -4698,7 +4698,7 @@ msgstr "Wachtwoorden komen niet met elkaar overeen." msgid "" "Registration successful. Please check your email for validation " "instructions." -msgstr "Registratie geslaagd. Controleer je e-mail voor instructies om je e-mail te bevestigen." +msgstr "Registratie geslaagd. Controleer je e-mail voor instructies." #: ../../mod/register.php:122 msgid "Your registration is pending approval by the site owner." diff --git a/view/nl/strings.php b/view/nl/strings.php index 7be347e53..d1b1359b0 100644 --- a/view/nl/strings.php +++ b/view/nl/strings.php @@ -353,7 +353,7 @@ $a->strings["[Red:Notify] %s posted to your profile wall"] = "[Red:Notificatie] $a->strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = "%1\$s, %2\$s heeft om %3\$s een bericht op jouw kanaal geplaatst"; $a->strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = "%1\$s, %2\$s heeft een bericht op [zrl=%3\$s]jouw kanaal[/zrl] geplaatst"; $a->strings["[Red:Notify] %s tagged you"] = "[Red:Notificatie] %s heeft je genoemd"; -$a->strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, %2\$s noemde jou om %3\$s"; +$a->strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, %2\$s noemde jou op %3\$s"; $a->strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "%1\$s, %2\$s [zrl=%3\$s]noemde jou[/zrl]."; $a->strings["[Red:Notify] %1\$s poked you"] = "[Red:Notificatie] %1\$s heeft je aangestoten"; $a->strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s heeft je aangestoten op %3\$s"; @@ -1113,7 +1113,7 @@ $a->strings["%1\$s's Chatrooms"] = "Chatkanalen van %1\$s"; $a->strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Maximum toegestane dagelijkse registraties op deze RedMatrix-hub bereikt. Probeer het morgen (UTC) nogmaals."; $a->strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Registratie mislukt. De gebruiksvoorwaarden dienen wel geaccepteerd te worden."; $a->strings["Passwords do not match."] = "Wachtwoorden komen niet met elkaar overeen."; -$a->strings["Registration successful. Please check your email for validation instructions."] = "Registratie geslaagd. Controleer je e-mail voor instructies om je e-mail te bevestigen."; +$a->strings["Registration successful. Please check your email for validation instructions."] = "Registratie geslaagd. Controleer je e-mail voor instructies."; $a->strings["Your registration is pending approval by the site owner."] = "Jouw accountregistratie wacht op goedkeuring van de beheerder van deze RedMatrix-hub."; $a->strings["Your registration can not be processed."] = "Jouw registratie kan niet verwerkt worden."; $a->strings["Registration on this site/hub is by approval only."] = "Registraties op deze RedMatrix-hub moeten eerst worden goedgekeurd."; -- cgit v1.2.3 From 9f22f28d2f4bae5fa2a4947fc01af6200a5a5223 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 22 Aug 2014 15:51:03 -0700 Subject: doc update --- doc/html/Contact_8php.html | 2 +- doc/html/apw_2php_2style_8php.html | 4 +- doc/html/boot_8php.html | 182 ++++++------ doc/html/boot_8php.js | 2 +- doc/html/crypto_8php.html | 304 ++++++++++++++++++++- doc/html/crypto_8php.js | 13 +- doc/html/datetime_8php.html | 2 +- doc/html/dba__driver_8php.html | 4 +- doc/html/diaspora_8php.html | 69 ++--- doc/html/diaspora_8php.js | 6 +- doc/html/dir_23ec12649285f9fabf3a6b7380226c28.html | 2 - doc/html/dir_23ec12649285f9fabf3a6b7380226c28.js | 1 - doc/html/dir_d41ce877eb409a4791b288730010abe2.html | 2 - doc/html/dir_d41ce877eb409a4791b288730010abe2.js | 1 - doc/html/docblox__errorchecker_8php.html | 4 +- doc/html/enotify_8php.html | 2 +- doc/html/event_8php.html | 2 +- doc/html/extract_8php.html | 4 +- doc/html/files.html | 220 ++++++++------- doc/html/globals.html | 41 +-- doc/html/globals_0x63.html | 5 +- doc/html/globals_0x64.html | 17 +- doc/html/globals_0x66.html | 9 +- doc/html/globals_0x67.html | 10 +- doc/html/globals_0x68.html | 3 + doc/html/globals_0x6d.html | 9 +- doc/html/globals_0x6f.html | 3 + doc/html/globals_0x70.html | 15 + doc/html/globals_0x72.html | 3 + doc/html/globals_0x73.html | 12 + doc/html/globals_0x75.html | 3 + doc/html/globals_0x77.html | 7 +- doc/html/globals_0x78.html | 3 - doc/html/globals_func_0x63.html | 5 +- doc/html/globals_func_0x64.html | 17 +- doc/html/globals_func_0x66.html | 9 +- doc/html/globals_func_0x67.html | 10 +- doc/html/globals_func_0x68.html | 3 + doc/html/globals_func_0x6d.html | 6 + doc/html/globals_func_0x6f.html | 3 + doc/html/globals_func_0x70.html | 15 + doc/html/globals_func_0x72.html | 3 + doc/html/globals_func_0x73.html | 12 + doc/html/globals_func_0x75.html | 3 + doc/html/globals_func_0x77.html | 7 +- doc/html/globals_func_0x78.html | 3 - doc/html/globals_vars.html | 41 +-- doc/html/globals_vars_0x6d.html | 3 - doc/html/html2bbcode_8php.html | 2 +- doc/html/include_2chat_8php.html | 31 --- doc/html/include_2chat_8php.js | 1 - doc/html/include_2config_8php.html | 6 +- doc/html/include_2group_8php.html | 2 +- doc/html/include_2network_8php.html | 144 +++++++--- doc/html/include_2network_8php.js | 8 +- doc/html/include_2oembed_8php.html | 2 +- doc/html/items_8php.html | 165 +++++++++-- doc/html/items_8php.js | 7 +- doc/html/language_8php.html | 2 +- doc/html/navtree.js | 14 +- doc/html/navtreeindex0.js | 118 ++++---- doc/html/navtreeindex1.js | 180 ++++++------ doc/html/navtreeindex3.js | 56 ++-- doc/html/navtreeindex4.js | 88 +++--- doc/html/navtreeindex5.js | 84 +++--- doc/html/navtreeindex6.js | 266 +++++++++--------- doc/html/navtreeindex7.js | 260 +++++++++--------- doc/html/navtreeindex8.js | 150 +++++----- doc/html/navtreeindex9.js | 25 +- doc/html/permissions_8php.html | 28 +- doc/html/permissions_8php.js | 1 + doc/html/photo__driver_8php.html | 2 +- doc/html/php_2theme__init_8php.html | 2 + doc/html/plugin_8php.html | 4 +- doc/html/post__to__red_8php.html | 20 -- doc/html/post__to__red_8php.js | 1 - doc/html/search/all_24.js | 16 +- doc/html/search/all_63.js | 3 +- doc/html/search/all_64.js | 7 +- doc/html/search/all_66.js | 7 +- doc/html/search/all_67.js | 8 +- doc/html/search/all_68.js | 1 + doc/html/search/all_6d.js | 3 +- doc/html/search/all_6f.js | 1 + doc/html/search/all_70.js | 5 + doc/html/search/all_72.js | 1 + doc/html/search/all_73.js | 6 +- doc/html/search/all_75.js | 1 + doc/html/search/all_77.js | 3 +- doc/html/search/all_78.js | 1 - doc/html/search/files_66.js | 2 - doc/html/search/functions_63.js | 3 +- doc/html/search/functions_64.js | 7 +- doc/html/search/functions_66.js | 3 +- doc/html/search/functions_67.js | 6 +- doc/html/search/functions_68.js | 1 + doc/html/search/functions_6d.js | 2 + doc/html/search/functions_6f.js | 1 + doc/html/search/functions_70.js | 5 + doc/html/search/functions_72.js | 1 + doc/html/search/functions_73.js | 4 + doc/html/search/functions_75.js | 1 + doc/html/search/functions_77.js | 3 +- doc/html/search/functions_78.js | 1 - doc/html/search/variables_24.js | 16 +- doc/html/search/variables_6d.js | 1 - doc/html/text_8php.html | 34 +-- doc/html/typo_8php.html | 2 + doc/html/zot_8php.html | 2 +- 109 files changed, 1697 insertions(+), 1236 deletions(-) diff --git a/doc/html/Contact_8php.html b/doc/html/Contact_8php.html index 38698a275..c8b87bcae 100644 --- a/doc/html/Contact_8php.html +++ b/doc/html/Contact_8php.html @@ -314,7 +314,7 @@ Functions
    -

    Referenced by widget_photo_albums().

    +

    Referenced by handle_feed(), and widget_photo_albums().

    diff --git a/doc/html/apw_2php_2style_8php.html b/doc/html/apw_2php_2style_8php.html index d2308d94a..002ed8871 100644 --- a/doc/html/apw_2php_2style_8php.html +++ b/doc/html/apw_2php_2style_8php.html @@ -246,7 +246,7 @@ Variables
    -

    Referenced by admin_page_channels(), admin_page_channels_post(), admin_page_users(), admin_page_users_post(), all_friends(), app_destroy(), app_install(), app_installed(), app_list(), build_sync_packet(), chat_message(), chatroom_list(), check_item_source(), check_list_permissions(), common_friends(), common_friends_zcid(), count_all_friends(), count_common_friends(), count_common_friends_zcid(), del_pconfig(), delete_imported_item(), drop_items(), event_addtocal(), events_post(), feature_enabled(), first_post_date(), fix_attached_photo_permissions(), fix_private_photos(), follow_init(), get_all_perms(), get_pconfig(), get_theme_uid(), get_things(), get_words(), group_add(), group_add_member(), group_byname(), group_rec_byhash(), group_rmv(), group_rmv_member(), groups_containing(), import_channel_photo(), item_add_cid(), item_expire(), item_post(), item_remove_cid(), item_store_update(), items_fetch(), list_post_dates(), load_contact_links(), load_pconfig(), local_dir_update(), FKOAuth1\loginUser(), menu_add_item(), menu_del_item(), menu_delete(), menu_delete_id(), menu_edit_item(), menu_fetch(), mini_group_select(), mood_init(), new_contact(), notifier_run(), pdl_selector(), perm_is_allowed(), photo_init(), poke_init(), posted_dates(), private_messages_list(), remove_community_tag(), send_message(), service_class_allows(), service_class_fetch(), set_pconfig(), Conversation\set_profile_owner(), photo_driver\store(), store_item_tag(), suggestion_query(), tag_deliver(), tagadelic(), tagblock(), tgroup_check(), widget_archive(), widget_follow(), widget_item(), widget_tagcloud(), and zot_feed().

    +

    Referenced by admin_page_channels(), admin_page_channels_post(), admin_page_users(), admin_page_users_post(), all_friends(), app_destroy(), app_install(), app_installed(), app_list(), build_sync_packet(), chat_message(), chatroom_list(), check_item_source(), check_list_permissions(), common_friends(), common_friends_zcid(), count_all_friends(), count_common_friends(), count_common_friends_zcid(), del_pconfig(), delete_imported_item(), diaspora_get_contact_by_handle(), drop_items(), event_addtocal(), events_post(), feature_enabled(), first_post_date(), fix_attached_photo_permissions(), fix_private_photos(), follow_init(), get_all_perms(), get_pconfig(), get_theme_uid(), get_things(), get_words(), group_add(), group_add_member(), group_byname(), group_rec_byhash(), group_rmv(), group_rmv_member(), groups_containing(), handle_feed(), import_channel_photo(), item_add_cid(), item_expire(), item_post(), item_remove_cid(), item_store_update(), items_fetch(), list_post_dates(), load_contact_links(), load_pconfig(), local_dir_update(), FKOAuth1\loginUser(), menu_add_item(), menu_del_item(), menu_delete(), menu_delete_id(), menu_edit_item(), menu_fetch(), mini_group_select(), mood_init(), new_contact(), notifier_run(), pdl_selector(), perm_is_allowed(), photo_init(), poke_init(), posted_dates(), private_messages_list(), remove_community_tag(), send_message(), service_class_allows(), service_class_fetch(), set_pconfig(), Conversation\set_profile_owner(), photo_driver\store(), store_item_tag(), suggestion_query(), tag_deliver(), tagadelic(), tagblock(), tgroup_check(), update_feed_item(), widget_archive(), widget_follow(), widget_item(), widget_tagcloud(), and zot_feed().

    @@ -260,7 +260,7 @@ Variables
    -

    Referenced by Template\_replcb_for(), Template\_replcb_if(), account_remove(), acl_init(), activity_sanitise(), admin_page_channels(), admin_page_themes(), advanced_profile(), aes_encapsulate(), api_login(), app_decode(), app_install(), app_list(), app_render(), app_store(), app_update(), apps_content(), argv(), array_sanitise(), attach_change_permissions(), attach_delete(), attach_store(), autoname(), bb_parse_crypt(), bbcode(), block_content(), blocks_content(), bookmark_add(), bookmarks_content(), build_sync_packet(), change_channel(), channel_content(), chat_content(), chat_message(), chat_post(), chatroom_create(), chatroom_enter(), chatsvc_content(), chatsvc_init(), chatsvc_post(), check_config(), check_form_security_token(), check_item_source(), check_list_permissions(), check_webbie(), RedDirectory\childExists(), cloud_init(), common_init(), construct_page(), conversation(), RedDirectory\createFile(), photo_gd\cropImage(), photo_imagick\cropImage(), datesel(), datesel_format(), decode_tags(), deliver_run(), diaspora_reshare(), dir_tagadelic(), directory_content(), directory_run(), dirprofile_init(), display_content(), downgrade_accounts(), email_header_encode(), encode_item(), encode_mail(), event_store_item(), events_post(), expand_groups(), expire_run(), externals_run(), feature_enabled(), fetch_post_tags(), filer_content(), find_xchan_in_array(), findpeople_widget(), fix_private_photos(), fix_system_urls(), photo_gd\flip(), fsuggest_post(), get_all_perms(), get_item_elements(), get_mail_elements(), get_mentions(), get_online_status(), get_profile_elements(), get_profile_fields_advanced(), get_profile_fields_basic(), get_system_apps(), get_terms_oftype(), get_theme_uid(), get_things(), RedDirectory\getChild(), RedDirectory\getDir(), RedDirectory\getQuotaInfo(), gprobe_run(), hcard_init(), hostxrd_init(), ids_to_querystr(), import_author_rss(), import_author_xchan(), import_author_zot(), import_directory_keywords(), import_directory_profile(), import_post(), import_site(), import_xchan(), invite_content(), invite_post(), item_post(), item_remove_cid(), items_fetch(), json_decode_plus(), json_return_and_die(), layouts_content(), legal_webbie(), FKOAuth1\loginUser(), magic_init(), mail_post(), manage_content(), mark_orphan_hubsxchans(), match_content(), menu_content(), menu_delete_id(), menu_fetch(), menu_render(), mimetype_select(), nav(), navbar_complete(), netgrowth_content(), network_content(), new_channel_init(), new_contact(), notification(), notifier_run(), oembed_fetch_url(), onedirsync_run(), onepoll_run(), openid_content(), page_content(), parse_app_description(), parse_xml_string(), pdledit_content(), perm_is_allowed(), photos_list_photos(), photos_post(), ping_init(), poco_load(), poller_run(), post_init(), post_post(), preg_heart(), print_template(), private_messages_list(), proc_run(), process_channel_sync_delivery(), process_mail_delivery(), profile_init(), profile_load(), profile_photo_post(), prune_hub_reinstalls(), public_recips(), RedFile\put(), dba_mysql\q(), dba_mysqli\q(), randprof_init(), red_item_new(), RedCollectionData(), RedFileData(), remote_online_status(), remove_community_tag(), rpost_content(), photo_driver\save(), search_ac_init(), send_status_notifications(), share_init(), share_unshield(), site_default_perms(), smilies(), sources_content(), sslify_init(), photo_driver\store(), string_splitter(), stringify_array_elms(), sync_directories(), tag_deliver(), tagadelic(), tagrm_content(), tagrm_post(), theme_status(), thing_content(), timesel(), toggle_theme(), update_directory_entry(), update_imported_item(), upgrade_bool_message(), upgrade_message(), valid_email(), RedBasicAuth\validateUserPass(), webpages_content(), what_next(), widget_affinity(), widget_bookmarkedchats(), widget_suggestedchats(), widget_suggestions(), xchan_query(), xmlify(), zfinger_init(), zot_process_response(), zot_refresh(), zot_register_hub(), and zotfeed_init().

    +

    Referenced by Template\_replcb_for(), Template\_replcb_if(), account_remove(), acl_init(), activity_sanitise(), admin_page_channels(), admin_page_themes(), advanced_profile(), aes_encapsulate(), api_login(), app_decode(), app_install(), app_list(), app_render(), app_store(), app_update(), apps_content(), argv(), array_sanitise(), attach_change_permissions(), attach_delete(), attach_store(), autoname(), bb_parse_crypt(), bbcode(), block_content(), blocks_content(), bookmark_add(), bookmarks_content(), build_sync_packet(), change_channel(), channel_content(), chat_content(), chat_message(), chat_post(), chatroom_create(), chatroom_enter(), chatsvc_content(), chatsvc_init(), chatsvc_post(), check_config(), check_form_security_token(), check_item_source(), check_list_permissions(), check_webbie(), RedDirectory\childExists(), cloud_init(), common_init(), construct_page(), conversation(), RedDirectory\createFile(), photo_gd\cropImage(), photo_imagick\cropImage(), datesel(), datesel_format(), decode_tags(), deliver_run(), diaspora_reshare(), dir_tagadelic(), directory_content(), directory_run(), dirprofile_init(), discover_by_webbie(), display_content(), downgrade_accounts(), email_header_encode(), encode_item(), encode_mail(), event_store_item(), events_post(), expand_groups(), expire_run(), externals_run(), feature_enabled(), fetch_post_tags(), fetch_xrd_links(), filer_content(), find_xchan_in_array(), findpeople_widget(), fix_private_photos(), fix_system_urls(), photo_gd\flip(), fsuggest_post(), get_all_perms(), get_directory_realm(), get_item_elements(), get_mail_elements(), get_mentions(), get_online_status(), get_profile_elements(), get_profile_fields_advanced(), get_profile_fields_basic(), get_system_apps(), get_terms_oftype(), get_theme_uid(), get_things(), RedDirectory\getChild(), RedDirectory\getDir(), RedDirectory\getQuotaInfo(), gprobe_run(), handle_feed(), hcard_init(), hostxrd_init(), ids_to_querystr(), import_author_rss(), import_author_xchan(), import_author_zot(), import_directory_keywords(), import_directory_profile(), import_post(), import_site(), import_xchan(), invite_content(), invite_post(), item_post(), item_remove_cid(), items_fetch(), json_decode_plus(), json_return_and_die(), layouts_content(), legal_webbie(), FKOAuth1\loginUser(), magic_init(), mail_post(), manage_content(), mark_orphan_hubsxchans(), match_content(), menu_content(), menu_delete_id(), menu_fetch(), menu_render(), mimetype_select(), nav(), navbar_complete(), netgrowth_content(), network_content(), new_channel_init(), new_contact(), notification(), notifier_run(), oembed_fetch_url(), onedirsync_run(), onepoll_run(), openid_content(), page_content(), parse_app_description(), parse_xml_string(), pdledit_content(), pemtome(), perm_is_allowed(), photos_list_photos(), photos_post(), ping_init(), poco_load(), poller_run(), post_init(), post_post(), preg_heart(), print_template(), private_messages_list(), proc_run(), process_channel_sync_delivery(), process_mail_delivery(), profile_init(), profile_load(), profile_photo_post(), prune_hub_reinstalls(), public_recips(), pubrsatome(), RedFile\put(), dba_mysql\q(), dba_mysqli\q(), randprof_init(), red_item_new(), RedCollectionData(), RedFileData(), remote_online_status(), remove_community_tag(), rpost_content(), photo_driver\save(), scrape_feed(), scrape_vcard(), search_ac_init(), send_status_notifications(), share_init(), share_unshield(), site_default_perms(), smilies(), sources_content(), sslify_init(), photo_driver\store(), string_splitter(), stringify_array_elms(), sync_directories(), tag_deliver(), tagadelic(), tagrm_content(), tagrm_post(), theme_status(), thing_content(), timesel(), toggle_theme(), update_directory_entry(), update_imported_item(), upgrade_bool_message(), upgrade_message(), valid_email(), RedBasicAuth\validateUserPass(), webpages_content(), what_next(), widget_affinity(), widget_bookmarkedchats(), widget_suggestedchats(), widget_suggestions(), xchan_query(), xmlify(), zfinger_init(), zot_process_response(), zot_refresh(), zot_register_hub(), and zotfeed_init().

    diff --git a/doc/html/boot_8php.html b/doc/html/boot_8php.html index e7a7ddb7e..560a01771 100644 --- a/doc/html/boot_8php.html +++ b/doc/html/boot_8php.html @@ -197,6 +197,8 @@ Functions    head_get_icon ()   + get_directory_realm () +  @@ -206,7 +208,7 @@ Variables - + @@ -456,8 +458,6 @@ Variables - - @@ -996,7 +996,7 @@ Variables

    Variables

     
    const ZOT_REVISION 1
     
    const DB_UPDATE_VERSION 1121
    const DB_UPDATE_VERSION 1123
     
    const EOL '<br />' . "\r\n"
     
     
    const ZCURL_TIMEOUT (-1)
     
    const MAX_CHATROOM_HOURS 36
     
    const NOTIFY_INTRO 0x0001
     
    const NOTIFY_CONFIRM 0x0002
    -

    Referenced by FriendicaSmarty\__construct(), FriendicaSmartyEngine\__construct(), abook_toggle_flag(), account_remove(), allowed_public_recips(), api_apply_template(), api_format_items(), api_get_user(), api_statuses_home_timeline(), api_statuses_repeat(), api_statuses_user_timeline(), api_user(), app_render(), app_store(), argc(), argv(), atom_entry(), authenticate_success(), avatar_img(), bbcode(), best_link_url(), blogtheme_imgurl(), build_sync_packet(), call_hooks(), can_comment_on_post(), categories_widget(), change_channel(), channel_remove(), check_form_security_token(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), check_htaccess(), cli_suggest_run(), comanche_get_channel_id(), comanche_replace_region(), comanche_widget(), common_friends_visitor_widget(), connedit_content(), contact_block(), contact_select(), create_identity(), current_theme(), deliver_run(), design_tools(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_like(), diaspora_message(), diaspora_msg_build(), diaspora_photo(), diaspora_post(), diaspora_profile(), diaspora_pubmsg_build(), diaspora_request(), diaspora_reshare(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_retraction(), diaspora_send_status(), diaspora_share(), diaspora_transmit(), diaspora_unshare(), dir_tagblock(), drop_item(), editpost_content(), event_store_item(), externals_run(), fileas_widget(), findpeople_widget(), fix_attached_photo_permissions(), fix_private_photos(), format_event_diaspora(), RedBrowser\generateDirectoryIndex(), get_account_id(), get_best_language(), get_birthdays(), get_events(), get_feed_for(), get_form_security_token(), FriendicaSmartyEngine\get_intltext_template(), get_intltext_template(), get_markup_template(), get_observer_hash(), get_plink(), get_theme_config_file(), get_theme_screenshot(), gprobe_run(), group_select(), guess_image_type(), handle_tag(), head_add_css(), head_add_js(), head_get_css(), head_get_js(), head_remove_css(), head_remove_js(), identity_selector(), import_channel_photo(), import_directory_profile(), import_post(), import_profile_photo(), import_xchan(), info(), insert_hook(), is_developer(), is_public_profile(), is_site_admin(), item_message_id(), item_photo_menu(), item_redir_and_replace_images(), item_store(), item_store_update(), items_fetch(), load_contact_links(), load_hooks(), local_dir_update(), login(), FKOAuth1\loginUser(), manage_content(), map_scope(), menu_add_item(), menu_edit_item(), nav_set_selected(), new_contact(), notice(), notification(), notifier_run(), oembed_fetch_url(), oembed_format_object(), oembed_iframe(), onedirsync_run(), onepoll_run(), page_content(), parse_app_description(), photos_album_widget(), photos_content(), ping_init(), poco_load(), poller_run(), post_activity_item(), preg_heart(), prepare_body(), proc_run(), process_delivery(), profile_activity(), profile_sidebar(), public_permissions_sql(), register_page_template(), replace_macros(), rmagic_init(), rpost_callback(), scale_external_images(), search(), searchbox(), send_message(), send_reg_approval_email(), send_status_notifications(), send_verification_email(), service_class_allows(), service_class_fetch(), smilies(), tag_deliver(), tgroup_check(), theme_include(), tryzrlvideo(), tt(), update_suggestions(), user_allow(), user_approve(), vcard_from_xchan(), verify_email_address(), wfinger_init(), what_next(), widget_archive(), widget_categories(), widget_chatroom_list(), widget_collections(), widget_design_tools(), widget_filer(), widget_follow(), widget_fullprofile(), widget_mailmenu(), widget_menu_preview(), widget_photo_albums(), widget_profile(), widget_savedsearch(), widget_settings_menu(), widget_tagcloud(), widget_tagcloud_wall(), widget_vcard(), z_fetch_url(), and zot_finger().

    +

    Referenced by FriendicaSmarty\__construct(), FriendicaSmartyEngine\__construct(), abook_toggle_flag(), account_remove(), allowed_public_recips(), api_apply_template(), api_format_items(), api_get_user(), api_statuses_home_timeline(), api_statuses_repeat(), api_statuses_user_timeline(), api_user(), app_render(), app_store(), argc(), argv(), atom_entry(), authenticate_success(), avatar_img(), bbcode(), best_link_url(), blogtheme_imgurl(), build_sync_packet(), call_hooks(), can_comment_on_post(), categories_widget(), change_channel(), channel_remove(), check_form_security_token(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), check_htaccess(), cli_suggest_run(), comanche_get_channel_id(), comanche_replace_region(), comanche_widget(), common_friends_visitor_widget(), connedit_content(), contact_block(), contact_select(), create_identity(), current_theme(), deliver_run(), design_tools(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_like(), diaspora_message(), diaspora_msg_build(), diaspora_photo(), diaspora_post(), diaspora_profile(), diaspora_pubmsg_build(), diaspora_request(), diaspora_reshare(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_retraction(), diaspora_send_status(), diaspora_share(), diaspora_transmit(), diaspora_unshare(), dir_tagblock(), drop_item(), editpost_content(), event_store_item(), externals_run(), fileas_widget(), findpeople_widget(), fix_attached_photo_permissions(), fix_private_photos(), format_event_diaspora(), RedBrowser\generateDirectoryIndex(), get_account_id(), get_best_language(), get_birthdays(), get_events(), get_feed_for(), get_form_security_token(), FriendicaSmartyEngine\get_intltext_template(), get_intltext_template(), get_markup_template(), get_observer_hash(), get_plink(), get_theme_config_file(), get_theme_screenshot(), gprobe_run(), group_select(), guess_image_type(), handle_tag(), head_add_css(), head_add_js(), head_get_css(), head_get_js(), head_remove_css(), head_remove_js(), identity_selector(), import_channel_photo(), import_directory_profile(), import_post(), import_profile_photo(), import_xchan(), info(), insert_hook(), is_developer(), is_public_profile(), is_site_admin(), item_message_id(), item_photo_menu(), item_redir_and_replace_images(), item_store(), item_store_update(), items_fetch(), load_contact_links(), load_hooks(), local_dir_update(), login(), FKOAuth1\loginUser(), manage_content(), map_scope(), menu_add_item(), menu_edit_item(), nav_set_selected(), new_contact(), notice(), notification(), notifier_run(), oembed_fetch_url(), oembed_format_object(), oembed_iframe(), onedirsync_run(), onepoll_run(), page_content(), parse_app_description(), photos_album_widget(), photos_content(), ping_init(), poco_load(), poller_run(), post_activity_item(), preg_heart(), prepare_body(), proc_run(), process_delivery(), profile_activity(), profile_sidebar(), public_permissions_sql(), register_page_template(), replace_macros(), rmagic_init(), rpost_callback(), scale_external_images(), scrape_feed(), scrape_vcard(), search(), searchbox(), send_message(), send_reg_approval_email(), send_status_notifications(), send_verification_email(), service_class_allows(), service_class_fetch(), smilies(), tag_deliver(), tgroup_check(), theme_include(), tryzrlvideo(), tt(), update_suggestions(), user_allow(), user_approve(), vcard_from_xchan(), verify_email_address(), wfinger_init(), what_next(), widget_archive(), widget_categories(), widget_chatroom_list(), widget_collections(), widget_design_tools(), widget_filer(), widget_follow(), widget_fullprofile(), widget_mailmenu(), widget_menu_preview(), widget_photo_albums(), widget_profile(), widget_savedsearch(), widget_settings_menu(), widget_tagcloud(), widget_tagcloud_wall(), widget_vcard(), z_fetch_url(), and zot_finger().

    @@ -1026,6 +1026,23 @@ Variables

    Referenced by construct_page().

    + + + +
    +
    + + + + + + + +
    get_directory_realm ()
    +
    @@ -1076,7 +1093,7 @@ Variables
    -

    Referenced by account_remove(), admin_page_channels(), admin_page_channels_post(), admin_page_dbsync(), admin_page_hubloc(), admin_page_hubloc_post(), admin_page_logs_post(), admin_page_plugins(), admin_page_site_post(), admin_page_themes(), admin_page_users(), admin_page_users_post(), admin_post(), api_content(), appman_post(), authenticate_success(), channel_content(), channel_remove(), chanview_content(), chat_content(), chat_post(), chatsvc_content(), check_form_security_token_redirectOnErr(), connect_post(), connections_post(), connedit_content(), connedit_post(), delegate_content(), directory_content(), display_content(), drop_item(), events_post(), filerm_content(), filestorage_content(), filestorage_post(), follow_init(), frphotos_init(), group_content(), group_post(), home_init(), import_post(), item_post(), login_content(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_post(), manage_content(), menu_content(), menu_post(), message_content(), mitem_content(), mitem_post(), mood_init(), network_content(), new_channel_post(), new_contact(), notifications_post(), notify_init(), openid_content(), pdledit_post(), photos_post(), post_init(), profile_photo_post(), profiles_init(), randprof_init(), rbmark_content(), rbmark_post(), register_post(), removeaccount_content(), removeme_content(), rmagic_init(), rmagic_post(), rpost_content(), search_content(), settings_post(), sources_content(), sources_post(), sslify_init(), tagrm_content(), tagrm_post(), toggle_mobile_init(), toggle_safesearch_init(), wfinger_init(), xref_init(), and zid_init().

    +

    Referenced by account_remove(), admin_page_channels(), admin_page_channels_post(), admin_page_dbsync(), admin_page_hubloc(), admin_page_hubloc_post(), admin_page_logs_post(), admin_page_plugins(), admin_page_site_post(), admin_page_themes(), admin_page_users(), admin_page_users_post(), admin_post(), api_content(), appman_post(), authenticate_success(), channel_content(), channel_remove(), chanview_content(), chat_content(), chat_post(), chatsvc_content(), check_form_security_token_redirectOnErr(), connect_post(), connections_post(), connedit_content(), connedit_post(), delegate_content(), directory_content(), display_content(), drop_item(), events_post(), filerm_content(), filestorage_content(), filestorage_post(), follow_init(), group_content(), group_post(), home_init(), import_post(), item_post(), login_content(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_post(), manage_content(), menu_content(), menu_post(), message_content(), mitem_content(), mitem_post(), mood_init(), network_content(), new_channel_post(), new_contact(), notifications_post(), notify_init(), openid_content(), pdledit_post(), photos_post(), post_init(), profile_photo_post(), profiles_init(), randprof_init(), rbmark_content(), rbmark_post(), register_post(), removeaccount_content(), removeme_content(), rmagic_init(), rmagic_post(), rpost_content(), search_content(), settings_post(), sources_content(), sources_post(), sslify_init(), tagrm_content(), tagrm_post(), toggle_mobile_init(), toggle_safesearch_init(), wfinger_init(), xref_init(), and zid_init().

    @@ -1127,7 +1144,7 @@ Variables
    -

    Referenced by admin_page_dbsync(), admin_page_logs_post(), admin_page_plugins(), admin_page_site_post(), admin_page_themes(), admin_post(), appman_post(), bookmarks_init(), connections_post(), connedit_content(), connedit_post(), directory_content(), dirprofile_init(), filestorage_content(), follow_init(), frphotos_content(), fsuggest_post(), group_content(), group_post(), item_post(), lostpass_content(), lostpass_post(), mail_content(), match_content(), menu_content(), menu_post(), message_content(), mitem_content(), mitem_post(), network_content(), oexchange_content(), openid_content(), pdledit_post(), post_init(), profile_photo_post(), profiles_init(), profiles_post(), register_post(), regmod_content(), settings_post(), sources_content(), sources_post(), suggest_content(), tagrm_post(), thing_init(), user_allow(), user_approve(), and viewconnections_content().

    +

    Referenced by admin_page_dbsync(), admin_page_logs_post(), admin_page_plugins(), admin_page_site_post(), admin_page_themes(), admin_post(), appman_post(), bookmarks_init(), connections_post(), connedit_content(), connedit_post(), directory_content(), dirprofile_init(), filestorage_content(), follow_init(), fsuggest_post(), group_content(), group_post(), item_post(), lostpass_content(), lostpass_post(), mail_content(), match_content(), menu_content(), menu_post(), message_content(), mitem_content(), mitem_post(), network_content(), oexchange_content(), openid_content(), pdledit_post(), post_init(), profile_photo_post(), profiles_init(), profiles_post(), register_post(), regmod_content(), settings_post(), sources_content(), sources_post(), suggest_content(), tagrm_post(), thing_init(), user_allow(), user_approve(), and viewconnections_content().

    @@ -1245,7 +1262,7 @@ Variables
    -

    Referenced by Conversation\__construct(), acl_init(), api_content(), api_get_user(), api_post(), api_user(), app_render(), appman_content(), appman_post(), apps_content(), apw_form(), best_link_url(), blocks_content(), bookmarks_content(), bookmarks_init(), App\build_pagehead(), build_sync_packet(), change_channel(), channel_content(), channel_init(), channel_remove(), chanview_content(), chat_content(), chat_init(), chat_post(), cloud_init(), comanche_get_channel_id(), common_friends_visitor_widget(), connect_content(), connect_post(), connections_content(), connections_init(), connections_post(), connedit_content(), connedit_init(), connedit_post(), contact_block(), contact_select(), contactgroup_content(), conversation(), current_theme(), delegate_content(), directory_content(), dirprofile_init(), display_content(), drop_item(), drop_items(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), fbrowser_content(), fileas_widget(), filer_content(), filerm_content(), filestorage_content(), filestorage_post(), findpeople_widget(), follow_content(), follow_init(), frphotos_content(), frphotos_init(), fsuggest_content(), fsuggest_post(), RedBrowser\generateDirectoryIndex(), get_birthdays(), Item\get_comment_box(), get_events(), get_online_status(), Item\get_template_data(), get_theme_uid(), group_content(), group_get_members(), group_post(), group_select(), group_side(), handle_tag(), hcard_init(), home_init(), identity_selector(), invite_content(), invite_post(), is_public_profile(), item_content(), item_permissions_sql(), item_photo_menu(), item_post(), item_store(), item_store_update(), items_fetch(), layouts_content(), lockview_content(), login(), login_content(), magic_init(), mail_content(), mail_post(), manage_content(), match_content(), menu_add_item(), menu_content(), menu_edit_item(), menu_post(), message_content(), mimetype_select(), mitem_content(), mitem_init(), mitem_post(), mood_content(), mood_init(), nav(), navbar_complete(), network_content(), network_init(), new_contact(), notes_init(), notifications_content(), notifications_post(), notify_content(), notify_init(), oexchange_content(), parse_app_description(), pdledit_content(), pdledit_post(), permissions_sql(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), poke_content(), poke_init(), post_init(), prepare_body(), private_messages_list(), profile_activity(), profile_content(), profile_create_sidebar(), profile_init(), profile_load(), profile_photo_init(), profile_photo_post(), profile_photo_set_profile_perms(), profile_sidebar(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), profperm_init(), rbmark_content(), redbasic_form(), regmod_content(), removeaccount_content(), removeaccount_post(), removeme_content(), removeme_post(), rmagic_init(), rpost_content(), search(), search_ac_init(), search_content(), searchbox(), service_class_allows(), service_class_fetch(), Conversation\set_mode(), settings_init(), settings_post(), share_init(), smilies(), sources_content(), sources_post(), starred_init(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), suggest_content(), suggest_init(), tagger_content(), tagrm_content(), tagrm_post(), theme_content(), theme_post(), thing_content(), thing_init(), uexport_init(), vcard_from_xchan(), viewconnections_content(), viewconnections_init(), viewsrc_content(), webpages_content(), widget_affinity(), widget_appselect(), widget_design_tools(), widget_filer(), widget_follow(), widget_fullprofile(), widget_mailmenu(), widget_notes(), widget_profile(), widget_savedsearch(), widget_settings_menu(), widget_suggestions(), z_input_filter(), zid_init(), and zping_content().

    +

    Referenced by Conversation\__construct(), acl_init(), api_content(), api_get_user(), api_post(), api_user(), app_render(), appman_content(), appman_post(), apps_content(), apw_form(), best_link_url(), blocks_content(), bookmarks_content(), bookmarks_init(), App\build_pagehead(), build_sync_packet(), change_channel(), channel_content(), channel_init(), channel_remove(), chanview_content(), chat_content(), chat_init(), chat_post(), cloud_init(), comanche_get_channel_id(), common_friends_visitor_widget(), connect_content(), connect_post(), connections_content(), connections_init(), connections_post(), connedit_content(), connedit_init(), connedit_post(), contact_block(), contact_select(), contactgroup_content(), conversation(), current_theme(), delegate_content(), directory_content(), dirprofile_init(), display_content(), drop_item(), drop_items(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), fbrowser_content(), fileas_widget(), filer_content(), filerm_content(), filestorage_content(), filestorage_post(), findpeople_widget(), follow_content(), follow_init(), fsuggest_content(), fsuggest_post(), RedBrowser\generateDirectoryIndex(), get_birthdays(), Item\get_comment_box(), get_events(), get_online_status(), Item\get_template_data(), get_theme_uid(), group_content(), group_get_members(), group_post(), group_select(), group_side(), handle_tag(), hcard_init(), home_init(), identity_selector(), invite_content(), invite_post(), is_public_profile(), item_content(), item_permissions_sql(), item_photo_menu(), item_post(), item_store(), item_store_update(), items_fetch(), layouts_content(), lockview_content(), login(), login_content(), magic_init(), mail_content(), mail_post(), manage_content(), match_content(), menu_add_item(), menu_content(), menu_edit_item(), menu_post(), message_content(), mimetype_select(), mitem_content(), mitem_init(), mitem_post(), mood_content(), mood_init(), nav(), navbar_complete(), network_content(), network_init(), new_contact(), notes_init(), notifications_content(), notifications_post(), notify_content(), notify_init(), oexchange_content(), parse_app_description(), pdledit_content(), pdledit_post(), permissions_sql(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), poke_content(), poke_init(), post_init(), prepare_body(), private_messages_list(), profile_activity(), profile_content(), profile_create_sidebar(), profile_init(), profile_load(), profile_photo_init(), profile_photo_post(), profile_photo_set_profile_perms(), profile_sidebar(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), profperm_init(), rbmark_content(), redbasic_form(), regmod_content(), removeaccount_content(), removeaccount_post(), removeme_content(), removeme_post(), rmagic_init(), rpost_content(), search(), search_ac_init(), search_content(), searchbox(), service_class_allows(), service_class_fetch(), Conversation\set_mode(), settings_init(), settings_post(), share_init(), smilies(), sources_content(), sources_post(), starred_init(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), suggest_content(), suggest_init(), tagger_content(), tagrm_content(), tagrm_post(), theme_content(), theme_post(), thing_content(), thing_init(), uexport_init(), vcard_from_xchan(), viewconnections_content(), viewconnections_init(), viewsrc_content(), webpages_content(), widget_affinity(), widget_appselect(), widget_design_tools(), widget_filer(), widget_follow(), widget_fullprofile(), widget_mailmenu(), widget_notes(), widget_profile(), widget_savedsearch(), widget_settings_menu(), widget_suggestions(), z_input_filter(), zid_init(), and zping_content().

    @@ -1297,7 +1314,7 @@ Variables
    -

    Referenced by achievements_content(), admin_content(), admin_page_channels(), admin_page_channels_post(), admin_page_hubloc(), admin_page_plugins(), admin_page_themes(), admin_page_users(), admin_page_users_post(), api_content(), api_post(), appman_content(), appman_post(), attach_init(), block_content(), blocks_content(), bookmarks_content(), channel_content(), channel_init(), chanview_content(), chat_content(), chat_init(), chatroom_enter(), check_form_security_token_redirectOnErr(), common_content(), common_init(), connect_init(), connect_post(), connections_content(), connections_post(), connedit_content(), connedit_post(), delegate_content(), directory_content(), dirprofile_init(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), filestorage_content(), filestorage_post(), follow_init(), frphotos_content(), fsuggest_content(), fsuggest_post(), group_add(), group_content(), group_post(), hcard_init(), home_content(), import_content(), import_post(), importelm_post(), invite_content(), invite_post(), item_content(), item_post(), layouts_content(), like_content(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_post(), manage_content(), match_content(), menu_content(), menu_post(), message_content(), mitem_content(), mitem_init(), mitem_post(), mood_content(), network_content(), network_init(), new_channel_content(), new_channel_post(), notifications_content(), notifications_post(), oexchange_content(), openid_content(), page_content(), pdledit_content(), photos_content(), photos_post(), poke_content(), post_init(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), register_content(), register_post(), regmod_content(), removeaccount_post(), removeme_post(), rmagic_post(), search_content(), settings_post(), sources_content(), sources_post(), subthread_content(), suggest_content(), thing_content(), thing_init(), user_deny(), viewconnections_content(), viewsrc_content(), wall_attach_post(), wall_upload_post(), webpages_content(), and xchan_content().

    +

    Referenced by account_remove(), achievements_content(), admin_content(), admin_page_channels(), admin_page_channels_post(), admin_page_hubloc(), admin_page_plugins(), admin_page_themes(), admin_page_users(), admin_page_users_post(), api_content(), api_post(), appman_content(), appman_post(), attach_init(), block_content(), blocks_content(), bookmarks_content(), channel_content(), channel_init(), chanview_content(), chat_content(), chat_init(), chatroom_enter(), check_form_security_token_redirectOnErr(), common_content(), common_init(), connect_init(), connect_post(), connections_content(), connections_post(), connedit_content(), connedit_post(), delegate_content(), directory_content(), dirprofile_init(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), filestorage_content(), filestorage_post(), follow_init(), fsuggest_content(), fsuggest_post(), group_add(), group_content(), group_post(), hcard_init(), home_content(), import_content(), import_post(), importelm_post(), invite_content(), invite_post(), item_content(), item_post(), layouts_content(), like_content(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_post(), manage_content(), match_content(), menu_content(), menu_post(), message_content(), mitem_content(), mitem_init(), mitem_post(), mood_content(), network_content(), network_init(), new_channel_content(), new_channel_post(), notifications_content(), notifications_post(), oexchange_content(), openid_content(), page_content(), pdledit_content(), photos_content(), photos_post(), poke_content(), post_init(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), register_content(), register_post(), regmod_content(), removeaccount_post(), removeme_post(), rmagic_post(), search_content(), settings_post(), sources_content(), sources_post(), subthread_content(), suggest_content(), thing_content(), thing_init(), user_deny(), viewconnections_content(), viewsrc_content(), wall_attach_post(), wall_upload_post(), webpages_content(), and xchan_content().

    @@ -1353,7 +1370,7 @@ Variables

    e.g.: proc_run("ls","-la","/tmp");

    $cmd and string args are surrounded with ""

    -

    Referenced by admin_page_channels_post(), build_sync_packet(), channel_remove(), connect_post(), connections_post(), connedit_content(), connedit_post(), create_identity(), diaspora_comment(), diaspora_like(), diaspora_request(), diaspora_signed_retraction(), directory_run(), drop_item(), drop_items(), events_post(), fix_system_urls(), follow_init(), frphotos_init(), fsuggest_post(), import_post(), item_post(), like_content(), mail_content(), mood_init(), new_contact(), notifier_run(), photo_upload(), photos_post(), poller_run(), post_activity_item(), process_delivery(), profile_activity(), profile_photo_post(), profiles_post(), send_message(), settings_post(), tag_deliver(), tagger_content(), zid_init(), and zot_refresh().

    +

    Referenced by admin_page_channels_post(), build_sync_packet(), channel_remove(), connect_post(), connections_post(), connedit_content(), connedit_post(), create_identity(), diaspora_like(), diaspora_signed_retraction(), directory_run(), drop_item(), drop_items(), events_post(), fix_system_urls(), follow_init(), fsuggest_post(), import_post(), item_post(), like_content(), mail_content(), mood_init(), new_contact(), notifier_run(), photo_upload(), photos_post(), poller_run(), post_activity_item(), process_delivery(), profile_activity(), profile_photo_post(), profiles_post(), send_message(), settings_post(), start_delivery_chain(), tag_deliver(), tagger_content(), zid_init(), and zot_refresh().

    @@ -1431,7 +1448,7 @@ Variables
    -

    Referenced by FriendicaSmarty\__construct(), App\__construct(), acl_init(), admin_page_channels_post(), admin_page_logs_post(), admin_page_plugins(), admin_page_site(), admin_page_site_post(), admin_page_themes(), admin_page_users_post(), api_content(), api_direct_messages_box(), api_direct_messages_new(), api_favorites(), api_format_messages(), api_get_user(), api_login(), api_post(), api_statuses_f(), api_statuses_home_timeline(), api_statuses_mentions(), api_statuses_public_timeline(), api_statuses_show(), api_statuses_update(), api_statuses_user_timeline(), api_user(), app_store(), app_update(), attach_store(), authenticate_success(), bbcode(), bbtoevent(), best_link_url(), bookmark_add(), App\build_pagehead(), channel_content(), chatsvc_content(), check_form_security_token(), cloud_init(), connections_content(), connections_post(), connedit_content(), construct_page(), consume_feed(), conversation(), create_account(), create_identity(), current_theme(), current_theme_url(), del_pconfig(), del_xconfig(), delegate_content(), detect_language(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_like(), diaspora_message(), diaspora_post(), diaspora_reshare(), directory_content(), dirprofile_init(), dirsearch_content(), display_content(), encode_rel_links(), event_addtocal(), events_content(), events_post(), feed_init(), filerm_content(), filestorage_post(), get_atom_elements(), get_browser_language(), get_item_elements(), get_my_address(), get_my_url(), get_plink(), get_public_feed(), Item\get_template_data(), group_add(), group_rmv(), group_side(), home_content(), import_post(), import_xchan(), info(), invite_post(), item_post(), item_store(), item_store_update(), lang_selector(), load_contact_links(), local_user(), lostpass_content(), magic_init(), mail_content(), mail_post(), mail_store(), mood_content(), mood_init(), nav(), navbar_complete(), network_content(), new_channel_content(), new_cookie(), notice(), oexchange_content(), openid_content(), parse_url_content(), photo_upload(), photos_content(), photos_post(), ping_init(), poco_init(), poco_load(), poke_content(), poke_init(), post_activity_item(), post_init(), printable(), probe_content(), proc_run(), profile_photo_post(), profile_photo_set_profile_perms(), profile_sidebar(), profiles_post(), rbmark_content(), rbmark_post(), red_item_new(), ref_session_read(), register_content(), register_post(), App\register_template_engine(), regmod_content(), remote_user(), removeaccount_post(), removeme_post(), rpost_content(), script_path(), search_ac_init(), search_content(), search_init(), service_class_allows(), service_class_fetch(), App\set_baseurl(), settings_post(), setup_content(), setup_init(), siteinfo_init(), suggest_init(), t(), tagrm_post(), App\template_engine(), tt(), validate_channelname(), wall_upload_post(), webfinger_content(), wfinger_init(), widget_affinity(), widget_categories(), widget_filer(), widget_savedsearch(), widget_tagcloud(), xchan_content(), z_fetch_url(), z_post_url(), and zfinger_init().

    +

    Referenced by FriendicaSmarty\__construct(), App\__construct(), acl_init(), admin_page_channels_post(), admin_page_logs_post(), admin_page_plugins(), admin_page_site(), admin_page_site_post(), admin_page_themes(), admin_page_users_post(), api_content(), api_direct_messages_box(), api_direct_messages_new(), api_favorites(), api_format_messages(), api_get_user(), api_login(), api_post(), api_statuses_f(), api_statuses_home_timeline(), api_statuses_mentions(), api_statuses_public_timeline(), api_statuses_show(), api_statuses_update(), api_statuses_user_timeline(), api_user(), app_store(), app_update(), attach_store(), authenticate_success(), bbcode(), bbtoevent(), best_link_url(), bookmark_add(), App\build_pagehead(), channel_content(), chatsvc_content(), check_form_security_token(), cloud_init(), connections_content(), connections_post(), connedit_content(), construct_page(), consume_feed(), conversation(), create_account(), create_identity(), current_theme(), current_theme_url(), del_pconfig(), del_xconfig(), delegate_content(), detect_language(), diaspora_asphoto(), diaspora_conversation(), diaspora_like(), diaspora_message(), diaspora_reshare(), directory_content(), dirprofile_init(), dirsearch_content(), display_content(), encode_rel_links(), event_addtocal(), events_content(), events_post(), feed_init(), filerm_content(), filestorage_post(), get_atom_elements(), get_browser_language(), get_item_elements(), get_my_address(), get_my_url(), get_plink(), get_public_feed(), Item\get_template_data(), group_add(), group_rmv(), group_side(), home_content(), import_post(), import_xchan(), info(), invite_post(), item_post(), item_store(), item_store_update(), lang_selector(), load_contact_links(), local_user(), lostpass_content(), magic_init(), mail_content(), mail_post(), mail_store(), mood_content(), mood_init(), nav(), navbar_complete(), network_content(), new_channel_content(), new_cookie(), notice(), oexchange_content(), openid_content(), parse_url_content(), photo_upload(), photos_content(), photos_post(), ping_init(), poco_init(), poco_load(), poke_content(), poke_init(), post_activity_item(), post_init(), printable(), probe_content(), proc_run(), profile_photo_post(), profile_photo_set_profile_perms(), profile_sidebar(), profiles_post(), rbmark_content(), rbmark_post(), red_item_new(), ref_session_read(), register_content(), register_post(), App\register_template_engine(), regmod_content(), remote_user(), removeaccount_post(), removeme_post(), rpost_content(), scrape_feed(), script_path(), search_ac_init(), search_content(), search_init(), service_class_allows(), service_class_fetch(), App\set_baseurl(), settings_post(), setup_content(), setup_init(), siteinfo_init(), suggest_init(), t(), tagrm_post(), App\template_engine(), tt(), validate_channelname(), wall_upload_post(), webfinger_content(), wfinger_init(), widget_affinity(), widget_categories(), widget_filer(), widget_savedsearch(), widget_tagcloud(), xchan_content(), z_fetch_url(), z_post_url(), and zfinger_init().

    @@ -1465,7 +1482,7 @@ Variables
    -

    Referenced by admin_content(), allowed_public_recips(), app_render(), app_store(), app_update(), appman_post(), authenticate_success(), bb_parse_crypt(), bbcode(), blocks_content(), chanlink_cid(), chanlink_hash(), chanlink_url(), channel_content(), channel_remove(), chat_content(), chat_post(), chatsvc_content(), check_config(), connect_post(), connections_content(), connections_post(), conversation(), create_identity(), deliver_run(), directory_content(), dirprofile_init(), display_content(), event_store_item(), externals_run(), filestorage_content(), find_upstream_directory(), follow_init(), format_categories(), format_filer(), frphotos_init(), get_parent_cloudpath(), RedBrowser\getAssetUrl(), group_post(), handle_tag(), App\head_get_icon(), head_get_icon(), home_init(), hostxrd_init(), import_post(), import_xchan(), invite_content(), item_post(), item_store(), layouts_content(), like_content(), login_content(), lostpass_content(), lostpass_post(), magic_init(), magiclink_url(), mail_post(), manage_content(), menu_content(), menu_post(), mitem_content(), mitem_post(), mood_init(), nav(), navbar_complete(), network_content(), new_channel_post(), notification(), notifications_post(), notifier_run(), openid_content(), pagelist_widget(), parse_app_description(), pdledit_post(), photo_upload(), photos_album_widget(), photos_albums_list(), photos_create_item(), photos_list_photos(), poll_content(), post_activity_item(), post_init(), post_post(), profile_activity(), profile_sidebar(), public_recips(), pubsites_content(), rbmark_content(), rbmark_post(), register_post(), removeaccount_content(), removeme_content(), rmagic_init(), rmagic_post(), rpost_content(), script_path(), search_content(), searchbox(), send_reg_approval_email(), send_verification_email(), setup_content(), setup_post(), siteinfo_content(), siteinfo_init(), sources_content(), sources_post(), sslify(), sync_directories(), tagger_content(), theme_attachments(), thing_init(), toggle_safesearch_init(), update_suggestions(), user_allow(), vcard_from_xchan(), verify_email_address(), webpages_content(), wfinger_init(), widget_archive(), widget_chatroom_list(), widget_dirtags(), widget_filer(), widget_savedsearch(), widget_suggestions(), xref_init(), zfinger_init(), zid_init(), zot_build_packet(), zot_fetch(), zot_new_uid(), and zot_refresh().

    +

    Referenced by admin_content(), allowed_public_recips(), app_render(), app_store(), app_update(), appman_post(), authenticate_success(), bb_parse_crypt(), bbcode(), blocks_content(), chanlink_cid(), chanlink_hash(), chanlink_url(), channel_content(), channel_remove(), chat_content(), chat_post(), chatsvc_content(), check_config(), connect_post(), connections_content(), connections_post(), conversation(), create_identity(), deliver_run(), diaspora_request(), directory_content(), dirprofile_init(), display_content(), event_store_item(), externals_run(), filestorage_content(), find_upstream_directory(), follow_init(), format_categories(), format_filer(), get_parent_cloudpath(), RedBrowser\getAssetUrl(), group_post(), handle_tag(), App\head_get_icon(), head_get_icon(), home_init(), hostxrd_init(), import_post(), import_xchan(), invite_content(), item_photo_menu(), item_post(), item_store(), layouts_content(), like_content(), login_content(), lostpass_content(), lostpass_post(), magic_init(), magiclink_url(), mail_post(), manage_content(), menu_content(), menu_post(), mitem_content(), mitem_post(), mood_init(), nav(), navbar_complete(), network_content(), new_channel_post(), notification(), notifications_post(), notifier_run(), openid_content(), pagelist_widget(), parse_app_description(), pdledit_post(), photo_upload(), photos_album_widget(), photos_albums_list(), photos_create_item(), photos_list_photos(), poll_content(), post_activity_item(), post_init(), post_post(), profile_activity(), profile_sidebar(), public_recips(), pubsites_content(), rbmark_content(), rbmark_post(), register_post(), removeaccount_content(), removeme_content(), rmagic_init(), rmagic_post(), rpost_content(), script_path(), search_content(), searchbox(), send_reg_approval_email(), send_verification_email(), setup_content(), setup_post(), siteinfo_content(), siteinfo_init(), sources_content(), sources_post(), sslify(), sync_directories(), tagger_content(), theme_attachments(), thing_init(), toggle_safesearch_init(), update_suggestions(), user_allow(), vcard_from_xchan(), verify_email_address(), webpages_content(), wfinger_init(), widget_archive(), widget_chatroom_list(), widget_dirtags(), widget_filer(), widget_savedsearch(), widget_suggestions(), xref_init(), zfinger_init(), zid_init(), zot_build_packet(), zot_fetch(), zot_new_uid(), and zot_refresh().

    @@ -1559,7 +1576,7 @@ Variables @@ -1573,7 +1590,7 @@ Variables @@ -1796,7 +1813,7 @@ Variables @@ -1822,7 +1839,7 @@ Variables
    -

    Referenced by consume_feed(), and subthread_content().

    +

    Referenced by subthread_content().

    @@ -1836,7 +1853,7 @@ Variables @@ -1863,7 +1880,7 @@ Variables @@ -1915,7 +1932,7 @@ Variables @@ -1953,7 +1970,7 @@ Variables @@ -1979,7 +1996,7 @@ Variables @@ -2021,7 +2038,7 @@ Variables @@ -2077,8 +2094,6 @@ Variables
    -

    Referenced by consume_feed().

    -
    @@ -2091,7 +2106,7 @@ Variables @@ -2105,7 +2120,7 @@ Variables
    -

    Referenced by consume_feed(), and get_atom_elements().

    +

    Referenced by get_atom_elements().

    @@ -2119,8 +2134,6 @@ Variables
    -

    Referenced by consume_feed().

    -
    @@ -2232,7 +2245,7 @@ Variables @@ -2246,8 +2259,6 @@ Variables
    -

    Referenced by diaspora_post_allow(), and diaspora_request().

    -
    @@ -2260,8 +2271,6 @@ Variables
    -

    Referenced by diaspora_post_allow().

    -
    @@ -2269,7 +2278,7 @@ Variables
    - +
    const DB_UPDATE_VERSION 1121const DB_UPDATE_VERSION 1123
    @@ -2371,6 +2380,8 @@ Variables
    @@ -2425,7 +2436,7 @@ Variables
    -

    Referenced by achievements_content(), admin_page_channels(), admin_page_dbsync(), admin_page_hubloc(), admin_page_site_post(), admin_page_users(), api_content(), api_post(), appman_content(), appman_post(), attach_init(), block_content(), blocks_content(), bookmarks_content(), bookmarks_init(), channel_content(), channel_init(), chanview_content(), chat_content(), chat_init(), chatroom_enter(), check_account_email(), check_account_invite(), check_form_security_std_err_msg(), check_htaccess(), check_keys(), check_php(), check_smarty3(), check_store(), common_content(), common_init(), connect_init(), connections_content(), connections_post(), connedit_content(), connedit_post(), delegate_content(), directory_content(), dirprofile_init(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), filestorage_content(), filestorage_post(), follow_init(), format_like(), frphotos_content(), fsuggest_content(), fsuggest_post(), group_add(), group_content(), group_post(), hcard_init(), home_content(), import_post(), import_xchan(), importelm_post(), invite_content(), invite_post(), item_content(), item_post(), layouts_content(), like_content(), load_database(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_post(), manage_content(), match_content(), menu_content(), menu_post(), message_content(), mitem_content(), mitem_init(), mitem_post(), mood_content(), network_content(), network_init(), new_channel_content(), new_channel_post(), notifications_content(), notifications_post(), oexchange_content(), openid_content(), page_content(), pdledit_content(), pdledit_post(), photos_content(), photos_post(), poke_content(), post_init(), post_post(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), pubsites_content(), register_content(), register_post(), regmod_content(), removeaccount_post(), removeme_post(), rmagic_post(), search_content(), settings_post(), setup_content(), sources_content(), sources_post(), subthread_content(), suggest_content(), tagrm_post(), thing_content(), thing_init(), user_allow(), user_approve(), user_deny(), viewconnections_content(), viewsrc_content(), wall_attach_post(), wall_upload_post(), webpages_content(), and xchan_content().

    +

    Referenced by account_remove(), achievements_content(), admin_page_channels(), admin_page_dbsync(), admin_page_hubloc(), admin_page_site_post(), admin_page_users(), api_content(), api_post(), appman_content(), appman_post(), attach_init(), block_content(), blocks_content(), bookmarks_content(), bookmarks_init(), channel_content(), channel_init(), chanview_content(), chat_content(), chat_init(), chatroom_enter(), check_account_email(), check_account_invite(), check_form_security_std_err_msg(), check_htaccess(), check_keys(), check_php(), check_smarty3(), check_store(), common_content(), common_init(), connect_init(), connections_content(), connections_post(), connedit_content(), connedit_post(), delegate_content(), directory_content(), dirprofile_init(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), filestorage_content(), filestorage_post(), follow_init(), format_like(), fsuggest_content(), fsuggest_post(), group_add(), group_content(), group_post(), hcard_init(), home_content(), import_post(), import_xchan(), importelm_post(), invite_content(), invite_post(), item_content(), item_post(), layouts_content(), like_content(), load_database(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_post(), manage_content(), match_content(), menu_content(), menu_post(), message_content(), mitem_content(), mitem_init(), mitem_post(), mood_content(), network_content(), network_init(), new_channel_content(), new_channel_post(), notifications_content(), notifications_post(), oexchange_content(), openid_content(), page_content(), pdledit_content(), pdledit_post(), photos_content(), photos_post(), poke_content(), post_init(), post_post(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), pubsites_content(), register_content(), register_post(), regmod_content(), removeaccount_post(), removeme_post(), rmagic_post(), search_content(), settings_post(), setup_content(), sources_content(), sources_post(), subthread_content(), suggest_content(), tagrm_post(), thing_content(), thing_init(), user_allow(), user_approve(), user_deny(), viewconnections_content(), viewsrc_content(), wall_attach_post(), wall_upload_post(), webpages_content(), and xchan_content().

    @@ -2439,8 +2450,6 @@ Variables
    -

    Referenced by diaspora_comment().

    -
    @@ -2453,7 +2462,7 @@ Variables @@ -2654,7 +2663,7 @@ Variables @@ -2752,7 +2761,7 @@ Variables @@ -2767,7 +2776,7 @@ Variables @@ -2903,7 +2912,7 @@ Variables @@ -2958,7 +2967,7 @@ Variables @@ -3044,7 +3053,7 @@ Variables
    -

    Referenced by RedDirectory\__construct(), RedFile\__construct(), admin_page_logs(), build_sync_packet(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), RedDirectory\childExists(), RedDirectory\createFile(), deliver_run(), detect_language(), diaspora_msg_build(), diaspora_pubmsg_build(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_status(), dir_parse_query(), directory_content(), dirprofile_init(), encode_item(), fix_private_photos(), RedDirectory\getChild(), RedDirectory\getChildren(), RedDirectory\getDir(), RedDirectory\getName(), import_xchan(), item_post(), item_store(), item_store_update(), RedDirectory\log(), RedBasicAuth\log(), magic_init(), mail_post(), mail_store(), mini_group_select(), new_contact(), notifier_run(), onepoll_run(), openid_content(), parse_xml_string(), photos_post(), ping_init(), poco_load(), post_post(), public_recips(), receive_post(), RedChannelList(), RedCollectionData(), RedDirectory\setName(), sync_directories(), tag_deliver(), tgroup_check(), update_directory_entry(), webfinger_dfrn(), xml2array(), z_fetch_url(), z_post_url(), zot_build_packet(), zot_fetch(), zot_import(), zot_process_response(), zot_refresh(), and zot_register_hub().

    +

    Referenced by RedDirectory\__construct(), RedFile\__construct(), admin_page_logs(), build_sync_packet(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), RedDirectory\childExists(), consume_feed(), RedDirectory\createFile(), deliver_run(), detect_language(), diaspora_msg_build(), diaspora_pubmsg_build(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_status(), dir_parse_query(), directory_content(), dirprofile_init(), encode_item(), fetch_xrd_links(), find_diaspora_person_by_handle(), fix_private_photos(), get_atom_elements(), RedDirectory\getChild(), RedDirectory\getChildren(), RedDirectory\getDir(), RedDirectory\getName(), import_xchan(), item_post(), item_store(), item_store_update(), RedDirectory\log(), RedBasicAuth\log(), magic_init(), mail_post(), mail_store(), mini_group_select(), new_contact(), notifier_run(), old_webfinger(), onepoll_run(), openid_content(), parse_xml_string(), photos_post(), ping_init(), poco_load(), post_post(), public_recips(), receive_post(), RedChannelList(), RedCollectionData(), RedDirectory\setName(), sync_directories(), tag_deliver(), tgroup_check(), update_directory_entry(), update_feed_item(), xml2array(), z_fetch_url(), z_post_url(), zot_build_packet(), zot_fetch(), zot_import(), zot_process_response(), zot_refresh(), and zot_register_hub().

    @@ -3058,7 +3067,7 @@ Variables
    -

    Referenced by Item\add_child(), Conversation\add_thread(), admin_content(), admin_page_hubloc_post(), admin_page_logs(), admin_post(), api_login(), api_statuses_user_timeline(), avatar_img(), bookmark_add(), consume_feed(), conversation(), RedDirectory\createDirectory(), RedDirectory\createFile(), RedFile\delete(), delete_imported_item(), deliver_run(), diaspora_conversation(), diaspora_decode(), diaspora_dispatch(), diaspora_handle_from_contact(), diaspora_message(), diaspora_photo(), diaspora_reshare(), diaspora_send_status(), directory_content(), directory_run(), dirprofile_init(), expire_run(), externals_run(), find_diaspora_person_by_handle(), fix_private_photos(), RedFile\get(), get_language_name(), Conversation\get_template_data(), RedDirectory\getDir(), RedFile\getName(), group_content(), guess_image_type(), import_author_rss(), import_author_zot(), import_channel_photo(), import_directory_profile(), import_profile_photo(), import_xchan(), item_post(), item_store(), item_store_update(), like_content(), limit_body_size(), load_plugin(), local_dir_update(), FKOAuth1\loginUser(), magic_init(), mail_store(), mood_init(), new_contact(), notes_init(), notification(), notifier_run(), parse_url_content(), photo_upload(), photos_post(), poco_init(), poco_load(), poke_init(), post_post(), process_delivery(), process_profile_delivery(), profile_load(), RedFile\put(), receive_post(), RedFileData(), Item\remove_child(), scale_external_images(), enotify\send(), Conversation\set_mode(), RedFile\setName(), stream_perms_api_uids(), stream_perms_xchans(), tag_deliver(), unload_plugin(), z_fetch_url(), z_post_url(), zot_feed(), zot_finger(), zot_gethub(), zot_register_hub(), and zotfeed_init().

    +

    Referenced by Item\add_child(), Conversation\add_thread(), admin_content(), admin_page_hubloc_post(), admin_page_logs(), admin_post(), api_login(), api_statuses_user_timeline(), avatar_img(), bookmark_add(), consume_feed(), conversation(), RedDirectory\createDirectory(), RedDirectory\createFile(), RedFile\delete(), delete_imported_item(), deliver_run(), diaspora_conversation(), diaspora_decode(), diaspora_dispatch(), diaspora_handle_from_contact(), diaspora_message(), diaspora_photo(), diaspora_reshare(), diaspora_send_status(), directory_content(), directory_run(), dirprofile_init(), expire_run(), externals_run(), fetch_lrdd_template(), fix_private_photos(), RedFile\get(), get_diaspora_key(), get_language_name(), Conversation\get_template_data(), RedDirectory\getDir(), RedFile\getName(), group_content(), guess_image_type(), import_author_rss(), import_author_zot(), import_channel_photo(), import_directory_profile(), import_profile_photo(), import_xchan(), item_post(), item_store(), item_store_update(), like_content(), limit_body_size(), load_plugin(), local_dir_update(), FKOAuth1\loginUser(), magic_init(), mail_store(), mood_init(), new_contact(), notes_init(), notification(), notifier_run(), parse_url_content(), photo_upload(), photos_post(), poco_init(), poco_load(), poke_init(), post_post(), process_delivery(), process_profile_delivery(), profile_load(), RedFile\put(), receive_post(), RedFileData(), Item\remove_child(), scale_external_images(), scrape_feed(), enotify\send(), Conversation\set_mode(), RedFile\setName(), stream_perms_api_uids(), stream_perms_xchans(), tag_deliver(), unload_plugin(), z_fetch_url(), z_post_url(), zot_feed(), zot_finger(), zot_gethub(), zot_register_hub(), and zotfeed_init().

    @@ -3169,21 +3178,6 @@ Variables

    Referenced by manage_content(), ping_init(), private_messages_fetch_conversation(), private_messages_fetch_message(), and private_messages_list().

    - - - -
    -
    - - - - -
    const MAX_CHATROOM_HOURS 36
    -
    -

    Hours before chat lines are deleted

    - -

    Referenced by chatroom_flush().

    -
    @@ -3300,7 +3294,7 @@ Variables
    -

    Referenced by get_atom_elements().

    +

    Referenced by get_atom_elements().

    @@ -3340,7 +3334,7 @@ Variables
    -

    Referenced by get_atom_elements(), and webfinger_dfrn().

    +

    Referenced by get_atom_elements().

    @@ -3366,7 +3360,7 @@ Variables
    -

    Referenced by get_atom_elements().

    +

    Referenced by get_atom_elements().

    @@ -3406,8 +3400,6 @@ Variables
    -

    Referenced by webfinger_dfrn().

    -
    @@ -3446,7 +3438,7 @@ Variables
    -

    Referenced by get_atom_elements().

    +

    Referenced by get_atom_elements().

    @@ -3460,7 +3452,7 @@ Variables
    -

    Referenced by consume_feed().

    +

    Referenced by consume_feed().

    @@ -3474,7 +3466,7 @@ Variables
    -

    Referenced by consume_feed().

    +

    Referenced by consume_feed().

    @@ -3489,6 +3481,8 @@ Variables

    various namespaces we may need to parse

    +

    Referenced by get_atom_elements().

    +
    @@ -3502,7 +3496,7 @@ Variables @@ -3516,7 +3510,7 @@ Variables @@ -3678,7 +3672,7 @@ Variables @@ -3707,7 +3701,7 @@ Variables

    email notification options

    -

    Referenced by notification(), and zot_refresh().

    +

    Referenced by diaspora_request(), notification(), and zot_refresh().

    @@ -3910,7 +3904,7 @@ Variables

    Channel pageflags

    -

    Referenced by create_identity(), and diaspora_request().

    +

    Referenced by create_identity().

    @@ -3938,7 +3932,7 @@ Variables @@ -3980,7 +3974,7 @@ Variables @@ -4008,7 +4002,7 @@ Variables @@ -4022,7 +4016,7 @@ Variables @@ -4050,7 +4044,7 @@ Variables @@ -4064,7 +4058,7 @@ Variables
    -

    Referenced by get_perms().

    +

    Referenced by diaspora_request(), get_perms(), and get_role_perms().

    @@ -4078,7 +4072,7 @@ Variables
    -

    Referenced by get_perms().

    +

    Referenced by get_perms(), and get_role_perms().

    @@ -4092,7 +4086,7 @@ Variables
    -

    Referenced by get_perms().

    +

    Referenced by get_perms(), and get_role_perms().

    @@ -4106,7 +4100,7 @@ Variables
    -

    Referenced by get_perms().

    +

    Referenced by diaspora_request(), get_perms(), and get_role_perms().

    @@ -4120,7 +4114,7 @@ Variables
    -

    Referenced by get_perms().

    +

    Referenced by get_perms(), and get_role_perms().

    @@ -4135,7 +4129,7 @@ Variables @@ -4163,7 +4157,7 @@ Variables @@ -4177,7 +4171,7 @@ Variables
    -

    Referenced by get_perms().

    +

    Referenced by diaspora_request(), get_perms(), and get_role_perms().

    @@ -4191,7 +4185,7 @@ Variables @@ -4205,7 +4199,7 @@ Variables
    -

    Referenced by get_perms().

    +

    Referenced by get_perms(), and get_role_perms().

    @@ -4219,7 +4213,7 @@ Variables @@ -4275,7 +4269,7 @@ Variables @@ -4303,7 +4297,7 @@ Variables
    -

    Referenced by get_perms().

    +

    Referenced by get_perms(), and get_role_perms().

    @@ -4625,7 +4619,7 @@ Variables @@ -4639,7 +4633,7 @@ Variables @@ -4701,7 +4695,7 @@ Variables @@ -4784,7 +4778,7 @@ Variables diff --git a/doc/html/boot_8php.js b/doc/html/boot_8php.js index e5770cdb9..392763b1c 100644 --- a/doc/html/boot_8php.js +++ b/doc/html/boot_8php.js @@ -17,6 +17,7 @@ var boot_8php = [ "get_account_id", "boot_8php.html#afe88b920aa285982edb817a0dd44eb37", null ], [ "get_app", "boot_8php.html#a0e6db7e365f2b041a828b93786f694bc", null ], [ "get_custom_nav", "boot_8php.html#a899d24fd074594ceebbf72e1feff335f", null ], + [ "get_directory_realm", "boot_8php.html#a329400dcb29897cdaae3020109272285", null ], [ "get_max_import_size", "boot_8php.html#a97769915c9f14adc4f8ab1ea2cecfd90", null ], [ "get_observer_hash", "boot_8php.html#a623e49c79943f3e7bdb770d021683cf7", null ], [ "goaway", "boot_8php.html#a5ab6181607a090bcdbaa13b15b85aba1", null ], @@ -163,7 +164,6 @@ var boot_8php = [ "MAIL_RECALLED", "boot_8php.html#ae4861de36017fe399c1839f778bad9f5", null ], [ "MAIL_REPLIED", "boot_8php.html#aa3679df31c8dad1b71816b0322d5baff", null ], [ "MAIL_SEEN", "boot_8php.html#a1fbb93cf030f07391f22cc2948744869", null ], - [ "MAX_CHATROOM_HOURS", "boot_8php.html#ae543d0b69f816b52e91167fc19d3fddc", null ], [ "MAX_IMAGE_LENGTH", "boot_8php.html#a525ca93ff35d3535d1a2b8ba57876afa", null ], [ "MAX_LIKERS", "boot_8php.html#a35625dacd2158b9f1f1a8e77f9f081fd", null ], [ "MENU_BOOKMARK", "boot_8php.html#a458e19af801bc4b0d1f1ce1a6d9e857e", null ], diff --git a/doc/html/crypto_8php.html b/doc/html/crypto_8php.html index 05f69f401..de1976f8e 100644 --- a/doc/html/crypto_8php.html +++ b/doc/html/crypto_8php.html @@ -138,6 +138,28 @@ Functions    pkcs8to1 ($oldkey, $len)   + DerToPem ($Der, $Private=false) +  + DerToRsa ($Der) +  + pkcs8_encode ($Modulus, $PublicExponent) +  + pkcs1_encode ($Modulus, $PublicExponent) +  + metopem ($m, $e) +  + pubrsatome ($key, &$m, &$e) +  + rsatopem ($key) +  + pemtorsa ($key) +  + pemtome ($key, &$m, &$e) +  + metorsa ($m, $e) +  + salmon_key ($pubkey) + 

    Function Documentation

    @@ -232,7 +254,7 @@ Functions @@ -260,7 +282,7 @@ Functions @@ -324,6 +346,108 @@ Functions

    Referenced by editpost_content(), editwebpage_content(), encode_item(), encode_mail(), mail_post(), new_contact(), post_post(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), probe_content(), tag_deliver(), unobscure(), zot_import(), and zot_refresh().

    + + + +
    +
    + + + + + + + + + + + + + + + + + + +
    DerToPem ( $Der,
     $Private = false 
    )
    +
    + +

    Referenced by metopem().

    + +
    +
    + +
    +
    + + + + + + + + +
    DerToRsa ( $Der)
    +
    + +

    Referenced by metorsa().

    + +
    +
    + +
    +
    + + + + + + + + + + + + + + + + + + +
    metopem ( $m,
     $e 
    )
    +
    + +

    Referenced by rsatopem().

    + +
    +
    + +
    +
    + + + + + + + + + + + + + + + + + + +
    metorsa ( $m,
     $e 
    )
    +
    + +

    Referenced by pemtorsa().

    +
    @@ -342,6 +466,86 @@ Functions

    Referenced by create_account(), create_identity(), and create_sys_channel().

    + + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + +
    pemtome ( $key,
    $m,
    $e 
    )
    +
    + +

    Referenced by pemtorsa(), and salmon_key().

    + +
    +
    + +
    +
    + + + + + + + + +
    pemtorsa ( $key)
    +
    + +

    Referenced by xrd_init().

    + +
    +
    + +
    +
    + + + + + + + + + + + + + + + + + + +
    pkcs1_encode ( $Modulus,
     $PublicExponent 
    )
    +
    + +

    Referenced by metorsa().

    +
    @@ -414,6 +618,34 @@ Functions

    Referenced by AES256CBC_decrypt(), and diaspora_decode().

    + + + +
    +
    + + + + + + + + + + + + + + + + + + +
    pkcs8_encode ( $Modulus,
     $PublicExponent 
    )
    +
    + +

    Referenced by metopem().

    +
    @@ -440,6 +672,40 @@ Functions
    +
    + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + +
    pubrsatome ( $key,
    $m,
    $e 
    )
    +
    + +

    Referenced by rsatopem().

    +
    @@ -514,6 +780,40 @@ Functions

    Referenced by diaspora_comment(), diaspora_conversation(), diaspora_decode(), diaspora_like(), diaspora_message(), diaspora_signed_retraction(), get_item_elements(), import_site(), import_xchan(), post_init(), post_post(), zfinger_init(), and zot_register_hub().

    + + + +
    +
    + + + + + + + + +
    rsatopem ( $key)
    +
    + +
    +
    + +
    +
    + + + + + + + + +
    salmon_key ( $pubkey)
    +
    + +

    Referenced by xrd_init().

    +
    diff --git a/doc/html/crypto_8php.js b/doc/html/crypto_8php.js index cf0dea684..dca2088c1 100644 --- a/doc/html/crypto_8php.js +++ b/doc/html/crypto_8php.js @@ -6,11 +6,22 @@ var crypto_8php = [ "aes_unencapsulate", "crypto_8php.html#aca7c3a574bfb6c6ef1f2403a56823914", null ], [ "crypto_encapsulate", "crypto_8php.html#a32fc08d57a5694f94d8543ecbb03323c", null ], [ "crypto_unencapsulate", "crypto_8php.html#a0781202b0a43b82426929cc87c2fa2b5", null ], + [ "DerToPem", "crypto_8php.html#a630e1574554f34e7c38511585d9e71a2", null ], + [ "DerToRsa", "crypto_8php.html#ae5af17db1cb5d7c91d486e1264079839", null ], + [ "metopem", "crypto_8php.html#af8bbdeaf4abed7b40365d301e6013c85", null ], + [ "metorsa", "crypto_8php.html#a573f02517abe4ac9241268263063b2a0", null ], [ "new_keypair", "crypto_8php.html#aae0ab70d6a199b29555b1ac3cf250d6a", null ], + [ "pemtome", "crypto_8php.html#a798368843cdd9bb08386b48e53e29e8c", null ], + [ "pemtorsa", "crypto_8php.html#a35bc357c93f4ddc67ef377620b0349e8", null ], + [ "pkcs1_encode", "crypto_8php.html#a890b443f80f0968fb9eabd93fc99dbb5", null ], [ "pkcs1to8", "crypto_8php.html#a4d15d19b446dbf47804675df7c85e2a9", null ], [ "pkcs5_pad", "crypto_8php.html#ad5e51fd44cff93cfaa07a37e24a5edec", null ], [ "pkcs5_unpad", "crypto_8php.html#ac95ac3b1b23b65b04a86613d4206ae85", null ], + [ "pkcs8_encode", "crypto_8php.html#a0e941b6b18ff895d1a2448741abf2ef2", null ], [ "pkcs8to1", "crypto_8php.html#a7427a18417341aa35e2207bfa205e432", null ], + [ "pubrsatome", "crypto_8php.html#a2a3fae7caca27f86d158eeaf69b6f287", null ], [ "rsa_sign", "crypto_8php.html#a920e5f222d0020f47556033d8b2b6552", null ], - [ "rsa_verify", "crypto_8php.html#ab4f21d8f6b8ece0915e7c8bb73379f96", null ] + [ "rsa_verify", "crypto_8php.html#ab4f21d8f6b8ece0915e7c8bb73379f96", null ], + [ "rsatopem", "crypto_8php.html#a7f7e650aaeaa3832580a73eb00966b26", null ], + [ "salmon_key", "crypto_8php.html#a9191447cc46f0b4eaba3273e313994d5", null ] ]; \ No newline at end of file diff --git a/doc/html/datetime_8php.html b/doc/html/datetime_8php.html index 20c270f46..19c6fe448 100644 --- a/doc/html/datetime_8php.html +++ b/doc/html/datetime_8php.html @@ -336,7 +336,7 @@ Functions
    -

    Referenced by abook_toggle_flag(), account_verify_password(), advanced_profile(), age(), api_account_rate_limit_status(), api_date(), api_rss_extra(), atom_entry(), attach_delete(), attach_mkdir(), attach_store(), authenticate_success(), build_sync_packet(), cal(), channel_content(), channel_remove(), chat_message(), chatroom_create(), chatroom_enter(), chatroom_flush(), chatsvc_content(), chatsvc_post(), Cache\clear(), consume_feed(), conversation(), create_account(), create_identity(), RedDirectory\createFile(), cronhooks_run(), delete_item_lowlevel(), deliver_run(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_message(), diaspora_post(), diaspora_profile(), diaspora_request(), diaspora_reshare(), diaspora_retraction(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_status(), diaspora_signed_retraction(), directory_run(), dirsearch_content(), dlogger(), dob(), editpost_content(), ev_compare(), event_store_event(), events_content(), events_post(), externals_run(), first_post_date(), fix_system_urls(), format_event_diaspora(), format_event_html(), fsuggest_post(), RedBrowser\generateDirectoryIndex(), get_atom_elements(), get_birthdays(), get_events(), get_feed_for(), get_first_dim(), get_item_elements(), get_mail_elements(), get_profile_elements(), get_public_feed(), Item\get_template_data(), RedDirectory\getLastModified(), RedFile\getLastModified(), import_author_rss(), import_directory_profile(), import_post(), import_site(), import_xchan(), invite_post(), item_post(), item_store(), item_store_update(), items_fetch(), like_content(), list_post_dates(), logger(), magic_init(), mail_content(), mail_post(), mail_store(), manage_content(), message_content(), network_content(), new_contact(), notification(), notifier_run(), onepoll_run(), openid_content(), pagelist_widget(), photo_upload(), photos_post(), ping_init(), poco_load(), poller_run(), post_post(), posted_dates(), profile_photo_post(), profiles_content(), profiles_post(), prune_hub_reinstalls(), RedFile\put(), dba_mysql\q(), dba_mysqli\q(), queue_run(), relative_date(), removeaccount_post(), removeme_post(), photo_driver\save(), send_message(), send_reg_approval_email(), Cache\set(), settings_post(), photo_driver\store(), sync_directories(), tag_deliver(), update_birthdays(), update_directory_entry(), update_modtime(), update_queue_time(), verify_email_address(), webpages_content(), z_birthday(), zot_feed(), zot_process_response(), zot_refresh(), and zotfeed_init().

    +

    Referenced by abook_toggle_flag(), account_verify_password(), advanced_profile(), age(), api_account_rate_limit_status(), api_date(), api_rss_extra(), atom_entry(), attach_delete(), attach_mkdir(), attach_store(), authenticate_success(), build_sync_packet(), cal(), channel_content(), channel_remove(), chat_message(), chatroom_create(), chatroom_enter(), chatsvc_content(), chatsvc_post(), Cache\clear(), consume_feed(), conversation(), create_account(), create_identity(), RedDirectory\createFile(), cronhooks_run(), delete_item_lowlevel(), deliver_run(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_message(), diaspora_post(), diaspora_profile(), diaspora_request(), diaspora_reshare(), diaspora_retraction(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_status(), diaspora_signed_retraction(), directory_run(), dirsearch_content(), dlogger(), dob(), editpost_content(), ev_compare(), event_store_event(), events_content(), events_post(), externals_run(), first_post_date(), fix_system_urls(), format_event_diaspora(), format_event_html(), fsuggest_post(), RedBrowser\generateDirectoryIndex(), get_atom_elements(), get_birthdays(), get_events(), get_feed_for(), get_first_dim(), get_item_elements(), get_mail_elements(), get_profile_elements(), get_public_feed(), Item\get_template_data(), RedDirectory\getLastModified(), RedFile\getLastModified(), import_author_rss(), import_directory_profile(), import_post(), import_site(), import_xchan(), invite_post(), item_post(), item_store(), item_store_update(), items_fetch(), like_content(), list_post_dates(), logger(), magic_init(), mail_content(), mail_post(), mail_store(), manage_content(), message_content(), network_content(), new_contact(), notification(), notifier_run(), onepoll_run(), openid_content(), pagelist_widget(), photo_upload(), photos_post(), ping_init(), poco_load(), poller_run(), post_post(), posted_dates(), profile_photo_post(), profiles_content(), profiles_post(), prune_hub_reinstalls(), RedFile\put(), dba_mysql\q(), dba_mysqli\q(), queue_run(), relative_date(), removeaccount_post(), removeme_post(), photo_driver\save(), send_message(), send_reg_approval_email(), Cache\set(), settings_post(), photo_driver\store(), sync_directories(), tag_deliver(), update_birthdays(), update_directory_entry(), update_modtime(), update_queue_time(), verify_email_address(), webpages_content(), z_birthday(), zot_feed(), zot_process_response(), zot_refresh(), and zotfeed_init().

    diff --git a/doc/html/dba__driver_8php.html b/doc/html/dba__driver_8php.html index d03862b39..f29aafa86 100644 --- a/doc/html/dba__driver_8php.html +++ b/doc/html/dba__driver_8php.html @@ -202,7 +202,7 @@ Functions
    -

    Referenced by abook_toggle_flag(), account_verify_password(), achievements_content(), acl_init(), add_source_route(), admin_page_users(), advanced_profile(), allowed_public_recips(), api_direct_messages_new(), api_get_user(), api_login(), api_status_show(), api_statuses_destroy(), api_statuses_mentions(), api_user(), api_users_show(), app_destroy(), app_installed(), app_store(), app_update(), appman_content(), attach_by_hash(), attach_by_hash_nodata(), attach_change_permissions(), attach_count_files(), attach_delete(), attach_list_files(), attach_mkdir(), attach_store(), authenticate_success(), block_content(), blocks_content(), bookmark_add(), bookmarks_init(), build_sync_packet(), call_hooks(), categories_widget(), change_channel(), channel_content(), channel_remove(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), chanview_content(), chat_message(), chat_post(), chatroom_create(), chatroom_destroy(), chatroom_enter(), chatroom_flush(), chatroom_leave(), chatsvc_content(), chatsvc_post(), check_account_email(), check_account_invite(), check_item_source(), check_webbie(), Cache\clear(), comanche_block(), common_friends(), connect_init(), connect_post(), connections_content(), connections_post(), connedit_post(), consume_feed(), contact_remove(), contactgroup_content(), count_common_friends(), create_account(), create_identity(), RedDirectory\createFile(), dbesc_array_cb(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_dispatch_public(), diaspora_get_contact_by_handle(), diaspora_like(), diaspora_message(), diaspora_photo(), diaspora_post(), diaspora_profile(), diaspora_request(), diaspora_reshare(), diaspora_retraction(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_relay(), diaspora_signed_retraction(), diaspora_transmit(), dir_query_build(), directory_run(), dirsearch_content(), display_content(), downgrade_accounts(), editlayout_content(), editpost_content(), editwebpage_content(), event_addtocal(), event_store_event(), event_store_item(), events_content(), events_post(), externals_run(), fbrowser_content(), feed_init(), fetch_post_tags(), file_tag_file_query(), filerm_content(), filestorage_content(), find_diaspora_person_by_handle(), find_filename_by_hash(), find_folder_hash_by_attach_hash(), RedBrowser\findAttachHash(), RedBrowser\findAttachIdByHash(), fix_attached_photo_permissions(), fix_private_photos(), fix_system_urls(), frphotos_init(), fsuggest_post(), Cache\get(), RedFile\get(), get_all_perms(), get_birthdays(), get_channel_by_nick(), get_cloudpath(), get_config_from_storage(), get_events(), get_item_elements(), get_online_status(), get_things(), RedDirectory\getDir(), RedDirectory\getLastModified(), gprobe_run(), group_add(), group_add_member(), group_byname(), group_content(), group_post(), group_rec_byhash(), group_rmv(), group_rmv_member(), groups_containing(), handle_tag(), hcard_init(), home_content(), import_author_rss(), import_author_zot(), import_directory_keywords(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), invite_post(), is_matrix_url(), item_add_cid(), item_message_id(), item_permissions_sql(), item_post(), item_remove_cid(), item_store(), item_store_update(), items_fetch(), layouts_content(), like_content(), load_config(), load_plugin(), load_xconfig(), local_dir_update(), lockview_content(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_nonce(), FKOAuthDataStore\lookup_token(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_store(), manage_content(), mark_orphan_hubsxchans(), match_openid(), member_of(), menu_add_item(), menu_create(), menu_delete(), menu_edit(), menu_edit_item(), menu_fetch(), menu_list(), msearch_post(), netgrowth_content(), network_content(), FKOAuthDataStore\new_access_token(), new_contact(), new_cookie(), FKOAuthDataStore\new_request_token(), notification(), notifier_run(), notify_init(), oauth_get_client(), onedirsync_run(), onepoll_run(), openid_content(), page_content(), perm_is_allowed(), permissions_sql(), photo_init(), photo_new_resource(), photo_upload(), photos_album_exists(), photos_album_get_db_idstr(), photos_album_rename(), photos_content(), photos_list_photos(), photos_post(), ping_init(), plugin_is_installed(), poco_init(), poco_load(), poll_post(), poller_run(), post_init(), post_post(), private_messages_drop(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_init(), profile_load(), profile_photo_post(), profile_photo_set_profile_perms(), profiles_init(), profiles_post(), profperm_content(), prune_hub_reinstalls(), public_permissions_sql(), public_recips(), RedFile\put(), queue_run(), rconnect_url(), receive_post(), RedCollectionData(), RedFileData(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_hook(), register_post(), remote_online_status(), remove_all_xchan_resources(), remove_community_tag(), remove_queue_item(), rmagic_init(), rmagic_post(), rpost_content(), photo_driver\save(), search_ac_init(), search_content(), send_message(), send_reg_approval_email(), send_status_notifications(), Cache\set(), set_config(), set_pconfig(), set_xconfig(), RedDirectory\setName(), RedFile\setName(), settings_post(), siteinfo_init(), sources_content(), sources_post(), photo_driver\store(), store_item_tag(), stream_perms_xchans(), stringify_array_elms(), subthread_content(), suggest_init(), sync_directories(), tag_deliver(), tagger_content(), tagrm_post(), term_query(), tgroup_check(), thing_content(), thing_init(), uninstall_plugin(), unregister_hook(), update_birthdays(), update_directory_entry(), update_modtime(), update_queue_time(), update_remote_id(), user_allow(), user_approve(), user_deny(), RedBasicAuth\validateUserPass(), vcard_from_xchan(), verify_email_address(), vote_post(), webpages_content(), wfinger_init(), widget_bookmarkedchats(), widget_item(), widget_savedsearch(), xchan_content(), xchan_mail_query(), xchan_query(), xrd_init(), z_readdir(), zfinger_init(), zid_init(), zot_feed(), zot_finger(), zot_get_hublocs(), zot_gethub(), zot_process_response(), zot_refresh(), and zotfeed_init().

    +

    Referenced by abook_toggle_flag(), account_verify_password(), achievements_content(), acl_init(), add_source_route(), admin_page_users(), advanced_profile(), allowed_public_recips(), api_direct_messages_new(), api_get_user(), api_login(), api_status_show(), api_statuses_destroy(), api_statuses_mentions(), api_user(), api_users_show(), app_destroy(), app_installed(), app_store(), app_update(), appman_content(), attach_by_hash(), attach_by_hash_nodata(), attach_change_permissions(), attach_count_files(), attach_delete(), attach_list_files(), attach_mkdir(), attach_store(), authenticate_success(), block_content(), blocks_content(), bookmark_add(), bookmarks_init(), build_sync_packet(), call_hooks(), categories_widget(), change_channel(), channel_content(), channel_remove(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), chanview_content(), chat_message(), chat_post(), chatroom_create(), chatroom_destroy(), chatroom_enter(), chatroom_leave(), chatsvc_content(), chatsvc_post(), check_account_email(), check_account_invite(), check_item_source(), check_webbie(), Cache\clear(), comanche_block(), common_friends(), connect_init(), connect_post(), connections_content(), connections_post(), connedit_post(), consume_feed(), contact_remove(), contactgroup_content(), count_common_friends(), create_account(), create_identity(), RedDirectory\createFile(), dbesc_array_cb(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_dispatch_public(), diaspora_get_contact_by_handle(), diaspora_like(), diaspora_message(), diaspora_photo(), diaspora_post(), diaspora_profile(), diaspora_request(), diaspora_reshare(), diaspora_retraction(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_relay(), diaspora_signed_retraction(), diaspora_transmit(), dir_query_build(), directory_run(), dirsearch_content(), display_content(), downgrade_accounts(), editlayout_content(), editpost_content(), editwebpage_content(), event_addtocal(), event_store_event(), event_store_item(), events_content(), events_post(), externals_run(), fbrowser_content(), feed_init(), fetch_post_tags(), file_tag_file_query(), filerm_content(), filestorage_content(), find_diaspora_person_by_handle(), find_filename_by_hash(), find_folder_hash_by_attach_hash(), RedBrowser\findAttachHash(), RedBrowser\findAttachIdByHash(), fix_attached_photo_permissions(), fix_private_photos(), fix_system_urls(), fsuggest_post(), Cache\get(), RedFile\get(), get_all_perms(), get_birthdays(), get_channel_by_nick(), get_cloudpath(), get_config_from_storage(), get_events(), get_item_elements(), get_online_status(), get_things(), RedDirectory\getDir(), RedDirectory\getLastModified(), gprobe_run(), group_add(), group_add_member(), group_byname(), group_content(), group_post(), group_rec_byhash(), group_rmv(), group_rmv_member(), groups_containing(), handle_feed(), handle_tag(), hcard_init(), home_content(), import_author_rss(), import_author_zot(), import_directory_keywords(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), invite_post(), is_matrix_url(), item_add_cid(), item_message_id(), item_permissions_sql(), item_post(), item_remove_cid(), item_store(), item_store_update(), items_fetch(), layouts_content(), like_content(), list_public_sites(), load_config(), load_plugin(), load_xconfig(), local_dir_update(), lockview_content(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_nonce(), FKOAuthDataStore\lookup_token(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_store(), manage_content(), mark_orphan_hubsxchans(), match_openid(), member_of(), menu_add_item(), menu_create(), menu_delete(), menu_edit(), menu_edit_item(), menu_fetch(), menu_list(), msearch_post(), netgrowth_content(), network_content(), FKOAuthDataStore\new_access_token(), new_contact(), new_cookie(), FKOAuthDataStore\new_request_token(), notification(), notifier_run(), notify_init(), oauth_get_client(), onedirsync_run(), onepoll_run(), openid_content(), page_content(), perm_is_allowed(), permissions_sql(), photo_init(), photo_new_resource(), photo_upload(), photos_album_exists(), photos_album_get_db_idstr(), photos_album_rename(), photos_content(), photos_list_photos(), photos_post(), ping_init(), plugin_is_installed(), poco_init(), poco_load(), poll_post(), poller_run(), post_init(), post_post(), private_messages_drop(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_init(), profile_load(), profile_photo_post(), profile_photo_set_profile_perms(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), prune_hub_reinstalls(), public_permissions_sql(), public_recips(), RedFile\put(), queue_run(), rconnect_url(), receive_post(), RedCollectionData(), RedFileData(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_hook(), register_post(), remote_online_status(), remove_all_xchan_resources(), remove_community_tag(), remove_queue_item(), rmagic_init(), rmagic_post(), rpost_content(), photo_driver\save(), search_ac_init(), search_content(), send_message(), send_reg_approval_email(), send_status_notifications(), Cache\set(), set_config(), set_pconfig(), set_xconfig(), RedDirectory\setName(), RedFile\setName(), settings_post(), siteinfo_init(), sitelist_init(), sources_content(), sources_post(), start_delivery_chain(), photo_driver\store(), store_item_tag(), stream_perms_xchans(), stringify_array_elms(), subthread_content(), suggest_init(), sync_directories(), tag_deliver(), tagger_content(), tagrm_post(), term_query(), tgroup_check(), thing_content(), thing_init(), uninstall_plugin(), unregister_hook(), update_birthdays(), update_directory_entry(), update_modtime(), update_queue_time(), update_remote_id(), user_allow(), user_approve(), user_deny(), RedBasicAuth\validateUserPass(), vcard_from_xchan(), verify_email_address(), vote_post(), webpages_content(), wfinger_init(), widget_bookmarkedchats(), widget_item(), widget_savedsearch(), xchan_content(), xchan_mail_query(), xchan_query(), xrd_init(), z_readdir(), zfinger_init(), zid_init(), zot_feed(), zot_finger(), zot_get_hublocs(), zot_gethub(), zot_process_response(), zot_refresh(), and zotfeed_init().

    @@ -318,7 +318,7 @@ Functions

    This will happen occasionally trying to store the session data after abnormal program termination

    -

    Referenced by abook_connections(), abook_self(), abook_toggle_flag(), account_remove(), account_total(), account_verify_password(), achievements_content(), acl_init(), add_source_route(), admin_content(), admin_page_channels(), admin_page_channels_post(), admin_page_dbsync(), admin_page_hubloc(), admin_page_hubloc_post(), admin_page_summary(), admin_page_users(), admin_page_users_post(), advanced_profile(), all_friends(), allowed_public_recips(), api_direct_messages_box(), api_direct_messages_new(), api_favorites(), api_ff_ids(), api_format_items(), api_get_user(), api_login(), api_status_show(), api_statuses_destroy(), api_statuses_f(), api_statuses_home_timeline(), api_statuses_mentions(), api_statuses_public_timeline(), api_statuses_repeat(), api_statuses_show(), api_user(), api_users_show(), app_destroy(), app_installed(), app_list(), app_store(), app_update(), appman_content(), attach_by_hash(), attach_by_hash_nodata(), attach_change_permissions(), attach_count_files(), attach_delete(), attach_init(), attach_list_files(), attach_mkdir(), attach_store(), authenticate_success(), block_content(), blocks_content(), bookmark_add(), bookmarks_init(), build_sync_packet(), call_hooks(), categories_widget(), change_channel(), chanman_remove_everything_from_network(), channel_content(), channel_remove(), channel_total(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), chanview_content(), chat_content(), chat_message(), chat_post(), chatroom_create(), chatroom_destroy(), chatroom_enter(), chatroom_flush(), chatroom_leave(), chatroom_list(), chatsvc_content(), chatsvc_init(), chatsvc_post(), check_account_email(), check_account_invite(), check_config(), check_item_source(), check_webbie(), Cache\clear(), collect_recipients(), comanche_block(), common_friends(), common_friends_zcid(), common_init(), connect_init(), connect_post(), connections_content(), connections_post(), connedit_content(), connedit_init(), connedit_post(), consume_feed(), contact_block(), contact_profile_assign(), contact_remove(), contact_select(), contactgroup_content(), count_all_friends(), count_common_friends(), count_common_friends_zcid(), create_account(), create_identity(), RedDirectory\createDirectory(), RedDirectory\createFile(), current_theme(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_dispatch_public(), diaspora_get_contact_by_handle(), diaspora_handle_from_contact(), diaspora_like(), diaspora_message(), diaspora_photo(), diaspora_post(), diaspora_post_allow(), diaspora_profile(), diaspora_request(), diaspora_reshare(), diaspora_retraction(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_signed_retraction(), diaspora_transmit(), dir_parse_query(), dir_tagadelic(), directory_content(), directory_run(), dirprofile_init(), dirsearch_content(), display_content(), downgrade_accounts(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), encode_item(), event_addtocal(), event_store_event(), event_store_item(), events_content(), events_post(), expand_groups(), expire_run(), externals_run(), fbrowser_content(), feed_init(), fetch_post_tags(), fileas_widget(), filer_content(), filerm_content(), filestorage_content(), find_diaspora_person_by_handle(), find_filename_by_hash(), find_folder_hash_by_attach_hash(), RedBrowser\findAttachHash(), RedBrowser\findAttachIdByHash(), first_post_date(), fix_attached_photo_permissions(), fix_private_photos(), fix_system_urls(), frphotos_init(), fsuggest_content(), fsuggest_post(), RedBrowser\generateDirectoryIndex(), Cache\get(), RedFile\get(), get_all_perms(), get_birthdays(), get_channel_by_nick(), get_cloudpath(), get_config_from_storage(), get_events(), get_item_elements(), get_online_status(), get_sys_channel(), get_things(), get_words(), RedDirectory\getDir(), RedDirectory\getLastModified(), RedDirectory\getQuotaInfo(), gprobe_run(), group_add(), group_add_member(), group_byname(), group_content(), group_get_members(), group_post(), group_rec_byhash(), group_rmv(), group_rmv_member(), group_select(), group_side(), groups_containing(), handle_tag(), hcard_init(), home_content(), identity_basic_export(), identity_check_service_class(), identity_selector(), import_author_rss(), import_author_zot(), import_directory_keywords(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), invite_post(), is_matrix_url(), is_sys_channel(), item_add_cid(), item_check_service_class(), item_content(), item_expire(), item_message_id(), item_post(), item_remove_cid(), item_store(), item_store_update(), items_fetch(), layout_select(), layouts_content(), like_content(), list_public_sites(), load_config(), load_contact_links(), load_hooks(), load_pconfig(), load_plugin(), load_translation_table(), load_xconfig(), local_dir_update(), lockview_content(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_nonce(), FKOAuthDataStore\lookup_token(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_store(), manage_content(), mark_orphan_hubsxchans(), match_content(), match_openid(), member_of(), menu_add_item(), menu_create(), menu_del_item(), menu_delete(), menu_delete_id(), menu_edit(), menu_edit_item(), menu_fetch(), menu_fetch_id(), menu_list(), mimetype_select(), mini_group_select(), mitem_content(), mood_init(), msearch_post(), nav(), netgrowth_content(), network_content(), FKOAuthDataStore\new_access_token(), new_contact(), new_cookie(), FKOAuthDataStore\new_request_token(), notification(), notifications_content(), notifications_post(), notifier_run(), notify_content(), notify_init(), oauth_get_client(), onedirsync_run(), onepoll_run(), openid_content(), page_content(), pagelist_widget(), pdl_selector(), perm_is_allowed(), photo_init(), photo_new_resource(), photo_upload(), photos_album_exists(), photos_album_get_db_idstr(), photos_album_rename(), photos_albums_list(), photos_content(), photos_list_photos(), photos_post(), ping_init(), plugin_is_installed(), poco_init(), poco_load(), poke_content(), poke_init(), poll_content(), poll_post(), poller_run(), post_activity_item(), post_init(), post_post(), private_messages_drop(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_init(), profile_load(), profile_photo_post(), profile_photo_set_profile_perms(), profile_sidebar(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), prune_hub_reinstalls(), public_recips(), RedFile\put(), queue_run(), random_profile(), rconnect_url(), receive_post(), RedChannelList(), RedCollectionData(), RedFileData(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_content(), register_hook(), register_post(), reload_plugins(), remote_online_status(), remove_all_xchan_resources(), remove_community_tag(), remove_queue_item(), retain_item(), rmagic_init(), rmagic_post(), rpost_content(), photo_driver\save(), search_ac_init(), search_content(), send_message(), send_reg_approval_email(), send_status_notifications(), service_class_allows(), service_class_fetch(), Cache\set(), set_config(), set_default_login_identity(), set_pconfig(), set_xconfig(), RedDirectory\setName(), RedFile\setName(), settings_post(), setup_content(), share_init(), siteinfo_content(), siteinfo_init(), sitelist_init(), sources_content(), sources_post(), starred_init(), photo_driver\store(), store_item_tag(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), suggest_init(), suggestion_query(), sync_directories(), tag_deliver(), tagadelic(), tagger_content(), tagrm_content(), tagrm_post(), tgroup_check(), thing_content(), thing_init(), uninstall_plugin(), unregister_hook(), update_birthdays(), update_directory_entry(), update_modtime(), update_queue_time(), update_remote_id(), update_suggestions(), user_allow(), user_approve(), user_deny(), RedBasicAuth\validateUserPass(), vcard_from_xchan(), verify_email_address(), viewconnections_content(), viewsrc_content(), vote_content(), vote_init(), vote_post(), webpages_content(), wfinger_init(), widget_bookmarkedchats(), widget_filer(), widget_follow(), widget_item(), widget_savedsearch(), widget_settings_menu(), widget_suggestedchats(), xchan_content(), xchan_mail_query(), xchan_query(), xrd_init(), z_input_filter(), z_readdir(), zfinger_init(), zid_init(), zot_feed(), zot_finger(), zot_get_hublocs(), zot_gethub(), zot_import(), zot_process_response(), zot_refresh(), and zotfeed_init().

    +

    Referenced by abook_connections(), abook_self(), abook_toggle_flag(), account_remove(), account_total(), account_verify_password(), achievements_content(), acl_init(), add_source_route(), admin_content(), admin_page_channels(), admin_page_channels_post(), admin_page_dbsync(), admin_page_hubloc(), admin_page_hubloc_post(), admin_page_summary(), admin_page_users(), admin_page_users_post(), advanced_profile(), all_friends(), allowed_public_recips(), api_direct_messages_box(), api_direct_messages_new(), api_favorites(), api_ff_ids(), api_format_items(), api_get_user(), api_login(), api_status_show(), api_statuses_destroy(), api_statuses_f(), api_statuses_home_timeline(), api_statuses_mentions(), api_statuses_public_timeline(), api_statuses_repeat(), api_statuses_show(), api_user(), api_users_show(), app_destroy(), app_installed(), app_list(), app_store(), app_update(), appman_content(), attach_by_hash(), attach_by_hash_nodata(), attach_change_permissions(), attach_count_files(), attach_delete(), attach_init(), attach_list_files(), attach_mkdir(), attach_store(), authenticate_success(), block_content(), blocks_content(), bookmark_add(), bookmarks_init(), build_sync_packet(), call_hooks(), categories_widget(), change_channel(), chanman_remove_everything_from_network(), channel_content(), channel_remove(), channel_total(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), chanview_content(), chat_content(), chat_message(), chat_post(), chatroom_create(), chatroom_destroy(), chatroom_enter(), chatroom_leave(), chatroom_list(), chatsvc_content(), chatsvc_init(), chatsvc_post(), check_account_email(), check_account_invite(), check_config(), check_item_source(), check_webbie(), Cache\clear(), collect_recipients(), comanche_block(), common_friends(), common_friends_zcid(), common_init(), connect_init(), connect_post(), connections_content(), connections_post(), connedit_content(), connedit_init(), connedit_post(), consume_feed(), contact_block(), contact_profile_assign(), contact_remove(), contact_select(), contactgroup_content(), count_all_friends(), count_common_friends(), count_common_friends_zcid(), create_account(), create_identity(), RedDirectory\createDirectory(), RedDirectory\createFile(), current_theme(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_dispatch_public(), diaspora_get_contact_by_handle(), diaspora_handle_from_contact(), diaspora_like(), diaspora_message(), diaspora_photo(), diaspora_post(), diaspora_profile(), diaspora_request(), diaspora_reshare(), diaspora_retraction(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_signed_retraction(), diaspora_transmit(), dir_parse_query(), dir_tagadelic(), directory_content(), directory_run(), dirprofile_init(), dirsearch_content(), display_content(), downgrade_accounts(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), encode_item(), event_addtocal(), event_store_event(), event_store_item(), events_content(), events_post(), expand_groups(), expire_run(), externals_run(), fbrowser_content(), feed_init(), fetch_post_tags(), fileas_widget(), filer_content(), filerm_content(), filestorage_content(), find_diaspora_person_by_handle(), find_filename_by_hash(), find_folder_hash_by_attach_hash(), RedBrowser\findAttachHash(), RedBrowser\findAttachIdByHash(), first_post_date(), fix_attached_photo_permissions(), fix_private_photos(), fix_system_urls(), fsuggest_content(), fsuggest_post(), RedBrowser\generateDirectoryIndex(), Cache\get(), RedFile\get(), get_all_perms(), get_birthdays(), get_channel_by_nick(), get_cloudpath(), get_config_from_storage(), get_events(), get_item_elements(), get_online_status(), get_sys_channel(), get_things(), get_words(), RedDirectory\getDir(), RedDirectory\getLastModified(), RedDirectory\getQuotaInfo(), gprobe_run(), group_add(), group_add_member(), group_byname(), group_content(), group_get_members(), group_post(), group_rec_byhash(), group_rmv(), group_rmv_member(), group_select(), group_side(), groups_containing(), handle_feed(), handle_tag(), hcard_init(), home_content(), identity_basic_export(), identity_check_service_class(), identity_selector(), import_author_rss(), import_author_zot(), import_directory_keywords(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), invite_post(), is_matrix_url(), is_sys_channel(), item_add_cid(), item_check_service_class(), item_content(), item_expire(), item_message_id(), item_post(), item_remove_cid(), item_store(), item_store_update(), items_fetch(), layout_select(), layouts_content(), like_content(), list_public_sites(), load_config(), load_contact_links(), load_hooks(), load_pconfig(), load_plugin(), load_translation_table(), load_xconfig(), local_dir_update(), lockview_content(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_nonce(), FKOAuthDataStore\lookup_token(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_store(), manage_content(), mark_orphan_hubsxchans(), match_content(), match_openid(), member_of(), menu_add_item(), menu_create(), menu_del_item(), menu_delete(), menu_delete_id(), menu_edit(), menu_edit_item(), menu_fetch(), menu_fetch_id(), menu_list(), mimetype_select(), mini_group_select(), mitem_content(), mood_init(), msearch_post(), nav(), netgrowth_content(), network_content(), FKOAuthDataStore\new_access_token(), new_contact(), new_cookie(), FKOAuthDataStore\new_request_token(), notification(), notifications_content(), notifications_post(), notifier_run(), notify_content(), notify_init(), oauth_get_client(), onedirsync_run(), onepoll_run(), openid_content(), page_content(), pagelist_widget(), pdl_selector(), perm_is_allowed(), photo_init(), photo_new_resource(), photo_upload(), photos_album_exists(), photos_album_get_db_idstr(), photos_album_rename(), photos_albums_list(), photos_content(), photos_list_photos(), photos_post(), ping_init(), plugin_is_installed(), poco_init(), poco_load(), poke_content(), poke_init(), poll_content(), poll_post(), poller_run(), post_activity_item(), post_init(), post_post(), private_messages_drop(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_init(), profile_load(), profile_photo_post(), profile_photo_set_profile_perms(), profile_sidebar(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), prune_hub_reinstalls(), public_recips(), RedFile\put(), queue_run(), random_profile(), rconnect_url(), receive_post(), RedChannelList(), RedCollectionData(), RedFileData(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_content(), register_hook(), register_post(), reload_plugins(), remote_online_status(), remove_all_xchan_resources(), remove_community_tag(), remove_queue_item(), retain_item(), rmagic_init(), rmagic_post(), rpost_content(), photo_driver\save(), search_ac_init(), search_content(), send_message(), send_reg_approval_email(), send_status_notifications(), service_class_allows(), service_class_fetch(), Cache\set(), set_config(), set_default_login_identity(), set_pconfig(), set_xconfig(), RedDirectory\setName(), RedFile\setName(), settings_post(), setup_content(), share_init(), siteinfo_content(), siteinfo_init(), sitelist_init(), sources_content(), sources_post(), starred_init(), start_delivery_chain(), photo_driver\store(), store_item_tag(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), suggest_init(), suggestion_query(), sync_directories(), tag_deliver(), tagadelic(), tagger_content(), tagrm_content(), tagrm_post(), tgroup_check(), thing_content(), thing_init(), uninstall_plugin(), unregister_hook(), update_birthdays(), update_directory_entry(), update_modtime(), update_queue_time(), update_remote_id(), update_suggestions(), user_allow(), user_approve(), user_deny(), RedBasicAuth\validateUserPass(), vcard_from_xchan(), verify_email_address(), viewconnections_content(), viewsrc_content(), vote_content(), vote_init(), vote_post(), webpages_content(), wfinger_init(), widget_bookmarkedchats(), widget_filer(), widget_follow(), widget_item(), widget_savedsearch(), widget_settings_menu(), widget_suggestedchats(), xchan_content(), xchan_mail_query(), xchan_query(), xrd_init(), z_input_filter(), z_readdir(), zfinger_init(), zid_init(), zot_feed(), zot_finger(), zot_get_hublocs(), zot_gethub(), zot_import(), zot_process_response(), zot_refresh(), and zotfeed_init().

    diff --git a/doc/html/diaspora_8php.html b/doc/html/diaspora_8php.html index 69825ab17..fa14301e9 100644 --- a/doc/html/diaspora_8php.html +++ b/doc/html/diaspora_8php.html @@ -116,14 +116,16 @@ Functions    diaspora_dispatch ($importer, $msg, $attempt=1)   - diaspora_handle_from_contact ($contact_id) -  + diaspora_is_blacklisted ($s) +  + diaspora_handle_from_contact ($contact_hash) +   diaspora_get_contact_by_handle ($uid, $handle)    find_diaspora_person_by_handle ($handle)   - get_diaspora_key ($uri) -  + get_diaspora_key ($handle) +   diaspora_pubmsg_build ($msg, $user, $contact, $prvkey, $pubkey)    diaspora_msg_build ($msg, $user, $contact, $prvkey, $pubkey, $public=false) @@ -132,8 +134,6 @@ Functions    diaspora_request ($importer, $xml)   - diaspora_post_allow ($importer, $contact) -   diaspora_post ($importer, $xml, $msg)    diaspora_reshare ($importer, $xml, $msg) @@ -405,7 +405,7 @@ Functions - +
    @@ -413,7 +413,7 @@ Functions - +
    diaspora_handle_from_contact (  $contact_id)$contact_hash)
    @@ -421,6 +421,24 @@ Functions

    Referenced by diaspora_send_relay().

    +
    +
    + +
    +
    + + + + + + + + +
    diaspora_is_blacklisted ( $s)
    +
    @@ -633,34 +651,6 @@ Functions

    Referenced by diaspora_dispatch().

    - - - -
    -
    - - - - - - - - - - - - - - - - - - -
    diaspora_post_allow ( $importer,
     $contact 
    )
    -
    @@ -766,6 +756,7 @@ Functions
    +

    If there is a default group for this channel, add this member to it

    Referenced by diaspora_dispatch().

    @@ -1211,11 +1202,11 @@ Functions
    - +
    @@ -1223,7 +1214,7 @@ Functions - +
    get_diaspora_key (  $uri)$handle)
    diff --git a/doc/html/diaspora_8php.js b/doc/html/diaspora_8php.js index 9a9c4a492..4d6263fd4 100644 --- a/doc/html/diaspora_8php.js +++ b/doc/html/diaspora_8php.js @@ -7,14 +7,14 @@ var diaspora_8php = [ "diaspora_dispatch", "diaspora_8php.html#a6f0a67b6b17503c125af32763be931b7", null ], [ "diaspora_dispatch_public", "diaspora_8php.html#ab99505944728d46585b8312989de533d", null ], [ "diaspora_get_contact_by_handle", "diaspora_8php.html#aa8e551a53fcce34be3942d0c3e20d1f4", null ], - [ "diaspora_handle_from_contact", "diaspora_8php.html#a625056c9dab9b9779d0665650e260bb9", null ], + [ "diaspora_handle_from_contact", "diaspora_8php.html#a5ed66b910d7b0284f9b3ee04e72306ff", null ], + [ "diaspora_is_blacklisted", "diaspora_8php.html#a858f70153c384f8778082cf7843a19da", null ], [ "diaspora_is_reshare", "diaspora_8php.html#ad9985cc4214bdfc14878785c838c8690", null ], [ "diaspora_like", "diaspora_8php.html#a5d57518545baa31cf8a85a937a267681", null ], [ "diaspora_message", "diaspora_8php.html#a7cff2f8f11044c1b3a360f20e1bbee46", null ], [ "diaspora_msg_build", "diaspora_8php.html#aca23425928635776dc17927041fc3fa8", null ], [ "diaspora_photo", "diaspora_8php.html#a71fe9bb66626b4197ae018a230778bb2", null ], [ "diaspora_post", "diaspora_8php.html#a20b968d64ef26afe5cb0cc75a7570a31", null ], - [ "diaspora_post_allow", "diaspora_8php.html#a978b08b5130bc94cf38ef3a2bcba0e3a", null ], [ "diaspora_profile", "diaspora_8php.html#a900abf51398b2ef26cd2cd31c52f1b0f", null ], [ "diaspora_pubmsg_build", "diaspora_8php.html#addaf8f202e52e3f0a49ed05681f9405c", null ], [ "diaspora_request", "diaspora_8php.html#ac1ab782a34552a7c6b4dc961754ed598", null ], @@ -31,5 +31,5 @@ var diaspora_8php = [ "diaspora_transmit", "diaspora_8php.html#aa704d6aa2ac77be345c0f501168e6e56", null ], [ "diaspora_unshare", "diaspora_8php.html#aa4b1cc0bca5c3fe8d11557685e0238a9", null ], [ "find_diaspora_person_by_handle", "diaspora_8php.html#aade0c165fcdded71352c7a67bf6ce37b", null ], - [ "get_diaspora_key", "diaspora_8php.html#a986114ce8d7a582ebd0b5972738e1fc2", null ] + [ "get_diaspora_key", "diaspora_8php.html#a9bf7ef4094e0e14f6e2b7fe76ab7ad2e", null ] ]; \ No newline at end of file diff --git a/doc/html/dir_23ec12649285f9fabf3a6b7380226c28.html b/doc/html/dir_23ec12649285f9fabf3a6b7380226c28.html index 85a9080eb..44036cc73 100644 --- a/doc/html/dir_23ec12649285f9fabf3a6b7380226c28.html +++ b/doc/html/dir_23ec12649285f9fabf3a6b7380226c28.html @@ -119,8 +119,6 @@ Files   file  friendica-to-smarty-tpl.py   -file  frphotohelper.php -  file  php2po.php   file  po2php.php diff --git a/doc/html/dir_23ec12649285f9fabf3a6b7380226c28.js b/doc/html/dir_23ec12649285f9fabf3a6b7380226c28.js index 13bf149d9..e59a2a7c4 100644 --- a/doc/html/dir_23ec12649285f9fabf3a6b7380226c28.js +++ b/doc/html/dir_23ec12649285f9fabf3a6b7380226c28.js @@ -6,7 +6,6 @@ var dir_23ec12649285f9fabf3a6b7380226c28 = [ "docblox_errorchecker.php", "docblox__errorchecker_8php.html", "docblox__errorchecker_8php" ], [ "extract.php", "extract_8php.html", "extract_8php" ], [ "friendica-to-smarty-tpl.py", "friendica-to-smarty-tpl_8py.html", "friendica-to-smarty-tpl_8py" ], - [ "frphotohelper.php", "frphotohelper_8php.html", "frphotohelper_8php" ], [ "php2po.php", "php2po_8php.html", "php2po_8php" ], [ "po2php.php", "po2php_8php.html", "po2php_8php" ], [ "tpldebug.php", "tpldebug_8php.html", "tpldebug_8php" ], diff --git a/doc/html/dir_d41ce877eb409a4791b288730010abe2.html b/doc/html/dir_d41ce877eb409a4791b288730010abe2.html index 7ce5bb439..927b81185 100644 --- a/doc/html/dir_d41ce877eb409a4791b288730010abe2.html +++ b/doc/html/dir_d41ce877eb409a4791b288730010abe2.html @@ -181,8 +181,6 @@ Files   file  follow.php   -file  frphotos.php -  file  fsuggest.php   file  group.php diff --git a/doc/html/dir_d41ce877eb409a4791b288730010abe2.js b/doc/html/dir_d41ce877eb409a4791b288730010abe2.js index 99990edda..f6374b795 100644 --- a/doc/html/dir_d41ce877eb409a4791b288730010abe2.js +++ b/doc/html/dir_d41ce877eb409a4791b288730010abe2.js @@ -38,7 +38,6 @@ var dir_d41ce877eb409a4791b288730010abe2 = [ "filerm.php", "filerm_8php.html", "filerm_8php" ], [ "filestorage.php", "filestorage_8php.html", "filestorage_8php" ], [ "follow.php", "mod_2follow_8php.html", "mod_2follow_8php" ], - [ "frphotos.php", "frphotos_8php.html", "frphotos_8php" ], [ "fsuggest.php", "fsuggest_8php.html", "fsuggest_8php" ], [ "group.php", "mod_2group_8php.html", "mod_2group_8php" ], [ "hcard.php", "hcard_8php.html", "hcard_8php" ], diff --git a/doc/html/docblox__errorchecker_8php.html b/doc/html/docblox__errorchecker_8php.html index 14c8c10ab..3b257594f 100644 --- a/doc/html/docblox__errorchecker_8php.html +++ b/doc/html/docblox__errorchecker_8php.html @@ -253,7 +253,7 @@ Variables
    @@ -279,7 +279,7 @@ Variables diff --git a/doc/html/enotify_8php.html b/doc/html/enotify_8php.html index f063eca1a..8a31b7368 100644 --- a/doc/html/enotify_8php.html +++ b/doc/html/enotify_8php.html @@ -136,7 +136,7 @@ Functions diff --git a/doc/html/event_8php.html b/doc/html/event_8php.html index 656ce68bf..a6368ee29 100644 --- a/doc/html/event_8php.html +++ b/doc/html/event_8php.html @@ -146,7 +146,7 @@ Functions diff --git a/doc/html/extract_8php.html b/doc/html/extract_8php.html index 78f04401f..eeb8660b9 100644 --- a/doc/html/extract_8php.html +++ b/doc/html/extract_8php.html @@ -132,7 +132,7 @@ Variables
    -

    Referenced by _well_known_init(), activity_sanitise(), api_rss_extra(), api_statuses_user_timeline(), app_store(), app_update(), appman_post(), array_sanitise(), attach_mkdir(), attach_store(), bookmark_add(), chat_message(), chat_post(), chatroom_create(), chatroom_destroy(), chatsvc_post(), check_account_admin(), check_account_email(), check_account_invite(), check_account_password(), check_list_permissions(), check_webbie(), connect_content(), connections_post(), connedit_content(), connedit_post(), construct_page(), contact_block(), contact_select(), conversation(), create_account(), create_identity(), dbesc_array(), diaspora_like(), diaspora_request(), directory_content(), drop_item(), event_store_event(), event_store_item(), externals_run(), feature_enabled(), find_xchan_in_array(), format_like(), get_all_perms(), get_atom_elements(), get_cloudpath(), get_features(), get_item_elements(), get_mail_elements(), get_mood_verbs(), get_poke_verbs(), get_profile_elements(), Item\get_template_data(), get_terms_oftype(), App\get_widgets(), group_select(), hostxrd_init(), ids_to_querystr(), import_author_rss(), import_author_xchan(), import_directory_profile(), import_post(), import_site(), import_xchan(), item_getfeedattach(), item_store(), item_store_update(), items_fetch(), like_content(), like_puller(), load_database(), magic_init(), mail_store(), menu_add_item(), menu_create(), menu_edit(), menu_edit_item(), mood_init(), network_content(), new_channel_post(), new_contact(), obj_verbs(), openid_content(), parse_url_content(), pdl_selector(), perm_is_allowed(), photo_upload(), photos_album_get_db_idstr(), photos_create_item(), ping_init(), po2php_run(), poke_init(), post_activity_item(), post_init(), post_post(), proc_run(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_activity(), profile_sidebar(), profiles_content(), redbasic_form(), register_page_template(), register_post(), remove_community_tag(), replace_macros(), rmagic_post(), photo_driver\save(), send_reg_approval_email(), service_class_allows(), service_class_fetch(), App\set_apps(), settings_post(), sort_by_date(), stringify_array_elms(), subthread_content(), suggest_content(), tag_deliver(), tagger_content(), tagrm_content(), tagrm_post(), theme_attachments(), theme_content(), thing_init(), translate_system_apps(), validate_channelname(), verify_email_address(), wfinger_init(), widget_affinity(), widget_archive(), widget_clock(), widget_item(), widget_photo(), widget_suggestions(), widget_tagcloud_wall(), xchan_mail_query(), xchan_query(), xml2array(), xrd_init(), zfinger_init(), zid(), zid_init(), zot_fetch(), zot_gethub(), zot_import(), zot_process_response(), and zot_register_hub().

    +

    Referenced by _well_known_init(), activity_sanitise(), api_rss_extra(), api_statuses_user_timeline(), app_store(), app_update(), appman_post(), array_sanitise(), attach_mkdir(), attach_store(), bookmark_add(), chat_message(), chat_post(), chatroom_create(), chatroom_destroy(), chatsvc_post(), check_account_admin(), check_account_email(), check_account_invite(), check_account_password(), check_list_permissions(), check_webbie(), connect_content(), connections_post(), connedit_content(), connedit_post(), construct_page(), contact_block(), contact_select(), conversation(), create_account(), create_identity(), dbesc_array(), diaspora_like(), directory_content(), drop_item(), event_store_event(), event_store_item(), externals_run(), feature_enabled(), fetch_xrd_links(), find_xchan_in_array(), format_like(), get_all_perms(), get_atom_elements(), get_cloudpath(), get_features(), get_item_elements(), get_mail_elements(), get_mood_verbs(), get_poke_verbs(), get_profile_elements(), Item\get_template_data(), get_terms_oftype(), App\get_widgets(), group_select(), hostxrd_init(), ids_to_querystr(), import_author_rss(), import_author_xchan(), import_directory_profile(), import_post(), import_site(), import_xchan(), item_getfeedattach(), item_store(), item_store_update(), items_fetch(), like_content(), like_puller(), load_database(), magic_init(), mail_store(), menu_add_item(), menu_create(), menu_edit(), menu_edit_item(), mood_init(), network_content(), new_channel_post(), new_contact(), obj_verbs(), openid_content(), parse_url_content(), pdl_selector(), perm_is_allowed(), photo_upload(), photos_album_get_db_idstr(), photos_create_item(), ping_init(), po2php_run(), poke_init(), post_activity_item(), post_init(), post_post(), proc_run(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_activity(), profile_sidebar(), profiles_content(), redbasic_form(), register_page_template(), register_post(), remove_community_tag(), replace_macros(), rmagic_post(), photo_driver\save(), send_reg_approval_email(), service_class_allows(), service_class_fetch(), App\set_apps(), settings_post(), sort_by_date(), stringify_array_elms(), subthread_content(), suggest_content(), tag_deliver(), tagger_content(), tagrm_content(), tagrm_post(), theme_attachments(), theme_content(), thing_init(), translate_system_apps(), validate_channelname(), verify_email_address(), wfinger_init(), widget_affinity(), widget_archive(), widget_clock(), widget_item(), widget_photo(), widget_suggestions(), widget_tagcloud_wall(), xchan_mail_query(), xchan_query(), xml2array(), xrd_init(), zfinger_init(), zid(), zid_init(), zot_fetch(), zot_gethub(), zot_import(), zot_process_response(), and zot_register_hub().

    @@ -160,7 +160,7 @@ Variables
    -

    Referenced by Template\_build_nodes(), Template\_replcb_node(), admin_page_themes(), app_decode(), attribute_contains(), base64url_decode(), base64url_encode(), bb_tag_preg_replace(), bb_translate_video(), bbtoevent(), bbtovcal(), bookmarks_init(), chanlink_hash(), chanlink_url(), comanche_parser(), comanche_region(), comanche_webpage(), construct_page(), datetime_convert(), day_translate(), detect_language(), diaspora2bb(), diaspora_ol(), diaspora_ul(), dir_parse_query(), dir_query_build(), expand_acl(), file_tag_decode(), file_tag_encode(), file_tag_file_query(), fix_mce_lf(), fix_private_photos(), format_categories(), format_filer(), format_hashtags(), format_mentions(), format_term_for_display(), get_bb_tag_pos(), get_intltext_template(), get_language_name(), get_markup_template(), get_tags(), html2bb_video(), info(), is_a_date_arg(), is_foreigner(), is_member(), json_decode_plus(), legal_webbie(), linkify(), magic_link(), mail_content(), network_to_name(), normalise_openid(), notice(), notifier_run(), oembed_iframe(), oembed_replacecb(), oexchange_content(), parse_xml_string(), photos_post(), poco_load(), prepare_body(), print_template(), printable(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), protect_sprintf(), purify_html(), qp(), random_string(), Template\replace(), replace_macros(), FriendicaSmartyEngine\replace_macros(), Template\replace_macros(), scale_external_images(), search(), searchbox(), siteinfo_content(), smilies(), sslify(), string_splitter(), strip_zids(), stripdcode_br_cb(), t(), template_escape(), template_unescape(), term_query(), theme_attachments(), unamp(), undo_post_tagging(), unxmlify(), Template\var_replace(), webfinger(), webfinger_dfrn(), x(), z_fetch_url(), z_input_filter(), z_post_url(), zfinger_init(), and zid().

    +

    Referenced by Template\_build_nodes(), Template\_replcb_node(), admin_page_themes(), app_decode(), attribute_contains(), base64url_decode(), base64url_encode(), bb_tag_preg_replace(), bb_translate_video(), bbtoevent(), bbtovcal(), bookmarks_init(), chanlink_hash(), chanlink_url(), comanche_parser(), comanche_region(), comanche_webpage(), construct_page(), datetime_convert(), day_translate(), detect_language(), diaspora2bb(), diaspora_is_blacklisted(), diaspora_ol(), diaspora_ul(), dir_parse_query(), dir_query_build(), expand_acl(), file_tag_decode(), file_tag_encode(), file_tag_file_query(), fix_mce_lf(), fix_private_photos(), format_categories(), format_filer(), format_hashtags(), format_mentions(), format_term_for_display(), get_bb_tag_pos(), get_intltext_template(), get_language_name(), get_markup_template(), get_tags(), html2bb_video(), info(), is_a_date_arg(), is_foreigner(), is_member(), json_decode_plus(), legal_webbie(), linkify(), magic_link(), mail_content(), network_to_name(), normalise_openid(), notice(), notifier_run(), oembed_iframe(), oembed_replacecb(), oexchange_content(), parse_xml_string(), photos_post(), poco_load(), prepare_body(), print_template(), printable(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), protect_sprintf(), purify_html(), qp(), random_string(), Template\replace(), replace_macros(), FriendicaSmartyEngine\replace_macros(), Template\replace_macros(), scale_external_images(), scrape_feed(), scrape_vcard(), search(), searchbox(), siteinfo_content(), smilies(), sslify(), string_splitter(), strip_zids(), stripdcode_br_cb(), t(), template_escape(), template_unescape(), term_query(), theme_attachments(), unamp(), undo_post_tagging(), unxmlify(), Template\var_replace(), webfinger_rfc7033(), x(), z_fetch_url(), z_input_filter(), z_post_url(), zfinger_init(), and zid().

    diff --git a/doc/html/files.html b/doc/html/files.html index 04c85d24a..0c8713881 100644 --- a/doc/html/files.html +++ b/doc/html/files.html @@ -235,110 +235,109 @@ $(document).ready(function(){initNavTree('files.html','');}); |o*filerm.php |o*filestorage.php |o*follow.php -|o*frphotos.php -|o*fsuggest.php -|o*group.php -|o*hcard.php -|o*help.php -|o*home.php -|o*hostxrd.php -|o*import.php -|o*importelm.php -|o*invite.php -|o*item.php -|o*lang.php -|o*layouts.php -|o*like.php -|o*lockview.php -|o*login.php -|o*lostpass.php -|o*magic.php -|o*mail.php -|o*manage.php -|o*match.php -|o*menu.php -|o*message.php -|o*mitem.php -|o*mood.php -|o*msearch.php -|o*netgrowth.php -|o*network.php -|o*new_channel.php -|o*notes.php -|o*notifications.php -|o*notify.php -|o*oembed.php -|o*oexchange.php -|o*online.php -|o*openid.php -|o*opensearch.php -|o*page.php -|o*parse_url.php -|o*pdledit.php -|o*photo.php -|o*photos.php -|o*php.php -|o*ping.php -|o*poco.php -|o*poke.php -|o*poll.php -|o*post.php -|o*pretheme.php -|o*probe.php -|o*profile.php -|o*profile_photo.php -|o*profiles.php -|o*profperm.php -|o*pubsites.php -|o*randprof.php -|o*rbmark.php -|o*receive.php -|o*register.php -|o*regmod.php -|o*regver.php -|o*removeaccount.php -|o*removeme.php -|o*rmagic.php -|o*rpost.php -|o*rsd_xml.php -|o*search.php -|o*search_ac.php -|o*settings.php -|o*setup.php -|o*share.php -|o*siteinfo.php -|o*sitelist.php -|o*smilies.php -|o*sources.php -|o*sslify.php -|o*starred.php -|o*subthread.php -|o*suggest.php -|o*tagger.php -|o*tagrm.php -|o*thing.php -|o*toggle_mobile.php -|o*toggle_safesearch.php -|o*uexport.php -|o*update_channel.php -|o*update_display.php -|o*update_network.php -|o*update_search.php -|o*view.php -|o*viewconnections.php -|o*viewsrc.php -|o*vote.php -|o*wall_attach.php -|o*wall_upload.php -|o*webfinger.php -|o*webpages.php -|o*wfinger.php -|o*xchan.php -|o*xrd.php -|o*xref.php -|o*zfinger.php -|o*zotfeed.php -|\*zping.php +|o*fsuggest.php +|o*group.php +|o*hcard.php +|o*help.php +|o*home.php +|o*hostxrd.php +|o*import.php +|o*importelm.php +|o*invite.php +|o*item.php +|o*lang.php +|o*layouts.php +|o*like.php +|o*lockview.php +|o*login.php +|o*lostpass.php +|o*magic.php +|o*mail.php +|o*manage.php +|o*match.php +|o*menu.php +|o*message.php +|o*mitem.php +|o*mood.php +|o*msearch.php +|o*netgrowth.php +|o*network.php +|o*new_channel.php +|o*notes.php +|o*notifications.php +|o*notify.php +|o*oembed.php +|o*oexchange.php +|o*online.php +|o*openid.php +|o*opensearch.php +|o*page.php +|o*parse_url.php +|o*pdledit.php +|o*photo.php +|o*photos.php +|o*php.php +|o*ping.php +|o*poco.php +|o*poke.php +|o*poll.php +|o*post.php +|o*pretheme.php +|o*probe.php +|o*profile.php +|o*profile_photo.php +|o*profiles.php +|o*profperm.php +|o*pubsites.php +|o*randprof.php +|o*rbmark.php +|o*receive.php +|o*register.php +|o*regmod.php +|o*regver.php +|o*removeaccount.php +|o*removeme.php +|o*rmagic.php +|o*rpost.php +|o*rsd_xml.php +|o*search.php +|o*search_ac.php +|o*settings.php +|o*setup.php +|o*share.php +|o*siteinfo.php +|o*sitelist.php +|o*smilies.php +|o*sources.php +|o*sslify.php +|o*starred.php +|o*subthread.php +|o*suggest.php +|o*tagger.php +|o*tagrm.php +|o*thing.php +|o*toggle_mobile.php +|o*toggle_safesearch.php +|o*uexport.php +|o*update_channel.php +|o*update_display.php +|o*update_network.php +|o*update_search.php +|o*view.php +|o*viewconnections.php +|o*viewsrc.php +|o*vote.php +|o*wall_attach.php +|o*wall_upload.php +|o*webfinger.php +|o*webpages.php +|o*wfinger.php +|o*xchan.php +|o*xrd.php +|o*xref.php +|o*zfinger.php +|o*zotfeed.php +|\*zping.php o+util |o+fpostit ||\*fpostit.php @@ -349,13 +348,12 @@ $(document).ready(function(){initNavTree('files.html','');}); |o*docblox_errorchecker.php |o*extract.php |o*friendica-to-smarty-tpl.py -|o*frphotohelper.php -|o*php2po.php -|o*po2php.php -|o*tpldebug.php -|o*typo.php -|o*typohelper.php -|\*updatetpl.py +|o*php2po.php +|o*po2php.php +|o*tpldebug.php +|o*typo.php +|o*typohelper.php +|\*updatetpl.py o+view |o+php ||o*choklet.php diff --git a/doc/html/globals.html b/doc/html/globals.html index 3679aeef4..d96b84b06 100644 --- a/doc/html/globals.html +++ b/doc/html/globals.html @@ -145,15 +145,11 @@ $(document).ready(function(){initNavTree('globals.html','');});

    - $ -

    • $a -: frphotohelper.php -, typo.php +: typo.php
    • $API : api.php
    • -
    • $args -: frphotohelper.php -
    • $arr : extract.php
    • @@ -163,24 +159,11 @@ $(document).ready(function(){initNavTree('globals.html','');});
    • $bodyclass : default.php
    • -
    • $c -: frphotohelper.php -
    • $called_api : api.php
    • -
    • $ch -: frphotohelper.php -
    • $channel -: frphotohelper.php -, theme_init.php -
    • -
    • $channel_address -: frphotohelper.php -
    • -
    • $cookies -: frphotohelper.php +: theme_init.php
    • $dir : docblox_errorchecker.php @@ -208,9 +191,6 @@ $(document).ready(function(){initNavTree('globals.html','');});
    • $fname : style.php
    • -
    • $fr_server -: frphotohelper.php -
    • $gc_probability : session.php
    • @@ -218,7 +198,7 @@ $(document).ready(function(){initNavTree('globals.html','');}); : default.php
    • $headimghome -: default.php +: default.php
    • $i : docblox_errorchecker.php @@ -238,9 +218,6 @@ $(document).ready(function(){initNavTree('globals.html','');});
    • $itemfloat : minimalisticdarkness.php
    • -
    • $j -: frphotohelper.php -
    • $k : php2po.php
    • @@ -262,12 +239,6 @@ $(document).ready(function(){initNavTree('globals.html','');});
    • $out : php2po.php
    • -
    • $output -: frphotohelper.php -
    • -
    • $photo_id -: frphotohelper.php -
    • $phpath : typo.php
    • @@ -283,15 +254,9 @@ $(document).ready(function(){initNavTree('globals.html','');});
    • $pofile : php2po.php
    • -
    • $r -: frphotohelper.php -
    • $res : docblox_errorchecker.php
    • -
    • $ret -: frphotohelper.php -
    • $s : extract.php
    • diff --git a/doc/html/globals_0x63.html b/doc/html/globals_0x63.html index 355defc9e..29a719812 100644 --- a/doc/html/globals_0x63.html +++ b/doc/html/globals_0x63.html @@ -216,9 +216,6 @@ $(document).ready(function(){initNavTree('globals_0x63.html','');});
    • chatroom_enter() : chat.php
    • -
    • chatroom_flush() -: chat.php -
    • chatroom_leave() : chat.php
    • @@ -415,7 +412,7 @@ $(document).ready(function(){initNavTree('globals_0x63.html','');}); : items.php
    • consume_feed() -: items.php +: items.php
    • contact_block() : text.php diff --git a/doc/html/globals_0x64.html b/doc/html/globals_0x64.html index b816936c0..a40fe3c56 100644 --- a/doc/html/globals_0x64.html +++ b/doc/html/globals_0x64.html @@ -210,6 +210,12 @@ $(document).ready(function(){initNavTree('globals_0x64.html','');});
    • deliver_run() : deliver.php
    • +
    • DerToPem() +: crypto.php +
    • +
    • DerToRsa() +: crypto.php +
    • design_tools() : text.php
    • @@ -241,7 +247,10 @@ $(document).ready(function(){initNavTree('globals_0x64.html','');}); : diaspora.php
    • diaspora_handle_from_contact() -: diaspora.php +: diaspora.php +
    • +
    • diaspora_is_blacklisted() +: diaspora.php
    • diaspora_is_reshare() : diaspora.php @@ -264,9 +273,6 @@ $(document).ready(function(){initNavTree('globals_0x64.html','');});
    • diaspora_post() : diaspora.php
    • -
    • diaspora_post_allow() -: diaspora.php -
    • diaspora_profile() : diaspora.php
    • @@ -369,6 +375,9 @@ $(document).ready(function(){initNavTree('globals_0x64.html','');});
    • dirsearch_init() : dirsearch.php
    • +
    • discover_by_webbie() +: network.php +
    • display_content() : display.php
    • diff --git a/doc/html/globals_0x66.html b/doc/html/globals_0x66.html index 295856fc2..0c9ca3c1f 100644 --- a/doc/html/globals_0x66.html +++ b/doc/html/globals_0x66.html @@ -165,6 +165,9 @@ $(document).ready(function(){initNavTree('globals_0x66.html','');});
    • fetch_post_tags() : items.php
    • +
    • fetch_xrd_links() +: network.php +
    • field_timezone() : datetime.php
    • @@ -282,12 +285,6 @@ $(document).ready(function(){initNavTree('globals_0x66.html','');});
    • format_term_for_display() : taxonomy.php
    • -
    • frphotos_content() -: frphotos.php -
    • -
    • frphotos_init() -: frphotos.php -
    • fsuggest_content() : fsuggest.php
    • diff --git a/doc/html/globals_0x67.html b/doc/html/globals_0x67.html index a9574a79f..b5d386137 100644 --- a/doc/html/globals_0x67.html +++ b/doc/html/globals_0x67.html @@ -160,7 +160,7 @@ $(document).ready(function(){initNavTree('globals_0x67.html','');}); : boot.php
    • get_atom_elements() -: items.php +: items.php
    • get_bb_tag_pos() : bb2diaspora.php @@ -202,11 +202,14 @@ $(document).ready(function(){initNavTree('globals_0x67.html','');}); : identity.php
    • get_diaspora_key() -: diaspora.php +: diaspora.php
    • get_dim() : datetime.php
    • +
    • get_directory_realm() +: boot.php +
    • get_events() : identity.php
    • @@ -297,6 +300,9 @@ $(document).ready(function(){initNavTree('globals_0x67.html','');});
    • get_rel_link() : text.php
    • +
    • get_role_perms() +: permissions.php +
    • get_rpost_path() : zot.php
    • diff --git a/doc/html/globals_0x68.html b/doc/html/globals_0x68.html index 00ba7fadd..e4dd5086b 100644 --- a/doc/html/globals_0x68.html +++ b/doc/html/globals_0x68.html @@ -144,6 +144,9 @@ $(document).ready(function(){initNavTree('globals_0x68.html','');});
      Here is a list of all file members with links to the files they belong to:

      - h -

        +
      • handle_feed() +: items.php +
      • handle_tag() : item.php
      • diff --git a/doc/html/globals_0x6d.html b/doc/html/globals_0x6d.html index 40a148b7f..3c8b8f959 100644 --- a/doc/html/globals_0x6d.html +++ b/doc/html/globals_0x6d.html @@ -207,9 +207,6 @@ $(document).ready(function(){initNavTree('globals_0x6d.html','');});
      • match_openid() : auth.php
      • -
      • MAX_CHATROOM_HOURS -: boot.php -
      • MAX_IMAGE_LENGTH : boot.php
      • @@ -276,6 +273,12 @@ $(document).ready(function(){initNavTree('globals_0x6d.html','');});
      • message_content() : message.php
      • +
      • metopem() +: crypto.php +
      • +
      • metorsa() +: crypto.php +
      • micropro() : text.php
      • diff --git a/doc/html/globals_0x6f.html b/doc/html/globals_0x6f.html index 924d9aedf..53902b780 100644 --- a/doc/html/globals_0x6f.html +++ b/doc/html/globals_0x6f.html @@ -186,6 +186,9 @@ $(document).ready(function(){initNavTree('globals_0x6f.html','');});
      • oexchange_init() : oexchange.php
      • +
      • old_webfinger() +: network.php +
      • onedirsync_run() : onedirsync.php
      • diff --git a/doc/html/globals_0x70.html b/doc/html/globals_0x70.html index 81efee637..97abc9796 100644 --- a/doc/html/globals_0x70.html +++ b/doc/html/globals_0x70.html @@ -213,6 +213,12 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');});
      • pdledit_post() : pdledit.php
      • +
      • pemtome() +: crypto.php +
      • +
      • pemtorsa() +: crypto.php +
      • perm_is_allowed() : permissions.php
      • @@ -360,6 +366,9 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');});
      • pipe_streams() : attach.php
      • +
      • pkcs1_encode() +: crypto.php +
      • pkcs1to8() : crypto.php
      • @@ -369,6 +378,9 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');});
      • pkcs5_unpad() : crypto.php
      • +
      • pkcs8_encode() +: crypto.php +
      • pkcs8to1() : crypto.php
      • @@ -630,6 +642,9 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');});
      • public_recips() : zot.php
      • +
      • pubrsatome() +: crypto.php +
      • pubsites_content() : pubsites.php
      • diff --git a/doc/html/globals_0x72.html b/doc/html/globals_0x72.html index 970b46a39..59d754eb8 100644 --- a/doc/html/globals_0x72.html +++ b/doc/html/globals_0x72.html @@ -345,6 +345,9 @@ $(document).ready(function(){initNavTree('globals_0x72.html','');});
      • rsa_verify() : crypto.php
      • +
      • rsatopem() +: crypto.php +
      • rsd_xml_content() : rsd_xml.php
      • diff --git a/doc/html/globals_0x73.html b/doc/html/globals_0x73.html index cb1327f1d..642fe2496 100644 --- a/doc/html/globals_0x73.html +++ b/doc/html/globals_0x73.html @@ -144,12 +144,21 @@ $(document).ready(function(){initNavTree('globals_0x73.html','');});
        Here is a list of all file members with links to the files they belong to:

        - s -

          +
        • salmon_key() +: crypto.php +
        • sanitise_acl() : text.php
        • scale_external_images() : network.php
        • +
        • scrape_feed() +: network.php +
        • +
        • scrape_vcard() +: network.php +
        • script_path() : plugin.php
        • @@ -300,6 +309,9 @@ $(document).ready(function(){initNavTree('globals_0x73.html','');});
        • starred_init() : starred.php
        • +
        • start_delivery_chain() +: items.php +
        • startup() : boot.php
        • diff --git a/doc/html/globals_0x75.html b/doc/html/globals_0x75.html index 7797435b2..a12a6aad0 100644 --- a/doc/html/globals_0x75.html +++ b/doc/html/globals_0x75.html @@ -186,6 +186,9 @@ $(document).ready(function(){initNavTree('globals_0x75.html','');});
        • UPDATE_FAILED : boot.php
        • +
        • update_feed_item() +: items.php +
        • UPDATE_FLAGS_DELETED : boot.php
        • diff --git a/doc/html/globals_0x77.html b/doc/html/globals_0x77.html index f4c80c5be..027bdc27f 100644 --- a/doc/html/globals_0x77.html +++ b/doc/html/globals_0x77.html @@ -150,14 +150,11 @@ $(document).ready(function(){initNavTree('globals_0x77.html','');});
        • wall_upload_post() : wall_upload.php
        • -
        • webfinger() -: network.php -
        • webfinger_content() : webfinger.php
        • -
        • webfinger_dfrn() -: network.php +
        • webfinger_rfc7033() +: network.php
        • webpages_content() : webpages.php diff --git a/doc/html/globals_0x78.html b/doc/html/globals_0x78.html index f016dce14..247422995 100644 --- a/doc/html/globals_0x78.html +++ b/doc/html/globals_0x78.html @@ -186,9 +186,6 @@ $(document).ready(function(){initNavTree('globals_0x78.html','');});
        • xmlify() : text.php
        • -
        • xpost_to_html2bbcode() -: post_to_red.php -
        • xrd_init() : xrd.php
        • diff --git a/doc/html/globals_func_0x63.html b/doc/html/globals_func_0x63.html index dd88b2210..c6c03977e 100644 --- a/doc/html/globals_func_0x63.html +++ b/doc/html/globals_func_0x63.html @@ -215,9 +215,6 @@ $(document).ready(function(){initNavTree('globals_func_0x63.html','');});
        • chatroom_enter() : chat.php
        • -
        • chatroom_flush() -: chat.php -
        • chatroom_leave() : chat.php
        • @@ -405,7 +402,7 @@ $(document).ready(function(){initNavTree('globals_func_0x63.html','');}); : items.php
        • consume_feed() -: items.php +: items.php
        • contact_block() : text.php diff --git a/doc/html/globals_func_0x64.html b/doc/html/globals_func_0x64.html index 73ecfd2ad..59d294110 100644 --- a/doc/html/globals_func_0x64.html +++ b/doc/html/globals_func_0x64.html @@ -203,6 +203,12 @@ $(document).ready(function(){initNavTree('globals_func_0x64.html','');});
        • deliver_run() : deliver.php
        • +
        • DerToPem() +: crypto.php +
        • +
        • DerToRsa() +: crypto.php +
        • design_tools() : text.php
        • @@ -234,7 +240,10 @@ $(document).ready(function(){initNavTree('globals_func_0x64.html','');}); : diaspora.php
        • diaspora_handle_from_contact() -: diaspora.php +: diaspora.php +
        • +
        • diaspora_is_blacklisted() +: diaspora.php
        • diaspora_is_reshare() : diaspora.php @@ -257,9 +266,6 @@ $(document).ready(function(){initNavTree('globals_func_0x64.html','');});
        • diaspora_post() : diaspora.php
        • -
        • diaspora_post_allow() -: diaspora.php -
        • diaspora_profile() : diaspora.php
        • @@ -344,6 +350,9 @@ $(document).ready(function(){initNavTree('globals_func_0x64.html','');});
        • dirsearch_init() : dirsearch.php
        • +
        • discover_by_webbie() +: network.php +
        • display_content() : display.php
        • diff --git a/doc/html/globals_func_0x66.html b/doc/html/globals_func_0x66.html index 0e3744801..3a67dc16b 100644 --- a/doc/html/globals_func_0x66.html +++ b/doc/html/globals_func_0x66.html @@ -164,6 +164,9 @@ $(document).ready(function(){initNavTree('globals_func_0x66.html','');});
        • fetch_post_tags() : items.php
        • +
        • fetch_xrd_links() +: network.php +
        • field_timezone() : datetime.php
        • @@ -278,12 +281,6 @@ $(document).ready(function(){initNavTree('globals_func_0x66.html','');});
        • format_term_for_display() : taxonomy.php
        • -
        • frphotos_content() -: frphotos.php -
        • -
        • frphotos_init() -: frphotos.php -
        • fsuggest_content() : fsuggest.php
        • diff --git a/doc/html/globals_func_0x67.html b/doc/html/globals_func_0x67.html index c6627a420..ec470029a 100644 --- a/doc/html/globals_func_0x67.html +++ b/doc/html/globals_func_0x67.html @@ -159,7 +159,7 @@ $(document).ready(function(){initNavTree('globals_func_0x67.html','');}); : boot.php
        • get_atom_elements() -: items.php +: items.php
        • get_bb_tag_pos() : bb2diaspora.php @@ -201,11 +201,14 @@ $(document).ready(function(){initNavTree('globals_func_0x67.html','');}); : identity.php
        • get_diaspora_key() -: diaspora.php +: diaspora.php
        • get_dim() : datetime.php
        • +
        • get_directory_realm() +: boot.php +
        • get_events() : identity.php
        • @@ -296,6 +299,9 @@ $(document).ready(function(){initNavTree('globals_func_0x67.html','');});
        • get_rel_link() : text.php
        • +
        • get_role_perms() +: permissions.php +
        • get_rpost_path() : zot.php
        • diff --git a/doc/html/globals_func_0x68.html b/doc/html/globals_func_0x68.html index 39bac6499..df141a260 100644 --- a/doc/html/globals_func_0x68.html +++ b/doc/html/globals_func_0x68.html @@ -143,6 +143,9 @@ $(document).ready(function(){initNavTree('globals_func_0x68.html','');});  

          - h -

            +
          • handle_feed() +: items.php +
          • handle_tag() : item.php
          • diff --git a/doc/html/globals_func_0x6d.html b/doc/html/globals_func_0x6d.html index 1f6bbb5e6..27125b1a7 100644 --- a/doc/html/globals_func_0x6d.html +++ b/doc/html/globals_func_0x6d.html @@ -233,6 +233,12 @@ $(document).ready(function(){initNavTree('globals_func_0x6d.html','');});
          • message_content() : message.php
          • +
          • metopem() +: crypto.php +
          • +
          • metorsa() +: crypto.php +
          • micropro() : text.php
          • diff --git a/doc/html/globals_func_0x6f.html b/doc/html/globals_func_0x6f.html index 21b74d14d..cf3b88fc4 100644 --- a/doc/html/globals_func_0x6f.html +++ b/doc/html/globals_func_0x6f.html @@ -185,6 +185,9 @@ $(document).ready(function(){initNavTree('globals_func_0x6f.html','');});
          • oexchange_init() : oexchange.php
          • +
          • old_webfinger() +: network.php +
          • onedirsync_run() : onedirsync.php
          • diff --git a/doc/html/globals_func_0x70.html b/doc/html/globals_func_0x70.html index 37e1d058e..dc9c4c03d 100644 --- a/doc/html/globals_func_0x70.html +++ b/doc/html/globals_func_0x70.html @@ -179,6 +179,12 @@ $(document).ready(function(){initNavTree('globals_func_0x70.html','');});
          • pdledit_post() : pdledit.php
          • +
          • pemtome() +: crypto.php +
          • +
          • pemtorsa() +: crypto.php +
          • perm_is_allowed() : permissions.php
          • @@ -239,6 +245,9 @@ $(document).ready(function(){initNavTree('globals_func_0x70.html','');});
          • pipe_streams() : attach.php
          • +
          • pkcs1_encode() +: crypto.php +
          • pkcs1to8() : crypto.php
          • @@ -248,6 +257,9 @@ $(document).ready(function(){initNavTree('globals_func_0x70.html','');});
          • pkcs5_unpad() : crypto.php
          • +
          • pkcs8_encode() +: crypto.php +
          • pkcs8to1() : crypto.php
          • @@ -485,6 +497,9 @@ $(document).ready(function(){initNavTree('globals_func_0x70.html','');});
          • public_recips() : zot.php
          • +
          • pubrsatome() +: crypto.php +
          • pubsites_content() : pubsites.php
          • diff --git a/doc/html/globals_func_0x72.html b/doc/html/globals_func_0x72.html index a6f87061d..df84835d5 100644 --- a/doc/html/globals_func_0x72.html +++ b/doc/html/globals_func_0x72.html @@ -320,6 +320,9 @@ $(document).ready(function(){initNavTree('globals_func_0x72.html','');});
          • rsa_verify() : crypto.php
          • +
          • rsatopem() +: crypto.php +
          • rsd_xml_content() : rsd_xml.php
          • diff --git a/doc/html/globals_func_0x73.html b/doc/html/globals_func_0x73.html index b6dda20e5..e872bc1d2 100644 --- a/doc/html/globals_func_0x73.html +++ b/doc/html/globals_func_0x73.html @@ -143,12 +143,21 @@ $(document).ready(function(){initNavTree('globals_func_0x73.html','');});  

            - s -

              +
            • salmon_key() +: crypto.php +
            • sanitise_acl() : text.php
            • scale_external_images() : network.php
            • +
            • scrape_feed() +: network.php +
            • +
            • scrape_vcard() +: network.php +
            • script_path() : plugin.php
            • @@ -290,6 +299,9 @@ $(document).ready(function(){initNavTree('globals_func_0x73.html','');});
            • starred_init() : starred.php
            • +
            • start_delivery_chain() +: items.php +
            • startup() : boot.php
            • diff --git a/doc/html/globals_func_0x75.html b/doc/html/globals_func_0x75.html index 0b57ed450..5b05540e1 100644 --- a/doc/html/globals_func_0x75.html +++ b/doc/html/globals_func_0x75.html @@ -182,6 +182,9 @@ $(document).ready(function(){initNavTree('globals_func_0x75.html','');});
            • update_display_content() : update_display.php
            • +
            • update_feed_item() +: items.php +
            • update_imported_item() : zot.php
            • diff --git a/doc/html/globals_func_0x77.html b/doc/html/globals_func_0x77.html index 8531e1a57..83d145707 100644 --- a/doc/html/globals_func_0x77.html +++ b/doc/html/globals_func_0x77.html @@ -149,14 +149,11 @@ $(document).ready(function(){initNavTree('globals_func_0x77.html','');});
            • wall_upload_post() : wall_upload.php
            • -
            • webfinger() -: network.php -
            • webfinger_content() : webfinger.php
            • -
            • webfinger_dfrn() -: network.php +
            • webfinger_rfc7033() +: network.php
            • webpages_content() : webpages.php diff --git a/doc/html/globals_func_0x78.html b/doc/html/globals_func_0x78.html index 24b97f465..077f66945 100644 --- a/doc/html/globals_func_0x78.html +++ b/doc/html/globals_func_0x78.html @@ -164,9 +164,6 @@ $(document).ready(function(){initNavTree('globals_func_0x78.html','');});
            • xmlify() : text.php
            • -
            • xpost_to_html2bbcode() -: post_to_red.php -
            • xrd_init() : xrd.php
            • diff --git a/doc/html/globals_vars.html b/doc/html/globals_vars.html index b011d6ece..db57ee822 100644 --- a/doc/html/globals_vars.html +++ b/doc/html/globals_vars.html @@ -140,15 +140,11 @@ $(document).ready(function(){initNavTree('globals_vars.html','');});

              - $ -

              • $a -: frphotohelper.php -, typo.php +: typo.php
              • $API : api.php
              • -
              • $args -: frphotohelper.php -
              • $arr : extract.php
              • @@ -158,24 +154,11 @@ $(document).ready(function(){initNavTree('globals_vars.html','');});
              • $bodyclass : default.php
              • -
              • $c -: frphotohelper.php -
              • $called_api : api.php
              • -
              • $ch -: frphotohelper.php -
              • $channel -: frphotohelper.php -, theme_init.php -
              • -
              • $channel_address -: frphotohelper.php -
              • -
              • $cookies -: frphotohelper.php +: theme_init.php
              • $dir : docblox_errorchecker.php @@ -203,9 +186,6 @@ $(document).ready(function(){initNavTree('globals_vars.html','');});
              • $fname : style.php
              • -
              • $fr_server -: frphotohelper.php -
              • $gc_probability : session.php
              • @@ -213,7 +193,7 @@ $(document).ready(function(){initNavTree('globals_vars.html','');}); : default.php
              • $headimghome -: default.php +: default.php
              • $i : docblox_errorchecker.php @@ -233,9 +213,6 @@ $(document).ready(function(){initNavTree('globals_vars.html','');});
              • $itemfloat : minimalisticdarkness.php
              • -
              • $j -: frphotohelper.php -
              • $k : php2po.php
              • @@ -257,12 +234,6 @@ $(document).ready(function(){initNavTree('globals_vars.html','');});
              • $out : php2po.php
              • -
              • $output -: frphotohelper.php -
              • -
              • $photo_id -: frphotohelper.php -
              • $phpath : typo.php
              • @@ -278,15 +249,9 @@ $(document).ready(function(){initNavTree('globals_vars.html','');});
              • $pofile : php2po.php
              • -
              • $r -: frphotohelper.php -
              • $res : docblox_errorchecker.php
              • -
              • $ret -: frphotohelper.php -
              • $s : extract.php
              • diff --git a/doc/html/globals_vars_0x6d.html b/doc/html/globals_vars_0x6d.html index 38ee7270f..b6da098d2 100644 --- a/doc/html/globals_vars_0x6d.html +++ b/doc/html/globals_vars_0x6d.html @@ -157,9 +157,6 @@ $(document).ready(function(){initNavTree('globals_vars_0x6d.html','');});
              • MAIL_SEEN : boot.php
              • -
              • MAX_CHATROOM_HOURS -: boot.php -
              • MAX_IMAGE_LENGTH : boot.php
              • diff --git a/doc/html/html2bbcode_8php.html b/doc/html/html2bbcode_8php.html index 62c70d045..b04e5d27a 100644 --- a/doc/html/html2bbcode_8php.html +++ b/doc/html/html2bbcode_8php.html @@ -164,7 +164,7 @@ Functions diff --git a/doc/html/include_2chat_8php.html b/doc/html/include_2chat_8php.html index faa52b563..8d38b7e76 100644 --- a/doc/html/include_2chat_8php.html +++ b/doc/html/include_2chat_8php.html @@ -124,8 +124,6 @@ Functions    chat_message ($uid, $room_id, $xchan, $text)   - chatroom_flush ($room_id, $xchan) - 

                Function Documentation

                @@ -261,35 +259,6 @@ Functions

                Referenced by chat_content().

                - - - -
                -
                - - - - - - - - - - - - - - - - - - -
                chatroom_flush ( $room_id,
                 $xchan 
                )
                -
                -

                Reduces the number of lines shown in chat by removing those older than MAX_CHATROOM_HOURS

                - -

                Referenced by chat_message(), and chatroom_enter().

                -
                diff --git a/doc/html/include_2chat_8php.js b/doc/html/include_2chat_8php.js index 65f9fca05..db3011fcf 100644 --- a/doc/html/include_2chat_8php.js +++ b/doc/html/include_2chat_8php.js @@ -4,7 +4,6 @@ var include_2chat_8php = [ "chatroom_create", "include_2chat_8php.html#acdc80dba4eb796c7472b21129b435422", null ], [ "chatroom_destroy", "include_2chat_8php.html#a2ba3af6884ecdce95de69262fe599639", null ], [ "chatroom_enter", "include_2chat_8php.html#a2c95b545e46bfee64faa05ecf0afea91", null ], - [ "chatroom_flush", "include_2chat_8php.html#afffdd0f2c218c392ba28376948624e3f", null ], [ "chatroom_leave", "include_2chat_8php.html#a1ee1360f7d2549c7549ae07cb5190f0f", null ], [ "chatroom_list", "include_2chat_8php.html#aedcb532a0627b8644001a2fadab4e87a", null ] ]; \ No newline at end of file diff --git a/doc/html/include_2config_8php.html b/doc/html/include_2config_8php.html index 6924d591b..0335acdf3 100644 --- a/doc/html/include_2config_8php.html +++ b/doc/html/include_2config_8php.html @@ -258,7 +258,7 @@ Functions
                -

                Referenced by account_verify_password(), acl_init(), admin_page_dbsync(), admin_page_logs(), admin_page_site(), admin_page_summary(), admin_page_themes(), allowed_email(), allowed_url(), api_statuses_mentions(), api_statusnet_config(), attach_store(), bbcode(), build_sync_packet(), channel_content(), check_account_admin(), check_account_invite(), check_config(), cli_startup(), create_account(), create_identity(), create_sys_channel(), RedDirectory\createFile(), detect_language(), diaspora_dispatch(), diaspora_dispatch_public(), diaspora_like(), diaspora_reshare(), diaspora_transmit(), directory_content(), directory_run(), dirprofile_init(), dirsearch_content(), display_content(), dlogger(), dob(), downgrade_accounts(), editblock_content(), editpost_content(), editwebpage_content(), encode_item(), encode_mail(), events_content(), expire_run(), externals_run(), feature_enabled(), feed_init(), find_upstream_directory(), findpeople_widget(), get_all_perms(), Item\get_comment_box(), get_default_profile_photo(), get_item_elements(), get_mail_elements(), get_max_import_size(), get_online_status(), get_profile_fields_advanced(), get_profile_fields_basic(), RedDirectory\getChild(), RedDirectory\getChildren(), group_content(), home_content(), home_init(), photo_gd\imageString(), import_post(), import_xchan(), invite_content(), invite_post(), is_public_profile(), item_post(), item_store(), item_store_update(), photo_imagick\load(), logger(), login(), lostpass_content(), lostpass_post(), mark_orphan_hubsxchans(), nav(), navbar_complete(), network_content(), FKOAuthDataStore\new_access_token(), new_channel_post(), new_keypair(), notification(), notifier_run(), oembed_bbcode2html(), openid_content(), parse_url_content(), perm_is_allowed(), photo_upload(), photos_content(), photos_init(), poco_init(), poller_run(), post_activity_item(), post_post(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), profile_content(), profile_create_sidebar(), profile_photo_post(), profiles_content(), profperm_content(), pubsites_content(), RedFile\put(), receive_post(), register_content(), register_post(), reload_plugins(), remove_all_xchan_resources(), scale_external_images(), search_content(), send_message(), send_reg_approval_email(), send_verification_email(), service_class_allows(), service_class_fetch(), set_config(), settings_post(), site_default_perms(), siteinfo_content(), smilies(), tag_deliver(), theme_admin(), unobscure(), update_modtime(), update_suggestions(), upgrade_link(), user_allow(), valid_email(), validate_email(), verify_email_address(), viewconnections_content(), viewconnections_init(), webpages_content(), widget_fullprofile(), widget_profile(), z_fetch_url(), z_post_url(), zfinger_init(), zot_fetch(), zot_import(), and zotfeed_init().

                +

                Referenced by account_verify_password(), acl_init(), admin_page_dbsync(), admin_page_logs(), admin_page_site(), admin_page_summary(), admin_page_themes(), allowed_email(), allowed_url(), api_statuses_mentions(), api_statusnet_config(), attach_store(), bbcode(), build_sync_packet(), channel_content(), check_account_admin(), check_account_invite(), check_config(), cli_startup(), create_account(), create_identity(), create_sys_channel(), RedDirectory\createFile(), detect_language(), diaspora_dispatch(), diaspora_dispatch_public(), diaspora_is_blacklisted(), diaspora_like(), diaspora_reshare(), diaspora_transmit(), directory_content(), directory_run(), dirprofile_init(), dirsearch_content(), display_content(), dlogger(), dob(), downgrade_accounts(), editblock_content(), editpost_content(), editwebpage_content(), encode_item(), encode_mail(), events_content(), expire_run(), externals_run(), feature_enabled(), feed_init(), find_upstream_directory(), findpeople_widget(), get_all_perms(), Item\get_comment_box(), get_default_profile_photo(), get_directory_realm(), get_item_elements(), get_mail_elements(), get_max_import_size(), get_online_status(), get_profile_fields_advanced(), get_profile_fields_basic(), RedDirectory\getChild(), RedDirectory\getChildren(), group_content(), home_content(), home_init(), photo_gd\imageString(), import_post(), import_xchan(), invite_content(), invite_post(), is_public_profile(), item_post(), item_store(), item_store_update(), photo_imagick\load(), logger(), login(), lostpass_content(), lostpass_post(), mark_orphan_hubsxchans(), nav(), navbar_complete(), network_content(), FKOAuthDataStore\new_access_token(), new_channel_post(), new_keypair(), notification(), notifier_run(), oembed_bbcode2html(), openid_content(), parse_url_content(), perm_is_allowed(), photo_upload(), photos_content(), photos_init(), poco_init(), poller_run(), post_activity_item(), post_post(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), profile_content(), profile_create_sidebar(), profile_photo_post(), profile_sidebar(), profiles_content(), profperm_content(), pubsites_content(), RedFile\put(), receive_post(), register_content(), register_post(), reload_plugins(), remove_all_xchan_resources(), scale_external_images(), search_content(), send_message(), send_reg_approval_email(), send_verification_email(), service_class_allows(), service_class_fetch(), set_config(), settings_post(), site_default_perms(), siteinfo_content(), smilies(), start_delivery_chain(), tag_deliver(), theme_admin(), unobscure(), update_modtime(), update_suggestions(), upgrade_link(), user_allow(), valid_email(), validate_email(), verify_email_address(), viewconnections_content(), viewconnections_init(), webpages_content(), widget_fullprofile(), widget_profile(), xrd_init(), z_fetch_url(), z_post_url(), zfinger_init(), zot_fetch(), zot_gethub(), zot_import(), and zotfeed_init().

                @@ -326,7 +326,7 @@ Functions
                -

                Referenced by Conversation\__construct(), acl_init(), App\build_pagehead(), change_channel(), channel_content(), connect_content(), connedit_post(), construct_page(), contact_block(), contact_remove(), conversation(), current_theme(), display_content(), editpost_content(), feature_enabled(), findpeople_widget(), frphotos_content(), frphotos_init(), Item\get_comment_box(), get_online_status(), get_theme_uid(), group_content(), home_init(), invite_content(), invite_post(), item_post(), item_store(), item_store_update(), items_fetch(), FKOAuth1\loginUser(), mail_content(), message_content(), network_content(), pdledit_content(), post_post(), profile_activity(), profile_load(), profile_sidebar(), profperm_content(), remove_community_tag(), rpost_content(), search_content(), set_pconfig(), smilies(), tag_deliver(), theme_content(), and widget_notes().

                +

                Referenced by Conversation\__construct(), acl_init(), App\build_pagehead(), change_channel(), channel_content(), connect_content(), connedit_post(), construct_page(), contact_block(), contact_remove(), conversation(), current_theme(), display_content(), editpost_content(), feature_enabled(), findpeople_widget(), Item\get_comment_box(), get_online_status(), get_theme_uid(), group_content(), home_init(), invite_content(), invite_post(), item_post(), item_store(), item_store_update(), items_fetch(), FKOAuth1\loginUser(), mail_content(), message_content(), network_content(), notification(), pdledit_content(), post_post(), profile_activity(), profile_load(), profile_sidebar(), profperm_content(), remove_community_tag(), rpost_content(), search_content(), set_pconfig(), smilies(), tag_deliver(), theme_content(), and widget_notes().

                @@ -510,7 +510,7 @@ Functions diff --git a/doc/html/include_2group_8php.html b/doc/html/include_2group_8php.html index 2ce94e220..dfba8fafe 100644 --- a/doc/html/include_2group_8php.html +++ b/doc/html/include_2group_8php.html @@ -300,7 +300,7 @@ Functions diff --git a/doc/html/include_2network_8php.html b/doc/html/include_2network_8php.html index 8bae3ad59..2a15e46b1 100644 --- a/doc/html/include_2network_8php.html +++ b/doc/html/include_2network_8php.html @@ -126,12 +126,6 @@ Functions    convert_xml_element_to_array ($xml_element, &$recursion_depth=0)   - webfinger_dfrn ($s, &$hcard) -  - webfinger ($s, $debug=false) -  - fetch_lrdd_template ($host) -   validate_url (&$url)    validate_email ($addr) @@ -152,6 +146,20 @@ Functions    email_send ($addr, $subject, $headers, $item)   + discover_by_webbie ($webbie) +  + webfinger_rfc7033 ($webbie) +  + old_webfinger ($webbie) +  + fetch_lrdd_template ($host) +  + fetch_xrd_links ($url) +  + scrape_vcard ($url) +  + scrape_feed ($url) + 

                Function Documentation

                @@ -230,6 +238,26 @@ Functions
                +

                Referenced by fetch_xrd_links().

                + +
                + + +
                +
                + + + + + + + + +
                discover_by_webbie ( $webbie)
                +
                + +

                Referenced by find_diaspora_person_by_handle().

                +
                @@ -312,7 +340,25 @@ Functions
                -

                Referenced by webfinger().

                +

                Referenced by old_webfinger().

                + +
                + + +
                +
                + + + + + + + + +
                fetch_xrd_links ( $url)
                +
                + +

                Referenced by fetch_lrdd_template(), and old_webfinger().

                @@ -387,6 +433,24 @@ Functions

                Referenced by api_albums(), api_channel_stream(), api_export_basic(), api_photos(), chat_content(), chatsvc_content(), chatsvc_init(), chatsvc_post(), dirsearch_content(), new_channel_init(), notes_init(), oexchange_content(), online_init(), post_init(), post_post(), red_item_new(), register_init(), zfinger_init(), and zotfeed_init().

                + + + +
                +
                + + + + + + + + +
                old_webfinger ( $webbie)
                +
                + +

                Referenced by discover_by_webbie().

                +
                @@ -413,7 +477,7 @@ Functions @@ -451,32 +515,30 @@ Functions - +
                - + - +
                validate_email scrape_feed (  $addr)$url)
                -

                Referenced by check_account_email(), and zid_init().

                -
                - +
                - + - + @@ -485,58 +547,56 @@ Functions - +
                validate_url scrape_vcard (  $url)
                - + - - - - - - - - - + - -
                webfinger validate_email (  $s,
                 $debug = false 
                $addr) )
                -

                Referenced by webfinger_content(), and webfinger_dfrn().

                +

                Referenced by check_account_email(), and zid_init().

                - +
                - + - - - - - - - + + +
                webfinger_dfrn validate_url ( $s,
                $hcard $url)
                +
                + +
                +
                + +
                +
                + + + + + - -
                webfinger_rfc7033 ( $webbie) )
                +

                Referenced by discover_by_webbie().

                +
                @@ -651,7 +711,7 @@ Functions
                Returns
                array 'return_code' => HTTP return code or 0 if timeout or failure 'success' => boolean true (if HTTP 2xx result) or false 'header' => HTTP headers 'body' => fetched content
                -

                Referenced by check_htaccess(), directory_content(), dirprofile_init(), externals_run(), import_post(), import_profile_photo(), import_site(), import_xchan(), navbar_complete(), oembed_fetch_url(), oexchange_content(), onepoll_run(), parseurl_getsiteinfo(), poco_load(), pubsites_content(), remote_online_status(), scale_external_images(), setup_post(), sslify_init(), sync_directories(), update_suggestions(), z_post_url(), zot_finger(), and zot_register_hub().

                +

                Referenced by check_htaccess(), directory_content(), dirprofile_init(), discover_by_webbie(), externals_run(), fetch_xrd_links(), handle_feed(), import_post(), import_profile_photo(), import_site(), import_xchan(), navbar_complete(), oembed_fetch_url(), oexchange_content(), onepoll_run(), parseurl_getsiteinfo(), poco_load(), pubsites_content(), remote_online_status(), scale_external_images(), scrape_feed(), scrape_vcard(), setup_post(), sslify_init(), sync_directories(), update_suggestions(), webfinger_rfc7033(), z_post_url(), zot_finger(), and zot_register_hub().

                diff --git a/doc/html/include_2network_8php.js b/doc/html/include_2network_8php.js index 15e2bab93..512573291 100644 --- a/doc/html/include_2network_8php.js +++ b/doc/html/include_2network_8php.js @@ -4,18 +4,22 @@ var include_2network_8php = [ "allowed_url", "include_2network_8php.html#aee35d9ad6b3f872bfb39ba3598936aa7", null ], [ "avatar_img", "include_2network_8php.html#ab07ce9d75eae559865ed90aad2154bd7", null ], [ "convert_xml_element_to_array", "include_2network_8php.html#ad4056d3ce69988f5c1a997a79f503246", null ], + [ "discover_by_webbie", "include_2network_8php.html#a63e62946e194928eb17c5a9f2bbef0fe", null ], [ "email_header_encode", "include_2network_8php.html#a469b9bd700269cd07d954f1a16c5899b", null ], [ "email_send", "include_2network_8php.html#a1ff07d9fad93b713b93da0ab77aab7f0", null ], [ "fetch_lrdd_template", "include_2network_8php.html#a8d5a3afb51cc932032b5dcc159efaae0", null ], + [ "fetch_xrd_links", "include_2network_8php.html#a850ed5307c6a18076f4b80addc99602d", null ], [ "get_capath", "include_2network_8php.html#a78e89557b2fbd344ad790846d761b0c7", null ], [ "http_status_exit", "include_2network_8php.html#a4cfb2c05a1c295317283d762440ce0b2", null ], [ "json_return_and_die", "include_2network_8php.html#a4c5d50079e089168d9248427018fffd4", null ], + [ "old_webfinger", "include_2network_8php.html#a872bbe72d23826c64c9e0f822180a3ec", null ], [ "parse_xml_string", "include_2network_8php.html#a27a951b59d8d622c0b3e7b0673ba74c6", null ], [ "scale_external_images", "include_2network_8php.html#ae8d9c41a11000fb8667039fc71b4f73f", null ], + [ "scrape_feed", "include_2network_8php.html#a316f318167a039c89719afbd129a8f3c", null ], + [ "scrape_vcard", "include_2network_8php.html#acb0bd7f5fe38ff1eaebeae3284525070", null ], [ "validate_email", "include_2network_8php.html#a897e7112d86eb95526cbd0bff9375f02", null ], [ "validate_url", "include_2network_8php.html#a5caa264fab6d2b2344e6bd5b298b08f2", null ], - [ "webfinger", "include_2network_8php.html#a8122356933bcd6b0a8567e8e15ae5cc5", null ], - [ "webfinger_dfrn", "include_2network_8php.html#adf6008b38c555e98e7ed10da9ede2335", null ], + [ "webfinger_rfc7033", "include_2network_8php.html#a3e6c751a51de33ad3563f0938296e78a", null ], [ "xml2array", "include_2network_8php.html#a99353baabbc3e0584b85eb79ee802cff", null ], [ "xml_status", "include_2network_8php.html#a9e9da2aafb806c98ecdc318604e60dc6", null ], [ "z_fetch_url", "include_2network_8php.html#aafd06c0a75402aefb06cfb9f9740fa37", null ], diff --git a/doc/html/include_2oembed_8php.html b/doc/html/include_2oembed_8php.html index b2e1efc44..6a4a63546 100644 --- a/doc/html/include_2oembed_8php.html +++ b/doc/html/include_2oembed_8php.html @@ -245,7 +245,7 @@ Functions

                Find .... and replace it with [embed]url[/embed]

                -

                Referenced by get_atom_elements(), and oembed_init().

                +

                Referenced by get_atom_elements(), and oembed_init().

                diff --git a/doc/html/items_8php.html b/doc/html/items_8php.html index 7be105fc9..5e7c4ff11 100644 --- a/doc/html/items_8php.html +++ b/doc/html/items_8php.html @@ -176,8 +176,8 @@ Functions    get_profile_elements ($x)   - get_atom_elements ($feed, $item) -  + get_atom_elements ($feed, $item, &$author) +   encode_rel_links ($links)    item_store ($arr, $allow_exec=false) @@ -192,12 +192,18 @@ Functions    tgroup_check ($uid, $item)   + start_delivery_chain ($channel, $item, $item_id, $parent) +   check_item_source ($uid, $item)    mail_store ($arr)   - consume_feed ($xml, $importer, &$contact, &$hub, $datedir=0, $pass=0) -  + consume_feed ($xml, $importer, &$contact, $pass=0) +  + update_feed_item ($uid, $datarray) +  + handle_feed ($uid, $abook_id, $url) +   atom_author ($tag, $name, $uri, $h, $w, $type, $photo)    atom_entry ($item, $type, $author, $owner, $comment=false, $cid=0) @@ -603,7 +609,7 @@ Functions - +
                @@ -625,18 +631,6 @@ Functions - - - - - - - - - - - - @@ -655,6 +649,8 @@ Functions

                $importer = the contact_record (joined to user_record) of the local user who owns this relationship. It is this person's stuff that is going to be updated. $contact = the person who is sending us stuff. If not set, we MAY be processing a "follow" activity from an external network and MAY create an appropriate contact record. Otherwise, we MUST have a contact record. $hub = should we find a hub declation in the feed, pass it back to our calling process, who might (or might not) try and subscribe to it. $datedir sorts in reverse order $pass - by default ($pass = 0) we cannot guarantee that a parent item has been imported prior to its children being seen in the stream unless we are certain of how the feed is arranged/ordered. With $pass = 1, we only pull parent items out of the stream. With $pass = 2, we only pull children (comments/likes).

                So running this twice, first with pass 1 and then with pass 2 will do the right thing regardless of feed ordering. This won't be adequate in a fully-threaded model where comments can have sub-threads. That would require some massive sorting to get all the feed items into a mostly linear ordering, and might still require recursion.

                +

                Referenced by handle_feed().

                + @@ -733,7 +729,7 @@ Functions
                $contact,
                $hub,
                 $datedir = 0,
                @@ -859,7 +855,7 @@ Functions
                -

                Referenced by get_atom_elements().

                +

                Referenced by get_atom_elements().

                @@ -977,7 +973,7 @@ Functions - +
                @@ -991,7 +987,13 @@ Functions - + + + + + + + @@ -1002,7 +1004,7 @@ Functions

                If there's a copy of the body content which is guaranteed to have survived mangling in transit, use it.

                -

                Referenced by consume_feed().

                +

                Referenced by consume_feed().

                @@ -1147,6 +1149,38 @@ Functions

                Referenced by feed_init().

                + + + +
                +
                +
                 $item $item,
                $author 
                + + + + + + + + + + + + + + + + + + + + + + + +
                handle_feed ( $uid,
                 $abook_id,
                 $url 
                )
                +
                +
                @@ -1352,7 +1386,7 @@ Functions @@ -1444,7 +1478,7 @@ Functions
                -

                Referenced by get_atom_elements().

                +

                Referenced by get_atom_elements().

                @@ -1519,7 +1553,7 @@ Functions @@ -1701,6 +1735,47 @@ Functions

                Referenced by item_store(), and item_store_update().

                + + + +
                +
                + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                start_delivery_chain ( $channel,
                 $item,
                 $item_id,
                 $parent 
                )
                +
                +

                Sourced and tag-delivered posts are re-targetted for delivery to the connections of the channel receiving the post. This starts the second delivery chain, by resetting permissions and ensuring that ITEM_UPLINK is set on the parent post, and storing the current owner_xchan as the source_xchan. We'll become the new owner. If called without $parent, this is the parent post.

                + +

                Referenced by tag_deliver().

                +
                @@ -1726,6 +1801,12 @@ Functions
                +

                Fetch stuff we need - a channel and an item

                +

                Seems like a good place to plug in a poke notification.

                +

                Do community tagging

                +

                A "union" is a message which our channel has sourced from another channel. This sets up a second delivery chain just like forum tags do. Find out if this is a source-able post.

                +

                Now we've got those out of the way. Let's see if this is a post that's tagged for re-delivery

                +

                Kill two birds with one stone. As long as we're here, send a mention notification.

                Referenced by delete_imported_item(), item_content(), item_store(), and item_store_update().

                @@ -1772,8 +1853,10 @@ Functions
                +

                tgroup_check($uid,$item)

                +

                This function is called pre-deliver to see if a post matches the criteria to be tag delivered. We don't actually do anything except check that it matches the criteria. This is so that the channel with tag_delivery enabled can receive the post even if they turn off permissions for the sender to send their stream. tag_deliver() can't be called until the post is actually stored. By then it would be too late to reject it.

                -

                Referenced by consume_feed(), and process_delivery().

                +

                Referenced by process_delivery().

                @@ -1801,7 +1884,7 @@ Functions
                -

                Referenced by get_atom_elements().

                +

                Referenced by get_atom_elements().

                @@ -1821,6 +1904,34 @@ Functions

                Referenced by lockview_content(), and profiles_content().

                + + + +
                +
                + + + + + + + + + + + + + + + + + + +
                update_feed_item ( $uid,
                 $datarray 
                )
                +
                + +

                Referenced by consume_feed().

                +
                diff --git a/doc/html/items_8php.js b/doc/html/items_8php.js index 8b1453bb9..f0e2953c9 100644 --- a/doc/html/items_8php.js +++ b/doc/html/items_8php.js @@ -12,7 +12,7 @@ var items_8php = [ "construct_activity_object", "items_8php.html#aa9e99613d38a97b39c8cf5449699c2ee", null ], [ "construct_activity_target", "items_8php.html#aa579bc4445d60098b1410961ca8e96b7", null ], [ "construct_verb", "items_8php.html#a8f3c85c584ccd2b98c3ca440e45b40f8", null ], - [ "consume_feed", "items_8php.html#a8794863cdf8ce1333040933d3a3f66bd", null ], + [ "consume_feed", "items_8php.html#adc26e08aa61f5666da04ab5d2a9d68a6", null ], [ "decode_tags", "items_8php.html#a56b2a4abcadfac71175cd50555528cc3", null ], [ "delete_item_lowlevel", "items_8php.html#aac8c9eb4338e2a996c43914392c6cfdb", null ], [ "drop_item", "items_8php.html#a555762e1022a4b8e3c3abd32e7812408", null ], @@ -27,13 +27,14 @@ var items_8php = [ "fetch_post_tags", "items_8php.html#adf980098b6de9c3993bc3ff26a8dd6f9", null ], [ "first_post_date", "items_8php.html#a0cf98bb619f07dd18f602683a55a5f59", null ], [ "fix_private_photos", "items_8php.html#aba98fcbbcd7044a7e9ea34edabc14c87", null ], - [ "get_atom_elements", "items_8php.html#a896c1809d58f2d7a42cfe14577958ddf", null ], + [ "get_atom_elements", "items_8php.html#a5e5be7bf1f8257dec0b2647e60a3f3f1", null ], [ "get_feed_for", "items_8php.html#a04a35b610acfe54434df08adec39c0c7", null ], [ "get_item_contact", "items_8php.html#aab9c6bae4c40799867596bdaae9829fd", null ], [ "get_item_elements", "items_8php.html#a536d0313b6ffe33b9d2490c4e25c5361", null ], [ "get_mail_elements", "items_8php.html#a94ddb1d6c8fa21dd7433677e85168037", null ], [ "get_profile_elements", "items_8php.html#a251343637ff40a50cca93452cd530c26", null ], [ "get_public_feed", "items_8php.html#a079e099e15d88d47aeb6ca6d60da7107", null ], + [ "handle_feed", "items_8php.html#a52c24114b73c0bdb605a03cd29712223", null ], [ "has_permissions", "items_8php.html#a77051724d1784074ff187e73a4db93fe", null ], [ "import_author_rss", "items_8php.html#a6bee35961f2e32905f20367a9309d627", null ], [ "import_author_xchan", "items_8php.html#ae73794179b62d39bb597ff670ab1c1e5", null ], @@ -58,11 +59,13 @@ var items_8php = [ "red_zrlify_img_callback", "items_8php.html#a78a60e39f6991bd3324a24dcbf9dac5a", null ], [ "retain_item", "items_8php.html#af6237605c60d69abdd959ddbbee3420c", null ], [ "send_status_notifications", "items_8php.html#aab9e0c58247427126de0699c729c3b6c", null ], + [ "start_delivery_chain", "items_8php.html#adf2b8137dc4ad9ec958de2842f16f3c2", null ], [ "tag_deliver", "items_8php.html#ab1bce4261bcf75ad62753b498a144d17", null ], [ "termtype", "items_8php.html#ad34827ed330898456783fb14c7b46154", null ], [ "tgroup_check", "items_8php.html#a88c6cf7649ac836fbbed82a7a0315110", null ], [ "title_is_body", "items_8php.html#aa371905f0a211b307cb3f7188c6cba04", null ], [ "translate_scope", "items_8php.html#aabfaa193b83154c2a81e91284e5d5e59", null ], + [ "update_feed_item", "items_8php.html#a9b449eeae50003414b8b30ca927af434", null ], [ "update_remote_id", "items_8php.html#a2baa9e05f1e8aa3dd61c85803ae39bd6", null ], [ "zot_feed", "items_8php.html#a004e89d86b0f29b2c4da20108ecc4091", null ] ]; \ No newline at end of file diff --git a/doc/html/language_8php.html b/doc/html/language_8php.html index 64f4466f3..63615621a 100644 --- a/doc/html/language_8php.html +++ b/doc/html/language_8php.html @@ -372,7 +372,7 @@ Functions
                Returns
                translated string if exsists, otherwise s
                -

                Referenced by achievements_content(), acl_init(), admin_content(), admin_page_channels(), admin_page_dbsync(), admin_page_hubloc(), admin_page_logs(), admin_page_logs_post(), admin_page_plugins(), admin_page_site(), admin_page_site_post(), admin_page_summary(), admin_page_themes(), admin_page_users(), admin_post(), advanced_profile(), alt_pager(), api_content(), api_post(), api_statuses_public_timeline(), app_render(), app_store(), app_update(), appman_content(), appman_post(), apps_content(), apw_form(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_init(), attach_list_files(), attach_mkdir(), attach_store(), bbcode(), block_content(), blocks_content(), blogtheme_form(), bookmark_add(), bookmarks_content(), bookmarks_init(), categories_widget(), channel_content(), channel_init(), chanview_content(), chat_content(), chat_init(), chatroom_create(), chatroom_destroy(), chatroom_enter(), chatsvc_content(), check_account_email(), check_account_invite(), check_config(), check_form_security_std_err_msg(), check_funcs(), check_htaccess(), check_htconfig(), check_keys(), check_php(), check_smarty3(), check_store(), cloud_init(), common_content(), common_friends_visitor_widget(), common_init(), connect_content(), connect_init(), connect_post(), connections_content(), connections_post(), connedit_content(), connedit_post(), construct_page(), contact_block(), contact_poll_interval(), conversation(), create_account(), create_identity(), datesel_format(), day_translate(), delegate_content(), design_tools(), diaspora_like(), diaspora_request(), diaspora_send_status(), dir_safe_mode(), dir_sort_links(), dir_tagblock(), directory_content(), dirprofile_init(), dirsearch_content(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), event_store_item(), events_content(), events_post(), fbrowser_content(), fileas_widget(), filer_content(), filestorage_content(), filestorage_post(), findpeople_widget(), follow_init(), format_categories(), format_event_diaspora(), format_event_html(), format_filer(), format_like(), format_notification(), frphotos_content(), fsuggest_content(), fsuggest_post(), gender_selector(), gender_selector_min(), RedBrowser\generateDirectoryIndex(), get_birthdays(), Item\get_comment_box(), get_events(), get_features(), get_mood_verbs(), get_perms(), get_plink(), get_poke_verbs(), Item\get_template_data(), group_add(), group_content(), group_post(), group_side(), hcard_init(), help_content(), home_content(), RedBrowser\htmlActionsPanel(), identity_check_service_class(), import_author_rss(), import_channel_photo(), import_content(), import_post(), import_xchan(), dba_driver\install(), invite_content(), invite_post(), item_check_service_class(), item_content(), item_photo_menu(), item_post(), item_post_type(), items_fetch(), lang_selector(), layout_select(), layouts_content(), like_content(), load_database(), localize_item(), lockview_content(), login(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_post(), manage_content(), manual_config(), marital_selector(), marital_selector_min(), match_content(), menu_content(), menu_post(), menu_render(), message_content(), mimetype_select(), mini_group_select(), mitem_content(), mitem_init(), mitem_post(), mood_content(), mood_init(), nav(), network_content(), network_init(), network_to_name(), new_channel_content(), new_channel_post(), new_contact(), notice(), notification(), notifications_content(), notifications_post(), notify_content(), obj_verbs(), oembed_bbcode2html(), oembed_iframe(), oexchange_content(), openid_content(), page_content(), pagelist_widget(), paginate(), pdl_selector(), pdledit_content(), pdledit_post(), photo_upload(), photos_album_widget(), photos_content(), photos_init(), photos_post(), ping_init(), poke_content(), poke_init(), poll_content(), populate_acl(), post_activity_item(), post_init(), probe_content(), profile_activity(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profile_sidebar(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), pubsites_content(), rbmark_content(), rbmark_post(), redbasic_form(), register_content(), register_post(), regmod_content(), relative_date(), removeaccount_content(), removeaccount_post(), removeme_content(), removeme_post(), rmagic_content(), rmagic_post(), rpost_content(), scale_external_images(), search(), search_content(), searchbox(), select_timezone(), send_message(), send_reg_approval_email(), send_verification_email(), settings_post(), setup_content(), sexpref_selector(), sexpref_selector_min(), siteinfo_content(), sources_content(), sources_post(), subthread_content(), suggest_content(), tagblock(), tagger_content(), tagrm_content(), tagrm_post(), theme_attachments(), thing_content(), thing_init(), timezone_cmp(), translate_scope(), translate_system_apps(), update_birthdays(), update_channel_content(), update_display_content(), update_network_content(), update_search_content(), upgrade_bool_message(), upgrade_link(), upgrade_message(), user_allow(), user_approve(), user_deny(), validate_channelname(), vcard_from_xchan(), verify_email_address(), viewconnections_content(), viewsrc_content(), vote_content(), wall_upload_post(), webpages_content(), what_next(), widget_affinity(), widget_appselect(), widget_archive(), widget_bookmarkedchats(), widget_chatroom_list(), widget_filer(), widget_follow(), widget_mailmenu(), widget_notes(), widget_savedsearch(), widget_settings_menu(), widget_suggestedchats(), widget_suggestions(), widget_tagcloud(), writepages_widget(), xchan_content(), z_readdir(), and zfinger_init().

                +

                Referenced by account_remove(), achievements_content(), acl_init(), admin_content(), admin_page_channels(), admin_page_dbsync(), admin_page_hubloc(), admin_page_logs(), admin_page_logs_post(), admin_page_plugins(), admin_page_site(), admin_page_site_post(), admin_page_summary(), admin_page_themes(), admin_page_users(), admin_post(), advanced_profile(), alt_pager(), api_content(), api_post(), api_statuses_public_timeline(), app_render(), app_store(), app_update(), appman_content(), appman_post(), apps_content(), apw_form(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_init(), attach_list_files(), attach_mkdir(), attach_store(), bbcode(), block_content(), blocks_content(), blogtheme_form(), bookmark_add(), bookmarks_content(), bookmarks_init(), categories_widget(), channel_content(), channel_init(), chanview_content(), chat_content(), chat_init(), chatroom_create(), chatroom_destroy(), chatroom_enter(), chatsvc_content(), check_account_email(), check_account_invite(), check_config(), check_form_security_std_err_msg(), check_funcs(), check_htaccess(), check_htconfig(), check_keys(), check_php(), check_smarty3(), check_store(), cloud_init(), common_content(), common_friends_visitor_widget(), common_init(), connect_content(), connect_init(), connect_post(), connections_content(), connections_post(), connedit_content(), connedit_post(), construct_page(), contact_block(), contact_poll_interval(), conversation(), create_account(), create_identity(), datesel_format(), day_translate(), delegate_content(), design_tools(), diaspora_like(), diaspora_send_status(), dir_safe_mode(), dir_sort_links(), dir_tagblock(), directory_content(), dirprofile_init(), dirsearch_content(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), event_store_item(), events_content(), events_post(), fbrowser_content(), fileas_widget(), filer_content(), filestorage_content(), filestorage_post(), findpeople_widget(), follow_init(), format_categories(), format_event_diaspora(), format_event_html(), format_filer(), format_like(), format_notification(), fsuggest_content(), fsuggest_post(), gender_selector(), gender_selector_min(), RedBrowser\generateDirectoryIndex(), get_birthdays(), Item\get_comment_box(), get_events(), get_features(), get_mood_verbs(), get_perms(), get_plink(), get_poke_verbs(), Item\get_template_data(), group_add(), group_content(), group_post(), group_side(), hcard_init(), help_content(), home_content(), RedBrowser\htmlActionsPanel(), identity_check_service_class(), import_author_rss(), import_channel_photo(), import_content(), import_post(), import_xchan(), dba_driver\install(), invite_content(), invite_post(), item_check_service_class(), item_content(), item_photo_menu(), item_post(), item_post_type(), items_fetch(), lang_selector(), layout_select(), layouts_content(), like_content(), load_database(), localize_item(), lockview_content(), login(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_post(), manage_content(), manual_config(), marital_selector(), marital_selector_min(), match_content(), menu_content(), menu_post(), menu_render(), message_content(), mimetype_select(), mini_group_select(), mitem_content(), mitem_init(), mitem_post(), mood_content(), mood_init(), nav(), network_content(), network_init(), network_to_name(), new_channel_content(), new_channel_post(), new_contact(), notice(), notification(), notifications_content(), notifications_post(), notify_content(), obj_verbs(), oembed_bbcode2html(), oembed_iframe(), oexchange_content(), openid_content(), page_content(), pagelist_widget(), paginate(), pdl_selector(), pdledit_content(), pdledit_post(), photo_upload(), photos_album_widget(), photos_content(), photos_init(), photos_post(), ping_init(), poke_content(), poke_init(), poll_content(), populate_acl(), post_activity_item(), post_init(), probe_content(), profile_activity(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profile_sidebar(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), pubsites_content(), rbmark_content(), rbmark_post(), redbasic_form(), register_content(), register_post(), regmod_content(), relative_date(), removeaccount_content(), removeaccount_post(), removeme_content(), removeme_post(), rmagic_content(), rmagic_post(), rpost_content(), scale_external_images(), search(), search_content(), searchbox(), select_timezone(), send_message(), send_reg_approval_email(), send_verification_email(), settings_post(), setup_content(), sexpref_selector(), sexpref_selector_min(), siteinfo_content(), sources_content(), sources_post(), subthread_content(), suggest_content(), tagblock(), tagger_content(), tagrm_content(), tagrm_post(), theme_attachments(), thing_content(), thing_init(), timezone_cmp(), translate_scope(), translate_system_apps(), update_birthdays(), update_channel_content(), update_display_content(), update_network_content(), update_search_content(), upgrade_bool_message(), upgrade_link(), upgrade_message(), user_allow(), user_approve(), user_deny(), validate_channelname(), vcard_from_xchan(), verify_email_address(), viewconnections_content(), viewsrc_content(), vote_content(), wall_upload_post(), webpages_content(), what_next(), widget_affinity(), widget_appselect(), widget_archive(), widget_bookmarkedchats(), widget_chatroom_list(), widget_filer(), widget_follow(), widget_mailmenu(), widget_notes(), widget_savedsearch(), widget_settings_menu(), widget_suggestedchats(), widget_suggestions(), widget_tagcloud(), writepages_widget(), xchan_content(), z_readdir(), and zfinger_init().

                diff --git a/doc/html/navtree.js b/doc/html/navtree.js index 980255729..8e8e44674 100644 --- a/doc/html/navtree.js +++ b/doc/html/navtree.js @@ -37,15 +37,15 @@ var NAVTREE = var NAVTREEINDEX = [ "BS-Default_8php.html", -"boot_8php.html#a6788e99021ec8ffb0fa94d651f22a322", +"boot_8php.html#a6626f383c3d2d459f731ab8b4f237d16", "classApp.html#a8863703a0305eaa45eb970dbd2046291", "classphoto__driver.html#a00cb166c00b7502dbc456c94330e5b03", -"docblox__errorchecker_8php.html", -"html2bbcode_8php.html", -"interfaceITemplateEngine.html#aaf2698adbf46c073c24b162fe1b1c442", -"permissions_8php.html#aa8b7b102c653649d7a71b5a1c044d90d", -"spam_8php.html#ab8fd81a82c9622cbebb8ceab6b310ca6", -"widgets_8php.html#ad1bf7aa69e8d100d95faba17c7bc91cd" +"dir_f19da925ee886ec38f19b0e8c19779bc.html", +"identity_8php.html#a332df795f684788002f5a6424abacfd7", +"items_8php.html#a02ca33c31ed535d24894f8a9a91ce9df", +"photo__imagick_8php.html", +"system__unavailable_8php.html#a73751a6bcc17ad3ca503496e2fb020fa", +"xref_8php.html#a9bee399213b8de8226b0d60834307473" ]; var SYNCONMSG = 'click to disable panel synchronisation'; diff --git a/doc/html/navtreeindex0.js b/doc/html/navtreeindex0.js index 5be99181a..c836f5135 100644 --- a/doc/html/navtreeindex0.js +++ b/doc/html/navtreeindex0.js @@ -137,117 +137,117 @@ var NAVTREEINDEX0 = "blogga_2view_2theme_2blog_2theme_8php.html#aae58cc837fe56473d9f3370abfe533ae":[6,0,3,1,1,1,0,0,2,1], "blogga_2view_2theme_2blog_2theme_8php.html#af634a3f721c5e238530d0636d33230ec":[6,0,3,1,1,1,0,0,2,4], "boot_8php.html":[6,0,4], -"boot_8php.html#a009e6a0637cb65804ea8094ecc4450b0":[6,0,4,142], -"boot_8php.html#a01353c9abebc3544ea080ac161729632":[6,0,4,37], -"boot_8php.html#a022cea669f9f13ef7c6268b63884c57f":[6,0,4,156], +"boot_8php.html#a009e6a0637cb65804ea8094ecc4450b0":[6,0,4,143], +"boot_8php.html#a01353c9abebc3544ea080ac161729632":[6,0,4,38], +"boot_8php.html#a022cea669f9f13ef7c6268b63884c57f":[6,0,4,157], "boot_8php.html#a02566ac9d891369a1d3ebb81a15722fc":[6,0,4,259], -"boot_8php.html#a028380b2902a86ba32198f6d3b5d10bb":[6,0,4,135], -"boot_8php.html#a032bbd6d0321e99e9117332c9ed2b1b8":[6,0,4,55], +"boot_8php.html#a028380b2902a86ba32198f6d3b5d10bb":[6,0,4,136], +"boot_8php.html#a032bbd6d0321e99e9117332c9ed2b1b8":[6,0,4,56], "boot_8php.html#a03d19251c245587de7ed959300b87bdf":[6,0,4,176], -"boot_8php.html#a0450389f24c632906fbc24347700a543":[6,0,4,46], -"boot_8php.html#a0603d6ece8c5d37b4b7db697db053a4b":[6,0,4,108], +"boot_8php.html#a0450389f24c632906fbc24347700a543":[6,0,4,47], +"boot_8php.html#a0603d6ece8c5d37b4b7db697db053a4b":[6,0,4,109], "boot_8php.html#a081307d681d7d04f17b9ced2076e7c85":[6,0,4,1], "boot_8php.html#a09532c3f750ae8c4527e63b2b790cbf3":[6,0,4,216], -"boot_8php.html#a0a98dd0110dc6c8e24cefc8ae74d5562":[6,0,4,70], +"boot_8php.html#a0a98dd0110dc6c8e24cefc8ae74d5562":[6,0,4,71], "boot_8php.html#a0b73e2548d6f9beb9c93211f488e336a":[6,0,4,180], "boot_8php.html#a0c59dde058efebbc66520d136cbd1631":[6,0,4,279], "boot_8php.html#a0cc8dc76bd10ac0ec81bac08a46f82fe":[6,0,4,275], "boot_8php.html#a0d877df1e20bae765e1708be50f6b503":[6,0,4,278], -"boot_8php.html#a0e4701c9742c3ef88f02ac450a042a84":[6,0,4,21], -"boot_8php.html#a0e57f846e6d47a308feced0f7274f178":[6,0,4,62], +"boot_8php.html#a0e4701c9742c3ef88f02ac450a042a84":[6,0,4,22], +"boot_8php.html#a0e57f846e6d47a308feced0f7274f178":[6,0,4,63], "boot_8php.html#a0e6db7e365f2b041a828b93786f694bc":[6,0,4,15], -"boot_8php.html#a0fb63e51c2a9814941842ae8f2f4dff8":[6,0,4,80], -"boot_8php.html#a107d53f96acf5319905a34b1870db09a":[6,0,4,40], +"boot_8php.html#a0fb63e51c2a9814941842ae8f2f4dff8":[6,0,4,81], +"boot_8php.html#a107d53f96acf5319905a34b1870db09a":[6,0,4,41], "boot_8php.html#a115faf8797718c3165498abbd6895843":[6,0,4,264], -"boot_8php.html#a11cfe7d99b4dac0454d0de8873989f81":[6,0,4,137], +"boot_8php.html#a11cfe7d99b4dac0454d0de8873989f81":[6,0,4,138], "boot_8php.html#a1200c1f968ff3d52ef878de5fc5c30c1":[6,0,4,263], -"boot_8php.html#a12c781cefc20167231e2e3fd5866b1b5":[6,0,4,84], -"boot_8php.html#a14ba8f9e162f2559831ee3bf98e0c3bd":[6,0,4,81], +"boot_8php.html#a12c781cefc20167231e2e3fd5866b1b5":[6,0,4,85], +"boot_8php.html#a14ba8f9e162f2559831ee3bf98e0c3bd":[6,0,4,82], "boot_8php.html#a14d44d4a00223dc3db4ea962325db192":[6,0,4,206], -"boot_8php.html#a176664e78dcb9132e16be69418223eb2":[6,0,4,65], -"boot_8php.html#a17b4ea23d9ecf628d9c8f53b7abcb805":[6,0,4,155], -"boot_8php.html#a17cf72338b040891781a4bcbdd9a8595":[6,0,4,151], +"boot_8php.html#a176664e78dcb9132e16be69418223eb2":[6,0,4,66], +"boot_8php.html#a17b4ea23d9ecf628d9c8f53b7abcb805":[6,0,4,156], +"boot_8php.html#a17cf72338b040891781a4bcbdd9a8595":[6,0,4,152], "boot_8php.html#a181c111f4b6c14d091dfd3bf0d0a22cd":[6,0,4,179], -"boot_8php.html#a18a400fa45e5632811b33041d8c048bf":[6,0,4,145], +"boot_8php.html#a18a400fa45e5632811b33041d8c048bf":[6,0,4,146], "boot_8php.html#a1af3ed96de14aa0d7891b39cc75b60f2":[6,0,4,287], "boot_8php.html#a1ba00027b718db732f30fc0e2c3e0abc":[6,0,4,253], "boot_8php.html#a1c923b99bf77e4203ae94e5684b6ad0f":[6,0,4,289], "boot_8php.html#a1d6e7f4c08bb68e4a424326a811bdd86":[6,0,4,183], -"boot_8php.html#a1da180f961f49a11573cac4ff6c62c05":[6,0,4,79], +"boot_8php.html#a1da180f961f49a11573cac4ff6c62c05":[6,0,4,80], "boot_8php.html#a1db4f0009c9cb4e107eab0f914a3c8dc":[6,0,4,231], -"boot_8php.html#a1f5906598e90b5ea2b4245f682be4348":[6,0,4,110], -"boot_8php.html#a1fbb93cf030f07391f22cc2948744869":[6,0,4,162], +"boot_8php.html#a1f5906598e90b5ea2b4245f682be4348":[6,0,4,111], +"boot_8php.html#a1fbb93cf030f07391f22cc2948744869":[6,0,4,163], "boot_8php.html#a205d013103997adfa72953d2f20c01e1":[6,0,4,225], "boot_8php.html#a20f0eed431d25870b624b8937a07a59f":[6,0,4,199], "boot_8php.html#a21cc29e0025943e7c28ff58cb4856ac3":[6,0,4,255], -"boot_8php.html#a222395aa223cfbff6166fab0b4e2e1d5":[6,0,4,41], -"boot_8php.html#a24a7a70afedd5d85fe0eadc85afa9f77":[6,0,4,20], -"boot_8php.html#a25476eec71fceda237f7dc1d78b0adb8":[6,0,4,103], -"boot_8php.html#a27299ecfb9e9a99826f17a1c14c6995f":[6,0,4,95], +"boot_8php.html#a222395aa223cfbff6166fab0b4e2e1d5":[6,0,4,42], +"boot_8php.html#a24a7a70afedd5d85fe0eadc85afa9f77":[6,0,4,21], +"boot_8php.html#a25476eec71fceda237f7dc1d78b0adb8":[6,0,4,104], +"boot_8php.html#a27299ecfb9e9a99826f17a1c14c6995f":[6,0,4,96], "boot_8php.html#a2750985ec445617d7e82ae3098c91e3f":[6,0,4,267], "boot_8php.html#a285732e7889fa7f333cbe431111e1029":[6,0,4,202], -"boot_8php.html#a29528a2544373cc19a378f350040c6a1":[6,0,4,86], -"boot_8php.html#a2958a2bd5422b85329d7c36c06dbc221":[6,0,4,136], +"boot_8php.html#a29528a2544373cc19a378f350040c6a1":[6,0,4,87], +"boot_8php.html#a2958a2bd5422b85329d7c36c06dbc221":[6,0,4,137], "boot_8php.html#a29e921c0c72412cc738e44cca6ca1f62":[6,0,4,229], -"boot_8php.html#a2af173e4e9836ee7c90757b4793a2be3":[6,0,4,111], +"boot_8php.html#a2af173e4e9836ee7c90757b4793a2be3":[6,0,4,112], "boot_8php.html#a2b525996e4426bdddbcec277778bde08":[6,0,4,251], "boot_8php.html#a2c65e925994566a63e6c03c381f1b4a0":[6,0,4,198], -"boot_8php.html#a2c8906f1af94a3559a5b4661067bb79d":[6,0,4,132], -"boot_8php.html#a2e90096fede6acce16abf0da8cb2febe":[6,0,4,71], -"boot_8php.html#a2f8f25b13480c37a5f22511f53da8bab":[6,0,4,76], +"boot_8php.html#a2c8906f1af94a3559a5b4661067bb79d":[6,0,4,133], +"boot_8php.html#a2e90096fede6acce16abf0da8cb2febe":[6,0,4,72], +"boot_8php.html#a2f8f25b13480c37a5f22511f53da8bab":[6,0,4,77], +"boot_8php.html#a329400dcb29897cdaae3020109272285":[6,0,4,17], "boot_8php.html#a32df13fec0e43281da5979e1f5579aa8":[6,0,4,236], -"boot_8php.html#a3475ff6c2e575f946ea0ee377e944173":[6,0,4,149], -"boot_8php.html#a34c756469ebed32e2fc987bcde62d382":[6,0,4,43], -"boot_8php.html#a3515ea6bf77495de89b93e9ccd881c49":[6,0,4,125], +"boot_8php.html#a3475ff6c2e575f946ea0ee377e944173":[6,0,4,150], +"boot_8php.html#a34c756469ebed32e2fc987bcde62d382":[6,0,4,44], +"boot_8php.html#a3515ea6bf77495de89b93e9ccd881c49":[6,0,4,126], "boot_8php.html#a35625dacd2158b9f1f1a8e77f9f081fd":[6,0,4,165], "boot_8php.html#a36003bebe4ce860c6652bcc3e09b2214":[6,0,4,213], "boot_8php.html#a36b31575f992a10b5927b76efba9362e":[6,0,4,293], "boot_8php.html#a38f6c7fe33b5434a24b4314567753dfa":[6,0,4,187], -"boot_8php.html#a3ad9cc5d4354be741fa1de12b96e9955":[6,0,4,114], -"boot_8php.html#a3b56bfc6a0dd159070e316ddac3b7456":[6,0,4,119], +"boot_8php.html#a3ad9cc5d4354be741fa1de12b96e9955":[6,0,4,115], +"boot_8php.html#a3b56bfc6a0dd159070e316ddac3b7456":[6,0,4,120], "boot_8php.html#a3cd42a70c6b3999590e4fd7a1a9096af":[6,0,4,292], "boot_8php.html#a3d6d4fc5fafcc9156811669158541caf":[6,0,4,227], "boot_8php.html#a3e0930933fb2c0bf8211cc7ab4e1c3b4":[6,0,4,12], -"boot_8php.html#a3e2ea123d29a72012db1241f96280b0e":[6,0,4,63], -"boot_8php.html#a3f40aa5bafff8c4eebdc62e5121daf77":[6,0,4,93], -"boot_8php.html#a400519fa181591cd6fdbb8f25fbcba0a":[6,0,4,53], -"boot_8php.html#a40d885b2cfd736aab4234ae641ca4dfb":[6,0,4,138], +"boot_8php.html#a3e2ea123d29a72012db1241f96280b0e":[6,0,4,64], +"boot_8php.html#a3f40aa5bafff8c4eebdc62e5121daf77":[6,0,4,94], +"boot_8php.html#a400519fa181591cd6fdbb8f25fbcba0a":[6,0,4,54], +"boot_8php.html#a40d885b2cfd736aab4234ae641ca4dfb":[6,0,4,139], "boot_8php.html#a423505ab8dbd8e39d04ae3fe1374102b":[6,0,4,220], "boot_8php.html#a43296b1b4398aacbf92a4b2d56bab91e":[6,0,4,197], -"boot_8php.html#a43c6c7d84d880e9500bd4f8f8ecc5731":[6,0,4,92], +"boot_8php.html#a43c6c7d84d880e9500bd4f8f8ecc5731":[6,0,4,93], "boot_8php.html#a444ce608ce34efb82ee11852f36e825f":[6,0,4,173], -"boot_8php.html#a44ae1542a805ffd7f826fb511db07374":[6,0,4,159], -"boot_8php.html#a44d069c8a1cfcc6d2007c506a17ff28f":[6,0,4,74], +"boot_8php.html#a44ae1542a805ffd7f826fb511db07374":[6,0,4,160], +"boot_8php.html#a44d069c8a1cfcc6d2007c506a17ff28f":[6,0,4,75], "boot_8php.html#a458e19af801bc4b0d1f1ce1a6d9e857e":[6,0,4,166], "boot_8php.html#a45b12aefab9675baffc7a07a09486db8":[6,0,4,276], "boot_8php.html#a49f2a70b3b43aa904223a8d19e986a47":[6,0,4,185], -"boot_8php.html#a4a12ce5de39789b0361e308d89925a20":[6,0,4,109], +"boot_8php.html#a4a12ce5de39789b0361e308d89925a20":[6,0,4,110], "boot_8php.html#a4a49b29838ef2c45ab3556b52baec6a4":[6,0,4,245], "boot_8php.html#a4bfe22e163657690dfb6d5b1d04cb47e":[6,0,4,184], "boot_8php.html#a4c02d88e66852a01bd5a1feecb7c3ce3":[6,0,4,6], "boot_8php.html#a4edce16cb7f21cdafa1e85bf63d713e6":[6,0,4,218], -"boot_8php.html#a4f507a5996dbb3da148add0339a40d5a":[6,0,4,59], +"boot_8php.html#a4f507a5996dbb3da148add0339a40d5a":[6,0,4,60], "boot_8php.html#a4fefd7486d3b888a05cfd3dc9575f115":[6,0,4,241], "boot_8php.html#a505410c7edc5f5bb5fa227b98359793e":[6,0,4,209], "boot_8php.html#a525ca93ff35d3535d1a2b8ba57876afa":[6,0,4,164], -"boot_8php.html#a52b599cd13e152ebc80d7e4413683195":[6,0,4,42], -"boot_8php.html#a53e4bdb6f225da55115acb9277f75e53":[6,0,4,85], -"boot_8php.html#a5542c5c2806ab8bca04bad53d47b5209":[6,0,4,34], +"boot_8php.html#a52b599cd13e152ebc80d7e4413683195":[6,0,4,43], +"boot_8php.html#a53e4bdb6f225da55115acb9277f75e53":[6,0,4,86], +"boot_8php.html#a5542c5c2806ab8bca04bad53d47b5209":[6,0,4,35], "boot_8php.html#a56fd673eaa7014150297ce1162502db5":[6,0,4,201], "boot_8php.html#a57eee7352714c004d36c26dda74af73e":[6,0,4,240], "boot_8php.html#a5a681a672e007cdc22b43345d71f07c6":[6,0,4,290], -"boot_8php.html#a5ab6181607a090bcdbaa13b15b85aba1":[6,0,4,19], -"boot_8php.html#a5ae728ac966ea1d3525a19e7fec59434":[6,0,4,64], +"boot_8php.html#a5ab6181607a090bcdbaa13b15b85aba1":[6,0,4,20], +"boot_8php.html#a5ae728ac966ea1d3525a19e7fec59434":[6,0,4,65], "boot_8php.html#a5b043b7fdcfd4e8c9c3747574afc6caa":[6,0,4,191], "boot_8php.html#a5b8484922918946d041e5e0515dbe718":[6,0,4,214], -"boot_8php.html#a5c3747e0f505f0d5271dc4c54e3feaf4":[6,0,4,82], +"boot_8php.html#a5c3747e0f505f0d5271dc4c54e3feaf4":[6,0,4,83], "boot_8php.html#a5df5359090d1f8e898c36d7cf8878ad2":[6,0,4,171], "boot_8php.html#a5e322a2a2d0f51924c0b2e874988e640":[6,0,4,215], -"boot_8php.html#a5fbebdf7a1c0ea8f904dbd9d78c2c06c":[6,0,4,32], -"boot_8php.html#a623e49c79943f3e7bdb770d021683cf7":[6,0,4,18], -"boot_8php.html#a6252d8eca67c689d9035ec6da544cf46":[6,0,4,24], -"boot_8php.html#a62c832a95e38b1fa23e6cef39521b7d5":[6,0,4,78], -"boot_8php.html#a639f079bf28f7bbb2769fee651d76dd8":[6,0,4,107], -"boot_8php.html#a64617d4655804de2a3c86501ab4fdbfd":[6,0,4,272], -"boot_8php.html#a6626f383c3d2d459f731ab8b4f237d16":[6,0,4,177] +"boot_8php.html#a5fbebdf7a1c0ea8f904dbd9d78c2c06c":[6,0,4,33], +"boot_8php.html#a623e49c79943f3e7bdb770d021683cf7":[6,0,4,19], +"boot_8php.html#a6252d8eca67c689d9035ec6da544cf46":[6,0,4,25], +"boot_8php.html#a62c832a95e38b1fa23e6cef39521b7d5":[6,0,4,79], +"boot_8php.html#a639f079bf28f7bbb2769fee651d76dd8":[6,0,4,108], +"boot_8php.html#a64617d4655804de2a3c86501ab4fdbfd":[6,0,4,272] }; diff --git a/doc/html/navtreeindex1.js b/doc/html/navtreeindex1.js index b549202c4..b1e24009e 100644 --- a/doc/html/navtreeindex1.js +++ b/doc/html/navtreeindex1.js @@ -1,70 +1,71 @@ var NAVTREEINDEX1 = { -"boot_8php.html#a6788e99021ec8ffb0fa94d651f22a322":[6,0,4,147], -"boot_8php.html#a68d1d5bc9c7ccb663dc671b48c66df11":[6,0,4,150], -"boot_8php.html#a68eebe493e6f729ffd1aeda7a4b11155":[6,0,4,45], -"boot_8php.html#a6969947145a139ec374ce098224d8e81":[6,0,4,153], +"boot_8php.html#a6626f383c3d2d459f731ab8b4f237d16":[6,0,4,177], +"boot_8php.html#a6788e99021ec8ffb0fa94d651f22a322":[6,0,4,148], +"boot_8php.html#a68d1d5bc9c7ccb663dc671b48c66df11":[6,0,4,151], +"boot_8php.html#a68eebe493e6f729ffd1aeda7a4b11155":[6,0,4,46], +"boot_8php.html#a6969947145a139ec374ce098224d8e81":[6,0,4,154], "boot_8php.html#a69aac276ed82e010dc382b16ab4d59e1":[6,0,4,257], "boot_8php.html#a6b14a31a8aa9f3452a13383f413bffa2":[6,0,4,244], "boot_8php.html#a6b31dd451bc6c37fe7c9c766ff385aaf":[6,0,4,238], -"boot_8php.html#a6b9909db6a7ec80ec6fdd40ba74014dd":[6,0,4,104], -"boot_8php.html#a6c5e9e293c8242dcb9bc2c3ea2fee2c9":[6,0,4,96], +"boot_8php.html#a6b9909db6a7ec80ec6fdd40ba74014dd":[6,0,4,105], +"boot_8php.html#a6c5e9e293c8242dcb9bc2c3ea2fee2c9":[6,0,4,97], "boot_8php.html#a6df1102664f64b274810db85197c2755":[6,0,4,224], -"boot_8php.html#a6e57d913634d033b4d5ad72d99fd3e9d":[6,0,4,134], +"boot_8php.html#a6e57d913634d033b4d5ad72d99fd3e9d":[6,0,4,135], "boot_8php.html#a6ee7a72d558d1851bbb9e3cdde377932":[6,0,4,219], -"boot_8php.html#a7037bcbca223395c06bc67f65024de7a":[6,0,4,105], +"boot_8php.html#a7037bcbca223395c06bc67f65024de7a":[6,0,4,106], "boot_8php.html#a7176c0f9f1c98421b97735d892cf6252":[6,0,4,256], "boot_8php.html#a718a801b0be6cbaef5e519516da12721":[6,0,4,170], -"boot_8php.html#a719c7f3972d5f9268f37a41c76cd4ef6":[6,0,4,28], +"boot_8php.html#a719c7f3972d5f9268f37a41c76cd4ef6":[6,0,4,29], "boot_8php.html#a7236b2cdcf59f02a42302e893a99013b":[6,0,4,192], -"boot_8php.html#a749144d8dd9c1366596a0213c277d050":[6,0,4,140], -"boot_8php.html#a74bf27f7564c9a37975e7b37d973dcab":[6,0,4,75], +"boot_8php.html#a749144d8dd9c1366596a0213c277d050":[6,0,4,141], +"boot_8php.html#a74bf27f7564c9a37975e7b37d973dcab":[6,0,4,76], "boot_8php.html#a75a90b0eadd0df510f7e63210733634d":[6,0,4,2], "boot_8php.html#a75fc600186b13c3b25e661afefb5eac8":[6,0,4,280], "boot_8php.html#a768f00b7d66be0daf7ef4eea2e862006":[6,0,4,4], -"boot_8php.html#a774f0f792ebfec1e774c5a17bb9d5966":[6,0,4,77], -"boot_8php.html#a781916f83fcc8ff1035649afa45f0292":[6,0,4,90], +"boot_8php.html#a774f0f792ebfec1e774c5a17bb9d5966":[6,0,4,78], +"boot_8php.html#a781916f83fcc8ff1035649afa45f0292":[6,0,4,91], "boot_8php.html#a78849a1bf8ce8d9804b4cbb502e8f383":[6,0,4,247], -"boot_8php.html#a7a8ba64d089cc0412c59a2eefc6d655c":[6,0,4,120], -"boot_8php.html#a7aa57438db03834aaa0b468bdce773a6":[6,0,4,68], -"boot_8php.html#a7af107fab8d62b9a73801713b774ed30":[6,0,4,139], +"boot_8php.html#a7a8ba64d089cc0412c59a2eefc6d655c":[6,0,4,121], +"boot_8php.html#a7aa57438db03834aaa0b468bdce773a6":[6,0,4,69], +"boot_8php.html#a7af107fab8d62b9a73801713b774ed30":[6,0,4,140], "boot_8php.html#a7b8f8ad9dbe82711257d23891ef6b133":[6,0,4,172], -"boot_8php.html#a7bff2278e68a71e524afd1c7c951e1e3":[6,0,4,72], -"boot_8php.html#a7c286add8961fd2d79216314cd4aadd8":[6,0,4,112], -"boot_8php.html#a7c2eb822d50e1554bf5c32861f36342b":[6,0,4,60], +"boot_8php.html#a7bff2278e68a71e524afd1c7c951e1e3":[6,0,4,73], +"boot_8php.html#a7c286add8961fd2d79216314cd4aadd8":[6,0,4,113], +"boot_8php.html#a7c2eb822d50e1554bf5c32861f36342b":[6,0,4,61], "boot_8php.html#a7ed4581ab66ebcde97f6b3730856b028":[6,0,4,174], -"boot_8php.html#a7eeb83e15968f7a6cc5937d493815773":[6,0,4,47], -"boot_8php.html#a7f3474fec541e261fc8dff47313c4017":[6,0,4,50], -"boot_8php.html#a7f4264232dbb6c3b41f2617deecb1866":[6,0,4,87], -"boot_8php.html#a7fc4b291a7cdaa48b38e27344ea183cf":[6,0,4,123], +"boot_8php.html#a7eeb83e15968f7a6cc5937d493815773":[6,0,4,48], +"boot_8php.html#a7f3474fec541e261fc8dff47313c4017":[6,0,4,51], +"boot_8php.html#a7f4264232dbb6c3b41f2617deecb1866":[6,0,4,88], +"boot_8php.html#a7fc4b291a7cdaa48b38e27344ea183cf":[6,0,4,124], "boot_8php.html#a8231d115060d41a9c2a677f2c86f10ed":[6,0,4,211], -"boot_8php.html#a84057c5bfa1bca5fba8497fe005ee4d8":[6,0,4,54], -"boot_8php.html#a845891f82bf6edd7fa2d578b66703112":[6,0,4,117], -"boot_8php.html#a84f48897059bbd4a8738d7ee4cec6688":[6,0,4,58], +"boot_8php.html#a84057c5bfa1bca5fba8497fe005ee4d8":[6,0,4,55], +"boot_8php.html#a845891f82bf6edd7fa2d578b66703112":[6,0,4,118], +"boot_8php.html#a84f48897059bbd4a8738d7ee4cec6688":[6,0,4,59], "boot_8php.html#a852d4036a3bed66af1534d014c4ecde2":[6,0,4,222], -"boot_8php.html#a8663f32171568489dbb2a01dd00371f8":[6,0,4,130], -"boot_8php.html#a87b0f279f8413c7e4d805c5d85f20d34":[6,0,4,122], +"boot_8php.html#a8663f32171568489dbb2a01dd00371f8":[6,0,4,131], +"boot_8php.html#a87b0f279f8413c7e4d805c5d85f20d34":[6,0,4,123], "boot_8php.html#a882b666adfe21f035a0f8c02806066d6":[6,0,4,271], "boot_8php.html#a8892374789fd261eb32a7969d934a14a":[6,0,4,270], "boot_8php.html#a8905fde0a5b7882bdc083b20d9b34701":[6,0,4,190], "boot_8php.html#a899d24fd074594ceebbf72e1feff335f":[6,0,4,16], -"boot_8php.html#a8a60cc38bb567765fd926fef70205f16":[6,0,4,101], +"boot_8php.html#a8a60cc38bb567765fd926fef70205f16":[6,0,4,102], "boot_8php.html#a8bb0395933b5e886f086f6a2fb0bfa55":[6,0,4,242], -"boot_8php.html#a8c9dce0ef27b35397e29298eb966f7f7":[6,0,4,133], -"boot_8php.html#a8da836617174eed9fc2ac8054125354b":[6,0,4,127], +"boot_8php.html#a8c9dce0ef27b35397e29298eb966f7f7":[6,0,4,134], +"boot_8php.html#a8da836617174eed9fc2ac8054125354b":[6,0,4,128], "boot_8php.html#a8df201788c9dd0ca91384e3a14c08bce":[6,0,4,249], "boot_8php.html#a8fdcc4ffb365a3267bd02ce8a8d466d6":[6,0,4,288], -"boot_8php.html#a9255af5ae9c887520091ea04763c1a88":[6,0,4,31], +"boot_8php.html#a9255af5ae9c887520091ea04763c1a88":[6,0,4,32], "boot_8php.html#a926cad0b3d8b9d9ee5da1898fc063ba3":[6,0,4,11], -"boot_8php.html#a93823d15ae07548a4c49de88d325cd26":[6,0,4,154], -"boot_8php.html#a939de9a99278f4fd7dcd0ee67f243f08":[6,0,4,131], -"boot_8php.html#a949116d9a295b214293006c060ca4848":[6,0,4,129], +"boot_8php.html#a93823d15ae07548a4c49de88d325cd26":[6,0,4,155], +"boot_8php.html#a939de9a99278f4fd7dcd0ee67f243f08":[6,0,4,132], +"boot_8php.html#a949116d9a295b214293006c060ca4848":[6,0,4,130], "boot_8php.html#a9690d73434125ce594a1f5e7c2a4f7c0":[6,0,4,283], "boot_8php.html#a96ad56755a21e1361dbd7bf93c9e7ff4":[6,0,4,254], -"boot_8php.html#a97769915c9f14adc4f8ab1ea2cecfd90":[6,0,4,17], +"boot_8php.html#a97769915c9f14adc4f8ab1ea2cecfd90":[6,0,4,18], "boot_8php.html#a981d46380f9f23c308bac1f9cb00dc5b":[6,0,4,204], "boot_8php.html#a99a4a17cb644e7e6826ea07ecaf09777":[6,0,4,243], -"boot_8php.html#a9c80420e5a063a4a87ce4831f086134d":[6,0,4,49], +"boot_8php.html#a9c80420e5a063a4a87ce4831f086134d":[6,0,4,50], "boot_8php.html#a9cbab4ee728e9a8b4ce952bae643044e":[6,0,4,5], "boot_8php.html#a9cc986b4f9dd6558cbb2e25aadbfd964":[6,0,4,234], "boot_8php.html#a9d01ef178b72b145016cca1393415bc4":[6,0,4,205], @@ -72,54 +73,54 @@ var NAVTREEINDEX1 = "boot_8php.html#a9eeb8989272d5ff804a616898bb13659":[6,0,4,273], "boot_8php.html#a9ff652e5cb83cd11cbb0350844e7b28f":[6,0,4,233], "boot_8php.html#aa17a4f9c63f5cbc5c06f1066b6aebc42":[6,0,4,193], -"boot_8php.html#aa1e828bbbcba170265eb2668d8daf42e":[6,0,4,25], +"boot_8php.html#aa1e828bbbcba170265eb2668d8daf42e":[6,0,4,26], "boot_8php.html#aa275653b9c87abc7391bb8040c1c2de9":[6,0,4,212], -"boot_8php.html#aa3425e2de85b08f7041656d3a8502cb6":[6,0,4,44], -"boot_8php.html#aa3679df31c8dad1b71816b0322d5baff":[6,0,4,161], +"boot_8php.html#aa3425e2de85b08f7041656d3a8502cb6":[6,0,4,45], +"boot_8php.html#aa3679df31c8dad1b71816b0322d5baff":[6,0,4,162], "boot_8php.html#aa4221641e5c21db69fa52c426b9017f5":[6,0,4,9], -"boot_8php.html#aa544a6c078130d0967a1f4ed8ce0a2d2":[6,0,4,158], -"boot_8php.html#aa589421267f0c2f0d643f727792cce35":[6,0,4,116], -"boot_8php.html#aa74438cf71e48e37bf7b440b94243985":[6,0,4,89], -"boot_8php.html#aa8a2b61e70900139d1ca28e46f1da49d":[6,0,4,98], +"boot_8php.html#aa544a6c078130d0967a1f4ed8ce0a2d2":[6,0,4,159], +"boot_8php.html#aa589421267f0c2f0d643f727792cce35":[6,0,4,117], +"boot_8php.html#aa74438cf71e48e37bf7b440b94243985":[6,0,4,90], +"boot_8php.html#aa8a2b61e70900139d1ca28e46f1da49d":[6,0,4,99], "boot_8php.html#aa9244fc9cc221980c07a20cc534111be":[6,0,4,239], -"boot_8php.html#aad33b494084f729b6ee3b0bc457718a1":[6,0,4,144], +"boot_8php.html#aad33b494084f729b6ee3b0bc457718a1":[6,0,4,145], "boot_8php.html#aae6c941bde5fd6fce07e51dba7326ead":[6,0,4,221], -"boot_8php.html#aaf9b76832ee5f85e56466af162ba8a14":[6,0,4,69], +"boot_8php.html#aaf9b76832ee5f85e56466af162ba8a14":[6,0,4,70], "boot_8php.html#ab21fb0f3e6b962419955c6fc7f26734f":[6,0,4,196], -"boot_8php.html#ab28dc518fa90b6f617dd8c564eb4f35f":[6,0,4,121], +"boot_8php.html#ab28dc518fa90b6f617dd8c564eb4f35f":[6,0,4,122], "boot_8php.html#ab2d0e8a9b81ee548ef2ce8e4560da2f6":[6,0,4,223], -"boot_8php.html#ab346a2ece14993861f3e4206befa94f0":[6,0,4,33], +"boot_8php.html#ab346a2ece14993861f3e4206befa94f0":[6,0,4,34], "boot_8php.html#ab3920c2f3cd64802c0b7ff625c3b2ea8":[6,0,4,217], "boot_8php.html#ab4bc9c50ecc927b92d519e36562b0df0":[6,0,4,246], "boot_8php.html#ab4bddb41a0cf407178ec5278b950c393":[6,0,4,189], "boot_8php.html#ab51965fabe54dc031e9a0ce1142ee83e":[6,0,4,228], -"boot_8php.html#ab54b24cc302e1a42a67a49d788b6b764":[6,0,4,115], -"boot_8php.html#ab55b16ae7fc19fafe5afaedd49163bbf":[6,0,4,146], -"boot_8php.html#ab5ddbe69d3d03acd06e1fb281488cb78":[6,0,4,56], +"boot_8php.html#ab54b24cc302e1a42a67a49d788b6b764":[6,0,4,116], +"boot_8php.html#ab55b16ae7fc19fafe5afaedd49163bbf":[6,0,4,147], +"boot_8php.html#ab5ddbe69d3d03acd06e1fb281488cb78":[6,0,4,57], "boot_8php.html#ab724491497ab2618b23a01d5da60aec0":[6,0,4,207], "boot_8php.html#ab79b8b4555cae20d03f8200666d89d63":[6,0,4,7], -"boot_8php.html#ab7d65a7e7417825a4db62906bb600729":[6,0,4,100], +"boot_8php.html#ab7d65a7e7417825a4db62906bb600729":[6,0,4,101], "boot_8php.html#ab9dca53455cd157d3c6ba2bdecdbd22d":[6,0,4,282], -"boot_8php.html#aba208673515cbb8a55e5fa4a1da99fda":[6,0,4,38], +"boot_8php.html#aba208673515cbb8a55e5fa4a1da99fda":[6,0,4,39], "boot_8php.html#abbf5ac24eb8aeedb862f618ee0d21e86":[6,0,4,250], "boot_8php.html#abc0a90a1a77f5b668aa7e4b57d1776a7":[6,0,4,3], "boot_8php.html#abd7bb40da9cc073297e49736b338ca07":[6,0,4,277], -"boot_8php.html#abdcdfc873ace4e0902177bad934de0c0":[6,0,4,67], -"boot_8php.html#abeb4d86e17cefa8584f1244e2183b0e1":[6,0,4,118], -"boot_8php.html#abedd940e664017c61b48c6efa31d0cb8":[6,0,4,99], -"boot_8php.html#ac01230c7655e0705b2e99c9bc03c4450":[6,0,4,128], -"boot_8php.html#ac17fc8a416ea79e9d5cb4dc9a8ff8c5c":[6,0,4,23], +"boot_8php.html#abdcdfc873ace4e0902177bad934de0c0":[6,0,4,68], +"boot_8php.html#abeb4d86e17cefa8584f1244e2183b0e1":[6,0,4,119], +"boot_8php.html#abedd940e664017c61b48c6efa31d0cb8":[6,0,4,100], +"boot_8php.html#ac01230c7655e0705b2e99c9bc03c4450":[6,0,4,129], +"boot_8php.html#ac17fc8a416ea79e9d5cb4dc9a8ff8c5c":[6,0,4,24], "boot_8php.html#ac195fc9003298923ea81f144388e24b1":[6,0,4,175], "boot_8php.html#ac43182e0d8bae7576a30b603774974f8":[6,0,4,248], -"boot_8php.html#ac59a18a4838710d6c2de37aed6b21f03":[6,0,4,97], -"boot_8php.html#ac5e74f899f6e98d8e91b14ba1c08bc08":[6,0,4,26], -"boot_8php.html#ac608a34f3bc180e7724192e0fd31f9b0":[6,0,4,36], -"boot_8php.html#ac8400313df2c831653f9036f71ebd86d":[6,0,4,57], +"boot_8php.html#ac59a18a4838710d6c2de37aed6b21f03":[6,0,4,98], +"boot_8php.html#ac5e74f899f6e98d8e91b14ba1c08bc08":[6,0,4,27], +"boot_8php.html#ac608a34f3bc180e7724192e0fd31f9b0":[6,0,4,37], +"boot_8php.html#ac8400313df2c831653f9036f71ebd86d":[6,0,4,58], "boot_8php.html#ac86615ddc0763a00f5311c90e991730c":[6,0,4,284], -"boot_8php.html#ac890557fedc5b5a3b1d996249b1e1a20":[6,0,4,124], -"boot_8php.html#ac99fc4d040764eac1736bec6973556fe":[6,0,4,126], +"boot_8php.html#ac890557fedc5b5a3b1d996249b1e1a20":[6,0,4,125], +"boot_8php.html#ac99fc4d040764eac1736bec6973556fe":[6,0,4,127], "boot_8php.html#aca08bc4f1554ba877500f6abcc99e1e8":[6,0,4,203], -"boot_8php.html#aca47505b8732177f52bb2d647eb2741c":[6,0,4,35], +"boot_8php.html#aca47505b8732177f52bb2d647eb2741c":[6,0,4,36], "boot_8php.html#aca5e42678e178c6b9034610d66666fd7":[6,0,4,13], "boot_8php.html#acc4e0c910af066148b810e5fde55fff1":[6,0,4,8], "boot_8php.html#acca19aae62e1a6951a856b945de20d67":[6,0,4,178], @@ -127,56 +128,55 @@ var NAVTREEINDEX1 = "boot_8php.html#acd877c405b06b348b37b6f7e62a211e9":[6,0,4,235], "boot_8php.html#ace6d70ac290397ddd40e561fd0831858":[6,0,4,269], "boot_8php.html#ace83842dbeb84f7ed9ac59a9f57a7c32":[6,0,4,210], -"boot_8php.html#aced60c7285192e80b7c4757e45a7f1e3":[6,0,4,66], -"boot_8php.html#ad0876e837cf3fad8a26417e315f6e2c8":[6,0,4,157], +"boot_8php.html#aced60c7285192e80b7c4757e45a7f1e3":[6,0,4,67], +"boot_8php.html#ad0876e837cf3fad8a26417e315f6e2c8":[6,0,4,158], "boot_8php.html#ad11f30a6590d3d77f0c5e1e3909af8f5":[6,0,4,168], "boot_8php.html#ad206598b909e8eb67eb0e0bb5ef69c13":[6,0,4,10], -"boot_8php.html#ad302cb26b838898d475f57f61b0fcc9f":[6,0,4,73], -"boot_8php.html#ad34c1547020a305915bcc39707744690":[6,0,4,88], -"boot_8php.html#ad4c9dc2c8a82e8f52b7404c1655eab44":[6,0,4,29], +"boot_8php.html#ad302cb26b838898d475f57f61b0fcc9f":[6,0,4,74], +"boot_8php.html#ad34c1547020a305915bcc39707744690":[6,0,4,89], +"boot_8php.html#ad4c9dc2c8a82e8f52b7404c1655eab44":[6,0,4,30], "boot_8php.html#ad789aef3cb95fc1eb36be7c4283d0137":[6,0,4,230], "boot_8php.html#ad8887b49bbb02dd30b4eb9f6c7773c63":[6,0,4,258], "boot_8php.html#ad88a70ec62e08d590123d3697dfe64d5":[6,0,4,252], -"boot_8php.html#ada72d88ae39a7e3b45baea201cb49a29":[6,0,4,94], -"boot_8php.html#adaeb4f590c56326b2dca3b19f31b6272":[6,0,4,141], +"boot_8php.html#ada72d88ae39a7e3b45baea201cb49a29":[6,0,4,95], +"boot_8php.html#adaeb4f590c56326b2dca3b19f31b6272":[6,0,4,142], "boot_8php.html#adca48aee78465ae3064ca4432c0d87b5":[6,0,4,261], -"boot_8php.html#add517a0958ac684792c62142a3877f81":[6,0,4,39], -"boot_8php.html#adfb2fc7be5a4226c0a8e24131da9d498":[6,0,4,22], -"boot_8php.html#ae0da3ca0f54d75d22c71e007331f8d06":[6,0,4,106], +"boot_8php.html#add517a0958ac684792c62142a3877f81":[6,0,4,40], +"boot_8php.html#adfb2fc7be5a4226c0a8e24131da9d498":[6,0,4,23], +"boot_8php.html#ae0da3ca0f54d75d22c71e007331f8d06":[6,0,4,107], "boot_8php.html#ae37444eaa42705185080ccf3e670cbc2":[6,0,4,268], "boot_8php.html#ae3cef7b63e25e7bafea3fcf6b99fad0e":[6,0,4,186], -"boot_8php.html#ae4861de36017fe399c1839f778bad9f5":[6,0,4,160], -"boot_8php.html#ae543d0b69f816b52e91167fc19d3fddc":[6,0,4,163], +"boot_8php.html#ae4861de36017fe399c1839f778bad9f5":[6,0,4,161], "boot_8php.html#ae94f7c7c0909629a75aed1c41f10bc95":[6,0,4,194], "boot_8php.html#aea392cb26ed617f3a8cde648385b5df0":[6,0,4,281], -"boot_8php.html#aea7fc57a4d8e9dcb42f2601b0b9b761c":[6,0,4,27], +"boot_8php.html#aea7fc57a4d8e9dcb42f2601b0b9b761c":[6,0,4,28], "boot_8php.html#aead84fa27d7516b855220fe004964a45":[6,0,4,274], -"boot_8php.html#aeb1039302affcbe7e8872c01c08c88f8":[6,0,4,51], +"boot_8php.html#aeb1039302affcbe7e8872c01c08c88f8":[6,0,4,52], "boot_8php.html#aec36f8fcd4cb14a52934590b3d6666b4":[6,0,4,232], "boot_8php.html#aecaa1b6945b317ba8f1daf4af2aed8e6":[6,0,4,262], "boot_8php.html#aed0dfb35f7dd00dc9e4f868ea7f7ff53":[6,0,4,169], -"boot_8php.html#aedfb9501ed408278667995524e0d15cf":[6,0,4,102], +"boot_8php.html#aedfb9501ed408278667995524e0d15cf":[6,0,4,103], "boot_8php.html#aee324eca9de4e0fedf01ab5f92e27c67":[6,0,4,181], "boot_8php.html#aef4b6c558c68c88c10f13c5a00c20e3d":[6,0,4,195], -"boot_8php.html#aefba06f1c0842036329033e7567ecf6d":[6,0,4,143], -"boot_8php.html#aefe573c3c7b0d37fbff264bbae79d673":[6,0,4,113], -"boot_8php.html#aefecf8599036df7f1b95d6820e0e2fa4":[6,0,4,30], +"boot_8php.html#aefba06f1c0842036329033e7567ecf6d":[6,0,4,144], +"boot_8php.html#aefe573c3c7b0d37fbff264bbae79d673":[6,0,4,114], +"boot_8php.html#aefecf8599036df7f1b95d6820e0e2fa4":[6,0,4,31], "boot_8php.html#af33d1b2e98a1e21af672005525d46dfe":[6,0,4,265], "boot_8php.html#af3905ea8f8568d0236db13fca40514e3":[6,0,4,188], -"boot_8php.html#af3a4271630aabd8be592213f925d6a36":[6,0,4,61], -"boot_8php.html#af3bdfc20979c16f15bb9c60446a480f9":[6,0,4,52], +"boot_8php.html#af3a4271630aabd8be592213f925d6a36":[6,0,4,62], +"boot_8php.html#af3bdfc20979c16f15bb9c60446a480f9":[6,0,4,53], "boot_8php.html#af3ff14985bffbd951a6ea356b7ec3007":[6,0,4,237], -"boot_8php.html#af489d0c3166551b93e63a79ff2c9be35":[6,0,4,148], +"boot_8php.html#af489d0c3166551b93e63a79ff2c9be35":[6,0,4,149], "boot_8php.html#af6937db5f581d006bf4a5c3d9c7e0461":[6,0,4,208], "boot_8php.html#af6b3de425e5849c73370a484c44607a3":[6,0,4,167], -"boot_8php.html#af6f6f6f40139f12fc09ec47373b30919":[6,0,4,91], +"boot_8php.html#af6f6f6f40139f12fc09ec47373b30919":[6,0,4,92], "boot_8php.html#af86c651547aa8f9e549ee40a09455549":[6,0,4,260], "boot_8php.html#af8c0cb0744c9a6b5d6d3baafb1f1e71d":[6,0,4,200], "boot_8php.html#afaf93b7026f784b113b4f8921745891e":[6,0,4,182], "boot_8php.html#afb97615e985a013799839b68b99018d7":[6,0,4,266], -"boot_8php.html#afbb1fe1b2c8c730ec8e08da93b6512c4":[6,0,4,48], -"boot_8php.html#afe084c30a1810c10442edb4fbcbc0086":[6,0,4,83], -"boot_8php.html#afe63ae69ba55299f813766e54df06ede":[6,0,4,152], +"boot_8php.html#afbb1fe1b2c8c730ec8e08da93b6512c4":[6,0,4,49], +"boot_8php.html#afe084c30a1810c10442edb4fbcbc0086":[6,0,4,84], +"boot_8php.html#afe63ae69ba55299f813766e54df06ede":[6,0,4,153], "boot_8php.html#afe88b920aa285982edb817a0dd44eb37":[6,0,4,14], "boot_8php.html#afef254290febac854c85fc698d9483a6":[6,0,4,291], "boot_8php.html#aff210e8403dd72368522b17fb6e5d4e7":[6,0,4,226], diff --git a/doc/html/navtreeindex3.js b/doc/html/navtreeindex3.js index 607b3c58a..a73928279 100644 --- a/doc/html/navtreeindex3.js +++ b/doc/html/navtreeindex3.js @@ -127,18 +127,29 @@ var NAVTREEINDEX3 = "cronhooks_8php.html#a4c4c1bbec4ecc9a0efa00dd6afd2c0ca":[6,0,0,25,0], "crypto_8php.html":[6,0,0,26], "crypto_8php.html#a0781202b0a43b82426929cc87c2fa2b5":[6,0,0,26,5], +"crypto_8php.html#a0e941b6b18ff895d1a2448741abf2ef2":[6,0,0,26,17], "crypto_8php.html#a2148d7aac7b30c720f7ebda7e9790286":[6,0,0,26,2], +"crypto_8php.html#a2a3fae7caca27f86d158eeaf69b6f287":[6,0,0,26,19], "crypto_8php.html#a32fc08d57a5694f94d8543ecbb03323c":[6,0,0,26,4], -"crypto_8php.html#a4d15d19b446dbf47804675df7c85e2a9":[6,0,0,26,7], +"crypto_8php.html#a35bc357c93f4ddc67ef377620b0349e8":[6,0,0,26,12], +"crypto_8php.html#a4d15d19b446dbf47804675df7c85e2a9":[6,0,0,26,14], +"crypto_8php.html#a573f02517abe4ac9241268263063b2a0":[6,0,0,26,9], "crypto_8php.html#a5c61821d205f95f127114159cbffa764":[6,0,0,26,1], -"crypto_8php.html#a7427a18417341aa35e2207bfa205e432":[6,0,0,26,10], -"crypto_8php.html#a920e5f222d0020f47556033d8b2b6552":[6,0,0,26,11], -"crypto_8php.html#aae0ab70d6a199b29555b1ac3cf250d6a":[6,0,0,26,6], -"crypto_8php.html#ab4f21d8f6b8ece0915e7c8bb73379f96":[6,0,0,26,12], +"crypto_8php.html#a630e1574554f34e7c38511585d9e71a2":[6,0,0,26,6], +"crypto_8php.html#a7427a18417341aa35e2207bfa205e432":[6,0,0,26,18], +"crypto_8php.html#a798368843cdd9bb08386b48e53e29e8c":[6,0,0,26,11], +"crypto_8php.html#a7f7e650aaeaa3832580a73eb00966b26":[6,0,0,26,22], +"crypto_8php.html#a890b443f80f0968fb9eabd93fc99dbb5":[6,0,0,26,13], +"crypto_8php.html#a9191447cc46f0b4eaba3273e313994d5":[6,0,0,26,23], +"crypto_8php.html#a920e5f222d0020f47556033d8b2b6552":[6,0,0,26,20], +"crypto_8php.html#aae0ab70d6a199b29555b1ac3cf250d6a":[6,0,0,26,10], +"crypto_8php.html#ab4f21d8f6b8ece0915e7c8bb73379f96":[6,0,0,26,21], "crypto_8php.html#ac852ee41392d1358c3a54d54935e0bf9":[6,0,0,26,0], -"crypto_8php.html#ac95ac3b1b23b65b04a86613d4206ae85":[6,0,0,26,9], +"crypto_8php.html#ac95ac3b1b23b65b04a86613d4206ae85":[6,0,0,26,16], "crypto_8php.html#aca7c3a574bfb6c6ef1f2403a56823914":[6,0,0,26,3], -"crypto_8php.html#ad5e51fd44cff93cfaa07a37e24a5edec":[6,0,0,26,8], +"crypto_8php.html#ad5e51fd44cff93cfaa07a37e24a5edec":[6,0,0,26,15], +"crypto_8php.html#ae5af17db1cb5d7c91d486e1264079839":[6,0,0,26,7], +"crypto_8php.html#af8bbdeaf4abed7b40365d301e6013c85":[6,0,0,26,8], "dark_8php.html":[6,0,3,1,3,1,2], "darkness_8php.html":[6,0,3,1,0,2,0], "darknessleftaside_8php.html":[6,0,3,1,0,2,1], @@ -180,19 +191,19 @@ var NAVTREEINDEX3 = "diaspora_8php.html#a0b3628a5e53332c3d3196b689fe2b94d":[6,0,0,29,23], "diaspora_8php.html#a0fb2abe304aae19efc040a5e6b917829":[6,0,0,29,1], "diaspora_8php.html#a1704748aa2384c73e43f10e71defd31a":[6,0,0,29,24], -"diaspora_8php.html#a20b968d64ef26afe5cb0cc75a7570a31":[6,0,0,29,13], +"diaspora_8php.html#a20b968d64ef26afe5cb0cc75a7570a31":[6,0,0,29,14], "diaspora_8php.html#a2bf43f6b5890897f425ef4325d34b007":[6,0,0,29,18], "diaspora_8php.html#a33ae0c4606a7df4d801c05507d87f668":[6,0,0,29,25], -"diaspora_8php.html#a5d57518545baa31cf8a85a937a267681":[6,0,0,29,9], -"diaspora_8php.html#a625056c9dab9b9779d0665650e260bb9":[6,0,0,29,7], +"diaspora_8php.html#a5d57518545baa31cf8a85a937a267681":[6,0,0,29,10], +"diaspora_8php.html#a5ed66b910d7b0284f9b3ee04e72306ff":[6,0,0,29,7], "diaspora_8php.html#a6f0a67b6b17503c125af32763be931b7":[6,0,0,29,4], -"diaspora_8php.html#a71fe9bb66626b4197ae018a230778bb2":[6,0,0,29,12], -"diaspora_8php.html#a7cff2f8f11044c1b3a360f20e1bbee46":[6,0,0,29,10], +"diaspora_8php.html#a71fe9bb66626b4197ae018a230778bb2":[6,0,0,29,13], +"diaspora_8php.html#a7cff2f8f11044c1b3a360f20e1bbee46":[6,0,0,29,11], "diaspora_8php.html#a849754ec369e1a60fadae5c14584ca36":[6,0,0,29,3], +"diaspora_8php.html#a858f70153c384f8778082cf7843a19da":[6,0,0,29,8], "diaspora_8php.html#a900abf51398b2ef26cd2cd31c52f1b0f":[6,0,0,29,15], "diaspora_8php.html#a938c7ee808d38725c0988fa6006805b9":[6,0,0,29,19], -"diaspora_8php.html#a978b08b5130bc94cf38ef3a2bcba0e3a":[6,0,0,29,14], -"diaspora_8php.html#a986114ce8d7a582ebd0b5972738e1fc2":[6,0,0,29,31], +"diaspora_8php.html#a9bf7ef4094e0e14f6e2b7fe76ab7ad2e":[6,0,0,29,31], "diaspora_8php.html#aa34d2748bb97e9e193cacd572f335055":[6,0,0,29,27], "diaspora_8php.html#aa4b1cc0bca5c3fe8d11557685e0238a9":[6,0,0,29,29], "diaspora_8php.html#aa704d6aa2ac77be345c0f501168e6e56":[6,0,0,29,28], @@ -200,8 +211,8 @@ var NAVTREEINDEX3 = "diaspora_8php.html#aade0c165fcdded71352c7a67bf6ce37b":[6,0,0,29,30], "diaspora_8php.html#ab99505944728d46585b8312989de533d":[6,0,0,29,5], "diaspora_8php.html#ac1ab782a34552a7c6b4dc961754ed598":[6,0,0,29,17], -"diaspora_8php.html#aca23425928635776dc17927041fc3fa8":[6,0,0,29,11], -"diaspora_8php.html#ad9985cc4214bdfc14878785c838c8690":[6,0,0,29,8], +"diaspora_8php.html#aca23425928635776dc17927041fc3fa8":[6,0,0,29,12], +"diaspora_8php.html#ad9985cc4214bdfc14878785c838c8690":[6,0,0,29,9], "diaspora_8php.html#addaf8f202e52e3f0a49ed05681f9405c":[6,0,0,29,16], "diaspora_8php.html#adef30b6fac948baedcc7194d5d155b5f":[6,0,0,29,2], "diaspora_8php.html#ae6f52efd81fe515cd9912bc8293abf5b":[6,0,0,29,21], @@ -238,16 +249,5 @@ var NAVTREEINDEX3 = "dir_cb8a8f75dcdd0b3fbfcc82e9eda410c5.html":[6,0,3,1,0,1], "dir_d41ce877eb409a4791b288730010abe2.html":[6,0,1], "dir_d44c64559bbebec7f509842c48db8b23.html":[6,0,0], -"dir_d520c5cf583201d9437764f209363c22.html":[6,0,3,1,0], -"dir_f19da925ee886ec38f19b0e8c19779bc.html":[6,0,3,1,0,0], -"dirprofile_8php.html":[6,0,1,24], -"dirprofile_8php.html#a3e1d30d3d93863ff5615f2df4ac7f052":[6,0,1,24,0], -"dirsearch_8php.html":[6,0,1,25], -"dirsearch_8php.html#a3e51964ae3f5ff147403407b65324752":[6,0,1,25,3], -"dirsearch_8php.html#a52bcac49b0e35cc8c6b70066143c2ee2":[6,0,1,25,1], -"dirsearch_8php.html#a7d4cd9890d5ed23c3efc58e2a778a305":[6,0,1,25,0], -"dirsearch_8php.html#a985d410a170549429857af6ff2673149":[6,0,1,25,4], -"dirsearch_8php.html#aa1fb04e1de4f25b63349ac78f94ceb4c":[6,0,1,25,2], -"display_8php.html":[6,0,1,26], -"display_8php.html#a37137c98d47bf3306f4c2bb9f5b60de0":[6,0,1,26,0] +"dir_d520c5cf583201d9437764f209363c22.html":[6,0,3,1,0] }; diff --git a/doc/html/navtreeindex4.js b/doc/html/navtreeindex4.js index b8b6c996d..39fc46897 100644 --- a/doc/html/navtreeindex4.js +++ b/doc/html/navtreeindex4.js @@ -1,5 +1,16 @@ var NAVTREEINDEX4 = { +"dir_f19da925ee886ec38f19b0e8c19779bc.html":[6,0,3,1,0,0], +"dirprofile_8php.html":[6,0,1,24], +"dirprofile_8php.html#a3e1d30d3d93863ff5615f2df4ac7f052":[6,0,1,24,0], +"dirsearch_8php.html":[6,0,1,25], +"dirsearch_8php.html#a3e51964ae3f5ff147403407b65324752":[6,0,1,25,3], +"dirsearch_8php.html#a52bcac49b0e35cc8c6b70066143c2ee2":[6,0,1,25,1], +"dirsearch_8php.html#a7d4cd9890d5ed23c3efc58e2a778a305":[6,0,1,25,0], +"dirsearch_8php.html#a985d410a170549429857af6ff2673149":[6,0,1,25,4], +"dirsearch_8php.html#aa1fb04e1de4f25b63349ac78f94ceb4c":[6,0,1,25,2], +"display_8php.html":[6,0,1,26], +"display_8php.html#a37137c98d47bf3306f4c2bb9f5b60de0":[6,0,1,26,0], "docblox__errorchecker_8php.html":[6,0,2,3], "docblox__errorchecker_8php.html#a1659f0a629d408e0f849dbe4ee061e62":[6,0,2,3,3], "docblox__errorchecker_8php.html#a21b4bbe5aae2d85db33affc7126a67ec":[6,0,2,3,2], @@ -78,37 +89,9 @@ var NAVTREEINDEX4 = "friendica-to-smarty-tpl_8py.html#ae74419b16516956c66f7db714a93a6ac":[6,0,2,5,7], "friendica-to-smarty-tpl_8py.html#aecf730e0884bb4ddc6c0deb1ef85f8eb":[6,0,2,5,4], "friendica-to-smarty-tpl_8py.html#af6b2c793958aae2aadc294577431f749":[6,0,2,5,3], -"frphotohelper_8php.html":[6,0,2,6], -"frphotohelper_8php.html#a1ce9aa56ce28b42f5db69d00d4c78972":[6,0,2,6,16], -"frphotohelper_8php.html#a1fba6794d8decbc7b957710af3179c10":[6,0,2,6,9], -"frphotohelper_8php.html#a2059b37bbca58d2613c70af2c19eddce":[6,0,2,6,18], -"frphotohelper_8php.html#a2d2299040f635cee8d5aac68230dd630":[6,0,2,6,21], -"frphotohelper_8php.html#a44a64913242d4235e332cc69885c1460":[6,0,2,6,6], -"frphotohelper_8php.html#a67e94494731d99ed23b123e95175bc10":[6,0,2,6,1], -"frphotohelper_8php.html#a696b903bbc5c02914bdd402e91826eca":[6,0,2,6,14], -"frphotohelper_8php.html#a6bb04aa9e43d97273fc84b6e308999c5":[6,0,2,6,7], -"frphotohelper_8php.html#a6f16db779ef3ccea921b277b5dc245d1":[6,0,2,6,19], -"frphotohelper_8php.html#a73004ce9cd673c1bfafd1dc351134797":[6,0,2,6,20], -"frphotohelper_8php.html#a83d5f232bed56a5af8173818b0bdf79d":[6,0,2,6,23], -"frphotohelper_8php.html#a88f7360b97eecb65e5e13708a093d172":[6,0,2,6,10], -"frphotohelper_8php.html#a8abe176bc41afd728f32ba8c506cbd98":[6,0,2,6,22], -"frphotohelper_8php.html#ab66e3756cdc86eaa61d42e675092c649":[6,0,2,6,12], -"frphotohelper_8php.html#ab73d7f4f2dae233dd561e7fdaab3a77b":[6,0,2,6,13], -"frphotohelper_8php.html#ab93f92df528f98af0f4511720032b03c":[6,0,2,6,8], -"frphotohelper_8php.html#ac162139c764f53cc07f42b09432549ba":[6,0,2,6,15], -"frphotohelper_8php.html#acaefa2c3b286896f12eb55ae56e154af":[6,0,2,6,2], -"frphotohelper_8php.html#acebf83966ef6d7e5645a6b62ba368f9f":[6,0,2,6,0], -"frphotohelper_8php.html#ad3310ef5d714f2baae2d882a1e22cf05":[6,0,2,6,3], -"frphotohelper_8php.html#ad4237a752a460152a5445abcb50238cf":[6,0,2,6,5], -"frphotohelper_8php.html#ad5fe4c1396829f3ce98eec037db698b2":[6,0,2,6,11], -"frphotohelper_8php.html#adbc68ba8d9b3e0fac2d4c9fb683ef9f6":[6,0,2,6,4], -"frphotohelper_8php.html#aef9f7eafd54f6e36423347bed723c67e":[6,0,2,6,17], -"frphotos_8php.html":[6,0,1,38], -"frphotos_8php.html#a4a33fadb181497eff301ee5132ec61d1":[6,0,1,38,1], -"frphotos_8php.html#a6536248e7dda3f06cf37838064b961a4":[6,0,1,38,0], -"fsuggest_8php.html":[6,0,1,39], -"fsuggest_8php.html#a61ecfe10ce937ed526614f8fd3de3c7d":[6,0,1,39,1], -"fsuggest_8php.html#aa6c49ed4b50a387f1845f36844dd7998":[6,0,1,39,0], +"fsuggest_8php.html":[6,0,1,38], +"fsuggest_8php.html#a61ecfe10ce937ed526614f8fd3de3c7d":[6,0,1,38,1], +"fsuggest_8php.html#aa6c49ed4b50a387f1845f36844dd7998":[6,0,1,38,0], "full_8php.html":[6,0,3,0,2], "full_8php.html#a3987f5547ceb7e36a210a66a06241a5a":[6,0,3,0,2,0], "functions.html":[5,3,0], @@ -185,8 +168,8 @@ var NAVTREEINDEX4 = "globals_0x77.html":[6,1,0,24], "globals_0x78.html":[6,1,0,25], "globals_0x7a.html":[6,1,0,26], -"globals_func.html":[6,1,1,0], "globals_func.html":[6,1,1], +"globals_func.html":[6,1,1,0], "globals_func_0x61.html":[6,1,1,1], "globals_func_0x62.html":[6,1,1,2], "globals_func_0x63.html":[6,1,1,3], @@ -212,8 +195,8 @@ var NAVTREEINDEX4 = "globals_func_0x77.html":[6,1,1,23], "globals_func_0x78.html":[6,1,1,24], "globals_func_0x7a.html":[6,1,1,25], -"globals_vars.html":[6,1,2], "globals_vars.html":[6,1,2,0], +"globals_vars.html":[6,1,2], "globals_vars_0x61.html":[6,1,2,1], "globals_vars_0x63.html":[6,1,2,2], "globals_vars_0x64.html":[6,1,2,3], @@ -238,16 +221,33 @@ var NAVTREEINDEX4 = "gprobe_8php.html":[6,0,0,38], "gprobe_8php.html#adf72cb0a70b5b9d99fdec1cc60e18ed1":[6,0,0,38,0], "greenthumbnails_8php.html":[6,0,3,1,0,2,3], -"hcard_8php.html":[6,0,1,41], -"hcard_8php.html#a3663012f1549849af88aba2bb87388e3":[6,0,1,41,0], -"hcard_8php.html#ac34f26b0e6a37eef44fa49bea135136d":[6,0,1,41,1], -"help_8php.html":[6,0,1,42], -"help_8php.html#a06b2a51aaabed99e53a9b639047c4ce4":[6,0,1,42,1], -"help_8php.html#af055e15f600ffa6fbca9386fdf715224":[6,0,1,42,0], +"hcard_8php.html":[6,0,1,40], +"hcard_8php.html#a3663012f1549849af88aba2bb87388e3":[6,0,1,40,0], +"hcard_8php.html#ac34f26b0e6a37eef44fa49bea135136d":[6,0,1,40,1], +"help_8php.html":[6,0,1,41], +"help_8php.html#a06b2a51aaabed99e53a9b639047c4ce4":[6,0,1,41,1], +"help_8php.html#af055e15f600ffa6fbca9386fdf715224":[6,0,1,41,0], "hierarchy.html":[5,2], -"home_8php.html":[6,0,1,43], -"home_8php.html#aa1cf697851a646755baf537f75334c46":[6,0,1,43,0], -"home_8php.html#ac4642c38b6f23a8d065dd4a75c620bde":[6,0,1,43,1], -"hostxrd_8php.html":[6,0,1,44], -"hostxrd_8php.html#aa37ffc8e7900bc76c4828bd25916db92":[6,0,1,44,0] +"home_8php.html":[6,0,1,42], +"home_8php.html#aa1cf697851a646755baf537f75334c46":[6,0,1,42,0], +"home_8php.html#ac4642c38b6f23a8d065dd4a75c620bde":[6,0,1,42,1], +"hostxrd_8php.html":[6,0,1,43], +"hostxrd_8php.html#aa37ffc8e7900bc76c4828bd25916db92":[6,0,1,43,0], +"html2bbcode_8php.html":[6,0,0,40], +"html2bbcode_8php.html#a39c662b19d318990fee2ba795a55d7a7":[6,0,0,40,3], +"html2bbcode_8php.html#a5ad726995ac4070213abdb3bd09f4837":[6,0,0,40,1], +"html2bbcode_8php.html#a71a07f135d196ec5943b13f7b2e6a9b2":[6,0,0,40,0], +"html2bbcode_8php.html#ad174afe0ccbd8c475e48f8a6ee2f27d8":[6,0,0,40,2], +"html2plain_8php.html":[6,0,0,41], +"html2plain_8php.html#a3214912e3d00cf0a948072daccf16740":[6,0,0,41,0], +"html2plain_8php.html#a56d29b254333d29abb9d96a9a903a4b0":[6,0,0,41,3], +"html2plain_8php.html#ab3e121fa9f3feb16f9f942e705bc6c04":[6,0,0,41,2], +"html2plain_8php.html#ae1c203d0f089d5678d73a6c64a395201":[6,0,0,41,1], +"hubloc_8php.html":[6,0,0,42], +"hubloc_8php.html#ad3d0dcfcfcb347744f7617fe6f5de002":[6,0,0,42,1], +"hubloc_8php.html#aebd244b4616ded022cbbee5e82926951":[6,0,0,42,0], +"identity_8php.html":[6,0,0,43], +"identity_8php.html#a1cf83ac2b645de12868edaa3a5718f05":[6,0,0,43,3], +"identity_8php.html#a224710dfb7465b706c91134247c20afa":[6,0,0,43,11], +"identity_8php.html#a2ab5172eabd375869060c9ad68323f5c":[6,0,0,43,17] }; diff --git a/doc/html/navtreeindex5.js b/doc/html/navtreeindex5.js index ad15f4e7a..6d4c64dce 100644 --- a/doc/html/navtreeindex5.js +++ b/doc/html/navtreeindex5.js @@ -1,22 +1,5 @@ var NAVTREEINDEX5 = { -"html2bbcode_8php.html":[6,0,0,40], -"html2bbcode_8php.html#a39c662b19d318990fee2ba795a55d7a7":[6,0,0,40,3], -"html2bbcode_8php.html#a5ad726995ac4070213abdb3bd09f4837":[6,0,0,40,1], -"html2bbcode_8php.html#a71a07f135d196ec5943b13f7b2e6a9b2":[6,0,0,40,0], -"html2bbcode_8php.html#ad174afe0ccbd8c475e48f8a6ee2f27d8":[6,0,0,40,2], -"html2plain_8php.html":[6,0,0,41], -"html2plain_8php.html#a3214912e3d00cf0a948072daccf16740":[6,0,0,41,0], -"html2plain_8php.html#a56d29b254333d29abb9d96a9a903a4b0":[6,0,0,41,3], -"html2plain_8php.html#ab3e121fa9f3feb16f9f942e705bc6c04":[6,0,0,41,2], -"html2plain_8php.html#ae1c203d0f089d5678d73a6c64a395201":[6,0,0,41,1], -"hubloc_8php.html":[6,0,0,42], -"hubloc_8php.html#ad3d0dcfcfcb347744f7617fe6f5de002":[6,0,0,42,1], -"hubloc_8php.html#aebd244b4616ded022cbbee5e82926951":[6,0,0,42,0], -"identity_8php.html":[6,0,0,43], -"identity_8php.html#a1cf83ac2b645de12868edaa3a5718f05":[6,0,0,43,3], -"identity_8php.html#a224710dfb7465b706c91134247c20afa":[6,0,0,43,11], -"identity_8php.html#a2ab5172eabd375869060c9ad68323f5c":[6,0,0,43,17], "identity_8php.html#a332df795f684788002f5a6424abacfd7":[6,0,0,43,10], "identity_8php.html#a345f4c943d84de502ec6e72d2c813945":[6,0,0,43,2], "identity_8php.html#a3570a4eb77332b292d394c4132cb8f03":[6,0,0,43,15], @@ -44,11 +27,11 @@ var NAVTREEINDEX5 = "identity_8php.html#ae2b140df652a55ca11bb6a99005fce35":[6,0,0,43,18], "identity_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312":[6,0,0,43,7], "identity_8php.html#af2802bc13a00a17b867bba7978ba8f58":[6,0,0,43,27], -"import_8php.html":[6,0,1,45], -"import_8php.html#af17fef0410518f7eac205d0ea416eaa2":[6,0,1,45,1], -"import_8php.html#afdf25ed70096d5dbf4f6d0ca79fea184":[6,0,1,45,0], -"importelm_8php.html":[6,0,1,46], -"importelm_8php.html#a1a4f71e6d76ace6add5e9659845f5e5f":[6,0,1,46,0], +"import_8php.html":[6,0,1,44], +"import_8php.html#af17fef0410518f7eac205d0ea416eaa2":[6,0,1,44,1], +"import_8php.html#afdf25ed70096d5dbf4f6d0ca79fea184":[6,0,1,44,0], +"importelm_8php.html":[6,0,1,45], +"importelm_8php.html#a1a4f71e6d76ace6add5e9659845f5e5f":[6,0,1,45,0], "include_2api_8php.html":[6,0,0,5], "include_2api_8php.html#a0991f72554f821255397d615e76f3203":[6,0,0,5,12], "include_2api_8php.html#a176c448d79c211ad41c2bbe3124658f5":[6,0,0,5,5], @@ -140,13 +123,12 @@ var NAVTREEINDEX5 = "include_2chanman_8php.html":[6,0,0,14], "include_2chanman_8php.html#a21ba9a5c961e866ff27aee3ee67bf99b":[6,0,0,14,0], "include_2chat_8php.html":[6,0,0,15], -"include_2chat_8php.html#a1ee1360f7d2549c7549ae07cb5190f0f":[6,0,0,15,5], +"include_2chat_8php.html#a1ee1360f7d2549c7549ae07cb5190f0f":[6,0,0,15,4], "include_2chat_8php.html#a2ba3af6884ecdce95de69262fe599639":[6,0,0,15,2], "include_2chat_8php.html#a2c95b545e46bfee64faa05ecf0afea91":[6,0,0,15,3], "include_2chat_8php.html#acdc80dba4eb796c7472b21129b435422":[6,0,0,15,1], "include_2chat_8php.html#acea6b176eb7aff44d9ba3ae24ce511d3":[6,0,0,15,0], -"include_2chat_8php.html#aedcb532a0627b8644001a2fadab4e87a":[6,0,0,15,6], -"include_2chat_8php.html#afffdd0f2c218c392ba28376948624e3f":[6,0,0,15,4], +"include_2chat_8php.html#aedcb532a0627b8644001a2fadab4e87a":[6,0,0,15,5], "include_2config_8php.html":[6,0,0,19], "include_2config_8php.html#a27559f388c9b9af81c94e48d6889d1d1":[6,0,0,19,7], "include_2config_8php.html#a549910227348003efc3c05c9105c42da":[6,0,0,19,0], @@ -197,25 +179,29 @@ var NAVTREEINDEX5 = "include_2message_8php.html#a751ffd6635022b2190f56154ee745752":[6,0,0,49,4], "include_2message_8php.html#aed272d77c06a309e2836ac79e75613f1":[6,0,0,49,0], "include_2network_8php.html":[6,0,0,51], -"include_2network_8php.html#a1ff07d9fad93b713b93da0ab77aab7f0":[6,0,0,51,5], -"include_2network_8php.html#a27a951b59d8d622c0b3e7b0673ba74c6":[6,0,0,51,10], -"include_2network_8php.html#a469b9bd700269cd07d954f1a16c5899b":[6,0,0,51,4], -"include_2network_8php.html#a4c5d50079e089168d9248427018fffd4":[6,0,0,51,9], -"include_2network_8php.html#a4cfb2c05a1c295317283d762440ce0b2":[6,0,0,51,8], -"include_2network_8php.html#a5caa264fab6d2b2344e6bd5b298b08f2":[6,0,0,51,13], -"include_2network_8php.html#a78e89557b2fbd344ad790846d761b0c7":[6,0,0,51,7], -"include_2network_8php.html#a8122356933bcd6b0a8567e8e15ae5cc5":[6,0,0,51,14], -"include_2network_8php.html#a897e7112d86eb95526cbd0bff9375f02":[6,0,0,51,12], -"include_2network_8php.html#a8d5a3afb51cc932032b5dcc159efaae0":[6,0,0,51,6], -"include_2network_8php.html#a9129fd55e7fc175b4ea9a195cccc16bc":[6,0,0,51,19], -"include_2network_8php.html#a99353baabbc3e0584b85eb79ee802cff":[6,0,0,51,16], -"include_2network_8php.html#a9e9da2aafb806c98ecdc318604e60dc6":[6,0,0,51,17], -"include_2network_8php.html#aafd06c0a75402aefb06cfb9f9740fa37":[6,0,0,51,18], +"include_2network_8php.html#a1ff07d9fad93b713b93da0ab77aab7f0":[6,0,0,51,6], +"include_2network_8php.html#a27a951b59d8d622c0b3e7b0673ba74c6":[6,0,0,51,13], +"include_2network_8php.html#a316f318167a039c89719afbd129a8f3c":[6,0,0,51,15], +"include_2network_8php.html#a3e6c751a51de33ad3563f0938296e78a":[6,0,0,51,19], +"include_2network_8php.html#a469b9bd700269cd07d954f1a16c5899b":[6,0,0,51,5], +"include_2network_8php.html#a4c5d50079e089168d9248427018fffd4":[6,0,0,51,11], +"include_2network_8php.html#a4cfb2c05a1c295317283d762440ce0b2":[6,0,0,51,10], +"include_2network_8php.html#a5caa264fab6d2b2344e6bd5b298b08f2":[6,0,0,51,18], +"include_2network_8php.html#a63e62946e194928eb17c5a9f2bbef0fe":[6,0,0,51,4], +"include_2network_8php.html#a78e89557b2fbd344ad790846d761b0c7":[6,0,0,51,9], +"include_2network_8php.html#a850ed5307c6a18076f4b80addc99602d":[6,0,0,51,8], +"include_2network_8php.html#a872bbe72d23826c64c9e0f822180a3ec":[6,0,0,51,12], +"include_2network_8php.html#a897e7112d86eb95526cbd0bff9375f02":[6,0,0,51,17], +"include_2network_8php.html#a8d5a3afb51cc932032b5dcc159efaae0":[6,0,0,51,7], +"include_2network_8php.html#a9129fd55e7fc175b4ea9a195cccc16bc":[6,0,0,51,23], +"include_2network_8php.html#a99353baabbc3e0584b85eb79ee802cff":[6,0,0,51,20], +"include_2network_8php.html#a9e9da2aafb806c98ecdc318604e60dc6":[6,0,0,51,21], +"include_2network_8php.html#aafd06c0a75402aefb06cfb9f9740fa37":[6,0,0,51,22], "include_2network_8php.html#ab07ce9d75eae559865ed90aad2154bd7":[6,0,0,51,2], "include_2network_8php.html#aba38458a2ff2d92d3536488dbb119694":[6,0,0,51,0], +"include_2network_8php.html#acb0bd7f5fe38ff1eaebeae3284525070":[6,0,0,51,16], "include_2network_8php.html#ad4056d3ce69988f5c1a997a79f503246":[6,0,0,51,3], -"include_2network_8php.html#adf6008b38c555e98e7ed10da9ede2335":[6,0,0,51,15], -"include_2network_8php.html#ae8d9c41a11000fb8667039fc71b4f73f":[6,0,0,51,11], +"include_2network_8php.html#ae8d9c41a11000fb8667039fc71b4f73f":[6,0,0,51,14], "include_2network_8php.html#aee35d9ad6b3f872bfb39ba3598936aa7":[6,0,0,51,1], "include_2notify_8php.html":[6,0,0,53], "include_2notify_8php.html#a0e61728e487df50c72e6434f911a57d3":[6,0,0,53,0], @@ -249,5 +235,19 @@ var NAVTREEINDEX5 = "include_2probe_8php.html#ab19a52326b27607a0fb8191cc75ba481":[6,0,0,63,5], "index.html":[], "interfaceITemplateEngine.html":[5,0,18], -"interfaceITemplateEngine.html#aaa7381c8becc3d1c1790b53988a0f243":[5,0,18,1] +"interfaceITemplateEngine.html#aaa7381c8becc3d1c1790b53988a0f243":[5,0,18,1], +"interfaceITemplateEngine.html#aaf2698adbf46c073c24b162fe1b1c442":[5,0,18,0], +"invite_8php.html":[6,0,1,46], +"invite_8php.html#a244385b28cfd021d308715f01158bfd9":[6,0,1,46,0], +"invite_8php.html#aeb0881c0f93c8e8552e5ed756ce6e5a5":[6,0,1,46,1], +"item_8php.html":[6,0,1,47], +"item_8php.html#a3daae7944f737bd30412a0d042207c0f":[6,0,1,47,0], +"item_8php.html#a5b1b36cb301a94b38150074f0d424e74":[6,0,1,47,3], +"item_8php.html#a693cd09805755ab85bbb5ecae69a48c3":[6,0,1,47,5], +"item_8php.html#a764bbb2e9a885a86fb23d0b5e4a09221":[6,0,1,47,4], +"item_8php.html#a7b63a9d0cd02096e17dcf11f4afa7c10":[6,0,1,47,1], +"item_8php.html#aa22feef4de326e1d7078dedd892e615c":[6,0,1,47,2], +"items_8php.html":[6,0,0,46], +"items_8php.html#a004e89d86b0f29b2c4da20108ecc4091":[6,0,0,46,67], +"items_8php.html#a016dd86c827d08db89061ea81d15c6cb":[6,0,0,46,3] }; diff --git a/doc/html/navtreeindex6.js b/doc/html/navtreeindex6.js index 53a0c52e6..e4e5bba06 100644 --- a/doc/html/navtreeindex6.js +++ b/doc/html/navtreeindex6.js @@ -1,84 +1,73 @@ var NAVTREEINDEX6 = { -"interfaceITemplateEngine.html#aaf2698adbf46c073c24b162fe1b1c442":[5,0,18,0], -"invite_8php.html":[6,0,1,47], -"invite_8php.html#a244385b28cfd021d308715f01158bfd9":[6,0,1,47,0], -"invite_8php.html#aeb0881c0f93c8e8552e5ed756ce6e5a5":[6,0,1,47,1], -"item_8php.html":[6,0,1,48], -"item_8php.html#a3daae7944f737bd30412a0d042207c0f":[6,0,1,48,0], -"item_8php.html#a5b1b36cb301a94b38150074f0d424e74":[6,0,1,48,3], -"item_8php.html#a693cd09805755ab85bbb5ecae69a48c3":[6,0,1,48,5], -"item_8php.html#a764bbb2e9a885a86fb23d0b5e4a09221":[6,0,1,48,4], -"item_8php.html#a7b63a9d0cd02096e17dcf11f4afa7c10":[6,0,1,48,1], -"item_8php.html#aa22feef4de326e1d7078dedd892e615c":[6,0,1,48,2], -"items_8php.html":[6,0,0,46], -"items_8php.html#a004e89d86b0f29b2c4da20108ecc4091":[6,0,0,46,64], -"items_8php.html#a016dd86c827d08db89061ea81d15c6cb":[6,0,0,46,3], -"items_8php.html#a02ca33c31ed535d24894f8a9a91ce9df":[6,0,0,46,37], +"items_8php.html#a02ca33c31ed535d24894f8a9a91ce9df":[6,0,0,46,38], "items_8php.html#a04a35b610acfe54434df08adec39c0c7":[6,0,0,46,28], "items_8php.html#a0790a4550b829e85504af548623002ca":[6,0,0,46,8], "items_8php.html#a079e099e15d88d47aeb6ca6d60da7107":[6,0,0,46,33], -"items_8php.html#a09d425596b9f8663472cf7474ad36d96":[6,0,0,46,39], +"items_8php.html#a09d425596b9f8663472cf7474ad36d96":[6,0,0,46,40], "items_8php.html#a0cf98bb619f07dd18f602683a55a5f59":[6,0,0,46,25], "items_8php.html#a1e75047cf175aaee8dd16aa761913ff9":[6,0,0,46,5], "items_8php.html#a251343637ff40a50cca93452cd530c26":[6,0,0,46,32], -"items_8php.html#a2541e6861a56d145c9281877cc501615":[6,0,0,46,42], +"items_8php.html#a2541e6861a56d145c9281877cc501615":[6,0,0,46,43], "items_8php.html#a275108c050f7eb18bcbb5018e6b81cf6":[6,0,0,46,4], -"items_8php.html#a2baa9e05f1e8aa3dd61c85803ae39bd6":[6,0,0,46,63], +"items_8php.html#a2baa9e05f1e8aa3dd61c85803ae39bd6":[6,0,0,46,66], "items_8php.html#a2d840c74ed23d1b6c7daee05cf89dda7":[6,0,0,46,21], "items_8php.html#a36e656667193c83aa2cc03a024fc131b":[6,0,0,46,0], -"items_8php.html#a410f9c743877c125ca06312373346903":[6,0,0,46,49], -"items_8php.html#a49905ea75adfe8a2d110be344d18d6a6":[6,0,0,46,51], -"items_8php.html#a4e6d7639431e0dd8e9f4dba8e1ac408b":[6,0,0,46,54], +"items_8php.html#a410f9c743877c125ca06312373346903":[6,0,0,46,50], +"items_8php.html#a49905ea75adfe8a2d110be344d18d6a6":[6,0,0,46,52], +"items_8php.html#a4e6d7639431e0dd8e9f4dba8e1ac408b":[6,0,0,46,55], +"items_8php.html#a52c24114b73c0bdb605a03cd29712223":[6,0,0,46,34], "items_8php.html#a536d0313b6ffe33b9d2490c4e25c5361":[6,0,0,46,30], "items_8php.html#a555762e1022a4b8e3c3abd32e7812408":[6,0,0,46,15], "items_8php.html#a566c601726697e044e75284af7fb6f17":[6,0,0,46,20], "items_8php.html#a56b2a4abcadfac71175cd50555528cc3":[6,0,0,46,13], -"items_8php.html#a5ed782ff5b9cf050bec931e06de12c00":[6,0,0,46,41], +"items_8php.html#a5e5be7bf1f8257dec0b2647e60a3f3f1":[6,0,0,46,27], +"items_8php.html#a5ed782ff5b9cf050bec931e06de12c00":[6,0,0,46,42], "items_8php.html#a5f690fc2484abec07840b4f9dd525bd9":[6,0,0,46,18], -"items_8php.html#a649dc3e53ed794d0ead4b5d037f8d8d7":[6,0,0,46,40], +"items_8php.html#a649dc3e53ed794d0ead4b5d037f8d8d7":[6,0,0,46,41], "items_8php.html#a668ece2c37f05cc3abe538eb0dabfe55":[6,0,0,46,16], -"items_8php.html#a6bee35961f2e32905f20367a9309d627":[6,0,0,46,35], -"items_8php.html#a6f7e1334af5d684a987fa6a3eb37f4cc":[6,0,0,46,38], -"items_8php.html#a756738301f2ed96be50232500677d58a":[6,0,0,46,44], -"items_8php.html#a77051724d1784074ff187e73a4db93fe":[6,0,0,46,34], +"items_8php.html#a6bee35961f2e32905f20367a9309d627":[6,0,0,46,36], +"items_8php.html#a6f7e1334af5d684a987fa6a3eb37f4cc":[6,0,0,46,39], +"items_8php.html#a756738301f2ed96be50232500677d58a":[6,0,0,46,45], +"items_8php.html#a77051724d1784074ff187e73a4db93fe":[6,0,0,46,35], "items_8php.html#a772f0ae77ad77c8ab68ed918a3870946":[6,0,0,46,7], -"items_8php.html#a77da7ce9a117601d49ac4a67c71b514f":[6,0,0,46,47], -"items_8php.html#a78a60e39f6991bd3324a24dcbf9dac5a":[6,0,0,46,55], +"items_8php.html#a77da7ce9a117601d49ac4a67c71b514f":[6,0,0,46,48], +"items_8php.html#a78a60e39f6991bd3324a24dcbf9dac5a":[6,0,0,46,56], "items_8php.html#a81565acf729e629e588d823308448e3c":[6,0,0,46,1], "items_8php.html#a82955cc578f0fa600acec84475026194":[6,0,0,46,17], -"items_8php.html#a83a349062945d585edb4b3c5d763ab6e":[6,0,0,46,52], -"items_8php.html#a8675e62674de6fb7c42e4a408c7116cc":[6,0,0,46,48], -"items_8php.html#a8794863cdf8ce1333040933d3a3f66bd":[6,0,0,46,12], +"items_8php.html#a83a349062945d585edb4b3c5d763ab6e":[6,0,0,46,53], +"items_8php.html#a8675e62674de6fb7c42e4a408c7116cc":[6,0,0,46,49], "items_8php.html#a87ac9e359591721a824ecd23bbb56296":[6,0,0,46,6], -"items_8php.html#a88c6cf7649ac836fbbed82a7a0315110":[6,0,0,46,60], -"items_8php.html#a896c1809d58f2d7a42cfe14577958ddf":[6,0,0,46,27], +"items_8php.html#a88c6cf7649ac836fbbed82a7a0315110":[6,0,0,46,62], "items_8php.html#a8f3c85c584ccd2b98c3ca440e45b40f8":[6,0,0,46,11], "items_8php.html#a94ddb1d6c8fa21dd7433677e85168037":[6,0,0,46,31], -"items_8php.html#aa2d3caa2f27720762b5c729e07df40fb":[6,0,0,46,46], -"items_8php.html#aa371905f0a211b307cb3f7188c6cba04":[6,0,0,46,61], +"items_8php.html#a9b449eeae50003414b8b30ca927af434":[6,0,0,46,65], +"items_8php.html#aa2d3caa2f27720762b5c729e07df40fb":[6,0,0,46,47], +"items_8php.html#aa371905f0a211b307cb3f7188c6cba04":[6,0,0,46,63], "items_8php.html#aa579bc4445d60098b1410961ca8e96b7":[6,0,0,46,10], "items_8php.html#aa723c0571e314a1853a24c5854b4f54f":[6,0,0,46,22], "items_8php.html#aa9e99613d38a97b39c8cf5449699c2ee":[6,0,0,46,9], "items_8php.html#aab9c6bae4c40799867596bdaae9829fd":[6,0,0,46,29], -"items_8php.html#aab9e0c58247427126de0699c729c3b6c":[6,0,0,46,57], -"items_8php.html#aabfaa193b83154c2a81e91284e5d5e59":[6,0,0,46,62], +"items_8php.html#aab9e0c58247427126de0699c729c3b6c":[6,0,0,46,58], +"items_8php.html#aabfaa193b83154c2a81e91284e5d5e59":[6,0,0,46,64], "items_8php.html#aac8c9eb4338e2a996c43914392c6cfdb":[6,0,0,46,14], -"items_8php.html#ab1bce4261bcf75ad62753b498a144d17":[6,0,0,46,58], +"items_8php.html#ab1bce4261bcf75ad62753b498a144d17":[6,0,0,46,60], "items_8php.html#aba98fcbbcd7044a7e9ea34edabc14c87":[6,0,0,46,26], "items_8php.html#abf7a1b73eb352d79acd36309b0dababd":[6,0,0,46,2], "items_8php.html#ac6673627d289ee4f547de0fe3b7acd0a":[6,0,0,46,19], -"items_8php.html#acf0bf7c9d21ac84f32effb754f7ad484":[6,0,0,46,43], -"items_8php.html#ad2abb4644ff1f20fefbc80326fe01cf0":[6,0,0,46,50], -"items_8php.html#ad34827ed330898456783fb14c7b46154":[6,0,0,46,59], -"items_8php.html#ad4ee16e3ff1eaf60428c61f82ba25e6a":[6,0,0,46,53], +"items_8php.html#acf0bf7c9d21ac84f32effb754f7ad484":[6,0,0,46,44], +"items_8php.html#ad2abb4644ff1f20fefbc80326fe01cf0":[6,0,0,46,51], +"items_8php.html#ad34827ed330898456783fb14c7b46154":[6,0,0,46,61], +"items_8php.html#ad4ee16e3ff1eaf60428c61f82ba25e6a":[6,0,0,46,54], +"items_8php.html#adc26e08aa61f5666da04ab5d2a9d68a6":[6,0,0,46,12], +"items_8php.html#adf2b8137dc4ad9ec958de2842f16f3c2":[6,0,0,46,59], "items_8php.html#adf980098b6de9c3993bc3ff26a8dd6f9":[6,0,0,46,24], -"items_8php.html#ae73794179b62d39bb597ff670ab1c1e5":[6,0,0,46,36], -"items_8php.html#af6237605c60d69abdd959ddbbee3420c":[6,0,0,46,56], -"items_8php.html#af94c281016c6c912d06e064113336c5c":[6,0,0,46,45], +"items_8php.html#ae73794179b62d39bb597ff670ab1c1e5":[6,0,0,46,37], +"items_8php.html#af6237605c60d69abdd959ddbbee3420c":[6,0,0,46,57], +"items_8php.html#af94c281016c6c912d06e064113336c5c":[6,0,0,46,46], "items_8php.html#afbcf26dfcf8a83fff952aa858c1b7b67":[6,0,0,46,23], -"lang_8php.html":[6,0,1,49], -"lang_8php.html#a4c5c1140f51a638f224275cd618c2f37":[6,0,1,49,0], +"lang_8php.html":[6,0,1,48], +"lang_8php.html#a4c5c1140f51a638f224275cd618c2f37":[6,0,1,48,0], "language_8php.html":[6,0,0,47], "language_8php.html#a151e5b4689aef86a12642cbb7a00bfe0":[6,0,0,47,7], "language_8php.html#a43e6ddba9df019c9ac3ab4c94c444ae7":[6,0,0,47,3], @@ -90,26 +79,26 @@ var NAVTREEINDEX6 = "language_8php.html#ac6ae482ee54fa2764d5c2e77305aeb96":[6,0,0,47,8], "language_8php.html#ac9142ef1d01a235c760deb0f16643f5a":[6,0,0,47,6], "language_8php.html#ace67d6cad57da08d030ad9dc9b8c836e":[6,0,0,47,2], -"layouts_8php.html":[6,0,1,50], -"layouts_8php.html#a6e0193759ad9eef76d3df2db24237b50":[6,0,1,50,0], -"like_8php.html":[6,0,1,51], -"like_8php.html#a9d7dd268f21c21e9d29dd2aca2dd9538":[6,0,1,51,0], -"lockview_8php.html":[6,0,1,52], -"lockview_8php.html#a851e26ab9a1008df5c5ebebea31e9b44":[6,0,1,52,0], -"login_8php.html":[6,0,1,53], -"login_8php.html#a1d69ca88eb9005a7026e128b9a645904":[6,0,1,53,0], -"lostpass_8php.html":[6,0,1,54], -"lostpass_8php.html#a0314d94e48c789b1b3a201d740c9eab3":[6,0,1,54,0], -"lostpass_8php.html#a8ed35ba71a4404eaf4903da61d0321cc":[6,0,1,54,1], -"magic_8php.html":[6,0,1,55], -"magic_8php.html#acea2cc792849ca2d71d4b689f66518bf":[6,0,1,55,0], -"mail_8php.html":[6,0,1,56], -"mail_8php.html#a3c7c485fc69f92371e8b20936040eca1":[6,0,1,56,0], -"mail_8php.html#acfc2cc0bf4e0b178207758384977f25a":[6,0,1,56,1], -"manage_8php.html":[6,0,1,57], -"manage_8php.html#a2bca247b5296827638959138367db4f5":[6,0,1,57,0], -"match_8php.html":[6,0,1,58], -"match_8php.html#a1dd853e959b9e70c1911bb2fb5f5130d":[6,0,1,58,0], +"layouts_8php.html":[6,0,1,49], +"layouts_8php.html#a6e0193759ad9eef76d3df2db24237b50":[6,0,1,49,0], +"like_8php.html":[6,0,1,50], +"like_8php.html#a9d7dd268f21c21e9d29dd2aca2dd9538":[6,0,1,50,0], +"lockview_8php.html":[6,0,1,51], +"lockview_8php.html#a851e26ab9a1008df5c5ebebea31e9b44":[6,0,1,51,0], +"login_8php.html":[6,0,1,52], +"login_8php.html#a1d69ca88eb9005a7026e128b9a645904":[6,0,1,52,0], +"lostpass_8php.html":[6,0,1,53], +"lostpass_8php.html#a0314d94e48c789b1b3a201d740c9eab3":[6,0,1,53,0], +"lostpass_8php.html#a8ed35ba71a4404eaf4903da61d0321cc":[6,0,1,53,1], +"magic_8php.html":[6,0,1,54], +"magic_8php.html#acea2cc792849ca2d71d4b689f66518bf":[6,0,1,54,0], +"mail_8php.html":[6,0,1,55], +"mail_8php.html#a3c7c485fc69f92371e8b20936040eca1":[6,0,1,55,0], +"mail_8php.html#acfc2cc0bf4e0b178207758384977f25a":[6,0,1,55,1], +"manage_8php.html":[6,0,1,56], +"manage_8php.html#a2bca247b5296827638959138367db4f5":[6,0,1,56,0], +"match_8php.html":[6,0,1,57], +"match_8php.html#a1dd853e959b9e70c1911bb2fb5f5130d":[6,0,1,57,0], "md_README.html":[2], "md_config.html":[0], "md_fresh.html":[1], @@ -121,10 +110,10 @@ var NAVTREEINDEX6 = "minimalisticdarkness_8php.html#a6e5d97615c6faef5dbffe04b8024ceaf":[6,0,3,1,0,2,4,0], "minimalisticdarkness_8php.html#a70bb13be8f23ec47839da81e0796f1cb":[6,0,3,1,0,2,4,2], "minimalisticdarkness_8php.html#a7e6c3d4efde4e9a2de32308081372c6b":[6,0,3,1,0,2,4,1], -"mitem_8php.html":[6,0,1,61], -"mitem_8php.html#a6ee694cca4b551a20d7c7a94b5243ec1":[6,0,1,61,2], -"mitem_8php.html#a7a31b702ecad18eeb6a38b243ff0037e":[6,0,1,61,0], -"mitem_8php.html#a9627cd857cafdf04e4fc0ae48c8e8518":[6,0,1,61,1], +"mitem_8php.html":[6,0,1,60], +"mitem_8php.html#a6ee694cca4b551a20d7c7a94b5243ec1":[6,0,1,60,2], +"mitem_8php.html#a7a31b702ecad18eeb6a38b243ff0037e":[6,0,1,60,0], +"mitem_8php.html#a9627cd857cafdf04e4fc0ae48c8e8518":[6,0,1,60,1], "mod_2api_8php.html":[6,0,1,4], "mod_2api_8php.html#a02ae0f60e240dc806b860edb7d582117":[6,0,1,4,2], "mod_2api_8php.html#a33315b5bbf5418f6850b2038107b526d":[6,0,1,4,0], @@ -147,41 +136,41 @@ var NAVTREEINDEX6 = "mod_2follow_8php.html":[6,0,1,37], "mod_2follow_8php.html#a171f5b19f50d7738adc3b2e96ec6018a":[6,0,1,37,1], "mod_2follow_8php.html#a4c540ea4e9f5c581c1a53516ac585592":[6,0,1,37,0], -"mod_2group_8php.html":[6,0,1,40], -"mod_2group_8php.html#a07a64f6c65b0080d8190b3d9728a7a83":[6,0,1,40,0], -"mod_2group_8php.html#aed1f009b1221348021bb34761160ef35":[6,0,1,40,1], -"mod_2menu_8php.html":[6,0,1,59], -"mod_2menu_8php.html#a6fed23af14d71a78a4153c8363a685cf":[6,0,1,59,0], -"mod_2menu_8php.html#aaa491ef173868fe002aece4632bcf393":[6,0,1,59,1], -"mod_2message_8php.html":[6,0,1,60], -"mod_2message_8php.html#ac72dfed3ce08fcb331d66b37edc6e15f":[6,0,1,60,0], -"mod_2network_8php.html":[6,0,1,65], -"mod_2network_8php.html#a180fce90ad11d7e0e45be094da7149ec":[6,0,1,65,1], -"mod_2network_8php.html#a43f2f29b90c5e29072c561934bc8f8b4":[6,0,1,65,0], -"mod_2notify_8php.html":[6,0,1,69], -"mod_2notify_8php.html#a94f9a6a9d4b5fd704baafff0c34f41ae":[6,0,1,69,1], -"mod_2notify_8php.html#acdf3851688ebd6d6a575eb84ef9febe3":[6,0,1,69,0], -"mod_2oembed_8php.html":[6,0,1,70], -"mod_2oembed_8php.html#a9145025aaf057fb5d3f9f7011e5e1014":[6,0,1,70,0], -"mod_2photos_8php.html":[6,0,1,79], -"mod_2photos_8php.html#a062bed4d04d14fee8a53f4c9be673080":[6,0,1,79,2], -"mod_2photos_8php.html#aa87382611a66ec5effdb2d78f13f5812":[6,0,1,79,0], -"mod_2photos_8php.html#ab950295cd77626f5fe65331a87693014":[6,0,1,79,1], -"mod_2probe_8php.html":[6,0,1,87], -"mod_2probe_8php.html#a1f1db3fa6038e451e737964c94bf5e99":[6,0,1,87,0], +"mod_2group_8php.html":[6,0,1,39], +"mod_2group_8php.html#a07a64f6c65b0080d8190b3d9728a7a83":[6,0,1,39,0], +"mod_2group_8php.html#aed1f009b1221348021bb34761160ef35":[6,0,1,39,1], +"mod_2menu_8php.html":[6,0,1,58], +"mod_2menu_8php.html#a6fed23af14d71a78a4153c8363a685cf":[6,0,1,58,0], +"mod_2menu_8php.html#aaa491ef173868fe002aece4632bcf393":[6,0,1,58,1], +"mod_2message_8php.html":[6,0,1,59], +"mod_2message_8php.html#ac72dfed3ce08fcb331d66b37edc6e15f":[6,0,1,59,0], +"mod_2network_8php.html":[6,0,1,64], +"mod_2network_8php.html#a180fce90ad11d7e0e45be094da7149ec":[6,0,1,64,1], +"mod_2network_8php.html#a43f2f29b90c5e29072c561934bc8f8b4":[6,0,1,64,0], +"mod_2notify_8php.html":[6,0,1,68], +"mod_2notify_8php.html#a94f9a6a9d4b5fd704baafff0c34f41ae":[6,0,1,68,1], +"mod_2notify_8php.html#acdf3851688ebd6d6a575eb84ef9febe3":[6,0,1,68,0], +"mod_2oembed_8php.html":[6,0,1,69], +"mod_2oembed_8php.html#a9145025aaf057fb5d3f9f7011e5e1014":[6,0,1,69,0], +"mod_2photos_8php.html":[6,0,1,78], +"mod_2photos_8php.html#a062bed4d04d14fee8a53f4c9be673080":[6,0,1,78,2], +"mod_2photos_8php.html#aa87382611a66ec5effdb2d78f13f5812":[6,0,1,78,0], +"mod_2photos_8php.html#ab950295cd77626f5fe65331a87693014":[6,0,1,78,1], +"mod_2probe_8php.html":[6,0,1,86], +"mod_2probe_8php.html#a1f1db3fa6038e451e737964c94bf5e99":[6,0,1,86,0], "mod__chanview_8php.html":[6,0,3,1,0,0,0], "mod__import_8php.html":[6,0,3,0,4], "mod__import_8php.html#a8db1899eeeb44dabd0904065b63627bb":[6,0,3,0,4,0], -"mood_8php.html":[6,0,1,62], -"mood_8php.html#a721b9b6703b3234a005641c92d409b8f":[6,0,1,62,0], -"mood_8php.html#a7ae136dd7476865b4828136175db5022":[6,0,1,62,1], -"msearch_8php.html":[6,0,1,63], -"msearch_8php.html#ac80d2a6c0a92e79eec7efbbccd74d9a8":[6,0,1,63,0], +"mood_8php.html":[6,0,1,61], +"mood_8php.html#a721b9b6703b3234a005641c92d409b8f":[6,0,1,61,0], +"mood_8php.html#a7ae136dd7476865b4828136175db5022":[6,0,1,61,1], +"msearch_8php.html":[6,0,1,62], +"msearch_8php.html#ac80d2a6c0a92e79eec7efbbccd74d9a8":[6,0,1,62,0], "mytheme_2php_2style_8php.html":[6,0,3,1,2,0,1], "mytheme_2php_2theme_8php.html":[6,0,3,1,2,0,2], "mytheme_2php_2theme_8php.html#a6ce5df8ece6acc09c1fddaccbeb244e8":[6,0,3,1,2,0,2,0], -"namespaceFriendica.html":[5,0,1], "namespaceFriendica.html":[4,0,1], +"namespaceFriendica.html":[5,0,1], "namespaceacl__selectors.html":[4,0,0], "namespaceacl__selectors.html":[5,0,0], "namespacefriendica-to-smarty-tpl.html":[5,0,2], @@ -190,64 +179,75 @@ var NAVTREEINDEX6 = "namespacemembers_func.html":[4,1,1], "namespacemembers_vars.html":[4,1,2], "namespaces.html":[4,0], -"namespaceupdatetpl.html":[4,0,3], "namespaceupdatetpl.html":[5,0,3], +"namespaceupdatetpl.html":[4,0,3], "namespaceutil.html":[5,0,4], "namespaceutil.html":[4,0,4], "nav_8php.html":[6,0,0,50], "nav_8php.html#a43be0df73b90647ea70947ce004e231e":[6,0,0,50,0], "nav_8php.html#ac3c920ce3ea5b0d9e0678ee37155f06a":[6,0,0,50,1], -"netgrowth_8php.html":[6,0,1,64], -"netgrowth_8php.html#a9b87bfc25a7cb11bc7f8e1fdd0310919":[6,0,1,64,0], -"new__channel_8php.html":[6,0,1,66], -"new__channel_8php.html#a180b0646957db8290482f02454ad7f23":[6,0,1,66,2], -"new__channel_8php.html#a1ad7f99e4366a32942c6b954aba3a164":[6,0,1,66,1], -"new__channel_8php.html#ae585191610f79da129492482ce8e2fee":[6,0,1,66,0], +"netgrowth_8php.html":[6,0,1,63], +"netgrowth_8php.html#a9b87bfc25a7cb11bc7f8e1fdd0310919":[6,0,1,63,0], +"new__channel_8php.html":[6,0,1,65], +"new__channel_8php.html#a180b0646957db8290482f02454ad7f23":[6,0,1,65,2], +"new__channel_8php.html#a1ad7f99e4366a32942c6b954aba3a164":[6,0,1,65,1], +"new__channel_8php.html#ae585191610f79da129492482ce8e2fee":[6,0,1,65,0], "none_8php.html":[6,0,3,0,5], -"notes_8php.html":[6,0,1,67], -"notes_8php.html#a4dbd7b1f906440746af48b484d66535a":[6,0,1,67,0], -"notifications_8php.html":[6,0,1,68], -"notifications_8php.html#a5baffec7b2e625c9f9cefbc097550d33":[6,0,1,68,1], -"notifications_8php.html#aadd0b5525bd8c283a5d8a37982bbfe62":[6,0,1,68,0], +"notes_8php.html":[6,0,1,66], +"notes_8php.html#a4dbd7b1f906440746af48b484d66535a":[6,0,1,66,0], +"notifications_8php.html":[6,0,1,67], +"notifications_8php.html#a5baffec7b2e625c9f9cefbc097550d33":[6,0,1,67,1], +"notifications_8php.html#aadd0b5525bd8c283a5d8a37982bbfe62":[6,0,1,67,0], "notifier_8php.html":[6,0,0,52], "notifier_8php.html#a568c502f626cff95e344c0748938b85d":[6,0,0,52,0], "notred_8php.html":[6,0,3,1,3,1,3], "oauth_8php.html":[6,0,0,54], "oauth_8php.html#a7a32a5990f113ac9465b03b29175cf16":[6,0,0,54,3], "oauth_8php.html#ad343cab37aa860d2d14dc86b7f5ca0c6":[6,0,0,54,2], -"oexchange_8php.html":[6,0,1,71], -"oexchange_8php.html#a2d8b785cd7d041a4e6274f5af370cf26":[6,0,1,71,0], -"oexchange_8php.html#ac8e2e469ddc3db984b0c1b44558aca59":[6,0,1,71,1], +"oexchange_8php.html":[6,0,1,70], +"oexchange_8php.html#a2d8b785cd7d041a4e6274f5af370cf26":[6,0,1,70,0], +"oexchange_8php.html#ac8e2e469ddc3db984b0c1b44558aca59":[6,0,1,70,1], "olddefault_8php.html":[6,0,3,1,0,2,5], "onedirsync_8php.html":[6,0,0,56], "onedirsync_8php.html#a411aedd47c57476099647961e6a86691":[6,0,0,56,0], "onepoll_8php.html":[6,0,0,57], "onepoll_8php.html#a72753b2fdec79b37c7f432035c91fb6d":[6,0,0,57,0], -"online_8php.html":[6,0,1,72], -"online_8php.html#a80e107c84eb722b0ca11d0413b96f9f7":[6,0,1,72,0], -"openid_8php.html":[6,0,1,73], -"openid_8php.html#a9a13827dbcf61ae4e45f0b6b33a88f43":[6,0,1,73,0], -"opensearch_8php.html":[6,0,1,74], -"opensearch_8php.html#ad13034877a496565ac7d99e9fc6f55e9":[6,0,1,74,0], -"page_8php.html":[6,0,1,75], -"page_8php.html#a4d89800c0366a239191b1692c09635cf":[6,0,1,75,1], -"page_8php.html#a91a5f649f68406149108bded1dc90b22":[6,0,1,75,0], +"online_8php.html":[6,0,1,71], +"online_8php.html#a80e107c84eb722b0ca11d0413b96f9f7":[6,0,1,71,0], +"openid_8php.html":[6,0,1,72], +"openid_8php.html#a9a13827dbcf61ae4e45f0b6b33a88f43":[6,0,1,72,0], +"opensearch_8php.html":[6,0,1,73], +"opensearch_8php.html#ad13034877a496565ac7d99e9fc6f55e9":[6,0,1,73,0], +"page_8php.html":[6,0,1,74], +"page_8php.html#a4d89800c0366a239191b1692c09635cf":[6,0,1,74,1], +"page_8php.html#a91a5f649f68406149108bded1dc90b22":[6,0,1,74,0], "page__widgets_8php.html":[6,0,0,58], "page__widgets_8php.html#a1a1e729da27f252cab6678288a17958f":[6,0,0,58,1], "page__widgets_8php.html#a39d547771c5f12a17c097436c82f0fa2":[6,0,0,58,0], "pages.html":[], -"parse__url_8php.html":[6,0,1,76], -"parse__url_8php.html#a05a9e8944380ba3cf6bbf5893dd4b74b":[6,0,1,76,2], -"parse__url_8php.html#a25635549f2c22955d72465f4d2e58993":[6,0,1,76,3], -"parse__url_8php.html#a496f4e3836154f6f32b8e805a7160d3a":[6,0,1,76,1], -"parse__url_8php.html#aa7dd8f961bea042d62726ed909e4a868":[6,0,1,76,0], +"parse__url_8php.html":[6,0,1,75], +"parse__url_8php.html#a05a9e8944380ba3cf6bbf5893dd4b74b":[6,0,1,75,2], +"parse__url_8php.html#a25635549f2c22955d72465f4d2e58993":[6,0,1,75,3], +"parse__url_8php.html#a496f4e3836154f6f32b8e805a7160d3a":[6,0,1,75,1], +"parse__url_8php.html#aa7dd8f961bea042d62726ed909e4a868":[6,0,1,75,0], "passion_8php.html":[6,0,3,1,0,2,6], "passionwide_8php.html":[6,0,3,1,0,2,7], -"pdledit_8php.html":[6,0,1,77], -"pdledit_8php.html#a59cb550f6b7a4e7d8196fbc9de601619":[6,0,1,77,0], -"pdledit_8php.html#a81da3c955d0e3db55d148a31483104c7":[6,0,1,77,1], +"pdledit_8php.html":[6,0,1,76], +"pdledit_8php.html#a59cb550f6b7a4e7d8196fbc9de601619":[6,0,1,76,0], +"pdledit_8php.html#a81da3c955d0e3db55d148a31483104c7":[6,0,1,76,1], "permissions_8php.html":[6,0,0,59], "permissions_8php.html#a040fd3d3b8517658b1668ae0cd093972":[6,0,0,59,2], "permissions_8php.html#a0f5bd9f7f4c8fb7ba4b2c1ed048b4dc7":[6,0,0,59,0], -"permissions_8php.html#a67ada9ed51e77885b6b0f6a28cee1835":[6,0,0,59,3] +"permissions_8php.html#a67ada9ed51e77885b6b0f6a28cee1835":[6,0,0,59,4], +"permissions_8php.html#a9b5f5120566a3699a98efc5ccb0c59fe":[6,0,0,59,3], +"permissions_8php.html#aa8b7b102c653649d7a71b5a1c044d90d":[6,0,0,59,5], +"permissions_8php.html#aeca9b280f3dc3358c89976d81d690008":[6,0,0,59,1], +"photo_8php.html":[6,0,1,77], +"photo_8php.html#a582779d24882b0d31ee909a91d70a448":[6,0,1,77,0], +"photo__driver_8php.html":[6,0,0,1,0], +"photo__driver_8php.html#a1d0bc7161dec0d177b7d3bbe4421af9a":[6,0,0,1,0,2], +"photo__driver_8php.html#a243cee492ce443afb6a7d77d54b6c4aa":[6,0,0,1,0,1], +"photo__driver_8php.html#a32e2817faa25d7f11f60a8abff565035":[6,0,0,1,0,4], +"photo__driver_8php.html#a78f5a10c568d2a9bbbb129dc96548887":[6,0,0,1,0,3], +"photo__gd_8php.html":[6,0,0,1,1] }; diff --git a/doc/html/navtreeindex7.js b/doc/html/navtreeindex7.js index eeb96f69f..bb4f1dace 100644 --- a/doc/html/navtreeindex7.js +++ b/doc/html/navtreeindex7.js @@ -1,34 +1,24 @@ var NAVTREEINDEX7 = { -"permissions_8php.html#aa8b7b102c653649d7a71b5a1c044d90d":[6,0,0,59,4], -"permissions_8php.html#aeca9b280f3dc3358c89976d81d690008":[6,0,0,59,1], -"photo_8php.html":[6,0,1,78], -"photo_8php.html#a582779d24882b0d31ee909a91d70a448":[6,0,1,78,0], -"photo__driver_8php.html":[6,0,0,1,0], -"photo__driver_8php.html#a1d0bc7161dec0d177b7d3bbe4421af9a":[6,0,0,1,0,2], -"photo__driver_8php.html#a243cee492ce443afb6a7d77d54b6c4aa":[6,0,0,1,0,1], -"photo__driver_8php.html#a32e2817faa25d7f11f60a8abff565035":[6,0,0,1,0,4], -"photo__driver_8php.html#a78f5a10c568d2a9bbbb129dc96548887":[6,0,0,1,0,3], -"photo__gd_8php.html":[6,0,0,1,1], "photo__imagick_8php.html":[6,0,0,1,2], -"php2po_8php.html":[6,0,2,7], -"php2po_8php.html#a1594a11499d06cc8a789ee7ca0c7a12b":[6,0,2,7,7], -"php2po_8php.html#a401d84ce156e49e8168bd0c4781e1be1":[6,0,2,7,5], -"php2po_8php.html#a45b05625748f412ec97afcd61cf7980b":[6,0,2,7,6], -"php2po_8php.html#a48cb304902320d173a4eaa41543327b9":[6,0,2,7,3], -"php2po_8php.html#a61f8ddeb5557d46ebc546cc355bda214":[6,0,2,7,0], -"php2po_8php.html#a6b0b8ebd9ce811d1325ef2c129443bc0":[6,0,2,7,1], -"php2po_8php.html#abbb0e5fd8fbc1f13a9bf68f86eb3d2a4":[6,0,2,7,4], -"php2po_8php.html#ad6726cfaa85d4b8299d2b0f034cbf178":[6,0,2,7,2], +"php2po_8php.html":[6,0,2,6], +"php2po_8php.html#a1594a11499d06cc8a789ee7ca0c7a12b":[6,0,2,6,7], +"php2po_8php.html#a401d84ce156e49e8168bd0c4781e1be1":[6,0,2,6,5], +"php2po_8php.html#a45b05625748f412ec97afcd61cf7980b":[6,0,2,6,6], +"php2po_8php.html#a48cb304902320d173a4eaa41543327b9":[6,0,2,6,3], +"php2po_8php.html#a61f8ddeb5557d46ebc546cc355bda214":[6,0,2,6,0], +"php2po_8php.html#a6b0b8ebd9ce811d1325ef2c129443bc0":[6,0,2,6,1], +"php2po_8php.html#abbb0e5fd8fbc1f13a9bf68f86eb3d2a4":[6,0,2,6,4], +"php2po_8php.html#ad6726cfaa85d4b8299d2b0f034cbf178":[6,0,2,6,2], "php_2default_8php.html":[6,0,3,0,1], "php_2default_8php.html#a3987f5547ceb7e36a210a66a06241a5a":[6,0,3,0,1,0], "php_2theme__init_8php.html":[6,0,3,0,7], "php_2theme__init_8php.html#a54f32c086fe209c99769a4c4047dd864":[6,0,3,0,7,0], -"php_8php.html":[6,0,1,80], -"php_8php.html#adb7164dfed9a4ecbe2e168e1e78f12f6":[6,0,1,80,0], +"php_8php.html":[6,0,1,79], +"php_8php.html#adb7164dfed9a4ecbe2e168e1e78f12f6":[6,0,1,79,0], "pine_8php.html":[6,0,3,1,0,2,8], -"ping_8php.html":[6,0,1,81], -"ping_8php.html#a77217b1b190b4c5d8770867b45f0c0a1":[6,0,1,81,0], +"ping_8php.html":[6,0,1,80], +"ping_8php.html#a77217b1b190b4c5d8770867b45f0c0a1":[6,0,1,80,0], "plugin_8php.html":[6,0,0,61], "plugin_8php.html#a030cec6793b909c439c0336ba39b1571":[6,0,0,61,23], "plugin_8php.html#a093a9cb98f51e3643634bd8bc6ed6e76":[6,0,0,61,26], @@ -62,22 +52,22 @@ var NAVTREEINDEX7 = "plugin_8php.html#af92789f559b89a380e49d303218aeeca":[6,0,0,61,10], "plugin_8php.html#af9ac19004dca49adae1ac7a0d9f3b025":[6,0,0,61,21], "plugin_8php.html#aff0178bd8d0b34a94d5efddc883edd35":[6,0,0,61,5], -"po2php_8php.html":[6,0,2,8], -"po2php_8php.html#a3b75e36f913198299e99559b175cd8b4":[6,0,2,8,0], -"poco_8php.html":[6,0,1,82], -"poco_8php.html#a53def16f75e3d41f1d2bb7cfa4905498":[6,0,1,82,0], -"poke_8php.html":[6,0,1,83], -"poke_8php.html#a9725aab97b3983e6a98bd81c4efe7d3b":[6,0,1,83,1], -"poke_8php.html#ac9190563a8da9c07a16f9dcd71cf6993":[6,0,1,83,0], -"poll_8php.html":[6,0,1,84], -"poll_8php.html#a26be9d4f230cb68f5be326198cfc6c77":[6,0,1,84,2], -"poll_8php.html#a3314c26bd2ac0ed831cebf3315cd3263":[6,0,1,84,0], -"poll_8php.html#ab9ecd5b71af090a5da9c93f34f7ec930":[6,0,1,84,1], +"po2php_8php.html":[6,0,2,7], +"po2php_8php.html#a3b75e36f913198299e99559b175cd8b4":[6,0,2,7,0], +"poco_8php.html":[6,0,1,81], +"poco_8php.html#a53def16f75e3d41f1d2bb7cfa4905498":[6,0,1,81,0], +"poke_8php.html":[6,0,1,82], +"poke_8php.html#a9725aab97b3983e6a98bd81c4efe7d3b":[6,0,1,82,1], +"poke_8php.html#ac9190563a8da9c07a16f9dcd71cf6993":[6,0,1,82,0], +"poll_8php.html":[6,0,1,83], +"poll_8php.html#a26be9d4f230cb68f5be326198cfc6c77":[6,0,1,83,2], +"poll_8php.html#a3314c26bd2ac0ed831cebf3315cd3263":[6,0,1,83,0], +"poll_8php.html#ab9ecd5b71af090a5da9c93f34f7ec930":[6,0,1,83,1], "poller_8php.html":[6,0,0,62], "poller_8php.html#a5f12df3a4738124b6c039971e87e76da":[6,0,0,62,0], -"post_8php.html":[6,0,1,85], -"post_8php.html#af4b48181ce773ef0cdfc972441445c34":[6,0,1,85,0], -"post_8php.html#af59e6a1dc22d19d9257b01cd7ccedb75":[6,0,1,85,1], +"post_8php.html":[6,0,1,84], +"post_8php.html#af4b48181ce773ef0cdfc972441445c34":[6,0,1,84,0], +"post_8php.html#af59e6a1dc22d19d9257b01cd7ccedb75":[6,0,1,84,1], "post__to__red_8php.html":[6,0,2,1,0,0], "post__to__red_8php.html#a085c250d4ceff5e4f10052f3d2039823":[6,0,2,1,0,0,16], "post__to__red_8php.html#a0f139dea77a94c98f26007963eea639c":[6,0,2,1,0,0,12], @@ -85,33 +75,32 @@ var NAVTREEINDEX7 = "post__to__red_8php.html#a4674bb5ce2baa32c559607460c39a2c5":[6,0,2,1,0,0,3], "post__to__red_8php.html#a49fd35f7b1cdddfe6e26ddfcf8d3c4ec":[6,0,2,1,0,0,1], "post__to__red_8php.html#a4d90ac085c14f53ff4d8ab4c23477ea6":[6,0,2,1,0,0,9], -"post__to__red_8php.html#a588cea66afe0b32f27f2713d44940119":[6,0,2,1,0,0,21], +"post__to__red_8php.html#a588cea66afe0b32f27f2713d44940119":[6,0,2,1,0,0,20], "post__to__red_8php.html#a5cc2a89a6d33cdb8e2ca557a69bef42d":[6,0,2,1,0,0,2], -"post__to__red_8php.html#a6210f39392a5f0fa0255cc7d3760493a":[6,0,2,1,0,0,22], +"post__to__red_8php.html#a6210f39392a5f0fa0255cc7d3760493a":[6,0,2,1,0,0,21], "post__to__red_8php.html#a75db5d87226a0287a0ac0fa315f2bcfd":[6,0,2,1,0,0,5], "post__to__red_8php.html#a7e68a8d9c83cb28d032aad3ea85ce0a6":[6,0,2,1,0,0,13], "post__to__red_8php.html#a8ec8f8809e3c5d1b2c9598c8185d63aa":[6,0,2,1,0,0,4], "post__to__red_8php.html#a906be8f72cf1aa2e199c0683ea6a4017":[6,0,2,1,0,0,15], "post__to__red_8php.html#a96d0ccecb96600ef1bfd50ab3f77315f":[6,0,2,1,0,0,10], -"post__to__red_8php.html#a99811555b30bde504a863e44015f2f19":[6,0,2,1,0,0,20], +"post__to__red_8php.html#a99811555b30bde504a863e44015f2f19":[6,0,2,1,0,0,19], "post__to__red_8php.html#aa97aeda12ef080665f16311a4e1eb901":[6,0,2,1,0,0,14], "post__to__red_8php.html#aacba7a0646fc00ae6ac4f5dc383fccab":[6,0,2,1,0,0,8], -"post__to__red_8php.html#ada8a7130088351710bb02ed622d6bf65":[6,0,2,1,0,0,19], +"post__to__red_8php.html#ada8a7130088351710bb02ed622d6bf65":[6,0,2,1,0,0,18], "post__to__red_8php.html#ae0b881461afbdba93d9329068ea52136":[6,0,2,1,0,0,7], "post__to__red_8php.html#ae6f3a2c0561cbeacda5be565b06de8a7":[6,0,2,1,0,0,6], "post__to__red_8php.html#aeec4125719184e7b097b3b9fba3101b5":[6,0,2,1,0,0,0], -"post__to__red_8php.html#af2713018a2dc97e88f121fc6215beb66":[6,0,2,1,0,0,18], -"post__to__red_8php.html#af3e7ebd361d4ed7cb6d43209970cd94a":[6,0,2,1,0,0,23], +"post__to__red_8php.html#af3e7ebd361d4ed7cb6d43209970cd94a":[6,0,2,1,0,0,22], "post__to__red_8php.html#af5fd50e2c42ede85f8a9e8d9ee3cf540":[6,0,2,1,0,0,11], -"pretheme_8php.html":[6,0,1,86], -"pretheme_8php.html#af5660943ee99db5fd75182316522eafe":[6,0,1,86,0], -"profile_8php.html":[6,0,1,88], -"profile_8php.html#a3775cf6eef6587e5143133356a7b76c0":[6,0,1,88,0], -"profile_8php.html#ab5d0246be0552e2182a585c1206d22a5":[6,0,1,88,1], -"profile__photo_8php.html":[6,0,1,89], -"profile__photo_8php.html#a140631c56438fbfacb61a1eb43067d02":[6,0,1,89,0], -"profile__photo_8php.html#a4b80234074bd603221aa5364f330e479":[6,0,1,89,1], -"profile__photo_8php.html#a561103564199da56e58061a4196eb102":[6,0,1,89,2], +"pretheme_8php.html":[6,0,1,85], +"pretheme_8php.html#af5660943ee99db5fd75182316522eafe":[6,0,1,85,0], +"profile_8php.html":[6,0,1,87], +"profile_8php.html#a3775cf6eef6587e5143133356a7b76c0":[6,0,1,87,0], +"profile_8php.html#ab5d0246be0552e2182a585c1206d22a5":[6,0,1,87,1], +"profile__photo_8php.html":[6,0,1,88], +"profile__photo_8php.html#a140631c56438fbfacb61a1eb43067d02":[6,0,1,88,0], +"profile__photo_8php.html#a4b80234074bd603221aa5364f330e479":[6,0,1,88,1], +"profile__photo_8php.html#a561103564199da56e58061a4196eb102":[6,0,1,88,2], "profile__selectors_8php.html":[6,0,0,64], "profile__selectors_8php.html#a3b50b3ea4ea4bdbebebfffc5d1b157c7":[6,0,0,64,4], "profile__selectors_8php.html#a7473dd095987e1cdcc79d4f0bb5e6798":[6,0,0,64,2], @@ -119,27 +108,27 @@ var NAVTREEINDEX7 = "profile__selectors_8php.html#ab0eae5c0ceba77364469f0f580f0d074":[6,0,0,64,5], "profile__selectors_8php.html#adc79715bd2e102b4583fb530749ec534":[6,0,0,64,3], "profile__selectors_8php.html#ae2b2c087e6530c61c0b256fd26d52355":[6,0,0,64,0], -"profiles_8php.html":[6,0,1,90], -"profiles_8php.html#a36f71405ad536228f8bb84a551b23f7e":[6,0,1,90,1], -"profiles_8php.html#a46975783b8b8d70402d51487eb1f0b00":[6,0,1,90,0], -"profiles_8php.html#ab0362c81b1d3b0b12a772b9fac446e04":[6,0,1,90,2], -"profperm_8php.html":[6,0,1,91], -"profperm_8php.html#a17fb64ec05edee1dc94d95438807d6c6":[6,0,1,91,1], -"profperm_8php.html#aef015787de2373d9fb3fe3f814fb5023":[6,0,1,91,0], -"pubsites_8php.html":[6,0,1,92], -"pubsites_8php.html#af614e279aab54065345bda6b03eafdf0":[6,0,1,92,0], +"profiles_8php.html":[6,0,1,89], +"profiles_8php.html#a36f71405ad536228f8bb84a551b23f7e":[6,0,1,89,1], +"profiles_8php.html#a46975783b8b8d70402d51487eb1f0b00":[6,0,1,89,0], +"profiles_8php.html#ab0362c81b1d3b0b12a772b9fac446e04":[6,0,1,89,2], +"profperm_8php.html":[6,0,1,90], +"profperm_8php.html#a17fb64ec05edee1dc94d95438807d6c6":[6,0,1,90,1], +"profperm_8php.html#aef015787de2373d9fb3fe3f814fb5023":[6,0,1,90,0], +"pubsites_8php.html":[6,0,1,91], +"pubsites_8php.html#af614e279aab54065345bda6b03eafdf0":[6,0,1,91,0], "queue_8php.html":[6,0,0,66], "queue_8php.html#af8c93de86d866c3200174c8450a0f341":[6,0,0,66,0], "queue__fn_8php.html":[6,0,0,67], "queue__fn_8php.html#a4c2876181f75a4a61e85b7f00dfdbba1":[6,0,0,67,1], "queue__fn_8php.html#a8fe71e981399bbf5d000a6ca42f57b24":[6,0,0,67,0], -"randprof_8php.html":[6,0,1,93], -"randprof_8php.html#abf5dba3c608b9304cbf68327cd31b090":[6,0,1,93,0], -"rbmark_8php.html":[6,0,1,94], -"rbmark_8php.html#a43fec4960b50926251574762cc491f76":[6,0,1,94,0], -"rbmark_8php.html#ac5a66aa8599fa5dc702bae396d8d1f8c":[6,0,1,94,1], -"receive_8php.html":[6,0,1,95], -"receive_8php.html#a03d8fa26e77844020ba5602deca7d494":[6,0,1,95,0], +"randprof_8php.html":[6,0,1,92], +"randprof_8php.html#abf5dba3c608b9304cbf68327cd31b090":[6,0,1,92,0], +"rbmark_8php.html":[6,0,1,93], +"rbmark_8php.html#a43fec4960b50926251574762cc491f76":[6,0,1,93,0], +"rbmark_8php.html#ac5a66aa8599fa5dc702bae396d8d1f8c":[6,0,1,93,1], +"receive_8php.html":[6,0,1,94], +"receive_8php.html#a03d8fa26e77844020ba5602deca7d494":[6,0,1,94,0], "redable_8php.html":[6,0,3,0,6], "redable_8php.html#a3987f5547ceb7e36a210a66a06241a5a":[6,0,3,0,6,0], "redbasic_2php_2style_8php.html":[6,0,3,1,3,0,1], @@ -152,33 +141,33 @@ var NAVTREEINDEX7 = "reddav_8php.html#a5df0d09893f2e65dc5cf6bbab6cfb266":[6,0,0,68,5], "reddav_8php.html#a9f531641dfb4e43cd88ac1a9ae7e2088":[6,0,0,68,6], "reddav_8php.html#ae92ea0df1993f6a7bcd1b6efa6c1fb66":[6,0,0,68,4], -"register_8php.html":[6,0,1,96], -"register_8php.html#a0e91f57f111407ea8d3223a05022bb2a":[6,0,1,96,0], -"register_8php.html#a51731dcc1917c58a790eb1c0f6132271":[6,0,1,96,2], -"register_8php.html#ae20c0cd40f738d6295de58b9202c83d5":[6,0,1,96,1], -"regmod_8php.html":[6,0,1,97], -"regmod_8php.html#a7953df4e32e63946565e90cdd5d50409":[6,0,1,97,0], -"regver_8php.html":[6,0,1,98], -"regver_8php.html#ad2c5f644fd1b099abd7c715b7df6f50f":[6,0,1,98,0], -"removeaccount_8php.html":[6,0,1,99], -"removeaccount_8php.html#a26a3325292e932c59793430ab737126a":[6,0,1,99,1], -"removeaccount_8php.html#a516e7380b9e5796054aa8245f3509695":[6,0,1,99,0], -"removeme_8php.html":[6,0,1,100], -"removeme_8php.html#a065a589caa2aa84c60f7073a28f0ad9c":[6,0,1,100,0], -"removeme_8php.html#a7be08738beca44bb98a79e01cdb2ee88":[6,0,1,100,1], -"rmagic_8php.html":[6,0,1,101], -"rmagic_8php.html#a3e28db1e5cfa7e5c2617f90222c1caef":[6,0,1,101,0], -"rmagic_8php.html#a869de069d081b3c4e98b957d06bbf08f":[6,0,1,101,2], -"rmagic_8php.html#a95455edd43f1bff39446a57388cdde16":[6,0,1,101,1], -"rpost_8php.html":[6,0,1,102], -"rpost_8php.html#a8190354d789000806d9879aea276728f":[6,0,1,102,0], -"rsd__xml_8php.html":[6,0,1,103], -"rsd__xml_8php.html#a740cd02fa15e5a53f8547fac73f0ab82":[6,0,1,103,0], -"search_8php.html":[6,0,1,104], -"search_8php.html#ab2568591359edde5b483a6cd9a24b2cc":[6,0,1,104,0], -"search_8php.html#acf19fd30f07f495781ca0d7a0a08b435":[6,0,1,104,1], -"search__ac_8php.html":[6,0,1,105], -"search__ac_8php.html#a14f90c83a3f2be095e9e2992a8d66138":[6,0,1,105,0], +"register_8php.html":[6,0,1,95], +"register_8php.html#a0e91f57f111407ea8d3223a05022bb2a":[6,0,1,95,0], +"register_8php.html#a51731dcc1917c58a790eb1c0f6132271":[6,0,1,95,2], +"register_8php.html#ae20c0cd40f738d6295de58b9202c83d5":[6,0,1,95,1], +"regmod_8php.html":[6,0,1,96], +"regmod_8php.html#a7953df4e32e63946565e90cdd5d50409":[6,0,1,96,0], +"regver_8php.html":[6,0,1,97], +"regver_8php.html#ad2c5f644fd1b099abd7c715b7df6f50f":[6,0,1,97,0], +"removeaccount_8php.html":[6,0,1,98], +"removeaccount_8php.html#a26a3325292e932c59793430ab737126a":[6,0,1,98,1], +"removeaccount_8php.html#a516e7380b9e5796054aa8245f3509695":[6,0,1,98,0], +"removeme_8php.html":[6,0,1,99], +"removeme_8php.html#a065a589caa2aa84c60f7073a28f0ad9c":[6,0,1,99,0], +"removeme_8php.html#a7be08738beca44bb98a79e01cdb2ee88":[6,0,1,99,1], +"rmagic_8php.html":[6,0,1,100], +"rmagic_8php.html#a3e28db1e5cfa7e5c2617f90222c1caef":[6,0,1,100,0], +"rmagic_8php.html#a869de069d081b3c4e98b957d06bbf08f":[6,0,1,100,2], +"rmagic_8php.html#a95455edd43f1bff39446a57388cdde16":[6,0,1,100,1], +"rpost_8php.html":[6,0,1,101], +"rpost_8php.html#a8190354d789000806d9879aea276728f":[6,0,1,101,0], +"rsd__xml_8php.html":[6,0,1,102], +"rsd__xml_8php.html#a740cd02fa15e5a53f8547fac73f0ab82":[6,0,1,102,0], +"search_8php.html":[6,0,1,103], +"search_8php.html#ab2568591359edde5b483a6cd9a24b2cc":[6,0,1,103,0], +"search_8php.html#acf19fd30f07f495781ca0d7a0a08b435":[6,0,1,103,1], +"search__ac_8php.html":[6,0,1,104], +"search__ac_8php.html#a14f90c83a3f2be095e9e2992a8d66138":[6,0,1,104,0], "security_8php.html":[6,0,0,69], "security_8php.html#a20f8b9851f23ee8894b8925584ef6821":[6,0,0,69,2], "security_8php.html#a3ef2be6a7e4928e39d50059d6feb457c":[6,0,0,69,11], @@ -203,38 +192,38 @@ var NAVTREEINDEX7 = "session_8php.html#ac95373f4966862a028033dd2f94d4da1":[6,0,0,70,3], "session_8php.html#af0100a2642a5268594bbd5742a03d885":[6,0,0,70,9], "session_8php.html#af230b86bfff7db66c3bdd7e0bbc24052":[6,0,0,70,2], -"settings_8php.html":[6,0,1,106], -"settings_8php.html#a39abc76ff5459c57e3b957664f273f18":[6,0,1,106,0], -"settings_8php.html#a3a4cde287482fced008583f54ba2a722":[6,0,1,106,1], -"settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586":[6,0,1,106,2], -"setup_8php.html":[6,0,1,107], -"setup_8php.html#a0c3f3b671381f6dccd924b8ecdfc56c4":[6,0,1,107,2], -"setup_8php.html#a13cf286774149a0a7bd8adb8179cec75":[6,0,1,107,14], -"setup_8php.html#a14d208682a88632290c895d20da6e7d6":[6,0,1,107,5], -"setup_8php.html#a267555abd17290e659b4bf44b885e4e0":[6,0,1,107,13], -"setup_8php.html#a2b375ddc555140236fc500135de99371":[6,0,1,107,10], -"setup_8php.html#a5ad92c0857d1dadd6b60a9a557159c9f":[6,0,1,107,3], -"setup_8php.html#a69a450e06dd3771fb51d3e4b0266a35e":[6,0,1,107,1], -"setup_8php.html#a8652788e8589778c5f81634a9d5b9429":[6,0,1,107,8], -"setup_8php.html#a88247384a96e14516f474d7af6a465c1":[6,0,1,107,12], -"setup_8php.html#aa3bbb111780da70ba35cc23a306f2c76":[6,0,1,107,4], -"setup_8php.html#ab4b71369a25021d59247c917e98d8246":[6,0,1,107,7], -"setup_8php.html#abe405d227ba7232971964a706d4f3bce":[6,0,1,107,11], -"setup_8php.html#ad2e0375a9ab87ebe6e78124ee125054a":[6,0,1,107,9], -"setup_8php.html#addb24714bc2542aa4f4215e98fe48432":[6,0,1,107,16], -"setup_8php.html#ae8e4d9279a61de74d5f39962cb7b6ca1":[6,0,1,107,0], -"setup_8php.html#aea1ebdda58ec938f4e7b31aa5c5f6b58":[6,0,1,107,15], -"setup_8php.html#afd8b0b3ade1507c45325caf377bf459d":[6,0,1,107,6], -"share_8php.html":[6,0,1,108], -"share_8php.html#afeb26046bdd02567ecd29ab5f188b249":[6,0,1,108,0], -"siteinfo_8php.html":[6,0,1,109], -"siteinfo_8php.html#a3efbd0bd6564af19ec0a9ce0294e59d0":[6,0,1,109,1], -"siteinfo_8php.html#a70c09bfb6dd1c86a125a35f62ed53656":[6,0,1,109,0], -"sitelist_8php.html":[6,0,1,110], -"sitelist_8php.html#a665a59bf60f780b40f32c909f4a473b1":[6,0,1,110,0], +"settings_8php.html":[6,0,1,105], +"settings_8php.html#a39abc76ff5459c57e3b957664f273f18":[6,0,1,105,0], +"settings_8php.html#a3a4cde287482fced008583f54ba2a722":[6,0,1,105,1], +"settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586":[6,0,1,105,2], +"setup_8php.html":[6,0,1,106], +"setup_8php.html#a0c3f3b671381f6dccd924b8ecdfc56c4":[6,0,1,106,2], +"setup_8php.html#a13cf286774149a0a7bd8adb8179cec75":[6,0,1,106,14], +"setup_8php.html#a14d208682a88632290c895d20da6e7d6":[6,0,1,106,5], +"setup_8php.html#a267555abd17290e659b4bf44b885e4e0":[6,0,1,106,13], +"setup_8php.html#a2b375ddc555140236fc500135de99371":[6,0,1,106,10], +"setup_8php.html#a5ad92c0857d1dadd6b60a9a557159c9f":[6,0,1,106,3], +"setup_8php.html#a69a450e06dd3771fb51d3e4b0266a35e":[6,0,1,106,1], +"setup_8php.html#a8652788e8589778c5f81634a9d5b9429":[6,0,1,106,8], +"setup_8php.html#a88247384a96e14516f474d7af6a465c1":[6,0,1,106,12], +"setup_8php.html#aa3bbb111780da70ba35cc23a306f2c76":[6,0,1,106,4], +"setup_8php.html#ab4b71369a25021d59247c917e98d8246":[6,0,1,106,7], +"setup_8php.html#abe405d227ba7232971964a706d4f3bce":[6,0,1,106,11], +"setup_8php.html#ad2e0375a9ab87ebe6e78124ee125054a":[6,0,1,106,9], +"setup_8php.html#addb24714bc2542aa4f4215e98fe48432":[6,0,1,106,16], +"setup_8php.html#ae8e4d9279a61de74d5f39962cb7b6ca1":[6,0,1,106,0], +"setup_8php.html#aea1ebdda58ec938f4e7b31aa5c5f6b58":[6,0,1,106,15], +"setup_8php.html#afd8b0b3ade1507c45325caf377bf459d":[6,0,1,106,6], +"share_8php.html":[6,0,1,107], +"share_8php.html#afeb26046bdd02567ecd29ab5f188b249":[6,0,1,107,0], +"siteinfo_8php.html":[6,0,1,108], +"siteinfo_8php.html#a3efbd0bd6564af19ec0a9ce0294e59d0":[6,0,1,108,1], +"siteinfo_8php.html#a70c09bfb6dd1c86a125a35f62ed53656":[6,0,1,108,0], +"sitelist_8php.html":[6,0,1,109], +"sitelist_8php.html#a665a59bf60f780b40f32c909f4a473b1":[6,0,1,109,0], "smarty_8php.html":[6,0,0,71], -"smilies_8php.html":[6,0,1,111], -"smilies_8php.html#ab43b1e9f33a700a830aff14c7b3a617f":[6,0,1,111,0], +"smilies_8php.html":[6,0,1,110], +"smilies_8php.html#ab43b1e9f33a700a830aff14c7b3a617f":[6,0,1,110,0], "socgraph_8php.html":[6,0,0,72], "socgraph_8php.html#a16ac51c505d72987ed8d6d6aed0e8586":[6,0,0,72,0], "socgraph_8php.html#a5ef8bef37161df53718a21e93d02fbd6":[6,0,0,72,6], @@ -245,9 +234,20 @@ var NAVTREEINDEX7 = "socgraph_8php.html#ac343a846241d36cdf046b08f3396cfe9":[6,0,0,72,2], "socgraph_8php.html#af175807406d94407a5e11742a3287746":[6,0,0,72,5], "socgraph_8php.html#af29d056beec10b4e38e5209c92452894":[6,0,0,72,3], -"sources_8php.html":[6,0,1,112], -"sources_8php.html#ac442ccef080ab95772d8929fcafcb4b7":[6,0,1,112,0], -"sources_8php.html#ac73298ff162ce7b2de8dcaf3d3305b1e":[6,0,1,112,1], +"sources_8php.html":[6,0,1,111], +"sources_8php.html#ac442ccef080ab95772d8929fcafcb4b7":[6,0,1,111,0], +"sources_8php.html#ac73298ff162ce7b2de8dcaf3d3305b1e":[6,0,1,111,1], "spam_8php.html":[6,0,0,73], -"spam_8php.html#a05861201147b9a538d006f0269255cf9":[6,0,0,73,1] +"spam_8php.html#a05861201147b9a538d006f0269255cf9":[6,0,0,73,1], +"spam_8php.html#ab8fd81a82c9622cbebb8ceab6b310ca6":[6,0,0,73,0], +"sslify_8php.html":[6,0,1,112], +"sslify_8php.html#a75b11e54a3d1fc83e7d4c0e8b4dab316":[6,0,1,112,0], +"starred_8php.html":[6,0,1,113], +"starred_8php.html#a63024fb418c678e49fd535e3752d349a":[6,0,1,113,0], +"subthread_8php.html":[6,0,1,114], +"subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3":[6,0,1,114,0], +"suggest_8php.html":[6,0,1,115], +"suggest_8php.html#a58748a8235d4523f8333847f3e42dd91":[6,0,1,115,0], +"suggest_8php.html#a696acf1dd8070e479adcc80c63c6718c":[6,0,1,115,1], +"system__unavailable_8php.html":[6,0,0,74] }; diff --git a/doc/html/navtreeindex8.js b/doc/html/navtreeindex8.js index 03c1f0fef..5ec9e888f 100644 --- a/doc/html/navtreeindex8.js +++ b/doc/html/navtreeindex8.js @@ -1,22 +1,11 @@ var NAVTREEINDEX8 = { -"spam_8php.html#ab8fd81a82c9622cbebb8ceab6b310ca6":[6,0,0,73,0], -"sslify_8php.html":[6,0,1,113], -"sslify_8php.html#a75b11e54a3d1fc83e7d4c0e8b4dab316":[6,0,1,113,0], -"starred_8php.html":[6,0,1,114], -"starred_8php.html#a63024fb418c678e49fd535e3752d349a":[6,0,1,114,0], -"subthread_8php.html":[6,0,1,115], -"subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3":[6,0,1,115,0], -"suggest_8php.html":[6,0,1,116], -"suggest_8php.html#a58748a8235d4523f8333847f3e42dd91":[6,0,1,116,0], -"suggest_8php.html#a696acf1dd8070e479adcc80c63c6718c":[6,0,1,116,1], -"system__unavailable_8php.html":[6,0,0,74], "system__unavailable_8php.html#a73751a6bcc17ad3ca503496e2fb020fa":[6,0,0,74,0], -"tagger_8php.html":[6,0,1,117], -"tagger_8php.html#a0e4a3eb177d1684553c547503d67161c":[6,0,1,117,0], -"tagrm_8php.html":[6,0,1,118], -"tagrm_8php.html#a1702f40aa53a2fa93deade1f609abe78":[6,0,1,118,1], -"tagrm_8php.html#adfd4ea5b4d7fc6d9c9e042af5cd7d49a":[6,0,1,118,0], +"tagger_8php.html":[6,0,1,116], +"tagger_8php.html#a0e4a3eb177d1684553c547503d67161c":[6,0,1,116,0], +"tagrm_8php.html":[6,0,1,117], +"tagrm_8php.html#a1702f40aa53a2fa93deade1f609abe78":[6,0,1,117,1], +"tagrm_8php.html#adfd4ea5b4d7fc6d9c9e042af5cd7d49a":[6,0,1,117,0], "taxonomy_8php.html":[6,0,0,75], "taxonomy_8php.html#a03f55ee46c5f496e42f3d29db8d09cce":[6,0,0,75,9], "taxonomy_8php.html#a088371f4bc19155b2291508f5cd63332":[6,0,0,75,0], @@ -145,44 +134,44 @@ var NAVTREEINDEX8 = "theme_2mytheme_2php_2default_8php.html":[6,0,3,1,2,0,0], "theme_2mytheme_2php_2default_8php.html#a3987f5547ceb7e36a210a66a06241a5a":[6,0,3,1,2,0,0,0], "theme_2redbasic_2php_2theme__init_8php.html":[6,0,3,1,3,0,3], -"thing_8php.html":[6,0,1,119], -"thing_8php.html#a24a35f1e64029a67fdbea94a776ae04b":[6,0,1,119,0], -"thing_8php.html#a8be23b1d475ec3d9291999221c674c80":[6,0,1,119,1], +"thing_8php.html":[6,0,1,118], +"thing_8php.html#a24a35f1e64029a67fdbea94a776ae04b":[6,0,1,118,0], +"thing_8php.html#a8be23b1d475ec3d9291999221c674c80":[6,0,1,118,1], "todo.html":[3], -"toggle__mobile_8php.html":[6,0,1,120], -"toggle__mobile_8php.html#aca53ade8971802b45c31e722b22c6254":[6,0,1,120,0], -"toggle__safesearch_8php.html":[6,0,1,121], -"toggle__safesearch_8php.html#a23d5cfb2727a266e44993ffbf5595a79":[6,0,1,121,0], -"tpldebug_8php.html":[6,0,2,9], -"tpldebug_8php.html#a44778457a6c02554812fbfad19d32ba3":[6,0,2,9,0], -"tpldebug_8php.html#a5358407d65f2ca826f96356a6642d149":[6,0,2,9,1], -"tpldebug_8php.html#afbc7aadb3f7ff1edf0aaaa326a42179c":[6,0,2,9,2], -"typo_8php.html":[6,0,2,10], -"typo_8php.html#a1b709c1d79631ebc8320b41bda028b54":[6,0,2,10,1], -"typo_8php.html#a329c9c12217d2c8660c47bbc7c8df4c5":[6,0,2,10,4], -"typo_8php.html#a3ecd17ac846be1b35f3662f5c12ab6bd":[6,0,2,10,3], -"typo_8php.html#a9590b15215a21e9b42eb546aeef79704":[6,0,2,10,2], -"typo_8php.html#acebf83966ef6d7e5645a6b62ba368f9f":[6,0,2,10,0], -"typohelper_8php.html":[6,0,2,11], -"typohelper_8php.html#a7542d95618011800c61773127fa625cf":[6,0,2,11,0], -"typohelper_8php.html#ab6fd357fb5b2a3ba8aab9e8b98c6a805":[6,0,2,11,1], -"uexport_8php.html":[6,0,1,122], -"uexport_8php.html#a118920137dedebe0581623a2e57e7b0d":[6,0,1,122,0], -"update__channel_8php.html":[6,0,1,123], -"update__channel_8php.html#aca52a9da500f0db2f0a8666af5bc06ba":[6,0,1,123,0], -"update__display_8php.html":[6,0,1,124], -"update__display_8php.html#aa36ac524059e209d5d75a03c16206246":[6,0,1,124,0], -"update__network_8php.html":[6,0,1,125], -"update__network_8php.html#a8abf5b9f65af6a27ee2f9d7207ed1b41":[6,0,1,125,0], -"update__search_8php.html":[6,0,1,126], -"update__search_8php.html#ace4c3a23fa7d6922399e27c297a6ba52":[6,0,1,126,0], -"updatetpl_8py.html":[6,0,2,12], -"updatetpl_8py.html#a52a85ffa6b6d63d840b185a133478c12":[6,0,2,12,5], -"updatetpl_8py.html#a79c20eb62d568c999b56eb08530355d3":[6,0,2,12,2], -"updatetpl_8py.html#a988d937ed5d5c2b592b763036af5cf94":[6,0,2,12,1], -"updatetpl_8py.html#ab42dd79af65ee82201fd6f04715f62f6":[6,0,2,12,3], -"updatetpl_8py.html#ac9d11279fed403a329a719298feafc4f":[6,0,2,12,0], -"updatetpl_8py.html#ae694f5e1f25f8a92a945eb90c432dfe6":[6,0,2,12,4], +"toggle__mobile_8php.html":[6,0,1,119], +"toggle__mobile_8php.html#aca53ade8971802b45c31e722b22c6254":[6,0,1,119,0], +"toggle__safesearch_8php.html":[6,0,1,120], +"toggle__safesearch_8php.html#a23d5cfb2727a266e44993ffbf5595a79":[6,0,1,120,0], +"tpldebug_8php.html":[6,0,2,8], +"tpldebug_8php.html#a44778457a6c02554812fbfad19d32ba3":[6,0,2,8,0], +"tpldebug_8php.html#a5358407d65f2ca826f96356a6642d149":[6,0,2,8,1], +"tpldebug_8php.html#afbc7aadb3f7ff1edf0aaaa326a42179c":[6,0,2,8,2], +"typo_8php.html":[6,0,2,9], +"typo_8php.html#a1b709c1d79631ebc8320b41bda028b54":[6,0,2,9,1], +"typo_8php.html#a329c9c12217d2c8660c47bbc7c8df4c5":[6,0,2,9,4], +"typo_8php.html#a3ecd17ac846be1b35f3662f5c12ab6bd":[6,0,2,9,3], +"typo_8php.html#a9590b15215a21e9b42eb546aeef79704":[6,0,2,9,2], +"typo_8php.html#acebf83966ef6d7e5645a6b62ba368f9f":[6,0,2,9,0], +"typohelper_8php.html":[6,0,2,10], +"typohelper_8php.html#a7542d95618011800c61773127fa625cf":[6,0,2,10,0], +"typohelper_8php.html#ab6fd357fb5b2a3ba8aab9e8b98c6a805":[6,0,2,10,1], +"uexport_8php.html":[6,0,1,121], +"uexport_8php.html#a118920137dedebe0581623a2e57e7b0d":[6,0,1,121,0], +"update__channel_8php.html":[6,0,1,122], +"update__channel_8php.html#aca52a9da500f0db2f0a8666af5bc06ba":[6,0,1,122,0], +"update__display_8php.html":[6,0,1,123], +"update__display_8php.html#aa36ac524059e209d5d75a03c16206246":[6,0,1,123,0], +"update__network_8php.html":[6,0,1,124], +"update__network_8php.html#a8abf5b9f65af6a27ee2f9d7207ed1b41":[6,0,1,124,0], +"update__search_8php.html":[6,0,1,125], +"update__search_8php.html#ace4c3a23fa7d6922399e27c297a6ba52":[6,0,1,125,0], +"updatetpl_8py.html":[6,0,2,11], +"updatetpl_8py.html#a52a85ffa6b6d63d840b185a133478c12":[6,0,2,11,5], +"updatetpl_8py.html#a79c20eb62d568c999b56eb08530355d3":[6,0,2,11,2], +"updatetpl_8py.html#a988d937ed5d5c2b592b763036af5cf94":[6,0,2,11,1], +"updatetpl_8py.html#ab42dd79af65ee82201fd6f04715f62f6":[6,0,2,11,3], +"updatetpl_8py.html#ac9d11279fed403a329a719298feafc4f":[6,0,2,11,0], +"updatetpl_8py.html#ae694f5e1f25f8a92a945eb90c432dfe6":[6,0,2,11,4], "view_2theme_2apw_2php_2config_8php.html":[6,0,3,1,0,1,0], "view_2theme_2apw_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d":[6,0,3,1,0,1,0,1], "view_2theme_2apw_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6":[6,0,3,1,0,1,0,2], @@ -203,27 +192,27 @@ var NAVTREEINDEX8 = "view_2theme_2redbasic_2php_2config_8php.html#a8574a41fa9735ee391ba57ab24b93793":[6,0,3,1,3,0,0,0], "view_2theme_2redbasic_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d":[6,0,3,1,3,0,0,1], "view_2theme_2redbasic_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6":[6,0,3,1,3,0,0,2], -"view_8php.html":[6,0,1,127], -"view_8php.html#ac168f6c61a91ba2063f13b441c0ae96e":[6,0,1,127,0], -"viewconnections_8php.html":[6,0,1,128], -"viewconnections_8php.html#a00163d50b17568f7b0e48b1ca9ab7330":[6,0,1,128,1], -"viewconnections_8php.html#ab6c4d983e97b3a8a879567ff76507776":[6,0,1,128,0], -"viewsrc_8php.html":[6,0,1,129], -"viewsrc_8php.html#a6eff3d0c1d7d14b335c4edb785cd60a4":[6,0,1,129,0], -"vote_8php.html":[6,0,1,130], -"vote_8php.html#a57a9516ee1b923b224e66dcc47377fb2":[6,0,1,130,2], -"vote_8php.html#a6aa67489bf458ca5e3206e46dac68596":[6,0,1,130,0], -"vote_8php.html#ae0c6610f40afbbc1f4fe6494c51fbab2":[6,0,1,130,1], -"wall__attach_8php.html":[6,0,1,131], -"wall__attach_8php.html#a7385e970e93228d082f0fd7254f6e653":[6,0,1,131,0], -"wall__upload_8php.html":[6,0,1,132], -"wall__upload_8php.html#a7cbe204244cf9e0380ee932263a74d8f":[6,0,1,132,0], -"webfinger_8php.html":[6,0,1,133], -"webfinger_8php.html#a17dd28db6d390194bf9ecb809739d1d3":[6,0,1,133,0], -"webpages_8php.html":[6,0,1,134], -"webpages_8php.html#af3b7397d4abc153e3d2147740ee1a41d":[6,0,1,134,0], -"wfinger_8php.html":[6,0,1,135], -"wfinger_8php.html#ae21e50c8d0a5f3c9be9f43a4e519acd3":[6,0,1,135,0], +"view_8php.html":[6,0,1,126], +"view_8php.html#ac168f6c61a91ba2063f13b441c0ae96e":[6,0,1,126,0], +"viewconnections_8php.html":[6,0,1,127], +"viewconnections_8php.html#a00163d50b17568f7b0e48b1ca9ab7330":[6,0,1,127,1], +"viewconnections_8php.html#ab6c4d983e97b3a8a879567ff76507776":[6,0,1,127,0], +"viewsrc_8php.html":[6,0,1,128], +"viewsrc_8php.html#a6eff3d0c1d7d14b335c4edb785cd60a4":[6,0,1,128,0], +"vote_8php.html":[6,0,1,129], +"vote_8php.html#a57a9516ee1b923b224e66dcc47377fb2":[6,0,1,129,2], +"vote_8php.html#a6aa67489bf458ca5e3206e46dac68596":[6,0,1,129,0], +"vote_8php.html#ae0c6610f40afbbc1f4fe6494c51fbab2":[6,0,1,129,1], +"wall__attach_8php.html":[6,0,1,130], +"wall__attach_8php.html#a7385e970e93228d082f0fd7254f6e653":[6,0,1,130,0], +"wall__upload_8php.html":[6,0,1,131], +"wall__upload_8php.html#a7cbe204244cf9e0380ee932263a74d8f":[6,0,1,131,0], +"webfinger_8php.html":[6,0,1,132], +"webfinger_8php.html#a17dd28db6d390194bf9ecb809739d1d3":[6,0,1,132,0], +"webpages_8php.html":[6,0,1,133], +"webpages_8php.html#af3b7397d4abc153e3d2147740ee1a41d":[6,0,1,133,0], +"wfinger_8php.html":[6,0,1,134], +"wfinger_8php.html#ae21e50c8d0a5f3c9be9f43a4e519acd3":[6,0,1,134,0], "widedarkness_8php.html":[6,0,3,1,0,2,10], "widgets_8php.html":[6,0,0,78], "widgets_8php.html#a08035db02ff6a23260146b4c64153422":[6,0,0,78,11], @@ -249,5 +238,16 @@ var NAVTREEINDEX8 = "widgets_8php.html#aaa73bcf1702eaadd9dcd253502f55e01":[6,0,0,78,24], "widgets_8php.html#abd2e508a2a0b911c4a838e3cb7599923":[6,0,0,78,22], "widgets_8php.html#abe03366fd22fd27d683518fa0765da50":[6,0,0,78,29], -"widgets_8php.html#aced5cb177f630b30799c5eab873ee75c":[6,0,0,78,1] +"widgets_8php.html#aced5cb177f630b30799c5eab873ee75c":[6,0,0,78,1], +"widgets_8php.html#ad1bf7aa69e8d100d95faba17c7bc91cd":[6,0,0,78,14], +"widgets_8php.html#add9b24d3304e529a7975e96122315554":[6,0,0,78,0], +"widgets_8php.html#ade630b19fb4c622b7b2f6f8ef89eefa2":[6,0,0,78,13], +"widgets_8php.html#ae4ced69d83dbdd9e6b51660d9eba8653":[6,0,0,78,28], +"widgets_8php.html#af37fdad3b2e861d860a4a8c4d8a76c0b":[6,0,0,78,4], +"widgets_8php.html#afa2e55a78f95667a6da082efac7fec74":[6,0,0,78,17], +"xchan_8php.html":[6,0,1,135], +"xchan_8php.html#a9853348bf1a35c644460221ba75edc2d":[6,0,1,135,0], +"xrd_8php.html":[6,0,1,136], +"xrd_8php.html#aee3cf087968e4a0ff3a87de16eb23270":[6,0,1,136,0], +"xref_8php.html":[6,0,1,137] }; diff --git a/doc/html/navtreeindex9.js b/doc/html/navtreeindex9.js index ff97ed5cf..3160df6d3 100644 --- a/doc/html/navtreeindex9.js +++ b/doc/html/navtreeindex9.js @@ -1,19 +1,8 @@ var NAVTREEINDEX9 = { -"widgets_8php.html#ad1bf7aa69e8d100d95faba17c7bc91cd":[6,0,0,78,14], -"widgets_8php.html#add9b24d3304e529a7975e96122315554":[6,0,0,78,0], -"widgets_8php.html#ade630b19fb4c622b7b2f6f8ef89eefa2":[6,0,0,78,13], -"widgets_8php.html#ae4ced69d83dbdd9e6b51660d9eba8653":[6,0,0,78,28], -"widgets_8php.html#af37fdad3b2e861d860a4a8c4d8a76c0b":[6,0,0,78,4], -"widgets_8php.html#afa2e55a78f95667a6da082efac7fec74":[6,0,0,78,17], -"xchan_8php.html":[6,0,1,136], -"xchan_8php.html#a9853348bf1a35c644460221ba75edc2d":[6,0,1,136,0], -"xrd_8php.html":[6,0,1,137], -"xrd_8php.html#aee3cf087968e4a0ff3a87de16eb23270":[6,0,1,137,0], -"xref_8php.html":[6,0,1,138], -"xref_8php.html#a9bee399213b8de8226b0d60834307473":[6,0,1,138,0], -"zfinger_8php.html":[6,0,1,139], -"zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0":[6,0,1,139,0], +"xref_8php.html#a9bee399213b8de8226b0d60834307473":[6,0,1,137,0], +"zfinger_8php.html":[6,0,1,138], +"zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0":[6,0,1,138,0], "zot_8php.html":[6,0,0,79], "zot_8php.html#a083aec6c900d244e1bfc1406f9461465":[6,0,0,79,14], "zot_8php.html#a0fc2211c5309d9f925ecc4115e3fdb75":[6,0,0,79,9], @@ -44,8 +33,8 @@ var NAVTREEINDEX9 = "zot_8php.html#adfeb9400ae6b726beec89f8f1e8fde72":[6,0,0,79,2], "zot_8php.html#ae7cec2b417b5858fd4a41070f843d1d7":[6,0,0,79,21], "zot_8php.html#aeea071f17e306fe3d0c488551906bfab":[6,0,0,79,23], -"zotfeed_8php.html":[6,0,1,140], -"zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac":[6,0,1,140,0], -"zping_8php.html":[6,0,1,141], -"zping_8php.html#a4d3a6b0b8b04ed6469015823e615ee75":[6,0,1,141,0] +"zotfeed_8php.html":[6,0,1,139], +"zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac":[6,0,1,139,0], +"zping_8php.html":[6,0,1,140], +"zping_8php.html#a4d3a6b0b8b04ed6469015823e615ee75":[6,0,1,140,0] }; diff --git a/doc/html/permissions_8php.html b/doc/html/permissions_8php.html index 24c4d09f4..f4baf95c3 100644 --- a/doc/html/permissions_8php.html +++ b/doc/html/permissions_8php.html @@ -122,6 +122,8 @@ Functions    site_default_perms ()   + get_role_perms ($role) + 

                Function Documentation

                @@ -216,6 +218,30 @@ Functions

                Referenced by connedit_content(), create_identity(), get_all_perms(), mail_post(), new_contact(), perm_is_allowed(), site_default_perms(), and zot_refresh().

                + + + +
                +
                + + + + + + + + +
                get_role_perms ( $role)
                +
                +

                get_role_perms($role)

                +
                Parameters
                + + +
                string$roleGiven a string for the channel role ('social','forum', etc) return an array of all permission fields pre-filled for this role. This includes the channel permission scope indicators as well as perms_auto: The permissions to apply automatically on receipt of a connection request perms_follow: The permissions to apply when initiating a connection request to another channel perms_accept: The permissions to apply when accepting a connection request from another channel (not automatic)
                +
                +
                +

                Any attributes may be extended (new roles defined) and modified (specific permissions altered) by plugins

                +
                @@ -248,7 +274,7 @@ Functions
                -

                Referenced by Conversation\add_thread(), advanced_profile(), api_statuses_home_timeline(), api_statuses_repeat(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_mkdir(), attach_store(), block_content(), chat_content(), chatsvc_init(), check_list_permissions(), common_content(), common_friends_visitor_widget(), contact_block(), RedDirectory\createDirectory(), RedDirectory\createFile(), RedFile\delete(), display_content(), editblock_content(), get_feed_for(), RedDirectory\getChild(), RedDirectory\getChildren(), item_post(), like_content(), local_dir_update(), photo_init(), photo_upload(), photos_album_widget(), photos_albums_list(), photos_content(), photos_list_photos(), photos_post(), poco_init(), post_activity_item(), post_post(), process_delivery(), process_mail_delivery(), profile_content(), profile_load(), profile_sidebar(), RedChannelList(), search_content(), Conversation\set_mode(), RedBrowser\set_writeable(), RedDirectory\setName(), RedFile\setName(), subthread_content(), tag_deliver(), tgroup_check(), update_birthdays(), viewconnections_content(), widget_archive(), widget_categories(), widget_item(), widget_photo_albums(), widget_tagcloud_wall(), z_readdir(), and zot_feed().

                +

                Referenced by Conversation\add_thread(), advanced_profile(), api_statuses_home_timeline(), api_statuses_repeat(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_mkdir(), attach_store(), block_content(), chat_content(), chatsvc_init(), check_list_permissions(), common_content(), common_friends_visitor_widget(), contact_block(), RedDirectory\createDirectory(), RedDirectory\createFile(), RedFile\delete(), diaspora_asphoto(), diaspora_comment(), diaspora_like(), diaspora_photo(), diaspora_post(), diaspora_reshare(), display_content(), editblock_content(), get_feed_for(), RedDirectory\getChild(), RedDirectory\getChildren(), item_post(), like_content(), local_dir_update(), photo_init(), photo_upload(), photos_album_widget(), photos_albums_list(), photos_content(), photos_list_photos(), photos_post(), poco_init(), post_activity_item(), post_post(), process_delivery(), process_mail_delivery(), profile_content(), profile_load(), profile_sidebar(), RedChannelList(), search_content(), Conversation\set_mode(), RedBrowser\set_writeable(), RedDirectory\setName(), RedFile\setName(), subthread_content(), tag_deliver(), tgroup_check(), update_birthdays(), viewconnections_content(), widget_archive(), widget_categories(), widget_item(), widget_photo_albums(), widget_tagcloud_wall(), z_readdir(), and zot_feed().

                diff --git a/doc/html/permissions_8php.js b/doc/html/permissions_8php.js index 49747cfd8..df2e58f84 100644 --- a/doc/html/permissions_8php.js +++ b/doc/html/permissions_8php.js @@ -3,6 +3,7 @@ var permissions_8php = [ "check_list_permissions", "permissions_8php.html#a0f5bd9f7f4c8fb7ba4b2c1ed048b4dc7", null ], [ "get_all_perms", "permissions_8php.html#aeca9b280f3dc3358c89976d81d690008", null ], [ "get_perms", "permissions_8php.html#a040fd3d3b8517658b1668ae0cd093972", null ], + [ "get_role_perms", "permissions_8php.html#a9b5f5120566a3699a98efc5ccb0c59fe", null ], [ "perm_is_allowed", "permissions_8php.html#a67ada9ed51e77885b6b0f6a28cee1835", null ], [ "site_default_perms", "permissions_8php.html#aa8b7b102c653649d7a71b5a1c044d90d", null ] ]; \ No newline at end of file diff --git a/doc/html/photo__driver_8php.html b/doc/html/photo__driver_8php.html index 1f7e7121b..2697b71ff 100644 --- a/doc/html/photo__driver_8php.html +++ b/doc/html/photo__driver_8php.html @@ -232,7 +232,7 @@ Functions diff --git a/doc/html/php_2theme__init_8php.html b/doc/html/php_2theme__init_8php.html index ebeea5ba5..359dfe491 100644 --- a/doc/html/php_2theme__init_8php.html +++ b/doc/html/php_2theme__init_8php.html @@ -127,6 +127,8 @@ Variables

                Those who require this feature will know what to do with it. Those who don't, won't. Eventually this functionality needs to be provided by a module such that permissions can be enforced. At the moment it's more of a proof of concept; but sufficient for our immediate needs.

                +

                Referenced by admin_page_channels(), api_call(), api_user(), appman_content(), attach_mkdir(), attach_store(), bbcode(), blocks_content(), bookmark_add(), bookmarks_content(), build_sync_packet(), channel_content(), channel_init(), channel_remove(), chat_content(), chat_init(), chat_post(), chatroom_create(), chatroom_destroy(), cloud_init(), connections_init(), connections_post(), connedit_content(), connedit_init(), connedit_post(), conversation(), design_tools(), directory_run(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), event_addtocal(), events_content(), events_post(), feed_init(), filestorage_content(), filestorage_post(), fix_attached_file_permissions(), get_feed_for(), get_public_feed(), handle_feed(), handle_tag(), hcard_init(), home_init(), import_post(), importelm_post(), invite_content(), is_public_profile(), item_photo_menu(), item_post(), item_store(), item_store_update(), items_fetch(), layouts_content(), magic_init(), mail_content(), mail_post(), menu_add_item(), menu_edit_item(), message_content(), mitem_content(), mitem_post(), mood_init(), nav(), network_content(), network_init(), new_contact(), notifier_run(), parse_app_description(), photo_upload(), photos_albums_list(), photos_content(), photos_create_item(), photos_list_photos(), ping_init(), poke_init(), post_activity_item(), post_to_red_delete_comment(), post_to_red_delete_post(), post_to_red_displayAdminContent(), post_to_red_post(), probe_content(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), profile_init(), profile_photo_init(), profile_photo_post(), profiles_content(), profiles_post(), profperm_init(), rbmark_content(), rbmark_post(), rpost_content(), send_message(), settings_post(), sources_post(), start_delivery_chain(), tagger_content(), thing_content(), thing_init(), uexport_init(), update_remote_id(), wall_attach_post(), wall_upload_post(), webpages_content(), wfinger_init(), widget_settings_menu(), zot_build_packet(), zot_finger(), and zot_refresh().

                +
                diff --git a/doc/html/plugin_8php.html b/doc/html/plugin_8php.html index 3ff4645e7..2f5ab3c62 100644 --- a/doc/html/plugin_8php.html +++ b/doc/html/plugin_8php.html @@ -216,7 +216,7 @@ Functions
                -

                Referenced by _well_known_init(), api_login(), atom_author(), atom_entry(), authenticate_success(), avatar_img(), bb2diaspora(), bbcode(), channel_remove(), chat_message(), chatsvc_post(), check_account_email(), check_account_invite(), check_account_password(), connect_content(), connections_post(), connedit_content(), connedit_post(), construct_page(), contact_block(), contact_select(), conversation(), create_identity(), cronhooks_run(), directory_content(), downgrade_accounts(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), event_store_item(), externals_run(), feature_enabled(), gender_selector(), gender_selector_min(), get_all_perms(), get_atom_elements(), get_features(), get_feed_for(), get_mood_verbs(), get_perms(), get_poke_verbs(), Item\get_template_data(), App\get_widgets(), group_select(), home_content(), home_init(), hostxrd_init(), html2bbcode(), import_author_xchan(), import_directory_profile(), import_xchan(), item_photo_menu(), item_post(), item_store(), item_store_update(), like_content(), login(), magic_init(), mail_store(), marital_selector(), marital_selector_min(), mood_init(), nav(), network_content(), network_to_name(), new_contact(), notification(), notifier_run(), obj_verbs(), oembed_fetch_url(), openid_content(), parse_url_content(), pdl_selector(), perm_is_allowed(), photo_upload(), photos_content(), ping_init(), poller_run(), populate_acl(), post_activity_item(), post_init(), prepare_body(), probe_well_known(), proc_run(), process_delivery(), profile_content(), profile_sidebar(), profiles_content(), profiles_post(), replace_macros(), rmagic_post(), settings_post(), sexpref_selector(), sexpref_selector_min(), siteinfo_content(), smilies(), subthread_content(), tag_deliver(), validate_channelname(), wfinger_init(), widget_affinity(), xrd_init(), zfinger_init(), zid(), and zid_init().

                +

                Referenced by _well_known_init(), api_login(), atom_author(), atom_entry(), authenticate_success(), avatar_img(), bb2diaspora(), bbcode(), channel_remove(), chat_message(), chatsvc_post(), check_account_email(), check_account_invite(), check_account_password(), connect_content(), connections_post(), connedit_content(), connedit_post(), construct_page(), contact_block(), contact_select(), conversation(), create_identity(), cronhooks_run(), directory_content(), downgrade_accounts(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), event_store_item(), externals_run(), feature_enabled(), gender_selector(), gender_selector_min(), get_all_perms(), get_atom_elements(), get_features(), get_feed_for(), get_mood_verbs(), get_perms(), get_poke_verbs(), get_role_perms(), Item\get_template_data(), App\get_widgets(), group_select(), home_content(), home_init(), hostxrd_init(), html2bbcode(), import_author_xchan(), import_directory_profile(), import_xchan(), item_photo_menu(), item_post(), item_store(), item_store_update(), like_content(), login(), magic_init(), mail_store(), marital_selector(), marital_selector_min(), mood_init(), nav(), network_content(), network_to_name(), new_contact(), notification(), notifier_run(), obj_verbs(), oembed_fetch_url(), openid_content(), parse_url_content(), pdl_selector(), perm_is_allowed(), photo_upload(), photos_content(), ping_init(), poller_run(), populate_acl(), post_activity_item(), post_init(), prepare_body(), probe_well_known(), proc_run(), process_delivery(), profile_content(), profile_sidebar(), profiles_content(), profiles_post(), replace_macros(), rmagic_post(), settings_post(), sexpref_selector(), sexpref_selector_min(), siteinfo_content(), smilies(), subthread_content(), tag_deliver(), validate_channelname(), wfinger_init(), widget_affinity(), xrd_init(), zfinger_init(), zid(), and zid_init().

                @@ -308,7 +308,7 @@ Functions
                -

                Referenced by admin_content(), admin_page_channels(), admin_page_dbsync(), admin_page_hubloc(), admin_page_logs(), admin_page_plugins(), admin_page_site(), admin_page_summary(), admin_page_themes(), admin_page_users(), advanced_profile(), alt_pager(), api_apply_template(), api_content(), app_render(), appman_content(), apps_content(), apw_form(), blocks_content(), blogtheme_form(), App\build_pagehead(), categories_widget(), channel_content(), chat_content(), check_php(), common_content(), common_friends_visitor_widget(), connect_content(), connections_content(), connedit_content(), construct_page(), contact_block(), conversation(), delegate_content(), design_tools(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_retraction(), diaspora_send_status(), diaspora_share(), diaspora_unshare(), dir_safe_mode(), dir_sort_links(), directory_content(), dirprofile_init(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), fbrowser_content(), field_timezone(), fileas_widget(), filer_content(), filestorage_content(), findpeople_widget(), format_categories(), format_filer(), frphotos_content(), RedBrowser\generateDirectoryIndex(), get_birthdays(), Item\get_comment_box(), get_events(), get_feed_for(), group_content(), group_side(), help_content(), hostxrd_init(), RedBrowser\htmlActionsPanel(), identity_selector(), import_content(), invite_content(), lang_selector(), layouts_content(), login(), lostpass_content(), mail_content(), manage_content(), match_content(), menu_content(), menu_render(), message_content(), micropro(), mini_group_select(), mitem_content(), mood_content(), nav(), network_content(), new_channel_content(), notification(), notifications_content(), notify_content(), oembed_format_object(), oexchange_init(), opensearch_init(), pagelist_widget(), pdledit_content(), photos_album_widget(), photos_content(), poco_init(), poke_content(), poll_content(), populate_acl(), profile_sidebar(), profiles_content(), rbmark_content(), redbasic_form(), register_content(), removeaccount_content(), removeme_content(), rmagic_content(), rpost_content(), search_content(), setup_content(), siteinfo_content(), sources_content(), suggest_content(), theme_attachments(), thing_content(), vcard_from_xchan(), viewconnections_content(), vote_content(), webpages_content(), widget_affinity(), widget_appselect(), widget_archive(), widget_bookmarkedchats(), widget_chatroom_list(), widget_filer(), widget_follow(), widget_mailmenu(), widget_notes(), widget_savedsearch(), widget_settings_menu(), widget_suggestedchats(), widget_suggestions(), writepages_widget(), and xrd_init().

                +

                Referenced by admin_content(), admin_page_channels(), admin_page_dbsync(), admin_page_hubloc(), admin_page_logs(), admin_page_plugins(), admin_page_site(), admin_page_summary(), admin_page_themes(), admin_page_users(), advanced_profile(), alt_pager(), api_apply_template(), api_content(), app_render(), appman_content(), apps_content(), apw_form(), blocks_content(), blogtheme_form(), App\build_pagehead(), categories_widget(), channel_content(), chat_content(), check_php(), common_content(), common_friends_visitor_widget(), connect_content(), connections_content(), connedit_content(), construct_page(), contact_block(), conversation(), delegate_content(), design_tools(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_retraction(), diaspora_send_status(), diaspora_share(), diaspora_unshare(), dir_safe_mode(), dir_sort_links(), directory_content(), dirprofile_init(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), fbrowser_content(), field_timezone(), fileas_widget(), filer_content(), filestorage_content(), findpeople_widget(), format_categories(), format_filer(), RedBrowser\generateDirectoryIndex(), get_birthdays(), Item\get_comment_box(), get_events(), get_feed_for(), group_content(), group_side(), help_content(), hostxrd_init(), RedBrowser\htmlActionsPanel(), identity_selector(), import_content(), invite_content(), lang_selector(), layouts_content(), login(), lostpass_content(), mail_content(), manage_content(), match_content(), menu_content(), menu_render(), message_content(), micropro(), mini_group_select(), mitem_content(), mood_content(), nav(), network_content(), new_channel_content(), notification(), notifications_content(), notify_content(), oembed_format_object(), oexchange_init(), opensearch_init(), pagelist_widget(), pdledit_content(), photos_album_widget(), photos_content(), poco_init(), poke_content(), poll_content(), populate_acl(), profile_sidebar(), profiles_content(), rbmark_content(), redbasic_form(), register_content(), removeaccount_content(), removeme_content(), rmagic_content(), rpost_content(), search_content(), setup_content(), siteinfo_content(), sources_content(), suggest_content(), theme_attachments(), thing_content(), vcard_from_xchan(), viewconnections_content(), vote_content(), webpages_content(), widget_affinity(), widget_appselect(), widget_archive(), widget_bookmarkedchats(), widget_chatroom_list(), widget_filer(), widget_follow(), widget_mailmenu(), widget_notes(), widget_savedsearch(), widget_settings_menu(), widget_suggestedchats(), widget_suggestions(), writepages_widget(), and xrd_init().

                diff --git a/doc/html/post__to__red_8php.html b/doc/html/post__to__red_8php.html index 0bec890ac..8776a12c7 100644 --- a/doc/html/post__to__red_8php.html +++ b/doc/html/post__to__red_8php.html @@ -149,8 +149,6 @@ Functions    post_to_red_get_avatar ($avatar, $id_or_email, $size, $default, $alt)   - xpost_to_html2bbcode ($text) -  @@ -481,24 +479,6 @@ Variables

                Variables

                -
                - - -
                -
                - - - - - - - - -
                xpost_to_html2bbcode ( $text)
                -
                - -

                Referenced by post_to_red_post().

                -

                Variable Documentation

                diff --git a/doc/html/post__to__red_8php.js b/doc/html/post__to__red_8php.js index b2a2c31f5..9fa505b7e 100644 --- a/doc/html/post__to__red_8php.js +++ b/doc/html/post__to__red_8php.js @@ -18,7 +18,6 @@ var post__to__red_8php = [ "post_to_red_settings_link", "post__to__red_8php.html#a906be8f72cf1aa2e199c0683ea6a4017", null ], [ "red_comment", "post__to__red_8php.html#a085c250d4ceff5e4f10052f3d2039823", null ], [ "red_xmlrpc_methods", "post__to__red_8php.html#a3a2af6ad845239f26e86fccabf8639e1", null ], - [ "xpost_to_html2bbcode", "post__to__red_8php.html#af2713018a2dc97e88f121fc6215beb66", null ], [ "$plugin", "post__to__red_8php.html#ada8a7130088351710bb02ed622d6bf65", null ], [ "$plugin_dir", "post__to__red_8php.html#a99811555b30bde504a863e44015f2f19", null ], [ "post_to_red_acct_name", "post__to__red_8php.html#a588cea66afe0b32f27f2713d44940119", null ], diff --git a/doc/html/search/all_24.js b/doc/html/search/all_24.js index 112919d28..2409f73b0 100644 --- a/doc/html/search/all_24.js +++ b/doc/html/search/all_24.js @@ -1,12 +1,11 @@ var searchData= [ - ['_24a',['$a',['../frphotohelper_8php.html#acebf83966ef6d7e5645a6b62ba368f9f',1,'$a(): frphotohelper.php'],['../typo_8php.html#acebf83966ef6d7e5645a6b62ba368f9f',1,'$a(): typo.php']]], + ['_24a',['$a',['../typo_8php.html#acebf83966ef6d7e5645a6b62ba368f9f',1,'typo.php']]], ['_24account',['$account',['../classApp.html#a14bd4b1c29f3aff371fe5d4cb11aeea3',1,'App']]], ['_24api',['$API',['../include_2api_8php.html#aeb2e7ad00ea666b4b6dfcf82008194f8',1,'api.php']]], ['_24app',['$app',['../classBaseObject.html#a02cc4cd8fa26b6fc76d92fde54b4e4b1',1,'BaseObject']]], ['_24apps',['$apps',['../classApp.html#a230e975296cf164da2fee35ef720964f',1,'App']]], ['_24argc',['$argc',['../classApp.html#af58db526040829b1c8bd95561b329262',1,'App']]], - ['_24args',['$args',['../frphotohelper_8php.html#a67e94494731d99ed23b123e95175bc10',1,'$args(): frphotohelper.php'],['../frphotohelper_8php.html#acaefa2c3b286896f12eb55ae56e154af',1,'$args(): frphotohelper.php'],['../frphotohelper_8php.html#ad3310ef5d714f2baae2d882a1e22cf05',1,'$args(): frphotohelper.php'],['../frphotohelper_8php.html#adbc68ba8d9b3e0fac2d4c9fb683ef9f6',1,'$args(): frphotohelper.php'],['../frphotohelper_8php.html#ad4237a752a460152a5445abcb50238cf',1,'$args(): frphotohelper.php'],['../frphotohelper_8php.html#a44a64913242d4235e332cc69885c1460',1,'$args(): frphotohelper.php'],['../frphotohelper_8php.html#a6bb04aa9e43d97273fc84b6e308999c5',1,'$args(): frphotohelper.php'],['../frphotohelper_8php.html#ab93f92df528f98af0f4511720032b03c',1,'$args(): frphotohelper.php'],['../frphotohelper_8php.html#a1fba6794d8decbc7b957710af3179c10',1,'$args(): frphotohelper.php'],['../frphotohelper_8php.html#a88f7360b97eecb65e5e13708a093d172',1,'$args(): frphotohelper.php'],['../frphotohelper_8php.html#ad5fe4c1396829f3ce98eec037db698b2',1,'$args(): frphotohelper.php'],['../frphotohelper_8php.html#ab66e3756cdc86eaa61d42e675092c649',1,'$args(): frphotohelper.php']]], ['_24argv',['$argv',['../classApp.html#ab3da757abe5cb45bf88f07cc51a73b58',1,'App']]], ['_24arr',['$arr',['../extract_8php.html#a63bb4c41bc532baacf6a4976cfaa0feb',1,'extract.php']]], ['_24aside',['$aside',['../minimalisticdarkness_8php.html#a6e5d97615c6faef5dbffe04b8024ceaf',1,'minimalisticdarkness.php']]], @@ -14,14 +13,11 @@ var searchData= ['_24baseurl',['$baseurl',['../classApp.html#ad5175536561021548ae8188e24c7b80c',1,'App']]], ['_24bodyclass',['$bodyclass',['../theme_2blogga_2php_2default_8php.html#a720581ae288aa09511670563e4205a4a',1,'$bodyclass(): default.php'],['../theme_2blogga_2view_2theme_2blog_2default_8php.html#a720581ae288aa09511670563e4205a4a',1,'$bodyclass(): default.php']]], ['_24browser',['$browser',['../classRedBasicAuth.html#af14337f1baad407f8a85d48205c0f30e',1,'RedBasicAuth']]], - ['_24c',['$c',['../frphotohelper_8php.html#ab73d7f4f2dae233dd561e7fdaab3a77b',1,'frphotohelper.php']]], ['_24cached_5fprofile_5fimage',['$cached_profile_image',['../classApp.html#abe0e4fa91097f7a6588e1213a834121c',1,'App']]], ['_24cached_5fprofile_5fpicdate',['$cached_profile_picdate',['../classApp.html#aab4a685d15a363bb1d7edbbc20bfb94e',1,'App']]], ['_24called_5fapi',['$called_api',['../include_2api_8php.html#aa62b15a6bbb280e86b98132eb214013d',1,'api.php']]], ['_24category',['$category',['../classApp.html#a5cfc098c061b7d765add58fd2ca97445',1,'App']]], - ['_24ch',['$ch',['../frphotohelper_8php.html#a696b903bbc5c02914bdd402e91826eca',1,'frphotohelper.php']]], - ['_24channel',['$channel',['../classApp.html#a050b0696118da47e8b30859ad1a2c149',1,'App\$channel()'],['../classItem.html#acc32426c0f465391be8a99ad810c7b8e',1,'Item\$channel()'],['../frphotohelper_8php.html#ac162139c764f53cc07f42b09432549ba',1,'$channel(): frphotohelper.php'],['../php_2theme__init_8php.html#a54f32c086fe209c99769a4c4047dd864',1,'$channel(): theme_init.php'],['../theme_2apw_2php_2theme__init_8php.html#a54f32c086fe209c99769a4c4047dd864',1,'$channel(): theme_init.php']]], - ['_24channel_5faddress',['$channel_address',['../frphotohelper_8php.html#a1ce9aa56ce28b42f5db69d00d4c78972',1,'frphotohelper.php']]], + ['_24channel',['$channel',['../classApp.html#a050b0696118da47e8b30859ad1a2c149',1,'App\$channel()'],['../classItem.html#acc32426c0f465391be8a99ad810c7b8e',1,'Item\$channel()'],['../php_2theme__init_8php.html#a54f32c086fe209c99769a4c4047dd864',1,'$channel(): theme_init.php'],['../theme_2apw_2php_2theme__init_8php.html#a54f32c086fe209c99769a4c4047dd864',1,'$channel(): theme_init.php']]], ['_24channel_5fhash',['$channel_hash',['../classRedBasicAuth.html#ad5a3ea4dc4783b242d9dc6e76478b6ef',1,'RedBasicAuth']]], ['_24channel_5fid',['$channel_id',['../classRedBasicAuth.html#a2dab393650d1573e3515969a153e8354',1,'RedBasicAuth']]], ['_24channel_5fname',['$channel_name',['../classRedBasicAuth.html#a438ab125b6ef46581947e35d49cdebac',1,'RedBasicAuth']]], @@ -37,7 +33,6 @@ var searchData= ['_24contacts',['$contacts',['../classApp.html#a61ca6e3af82071ea25ff2fd5dbcddae2',1,'App']]], ['_24content',['$content',['../classApp.html#ac1d80a14492acc932715d54567d8a589',1,'App']]], ['_24conversation',['$conversation',['../classItem.html#a007424e3e3171dcfb4312a02161da6cd',1,'Item']]], - ['_24cookies',['$cookies',['../frphotohelper_8php.html#aef9f7eafd54f6e36423347bed723c67e',1,'frphotohelper.php']]], ['_24css_5fsources',['$css_sources',['../classApp.html#a6f55d087e1ff4710132c1b0863faa2ee',1,'App']]], ['_24curl_5fcode',['$curl_code',['../classApp.html#a256360c9184fed6d7556e0bc0a835d7f',1,'App']]], ['_24curl_5fheaders',['$curl_headers',['../classApp.html#af5007c42a693afd9c4899c243b2e1363',1,'App']]], @@ -59,7 +54,6 @@ var searchData= ['_24fname',['$fname',['../apw_2php_2style_8php.html#ab9e0f70d44ab67f4334f9883631777fc',1,'style.php']]], ['_24folder_5fhash',['$folder_hash',['../classRedDirectory.html#aa10254abf177bb2a0e4a88495725e09b',1,'RedDirectory']]], ['_24force_5fmax_5fitems',['$force_max_items',['../classApp.html#ae3f47830543d0d902f66913def8db66b',1,'App']]], - ['_24fr_5fserver',['$fr_server',['../frphotohelper_8php.html#a2059b37bbca58d2613c70af2c19eddce',1,'frphotohelper.php']]], ['_24gc_5fprobability',['$gc_probability',['../session_8php.html#a96b09cc763572f45280786a7b33feb7e',1,'session.php']]], ['_24groups',['$groups',['../classApp.html#ac6e6b1c7d6df408580ff79977fcfa656',1,'App']]], ['_24headimg',['$headimg',['../theme_2blogga_2php_2default_8php.html#ac7062908d1eb80c0735270f7997c4527',1,'$headimg(): default.php'],['../theme_2blogga_2view_2theme_2blog_2default_8php.html#a52d9dd070ed541729088395c22502539',1,'$headimg(): default.php']]], @@ -77,7 +71,6 @@ var searchData= ['_24install_5fwizard_5fpass',['$install_wizard_pass',['../setup_8php.html#addb24714bc2542aa4f4215e98fe48432',1,'setup.php']]], ['_24interactive',['$interactive',['../classApp.html#a4c7cfc62d39508086cf300dc2e39c4df',1,'App']]], ['_24itemfloat',['$itemfloat',['../minimalisticdarkness_8php.html#a7e6c3d4efde4e9a2de32308081372c6b',1,'minimalisticdarkness.php']]], - ['_24j',['$j',['../frphotohelper_8php.html#a6f16db779ef3ccea921b277b5dc245d1',1,'frphotohelper.php']]], ['_24js_5fsources',['$js_sources',['../classApp.html#a11e24b3ed9b33ffee7dd41d110b4366d',1,'App']]], ['_24k',['$k',['../php2po_8php.html#ad6726cfaa85d4b8299d2b0f034cbf178',1,'php2po.php']]], ['_24lang',['$lang',['../classTemplate.html#ace26b8a4252fbc1c385d2b5e1e93e5c8',1,'Template']]], @@ -98,7 +91,6 @@ var searchData= ['_24observer',['$observer',['../classApp.html#a4ffe529fb14389f7fedf5fdc5f722e7f',1,'App\$observer()'],['../classConversation.html#a8748445aa26047ebed5141f3c3cbc244',1,'Conversation\$observer()'],['../classRedBasicAuth.html#aa75dc43b59adc98e38a98517d3fd35d1',1,'RedBasicAuth\$observer()']]], ['_24os_5fpath',['$os_path',['../classRedDirectory.html#a3c148c07ad909985125aa4926d8d0021',1,'RedDirectory']]], ['_24out',['$out',['../php2po_8php.html#a48cb304902320d173a4eaa41543327b9',1,'php2po.php']]], - ['_24output',['$output',['../frphotohelper_8php.html#a73004ce9cd673c1bfafd1dc351134797',1,'frphotohelper.php']]], ['_24owner_5fid',['$owner_id',['../classRedBasicAuth.html#a09c1488a0b290f5a54dc15180c5690d7',1,'RedBasicAuth']]], ['_24owner_5fname',['$owner_name',['../classItem.html#a9594df6014b0b6f45364ea7a34510130',1,'Item']]], ['_24owner_5fnick',['$owner_nick',['../classRedBasicAuth.html#a8d09b8d784cc810a0b3be580d05106a7',1,'RedBasicAuth']]], @@ -109,7 +101,6 @@ var searchData= ['_24parent',['$parent',['../classItem.html#a1a1e42877e6ac7af50286142ceb483d2',1,'Item']]], ['_24path',['$path',['../classApp.html#acad5896b7a79ae31433ad8f89606c728',1,'App']]], ['_24perms',['$perms',['../classApp.html#ab47de68fa39806d1fb0976407e188b77',1,'App']]], - ['_24photo_5fid',['$photo_id',['../frphotohelper_8php.html#a2d2299040f635cee8d5aac68230dd630',1,'frphotohelper.php']]], ['_24phpath',['$phpath',['../typo_8php.html#a3ecd17ac846be1b35f3662f5c12ab6bd',1,'typo.php']]], ['_24phpfile',['$phpfile',['../php2po_8php.html#abbb0e5fd8fbc1f13a9bf68f86eb3d2a4',1,'php2po.php']]], ['_24plugin',['$plugin',['../post__to__red_8php.html#ada8a7130088351710bb02ed622d6bf65',1,'post_to_red.php']]], @@ -123,13 +114,12 @@ var searchData= ['_24profile_5fowner',['$profile_owner',['../classConversation.html#a2f12724ef0244e9049fe1bb9641b516d',1,'Conversation']]], ['_24profile_5fuid',['$profile_uid',['../classApp.html#a08c24d6a6fc52fcc784b0f765f13b820',1,'App']]], ['_24query_5fstring',['$query_string',['../classApp.html#a2e82da4aecfc2017a8d1d332ca501f9f',1,'App']]], - ['_24r',['$r',['../classTemplate.html#aac9a4638f11271e1b1dcc9f247242718',1,'Template\$r()'],['../frphotohelper_8php.html#a8abe176bc41afd728f32ba8c506cbd98',1,'$r(): frphotohelper.php']]], + ['_24r',['$r',['../classTemplate.html#aac9a4638f11271e1b1dcc9f247242718',1,'Template']]], ['_24rdelim',['$rdelim',['../classApp.html#a244b2d53b21be269aad2269d23192f95',1,'App']]], ['_24red_5fpath',['$red_path',['../classRedDirectory.html#acb32b8df27538c57772824a745e751d7',1,'RedDirectory']]], ['_24redirect_5furl',['$redirect_url',['../classItem.html#a5b561415861f5b89b0733aacfe0428d1',1,'Item']]], ['_24replace',['$replace',['../classTemplate.html#a4e86b566c3f728e95ce5db1b33665c10',1,'Template']]], ['_24res',['$res',['../docblox__errorchecker_8php.html#a49a8a4009b02e49717caa88b128affc5',1,'docblox_errorchecker.php']]], - ['_24ret',['$ret',['../frphotohelper_8php.html#a83d5f232bed56a5af8173818b0bdf79d',1,'frphotohelper.php']]], ['_24root_5fdir',['$root_dir',['../classRedDirectory.html#ad87c514a307ec97ba0f1372e9bcfa6a4',1,'RedDirectory']]], ['_24s',['$s',['../extract_8php.html#a50b05cf2e02ef0b67fcad97106dd7634',1,'extract.php']]], ['_24scheme',['$scheme',['../classApp.html#ad082d63acc078e5bf23825a03bdd6a76',1,'App']]], diff --git a/doc/html/search/all_63.js b/doc/html/search/all_63.js index bf9e880c0..4b92715be 100644 --- a/doc/html/search/all_63.js +++ b/doc/html/search/all_63.js @@ -33,7 +33,6 @@ var searchData= ['chatroom_5fcreate',['chatroom_create',['../include_2chat_8php.html#acdc80dba4eb796c7472b21129b435422',1,'chat.php']]], ['chatroom_5fdestroy',['chatroom_destroy',['../include_2chat_8php.html#a2ba3af6884ecdce95de69262fe599639',1,'chat.php']]], ['chatroom_5fenter',['chatroom_enter',['../include_2chat_8php.html#a2c95b545e46bfee64faa05ecf0afea91',1,'chat.php']]], - ['chatroom_5fflush',['chatroom_flush',['../include_2chat_8php.html#afffdd0f2c218c392ba28376948624e3f',1,'chat.php']]], ['chatroom_5fleave',['chatroom_leave',['../include_2chat_8php.html#a1ee1360f7d2549c7549ae07cb5190f0f',1,'chat.php']]], ['chatroom_5flist',['chatroom_list',['../include_2chat_8php.html#aedcb532a0627b8644001a2fadab4e87a',1,'chat.php']]], ['chatsvc_2ephp',['chatsvc.php',['../chatsvc_8php.html',1,'']]], @@ -122,7 +121,7 @@ var searchData= ['construct_5factivity_5ftarget',['construct_activity_target',['../items_8php.html#aa579bc4445d60098b1410961ca8e96b7',1,'items.php']]], ['construct_5fpage',['construct_page',['../boot_8php.html#acc4e0c910af066148b810e5fde55fff1',1,'boot.php']]], ['construct_5fverb',['construct_verb',['../items_8php.html#a8f3c85c584ccd2b98c3ca440e45b40f8',1,'items.php']]], - ['consume_5ffeed',['consume_feed',['../items_8php.html#a8794863cdf8ce1333040933d3a3f66bd',1,'items.php']]], + ['consume_5ffeed',['consume_feed',['../items_8php.html#adc26e08aa61f5666da04ab5d2a9d68a6',1,'items.php']]], ['contact_2ephp',['Contact.php',['../Contact_8php.html',1,'']]], ['contact_5fblock',['contact_block',['../text_8php.html#ad6432621d0fafcbcf3d3b9b49bef7784',1,'text.php']]], ['contact_5fis_5ffollower',['CONTACT_IS_FOLLOWER',['../boot_8php.html#ada72d88ae39a7e3b45baea201cb49a29',1,'boot.php']]], diff --git a/doc/html/search/all_64.js b/doc/html/search/all_64.js index 18f53799c..2adecb72f 100644 --- a/doc/html/search/all_64.js +++ b/doc/html/search/all_64.js @@ -43,6 +43,8 @@ var searchData= ['deliver_2ephp',['deliver.php',['../deliver_8php.html',1,'']]], ['deliver_5fprivate',['deliver_private',['../classProtoDriver.html#ae5b44739f84c10d00a9b65adf3785181',1,'ProtoDriver\deliver_private()'],['../classZotDriver.html#afaaf9941169fc966e43e25b25e6daea6',1,'ZotDriver\deliver_private()']]], ['deliver_5frun',['deliver_run',['../deliver_8php.html#a397afcb9afecf0c1816b0951189dd346',1,'deliver.php']]], + ['dertopem',['DerToPem',['../crypto_8php.html#a630e1574554f34e7c38511585d9e71a2',1,'crypto.php']]], + ['dertorsa',['DerToRsa',['../crypto_8php.html#ae5af17db1cb5d7c91d486e1264079839',1,'crypto.php']]], ['design_5ftools',['design_tools',['../text_8php.html#a87a3cefc603302c78982f1d8e1245265',1,'text.php']]], ['destroy',['destroy',['../classphoto__driver.html#ae1a9edaf846983780dc65ea77d99e813',1,'photo_driver\destroy()'],['../classphoto__gd.html#a724703ecf71b1f1d04a80e86c76db6b1',1,'photo_gd\destroy()'],['../classphoto__imagick.html#afd49d64751ee3a298eac0c0ce0ba0207',1,'photo_imagick\destroy()']]], ['detect_5flanguage',['detect_language',['../language_8php.html#a632da17c7ac0d2dc1a00a4706870194b',1,'language.php']]], @@ -55,7 +57,8 @@ var searchData= ['diaspora_5fdispatch',['diaspora_dispatch',['../diaspora_8php.html#a6f0a67b6b17503c125af32763be931b7',1,'diaspora.php']]], ['diaspora_5fdispatch_5fpublic',['diaspora_dispatch_public',['../diaspora_8php.html#ab99505944728d46585b8312989de533d',1,'diaspora.php']]], ['diaspora_5fget_5fcontact_5fby_5fhandle',['diaspora_get_contact_by_handle',['../diaspora_8php.html#aa8e551a53fcce34be3942d0c3e20d1f4',1,'diaspora.php']]], - ['diaspora_5fhandle_5ffrom_5fcontact',['diaspora_handle_from_contact',['../diaspora_8php.html#a625056c9dab9b9779d0665650e260bb9',1,'diaspora.php']]], + ['diaspora_5fhandle_5ffrom_5fcontact',['diaspora_handle_from_contact',['../diaspora_8php.html#a5ed66b910d7b0284f9b3ee04e72306ff',1,'diaspora.php']]], + ['diaspora_5fis_5fblacklisted',['diaspora_is_blacklisted',['../diaspora_8php.html#a858f70153c384f8778082cf7843a19da',1,'diaspora.php']]], ['diaspora_5fis_5freshare',['diaspora_is_reshare',['../diaspora_8php.html#ad9985cc4214bdfc14878785c838c8690',1,'diaspora.php']]], ['diaspora_5flike',['diaspora_like',['../diaspora_8php.html#a5d57518545baa31cf8a85a937a267681',1,'diaspora.php']]], ['diaspora_5fmessage',['diaspora_message',['../diaspora_8php.html#a7cff2f8f11044c1b3a360f20e1bbee46',1,'diaspora.php']]], @@ -63,7 +66,6 @@ var searchData= ['diaspora_5fol',['diaspora_ol',['../bb2diaspora_8php.html#a8b96bd45884fa1c40b942939354197d4',1,'bb2diaspora.php']]], ['diaspora_5fphoto',['diaspora_photo',['../diaspora_8php.html#a71fe9bb66626b4197ae018a230778bb2',1,'diaspora.php']]], ['diaspora_5fpost',['diaspora_post',['../diaspora_8php.html#a20b968d64ef26afe5cb0cc75a7570a31',1,'diaspora.php']]], - ['diaspora_5fpost_5fallow',['diaspora_post_allow',['../diaspora_8php.html#a978b08b5130bc94cf38ef3a2bcba0e3a',1,'diaspora.php']]], ['diaspora_5fprofile',['diaspora_profile',['../diaspora_8php.html#a900abf51398b2ef26cd2cd31c52f1b0f',1,'diaspora.php']]], ['diaspora_5fpubmsg_5fbuild',['diaspora_pubmsg_build',['../diaspora_8php.html#addaf8f202e52e3f0a49ed05681f9405c',1,'diaspora.php']]], ['diaspora_5frequest',['diaspora_request',['../diaspora_8php.html#ac1ab782a34552a7c6b4dc961754ed598',1,'diaspora.php']]], @@ -104,6 +106,7 @@ var searchData= ['dirsearch_5fcontent',['dirsearch_content',['../dirsearch_8php.html#aa1fb04e1de4f25b63349ac78f94ceb4c',1,'dirsearch.php']]], ['dirsearch_5finit',['dirsearch_init',['../dirsearch_8php.html#a3e51964ae3f5ff147403407b65324752',1,'dirsearch.php']]], ['discover',['discover',['../classProtoDriver.html#a64a3868cffe27d601d55f69a2ecc4337',1,'ProtoDriver\discover()'],['../classZotDriver.html#a40d328ff9f6b0a238afe286dddee1514',1,'ZotDriver\discover()']]], + ['discover_5fby_5fwebbie',['discover_by_webbie',['../include_2network_8php.html#a63e62946e194928eb17c5a9f2bbef0fe',1,'network.php']]], ['display_2ephp',['display.php',['../display_8php.html',1,'']]], ['display_5fcontent',['display_content',['../display_8php.html#a37137c98d47bf3306f4c2bb9f5b60de0',1,'display.php']]], ['dlogger',['dlogger',['../text_8php.html#a0a1f7c0e97f9ecbebf3e5834582b014c',1,'text.php']]], diff --git a/doc/html/search/all_66.js b/doc/html/search/all_66.js index 14f3220bc..f498619dc 100644 --- a/doc/html/search/all_66.js +++ b/doc/html/search/all_66.js @@ -11,6 +11,7 @@ var searchData= ['feed_5fsalmonlinks',['feed_salmonlinks',['../text_8php.html#a89929fa6f70a8ba54d5273fcf622b665',1,'text.php']]], ['fetch_5flrdd_5ftemplate',['fetch_lrdd_template',['../include_2network_8php.html#a8d5a3afb51cc932032b5dcc159efaae0',1,'network.php']]], ['fetch_5fpost_5ftags',['fetch_post_tags',['../items_8php.html#adf980098b6de9c3993bc3ff26a8dd6f9',1,'items.php']]], + ['fetch_5fxrd_5flinks',['fetch_xrd_links',['../include_2network_8php.html#a850ed5307c6a18076f4b80addc99602d',1,'network.php']]], ['field_5ftimezone',['field_timezone',['../datetime_8php.html#a03900dcf0f9e3c58793a031673a70326',1,'datetime.php']]], ['file_5ftag_5fdecode',['file_tag_decode',['../taxonomy_8php.html#a08df5164926d2b31b8e9fcfe919de2b6',1,'taxonomy.php']]], ['file_5ftag_5fencode',['file_tag_encode',['../taxonomy_8php.html#a3299482ac20e9d79453048dd52881d37',1,'taxonomy.php']]], @@ -46,8 +47,8 @@ var searchData= ['fkoauthdatastore',['FKOAuthDataStore',['../classFKOAuthDataStore.html',1,'']]], ['flip',['flip',['../classphoto__driver.html#a2b2a99021fc63ed6465d703ddddcb832',1,'photo_driver\flip()'],['../classphoto__gd.html#a44cedef376044018702d9355ddc813ce',1,'photo_gd\flip()'],['../classphoto__imagick.html#aff6bcdbab18593a3fc5a480db8509393',1,'photo_imagick\flip()']]], ['fnull',['fnull',['../namespaceupdatetpl.html#a79c20eb62d568c999b56eb08530355d3',1,'updatetpl']]], - ['follow_2ephp',['follow.php',['../mod_2follow_8php.html',1,'']]], ['follow_2ephp',['follow.php',['../include_2follow_8php.html',1,'']]], + ['follow_2ephp',['follow.php',['../mod_2follow_8php.html',1,'']]], ['follow_5fcontent',['follow_content',['../mod_2follow_8php.html#a4c540ea4e9f5c581c1a53516ac585592',1,'follow.php']]], ['follow_5finit',['follow_init',['../mod_2follow_8php.html#a171f5b19f50d7738adc3b2e96ec6018a',1,'follow.php']]], ['foreach',['foreach',['../typo_8php.html#a329c9c12217d2c8660c47bbc7c8df4c5',1,'typo.php']]], @@ -71,10 +72,6 @@ var searchData= ['friendica_2dto_2dsmarty_2dtpl_2epy',['friendica-to-smarty-tpl.py',['../friendica-to-smarty-tpl_8py.html',1,'']]], ['friendicasmarty',['FriendicaSmarty',['../classFriendicaSmarty.html',1,'']]], ['friendicasmartyengine',['FriendicaSmartyEngine',['../classFriendicaSmartyEngine.html',1,'']]], - ['frphotohelper_2ephp',['frphotohelper.php',['../frphotohelper_8php.html',1,'']]], - ['frphotos_2ephp',['frphotos.php',['../frphotos_8php.html',1,'']]], - ['frphotos_5fcontent',['frphotos_content',['../frphotos_8php.html#a6536248e7dda3f06cf37838064b961a4',1,'frphotos.php']]], - ['frphotos_5finit',['frphotos_init',['../frphotos_8php.html#a4a33fadb181497eff301ee5132ec61d1',1,'frphotos.php']]], ['fsuggest_2ephp',['fsuggest.php',['../fsuggest_8php.html',1,'']]], ['fsuggest_5fcontent',['fsuggest_content',['../fsuggest_8php.html#aa6c49ed4b50a387f1845f36844dd7998',1,'fsuggest.php']]], ['fsuggest_5fpost',['fsuggest_post',['../fsuggest_8php.html#a61ecfe10ce937ed526614f8fd3de3c7d',1,'fsuggest.php']]], diff --git a/doc/html/search/all_67.js b/doc/html/search/all_67.js index 089503b0f..63d49ae1a 100644 --- a/doc/html/search/all_67.js +++ b/doc/html/search/all_67.js @@ -10,7 +10,7 @@ var searchData= ['get_5fall_5fperms',['get_all_perms',['../permissions_8php.html#aeca9b280f3dc3358c89976d81d690008',1,'permissions.php']]], ['get_5fapp',['get_app',['../classBaseObject.html#ac43f10e69ce80c78e4870636250fc8a2',1,'BaseObject\get_app()'],['../boot_8php.html#a0e6db7e365f2b041a828b93786f694bc',1,'get_app(): boot.php']]], ['get_5fapps',['get_apps',['../classApp.html#a5c63eabdc7fdd8b6e3348980ec16a3ad',1,'App']]], - ['get_5fatom_5felements',['get_atom_elements',['../items_8php.html#a896c1809d58f2d7a42cfe14577958ddf',1,'items.php']]], + ['get_5fatom_5felements',['get_atom_elements',['../items_8php.html#a5e5be7bf1f8257dec0b2647e60a3f3f1',1,'items.php']]], ['get_5fbaseurl',['get_baseurl',['../classApp.html#a604d659d6977a99de42a160343e5289a',1,'App']]], ['get_5fbb_5ftag_5fpos',['get_bb_tag_pos',['../bb2diaspora_8php.html#a4c2f8f11b29a06809d9b07782215b1b2',1,'bb2diaspora.php']]], ['get_5fbest_5flanguage',['get_best_language',['../language_8php.html#a980dee1d8715a98ab02e36b59facf8ed',1,'language.php']]], @@ -34,8 +34,9 @@ var searchData= ['get_5fdata_5fvalue',['get_data_value',['../classItem.html#ac6f1c96cc82a0dfb7e881fc70309ea3c',1,'Item']]], ['get_5fdb_5ferrno',['get_db_errno',['../setup_8php.html#a8652788e8589778c5f81634a9d5b9429',1,'setup.php']]], ['get_5fdefault_5fprofile_5fphoto',['get_default_profile_photo',['../identity_8php.html#ab1485a26b032956e1496fc08c58b83ed',1,'identity.php']]], - ['get_5fdiaspora_5fkey',['get_diaspora_key',['../diaspora_8php.html#a986114ce8d7a582ebd0b5972738e1fc2',1,'diaspora.php']]], + ['get_5fdiaspora_5fkey',['get_diaspora_key',['../diaspora_8php.html#a9bf7ef4094e0e14f6e2b7fe76ab7ad2e',1,'diaspora.php']]], ['get_5fdim',['get_dim',['../datetime_8php.html#a7df24d72ea05922d3127363e2295174c',1,'datetime.php']]], + ['get_5fdirectory_5frealm',['get_directory_realm',['../boot_8php.html#a329400dcb29897cdaae3020109272285',1,'boot.php']]], ['get_5fevents',['get_events',['../identity_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312',1,'identity.php']]], ['get_5ffeatures',['get_features',['../features_8php.html#ae73c5b03b01c7284ed7e7e0e774e975c',1,'features.php']]], ['get_5ffeed_5ffor',['get_feed_for',['../items_8php.html#a04a35b610acfe54434df08adec39c0c7',1,'items.php']]], @@ -79,6 +80,7 @@ var searchData= ['get_5fpublic_5ffeed',['get_public_feed',['../items_8php.html#a079e099e15d88d47aeb6ca6d60da7107',1,'items.php']]], ['get_5fredirect_5furl',['get_redirect_url',['../classItem.html#a428f448f89a8629055ea3294eb942aea',1,'Item']]], ['get_5frel_5flink',['get_rel_link',['../text_8php.html#a3972701c5c83624ec4e2d06242f614e7',1,'text.php']]], + ['get_5frole_5fperms',['get_role_perms',['../permissions_8php.html#a9b5f5120566a3699a98efc5ccb0c59fe',1,'permissions.php']]], ['get_5frpost_5fpath',['get_rpost_path',['../zot_8php.html#a8e22dbc6f884be3644a892a876cbd972',1,'zot.php']]], ['get_5fsys_5fchannel',['get_sys_channel',['../identity_8php.html#aaff86ee3b5984821e7a256c2da5f1a51',1,'identity.php']]], ['get_5fsystem_5fapps',['get_system_apps',['../include_2apps_8php.html#ae64f72eb4f126e03b4eb65ed1702a3ca',1,'apps.php']]], @@ -120,8 +122,8 @@ var searchData= ['gravity_5flike',['GRAVITY_LIKE',['../boot_8php.html#a1f5906598e90b5ea2b4245f682be4348',1,'boot.php']]], ['gravity_5fparent',['GRAVITY_PARENT',['../boot_8php.html#a2af173e4e9836ee7c90757b4793a2be3',1,'boot.php']]], ['greenthumbnails_2ephp',['greenthumbnails.php',['../greenthumbnails_8php.html',1,'']]], - ['group_2ephp',['group.php',['../include_2group_8php.html',1,'']]], ['group_2ephp',['group.php',['../mod_2group_8php.html',1,'']]], + ['group_2ephp',['group.php',['../include_2group_8php.html',1,'']]], ['group_5fadd',['group_add',['../include_2group_8php.html#a06ec565d2b64e79044e7c1bf91a2a4ce',1,'group.php']]], ['group_5fadd_5fmember',['group_add_member',['../include_2group_8php.html#a0122ef312df2c5546b1a46b3e6c7b31b',1,'group.php']]], ['group_5fbyname',['group_byname',['../include_2group_8php.html#abd66a5ea34a07a3422dc2dde6c7b3ecb',1,'group.php']]], diff --git a/doc/html/search/all_68.js b/doc/html/search/all_68.js index feda8d890..7d0f6ce9e 100644 --- a/doc/html/search/all_68.js +++ b/doc/html/search/all_68.js @@ -1,5 +1,6 @@ var searchData= [ + ['handle_5ffeed',['handle_feed',['../items_8php.html#a52c24114b73c0bdb605a03cd29712223',1,'items.php']]], ['handle_5ftag',['handle_tag',['../item_8php.html#aa22feef4de326e1d7078dedd892e615c',1,'item.php']]], ['has_5fpermissions',['has_permissions',['../items_8php.html#a77051724d1784074ff187e73a4db93fe',1,'items.php']]], ['hcard_2ephp',['hcard.php',['../hcard_8php.html',1,'']]], diff --git a/doc/html/search/all_6d.js b/doc/html/search/all_6d.js index 05ce354bb..73d951943 100644 --- a/doc/html/search/all_6d.js +++ b/doc/html/search/all_6d.js @@ -25,7 +25,6 @@ var searchData= ['match_2ephp',['match.php',['../match_8php.html',1,'']]], ['match_5fcontent',['match_content',['../match_8php.html#a1dd853e959b9e70c1911bb2fb5f5130d',1,'match.php']]], ['match_5fopenid',['match_openid',['../auth_8php.html#ab7be44ee051c0aa29847807cf2c5dd38',1,'auth.php']]], - ['max_5fchatroom_5fhours',['MAX_CHATROOM_HOURS',['../boot_8php.html#ae543d0b69f816b52e91167fc19d3fddc',1,'boot.php']]], ['max_5fimage_5flength',['MAX_IMAGE_LENGTH',['../boot_8php.html#a525ca93ff35d3535d1a2b8ba57876afa',1,'boot.php']]], ['max_5flikers',['MAX_LIKERS',['../boot_8php.html#a35625dacd2158b9f1f1a8e77f9f081fd',1,'boot.php']]], ['member_5fof',['member_of',['../include_2group_8php.html#a048f6892bfd28852de1b76470df411de',1,'group.php']]], @@ -52,6 +51,8 @@ var searchData= ['message_2ephp',['message.php',['../include_2message_8php.html',1,'']]], ['message_2ephp',['message.php',['../mod_2message_8php.html',1,'']]], ['message_5fcontent',['message_content',['../mod_2message_8php.html#ac72dfed3ce08fcb331d66b37edc6e15f',1,'message.php']]], + ['metopem',['metopem',['../crypto_8php.html#af8bbdeaf4abed7b40365d301e6013c85',1,'crypto.php']]], + ['metorsa',['metorsa',['../crypto_8php.html#a573f02517abe4ac9241268263063b2a0',1,'crypto.php']]], ['micropro',['micropro',['../text_8php.html#a2a902f5fdba8646333e997898ac45ea3',1,'text.php']]], ['mimetype_5fselect',['mimetype_select',['../text_8php.html#a1633412120f52bdce5f43e0a127d9293',1,'text.php']]], ['mini_5fgroup_5fselect',['mini_group_select',['../include_2group_8php.html#ab0e422a0f31c0c64fd9084ca03d85f32',1,'group.php']]], diff --git a/doc/html/search/all_6f.js b/doc/html/search/all_6f.js index 138b1507c..65f262de1 100644 --- a/doc/html/search/all_6f.js +++ b/doc/html/search/all_6f.js @@ -18,6 +18,7 @@ var searchData= ['oexchange_2ephp',['oexchange.php',['../oexchange_8php.html',1,'']]], ['oexchange_5fcontent',['oexchange_content',['../oexchange_8php.html#a2d8b785cd7d041a4e6274f5af370cf26',1,'oexchange.php']]], ['oexchange_5finit',['oexchange_init',['../oexchange_8php.html#ac8e2e469ddc3db984b0c1b44558aca59',1,'oexchange.php']]], + ['old_5fwebfinger',['old_webfinger',['../include_2network_8php.html#a872bbe72d23826c64c9e0f822180a3ec',1,'network.php']]], ['olddefault_2ephp',['olddefault.php',['../olddefault_8php.html',1,'']]], ['onedirsync_2ephp',['onedirsync.php',['../onedirsync_8php.html',1,'']]], ['onedirsync_5frun',['onedirsync_run',['../onedirsync_8php.html#a411aedd47c57476099647961e6a86691',1,'onedirsync.php']]], diff --git a/doc/html/search/all_70.js b/doc/html/search/all_70.js index a3bd6934f..ccd965d62 100644 --- a/doc/html/search/all_70.js +++ b/doc/html/search/all_70.js @@ -31,6 +31,8 @@ var searchData= ['pdledit_2ephp',['pdledit.php',['../pdledit_8php.html',1,'']]], ['pdledit_5fcontent',['pdledit_content',['../pdledit_8php.html#a59cb550f6b7a4e7d8196fbc9de601619',1,'pdledit.php']]], ['pdledit_5fpost',['pdledit_post',['../pdledit_8php.html#a81da3c955d0e3db55d148a31483104c7',1,'pdledit.php']]], + ['pemtome',['pemtome',['../crypto_8php.html#a798368843cdd9bb08386b48e53e29e8c',1,'crypto.php']]], + ['pemtorsa',['pemtorsa',['../crypto_8php.html#a35bc357c93f4ddc67ef377620b0349e8',1,'crypto.php']]], ['perm_5fis_5fallowed',['perm_is_allowed',['../permissions_8php.html#a67ada9ed51e77885b6b0f6a28cee1835',1,'permissions.php']]], ['permissions_2ephp',['permissions.php',['../permissions_8php.html',1,'']]], ['permissions_5fsql',['permissions_sql',['../security_8php.html#afa683bc025a1d2fe9065e2f6cd71a22f',1,'security.php']]], @@ -95,9 +97,11 @@ var searchData= ['ping_2ephp',['ping.php',['../ping_8php.html',1,'']]], ['ping_5finit',['ping_init',['../ping_8php.html#a77217b1b190b4c5d8770867b45f0c0a1',1,'ping.php']]], ['pipe_5fstreams',['pipe_streams',['../include_2attach_8php.html#a5d484de2d19a93071571d6499a50ae34',1,'attach.php']]], + ['pkcs1_5fencode',['pkcs1_encode',['../crypto_8php.html#a890b443f80f0968fb9eabd93fc99dbb5',1,'crypto.php']]], ['pkcs1to8',['pkcs1to8',['../crypto_8php.html#a4d15d19b446dbf47804675df7c85e2a9',1,'crypto.php']]], ['pkcs5_5fpad',['pkcs5_pad',['../crypto_8php.html#ad5e51fd44cff93cfaa07a37e24a5edec',1,'crypto.php']]], ['pkcs5_5funpad',['pkcs5_unpad',['../crypto_8php.html#ac95ac3b1b23b65b04a86613d4206ae85',1,'crypto.php']]], + ['pkcs8_5fencode',['pkcs8_encode',['../crypto_8php.html#a0e941b6b18ff895d1a2448741abf2ef2',1,'crypto.php']]], ['pkcs8to1',['pkcs8to1',['../crypto_8php.html#a7427a18417341aa35e2207bfa205e432',1,'crypto.php']]], ['plugin_2ephp',['plugin.php',['../plugin_8php.html',1,'']]], ['plugin_5fis_5finstalled',['plugin_is_installed',['../plugin_8php.html#a855c4fdb38c0fc2714d537752a4347f9',1,'plugin.php']]], @@ -203,6 +207,7 @@ var searchData= ['prune_5fhub_5freinstalls',['prune_hub_reinstalls',['../hubloc_8php.html#ad3d0dcfcfcb347744f7617fe6f5de002',1,'hubloc.php']]], ['public_5fpermissions_5fsql',['public_permissions_sql',['../security_8php.html#ab3bdd30dc60d9ee72370b866aa4a2d01',1,'security.php']]], ['public_5frecips',['public_recips',['../zot_8php.html#a083aec6c900d244e1bfc1406f9461465',1,'zot.php']]], + ['pubrsatome',['pubrsatome',['../crypto_8php.html#a2a3fae7caca27f86d158eeaf69b6f287',1,'crypto.php']]], ['pubsites_2ephp',['pubsites.php',['../pubsites_8php.html',1,'']]], ['pubsites_5fcontent',['pubsites_content',['../pubsites_8php.html#af614e279aab54065345bda6b03eafdf0',1,'pubsites.php']]], ['purify_5fhtml',['purify_html',['../text_8php.html#a4841df5beabdd1bdd1ed56781a915d61',1,'text.php']]], diff --git a/doc/html/search/all_72.js b/doc/html/search/all_72.js index 127d198ec..dcee0cdf4 100644 --- a/doc/html/search/all_72.js +++ b/doc/html/search/all_72.js @@ -92,6 +92,7 @@ var searchData= ['rpost_5fcontent',['rpost_content',['../rpost_8php.html#a8190354d789000806d9879aea276728f',1,'rpost.php']]], ['rsa_5fsign',['rsa_sign',['../crypto_8php.html#a920e5f222d0020f47556033d8b2b6552',1,'crypto.php']]], ['rsa_5fverify',['rsa_verify',['../crypto_8php.html#ab4f21d8f6b8ece0915e7c8bb73379f96',1,'crypto.php']]], + ['rsatopem',['rsatopem',['../crypto_8php.html#a7f7e650aaeaa3832580a73eb00966b26',1,'crypto.php']]], ['rsd_5fxml_2ephp',['rsd_xml.php',['../rsd__xml_8php.html',1,'']]], ['rsd_5fxml_5fcontent',['rsd_xml_content',['../rsd__xml_8php.html#a740cd02fa15e5a53f8547fac73f0ab82',1,'rsd_xml.php']]], ['runs',['runs',['../docblox__errorchecker_8php.html#a21b4bbe5aae2d85db33affc7126a67ec',1,'docblox_errorchecker.php']]] diff --git a/doc/html/search/all_73.js b/doc/html/search/all_73.js index 45324c367..266b0bff9 100644 --- a/doc/html/search/all_73.js +++ b/doc/html/search/all_73.js @@ -1,5 +1,6 @@ var searchData= [ + ['salmon_5fkey',['salmon_key',['../crypto_8php.html#a9191447cc46f0b4eaba3273e313994d5',1,'crypto.php']]], ['sanitise_5facl',['sanitise_acl',['../text_8php.html#a9fbeae13c9abd6e27cb4d8d1817f969c',1,'text.php']]], ['save',['save',['../classphoto__driver.html#a5864fae7d8389372955a8e78cec527ac',1,'photo_driver']]], ['saveimage',['saveImage',['../classphoto__driver.html#a22ecb8c696de65a5a10bd185be9d90c3',1,'photo_driver']]], @@ -7,6 +8,8 @@ var searchData= ['scaleimage',['scaleImage',['../classphoto__driver.html#af0f7ec48a31ae9b557b6e3f8bd5b4af0',1,'photo_driver']]], ['scaleimagesquare',['scaleImageSquare',['../classphoto__driver.html#a56634842b071b96502716e9843ea5361',1,'photo_driver']]], ['scaleimageup',['scaleImageUp',['../classphoto__driver.html#a1a63c4ae17e892a115ab9cf6efb960ce',1,'photo_driver']]], + ['scrape_5ffeed',['scrape_feed',['../include_2network_8php.html#a316f318167a039c89719afbd129a8f3c',1,'network.php']]], + ['scrape_5fvcard',['scrape_vcard',['../include_2network_8php.html#acb0bd7f5fe38ff1eaebeae3284525070',1,'network.php']]], ['script_5fpath',['script_path',['../plugin_8php.html#a0e8c2ea50bfdbc39e17ccccaea21ddc3',1,'plugin.php']]], ['search',['search',['../text_8php.html#a876e94892867019935b348b573299352',1,'text.php']]], ['search_2ephp',['search.php',['../search_8php.html',1,'']]], @@ -100,6 +103,7 @@ var searchData= ['sslify_5finit',['sslify_init',['../sslify_8php.html#a75b11e54a3d1fc83e7d4c0e8b4dab316',1,'sslify.php']]], ['starred_2ephp',['starred.php',['../starred_8php.html',1,'']]], ['starred_5finit',['starred_init',['../starred_8php.html#a63024fb418c678e49fd535e3752d349a',1,'starred.php']]], + ['start_5fdelivery_5fchain',['start_delivery_chain',['../items_8php.html#adf2b8137dc4ad9ec958de2842f16f3c2',1,'items.php']]], ['startup',['startup',['../boot_8php.html#aca47505b8732177f52bb2d647eb2741c',1,'boot.php']]], ['status_5feditor',['status_editor',['../conversation_8php.html#a2a7d541854bba755eb8ada59af7dcb1a',1,'conversation.php']]], ['storage_5fdefault_5fpermissions',['STORAGE_DEFAULT_PERMISSIONS',['../boot_8php.html#aecaa1b6945b317ba8f1daf4af2aed8e6',1,'boot.php']]], @@ -112,9 +116,9 @@ var searchData= ['stringify_5farray_5felms',['stringify_array_elms',['../text_8php.html#a8796f6a9ca592ecdce7b3afc3462aa13',1,'text.php']]], ['strip_5fzids',['strip_zids',['../text_8php.html#a2f2585385530cb935a6325c809d84a4d',1,'text.php']]], ['stripdcode_5fbr_5fcb',['stripdcode_br_cb',['../bb2diaspora_8php.html#a180b0e3a7d702998be19e3c3b44b0e93',1,'bb2diaspora.php']]], - ['style_2ephp',['style.php',['../mytheme_2php_2style_8php.html',1,'']]], ['style_2ephp',['style.php',['../redbasic_2php_2style_8php.html',1,'']]], ['style_2ephp',['style.php',['../apw_2php_2style_8php.html',1,'']]], + ['style_2ephp',['style.php',['../mytheme_2php_2style_8php.html',1,'']]], ['subthread_2ephp',['subthread.php',['../subthread_8php.html',1,'']]], ['subthread_5fcontent',['subthread_content',['../subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3',1,'subthread.php']]], ['suggest_2ephp',['suggest.php',['../suggest_8php.html',1,'']]], diff --git a/doc/html/search/all_75.js b/doc/html/search/all_75.js index 2da5eff92..7d8bb61fd 100644 --- a/doc/html/search/all_75.js +++ b/doc/html/search/all_75.js @@ -17,6 +17,7 @@ var searchData= ['update_5fdisplay_2ephp',['update_display.php',['../update__display_8php.html',1,'']]], ['update_5fdisplay_5fcontent',['update_display_content',['../update__display_8php.html#aa36ac524059e209d5d75a03c16206246',1,'update_display.php']]], ['update_5ffailed',['UPDATE_FAILED',['../boot_8php.html#a75fc600186b13c3b25e661afefb5eac8',1,'boot.php']]], + ['update_5ffeed_5fitem',['update_feed_item',['../items_8php.html#a9b449eeae50003414b8b30ca927af434',1,'items.php']]], ['update_5fflags_5fdeleted',['UPDATE_FLAGS_DELETED',['../boot_8php.html#aea392cb26ed617f3a8cde648385b5df0',1,'boot.php']]], ['update_5fflags_5fforced',['UPDATE_FLAGS_FORCED',['../boot_8php.html#ab9dca53455cd157d3c6ba2bdecdbd22d',1,'boot.php']]], ['update_5fflags_5fupdated',['UPDATE_FLAGS_UPDATED',['../boot_8php.html#a9690d73434125ce594a1f5e7c2a4f7c0',1,'boot.php']]], diff --git a/doc/html/search/all_77.js b/doc/html/search/all_77.js index 21956898a..b3a5a4947 100644 --- a/doc/html/search/all_77.js +++ b/doc/html/search/all_77.js @@ -4,10 +4,9 @@ var searchData= ['wall_5fattach_5fpost',['wall_attach_post',['../wall__attach_8php.html#a7385e970e93228d082f0fd7254f6e653',1,'wall_attach.php']]], ['wall_5fupload_2ephp',['wall_upload.php',['../wall__upload_8php.html',1,'']]], ['wall_5fupload_5fpost',['wall_upload_post',['../wall__upload_8php.html#a7cbe204244cf9e0380ee932263a74d8f',1,'wall_upload.php']]], - ['webfinger',['webfinger',['../include_2network_8php.html#a8122356933bcd6b0a8567e8e15ae5cc5',1,'network.php']]], ['webfinger_2ephp',['webfinger.php',['../webfinger_8php.html',1,'']]], ['webfinger_5fcontent',['webfinger_content',['../webfinger_8php.html#a17dd28db6d390194bf9ecb809739d1d3',1,'webfinger.php']]], - ['webfinger_5fdfrn',['webfinger_dfrn',['../include_2network_8php.html#adf6008b38c555e98e7ed10da9ede2335',1,'network.php']]], + ['webfinger_5frfc7033',['webfinger_rfc7033',['../include_2network_8php.html#a3e6c751a51de33ad3563f0938296e78a',1,'network.php']]], ['webpages_2ephp',['webpages.php',['../webpages_8php.html',1,'']]], ['webpages_5fcontent',['webpages_content',['../webpages_8php.html#af3b7397d4abc153e3d2147740ee1a41d',1,'webpages.php']]], ['wfinger_2ephp',['wfinger.php',['../wfinger_8php.html',1,'']]], diff --git a/doc/html/search/all_78.js b/doc/html/search/all_78.js index c3fc54170..8abd01215 100644 --- a/doc/html/search/all_78.js +++ b/doc/html/search/all_78.js @@ -15,7 +15,6 @@ var searchData= ['xml2array',['xml2array',['../include_2network_8php.html#a99353baabbc3e0584b85eb79ee802cff',1,'network.php']]], ['xml_5fstatus',['xml_status',['../include_2network_8php.html#a9e9da2aafb806c98ecdc318604e60dc6',1,'network.php']]], ['xmlify',['xmlify',['../text_8php.html#aaed4413ed8918838b517e3b2fafaea0d',1,'text.php']]], - ['xpost_5fto_5fhtml2bbcode',['xpost_to_html2bbcode',['../post__to__red_8php.html#af2713018a2dc97e88f121fc6215beb66',1,'post_to_red.php']]], ['xrd_2ephp',['xrd.php',['../xrd_8php.html',1,'']]], ['xrd_5finit',['xrd_init',['../xrd_8php.html#aee3cf087968e4a0ff3a87de16eb23270',1,'xrd.php']]], ['xref_2ephp',['xref.php',['../xref_8php.html',1,'']]], diff --git a/doc/html/search/files_66.js b/doc/html/search/files_66.js index 5684a9e50..41bca4490 100644 --- a/doc/html/search/files_66.js +++ b/doc/html/search/files_66.js @@ -11,8 +11,6 @@ var searchData= ['fpostit_2ephp',['fpostit.php',['../fpostit_8php.html',1,'']]], ['fresh_2emd',['fresh.md',['../fresh_8md.html',1,'']]], ['friendica_2dto_2dsmarty_2dtpl_2epy',['friendica-to-smarty-tpl.py',['../friendica-to-smarty-tpl_8py.html',1,'']]], - ['frphotohelper_2ephp',['frphotohelper.php',['../frphotohelper_8php.html',1,'']]], - ['frphotos_2ephp',['frphotos.php',['../frphotos_8php.html',1,'']]], ['fsuggest_2ephp',['fsuggest.php',['../fsuggest_8php.html',1,'']]], ['full_2ephp',['full.php',['../full_8php.html',1,'']]], ['functions_2ephp',['functions.php',['../functions_8php.html',1,'']]] diff --git a/doc/html/search/functions_63.js b/doc/html/search/functions_63.js index ea8162b06..b719c2a50 100644 --- a/doc/html/search/functions_63.js +++ b/doc/html/search/functions_63.js @@ -25,7 +25,6 @@ var searchData= ['chatroom_5fcreate',['chatroom_create',['../include_2chat_8php.html#acdc80dba4eb796c7472b21129b435422',1,'chat.php']]], ['chatroom_5fdestroy',['chatroom_destroy',['../include_2chat_8php.html#a2ba3af6884ecdce95de69262fe599639',1,'chat.php']]], ['chatroom_5fenter',['chatroom_enter',['../include_2chat_8php.html#a2c95b545e46bfee64faa05ecf0afea91',1,'chat.php']]], - ['chatroom_5fflush',['chatroom_flush',['../include_2chat_8php.html#afffdd0f2c218c392ba28376948624e3f',1,'chat.php']]], ['chatroom_5fleave',['chatroom_leave',['../include_2chat_8php.html#a1ee1360f7d2549c7549ae07cb5190f0f',1,'chat.php']]], ['chatroom_5flist',['chatroom_list',['../include_2chat_8php.html#aedcb532a0627b8644001a2fadab4e87a',1,'chat.php']]], ['chatsvc_5fcontent',['chatsvc_content',['../chatsvc_8php.html#a7032784215e1f6747cf385a6598770f9',1,'chatsvc.php']]], @@ -95,7 +94,7 @@ var searchData= ['construct_5factivity_5ftarget',['construct_activity_target',['../items_8php.html#aa579bc4445d60098b1410961ca8e96b7',1,'items.php']]], ['construct_5fpage',['construct_page',['../boot_8php.html#acc4e0c910af066148b810e5fde55fff1',1,'boot.php']]], ['construct_5fverb',['construct_verb',['../items_8php.html#a8f3c85c584ccd2b98c3ca440e45b40f8',1,'items.php']]], - ['consume_5ffeed',['consume_feed',['../items_8php.html#a8794863cdf8ce1333040933d3a3f66bd',1,'items.php']]], + ['consume_5ffeed',['consume_feed',['../items_8php.html#adc26e08aa61f5666da04ab5d2a9d68a6',1,'items.php']]], ['contact_5fblock',['contact_block',['../text_8php.html#ad6432621d0fafcbcf3d3b9b49bef7784',1,'text.php']]], ['contact_5fpoll_5finterval',['contact_poll_interval',['../contact__selectors_8php.html#a9839e8fdaac7ffb37bf1420493f5c28f',1,'contact_selectors.php']]], ['contact_5fprofile_5fassign',['contact_profile_assign',['../contact__selectors_8php.html#a2c743d2eb526eb758d943a1490162d75',1,'contact_selectors.php']]], diff --git a/doc/html/search/functions_64.js b/doc/html/search/functions_64.js index 40a205ec2..3fa1e0b1c 100644 --- a/doc/html/search/functions_64.js +++ b/doc/html/search/functions_64.js @@ -23,6 +23,8 @@ var searchData= ['deliver',['deliver',['../classProtoDriver.html#a85e9063f6d0c304410cd246f7900ea1b',1,'ProtoDriver\deliver()'],['../classZotDriver.html#a876e3e0e4cad83c0b58c8696b344be6f',1,'ZotDriver\deliver()']]], ['deliver_5fprivate',['deliver_private',['../classProtoDriver.html#ae5b44739f84c10d00a9b65adf3785181',1,'ProtoDriver\deliver_private()'],['../classZotDriver.html#afaaf9941169fc966e43e25b25e6daea6',1,'ZotDriver\deliver_private()']]], ['deliver_5frun',['deliver_run',['../deliver_8php.html#a397afcb9afecf0c1816b0951189dd346',1,'deliver.php']]], + ['dertopem',['DerToPem',['../crypto_8php.html#a630e1574554f34e7c38511585d9e71a2',1,'crypto.php']]], + ['dertorsa',['DerToRsa',['../crypto_8php.html#ae5af17db1cb5d7c91d486e1264079839',1,'crypto.php']]], ['design_5ftools',['design_tools',['../text_8php.html#a87a3cefc603302c78982f1d8e1245265',1,'text.php']]], ['destroy',['destroy',['../classphoto__driver.html#ae1a9edaf846983780dc65ea77d99e813',1,'photo_driver\destroy()'],['../classphoto__gd.html#a724703ecf71b1f1d04a80e86c76db6b1',1,'photo_gd\destroy()'],['../classphoto__imagick.html#afd49d64751ee3a298eac0c0ce0ba0207',1,'photo_imagick\destroy()']]], ['detect_5flanguage',['detect_language',['../language_8php.html#a632da17c7ac0d2dc1a00a4706870194b',1,'language.php']]], @@ -34,7 +36,8 @@ var searchData= ['diaspora_5fdispatch',['diaspora_dispatch',['../diaspora_8php.html#a6f0a67b6b17503c125af32763be931b7',1,'diaspora.php']]], ['diaspora_5fdispatch_5fpublic',['diaspora_dispatch_public',['../diaspora_8php.html#ab99505944728d46585b8312989de533d',1,'diaspora.php']]], ['diaspora_5fget_5fcontact_5fby_5fhandle',['diaspora_get_contact_by_handle',['../diaspora_8php.html#aa8e551a53fcce34be3942d0c3e20d1f4',1,'diaspora.php']]], - ['diaspora_5fhandle_5ffrom_5fcontact',['diaspora_handle_from_contact',['../diaspora_8php.html#a625056c9dab9b9779d0665650e260bb9',1,'diaspora.php']]], + ['diaspora_5fhandle_5ffrom_5fcontact',['diaspora_handle_from_contact',['../diaspora_8php.html#a5ed66b910d7b0284f9b3ee04e72306ff',1,'diaspora.php']]], + ['diaspora_5fis_5fblacklisted',['diaspora_is_blacklisted',['../diaspora_8php.html#a858f70153c384f8778082cf7843a19da',1,'diaspora.php']]], ['diaspora_5fis_5freshare',['diaspora_is_reshare',['../diaspora_8php.html#ad9985cc4214bdfc14878785c838c8690',1,'diaspora.php']]], ['diaspora_5flike',['diaspora_like',['../diaspora_8php.html#a5d57518545baa31cf8a85a937a267681',1,'diaspora.php']]], ['diaspora_5fmessage',['diaspora_message',['../diaspora_8php.html#a7cff2f8f11044c1b3a360f20e1bbee46',1,'diaspora.php']]], @@ -42,7 +45,6 @@ var searchData= ['diaspora_5fol',['diaspora_ol',['../bb2diaspora_8php.html#a8b96bd45884fa1c40b942939354197d4',1,'bb2diaspora.php']]], ['diaspora_5fphoto',['diaspora_photo',['../diaspora_8php.html#a71fe9bb66626b4197ae018a230778bb2',1,'diaspora.php']]], ['diaspora_5fpost',['diaspora_post',['../diaspora_8php.html#a20b968d64ef26afe5cb0cc75a7570a31',1,'diaspora.php']]], - ['diaspora_5fpost_5fallow',['diaspora_post_allow',['../diaspora_8php.html#a978b08b5130bc94cf38ef3a2bcba0e3a',1,'diaspora.php']]], ['diaspora_5fprofile',['diaspora_profile',['../diaspora_8php.html#a900abf51398b2ef26cd2cd31c52f1b0f',1,'diaspora.php']]], ['diaspora_5fpubmsg_5fbuild',['diaspora_pubmsg_build',['../diaspora_8php.html#addaf8f202e52e3f0a49ed05681f9405c',1,'diaspora.php']]], ['diaspora_5frequest',['diaspora_request',['../diaspora_8php.html#ac1ab782a34552a7c6b4dc961754ed598',1,'diaspora.php']]], @@ -72,6 +74,7 @@ var searchData= ['dirsearch_5fcontent',['dirsearch_content',['../dirsearch_8php.html#aa1fb04e1de4f25b63349ac78f94ceb4c',1,'dirsearch.php']]], ['dirsearch_5finit',['dirsearch_init',['../dirsearch_8php.html#a3e51964ae3f5ff147403407b65324752',1,'dirsearch.php']]], ['discover',['discover',['../classProtoDriver.html#a64a3868cffe27d601d55f69a2ecc4337',1,'ProtoDriver\discover()'],['../classZotDriver.html#a40d328ff9f6b0a238afe286dddee1514',1,'ZotDriver\discover()']]], + ['discover_5fby_5fwebbie',['discover_by_webbie',['../include_2network_8php.html#a63e62946e194928eb17c5a9f2bbef0fe',1,'network.php']]], ['display_5fcontent',['display_content',['../display_8php.html#a37137c98d47bf3306f4c2bb9f5b60de0',1,'display.php']]], ['dlogger',['dlogger',['../text_8php.html#a0a1f7c0e97f9ecbebf3e5834582b014c',1,'text.php']]], ['dob',['dob',['../datetime_8php.html#a3f2897db32e745fe2f3e70a6b46578f8',1,'datetime.php']]], diff --git a/doc/html/search/functions_66.js b/doc/html/search/functions_66.js index 4931f5bed..d86e4c5d3 100644 --- a/doc/html/search/functions_66.js +++ b/doc/html/search/functions_66.js @@ -7,6 +7,7 @@ var searchData= ['feed_5fsalmonlinks',['feed_salmonlinks',['../text_8php.html#a89929fa6f70a8ba54d5273fcf622b665',1,'text.php']]], ['fetch_5flrdd_5ftemplate',['fetch_lrdd_template',['../include_2network_8php.html#a8d5a3afb51cc932032b5dcc159efaae0',1,'network.php']]], ['fetch_5fpost_5ftags',['fetch_post_tags',['../items_8php.html#adf980098b6de9c3993bc3ff26a8dd6f9',1,'items.php']]], + ['fetch_5fxrd_5flinks',['fetch_xrd_links',['../include_2network_8php.html#a850ed5307c6a18076f4b80addc99602d',1,'network.php']]], ['field_5ftimezone',['field_timezone',['../datetime_8php.html#a03900dcf0f9e3c58793a031673a70326',1,'datetime.php']]], ['file_5ftag_5fdecode',['file_tag_decode',['../taxonomy_8php.html#a08df5164926d2b31b8e9fcfe919de2b6',1,'taxonomy.php']]], ['file_5ftag_5fencode',['file_tag_encode',['../taxonomy_8php.html#a3299482ac20e9d79453048dd52881d37',1,'taxonomy.php']]], @@ -49,8 +50,6 @@ var searchData= ['format_5fmentions',['format_mentions',['../text_8php.html#ad8c6e13d6accf057136c5f30a23a5f08',1,'text.php']]], ['format_5fnotification',['format_notification',['../include_2notify_8php.html#a0e61728e487df50c72e6434f911a57d3',1,'notify.php']]], ['format_5fterm_5ffor_5fdisplay',['format_term_for_display',['../taxonomy_8php.html#adfead45e3b8a3dfb2b4a4b9281d0dbe1',1,'taxonomy.php']]], - ['frphotos_5fcontent',['frphotos_content',['../frphotos_8php.html#a6536248e7dda3f06cf37838064b961a4',1,'frphotos.php']]], - ['frphotos_5finit',['frphotos_init',['../frphotos_8php.html#a4a33fadb181497eff301ee5132ec61d1',1,'frphotos.php']]], ['fsuggest_5fcontent',['fsuggest_content',['../fsuggest_8php.html#aa6c49ed4b50a387f1845f36844dd7998',1,'fsuggest.php']]], ['fsuggest_5fpost',['fsuggest_post',['../fsuggest_8php.html#a61ecfe10ce937ed526614f8fd3de3c7d',1,'fsuggest.php']]], ['ftosmarty',['fToSmarty',['../namespacefriendica-to-smarty-tpl.html#a89388ea9b2826e8218ed480e917d8105',1,'friendica-to-smarty-tpl']]] diff --git a/doc/html/search/functions_67.js b/doc/html/search/functions_67.js index 1ae04024c..51338a0e0 100644 --- a/doc/html/search/functions_67.js +++ b/doc/html/search/functions_67.js @@ -10,7 +10,7 @@ var searchData= ['get_5fall_5fperms',['get_all_perms',['../permissions_8php.html#aeca9b280f3dc3358c89976d81d690008',1,'permissions.php']]], ['get_5fapp',['get_app',['../classBaseObject.html#ac43f10e69ce80c78e4870636250fc8a2',1,'BaseObject\get_app()'],['../boot_8php.html#a0e6db7e365f2b041a828b93786f694bc',1,'get_app(): boot.php']]], ['get_5fapps',['get_apps',['../classApp.html#a5c63eabdc7fdd8b6e3348980ec16a3ad',1,'App']]], - ['get_5fatom_5felements',['get_atom_elements',['../items_8php.html#a896c1809d58f2d7a42cfe14577958ddf',1,'items.php']]], + ['get_5fatom_5felements',['get_atom_elements',['../items_8php.html#a5e5be7bf1f8257dec0b2647e60a3f3f1',1,'items.php']]], ['get_5fbaseurl',['get_baseurl',['../classApp.html#a604d659d6977a99de42a160343e5289a',1,'App']]], ['get_5fbb_5ftag_5fpos',['get_bb_tag_pos',['../bb2diaspora_8php.html#a4c2f8f11b29a06809d9b07782215b1b2',1,'bb2diaspora.php']]], ['get_5fbest_5flanguage',['get_best_language',['../language_8php.html#a980dee1d8715a98ab02e36b59facf8ed',1,'language.php']]], @@ -34,8 +34,9 @@ var searchData= ['get_5fdata_5fvalue',['get_data_value',['../classItem.html#ac6f1c96cc82a0dfb7e881fc70309ea3c',1,'Item']]], ['get_5fdb_5ferrno',['get_db_errno',['../setup_8php.html#a8652788e8589778c5f81634a9d5b9429',1,'setup.php']]], ['get_5fdefault_5fprofile_5fphoto',['get_default_profile_photo',['../identity_8php.html#ab1485a26b032956e1496fc08c58b83ed',1,'identity.php']]], - ['get_5fdiaspora_5fkey',['get_diaspora_key',['../diaspora_8php.html#a986114ce8d7a582ebd0b5972738e1fc2',1,'diaspora.php']]], + ['get_5fdiaspora_5fkey',['get_diaspora_key',['../diaspora_8php.html#a9bf7ef4094e0e14f6e2b7fe76ab7ad2e',1,'diaspora.php']]], ['get_5fdim',['get_dim',['../datetime_8php.html#a7df24d72ea05922d3127363e2295174c',1,'datetime.php']]], + ['get_5fdirectory_5frealm',['get_directory_realm',['../boot_8php.html#a329400dcb29897cdaae3020109272285',1,'boot.php']]], ['get_5fevents',['get_events',['../identity_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312',1,'identity.php']]], ['get_5ffeatures',['get_features',['../features_8php.html#ae73c5b03b01c7284ed7e7e0e774e975c',1,'features.php']]], ['get_5ffeed_5ffor',['get_feed_for',['../items_8php.html#a04a35b610acfe54434df08adec39c0c7',1,'items.php']]], @@ -79,6 +80,7 @@ var searchData= ['get_5fpublic_5ffeed',['get_public_feed',['../items_8php.html#a079e099e15d88d47aeb6ca6d60da7107',1,'items.php']]], ['get_5fredirect_5furl',['get_redirect_url',['../classItem.html#a428f448f89a8629055ea3294eb942aea',1,'Item']]], ['get_5frel_5flink',['get_rel_link',['../text_8php.html#a3972701c5c83624ec4e2d06242f614e7',1,'text.php']]], + ['get_5frole_5fperms',['get_role_perms',['../permissions_8php.html#a9b5f5120566a3699a98efc5ccb0c59fe',1,'permissions.php']]], ['get_5frpost_5fpath',['get_rpost_path',['../zot_8php.html#a8e22dbc6f884be3644a892a876cbd972',1,'zot.php']]], ['get_5fsys_5fchannel',['get_sys_channel',['../identity_8php.html#aaff86ee3b5984821e7a256c2da5f1a51',1,'identity.php']]], ['get_5fsystem_5fapps',['get_system_apps',['../include_2apps_8php.html#ae64f72eb4f126e03b4eb65ed1702a3ca',1,'apps.php']]], diff --git a/doc/html/search/functions_68.js b/doc/html/search/functions_68.js index 0319b653b..1fa2cdd16 100644 --- a/doc/html/search/functions_68.js +++ b/doc/html/search/functions_68.js @@ -1,5 +1,6 @@ var searchData= [ + ['handle_5ffeed',['handle_feed',['../items_8php.html#a52c24114b73c0bdb605a03cd29712223',1,'items.php']]], ['handle_5ftag',['handle_tag',['../item_8php.html#aa22feef4de326e1d7078dedd892e615c',1,'item.php']]], ['has_5fpermissions',['has_permissions',['../items_8php.html#a77051724d1784074ff187e73a4db93fe',1,'items.php']]], ['hcard_5fcontent',['hcard_content',['../hcard_8php.html#a3663012f1549849af88aba2bb87388e3',1,'hcard.php']]], diff --git a/doc/html/search/functions_6d.js b/doc/html/search/functions_6d.js index 20f8856e9..bdf817a57 100644 --- a/doc/html/search/functions_6d.js +++ b/doc/html/search/functions_6d.js @@ -30,6 +30,8 @@ var searchData= ['menu_5fpost',['menu_post',['../mod_2menu_8php.html#aaa491ef173868fe002aece4632bcf393',1,'menu.php']]], ['menu_5frender',['menu_render',['../include_2menu_8php.html#a03a5deed3908543581c074ce333e9d6a',1,'menu.php']]], ['message_5fcontent',['message_content',['../mod_2message_8php.html#ac72dfed3ce08fcb331d66b37edc6e15f',1,'message.php']]], + ['metopem',['metopem',['../crypto_8php.html#af8bbdeaf4abed7b40365d301e6013c85',1,'crypto.php']]], + ['metorsa',['metorsa',['../crypto_8php.html#a573f02517abe4ac9241268263063b2a0',1,'crypto.php']]], ['micropro',['micropro',['../text_8php.html#a2a902f5fdba8646333e997898ac45ea3',1,'text.php']]], ['mimetype_5fselect',['mimetype_select',['../text_8php.html#a1633412120f52bdce5f43e0a127d9293',1,'text.php']]], ['mini_5fgroup_5fselect',['mini_group_select',['../include_2group_8php.html#ab0e422a0f31c0c64fd9084ca03d85f32',1,'group.php']]], diff --git a/doc/html/search/functions_6f.js b/doc/html/search/functions_6f.js index 4f5083c20..4d843de13 100644 --- a/doc/html/search/functions_6f.js +++ b/doc/html/search/functions_6f.js @@ -14,6 +14,7 @@ var searchData= ['oembed_5freplacecb',['oembed_replacecb',['../include_2oembed_8php.html#a00c4c80deffd9daf8dc97b58d4c64ed0',1,'oembed.php']]], ['oexchange_5fcontent',['oexchange_content',['../oexchange_8php.html#a2d8b785cd7d041a4e6274f5af370cf26',1,'oexchange.php']]], ['oexchange_5finit',['oexchange_init',['../oexchange_8php.html#ac8e2e469ddc3db984b0c1b44558aca59',1,'oexchange.php']]], + ['old_5fwebfinger',['old_webfinger',['../include_2network_8php.html#a872bbe72d23826c64c9e0f822180a3ec',1,'network.php']]], ['onedirsync_5frun',['onedirsync_run',['../onedirsync_8php.html#a411aedd47c57476099647961e6a86691',1,'onedirsync.php']]], ['onepoll_5frun',['onepoll_run',['../onepoll_8php.html#a72753b2fdec79b37c7f432035c91fb6d',1,'onepoll.php']]], ['online_5finit',['online_init',['../online_8php.html#a80e107c84eb722b0ca11d0413b96f9f7',1,'online.php']]], diff --git a/doc/html/search/functions_70.js b/doc/html/search/functions_70.js index 95945433f..9fb807cb9 100644 --- a/doc/html/search/functions_70.js +++ b/doc/html/search/functions_70.js @@ -13,6 +13,8 @@ var searchData= ['pdl_5fselector',['pdl_selector',['../comanche_8php.html#af7150df735e5ff9d467994cd6f769c6e',1,'comanche.php']]], ['pdledit_5fcontent',['pdledit_content',['../pdledit_8php.html#a59cb550f6b7a4e7d8196fbc9de601619',1,'pdledit.php']]], ['pdledit_5fpost',['pdledit_post',['../pdledit_8php.html#a81da3c955d0e3db55d148a31483104c7',1,'pdledit.php']]], + ['pemtome',['pemtome',['../crypto_8php.html#a798368843cdd9bb08386b48e53e29e8c',1,'crypto.php']]], + ['pemtorsa',['pemtorsa',['../crypto_8php.html#a35bc357c93f4ddc67ef377620b0349e8',1,'crypto.php']]], ['perm_5fis_5fallowed',['perm_is_allowed',['../permissions_8php.html#a67ada9ed51e77885b6b0f6a28cee1835',1,'permissions.php']]], ['permissions_5fsql',['permissions_sql',['../security_8php.html#afa683bc025a1d2fe9065e2f6cd71a22f',1,'security.php']]], ['perms2str',['perms2str',['../text_8php.html#a98fd99dee3da8cf4c148dc04efe782ee',1,'text.php']]], @@ -33,9 +35,11 @@ var searchData= ['php_5finit',['php_init',['../php_8php.html#adb7164dfed9a4ecbe2e168e1e78f12f6',1,'php.php']]], ['ping_5finit',['ping_init',['../ping_8php.html#a77217b1b190b4c5d8770867b45f0c0a1',1,'ping.php']]], ['pipe_5fstreams',['pipe_streams',['../include_2attach_8php.html#a5d484de2d19a93071571d6499a50ae34',1,'attach.php']]], + ['pkcs1_5fencode',['pkcs1_encode',['../crypto_8php.html#a890b443f80f0968fb9eabd93fc99dbb5',1,'crypto.php']]], ['pkcs1to8',['pkcs1to8',['../crypto_8php.html#a4d15d19b446dbf47804675df7c85e2a9',1,'crypto.php']]], ['pkcs5_5fpad',['pkcs5_pad',['../crypto_8php.html#ad5e51fd44cff93cfaa07a37e24a5edec',1,'crypto.php']]], ['pkcs5_5funpad',['pkcs5_unpad',['../crypto_8php.html#ac95ac3b1b23b65b04a86613d4206ae85',1,'crypto.php']]], + ['pkcs8_5fencode',['pkcs8_encode',['../crypto_8php.html#a0e941b6b18ff895d1a2448741abf2ef2',1,'crypto.php']]], ['pkcs8to1',['pkcs8to1',['../crypto_8php.html#a7427a18417341aa35e2207bfa205e432',1,'crypto.php']]], ['plugin_5fis_5finstalled',['plugin_is_installed',['../plugin_8php.html#a855c4fdb38c0fc2714d537752a4347f9',1,'plugin.php']]], ['po2php_5frun',['po2php_run',['../po2php_8php.html#a3b75e36f913198299e99559b175cd8b4',1,'po2php.php']]], @@ -115,6 +119,7 @@ var searchData= ['prune_5fhub_5freinstalls',['prune_hub_reinstalls',['../hubloc_8php.html#ad3d0dcfcfcb347744f7617fe6f5de002',1,'hubloc.php']]], ['public_5fpermissions_5fsql',['public_permissions_sql',['../security_8php.html#ab3bdd30dc60d9ee72370b866aa4a2d01',1,'security.php']]], ['public_5frecips',['public_recips',['../zot_8php.html#a083aec6c900d244e1bfc1406f9461465',1,'zot.php']]], + ['pubrsatome',['pubrsatome',['../crypto_8php.html#a2a3fae7caca27f86d158eeaf69b6f287',1,'crypto.php']]], ['pubsites_5fcontent',['pubsites_content',['../pubsites_8php.html#af614e279aab54065345bda6b03eafdf0',1,'pubsites.php']]], ['purify_5fhtml',['purify_html',['../text_8php.html#a4841df5beabdd1bdd1ed56781a915d61',1,'text.php']]], ['push_5flang',['push_lang',['../language_8php.html#ac9142ef1d01a235c760deb0f16643f5a',1,'language.php']]], diff --git a/doc/html/search/functions_72.js b/doc/html/search/functions_72.js index 4f30c69be..1a4dfc7e2 100644 --- a/doc/html/search/functions_72.js +++ b/doc/html/search/functions_72.js @@ -64,6 +64,7 @@ var searchData= ['rpost_5fcontent',['rpost_content',['../rpost_8php.html#a8190354d789000806d9879aea276728f',1,'rpost.php']]], ['rsa_5fsign',['rsa_sign',['../crypto_8php.html#a920e5f222d0020f47556033d8b2b6552',1,'crypto.php']]], ['rsa_5fverify',['rsa_verify',['../crypto_8php.html#ab4f21d8f6b8ece0915e7c8bb73379f96',1,'crypto.php']]], + ['rsatopem',['rsatopem',['../crypto_8php.html#a7f7e650aaeaa3832580a73eb00966b26',1,'crypto.php']]], ['rsd_5fxml_5fcontent',['rsd_xml_content',['../rsd__xml_8php.html#a740cd02fa15e5a53f8547fac73f0ab82',1,'rsd_xml.php']]], ['runs',['runs',['../docblox__errorchecker_8php.html#a21b4bbe5aae2d85db33affc7126a67ec',1,'docblox_errorchecker.php']]] ]; diff --git a/doc/html/search/functions_73.js b/doc/html/search/functions_73.js index c1d5e625a..f771c9bdb 100644 --- a/doc/html/search/functions_73.js +++ b/doc/html/search/functions_73.js @@ -1,5 +1,6 @@ var searchData= [ + ['salmon_5fkey',['salmon_key',['../crypto_8php.html#a9191447cc46f0b4eaba3273e313994d5',1,'crypto.php']]], ['sanitise_5facl',['sanitise_acl',['../text_8php.html#a9fbeae13c9abd6e27cb4d8d1817f969c',1,'text.php']]], ['save',['save',['../classphoto__driver.html#a5864fae7d8389372955a8e78cec527ac',1,'photo_driver']]], ['saveimage',['saveImage',['../classphoto__driver.html#a22ecb8c696de65a5a10bd185be9d90c3',1,'photo_driver']]], @@ -7,6 +8,8 @@ var searchData= ['scaleimage',['scaleImage',['../classphoto__driver.html#af0f7ec48a31ae9b557b6e3f8bd5b4af0',1,'photo_driver']]], ['scaleimagesquare',['scaleImageSquare',['../classphoto__driver.html#a56634842b071b96502716e9843ea5361',1,'photo_driver']]], ['scaleimageup',['scaleImageUp',['../classphoto__driver.html#a1a63c4ae17e892a115ab9cf6efb960ce',1,'photo_driver']]], + ['scrape_5ffeed',['scrape_feed',['../include_2network_8php.html#a316f318167a039c89719afbd129a8f3c',1,'network.php']]], + ['scrape_5fvcard',['scrape_vcard',['../include_2network_8php.html#acb0bd7f5fe38ff1eaebeae3284525070',1,'network.php']]], ['script_5fpath',['script_path',['../plugin_8php.html#a0e8c2ea50bfdbc39e17ccccaea21ddc3',1,'plugin.php']]], ['search',['search',['../text_8php.html#a876e94892867019935b348b573299352',1,'text.php']]], ['search_5fac_5finit',['search_ac_init',['../search__ac_8php.html#a14f90c83a3f2be095e9e2992a8d66138',1,'search_ac.php']]], @@ -81,6 +84,7 @@ var searchData= ['sslify',['sslify',['../text_8php.html#a33bdb5d4bfff2ede7caf61a98ac0a2e9',1,'text.php']]], ['sslify_5finit',['sslify_init',['../sslify_8php.html#a75b11e54a3d1fc83e7d4c0e8b4dab316',1,'sslify.php']]], ['starred_5finit',['starred_init',['../starred_8php.html#a63024fb418c678e49fd535e3752d349a',1,'starred.php']]], + ['start_5fdelivery_5fchain',['start_delivery_chain',['../items_8php.html#adf2b8137dc4ad9ec958de2842f16f3c2',1,'items.php']]], ['startup',['startup',['../boot_8php.html#aca47505b8732177f52bb2d647eb2741c',1,'boot.php']]], ['status_5feditor',['status_editor',['../conversation_8php.html#a2a7d541854bba755eb8ada59af7dcb1a',1,'conversation.php']]], ['store',['store',['../classphoto__driver.html#a642a8d0c4ad5f887c99c6af77cee287b',1,'photo_driver']]], diff --git a/doc/html/search/functions_75.js b/doc/html/search/functions_75.js index deaadc8ab..09258d0df 100644 --- a/doc/html/search/functions_75.js +++ b/doc/html/search/functions_75.js @@ -13,6 +13,7 @@ var searchData= ['update_5fchannel_5fcontent',['update_channel_content',['../update__channel_8php.html#aca52a9da500f0db2f0a8666af5bc06ba',1,'update_channel.php']]], ['update_5fdirectory_5fentry',['update_directory_entry',['../dir__fns_8php.html#a44062d4b471d1e83f92f6c184585aa13',1,'dir_fns.php']]], ['update_5fdisplay_5fcontent',['update_display_content',['../update__display_8php.html#aa36ac524059e209d5d75a03c16206246',1,'update_display.php']]], + ['update_5ffeed_5fitem',['update_feed_item',['../items_8php.html#a9b449eeae50003414b8b30ca927af434',1,'items.php']]], ['update_5fimported_5fitem',['update_imported_item',['../zot_8php.html#a31aad56acf8ff8f2353e6ff8595544df',1,'zot.php']]], ['update_5fmodtime',['update_modtime',['../zot_8php.html#ab319d1d9fff9c7775d9daef42d1f33dd',1,'zot.php']]], ['update_5fnetwork_5fcontent',['update_network_content',['../update__network_8php.html#a8abf5b9f65af6a27ee2f9d7207ed1b41',1,'update_network.php']]], diff --git a/doc/html/search/functions_77.js b/doc/html/search/functions_77.js index c8b0145e5..8cfb46c63 100644 --- a/doc/html/search/functions_77.js +++ b/doc/html/search/functions_77.js @@ -2,9 +2,8 @@ var searchData= [ ['wall_5fattach_5fpost',['wall_attach_post',['../wall__attach_8php.html#a7385e970e93228d082f0fd7254f6e653',1,'wall_attach.php']]], ['wall_5fupload_5fpost',['wall_upload_post',['../wall__upload_8php.html#a7cbe204244cf9e0380ee932263a74d8f',1,'wall_upload.php']]], - ['webfinger',['webfinger',['../include_2network_8php.html#a8122356933bcd6b0a8567e8e15ae5cc5',1,'network.php']]], ['webfinger_5fcontent',['webfinger_content',['../webfinger_8php.html#a17dd28db6d390194bf9ecb809739d1d3',1,'webfinger.php']]], - ['webfinger_5fdfrn',['webfinger_dfrn',['../include_2network_8php.html#adf6008b38c555e98e7ed10da9ede2335',1,'network.php']]], + ['webfinger_5frfc7033',['webfinger_rfc7033',['../include_2network_8php.html#a3e6c751a51de33ad3563f0938296e78a',1,'network.php']]], ['webpages_5fcontent',['webpages_content',['../webpages_8php.html#af3b7397d4abc153e3d2147740ee1a41d',1,'webpages.php']]], ['wfinger_5finit',['wfinger_init',['../wfinger_8php.html#ae21e50c8d0a5f3c9be9f43a4e519acd3',1,'wfinger.php']]], ['what_5fnext',['what_next',['../setup_8php.html#aea1ebdda58ec938f4e7b31aa5c5f6b58',1,'setup.php']]], diff --git a/doc/html/search/functions_78.js b/doc/html/search/functions_78.js index 97e977ea8..2653d63e2 100644 --- a/doc/html/search/functions_78.js +++ b/doc/html/search/functions_78.js @@ -7,7 +7,6 @@ var searchData= ['xml2array',['xml2array',['../include_2network_8php.html#a99353baabbc3e0584b85eb79ee802cff',1,'network.php']]], ['xml_5fstatus',['xml_status',['../include_2network_8php.html#a9e9da2aafb806c98ecdc318604e60dc6',1,'network.php']]], ['xmlify',['xmlify',['../text_8php.html#aaed4413ed8918838b517e3b2fafaea0d',1,'text.php']]], - ['xpost_5fto_5fhtml2bbcode',['xpost_to_html2bbcode',['../post__to__red_8php.html#af2713018a2dc97e88f121fc6215beb66',1,'post_to_red.php']]], ['xrd_5finit',['xrd_init',['../xrd_8php.html#aee3cf087968e4a0ff3a87de16eb23270',1,'xrd.php']]], ['xref_5finit',['xref_init',['../xref_8php.html#a9bee399213b8de8226b0d60834307473',1,'xref.php']]] ]; diff --git a/doc/html/search/variables_24.js b/doc/html/search/variables_24.js index 112919d28..2409f73b0 100644 --- a/doc/html/search/variables_24.js +++ b/doc/html/search/variables_24.js @@ -1,12 +1,11 @@ var searchData= [ - ['_24a',['$a',['../frphotohelper_8php.html#acebf83966ef6d7e5645a6b62ba368f9f',1,'$a(): frphotohelper.php'],['../typo_8php.html#acebf83966ef6d7e5645a6b62ba368f9f',1,'$a(): typo.php']]], + ['_24a',['$a',['../typo_8php.html#acebf83966ef6d7e5645a6b62ba368f9f',1,'typo.php']]], ['_24account',['$account',['../classApp.html#a14bd4b1c29f3aff371fe5d4cb11aeea3',1,'App']]], ['_24api',['$API',['../include_2api_8php.html#aeb2e7ad00ea666b4b6dfcf82008194f8',1,'api.php']]], ['_24app',['$app',['../classBaseObject.html#a02cc4cd8fa26b6fc76d92fde54b4e4b1',1,'BaseObject']]], ['_24apps',['$apps',['../classApp.html#a230e975296cf164da2fee35ef720964f',1,'App']]], ['_24argc',['$argc',['../classApp.html#af58db526040829b1c8bd95561b329262',1,'App']]], - ['_24args',['$args',['../frphotohelper_8php.html#a67e94494731d99ed23b123e95175bc10',1,'$args(): frphotohelper.php'],['../frphotohelper_8php.html#acaefa2c3b286896f12eb55ae56e154af',1,'$args(): frphotohelper.php'],['../frphotohelper_8php.html#ad3310ef5d714f2baae2d882a1e22cf05',1,'$args(): frphotohelper.php'],['../frphotohelper_8php.html#adbc68ba8d9b3e0fac2d4c9fb683ef9f6',1,'$args(): frphotohelper.php'],['../frphotohelper_8php.html#ad4237a752a460152a5445abcb50238cf',1,'$args(): frphotohelper.php'],['../frphotohelper_8php.html#a44a64913242d4235e332cc69885c1460',1,'$args(): frphotohelper.php'],['../frphotohelper_8php.html#a6bb04aa9e43d97273fc84b6e308999c5',1,'$args(): frphotohelper.php'],['../frphotohelper_8php.html#ab93f92df528f98af0f4511720032b03c',1,'$args(): frphotohelper.php'],['../frphotohelper_8php.html#a1fba6794d8decbc7b957710af3179c10',1,'$args(): frphotohelper.php'],['../frphotohelper_8php.html#a88f7360b97eecb65e5e13708a093d172',1,'$args(): frphotohelper.php'],['../frphotohelper_8php.html#ad5fe4c1396829f3ce98eec037db698b2',1,'$args(): frphotohelper.php'],['../frphotohelper_8php.html#ab66e3756cdc86eaa61d42e675092c649',1,'$args(): frphotohelper.php']]], ['_24argv',['$argv',['../classApp.html#ab3da757abe5cb45bf88f07cc51a73b58',1,'App']]], ['_24arr',['$arr',['../extract_8php.html#a63bb4c41bc532baacf6a4976cfaa0feb',1,'extract.php']]], ['_24aside',['$aside',['../minimalisticdarkness_8php.html#a6e5d97615c6faef5dbffe04b8024ceaf',1,'minimalisticdarkness.php']]], @@ -14,14 +13,11 @@ var searchData= ['_24baseurl',['$baseurl',['../classApp.html#ad5175536561021548ae8188e24c7b80c',1,'App']]], ['_24bodyclass',['$bodyclass',['../theme_2blogga_2php_2default_8php.html#a720581ae288aa09511670563e4205a4a',1,'$bodyclass(): default.php'],['../theme_2blogga_2view_2theme_2blog_2default_8php.html#a720581ae288aa09511670563e4205a4a',1,'$bodyclass(): default.php']]], ['_24browser',['$browser',['../classRedBasicAuth.html#af14337f1baad407f8a85d48205c0f30e',1,'RedBasicAuth']]], - ['_24c',['$c',['../frphotohelper_8php.html#ab73d7f4f2dae233dd561e7fdaab3a77b',1,'frphotohelper.php']]], ['_24cached_5fprofile_5fimage',['$cached_profile_image',['../classApp.html#abe0e4fa91097f7a6588e1213a834121c',1,'App']]], ['_24cached_5fprofile_5fpicdate',['$cached_profile_picdate',['../classApp.html#aab4a685d15a363bb1d7edbbc20bfb94e',1,'App']]], ['_24called_5fapi',['$called_api',['../include_2api_8php.html#aa62b15a6bbb280e86b98132eb214013d',1,'api.php']]], ['_24category',['$category',['../classApp.html#a5cfc098c061b7d765add58fd2ca97445',1,'App']]], - ['_24ch',['$ch',['../frphotohelper_8php.html#a696b903bbc5c02914bdd402e91826eca',1,'frphotohelper.php']]], - ['_24channel',['$channel',['../classApp.html#a050b0696118da47e8b30859ad1a2c149',1,'App\$channel()'],['../classItem.html#acc32426c0f465391be8a99ad810c7b8e',1,'Item\$channel()'],['../frphotohelper_8php.html#ac162139c764f53cc07f42b09432549ba',1,'$channel(): frphotohelper.php'],['../php_2theme__init_8php.html#a54f32c086fe209c99769a4c4047dd864',1,'$channel(): theme_init.php'],['../theme_2apw_2php_2theme__init_8php.html#a54f32c086fe209c99769a4c4047dd864',1,'$channel(): theme_init.php']]], - ['_24channel_5faddress',['$channel_address',['../frphotohelper_8php.html#a1ce9aa56ce28b42f5db69d00d4c78972',1,'frphotohelper.php']]], + ['_24channel',['$channel',['../classApp.html#a050b0696118da47e8b30859ad1a2c149',1,'App\$channel()'],['../classItem.html#acc32426c0f465391be8a99ad810c7b8e',1,'Item\$channel()'],['../php_2theme__init_8php.html#a54f32c086fe209c99769a4c4047dd864',1,'$channel(): theme_init.php'],['../theme_2apw_2php_2theme__init_8php.html#a54f32c086fe209c99769a4c4047dd864',1,'$channel(): theme_init.php']]], ['_24channel_5fhash',['$channel_hash',['../classRedBasicAuth.html#ad5a3ea4dc4783b242d9dc6e76478b6ef',1,'RedBasicAuth']]], ['_24channel_5fid',['$channel_id',['../classRedBasicAuth.html#a2dab393650d1573e3515969a153e8354',1,'RedBasicAuth']]], ['_24channel_5fname',['$channel_name',['../classRedBasicAuth.html#a438ab125b6ef46581947e35d49cdebac',1,'RedBasicAuth']]], @@ -37,7 +33,6 @@ var searchData= ['_24contacts',['$contacts',['../classApp.html#a61ca6e3af82071ea25ff2fd5dbcddae2',1,'App']]], ['_24content',['$content',['../classApp.html#ac1d80a14492acc932715d54567d8a589',1,'App']]], ['_24conversation',['$conversation',['../classItem.html#a007424e3e3171dcfb4312a02161da6cd',1,'Item']]], - ['_24cookies',['$cookies',['../frphotohelper_8php.html#aef9f7eafd54f6e36423347bed723c67e',1,'frphotohelper.php']]], ['_24css_5fsources',['$css_sources',['../classApp.html#a6f55d087e1ff4710132c1b0863faa2ee',1,'App']]], ['_24curl_5fcode',['$curl_code',['../classApp.html#a256360c9184fed6d7556e0bc0a835d7f',1,'App']]], ['_24curl_5fheaders',['$curl_headers',['../classApp.html#af5007c42a693afd9c4899c243b2e1363',1,'App']]], @@ -59,7 +54,6 @@ var searchData= ['_24fname',['$fname',['../apw_2php_2style_8php.html#ab9e0f70d44ab67f4334f9883631777fc',1,'style.php']]], ['_24folder_5fhash',['$folder_hash',['../classRedDirectory.html#aa10254abf177bb2a0e4a88495725e09b',1,'RedDirectory']]], ['_24force_5fmax_5fitems',['$force_max_items',['../classApp.html#ae3f47830543d0d902f66913def8db66b',1,'App']]], - ['_24fr_5fserver',['$fr_server',['../frphotohelper_8php.html#a2059b37bbca58d2613c70af2c19eddce',1,'frphotohelper.php']]], ['_24gc_5fprobability',['$gc_probability',['../session_8php.html#a96b09cc763572f45280786a7b33feb7e',1,'session.php']]], ['_24groups',['$groups',['../classApp.html#ac6e6b1c7d6df408580ff79977fcfa656',1,'App']]], ['_24headimg',['$headimg',['../theme_2blogga_2php_2default_8php.html#ac7062908d1eb80c0735270f7997c4527',1,'$headimg(): default.php'],['../theme_2blogga_2view_2theme_2blog_2default_8php.html#a52d9dd070ed541729088395c22502539',1,'$headimg(): default.php']]], @@ -77,7 +71,6 @@ var searchData= ['_24install_5fwizard_5fpass',['$install_wizard_pass',['../setup_8php.html#addb24714bc2542aa4f4215e98fe48432',1,'setup.php']]], ['_24interactive',['$interactive',['../classApp.html#a4c7cfc62d39508086cf300dc2e39c4df',1,'App']]], ['_24itemfloat',['$itemfloat',['../minimalisticdarkness_8php.html#a7e6c3d4efde4e9a2de32308081372c6b',1,'minimalisticdarkness.php']]], - ['_24j',['$j',['../frphotohelper_8php.html#a6f16db779ef3ccea921b277b5dc245d1',1,'frphotohelper.php']]], ['_24js_5fsources',['$js_sources',['../classApp.html#a11e24b3ed9b33ffee7dd41d110b4366d',1,'App']]], ['_24k',['$k',['../php2po_8php.html#ad6726cfaa85d4b8299d2b0f034cbf178',1,'php2po.php']]], ['_24lang',['$lang',['../classTemplate.html#ace26b8a4252fbc1c385d2b5e1e93e5c8',1,'Template']]], @@ -98,7 +91,6 @@ var searchData= ['_24observer',['$observer',['../classApp.html#a4ffe529fb14389f7fedf5fdc5f722e7f',1,'App\$observer()'],['../classConversation.html#a8748445aa26047ebed5141f3c3cbc244',1,'Conversation\$observer()'],['../classRedBasicAuth.html#aa75dc43b59adc98e38a98517d3fd35d1',1,'RedBasicAuth\$observer()']]], ['_24os_5fpath',['$os_path',['../classRedDirectory.html#a3c148c07ad909985125aa4926d8d0021',1,'RedDirectory']]], ['_24out',['$out',['../php2po_8php.html#a48cb304902320d173a4eaa41543327b9',1,'php2po.php']]], - ['_24output',['$output',['../frphotohelper_8php.html#a73004ce9cd673c1bfafd1dc351134797',1,'frphotohelper.php']]], ['_24owner_5fid',['$owner_id',['../classRedBasicAuth.html#a09c1488a0b290f5a54dc15180c5690d7',1,'RedBasicAuth']]], ['_24owner_5fname',['$owner_name',['../classItem.html#a9594df6014b0b6f45364ea7a34510130',1,'Item']]], ['_24owner_5fnick',['$owner_nick',['../classRedBasicAuth.html#a8d09b8d784cc810a0b3be580d05106a7',1,'RedBasicAuth']]], @@ -109,7 +101,6 @@ var searchData= ['_24parent',['$parent',['../classItem.html#a1a1e42877e6ac7af50286142ceb483d2',1,'Item']]], ['_24path',['$path',['../classApp.html#acad5896b7a79ae31433ad8f89606c728',1,'App']]], ['_24perms',['$perms',['../classApp.html#ab47de68fa39806d1fb0976407e188b77',1,'App']]], - ['_24photo_5fid',['$photo_id',['../frphotohelper_8php.html#a2d2299040f635cee8d5aac68230dd630',1,'frphotohelper.php']]], ['_24phpath',['$phpath',['../typo_8php.html#a3ecd17ac846be1b35f3662f5c12ab6bd',1,'typo.php']]], ['_24phpfile',['$phpfile',['../php2po_8php.html#abbb0e5fd8fbc1f13a9bf68f86eb3d2a4',1,'php2po.php']]], ['_24plugin',['$plugin',['../post__to__red_8php.html#ada8a7130088351710bb02ed622d6bf65',1,'post_to_red.php']]], @@ -123,13 +114,12 @@ var searchData= ['_24profile_5fowner',['$profile_owner',['../classConversation.html#a2f12724ef0244e9049fe1bb9641b516d',1,'Conversation']]], ['_24profile_5fuid',['$profile_uid',['../classApp.html#a08c24d6a6fc52fcc784b0f765f13b820',1,'App']]], ['_24query_5fstring',['$query_string',['../classApp.html#a2e82da4aecfc2017a8d1d332ca501f9f',1,'App']]], - ['_24r',['$r',['../classTemplate.html#aac9a4638f11271e1b1dcc9f247242718',1,'Template\$r()'],['../frphotohelper_8php.html#a8abe176bc41afd728f32ba8c506cbd98',1,'$r(): frphotohelper.php']]], + ['_24r',['$r',['../classTemplate.html#aac9a4638f11271e1b1dcc9f247242718',1,'Template']]], ['_24rdelim',['$rdelim',['../classApp.html#a244b2d53b21be269aad2269d23192f95',1,'App']]], ['_24red_5fpath',['$red_path',['../classRedDirectory.html#acb32b8df27538c57772824a745e751d7',1,'RedDirectory']]], ['_24redirect_5furl',['$redirect_url',['../classItem.html#a5b561415861f5b89b0733aacfe0428d1',1,'Item']]], ['_24replace',['$replace',['../classTemplate.html#a4e86b566c3f728e95ce5db1b33665c10',1,'Template']]], ['_24res',['$res',['../docblox__errorchecker_8php.html#a49a8a4009b02e49717caa88b128affc5',1,'docblox_errorchecker.php']]], - ['_24ret',['$ret',['../frphotohelper_8php.html#a83d5f232bed56a5af8173818b0bdf79d',1,'frphotohelper.php']]], ['_24root_5fdir',['$root_dir',['../classRedDirectory.html#ad87c514a307ec97ba0f1372e9bcfa6a4',1,'RedDirectory']]], ['_24s',['$s',['../extract_8php.html#a50b05cf2e02ef0b67fcad97106dd7634',1,'extract.php']]], ['_24scheme',['$scheme',['../classApp.html#ad082d63acc078e5bf23825a03bdd6a76',1,'App']]], diff --git a/doc/html/search/variables_6d.js b/doc/html/search/variables_6d.js index 8222a95c6..6453e2e5c 100644 --- a/doc/html/search/variables_6d.js +++ b/doc/html/search/variables_6d.js @@ -6,7 +6,6 @@ var searchData= ['mail_5frecalled',['MAIL_RECALLED',['../boot_8php.html#ae4861de36017fe399c1839f778bad9f5',1,'boot.php']]], ['mail_5freplied',['MAIL_REPLIED',['../boot_8php.html#aa3679df31c8dad1b71816b0322d5baff',1,'boot.php']]], ['mail_5fseen',['MAIL_SEEN',['../boot_8php.html#a1fbb93cf030f07391f22cc2948744869',1,'boot.php']]], - ['max_5fchatroom_5fhours',['MAX_CHATROOM_HOURS',['../boot_8php.html#ae543d0b69f816b52e91167fc19d3fddc',1,'boot.php']]], ['max_5fimage_5flength',['MAX_IMAGE_LENGTH',['../boot_8php.html#a525ca93ff35d3535d1a2b8ba57876afa',1,'boot.php']]], ['max_5flikers',['MAX_LIKERS',['../boot_8php.html#a35625dacd2158b9f1f1a8e77f9f081fd',1,'boot.php']]], ['menu_5fbookmark',['MENU_BOOKMARK',['../boot_8php.html#a458e19af801bc4b0d1f1ce1a6d9e857e',1,'boot.php']]], diff --git a/doc/html/text_8php.html b/doc/html/text_8php.html index 5ca280347..09389d84b 100644 --- a/doc/html/text_8php.html +++ b/doc/html/text_8php.html @@ -328,7 +328,7 @@ Variables @@ -415,6 +415,8 @@ Variables
                +

                Referenced by scrape_vcard().

                +
                @@ -457,7 +459,7 @@ Variables @@ -485,7 +487,7 @@ Variables @@ -696,7 +698,7 @@ Variables
                Returns
                string
                -

                Referenced by admin_page_logs(), app_store(), app_update(), appman_post(), bookmark_add(), chatsvc_post(), connect_post(), create_identity(), events_post(), fsuggest_post(), get_atom_elements(), item_post(), mail_post(), mail_store(), menu_add_item(), menu_create(), menu_edit(), menu_edit_item(), network_content(), notes_init(), pdledit_post(), poco_load(), printable(), profiles_post(), rbmark_content(), rbmark_post(), thing_init(), and z_input_filter().

                +

                Referenced by admin_page_logs(), app_store(), app_update(), appman_post(), bookmark_add(), chatsvc_post(), connect_post(), create_identity(), events_post(), fsuggest_post(), get_atom_elements(), item_post(), mail_post(), mail_store(), menu_add_item(), menu_create(), menu_edit(), menu_edit_item(), network_content(), notes_init(), pdledit_post(), poco_load(), printable(), profiles_post(), rbmark_content(), rbmark_post(), thing_init(), and z_input_filter().

                @@ -1026,7 +1028,7 @@ Variables @@ -1270,7 +1272,7 @@ Variables

                Compare two URLs to see if they are the same, but ignore slight but hopefully insignificant differences such as if one is https and the other isn't, or if one is www.something and the other isn't - and also ignore case differences.

                Return true if the URLs match, otherwise false.

                -

                Referenced by consume_feed(), diaspora_comment(), diaspora_retraction(), diaspora_signed_retraction(), tag_deliver(), tgroup_check(), and zid().

                +

                Referenced by consume_feed(), diaspora_retraction(), diaspora_signed_retraction(), tag_deliver(), tgroup_check(), and zid().

                @@ -1318,7 +1320,7 @@ Variables
                -

                Referenced by RedDirectory\__construct(), RedFile\__construct(), account_remove(), account_verify_password(), Item\add_child(), Conversation\add_thread(), admin_content(), admin_page_hubloc_post(), admin_post(), aes_encapsulate(), allowed_public_recips(), api_call(), api_channel_stream(), api_export_basic(), api_favorites(), api_get_user(), api_login(), api_oauth_request_token(), api_statuses_destroy(), api_statuses_mediap(), api_statuses_repeat(), api_statuses_show(), api_statuses_update(), api_statuses_user_timeline(), attach_mkdir(), avatar_img(), base64url_decode(), blog_install(), blog_uninstall(), bookmark_add(), bookmarks_init(), build_sync_packet(), chanman_remove_everything_from_network(), channel_remove(), chanview_content(), chat_post(), check_config(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), RedDirectory\childExists(), cloud_init(), connedit_post(), consume_feed(), conversation(), create_account(), create_identity(), RedDirectory\createDirectory(), RedDirectory\createFile(), cronhooks_run(), datetime_convert(), RedFile\delete(), delete_imported_item(), deliver_run(), detect_language(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_decode(), diaspora_dispatch(), diaspora_dispatch_public(), diaspora_handle_from_contact(), diaspora_like(), diaspora_message(), diaspora_msg_build(), diaspora_photo(), diaspora_post(), diaspora_post_allow(), diaspora_profile(), diaspora_pubmsg_build(), diaspora_request(), diaspora_reshare(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_status(), diaspora_signed_retraction(), diaspora_transmit(), dir_parse_query(), directory_content(), directory_run(), dirprofile_init(), downgrade_accounts(), email_send(), encode_item(), expire_run(), externals_run(), feed_init(), fetch_lrdd_template(), filer_content(), filerm_content(), find_diaspora_person_by_handle(), fix_private_photos(), fix_system_urls(), RedFile\get(), get_atom_elements(), get_diaspora_key(), get_item_elements(), get_language_name(), Conversation\get_template_data(), RedDirectory\getChild(), RedDirectory\getChildren(), RedDirectory\getDir(), RedDirectory\getName(), RedFile\getName(), group_content(), guess_image_type(), http_status_exit(), import_author_rss(), import_author_zot(), import_channel_photo(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), item_post(), item_store(), item_store_update(), like_content(), limit_body_size(), load_plugin(), local_dir_update(), localize_item(), RedDirectory\log(), RedBasicAuth\log(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_token(), magic_init(), mail_post(), mail_store(), menu_edit(), mini_group_select(), mood_init(), FKOAuthDataStore\new_access_token(), new_contact(), new_keypair(), FKOAuthDataStore\new_request_token(), notes_init(), notification(), notifier_run(), onedirsync_run(), onepoll_run(), openid_content(), parse_url_content(), parse_xml_string(), photo_init(), photo_upload(), photos_content(), photos_post(), ping_init(), poco_init(), poco_load(), poke_init(), poller_run(), post_activity_item(), post_init(), post_post(), private_messages_list(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_load(), profile_photo_set_profile_perms(), profile_sidebar(), prune_hub_reinstalls(), public_recips(), RedFile\put(), dba_mysql\q(), dba_mysqli\q(), q(), queue_run(), rbmark_post(), receive_post(), red_item_new(), RedChannelList(), RedCollectionData(), RedFileData(), register_content(), reload_plugins(), Item\remove_child(), remove_community_tag(), remove_queue_item(), scale_external_images(), search_ac_init(), enotify\send(), send_reg_approval_email(), Conversation\set_mode(), RedDirectory\setName(), RedFile\setName(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), sync_directories(), tag_deliver(), tagger_content(), tgroup_check(), uninstall_plugin(), unload_plugin(), update_directory_entry(), update_imported_item(), update_queue_time(), RedBasicAuth\validateUserPass(), verify_email_address(), webfinger(), webfinger_dfrn(), xml2array(), xml_status(), z_fetch_url(), z_post_url(), zfinger_init(), zid_init(), zot_build_packet(), zot_feed(), zot_fetch(), zot_finger(), zot_gethub(), zot_import(), zot_process_response(), zot_refresh(), zot_register_hub(), and zotfeed_init().

                +

                Referenced by RedDirectory\__construct(), RedFile\__construct(), account_remove(), account_verify_password(), Item\add_child(), Conversation\add_thread(), admin_content(), admin_page_hubloc_post(), admin_post(), aes_encapsulate(), allowed_public_recips(), api_call(), api_channel_stream(), api_export_basic(), api_favorites(), api_get_user(), api_login(), api_oauth_request_token(), api_statuses_destroy(), api_statuses_mediap(), api_statuses_repeat(), api_statuses_show(), api_statuses_update(), api_statuses_user_timeline(), attach_mkdir(), avatar_img(), base64url_decode(), blog_install(), blog_uninstall(), bookmark_add(), bookmarks_init(), build_sync_packet(), chanman_remove_everything_from_network(), channel_remove(), chanview_content(), chat_post(), check_config(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), RedDirectory\childExists(), cloud_init(), connedit_post(), consume_feed(), conversation(), create_account(), create_identity(), RedDirectory\createDirectory(), RedDirectory\createFile(), cronhooks_run(), datetime_convert(), RedFile\delete(), delete_imported_item(), deliver_run(), detect_language(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_decode(), diaspora_dispatch(), diaspora_dispatch_public(), diaspora_handle_from_contact(), diaspora_is_blacklisted(), diaspora_like(), diaspora_message(), diaspora_msg_build(), diaspora_photo(), diaspora_post(), diaspora_profile(), diaspora_pubmsg_build(), diaspora_request(), diaspora_reshare(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_status(), diaspora_signed_retraction(), diaspora_transmit(), dir_parse_query(), directory_content(), directory_run(), dirprofile_init(), discover_by_webbie(), downgrade_accounts(), email_send(), encode_item(), expire_run(), externals_run(), feed_init(), fetch_lrdd_template(), fetch_xrd_links(), filer_content(), filerm_content(), find_diaspora_person_by_handle(), fix_private_photos(), fix_system_urls(), RedFile\get(), get_atom_elements(), get_diaspora_key(), get_item_elements(), get_language_name(), Conversation\get_template_data(), RedDirectory\getChild(), RedDirectory\getChildren(), RedDirectory\getDir(), RedDirectory\getName(), RedFile\getName(), group_content(), guess_image_type(), handle_feed(), http_status_exit(), import_author_rss(), import_author_zot(), import_channel_photo(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), item_post(), item_store(), item_store_update(), like_content(), limit_body_size(), load_plugin(), local_dir_update(), localize_item(), RedDirectory\log(), RedBasicAuth\log(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_token(), magic_init(), mail_post(), mail_store(), menu_edit(), mini_group_select(), mood_init(), FKOAuthDataStore\new_access_token(), new_contact(), new_keypair(), FKOAuthDataStore\new_request_token(), notes_init(), notification(), notifier_run(), old_webfinger(), onedirsync_run(), onepoll_run(), openid_content(), parse_url_content(), parse_xml_string(), photo_init(), photo_upload(), photos_content(), photos_post(), ping_init(), poco_init(), poco_load(), poke_init(), poller_run(), post_activity_item(), post_init(), post_post(), private_messages_list(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_load(), profile_photo_set_profile_perms(), profile_sidebar(), profiles_content(), prune_hub_reinstalls(), public_recips(), RedFile\put(), dba_mysql\q(), dba_mysqli\q(), q(), queue_run(), rbmark_post(), receive_post(), red_item_new(), RedChannelList(), RedCollectionData(), RedFileData(), register_content(), reload_plugins(), Item\remove_child(), remove_community_tag(), remove_queue_item(), scale_external_images(), scrape_feed(), scrape_vcard(), search_ac_init(), enotify\send(), send_reg_approval_email(), Conversation\set_mode(), RedDirectory\setName(), RedFile\setName(), start_delivery_chain(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), sync_directories(), tag_deliver(), tagger_content(), tgroup_check(), uninstall_plugin(), unload_plugin(), update_directory_entry(), update_feed_item(), update_imported_item(), update_queue_time(), RedBasicAuth\validateUserPass(), verify_email_address(), xml2array(), xml_status(), z_fetch_url(), z_post_url(), zfinger_init(), zid_init(), zot_build_packet(), zot_feed(), zot_fetch(), zot_finger(), zot_gethub(), zot_import(), zot_process_response(), zot_refresh(), zot_register_hub(), and zotfeed_init().

                @@ -1454,7 +1456,7 @@ Variables @@ -1501,7 +1503,7 @@ Variables
                Returns
                string Filtered string
                -

                Referenced by admin_page_logs_post(), admin_page_site_post(), channel_content(), connections_content(), conversation(), create_account(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_like(), diaspora_message(), diaspora_photo(), diaspora_post(), diaspora_profile(), diaspora_reshare(), diaspora_retraction(), diaspora_signed_retraction(), directory_content(), filestorage_post(), follow_init(), get_atom_elements(), group_post(), help_content(), invite_post(), item_post(), item_store(), item_store_update(), like_content(), lostpass_post(), mail_post(), mail_store(), mood_init(), network_content(), oexchange_content(), openid_content(), photos_post(), poco_init(), poke_init(), profiles_post(), register_post(), sanitise_acl(), settings_post(), setup_content(), setup_post(), subthread_content(), tagger_content(), and xrd_init().

                +

                Referenced by admin_page_logs_post(), admin_page_site_post(), channel_content(), connections_content(), conversation(), create_account(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_like(), diaspora_message(), diaspora_photo(), diaspora_post(), diaspora_profile(), diaspora_reshare(), diaspora_retraction(), diaspora_signed_retraction(), directory_content(), filestorage_post(), follow_init(), get_atom_elements(), group_post(), help_content(), invite_post(), item_post(), item_store(), item_store_update(), like_content(), lostpass_post(), mail_post(), mail_store(), mood_init(), network_content(), oexchange_content(), openid_content(), photos_post(), poco_init(), poke_init(), profiles_post(), register_post(), sanitise_acl(), settings_post(), setup_content(), setup_post(), subthread_content(), tagger_content(), and xrd_init().

                @@ -1678,7 +1680,7 @@ Variables @@ -1696,7 +1698,7 @@ Variables
                -

                Referenced by get_atom_elements(), and z_input_filter().

                +

                Referenced by get_atom_elements(), and z_input_filter().

                @@ -1740,7 +1742,7 @@ Variables @@ -1768,7 +1770,7 @@ Variables
                -

                Referenced by get_atom_elements().

                +

                Referenced by get_atom_elements().

                @@ -1805,7 +1807,7 @@ Variables
                Returns
                string substituted string
                -

                Referenced by admin_content(), admin_page_channels(), admin_page_dbsync(), admin_page_hubloc(), admin_page_logs(), admin_page_plugins(), admin_page_site(), admin_page_summary(), admin_page_themes(), admin_page_users(), advanced_profile(), alt_pager(), api_apply_template(), api_content(), app_render(), appman_content(), apps_content(), apw_form(), blocks_content(), blogtheme_form(), App\build_pagehead(), categories_widget(), channel_content(), chat_content(), check_config(), check_php(), common_content(), common_friends_visitor_widget(), connect_content(), connections_content(), connedit_content(), construct_page(), contact_block(), conversation(), delegate_content(), design_tools(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_retraction(), diaspora_send_status(), diaspora_share(), diaspora_unshare(), dir_safe_mode(), dir_sort_links(), directory_content(), dirprofile_init(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), fbrowser_content(), field_timezone(), fileas_widget(), filer_content(), filestorage_content(), findpeople_widget(), format_categories(), format_filer(), frphotos_content(), RedBrowser\generateDirectoryIndex(), get_birthdays(), Item\get_comment_box(), get_events(), get_feed_for(), group_content(), group_side(), help_content(), hostxrd_init(), RedBrowser\htmlActionsPanel(), identity_selector(), import_content(), invite_content(), lang_selector(), layouts_content(), login(), lostpass_content(), lostpass_post(), mail_content(), manage_content(), match_content(), menu_content(), menu_render(), message_content(), micropro(), mini_group_select(), mitem_content(), mood_content(), nav(), network_content(), new_channel_content(), notification(), notifications_content(), notify_content(), oembed_format_object(), oexchange_init(), opensearch_init(), pagelist_widget(), pdledit_content(), photos_album_widget(), photos_content(), poco_init(), poke_content(), poll_content(), populate_acl(), profile_sidebar(), profiles_content(), rbmark_content(), redbasic_form(), register_content(), removeaccount_content(), removeme_content(), rmagic_content(), rpost_content(), search_content(), send_reg_approval_email(), send_verification_email(), setup_content(), setup_post(), siteinfo_content(), sources_content(), suggest_content(), theme_attachments(), thing_content(), user_allow(), vcard_from_xchan(), verify_email_address(), viewconnections_content(), vote_content(), webpages_content(), widget_affinity(), widget_appselect(), widget_archive(), widget_bookmarkedchats(), widget_chatroom_list(), widget_filer(), widget_follow(), widget_mailmenu(), widget_notes(), widget_savedsearch(), widget_settings_menu(), widget_suggestedchats(), widget_suggestions(), writepages_widget(), and xrd_init().

                +

                Referenced by admin_content(), admin_page_channels(), admin_page_dbsync(), admin_page_hubloc(), admin_page_logs(), admin_page_plugins(), admin_page_site(), admin_page_summary(), admin_page_themes(), admin_page_users(), advanced_profile(), alt_pager(), api_apply_template(), api_content(), app_render(), appman_content(), apps_content(), apw_form(), blocks_content(), blogtheme_form(), App\build_pagehead(), categories_widget(), channel_content(), chat_content(), check_config(), check_php(), common_content(), common_friends_visitor_widget(), connect_content(), connections_content(), connedit_content(), construct_page(), contact_block(), conversation(), delegate_content(), design_tools(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_retraction(), diaspora_send_status(), diaspora_share(), diaspora_unshare(), dir_safe_mode(), dir_sort_links(), directory_content(), dirprofile_init(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), fbrowser_content(), field_timezone(), fileas_widget(), filer_content(), filestorage_content(), findpeople_widget(), format_categories(), format_filer(), RedBrowser\generateDirectoryIndex(), get_birthdays(), Item\get_comment_box(), get_events(), get_feed_for(), group_content(), group_side(), help_content(), hostxrd_init(), RedBrowser\htmlActionsPanel(), identity_selector(), import_content(), invite_content(), lang_selector(), layouts_content(), login(), lostpass_content(), lostpass_post(), mail_content(), manage_content(), match_content(), menu_content(), menu_render(), message_content(), micropro(), mini_group_select(), mitem_content(), mood_content(), nav(), network_content(), new_channel_content(), notification(), notifications_content(), notify_content(), oembed_format_object(), oexchange_init(), opensearch_init(), pagelist_widget(), pdledit_content(), photos_album_widget(), photos_content(), poco_init(), poke_content(), poll_content(), populate_acl(), profile_sidebar(), profiles_content(), rbmark_content(), redbasic_form(), register_content(), removeaccount_content(), removeme_content(), rmagic_content(), rpost_content(), search_content(), send_reg_approval_email(), send_verification_email(), setup_content(), setup_post(), siteinfo_content(), sources_content(), suggest_content(), theme_attachments(), thing_content(), user_allow(), vcard_from_xchan(), verify_email_address(), viewconnections_content(), vote_content(), webpages_content(), widget_affinity(), widget_appselect(), widget_archive(), widget_bookmarkedchats(), widget_chatroom_list(), widget_filer(), widget_follow(), widget_mailmenu(), widget_notes(), widget_savedsearch(), widget_settings_menu(), widget_suggestedchats(), widget_suggestions(), writepages_widget(), and xrd_init().

                @@ -2169,7 +2171,7 @@ Variables @@ -2259,7 +2261,7 @@ Variables
                Returns
                string Escaped text.
                -

                Referenced by array_xmlify(), atom_author(), atom_entry(), construct_activity_object(), construct_activity_target(), diaspora_like(), diaspora_request(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_retraction(), diaspora_send_status(), encode_rel_links(), get_atom_elements(), get_feed_for(), item_getfeedattach(), subthread_content(), tagger_content(), and xml_status().

                +

                Referenced by array_xmlify(), atom_author(), atom_entry(), construct_activity_object(), construct_activity_target(), diaspora_like(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_retraction(), diaspora_send_status(), encode_rel_links(), get_atom_elements(), get_feed_for(), item_getfeedattach(), subthread_content(), tagger_content(), and xml_status().

                diff --git a/doc/html/typo_8php.html b/doc/html/typo_8php.html index 3d4d0fc57..c4c576785 100644 --- a/doc/html/typo_8php.html +++ b/doc/html/typo_8php.html @@ -134,6 +134,8 @@ Variables
                +

                Referenced by FriendicaSmarty\__construct(), Item\__construct(), FriendicaSmartyEngine\__construct(), Template\_replcb_if(), Template\_replcb_inc(), _well_known_init(), abook_toggle_flag(), achievements_content(), acl_init(), admin_content(), admin_page_channels(), admin_page_channels_post(), admin_page_dbsync(), admin_page_hubloc(), admin_page_hubloc_post(), admin_page_logs(), admin_page_logs_post(), admin_page_plugins(), admin_page_site(), admin_page_site_post(), admin_page_summary(), admin_page_themes(), admin_page_users(), admin_page_users_post(), admin_post(), advanced_profile(), allowed_email(), allowed_url(), alt_pager(), api_account_verify_credentials(), api_albums(), api_apply_template(), api_call(), api_content(), api_direct_messages_all(), api_direct_messages_box(), api_direct_messages_conversation(), api_direct_messages_inbox(), api_direct_messages_new(), api_direct_messages_sentbox(), api_favorites(), api_followers_ids(), api_format_as(), api_format_items(), api_friends_ids(), api_get_user(), api_item_get_user(), api_login(), api_photos(), api_post(), api_rss_extra(), api_status_show(), api_statuses_destroy(), api_statuses_f(), api_statuses_followers(), api_statuses_friends(), api_statuses_home_timeline(), api_statuses_mediap(), api_statuses_mentions(), api_statuses_public_timeline(), api_statuses_repeat(), api_statuses_show(), api_statuses_update(), api_statuses_user_timeline(), api_statusnet_config(), api_users_show(), app_name_compare(), appman_content(), apw_form(), atom_entry(), attribute_contains(), authenticate_success(), avatar_img(), bb_sanitize_style(), bbcode(), best_link_url(), block_content(), block_init(), blocks_content(), blog_init(), blogtheme_display_item(), blogtheme_form(), blogtheme_imgurl(), bookmarks_content(), bookmarks_init(), build_sync_packet(), cal(), call_hooks(), categories_widget(), channel_content(), channel_init(), channel_remove(), chanview_content(), chat_content(), chat_init(), chat_post(), chatsvc_content(), chatsvc_init(), chatsvc_post(), check_config(), check_form_security_token(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), check_htaccess(), clean_urls(), cli_startup(), cli_suggest_run(), cloud_init(), comanche_parser(), comanche_replace_region(), comanche_widget(), common_content(), common_friends_visitor_widget(), common_init(), connect_content(), connect_init(), connect_post(), connections_clone(), connections_content(), connections_init(), connections_post(), connedit_clone(), connedit_content(), connedit_init(), connedit_post(), construct_page(), contact_block(), contact_select(), conversation(), create_identity(), current_theme(), current_theme_url(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), deliver_run(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_like(), diaspora_message(), diaspora_msg_build(), diaspora_photo(), diaspora_post(), diaspora_profile(), diaspora_pubmsg_build(), diaspora_request(), diaspora_reshare(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_retraction(), diaspora_send_status(), diaspora_share(), diaspora_transmit(), diaspora_unshare(), directory_content(), directory_init(), dirsearch_init(), display_content(), dlogger(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), ev_compare(), event_store_item(), events_content(), events_post(), expand_acl(), expand_groups(), externals_run(), fbrowser_content(), fileas_widget(), filer_content(), filerm_content(), filestorage_content(), filestorage_post(), findpeople_widget(), fix_private_photos(), follow_init(), format_event_diaspora(), fsuggest_content(), fsuggest_post(), BaseObject\get_app(), get_app(), get_best_language(), get_birthdays(), Item\get_comment_box(), get_config(), get_custom_nav(), get_events(), get_form_security_token(), FriendicaSmartyEngine\get_intltext_template(), get_intltext_template(), get_markup_template(), get_pconfig(), get_plink(), Item\get_template_data(), get_theme_screenshot(), get_xconfig(), gprobe_run(), group_content(), group_post(), group_select(), guess_image_type(), handle_tag(), hcard_init(), head_get_icon(), head_remove_css(), head_remove_js(), head_set_icon(), help_content(), home_content(), home_init(), hostxrd_init(), import_channel_photo(), import_post(), import_profile_photo(), info(), insert_hook(), invite_content(), invite_post(), is_developer(), is_site_admin(), item_photo_menu(), item_post(), items_fetch(), lang_selector(), layouts_content(), like_content(), link_compare(), load_config(), load_contact_links(), load_database(), load_hooks(), load_pconfig(), load_translation_table(), load_xconfig(), logger(), login(), login_content(), FKOAuth1\loginUser(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_post(), manual_config(), match_content(), message_content(), mitem_content(), mitem_init(), mitem_post(), mood_init(), msearch_post(), mytheme_init(), nav(), nav_set_selected(), network_content(), network_init(), new_contact(), notice(), notification(), notifications_content(), notifications_post(), notifier_run(), notify_content(), notify_init(), oembed_fetch_url(), oembed_format_object(), oembed_iframe(), oexchange_content(), oexchange_init(), onedirsync_run(), onepoll_run(), openid_content(), opensearch_init(), page_content(), page_init(), paginate(), photo_init(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), poco_load(), poke_init(), poller_run(), pop_lang(), post_init(), preg_heart(), prepare_body(), probe_content(), proc_run(), profile_activity(), profile_content(), profile_create_sidebar(), profile_init(), profile_load(), profile_photo_init(), profile_photo_post(), profile_sidebar(), profiles_content(), profiles_init(), profiles_post(), profperm_init(), push_lang(), queue_run(), randprof_init(), rbmark_content(), rbmark_post(), red_item_new(), redbasic_form(), register_content(), regmod_content(), regver_content(), relative_date(), removeaccount_content(), removeaccount_post(), removeme_content(), removeme_post(), replace_macros(), rmagic_post(), rpost_content(), scale_external_images(), scrape_feed(), scrape_vcard(), search(), search_ac_init(), search_content(), search_init(), searchbox(), send_message(), service_class_allows(), service_class_fetch(), set_config(), Conversation\set_mode(), set_pconfig(), set_xconfig(), settings_init(), settings_post(), setup_content(), setup_post(), share_init(), siteinfo_content(), siteinfo_init(), smilies(), sources_post(), subthread_content(), suggest_content(), t(), tag_deliver(), tag_sort_length(), tagger_content(), tagrm_content(), tagrm_post(), tags_sort(), tgroup_check(), theme_admin(), theme_content(), theme_include(), thing_content(), thing_init(), timezone_cmp(), toggle_mobile_init(), tt(), uexport_init(), update_channel_content(), update_display_content(), update_network_content(), update_search_content(), update_suggestions(), user_allow(), user_approve(), vcard_from_xchan(), viewconnections_content(), viewconnections_init(), viewsrc_content(), vote_content(), vote_init(), vote_post(), wall_upload_post(), webpages_content(), wfinger_init(), what_next(), widget_archive(), widget_categories(), widget_chatroom_list(), widget_design_tools(), widget_filer(), widget_follow(), widget_fullprofile(), widget_item(), widget_mailmenu(), widget_photo_albums(), widget_profile(), widget_savedsearch(), widget_settings_menu(), widget_tagcloud(), widget_tagcloud_wall(), xrd_init(), z_fetch_url(), z_path(), z_root(), zfinger_init(), zid_init(), zotfeed_init(), and zping_content().

                +
                diff --git a/doc/html/zot_8php.html b/doc/html/zot_8php.html index 3933c3d83..e62ee94f8 100644 --- a/doc/html/zot_8php.html +++ b/doc/html/zot_8php.html @@ -437,7 +437,7 @@ Functions
                Returns
                array => 'success' (boolean true or false) 'message' (optional error string only if success is false)
                -

                Referenced by chanview_content(), gprobe_run(), magic_init(), mail_post(), new_contact(), poco_load(), post_init(), process_channel_sync_delivery(), update_directory_entry(), zot_refresh(), and zot_register_hub().

                +

                Referenced by chanview_content(), discover_by_webbie(), gprobe_run(), magic_init(), mail_post(), new_contact(), poco_load(), post_init(), process_channel_sync_delivery(), update_directory_entry(), zot_refresh(), and zot_register_hub().

                -- cgit v1.2.3 From 9dbfed64bee54d9293bae311bfc48a262fdd64bb Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 22 Aug 2014 15:51:36 -0700 Subject: rev update --- util/messages.po | 1328 +++++++++++++++++++++++++++--------------------------- version.inc | 2 +- 2 files changed, 661 insertions(+), 669 deletions(-) diff --git a/util/messages.po b/util/messages.po index 86a39787e..6f135bcb3 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2014-08-15.768\n" +"Project-Id-Version: 2014-08-22.775\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-15 00:03-0700\n" +"POT-Creation-Date: 2014-08-22 00:03-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -29,34 +29,25 @@ msgstr "" msgid "Profile Photos" msgstr "" -#: ../../include/diaspora.php:610 -#, php-format -msgid "%1$s is now friends with %2$s" -msgstr "" - -#: ../../include/diaspora.php:693 -msgid "Sharing notification from Diaspora network" -msgstr "" - -#: ../../include/diaspora.php:1910 ../../include/text.php:1732 +#: ../../include/diaspora.php:1736 ../../include/text.php:1734 #: ../../include/conversation.php:120 ../../mod/subthread.php:72 #: ../../mod/subthread.php:174 ../../mod/tagger.php:45 ../../mod/like.php:294 msgid "photo" msgstr "" -#: ../../include/diaspora.php:1910 ../../include/text.php:1738 +#: ../../include/diaspora.php:1736 ../../include/text.php:1740 #: ../../include/conversation.php:148 ../../mod/subthread.php:72 #: ../../mod/subthread.php:174 ../../mod/tagger.php:53 ../../mod/like.php:294 msgid "status" msgstr "" -#: ../../include/diaspora.php:1926 ../../include/conversation.php:164 +#: ../../include/diaspora.php:1752 ../../include/conversation.php:164 #: ../../mod/like.php:331 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "" -#: ../../include/diaspora.php:2303 +#: ../../include/diaspora.php:2129 msgid "Attachments:" msgstr "" @@ -81,8 +72,8 @@ msgstr "" msgid "Site Admin" msgstr "" -#: ../../include/apps.php:124 ../../include/nav.php:100 -#: ../../include/conversation.php:1543 +#: ../../include/apps.php:124 ../../include/nav.php:113 +#: ../../include/conversation.php:1548 msgid "Bookmarks" msgstr "" @@ -90,65 +81,65 @@ msgstr "" msgid "Address Book" msgstr "" -#: ../../include/apps.php:126 ../../include/nav.php:106 ../../boot.php:1498 +#: ../../include/apps.php:126 ../../include/nav.php:119 ../../boot.php:1493 msgid "Login" msgstr "" -#: ../../include/apps.php:127 ../../include/nav.php:196 +#: ../../include/apps.php:127 msgid "Channel Select" msgstr "" -#: ../../include/apps.php:128 ../../include/nav.php:170 +#: ../../include/apps.php:128 ../../include/nav.php:183 msgid "Matrix" msgstr "" -#: ../../include/apps.php:129 ../../include/nav.php:198 -#: ../../include/widgets.php:514 ../../mod/admin.php:987 -#: ../../mod/admin.php:1192 +#: ../../include/apps.php:129 ../../include/nav.php:211 +#: ../../include/widgets.php:521 ../../mod/admin.php:947 +#: ../../mod/admin.php:1152 msgid "Settings" msgstr "" -#: ../../include/apps.php:130 ../../include/nav.php:92 -#: ../../include/reddav.php:1280 ../../include/conversation.php:1521 +#: ../../include/apps.php:130 ../../include/nav.php:105 +#: ../../include/reddav.php:1280 ../../include/conversation.php:1526 #: ../../mod/fbrowser.php:114 msgid "Files" msgstr "" -#: ../../include/apps.php:131 ../../include/nav.php:102 -#: ../../include/conversation.php:1554 ../../mod/webpages.php:79 +#: ../../include/apps.php:131 ../../include/nav.php:115 +#: ../../include/conversation.php:1559 ../../mod/webpages.php:79 msgid "Webpages" msgstr "" -#: ../../include/apps.php:132 ../../include/nav.php:173 +#: ../../include/apps.php:132 ../../include/nav.php:186 msgid "Channel Home" msgstr "" -#: ../../include/apps.php:133 ../../include/identity.php:973 -#: ../../include/identity.php:1091 ../../mod/profperm.php:112 +#: ../../include/apps.php:133 ../../include/identity.php:991 +#: ../../include/identity.php:1109 ../../mod/profperm.php:112 msgid "Profile" msgstr "" -#: ../../include/apps.php:134 ../../include/nav.php:91 -#: ../../include/conversation.php:1512 ../../mod/fbrowser.php:25 +#: ../../include/apps.php:134 ../../include/nav.php:104 +#: ../../include/conversation.php:1517 ../../mod/fbrowser.php:25 msgid "Photos" msgstr "" -#: ../../include/apps.php:135 ../../include/nav.php:192 +#: ../../include/apps.php:135 ../../include/nav.php:205 #: ../../mod/events.php:396 msgid "Events" msgstr "" -#: ../../include/apps.php:136 ../../include/nav.php:159 +#: ../../include/apps.php:136 ../../include/nav.php:172 #: ../../mod/directory.php:226 msgid "Directory" msgstr "" -#: ../../include/apps.php:137 ../../include/nav.php:151 ../../mod/help.php:60 +#: ../../include/apps.php:137 ../../include/nav.php:164 ../../mod/help.php:60 #: ../../mod/help.php:65 msgid "Help" msgstr "" -#: ../../include/apps.php:138 ../../include/nav.php:184 +#: ../../include/apps.php:138 ../../include/nav.php:197 msgid "Mail" msgstr "" @@ -156,16 +147,16 @@ msgstr "" msgid "Mood" msgstr "" -#: ../../include/apps.php:140 ../../include/conversation.php:945 +#: ../../include/apps.php:140 ../../include/conversation.php:950 msgid "Poke" msgstr "" -#: ../../include/apps.php:141 ../../include/nav.php:97 +#: ../../include/apps.php:141 ../../include/nav.php:110 msgid "Chat" msgstr "" #: ../../include/apps.php:142 ../../include/text.php:815 -#: ../../include/text.php:829 ../../include/nav.php:156 +#: ../../include/text.php:829 ../../include/nav.php:169 #: ../../mod/search.php:30 msgid "Search" msgstr "" @@ -219,7 +210,7 @@ msgstr "" #: ../../include/page_widgets.php:36 ../../include/reddav.php:1289 #: ../../include/menu.php:42 ../../include/ItemObject.php:96 #: ../../mod/settings.php:579 ../../mod/blocks.php:94 -#: ../../mod/connections.php:393 ../../mod/editblock.php:111 +#: ../../mod/connections.php:396 ../../mod/editblock.php:111 #: ../../mod/editlayout.php:106 ../../mod/editpost.php:112 #: ../../mod/editwebpage.php:143 ../../mod/thing.php:235 #: ../../mod/layouts.php:112 ../../mod/menu.php:59 ../../mod/webpages.php:120 @@ -229,8 +220,8 @@ msgstr "" #: ../../include/apps.php:247 ../../include/reddav.php:1290 #: ../../include/conversation.php:635 ../../include/ItemObject.php:108 #: ../../mod/settings.php:580 ../../mod/connedit.php:440 -#: ../../mod/photos.php:1052 ../../mod/group.php:176 ../../mod/admin.php:767 -#: ../../mod/admin.php:897 ../../mod/thing.php:236 +#: ../../mod/photos.php:1052 ../../mod/group.php:176 ../../mod/admin.php:727 +#: ../../mod/admin.php:857 ../../mod/thing.php:236 msgid "Delete" msgstr "" @@ -279,7 +270,7 @@ msgid "View Connections" msgstr "" #: ../../include/text.php:817 ../../include/text.php:831 -#: ../../include/widgets.php:186 ../../mod/rbmark.php:28 +#: ../../include/widgets.php:193 ../../mod/rbmark.php:28 #: ../../mod/rbmark.php:98 ../../mod/filer.php:50 msgid "Save" msgstr "" @@ -416,153 +407,153 @@ msgstr "" msgid "surprised" msgstr "" -#: ../../include/text.php:1092 +#: ../../include/text.php:1094 msgid "Monday" msgstr "" -#: ../../include/text.php:1092 +#: ../../include/text.php:1094 msgid "Tuesday" msgstr "" -#: ../../include/text.php:1092 +#: ../../include/text.php:1094 msgid "Wednesday" msgstr "" -#: ../../include/text.php:1092 +#: ../../include/text.php:1094 msgid "Thursday" msgstr "" -#: ../../include/text.php:1092 +#: ../../include/text.php:1094 msgid "Friday" msgstr "" -#: ../../include/text.php:1092 +#: ../../include/text.php:1094 msgid "Saturday" msgstr "" -#: ../../include/text.php:1092 +#: ../../include/text.php:1094 msgid "Sunday" msgstr "" -#: ../../include/text.php:1096 +#: ../../include/text.php:1098 msgid "January" msgstr "" -#: ../../include/text.php:1096 +#: ../../include/text.php:1098 msgid "February" msgstr "" -#: ../../include/text.php:1096 +#: ../../include/text.php:1098 msgid "March" msgstr "" -#: ../../include/text.php:1096 +#: ../../include/text.php:1098 msgid "April" msgstr "" -#: ../../include/text.php:1096 +#: ../../include/text.php:1098 msgid "May" msgstr "" -#: ../../include/text.php:1096 +#: ../../include/text.php:1098 msgid "June" msgstr "" -#: ../../include/text.php:1096 +#: ../../include/text.php:1098 msgid "July" msgstr "" -#: ../../include/text.php:1096 +#: ../../include/text.php:1098 msgid "August" msgstr "" -#: ../../include/text.php:1096 +#: ../../include/text.php:1098 msgid "September" msgstr "" -#: ../../include/text.php:1096 +#: ../../include/text.php:1098 msgid "October" msgstr "" -#: ../../include/text.php:1096 +#: ../../include/text.php:1098 msgid "November" msgstr "" -#: ../../include/text.php:1096 +#: ../../include/text.php:1098 msgid "December" msgstr "" -#: ../../include/text.php:1174 +#: ../../include/text.php:1176 msgid "unknown.???" msgstr "" -#: ../../include/text.php:1175 +#: ../../include/text.php:1177 msgid "bytes" msgstr "" -#: ../../include/text.php:1210 +#: ../../include/text.php:1212 msgid "remove category" msgstr "" -#: ../../include/text.php:1280 +#: ../../include/text.php:1282 msgid "remove from file" msgstr "" -#: ../../include/text.php:1345 ../../include/text.php:1357 +#: ../../include/text.php:1347 ../../include/text.php:1359 msgid "Click to open/close" msgstr "" -#: ../../include/text.php:1512 ../../mod/events.php:374 +#: ../../include/text.php:1514 ../../mod/events.php:374 msgid "Link to Source" msgstr "" -#: ../../include/text.php:1531 +#: ../../include/text.php:1533 msgid "Select a page layout: " msgstr "" -#: ../../include/text.php:1534 ../../include/text.php:1599 +#: ../../include/text.php:1536 ../../include/text.php:1601 msgid "default" msgstr "" -#: ../../include/text.php:1570 +#: ../../include/text.php:1572 msgid "Page content type: " msgstr "" -#: ../../include/text.php:1611 +#: ../../include/text.php:1613 msgid "Select an alternate language" msgstr "" -#: ../../include/text.php:1735 ../../include/conversation.php:123 +#: ../../include/text.php:1737 ../../include/conversation.php:123 #: ../../mod/tagger.php:49 msgid "event" msgstr "" -#: ../../include/text.php:1740 ../../include/conversation.php:150 +#: ../../include/text.php:1742 ../../include/conversation.php:150 #: ../../mod/tagger.php:55 msgid "comment" msgstr "" -#: ../../include/text.php:1745 +#: ../../include/text.php:1747 msgid "activity" msgstr "" -#: ../../include/text.php:2004 +#: ../../include/text.php:2006 msgid "Design" msgstr "" -#: ../../include/text.php:2006 +#: ../../include/text.php:2008 msgid "Blocks" msgstr "" -#: ../../include/text.php:2007 +#: ../../include/text.php:2009 msgid "Menus" msgstr "" -#: ../../include/text.php:2008 +#: ../../include/text.php:2010 msgid "Layouts" msgstr "" -#: ../../include/text.php:2009 +#: ../../include/text.php:2011 msgid "Pages" msgstr "" @@ -575,7 +566,7 @@ msgstr "" msgid "View" msgstr "" -#: ../../include/page_widgets.php:40 ../../include/conversation.php:1091 +#: ../../include/page_widgets.php:40 ../../include/conversation.php:1096 #: ../../include/ItemObject.php:592 ../../mod/editblock.php:141 #: ../../mod/editlayout.php:135 ../../mod/editpost.php:140 #: ../../mod/editwebpage.php:174 ../../mod/photos.php:1003 @@ -679,7 +670,7 @@ msgstr "" #: ../../include/attach.php:243 ../../include/attach.php:283 #: ../../include/attach.php:297 ../../include/attach.php:322 #: ../../include/attach.php:513 ../../include/attach.php:585 -#: ../../include/chat.php:116 ../../include/items.php:3711 +#: ../../include/chat.php:116 ../../include/items.php:3635 #: ../../mod/mood.php:112 ../../mod/mitem.php:73 ../../mod/achievements.php:27 #: ../../mod/settings.php:494 ../../mod/poke.php:128 ../../mod/api.php:26 #: ../../mod/api.php:31 ../../mod/authtest.php:13 ../../mod/profile.php:64 @@ -702,7 +693,7 @@ msgstr "" #: ../../mod/fsuggest.php:78 ../../mod/suggest.php:26 ../../mod/group.php:9 #: ../../mod/thing.php:249 ../../mod/thing.php:266 ../../mod/thing.php:301 #: ../../mod/invite.php:13 ../../mod/invite.php:104 ../../mod/item.php:178 -#: ../../mod/item.php:186 ../../mod/item.php:916 ../../mod/layouts.php:27 +#: ../../mod/item.php:186 ../../mod/item.php:915 ../../mod/layouts.php:27 #: ../../mod/layouts.php:39 ../../mod/like.php:154 #: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27 #: ../../mod/viewsrc.php:12 ../../mod/mail.php:108 ../../mod/manage.php:6 @@ -730,7 +721,7 @@ msgstr "" msgid "Photo storage failed." msgstr "" -#: ../../include/photos.php:339 ../../include/conversation.php:1515 +#: ../../include/photos.php:339 ../../include/conversation.php:1520 msgid "Photo Albums" msgstr "" @@ -876,206 +867,210 @@ msgstr "" msgid "Location:" msgstr "" -#: ../../include/nav.php:81 ../../include/nav.php:108 ../../boot.php:1497 +#: ../../include/nav.php:94 ../../include/nav.php:121 ../../boot.php:1492 msgid "Logout" msgstr "" -#: ../../include/nav.php:81 ../../include/nav.php:108 +#: ../../include/nav.php:94 ../../include/nav.php:121 msgid "End this session" msgstr "" -#: ../../include/nav.php:84 ../../include/nav.php:142 +#: ../../include/nav.php:97 ../../include/nav.php:155 msgid "Home" msgstr "" -#: ../../include/nav.php:84 +#: ../../include/nav.php:97 msgid "Your posts and conversations" msgstr "" -#: ../../include/nav.php:85 ../../include/conversation.php:940 +#: ../../include/nav.php:98 ../../include/conversation.php:944 #: ../../mod/connedit.php:393 ../../mod/connedit.php:507 msgid "View Profile" msgstr "" -#: ../../include/nav.php:85 +#: ../../include/nav.php:98 msgid "Your profile page" msgstr "" -#: ../../include/nav.php:87 +#: ../../include/nav.php:100 msgid "Edit Profiles" msgstr "" -#: ../../include/nav.php:87 +#: ../../include/nav.php:100 msgid "Manage/Edit profiles" msgstr "" -#: ../../include/nav.php:89 ../../include/identity.php:730 +#: ../../include/nav.php:102 ../../include/identity.php:730 msgid "Edit Profile" msgstr "" -#: ../../include/nav.php:89 +#: ../../include/nav.php:102 msgid "Edit your profile" msgstr "" -#: ../../include/nav.php:91 +#: ../../include/nav.php:104 msgid "Your photos" msgstr "" -#: ../../include/nav.php:92 +#: ../../include/nav.php:105 msgid "Your files" msgstr "" -#: ../../include/nav.php:97 +#: ../../include/nav.php:110 msgid "Your chatrooms" msgstr "" -#: ../../include/nav.php:100 +#: ../../include/nav.php:113 msgid "Your bookmarks" msgstr "" -#: ../../include/nav.php:102 +#: ../../include/nav.php:115 msgid "Your webpages" msgstr "" -#: ../../include/nav.php:106 +#: ../../include/nav.php:119 msgid "Sign in" msgstr "" -#: ../../include/nav.php:123 +#: ../../include/nav.php:136 #, php-format msgid "%s - click to logout" msgstr "" -#: ../../include/nav.php:128 +#: ../../include/nav.php:141 msgid "Click to authenticate to your home hub" msgstr "" -#: ../../include/nav.php:142 +#: ../../include/nav.php:155 msgid "Home Page" msgstr "" -#: ../../include/nav.php:146 ../../mod/register.php:221 ../../boot.php:1474 +#: ../../include/nav.php:159 ../../mod/register.php:221 ../../boot.php:1469 msgid "Register" msgstr "" -#: ../../include/nav.php:146 +#: ../../include/nav.php:159 msgid "Create an account" msgstr "" -#: ../../include/nav.php:151 +#: ../../include/nav.php:164 msgid "Help and documentation" msgstr "" -#: ../../include/nav.php:154 ../../include/widgets.php:79 +#: ../../include/nav.php:167 ../../include/widgets.php:86 #: ../../mod/apps.php:33 msgid "Apps" msgstr "" -#: ../../include/nav.php:154 +#: ../../include/nav.php:167 msgid "Applications, utilities, links, games" msgstr "" -#: ../../include/nav.php:156 +#: ../../include/nav.php:169 msgid "Search site content" msgstr "" -#: ../../include/nav.php:159 +#: ../../include/nav.php:172 msgid "Channel Locator" msgstr "" -#: ../../include/nav.php:170 +#: ../../include/nav.php:183 msgid "Your matrix" msgstr "" -#: ../../include/nav.php:171 +#: ../../include/nav.php:184 msgid "Mark all matrix notifications seen" msgstr "" -#: ../../include/nav.php:173 +#: ../../include/nav.php:186 msgid "Channel home" msgstr "" -#: ../../include/nav.php:174 +#: ../../include/nav.php:187 msgid "Mark all channel notifications seen" msgstr "" -#: ../../include/nav.php:177 ../../mod/connections.php:386 +#: ../../include/nav.php:190 ../../mod/connections.php:389 msgid "Connections" msgstr "" -#: ../../include/nav.php:180 +#: ../../include/nav.php:193 msgid "Notices" msgstr "" -#: ../../include/nav.php:180 +#: ../../include/nav.php:193 msgid "Notifications" msgstr "" -#: ../../include/nav.php:181 +#: ../../include/nav.php:194 msgid "See all notifications" msgstr "" -#: ../../include/nav.php:182 ../../mod/notifications.php:99 +#: ../../include/nav.php:195 ../../mod/notifications.php:99 msgid "Mark all system notifications seen" msgstr "" -#: ../../include/nav.php:184 +#: ../../include/nav.php:197 msgid "Private mail" msgstr "" -#: ../../include/nav.php:185 +#: ../../include/nav.php:198 msgid "See all private messages" msgstr "" -#: ../../include/nav.php:186 +#: ../../include/nav.php:199 msgid "Mark all private messages seen" msgstr "" -#: ../../include/nav.php:187 +#: ../../include/nav.php:200 msgid "Inbox" msgstr "" -#: ../../include/nav.php:188 +#: ../../include/nav.php:201 msgid "Outbox" msgstr "" -#: ../../include/nav.php:189 ../../include/widgets.php:536 +#: ../../include/nav.php:202 ../../include/widgets.php:543 msgid "New Message" msgstr "" -#: ../../include/nav.php:192 +#: ../../include/nav.php:205 msgid "Event Calendar" msgstr "" -#: ../../include/nav.php:193 +#: ../../include/nav.php:206 msgid "See all events" msgstr "" -#: ../../include/nav.php:194 +#: ../../include/nav.php:207 msgid "Mark all events seen" msgstr "" -#: ../../include/nav.php:196 +#: ../../include/nav.php:209 ../../mod/manage.php:148 +msgid "Channel Manager" +msgstr "" + +#: ../../include/nav.php:209 msgid "Manage Your Channels" msgstr "" -#: ../../include/nav.php:198 +#: ../../include/nav.php:211 msgid "Account/Channel Settings" msgstr "" -#: ../../include/nav.php:206 ../../mod/admin.php:123 +#: ../../include/nav.php:219 ../../mod/admin.php:123 msgid "Admin" msgstr "" -#: ../../include/nav.php:206 +#: ../../include/nav.php:219 msgid "Site Setup and Configuration" msgstr "" -#: ../../include/nav.php:231 +#: ../../include/nav.php:244 msgid "Nothing new here" msgstr "" -#: ../../include/nav.php:235 +#: ../../include/nav.php:248 msgid "Please wait..." msgstr "" @@ -1124,7 +1119,7 @@ msgstr "" msgid "dislikes" msgstr "" -#: ../../include/taxonomy.php:338 ../../include/identity.php:999 +#: ../../include/taxonomy.php:338 ../../include/identity.php:1017 #: ../../include/ItemObject.php:134 msgctxt "noun" msgid "Like" @@ -1172,8 +1167,8 @@ msgstr "" msgid "RSS/Atom" msgstr "" -#: ../../include/contact_selectors.php:79 ../../mod/admin.php:763 -#: ../../mod/admin.php:772 ../../boot.php:1500 +#: ../../include/contact_selectors.php:79 ../../mod/admin.php:723 +#: ../../mod/admin.php:732 ../../boot.php:1495 msgid "Email" msgstr "" @@ -1208,7 +1203,7 @@ msgid_plural "%d invitations available" msgstr[0] "" msgstr[1] "" -#: ../../include/contact_widgets.php:19 ../../mod/admin.php:455 +#: ../../include/contact_widgets.php:19 ../../mod/admin.php:415 msgid "Advanced" msgstr "" @@ -1228,7 +1223,7 @@ msgstr "" msgid "Examples: Robert Morgenstein, Fishing" msgstr "" -#: ../../include/contact_widgets.php:26 ../../mod/connections.php:392 +#: ../../include/contact_widgets.php:26 ../../mod/connections.php:395 #: ../../mod/directory.php:222 ../../mod/directory.php:227 msgid "Find" msgstr "" @@ -1253,13 +1248,13 @@ msgstr "" msgid "Advanced Find" msgstr "" -#: ../../include/contact_widgets.php:58 ../../include/features.php:69 -#: ../../include/widgets.php:296 +#: ../../include/contact_widgets.php:58 ../../include/features.php:72 +#: ../../include/widgets.php:303 msgid "Saved Folders" msgstr "" #: ../../include/contact_widgets.php:61 ../../include/contact_widgets.php:96 -#: ../../include/widgets.php:299 +#: ../../include/widgets.php:306 msgid "Everything" msgstr "" @@ -1282,15 +1277,15 @@ msgstr "" msgid "This event has been added to your calendar." msgstr "" -#: ../../include/zot.php:624 +#: ../../include/zot.php:640 msgid "Invalid data packet" msgstr "" -#: ../../include/zot.php:638 +#: ../../include/zot.php:654 msgid "Unable to verify channel signature" msgstr "" -#: ../../include/zot.php:835 +#: ../../include/zot.php:851 #, php-format msgid "Unable to verify site signature for %s" msgstr "" @@ -1597,7 +1592,7 @@ msgstr "" msgid "Please visit %s to approve or reject the suggestion." msgstr "" -#: ../../include/enotify.php:474 +#: ../../include/enotify.php:477 msgid "[Red:Notify]" msgstr "" @@ -1640,7 +1635,7 @@ msgid "%1$s used of %2$s (%3$s%)" msgstr "" #: ../../include/reddav.php:1284 ../../mod/settings.php:519 -#: ../../mod/settings.php:545 ../../mod/admin.php:902 +#: ../../mod/settings.php:545 ../../mod/admin.php:862 msgid "Name" msgstr "" @@ -1747,7 +1742,7 @@ msgstr "" msgid "View in context" msgstr "" -#: ../../include/conversation.php:714 ../../include/conversation.php:1130 +#: ../../include/conversation.php:714 ../../include/conversation.php:1135 #: ../../include/ItemObject.php:294 ../../mod/editblock.php:120 #: ../../mod/editlayout.php:115 ../../mod/editpost.php:121 #: ../../mod/editwebpage.php:152 ../../mod/photos.php:983 @@ -1767,334 +1762,342 @@ msgstr "" msgid "Delete Selected Items" msgstr "" -#: ../../include/conversation.php:937 +#: ../../include/conversation.php:941 msgid "View Source" msgstr "" -#: ../../include/conversation.php:938 +#: ../../include/conversation.php:942 msgid "Follow Thread" msgstr "" -#: ../../include/conversation.php:939 +#: ../../include/conversation.php:943 msgid "View Status" msgstr "" -#: ../../include/conversation.php:941 +#: ../../include/conversation.php:945 msgid "View Photos" msgstr "" -#: ../../include/conversation.php:942 +#: ../../include/conversation.php:946 msgid "Matrix Activity" msgstr "" -#: ../../include/conversation.php:943 +#: ../../include/conversation.php:947 ../../include/identity.php:706 +#: ../../include/widgets.php:135 ../../include/widgets.php:175 +#: ../../include/Contact.php:107 ../../mod/directory.php:183 +#: ../../mod/dirprofile.php:164 ../../mod/suggest.php:51 +#: ../../mod/match.php:62 +msgid "Connect" +msgstr "" + +#: ../../include/conversation.php:948 msgid "Edit Contact" msgstr "" -#: ../../include/conversation.php:944 +#: ../../include/conversation.php:949 msgid "Send PM" msgstr "" -#: ../../include/conversation.php:1001 +#: ../../include/conversation.php:1006 #, php-format msgid "%s likes this." msgstr "" -#: ../../include/conversation.php:1001 +#: ../../include/conversation.php:1006 #, php-format msgid "%s doesn't like this." msgstr "" -#: ../../include/conversation.php:1005 +#: ../../include/conversation.php:1010 #, php-format msgid "%2$d people like this." msgid_plural "%2$d people like this." msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1007 +#: ../../include/conversation.php:1012 #, php-format msgid "%2$d people don't like this." msgid_plural "%2$d people don't like this." msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1013 +#: ../../include/conversation.php:1018 msgid "and" msgstr "" -#: ../../include/conversation.php:1016 +#: ../../include/conversation.php:1021 #, php-format msgid ", and %d other people" msgid_plural ", and %d other people" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1017 +#: ../../include/conversation.php:1022 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:1017 +#: ../../include/conversation.php:1022 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:1074 +#: ../../include/conversation.php:1079 msgid "Visible to everybody" msgstr "" -#: ../../include/conversation.php:1075 ../../mod/mail.php:167 +#: ../../include/conversation.php:1080 ../../mod/mail.php:167 #: ../../mod/mail.php:279 msgid "Please enter a link URL:" msgstr "" -#: ../../include/conversation.php:1076 +#: ../../include/conversation.php:1081 msgid "Please enter a video link/URL:" msgstr "" -#: ../../include/conversation.php:1077 +#: ../../include/conversation.php:1082 msgid "Please enter an audio link/URL:" msgstr "" -#: ../../include/conversation.php:1078 +#: ../../include/conversation.php:1083 msgid "Tag term:" msgstr "" -#: ../../include/conversation.php:1079 ../../mod/filer.php:49 +#: ../../include/conversation.php:1084 ../../mod/filer.php:49 msgid "Save to Folder:" msgstr "" -#: ../../include/conversation.php:1080 +#: ../../include/conversation.php:1085 msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:1081 ../../mod/editpost.php:52 +#: ../../include/conversation.php:1086 ../../mod/editpost.php:52 #: ../../mod/mail.php:168 ../../mod/mail.php:280 msgid "Expires YYYY-MM-DD HH:MM" msgstr "" -#: ../../include/conversation.php:1105 ../../mod/photos.php:982 +#: ../../include/conversation.php:1110 ../../mod/photos.php:982 #: ../../mod/layouts.php:113 msgid "Share" msgstr "" -#: ../../include/conversation.php:1107 ../../mod/editwebpage.php:139 +#: ../../include/conversation.php:1112 ../../mod/editwebpage.php:139 msgid "Page link title" msgstr "" -#: ../../include/conversation.php:1110 +#: ../../include/conversation.php:1115 msgid "Post as" msgstr "" -#: ../../include/conversation.php:1111 ../../mod/editblock.php:112 +#: ../../include/conversation.php:1116 ../../mod/editblock.php:112 #: ../../mod/editlayout.php:107 ../../mod/editpost.php:113 #: ../../mod/editwebpage.php:144 ../../mod/mail.php:228 ../../mod/mail.php:342 msgid "Upload photo" msgstr "" -#: ../../include/conversation.php:1112 +#: ../../include/conversation.php:1117 msgid "upload photo" msgstr "" -#: ../../include/conversation.php:1113 ../../mod/editblock.php:113 +#: ../../include/conversation.php:1118 ../../mod/editblock.php:113 #: ../../mod/editlayout.php:108 ../../mod/editpost.php:114 #: ../../mod/editwebpage.php:145 ../../mod/mail.php:229 ../../mod/mail.php:343 msgid "Attach file" msgstr "" -#: ../../include/conversation.php:1114 +#: ../../include/conversation.php:1119 msgid "attach file" msgstr "" -#: ../../include/conversation.php:1115 ../../mod/editblock.php:114 +#: ../../include/conversation.php:1120 ../../mod/editblock.php:114 #: ../../mod/editlayout.php:109 ../../mod/editpost.php:115 #: ../../mod/editwebpage.php:146 ../../mod/mail.php:230 ../../mod/mail.php:344 msgid "Insert web link" msgstr "" -#: ../../include/conversation.php:1116 +#: ../../include/conversation.php:1121 msgid "web link" msgstr "" -#: ../../include/conversation.php:1117 +#: ../../include/conversation.php:1122 msgid "Insert video link" msgstr "" -#: ../../include/conversation.php:1118 +#: ../../include/conversation.php:1123 msgid "video link" msgstr "" -#: ../../include/conversation.php:1119 +#: ../../include/conversation.php:1124 msgid "Insert audio link" msgstr "" -#: ../../include/conversation.php:1120 +#: ../../include/conversation.php:1125 msgid "audio link" msgstr "" -#: ../../include/conversation.php:1121 ../../mod/editblock.php:118 +#: ../../include/conversation.php:1126 ../../mod/editblock.php:118 #: ../../mod/editlayout.php:113 ../../mod/editpost.php:119 #: ../../mod/editwebpage.php:150 msgid "Set your location" msgstr "" -#: ../../include/conversation.php:1122 +#: ../../include/conversation.php:1127 msgid "set location" msgstr "" -#: ../../include/conversation.php:1123 ../../mod/editblock.php:119 +#: ../../include/conversation.php:1128 ../../mod/editblock.php:119 #: ../../mod/editlayout.php:114 ../../mod/editpost.php:120 #: ../../mod/editwebpage.php:151 msgid "Clear browser location" msgstr "" -#: ../../include/conversation.php:1124 +#: ../../include/conversation.php:1129 msgid "clear location" msgstr "" -#: ../../include/conversation.php:1126 ../../mod/editblock.php:132 +#: ../../include/conversation.php:1131 ../../mod/editblock.php:132 #: ../../mod/editlayout.php:126 ../../mod/editpost.php:132 #: ../../mod/editwebpage.php:167 msgid "Set title" msgstr "" -#: ../../include/conversation.php:1129 ../../mod/editblock.php:135 +#: ../../include/conversation.php:1134 ../../mod/editblock.php:135 #: ../../mod/editlayout.php:129 ../../mod/editpost.php:134 #: ../../mod/editwebpage.php:169 msgid "Categories (comma-separated list)" msgstr "" -#: ../../include/conversation.php:1131 ../../mod/editblock.php:121 +#: ../../include/conversation.php:1136 ../../mod/editblock.php:121 #: ../../mod/editlayout.php:116 ../../mod/editpost.php:122 #: ../../mod/editwebpage.php:153 msgid "Permission settings" msgstr "" -#: ../../include/conversation.php:1132 +#: ../../include/conversation.php:1137 msgid "permissions" msgstr "" -#: ../../include/conversation.php:1139 ../../mod/editblock.php:129 +#: ../../include/conversation.php:1144 ../../mod/editblock.php:129 #: ../../mod/editlayout.php:123 ../../mod/editpost.php:129 #: ../../mod/editwebpage.php:162 msgid "Public post" msgstr "" -#: ../../include/conversation.php:1141 ../../mod/editblock.php:136 +#: ../../include/conversation.php:1146 ../../mod/editblock.php:136 #: ../../mod/editlayout.php:130 ../../mod/editpost.php:135 #: ../../mod/editwebpage.php:170 msgid "Example: bob@example.com, mary@example.com" msgstr "" -#: ../../include/conversation.php:1154 ../../mod/editblock.php:146 +#: ../../include/conversation.php:1159 ../../mod/editblock.php:146 #: ../../mod/editlayout.php:140 ../../mod/editpost.php:146 #: ../../mod/editwebpage.php:179 ../../mod/mail.php:235 ../../mod/mail.php:349 msgid "Set expiration date" msgstr "" -#: ../../include/conversation.php:1156 ../../include/ItemObject.php:595 +#: ../../include/conversation.php:1161 ../../include/ItemObject.php:595 #: ../../mod/editpost.php:148 ../../mod/mail.php:237 ../../mod/mail.php:351 msgid "Encrypt text" msgstr "" -#: ../../include/conversation.php:1158 ../../mod/editpost.php:150 +#: ../../include/conversation.php:1163 ../../mod/editpost.php:150 msgid "OK" msgstr "" -#: ../../include/conversation.php:1159 ../../mod/settings.php:518 +#: ../../include/conversation.php:1164 ../../mod/settings.php:518 #: ../../mod/settings.php:544 ../../mod/editpost.php:151 #: ../../mod/fbrowser.php:82 ../../mod/fbrowser.php:117 ../../mod/tagrm.php:11 #: ../../mod/tagrm.php:94 msgid "Cancel" msgstr "" -#: ../../include/conversation.php:1401 +#: ../../include/conversation.php:1406 msgid "Discover" msgstr "" -#: ../../include/conversation.php:1404 +#: ../../include/conversation.php:1409 msgid "Imported public streams" msgstr "" -#: ../../include/conversation.php:1409 +#: ../../include/conversation.php:1414 msgid "Commented Order" msgstr "" -#: ../../include/conversation.php:1412 +#: ../../include/conversation.php:1417 msgid "Sort by Comment Date" msgstr "" -#: ../../include/conversation.php:1416 +#: ../../include/conversation.php:1421 msgid "Posted Order" msgstr "" -#: ../../include/conversation.php:1419 +#: ../../include/conversation.php:1424 msgid "Sort by Post Date" msgstr "" -#: ../../include/conversation.php:1424 ../../include/widgets.php:82 +#: ../../include/conversation.php:1429 ../../include/widgets.php:89 msgid "Personal" msgstr "" -#: ../../include/conversation.php:1427 +#: ../../include/conversation.php:1432 msgid "Posts that mention or involve you" msgstr "" -#: ../../include/conversation.php:1433 ../../mod/connections.php:211 +#: ../../include/conversation.php:1438 ../../mod/connections.php:211 #: ../../mod/connections.php:224 ../../mod/menu.php:61 msgid "New" msgstr "" -#: ../../include/conversation.php:1436 +#: ../../include/conversation.php:1441 msgid "Activity Stream - by date" msgstr "" -#: ../../include/conversation.php:1442 +#: ../../include/conversation.php:1447 msgid "Starred" msgstr "" -#: ../../include/conversation.php:1445 +#: ../../include/conversation.php:1450 msgid "Favourite Posts" msgstr "" -#: ../../include/conversation.php:1452 +#: ../../include/conversation.php:1457 msgid "Spam" msgstr "" -#: ../../include/conversation.php:1455 +#: ../../include/conversation.php:1460 msgid "Posts flagged as SPAM" msgstr "" -#: ../../include/conversation.php:1491 ../../mod/admin.php:901 +#: ../../include/conversation.php:1496 ../../mod/admin.php:861 msgid "Channel" msgstr "" -#: ../../include/conversation.php:1494 +#: ../../include/conversation.php:1499 msgid "Status Messages and Posts" msgstr "" -#: ../../include/conversation.php:1503 +#: ../../include/conversation.php:1508 msgid "About" msgstr "" -#: ../../include/conversation.php:1506 +#: ../../include/conversation.php:1511 msgid "Profile Details" msgstr "" -#: ../../include/conversation.php:1524 +#: ../../include/conversation.php:1529 msgid "Files and Storage" msgstr "" -#: ../../include/conversation.php:1533 ../../include/conversation.php:1536 +#: ../../include/conversation.php:1538 ../../include/conversation.php:1541 msgid "Chatrooms" msgstr "" -#: ../../include/conversation.php:1546 +#: ../../include/conversation.php:1551 msgid "Saved Bookmarks" msgstr "" -#: ../../include/conversation.php:1557 +#: ../../include/conversation.php:1562 msgid "Manage Webpages" msgstr "" @@ -2150,185 +2153,193 @@ msgstr "" msgid "Enables a tool to store notes and reminders" msgstr "" -#: ../../include/features.php:35 +#: ../../include/features.php:34 +msgid "Navigation Channel Select" +msgstr "" + +#: ../../include/features.php:34 +msgid "Change channels directly from within the navigation dropdown menu" +msgstr "" + +#: ../../include/features.php:38 msgid "Extended Identity Sharing" msgstr "" -#: ../../include/features.php:35 +#: ../../include/features.php:38 msgid "" "Share your identity with all websites on the internet. When disabled, " "identity is only shared with sites in the matrix." msgstr "" -#: ../../include/features.php:36 +#: ../../include/features.php:39 msgid "Expert Mode" msgstr "" -#: ../../include/features.php:36 +#: ../../include/features.php:39 msgid "Enable Expert Mode to provide advanced configuration options" msgstr "" -#: ../../include/features.php:37 +#: ../../include/features.php:40 msgid "Premium Channel" msgstr "" -#: ../../include/features.php:37 +#: ../../include/features.php:40 msgid "" "Allows you to set restrictions and terms on those that connect with your " "channel" msgstr "" -#: ../../include/features.php:42 +#: ../../include/features.php:45 msgid "Post Composition Features" msgstr "" -#: ../../include/features.php:44 +#: ../../include/features.php:47 msgid "Use Markdown" msgstr "" -#: ../../include/features.php:44 +#: ../../include/features.php:47 msgid "Allow use of \"Markdown\" to format posts" msgstr "" -#: ../../include/features.php:45 +#: ../../include/features.php:48 msgid "Post Preview" msgstr "" -#: ../../include/features.php:45 +#: ../../include/features.php:48 msgid "Allow previewing posts and comments before publishing them" msgstr "" -#: ../../include/features.php:46 ../../include/widgets.php:503 +#: ../../include/features.php:49 ../../include/widgets.php:510 #: ../../mod/sources.php:88 msgid "Channel Sources" msgstr "" -#: ../../include/features.php:46 +#: ../../include/features.php:49 msgid "Automatically import channel content from other channels or feeds" msgstr "" -#: ../../include/features.php:47 +#: ../../include/features.php:50 msgid "Even More Encryption" msgstr "" -#: ../../include/features.php:47 +#: ../../include/features.php:50 msgid "" "Allow optional encryption of content end-to-end with a shared secret key" msgstr "" -#: ../../include/features.php:52 +#: ../../include/features.php:55 msgid "Network and Stream Filtering" msgstr "" -#: ../../include/features.php:53 +#: ../../include/features.php:56 msgid "Search by Date" msgstr "" -#: ../../include/features.php:53 +#: ../../include/features.php:56 msgid "Ability to select posts by date ranges" msgstr "" -#: ../../include/features.php:54 +#: ../../include/features.php:57 msgid "Collections Filter" msgstr "" -#: ../../include/features.php:54 +#: ../../include/features.php:57 msgid "Enable widget to display Network posts only from selected collections" msgstr "" -#: ../../include/features.php:55 ../../include/widgets.php:265 +#: ../../include/features.php:58 ../../include/widgets.php:272 msgid "Saved Searches" msgstr "" -#: ../../include/features.php:55 +#: ../../include/features.php:58 msgid "Save search terms for re-use" msgstr "" -#: ../../include/features.php:56 +#: ../../include/features.php:59 msgid "Network Personal Tab" msgstr "" -#: ../../include/features.php:56 +#: ../../include/features.php:59 msgid "Enable tab to display only Network posts that you've interacted on" msgstr "" -#: ../../include/features.php:57 +#: ../../include/features.php:60 msgid "Network New Tab" msgstr "" -#: ../../include/features.php:57 +#: ../../include/features.php:60 msgid "Enable tab to display all new Network activity" msgstr "" -#: ../../include/features.php:58 +#: ../../include/features.php:61 msgid "Affinity Tool" msgstr "" -#: ../../include/features.php:58 +#: ../../include/features.php:61 msgid "Filter stream activity by depth of relationships" msgstr "" -#: ../../include/features.php:59 +#: ../../include/features.php:62 msgid "Suggest Channels" msgstr "" -#: ../../include/features.php:59 +#: ../../include/features.php:62 msgid "Show channel suggestions" msgstr "" -#: ../../include/features.php:64 +#: ../../include/features.php:67 msgid "Post/Comment Tools" msgstr "" -#: ../../include/features.php:66 +#: ../../include/features.php:69 msgid "Edit Sent Posts" msgstr "" -#: ../../include/features.php:66 +#: ../../include/features.php:69 msgid "Edit and correct posts and comments after sending" msgstr "" -#: ../../include/features.php:67 +#: ../../include/features.php:70 msgid "Tagging" msgstr "" -#: ../../include/features.php:67 +#: ../../include/features.php:70 msgid "Ability to tag existing posts" msgstr "" -#: ../../include/features.php:68 +#: ../../include/features.php:71 msgid "Post Categories" msgstr "" -#: ../../include/features.php:68 +#: ../../include/features.php:71 msgid "Add categories to your posts" msgstr "" -#: ../../include/features.php:69 +#: ../../include/features.php:72 msgid "Ability to file posts under folders" msgstr "" -#: ../../include/features.php:70 +#: ../../include/features.php:73 msgid "Dislike Posts" msgstr "" -#: ../../include/features.php:70 +#: ../../include/features.php:73 msgid "Ability to dislike posts/comments" msgstr "" -#: ../../include/features.php:71 +#: ../../include/features.php:74 msgid "Star Posts" msgstr "" -#: ../../include/features.php:71 +#: ../../include/features.php:74 msgid "Ability to mark special posts with a star indicator" msgstr "" -#: ../../include/features.php:72 +#: ../../include/features.php:75 msgid "Tag Cloud" msgstr "" -#: ../../include/features.php:72 +#: ../../include/features.php:75 msgid "Provide a personal tag cloud on your channel page" msgstr "" @@ -2382,7 +2393,7 @@ msgstr "" #: ../../include/items.php:295 ../../mod/profperm.php:23 #: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/like.php:242 -#: ../../mod/frphotos.php:69 ../../index.php:360 +#: ../../index.php:360 msgid "Permission denied" msgstr "" @@ -2419,32 +2430,32 @@ msgstr "" msgid "Visible to approved connections." msgstr "" -#: ../../include/items.php:3649 ../../mod/home.php:67 ../../mod/display.php:32 +#: ../../include/items.php:3573 ../../mod/home.php:67 ../../mod/display.php:32 #: ../../mod/filestorage.php:18 ../../mod/admin.php:168 -#: ../../mod/admin.php:932 ../../mod/admin.php:1135 ../../mod/thing.php:78 +#: ../../mod/admin.php:892 ../../mod/admin.php:1095 ../../mod/thing.php:78 #: ../../mod/viewsrc.php:18 msgid "Item not found." msgstr "" -#: ../../include/items.php:4082 ../../mod/group.php:38 ../../mod/group.php:140 +#: ../../include/items.php:4006 ../../mod/group.php:38 ../../mod/group.php:140 msgid "Collection not found." msgstr "" -#: ../../include/items.php:4097 +#: ../../include/items.php:4021 msgid "Collection is empty." msgstr "" -#: ../../include/items.php:4104 +#: ../../include/items.php:4028 #, php-format msgid "Collection: %s" msgstr "" -#: ../../include/items.php:4115 +#: ../../include/items.php:4039 #, php-format msgid "Connection: %s" msgstr "" -#: ../../include/items.php:4118 +#: ../../include/items.php:4042 msgid "Connection not found." msgstr "" @@ -2459,7 +2470,7 @@ msgstr "" msgid "Default privacy group for new contacts" msgstr "" -#: ../../include/group.php:253 ../../mod/admin.php:772 +#: ../../include/group.php:253 ../../mod/admin.php:732 msgid "All Channels" msgstr "" @@ -2483,11 +2494,11 @@ msgstr "" msgid "Channels not in any collection" msgstr "" -#: ../../include/group.php:301 ../../include/widgets.php:266 +#: ../../include/group.php:301 ../../include/widgets.php:273 msgid "add" msgstr "" -#: ../../include/identity.php:30 ../../mod/item.php:1297 +#: ../../include/identity.php:30 ../../mod/item.php:1296 msgid "Unable to obtain identity information from database" msgstr "" @@ -2524,7 +2535,7 @@ msgstr "" msgid "Default Profile" msgstr "" -#: ../../include/identity.php:342 ../../include/widgets.php:400 +#: ../../include/identity.php:342 ../../include/widgets.php:407 #: ../../include/profile_selectors.php:80 ../../mod/connedit.php:473 msgid "Friends" msgstr "" @@ -2540,14 +2551,7 @@ msgstr "" msgid "Requested profile is not available." msgstr "" -#: ../../include/identity.php:706 ../../include/widgets.php:128 -#: ../../include/widgets.php:168 ../../include/Contact.php:107 -#: ../../mod/directory.php:183 ../../mod/dirprofile.php:164 -#: ../../mod/suggest.php:51 ../../mod/match.php:62 -msgid "Connect" -msgstr "" - -#: ../../include/identity.php:720 ../../mod/profiles.php:695 +#: ../../include/identity.php:720 ../../mod/profiles.php:714 msgid "Change profile photo" msgstr "" @@ -2559,11 +2563,11 @@ msgstr "" msgid "Manage/edit profiles" msgstr "" -#: ../../include/identity.php:727 ../../mod/profiles.php:696 +#: ../../include/identity.php:727 ../../mod/profiles.php:715 msgid "Create New Profile" msgstr "" -#: ../../include/identity.php:741 ../../mod/profiles.php:707 +#: ../../include/identity.php:741 ../../mod/profiles.php:726 msgid "Profile Image" msgstr "" @@ -2571,22 +2575,22 @@ msgstr "" msgid "visible to everybody" msgstr "" -#: ../../include/identity.php:745 ../../mod/profiles.php:591 -#: ../../mod/profiles.php:711 +#: ../../include/identity.php:745 ../../mod/profiles.php:609 +#: ../../mod/profiles.php:730 msgid "Edit visibility" msgstr "" -#: ../../include/identity.php:759 ../../include/identity.php:983 +#: ../../include/identity.php:759 ../../include/identity.php:1001 #: ../../mod/directory.php:158 msgid "Gender:" msgstr "" -#: ../../include/identity.php:760 ../../include/identity.php:1027 +#: ../../include/identity.php:760 ../../include/identity.php:1045 #: ../../mod/directory.php:160 msgid "Status:" msgstr "" -#: ../../include/identity.php:761 ../../include/identity.php:1038 +#: ../../include/identity.php:761 ../../include/identity.php:1056 #: ../../mod/directory.php:162 msgid "Homepage:" msgstr "" @@ -2595,146 +2599,146 @@ msgstr "" msgid "Online Now" msgstr "" -#: ../../include/identity.php:827 ../../include/identity.php:907 +#: ../../include/identity.php:845 ../../include/identity.php:925 #: ../../mod/ping.php:298 msgid "g A l F d" msgstr "" -#: ../../include/identity.php:828 ../../include/identity.php:908 +#: ../../include/identity.php:846 ../../include/identity.php:926 msgid "F d" msgstr "" -#: ../../include/identity.php:873 ../../include/identity.php:948 +#: ../../include/identity.php:891 ../../include/identity.php:966 #: ../../mod/ping.php:320 msgid "[today]" msgstr "" -#: ../../include/identity.php:885 +#: ../../include/identity.php:903 msgid "Birthday Reminders" msgstr "" -#: ../../include/identity.php:886 +#: ../../include/identity.php:904 msgid "Birthdays this week:" msgstr "" -#: ../../include/identity.php:941 +#: ../../include/identity.php:959 msgid "[No description]" msgstr "" -#: ../../include/identity.php:959 +#: ../../include/identity.php:977 msgid "Event Reminders" msgstr "" -#: ../../include/identity.php:960 +#: ../../include/identity.php:978 msgid "Events this week:" msgstr "" -#: ../../include/identity.php:981 ../../mod/settings.php:942 +#: ../../include/identity.php:999 ../../mod/settings.php:943 msgid "Full Name:" msgstr "" -#: ../../include/identity.php:988 +#: ../../include/identity.php:1006 msgid "Like this channel" msgstr "" -#: ../../include/identity.php:1012 +#: ../../include/identity.php:1030 msgid "j F, Y" msgstr "" -#: ../../include/identity.php:1013 +#: ../../include/identity.php:1031 msgid "j F" msgstr "" -#: ../../include/identity.php:1020 +#: ../../include/identity.php:1038 msgid "Birthday:" msgstr "" -#: ../../include/identity.php:1024 +#: ../../include/identity.php:1042 msgid "Age:" msgstr "" -#: ../../include/identity.php:1033 +#: ../../include/identity.php:1051 #, php-format msgid "for %1$d %2$s" msgstr "" -#: ../../include/identity.php:1036 ../../mod/profiles.php:613 +#: ../../include/identity.php:1054 ../../mod/profiles.php:631 msgid "Sexual Preference:" msgstr "" -#: ../../include/identity.php:1040 ../../mod/profiles.php:615 +#: ../../include/identity.php:1058 ../../mod/profiles.php:633 msgid "Hometown:" msgstr "" -#: ../../include/identity.php:1042 +#: ../../include/identity.php:1060 msgid "Tags:" msgstr "" -#: ../../include/identity.php:1044 ../../mod/profiles.php:616 +#: ../../include/identity.php:1062 ../../mod/profiles.php:634 msgid "Political Views:" msgstr "" -#: ../../include/identity.php:1046 +#: ../../include/identity.php:1064 msgid "Religion:" msgstr "" -#: ../../include/identity.php:1048 ../../mod/directory.php:164 +#: ../../include/identity.php:1066 ../../mod/directory.php:164 msgid "About:" msgstr "" -#: ../../include/identity.php:1050 +#: ../../include/identity.php:1068 msgid "Hobbies/Interests:" msgstr "" -#: ../../include/identity.php:1052 ../../mod/profiles.php:619 +#: ../../include/identity.php:1070 ../../mod/profiles.php:637 msgid "Likes:" msgstr "" -#: ../../include/identity.php:1054 ../../mod/profiles.php:620 +#: ../../include/identity.php:1072 ../../mod/profiles.php:638 msgid "Dislikes:" msgstr "" -#: ../../include/identity.php:1057 +#: ../../include/identity.php:1075 msgid "Contact information and Social Networks:" msgstr "" -#: ../../include/identity.php:1059 +#: ../../include/identity.php:1077 msgid "My other channels:" msgstr "" -#: ../../include/identity.php:1061 +#: ../../include/identity.php:1079 msgid "Musical interests:" msgstr "" -#: ../../include/identity.php:1063 +#: ../../include/identity.php:1081 msgid "Books, literature:" msgstr "" -#: ../../include/identity.php:1065 +#: ../../include/identity.php:1083 msgid "Television:" msgstr "" -#: ../../include/identity.php:1067 +#: ../../include/identity.php:1085 msgid "Film/dance/culture/entertainment:" msgstr "" -#: ../../include/identity.php:1069 +#: ../../include/identity.php:1087 msgid "Love/Romance:" msgstr "" -#: ../../include/identity.php:1071 +#: ../../include/identity.php:1089 msgid "Work/employment:" msgstr "" -#: ../../include/identity.php:1073 +#: ../../include/identity.php:1091 msgid "School/education:" msgstr "" -#: ../../include/identity.php:1093 +#: ../../include/identity.php:1111 msgid "Like this thing" msgstr "" -#: ../../include/network.php:652 +#: ../../include/network.php:557 msgid "view full size" msgstr "" @@ -2785,136 +2789,136 @@ msgstr "" msgid "Stored post could not be verified." msgstr "" -#: ../../include/widgets.php:80 +#: ../../include/widgets.php:87 msgid "System" msgstr "" -#: ../../include/widgets.php:83 +#: ../../include/widgets.php:90 msgid "Create Personal App" msgstr "" -#: ../../include/widgets.php:84 +#: ../../include/widgets.php:91 msgid "Edit Personal App" msgstr "" -#: ../../include/widgets.php:130 ../../mod/suggest.php:53 +#: ../../include/widgets.php:137 ../../mod/suggest.php:53 msgid "Ignore/Hide" msgstr "" -#: ../../include/widgets.php:136 ../../mod/connections.php:267 +#: ../../include/widgets.php:143 ../../mod/connections.php:267 msgid "Suggestions" msgstr "" -#: ../../include/widgets.php:137 +#: ../../include/widgets.php:144 msgid "See more..." msgstr "" -#: ../../include/widgets.php:159 +#: ../../include/widgets.php:166 #, php-format msgid "You have %1$.0f of %2$.0f allowed connections." msgstr "" -#: ../../include/widgets.php:165 +#: ../../include/widgets.php:172 msgid "Add New Connection" msgstr "" -#: ../../include/widgets.php:166 +#: ../../include/widgets.php:173 msgid "Enter the channel address" msgstr "" -#: ../../include/widgets.php:167 +#: ../../include/widgets.php:174 msgid "Example: bob@example.com, http://example.com/barbara" msgstr "" -#: ../../include/widgets.php:184 +#: ../../include/widgets.php:191 msgid "Notes" msgstr "" -#: ../../include/widgets.php:256 +#: ../../include/widgets.php:263 msgid "Remove term" msgstr "" -#: ../../include/widgets.php:335 +#: ../../include/widgets.php:342 msgid "Archives" msgstr "" -#: ../../include/widgets.php:397 +#: ../../include/widgets.php:404 msgid "Refresh" msgstr "" -#: ../../include/widgets.php:398 ../../mod/connedit.php:470 +#: ../../include/widgets.php:405 ../../mod/connedit.php:470 msgid "Me" msgstr "" -#: ../../include/widgets.php:399 ../../mod/connedit.php:472 +#: ../../include/widgets.php:406 ../../mod/connedit.php:472 msgid "Best Friends" msgstr "" -#: ../../include/widgets.php:401 +#: ../../include/widgets.php:408 msgid "Co-workers" msgstr "" -#: ../../include/widgets.php:402 ../../mod/connedit.php:474 +#: ../../include/widgets.php:409 ../../mod/connedit.php:474 msgid "Former Friends" msgstr "" -#: ../../include/widgets.php:403 ../../mod/connedit.php:475 +#: ../../include/widgets.php:410 ../../mod/connedit.php:475 msgid "Acquaintances" msgstr "" -#: ../../include/widgets.php:404 +#: ../../include/widgets.php:411 msgid "Everybody" msgstr "" -#: ../../include/widgets.php:436 +#: ../../include/widgets.php:443 msgid "Account settings" msgstr "" -#: ../../include/widgets.php:442 +#: ../../include/widgets.php:449 msgid "Channel settings" msgstr "" -#: ../../include/widgets.php:448 +#: ../../include/widgets.php:455 msgid "Additional features" msgstr "" -#: ../../include/widgets.php:454 +#: ../../include/widgets.php:461 msgid "Feature settings" msgstr "" -#: ../../include/widgets.php:460 +#: ../../include/widgets.php:467 msgid "Display settings" msgstr "" -#: ../../include/widgets.php:466 +#: ../../include/widgets.php:473 msgid "Connected apps" msgstr "" -#: ../../include/widgets.php:472 +#: ../../include/widgets.php:479 msgid "Export channel" msgstr "" -#: ../../include/widgets.php:484 +#: ../../include/widgets.php:491 msgid "Automatic Permissions (Advanced)" msgstr "" -#: ../../include/widgets.php:494 +#: ../../include/widgets.php:501 msgid "Premium Channel Settings" msgstr "" -#: ../../include/widgets.php:531 +#: ../../include/widgets.php:538 msgid "Check Mail" msgstr "" -#: ../../include/widgets.php:612 +#: ../../include/widgets.php:619 msgid "Chat Rooms" msgstr "" -#: ../../include/widgets.php:630 +#: ../../include/widgets.php:637 msgid "Bookmarked Chatrooms" msgstr "" -#: ../../include/widgets.php:648 +#: ../../include/widgets.php:655 msgid "Suggested Chatrooms" msgstr "" @@ -3031,21 +3035,21 @@ msgstr "" #: ../../include/ItemObject.php:583 ../../mod/mood.php:135 #: ../../mod/settings.php:517 ../../mod/settings.php:629 -#: ../../mod/settings.php:657 ../../mod/settings.php:681 -#: ../../mod/settings.php:754 ../../mod/settings.php:934 -#: ../../mod/poke.php:166 ../../mod/profiles.php:589 ../../mod/chat.php:177 +#: ../../mod/settings.php:658 ../../mod/settings.php:682 +#: ../../mod/settings.php:755 ../../mod/settings.php:935 +#: ../../mod/poke.php:166 ../../mod/profiles.php:607 ../../mod/chat.php:177 #: ../../mod/chat.php:211 ../../mod/connect.php:92 ../../mod/connedit.php:518 #: ../../mod/setup.php:307 ../../mod/setup.php:350 ../../mod/pdledit.php:58 #: ../../mod/photos.php:563 ../../mod/photos.php:674 ../../mod/photos.php:962 #: ../../mod/photos.php:1002 ../../mod/photos.php:1089 #: ../../mod/sources.php:104 ../../mod/sources.php:138 #: ../../mod/events.php:511 ../../mod/filestorage.php:137 -#: ../../mod/fsuggest.php:108 ../../mod/group.php:81 ../../mod/admin.php:451 -#: ../../mod/admin.php:760 ../../mod/admin.php:895 ../../mod/admin.php:1028 -#: ../../mod/admin.php:1227 ../../mod/admin.php:1314 ../../mod/thing.php:286 +#: ../../mod/fsuggest.php:108 ../../mod/group.php:81 ../../mod/admin.php:411 +#: ../../mod/admin.php:720 ../../mod/admin.php:855 ../../mod/admin.php:988 +#: ../../mod/admin.php:1187 ../../mod/admin.php:1274 ../../mod/thing.php:286 #: ../../mod/thing.php:329 ../../mod/import.php:393 ../../mod/invite.php:142 #: ../../mod/mail.php:345 ../../mod/appman.php:99 ../../mod/poll.php:68 -#: ../../mod/frphotos.php:84 ../../view/theme/apw/php/config.php:256 +#: ../../view/theme/apw/php/config.php:256 #: ../../view/theme/blogga/php/config.php:67 #: ../../view/theme/blogga/view/theme/blog/config.php:67 #: ../../view/theme/redbasic/php/config.php:99 @@ -3209,6 +3213,11 @@ msgstr "" msgid "Open the selected location in a different window or browser tab" msgstr "" +#: ../../include/Contact.php:211 ../../mod/admin.php:646 +#, php-format +msgid "User '%s' deleted" +msgstr "" + #: ../../include/profile_selectors.php:6 #: ../../include/profile_selectors.php:23 msgid "Male" @@ -3625,7 +3634,7 @@ msgstr "" msgid "Menu Item Permissions" msgstr "" -#: ../../mod/mitem.php:134 ../../mod/mitem.php:177 ../../mod/settings.php:967 +#: ../../mod/mitem.php:134 ../../mod/mitem.php:177 ../../mod/settings.php:968 msgid "(click to open/close)" msgstr "" @@ -3815,7 +3824,7 @@ msgstr "" msgid "Leave password fields blank unless changing" msgstr "" -#: ../../mod/settings.php:630 ../../mod/settings.php:943 +#: ../../mod/settings.php:630 ../../mod/settings.php:944 msgid "Email Address:" msgstr "" @@ -3823,324 +3832,328 @@ msgstr "" msgid "Remove Account" msgstr "" -#: ../../mod/settings.php:632 ../../mod/settings.php:1006 +#: ../../mod/settings.php:632 +msgid "Remove this account from this server including all its channels" +msgstr "" + +#: ../../mod/settings.php:633 ../../mod/settings.php:1007 msgid "Warning: This action is permanent and cannot be reversed." msgstr "" -#: ../../mod/settings.php:648 +#: ../../mod/settings.php:649 msgid "Off" msgstr "" -#: ../../mod/settings.php:648 +#: ../../mod/settings.php:649 msgid "On" msgstr "" -#: ../../mod/settings.php:655 +#: ../../mod/settings.php:656 msgid "Additional Features" msgstr "" -#: ../../mod/settings.php:680 +#: ../../mod/settings.php:681 msgid "Connector Settings" msgstr "" -#: ../../mod/settings.php:710 ../../mod/admin.php:399 +#: ../../mod/settings.php:711 ../../mod/admin.php:359 msgid "No special theme for mobile devices" msgstr "" -#: ../../mod/settings.php:719 +#: ../../mod/settings.php:720 #, php-format msgid "%s - (Experimental)" msgstr "" -#: ../../mod/settings.php:752 +#: ../../mod/settings.php:753 msgid "Display Settings" msgstr "" -#: ../../mod/settings.php:758 +#: ../../mod/settings.php:759 msgid "Display Theme:" msgstr "" -#: ../../mod/settings.php:759 +#: ../../mod/settings.php:760 msgid "Mobile Theme:" msgstr "" -#: ../../mod/settings.php:760 +#: ../../mod/settings.php:761 msgid "Enable user zoom on mobile devices" msgstr "" -#: ../../mod/settings.php:761 +#: ../../mod/settings.php:762 msgid "Update browser every xx seconds" msgstr "" -#: ../../mod/settings.php:761 +#: ../../mod/settings.php:762 msgid "Minimum of 10 seconds, no maximum" msgstr "" -#: ../../mod/settings.php:762 +#: ../../mod/settings.php:763 msgid "Maximum number of conversations to load at any time:" msgstr "" -#: ../../mod/settings.php:762 +#: ../../mod/settings.php:763 msgid "Maximum of 100 items" msgstr "" -#: ../../mod/settings.php:763 +#: ../../mod/settings.php:764 msgid "Don't show emoticons" msgstr "" -#: ../../mod/settings.php:764 +#: ../../mod/settings.php:765 msgid "System Page Layout Editor - (advanced)" msgstr "" -#: ../../mod/settings.php:800 +#: ../../mod/settings.php:801 msgid "Nobody except yourself" msgstr "" -#: ../../mod/settings.php:801 +#: ../../mod/settings.php:802 msgid "Only those you specifically allow" msgstr "" -#: ../../mod/settings.php:802 +#: ../../mod/settings.php:803 msgid "Approved connections" msgstr "" -#: ../../mod/settings.php:803 +#: ../../mod/settings.php:804 msgid "Any connections" msgstr "" -#: ../../mod/settings.php:804 +#: ../../mod/settings.php:805 msgid "Anybody on this website" msgstr "" -#: ../../mod/settings.php:805 +#: ../../mod/settings.php:806 msgid "Anybody in this network" msgstr "" -#: ../../mod/settings.php:806 +#: ../../mod/settings.php:807 msgid "Anybody authenticated" msgstr "" -#: ../../mod/settings.php:807 +#: ../../mod/settings.php:808 msgid "Anybody on the internet" msgstr "" -#: ../../mod/settings.php:884 +#: ../../mod/settings.php:885 msgid "Publish your default profile in the network directory" msgstr "" -#: ../../mod/settings.php:884 ../../mod/settings.php:889 -#: ../../mod/settings.php:960 ../../mod/api.php:106 ../../mod/profiles.php:566 -#: ../../mod/admin.php:429 +#: ../../mod/settings.php:885 ../../mod/settings.php:890 +#: ../../mod/settings.php:961 ../../mod/api.php:106 ../../mod/profiles.php:566 +#: ../../mod/admin.php:389 msgid "No" msgstr "" -#: ../../mod/settings.php:884 ../../mod/settings.php:889 -#: ../../mod/settings.php:960 ../../mod/api.php:105 ../../mod/profiles.php:565 -#: ../../mod/admin.php:431 +#: ../../mod/settings.php:885 ../../mod/settings.php:890 +#: ../../mod/settings.php:961 ../../mod/api.php:105 ../../mod/profiles.php:565 +#: ../../mod/admin.php:391 msgid "Yes" msgstr "" -#: ../../mod/settings.php:889 +#: ../../mod/settings.php:890 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: ../../mod/settings.php:893 ../../mod/profile_photo.php:365 +#: ../../mod/settings.php:894 ../../mod/profile_photo.php:365 msgid "or" msgstr "" -#: ../../mod/settings.php:898 +#: ../../mod/settings.php:899 msgid "Your channel address is" msgstr "" -#: ../../mod/settings.php:932 +#: ../../mod/settings.php:933 msgid "Channel Settings" msgstr "" -#: ../../mod/settings.php:941 +#: ../../mod/settings.php:942 msgid "Basic Settings" msgstr "" -#: ../../mod/settings.php:944 +#: ../../mod/settings.php:945 msgid "Your Timezone:" msgstr "" -#: ../../mod/settings.php:945 +#: ../../mod/settings.php:946 msgid "Default Post Location:" msgstr "" -#: ../../mod/settings.php:945 +#: ../../mod/settings.php:946 msgid "Geographical location to display on your posts" msgstr "" -#: ../../mod/settings.php:946 +#: ../../mod/settings.php:947 msgid "Use Browser Location:" msgstr "" -#: ../../mod/settings.php:948 +#: ../../mod/settings.php:949 msgid "Adult Content" msgstr "" -#: ../../mod/settings.php:948 +#: ../../mod/settings.php:949 msgid "" "This channel frequently or regularly publishes adult content. (Please tag " "any adult material and/or nudity with #NSFW)" msgstr "" -#: ../../mod/settings.php:950 +#: ../../mod/settings.php:951 msgid "Security and Privacy Settings" msgstr "" -#: ../../mod/settings.php:952 +#: ../../mod/settings.php:953 msgid "Hide my online presence" msgstr "" -#: ../../mod/settings.php:952 +#: ../../mod/settings.php:953 msgid "Prevents displaying in your profile that you are online" msgstr "" -#: ../../mod/settings.php:954 +#: ../../mod/settings.php:955 msgid "Simple Privacy Settings:" msgstr "" -#: ../../mod/settings.php:955 +#: ../../mod/settings.php:956 msgid "" "Very Public - extremely permissive (should be used with caution)" msgstr "" -#: ../../mod/settings.php:956 +#: ../../mod/settings.php:957 msgid "" "Typical - default public, privacy when desired (similar to social " "network permissions but with improved privacy)" msgstr "" -#: ../../mod/settings.php:957 +#: ../../mod/settings.php:958 msgid "Private - default private, never open or public" msgstr "" -#: ../../mod/settings.php:958 +#: ../../mod/settings.php:959 msgid "Blocked - default blocked to/from everybody" msgstr "" -#: ../../mod/settings.php:960 +#: ../../mod/settings.php:961 msgid "Allow others to tag your posts" msgstr "" -#: ../../mod/settings.php:960 +#: ../../mod/settings.php:961 msgid "" "Often used by the community to retro-actively flag inappropriate content" msgstr "" -#: ../../mod/settings.php:962 +#: ../../mod/settings.php:963 msgid "Advanced Privacy Settings" msgstr "" -#: ../../mod/settings.php:964 +#: ../../mod/settings.php:965 msgid "Expire other channel content after this many days" msgstr "" -#: ../../mod/settings.php:964 +#: ../../mod/settings.php:965 msgid "0 or blank prevents expiration" msgstr "" -#: ../../mod/settings.php:965 +#: ../../mod/settings.php:966 msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../mod/settings.php:965 +#: ../../mod/settings.php:966 msgid "May reduce spam activity" msgstr "" -#: ../../mod/settings.php:966 +#: ../../mod/settings.php:967 msgid "Default Post Permissions" msgstr "" -#: ../../mod/settings.php:978 +#: ../../mod/settings.php:979 msgid "Maximum private messages per day from unknown people:" msgstr "" -#: ../../mod/settings.php:978 +#: ../../mod/settings.php:979 msgid "Useful to reduce spamming" msgstr "" -#: ../../mod/settings.php:981 +#: ../../mod/settings.php:982 msgid "Notification Settings" msgstr "" -#: ../../mod/settings.php:982 +#: ../../mod/settings.php:983 msgid "By default post a status message when:" msgstr "" -#: ../../mod/settings.php:983 +#: ../../mod/settings.php:984 msgid "accepting a friend request" msgstr "" -#: ../../mod/settings.php:984 +#: ../../mod/settings.php:985 msgid "joining a forum/community" msgstr "" -#: ../../mod/settings.php:985 +#: ../../mod/settings.php:986 msgid "making an interesting profile change" msgstr "" -#: ../../mod/settings.php:986 +#: ../../mod/settings.php:987 msgid "Send a notification email when:" msgstr "" -#: ../../mod/settings.php:987 +#: ../../mod/settings.php:988 msgid "You receive a connection request" msgstr "" -#: ../../mod/settings.php:988 +#: ../../mod/settings.php:989 msgid "Your connections are confirmed" msgstr "" -#: ../../mod/settings.php:989 +#: ../../mod/settings.php:990 msgid "Someone writes on your profile wall" msgstr "" -#: ../../mod/settings.php:990 +#: ../../mod/settings.php:991 msgid "Someone writes a followup comment" msgstr "" -#: ../../mod/settings.php:991 +#: ../../mod/settings.php:992 msgid "You receive a private message" msgstr "" -#: ../../mod/settings.php:992 +#: ../../mod/settings.php:993 msgid "You receive a friend suggestion" msgstr "" -#: ../../mod/settings.php:993 +#: ../../mod/settings.php:994 msgid "You are tagged in a post" msgstr "" -#: ../../mod/settings.php:994 +#: ../../mod/settings.php:995 msgid "You are poked/prodded/etc. in a post" msgstr "" -#: ../../mod/settings.php:997 +#: ../../mod/settings.php:998 msgid "Advanced Account/Page Type Settings" msgstr "" -#: ../../mod/settings.php:998 +#: ../../mod/settings.php:999 msgid "Change the behaviour of this account for special situations" msgstr "" -#: ../../mod/settings.php:1001 +#: ../../mod/settings.php:1002 msgid "" "Please enable expert mode (in Settings > " "Additional features) to adjust!" msgstr "" -#: ../../mod/settings.php:1002 +#: ../../mod/settings.php:1003 msgid "Miscellaneous Settings" msgstr "" -#: ../../mod/settings.php:1004 +#: ../../mod/settings.php:1005 msgid "Personal menu to display in your channel pages" msgstr "" -#: ../../mod/settings.php:1005 +#: ../../mod/settings.php:1006 msgid "Remove this channel" msgstr "" @@ -4365,7 +4378,7 @@ msgstr "" msgid "Interests" msgstr "" -#: ../../mod/profiles.php:397 ../../mod/admin.php:902 +#: ../../mod/profiles.php:397 ../../mod/admin.php:862 msgid "Address" msgstr "" @@ -4381,177 +4394,177 @@ msgstr "" msgid "Hide your contact/friend list from viewers of this profile?" msgstr "" -#: ../../mod/profiles.php:588 +#: ../../mod/profiles.php:606 msgid "Edit Profile Details" msgstr "" -#: ../../mod/profiles.php:590 +#: ../../mod/profiles.php:608 msgid "View this profile" msgstr "" -#: ../../mod/profiles.php:592 +#: ../../mod/profiles.php:610 msgid "Change Profile Photo" msgstr "" -#: ../../mod/profiles.php:593 +#: ../../mod/profiles.php:611 msgid "Create a new profile using these settings" msgstr "" -#: ../../mod/profiles.php:594 +#: ../../mod/profiles.php:612 msgid "Clone this profile" msgstr "" -#: ../../mod/profiles.php:595 +#: ../../mod/profiles.php:613 msgid "Delete this profile" msgstr "" -#: ../../mod/profiles.php:597 +#: ../../mod/profiles.php:615 msgid "Import profile from file" msgstr "" -#: ../../mod/profiles.php:598 +#: ../../mod/profiles.php:616 msgid "Export profile to file" msgstr "" -#: ../../mod/profiles.php:599 +#: ../../mod/profiles.php:617 msgid "Profile Name:" msgstr "" -#: ../../mod/profiles.php:600 +#: ../../mod/profiles.php:618 msgid "Your Full Name:" msgstr "" -#: ../../mod/profiles.php:601 +#: ../../mod/profiles.php:619 msgid "Title/Description:" msgstr "" -#: ../../mod/profiles.php:602 +#: ../../mod/profiles.php:620 msgid "Your Gender:" msgstr "" -#: ../../mod/profiles.php:603 +#: ../../mod/profiles.php:621 #, php-format msgid "Birthday (%s):" msgstr "" -#: ../../mod/profiles.php:604 +#: ../../mod/profiles.php:622 msgid "Street Address:" msgstr "" -#: ../../mod/profiles.php:605 +#: ../../mod/profiles.php:623 msgid "Locality/City:" msgstr "" -#: ../../mod/profiles.php:606 +#: ../../mod/profiles.php:624 msgid "Postal/Zip Code:" msgstr "" -#: ../../mod/profiles.php:607 +#: ../../mod/profiles.php:625 msgid "Country:" msgstr "" -#: ../../mod/profiles.php:608 +#: ../../mod/profiles.php:626 msgid "Region/State:" msgstr "" -#: ../../mod/profiles.php:609 +#: ../../mod/profiles.php:627 msgid " Marital Status:" msgstr "" -#: ../../mod/profiles.php:610 +#: ../../mod/profiles.php:628 msgid "Who: (if applicable)" msgstr "" -#: ../../mod/profiles.php:611 +#: ../../mod/profiles.php:629 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "" -#: ../../mod/profiles.php:612 +#: ../../mod/profiles.php:630 msgid "Since [date]:" msgstr "" -#: ../../mod/profiles.php:614 +#: ../../mod/profiles.php:632 msgid "Homepage URL:" msgstr "" -#: ../../mod/profiles.php:617 +#: ../../mod/profiles.php:635 msgid "Religious Views:" msgstr "" -#: ../../mod/profiles.php:618 +#: ../../mod/profiles.php:636 msgid "Keywords:" msgstr "" -#: ../../mod/profiles.php:621 +#: ../../mod/profiles.php:639 msgid "Example: fishing photography software" msgstr "" -#: ../../mod/profiles.php:622 +#: ../../mod/profiles.php:640 msgid "Used in directory listings" msgstr "" -#: ../../mod/profiles.php:623 +#: ../../mod/profiles.php:641 msgid "Tell us about yourself..." msgstr "" -#: ../../mod/profiles.php:624 +#: ../../mod/profiles.php:642 msgid "Hobbies/Interests" msgstr "" -#: ../../mod/profiles.php:625 +#: ../../mod/profiles.php:643 msgid "Contact information and Social Networks" msgstr "" -#: ../../mod/profiles.php:626 +#: ../../mod/profiles.php:644 msgid "My other channels" msgstr "" -#: ../../mod/profiles.php:627 +#: ../../mod/profiles.php:645 msgid "Musical interests" msgstr "" -#: ../../mod/profiles.php:628 +#: ../../mod/profiles.php:646 msgid "Books, literature" msgstr "" -#: ../../mod/profiles.php:629 +#: ../../mod/profiles.php:647 msgid "Television" msgstr "" -#: ../../mod/profiles.php:630 +#: ../../mod/profiles.php:648 msgid "Film/dance/culture/entertainment" msgstr "" -#: ../../mod/profiles.php:631 +#: ../../mod/profiles.php:649 msgid "Love/romance" msgstr "" -#: ../../mod/profiles.php:632 +#: ../../mod/profiles.php:650 msgid "Work/employment" msgstr "" -#: ../../mod/profiles.php:633 +#: ../../mod/profiles.php:651 msgid "School/education" msgstr "" -#: ../../mod/profiles.php:639 +#: ../../mod/profiles.php:657 msgid "This is your default profile." msgstr "" -#: ../../mod/profiles.php:650 ../../mod/directory.php:143 +#: ../../mod/profiles.php:668 ../../mod/directory.php:143 #: ../../mod/dirprofile.php:92 msgid "Age: " msgstr "" -#: ../../mod/profiles.php:692 +#: ../../mod/profiles.php:711 msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/profiles.php:693 +#: ../../mod/profiles.php:712 msgid "Add profile things" msgstr "" -#: ../../mod/profiles.php:694 +#: ../../mod/profiles.php:713 msgid "Include desirable objects in your profile" msgstr "" @@ -4731,7 +4744,7 @@ msgstr "" msgid "I am over 13 years of age and accept the %s for this website" msgstr "" -#: ../../mod/register.php:204 ../../mod/admin.php:452 +#: ../../mod/register.php:204 ../../mod/admin.php:412 msgid "Registration" msgstr "" @@ -4986,20 +4999,20 @@ msgstr "" msgid "Only show hidden connections" msgstr "" -#: ../../mod/connections.php:368 +#: ../../mod/connections.php:371 #, php-format msgid "%1$s [%2$s]" msgstr "" -#: ../../mod/connections.php:369 +#: ../../mod/connections.php:372 msgid "Edit contact" msgstr "" -#: ../../mod/connections.php:390 +#: ../../mod/connections.php:393 msgid "Search your connections" msgstr "" -#: ../../mod/connections.php:391 +#: ../../mod/connections.php:394 msgid "Finding: " msgstr "" @@ -5091,12 +5104,12 @@ msgid "View recent posts and comments" msgstr "" #: ../../mod/connedit.php:414 ../../mod/connedit.php:557 -#: ../../mod/admin.php:769 +#: ../../mod/admin.php:729 msgid "Unblock" msgstr "" #: ../../mod/connedit.php:414 ../../mod/connedit.php:557 -#: ../../mod/admin.php:768 +#: ../../mod/admin.php:728 msgid "Block" msgstr "" @@ -6334,7 +6347,7 @@ msgstr "" msgid "Theme settings updated." msgstr "" -#: ../../mod/admin.php:97 ../../mod/admin.php:450 +#: ../../mod/admin.php:97 ../../mod/admin.php:410 msgid "Site" msgstr "" @@ -6342,19 +6355,19 @@ msgstr "" msgid "Accounts" msgstr "" -#: ../../mod/admin.php:99 ../../mod/admin.php:894 +#: ../../mod/admin.php:99 ../../mod/admin.php:854 msgid "Channels" msgstr "" -#: ../../mod/admin.php:100 ../../mod/admin.php:985 ../../mod/admin.php:1027 +#: ../../mod/admin.php:100 ../../mod/admin.php:945 ../../mod/admin.php:987 msgid "Plugins" msgstr "" -#: ../../mod/admin.php:101 ../../mod/admin.php:1190 ../../mod/admin.php:1226 +#: ../../mod/admin.php:101 ../../mod/admin.php:1150 ../../mod/admin.php:1186 msgid "Themes" msgstr "" -#: ../../mod/admin.php:102 ../../mod/admin.php:550 +#: ../../mod/admin.php:102 ../../mod/admin.php:510 msgid "Server" msgstr "" @@ -6366,7 +6379,7 @@ msgstr "" msgid "DB updates" msgstr "" -#: ../../mod/admin.php:118 ../../mod/admin.php:125 ../../mod/admin.php:1313 +#: ../../mod/admin.php:118 ../../mod/admin.php:125 ../../mod/admin.php:1273 msgid "Logs" msgstr "" @@ -6382,10 +6395,10 @@ msgstr "" msgid "Message queues" msgstr "" -#: ../../mod/admin.php:211 ../../mod/admin.php:449 ../../mod/admin.php:549 -#: ../../mod/admin.php:758 ../../mod/admin.php:893 ../../mod/admin.php:984 -#: ../../mod/admin.php:1026 ../../mod/admin.php:1189 ../../mod/admin.php:1225 -#: ../../mod/admin.php:1312 +#: ../../mod/admin.php:211 ../../mod/admin.php:409 ../../mod/admin.php:509 +#: ../../mod/admin.php:718 ../../mod/admin.php:853 ../../mod/admin.php:944 +#: ../../mod/admin.php:986 ../../mod/admin.php:1149 ../../mod/admin.php:1185 +#: ../../mod/admin.php:1272 msgid "Administration" msgstr "" @@ -6397,7 +6410,7 @@ msgstr "" msgid "Registered users" msgstr "" -#: ../../mod/admin.php:216 ../../mod/admin.php:553 +#: ../../mod/admin.php:216 ../../mod/admin.php:513 msgid "Pending registrations" msgstr "" @@ -6405,520 +6418,523 @@ msgstr "" msgid "Version" msgstr "" -#: ../../mod/admin.php:219 ../../mod/admin.php:554 +#: ../../mod/admin.php:219 ../../mod/admin.php:514 msgid "Active plugins" msgstr "" -#: ../../mod/admin.php:370 +#: ../../mod/admin.php:330 msgid "Site settings updated." msgstr "" -#: ../../mod/admin.php:401 +#: ../../mod/admin.php:361 msgid "No special theme for accessibility" msgstr "" -#: ../../mod/admin.php:430 +#: ../../mod/admin.php:390 msgid "Yes - with approval" msgstr "" -#: ../../mod/admin.php:436 +#: ../../mod/admin.php:396 msgid "My site is not a public server" msgstr "" -#: ../../mod/admin.php:437 +#: ../../mod/admin.php:397 msgid "My site has paid access only" msgstr "" -#: ../../mod/admin.php:438 +#: ../../mod/admin.php:398 msgid "My site has free access only" msgstr "" -#: ../../mod/admin.php:439 +#: ../../mod/admin.php:399 msgid "My site offers free accounts with optional paid upgrades" msgstr "" -#: ../../mod/admin.php:453 +#: ../../mod/admin.php:413 msgid "File upload" msgstr "" -#: ../../mod/admin.php:454 +#: ../../mod/admin.php:414 msgid "Policies" msgstr "" -#: ../../mod/admin.php:459 +#: ../../mod/admin.php:419 msgid "Site name" msgstr "" -#: ../../mod/admin.php:460 +#: ../../mod/admin.php:420 msgid "Banner/Logo" msgstr "" -#: ../../mod/admin.php:461 +#: ../../mod/admin.php:421 msgid "Administrator Information" msgstr "" -#: ../../mod/admin.php:461 +#: ../../mod/admin.php:421 msgid "" "Contact information for site administrators. Displayed on siteinfo page. " "BBCode can be used here" msgstr "" -#: ../../mod/admin.php:462 +#: ../../mod/admin.php:422 msgid "System language" msgstr "" -#: ../../mod/admin.php:463 +#: ../../mod/admin.php:423 msgid "System theme" msgstr "" -#: ../../mod/admin.php:463 +#: ../../mod/admin.php:423 msgid "" "Default system theme - may be over-ridden by user profiles - change theme settings" msgstr "" -#: ../../mod/admin.php:464 +#: ../../mod/admin.php:424 msgid "Mobile system theme" msgstr "" -#: ../../mod/admin.php:464 +#: ../../mod/admin.php:424 msgid "Theme for mobile devices" msgstr "" -#: ../../mod/admin.php:465 +#: ../../mod/admin.php:425 msgid "Accessibility system theme" msgstr "" -#: ../../mod/admin.php:465 +#: ../../mod/admin.php:425 msgid "Accessibility theme" msgstr "" -#: ../../mod/admin.php:466 +#: ../../mod/admin.php:426 msgid "Channel to use for this website's static pages" msgstr "" -#: ../../mod/admin.php:466 +#: ../../mod/admin.php:426 msgid "Site Channel" msgstr "" -#: ../../mod/admin.php:468 +#: ../../mod/admin.php:427 +msgid "Allow Feeds as Connections" +msgstr "" + +#: ../../mod/admin.php:427 +msgid "(Heavy system resource usage)" +msgstr "" + +#: ../../mod/admin.php:428 msgid "Maximum image size" msgstr "" -#: ../../mod/admin.php:468 +#: ../../mod/admin.php:428 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "" -#: ../../mod/admin.php:469 +#: ../../mod/admin.php:429 msgid "Does this site allow new member registration?" msgstr "" -#: ../../mod/admin.php:470 +#: ../../mod/admin.php:430 msgid "Which best describes the types of account offered by this hub?" msgstr "" -#: ../../mod/admin.php:471 +#: ../../mod/admin.php:431 msgid "Register text" msgstr "" -#: ../../mod/admin.php:471 +#: ../../mod/admin.php:431 msgid "Will be displayed prominently on the registration page." msgstr "" -#: ../../mod/admin.php:472 +#: ../../mod/admin.php:432 msgid "Accounts abandoned after x days" msgstr "" -#: ../../mod/admin.php:472 +#: ../../mod/admin.php:432 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: ../../mod/admin.php:473 +#: ../../mod/admin.php:433 msgid "Allowed friend domains" msgstr "" -#: ../../mod/admin.php:473 +#: ../../mod/admin.php:433 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:474 +#: ../../mod/admin.php:434 msgid "Allowed email domains" msgstr "" -#: ../../mod/admin.php:474 +#: ../../mod/admin.php:434 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:475 +#: ../../mod/admin.php:435 msgid "Block public" msgstr "" -#: ../../mod/admin.php:475 +#: ../../mod/admin.php:435 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:476 +#: ../../mod/admin.php:436 msgid "Force publish" msgstr "" -#: ../../mod/admin.php:476 +#: ../../mod/admin.php:436 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "" -#: ../../mod/admin.php:477 +#: ../../mod/admin.php:437 msgid "Disable discovery tab" msgstr "" -#: ../../mod/admin.php:477 +#: ../../mod/admin.php:437 msgid "" "Remove the tab in the network view with public content pulled from sources " "chosen for this site." msgstr "" -#: ../../mod/admin.php:478 +#: ../../mod/admin.php:438 msgid "No login on Homepage" msgstr "" -#: ../../mod/admin.php:478 +#: ../../mod/admin.php:438 msgid "" "Check to hide the login form from your sites homepage when visitors arrive " "who are not logged in (e.g. when you put the content of the homepage in via " "the site channel)." msgstr "" -#: ../../mod/admin.php:480 +#: ../../mod/admin.php:440 msgid "Proxy user" msgstr "" -#: ../../mod/admin.php:481 +#: ../../mod/admin.php:441 msgid "Proxy URL" msgstr "" -#: ../../mod/admin.php:482 +#: ../../mod/admin.php:442 msgid "Network timeout" msgstr "" -#: ../../mod/admin.php:482 +#: ../../mod/admin.php:442 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "" -#: ../../mod/admin.php:483 +#: ../../mod/admin.php:443 msgid "Delivery interval" msgstr "" -#: ../../mod/admin.php:483 +#: ../../mod/admin.php:443 msgid "" "Delay background delivery processes by this many seconds to reduce system " "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " "for large dedicated servers." msgstr "" -#: ../../mod/admin.php:484 +#: ../../mod/admin.php:444 msgid "Poll interval" msgstr "" -#: ../../mod/admin.php:484 +#: ../../mod/admin.php:444 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "" -#: ../../mod/admin.php:485 +#: ../../mod/admin.php:445 msgid "Maximum Load Average" msgstr "" -#: ../../mod/admin.php:485 +#: ../../mod/admin.php:445 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "" -#: ../../mod/admin.php:541 +#: ../../mod/admin.php:501 msgid "No server found" msgstr "" -#: ../../mod/admin.php:548 ../../mod/admin.php:772 +#: ../../mod/admin.php:508 ../../mod/admin.php:732 msgid "ID" msgstr "" -#: ../../mod/admin.php:548 +#: ../../mod/admin.php:508 msgid "for channel" msgstr "" -#: ../../mod/admin.php:548 +#: ../../mod/admin.php:508 msgid "on server" msgstr "" -#: ../../mod/admin.php:548 +#: ../../mod/admin.php:508 msgid "Status" msgstr "" -#: ../../mod/admin.php:569 +#: ../../mod/admin.php:529 msgid "Update has been marked successful" msgstr "" -#: ../../mod/admin.php:579 +#: ../../mod/admin.php:539 #, php-format msgid "Executing %s failed. Check system logs." msgstr "" -#: ../../mod/admin.php:582 +#: ../../mod/admin.php:542 #, php-format msgid "Update %s was successfully applied." msgstr "" -#: ../../mod/admin.php:586 +#: ../../mod/admin.php:546 #, php-format msgid "Update %s did not return a status. Unknown if it succeeded." msgstr "" -#: ../../mod/admin.php:589 +#: ../../mod/admin.php:549 #, php-format msgid "Update function %s could not be found." msgstr "" -#: ../../mod/admin.php:604 +#: ../../mod/admin.php:564 msgid "No failed updates." msgstr "" -#: ../../mod/admin.php:608 +#: ../../mod/admin.php:568 msgid "Failed Updates" msgstr "" -#: ../../mod/admin.php:610 +#: ../../mod/admin.php:570 msgid "Mark success (if update was manually applied)" msgstr "" -#: ../../mod/admin.php:611 +#: ../../mod/admin.php:571 msgid "Attempt to execute this update step automatically" msgstr "" -#: ../../mod/admin.php:637 +#: ../../mod/admin.php:597 #, php-format msgid "%s user blocked/unblocked" msgid_plural "%s users blocked/unblocked" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:644 +#: ../../mod/admin.php:604 #, php-format msgid "%s user deleted" msgid_plural "%s users deleted" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:675 +#: ../../mod/admin.php:635 msgid "Account not found" msgstr "" -#: ../../mod/admin.php:686 -#, php-format -msgid "User '%s' deleted" -msgstr "" - -#: ../../mod/admin.php:695 +#: ../../mod/admin.php:655 #, php-format msgid "User '%s' unblocked" msgstr "" -#: ../../mod/admin.php:695 +#: ../../mod/admin.php:655 #, php-format msgid "User '%s' blocked" msgstr "" -#: ../../mod/admin.php:759 ../../mod/admin.php:771 +#: ../../mod/admin.php:719 ../../mod/admin.php:731 msgid "Users" msgstr "" -#: ../../mod/admin.php:761 ../../mod/admin.php:896 +#: ../../mod/admin.php:721 ../../mod/admin.php:856 msgid "select all" msgstr "" -#: ../../mod/admin.php:762 +#: ../../mod/admin.php:722 msgid "User registrations waiting for confirm" msgstr "" -#: ../../mod/admin.php:763 +#: ../../mod/admin.php:723 msgid "Request date" msgstr "" -#: ../../mod/admin.php:764 +#: ../../mod/admin.php:724 msgid "No registrations." msgstr "" -#: ../../mod/admin.php:765 +#: ../../mod/admin.php:725 msgid "Approve" msgstr "" -#: ../../mod/admin.php:766 +#: ../../mod/admin.php:726 msgid "Deny" msgstr "" -#: ../../mod/admin.php:772 +#: ../../mod/admin.php:732 msgid "Register date" msgstr "" -#: ../../mod/admin.php:772 +#: ../../mod/admin.php:732 msgid "Last login" msgstr "" -#: ../../mod/admin.php:772 +#: ../../mod/admin.php:732 msgid "Expires" msgstr "" -#: ../../mod/admin.php:772 +#: ../../mod/admin.php:732 msgid "Service Class" msgstr "" -#: ../../mod/admin.php:774 +#: ../../mod/admin.php:734 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:775 +#: ../../mod/admin.php:735 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:808 +#: ../../mod/admin.php:768 #, php-format msgid "%s channel censored/uncensored" msgid_plural "%s channelss censored/uncensored" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:815 +#: ../../mod/admin.php:775 #, php-format msgid "%s channel deleted" msgid_plural "%s channels deleted" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:834 +#: ../../mod/admin.php:794 msgid "Channel not found" msgstr "" -#: ../../mod/admin.php:845 +#: ../../mod/admin.php:805 #, php-format msgid "Channel '%s' deleted" msgstr "" -#: ../../mod/admin.php:855 +#: ../../mod/admin.php:815 #, php-format msgid "Channel '%s' uncensored" msgstr "" -#: ../../mod/admin.php:855 +#: ../../mod/admin.php:815 #, php-format msgid "Channel '%s' censored" msgstr "" -#: ../../mod/admin.php:898 +#: ../../mod/admin.php:858 msgid "Censor" msgstr "" -#: ../../mod/admin.php:899 +#: ../../mod/admin.php:859 msgid "Uncensor" msgstr "" -#: ../../mod/admin.php:902 +#: ../../mod/admin.php:862 msgid "UID" msgstr "" -#: ../../mod/admin.php:904 +#: ../../mod/admin.php:864 msgid "" "Selected channels will be deleted!\\n\\nEverything that was posted in these " "channels on this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:905 +#: ../../mod/admin.php:865 msgid "" "The channel {0} will be deleted!\\n\\nEverything that was posted in this " "channel on this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:944 +#: ../../mod/admin.php:904 #, php-format msgid "Plugin %s disabled." msgstr "" -#: ../../mod/admin.php:948 +#: ../../mod/admin.php:908 #, php-format msgid "Plugin %s enabled." msgstr "" -#: ../../mod/admin.php:958 ../../mod/admin.php:1160 +#: ../../mod/admin.php:918 ../../mod/admin.php:1120 msgid "Disable" msgstr "" -#: ../../mod/admin.php:960 ../../mod/admin.php:1162 +#: ../../mod/admin.php:920 ../../mod/admin.php:1122 msgid "Enable" msgstr "" -#: ../../mod/admin.php:986 ../../mod/admin.php:1191 +#: ../../mod/admin.php:946 ../../mod/admin.php:1151 msgid "Toggle" msgstr "" -#: ../../mod/admin.php:994 ../../mod/admin.php:1201 +#: ../../mod/admin.php:954 ../../mod/admin.php:1161 msgid "Author: " msgstr "" -#: ../../mod/admin.php:995 ../../mod/admin.php:1202 +#: ../../mod/admin.php:955 ../../mod/admin.php:1162 msgid "Maintainer: " msgstr "" -#: ../../mod/admin.php:1124 +#: ../../mod/admin.php:1084 msgid "No themes found." msgstr "" -#: ../../mod/admin.php:1183 +#: ../../mod/admin.php:1143 msgid "Screenshot" msgstr "" -#: ../../mod/admin.php:1231 +#: ../../mod/admin.php:1191 msgid "[Experimental]" msgstr "" -#: ../../mod/admin.php:1232 +#: ../../mod/admin.php:1192 msgid "[Unsupported]" msgstr "" -#: ../../mod/admin.php:1259 +#: ../../mod/admin.php:1219 msgid "Log settings updated." msgstr "" -#: ../../mod/admin.php:1315 +#: ../../mod/admin.php:1275 msgid "Clear" msgstr "" -#: ../../mod/admin.php:1321 +#: ../../mod/admin.php:1281 msgid "Debugging" msgstr "" -#: ../../mod/admin.php:1322 +#: ../../mod/admin.php:1282 msgid "Log file" msgstr "" -#: ../../mod/admin.php:1322 +#: ../../mod/admin.php:1282 msgid "" "Must be writable by web server. Relative to your Red top-level directory." msgstr "" -#: ../../mod/admin.php:1323 +#: ../../mod/admin.php:1283 msgid "Log level" msgstr "" @@ -7137,16 +7153,16 @@ msgstr "" msgid "Executable content type not permitted to this channel." msgstr "" -#: ../../mod/item.php:850 +#: ../../mod/item.php:849 msgid "System error. Post not saved." msgstr "" -#: ../../mod/item.php:1302 +#: ../../mod/item.php:1301 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "" -#: ../../mod/item.php:1308 +#: ../../mod/item.php:1307 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "" @@ -7202,11 +7218,11 @@ msgstr "" msgid "Thank you." msgstr "" -#: ../../mod/lockview.php:35 ../../mod/lockview.php:41 +#: ../../mod/lockview.php:30 msgid "Remote privacy information not available." msgstr "" -#: ../../mod/lockview.php:50 +#: ../../mod/lockview.php:51 msgid "Visible to:" msgstr "" @@ -7247,7 +7263,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:85 ../../boot.php:1508 +#: ../../mod/lostpass.php:85 ../../boot.php:1503 msgid "Password Reset" msgstr "" @@ -7395,10 +7411,6 @@ msgstr "" msgid "Create a new channel" msgstr "" -#: ../../mod/manage.php:148 -msgid "Channel Manager" -msgstr "" - #: ../../mod/manage.php:149 msgid "Current Channel" msgstr "" @@ -7652,26 +7664,6 @@ msgstr "" msgid "View Results" msgstr "" -#: ../../mod/frphotos.php:79 -msgid "Friendica Photo Album Import" -msgstr "" - -#: ../../mod/frphotos.php:80 -msgid "This will import all your Friendica photo albums to this Red channel." -msgstr "" - -#: ../../mod/frphotos.php:81 -msgid "Friendica Server base URL" -msgstr "" - -#: ../../mod/frphotos.php:82 -msgid "Friendica Login Username" -msgstr "" - -#: ../../mod/frphotos.php:83 -msgid "Friendica Login Password" -msgstr "" - #: ../../mod/removeaccount.php:30 msgid "" "Account removals are not allowed within 48 hours of changing the account " @@ -7985,41 +7977,41 @@ msgstr "" msgid "Are you a clean desk or a messy desk person?" msgstr "" -#: ../../boot.php:1296 +#: ../../boot.php:1291 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../boot.php:1299 +#: ../../boot.php:1294 #, php-format msgid "Update Error at %s" msgstr "" -#: ../../boot.php:1473 +#: ../../boot.php:1468 msgid "" "Create an account to access services and applications within the Red Matrix" msgstr "" -#: ../../boot.php:1501 +#: ../../boot.php:1496 msgid "Password" msgstr "" -#: ../../boot.php:1502 +#: ../../boot.php:1497 msgid "Remember me" msgstr "" -#: ../../boot.php:1507 +#: ../../boot.php:1502 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:1572 +#: ../../boot.php:1567 msgid "permission denied" msgstr "" -#: ../../boot.php:1573 +#: ../../boot.php:1568 msgid "Got Zot?" msgstr "" -#: ../../boot.php:2003 +#: ../../boot.php:1998 msgid "toggle mobile" msgstr "" diff --git a/version.inc b/version.inc index 8936c7bc8..66e432ce0 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-08-21.774 +2014-08-22.775 -- cgit v1.2.3 From 2dc705d9a04df4b5d5415a42ddd2cb86c99222e8 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 22 Aug 2014 15:51:48 -0700 Subject: issue #571 - use feed/nickname?top=1 --- include/items.php | 7 ++++++- mod/feed.php | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/include/items.php b/include/items.php index 783c67752..c0bc0ef83 100755 --- a/include/items.php +++ b/include/items.php @@ -400,6 +400,7 @@ function get_public_feed($channel,$params) { $params['records'] = ((x($params,'records')) ? $params['records'] : 40); $params['direction'] = ((x($params,'direction')) ? $params['direction'] : 'desc'); $params['pages'] = ((x($params,'pages')) ? intval($params['pages']) : 0); + $params['top'] = ((x($params,'top')) ? intval($params['top']) : 0); switch($params['type']) { case 'json': @@ -440,7 +441,8 @@ function get_feed_for($channel, $observer_hash, $params) { 'records' => $params['records'], // FIXME 'direction' => $params['direction'], // FIXME 'pages' => $params['pages'], - 'order' => 'post' + 'order' => 'post', + 'top' => $params['top'] ), $channel, $observer_hash, CLIENT_MODE_NORMAL, get_app()->module); @@ -4186,6 +4188,9 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C $parents_str = ids_to_querystr($r,'item_id'); + if($arr['top']) + $sql_extra = ' and id = parent ' . $sql_extra; + $items = q("SELECT item.*, item.id AS item_id FROM item WHERE $item_uids $item_restrict AND item.parent IN ( %s ) diff --git a/mod/feed.php b/mod/feed.php index 0f8296ed1..fdbe4db8c 100644 --- a/mod/feed.php +++ b/mod/feed.php @@ -11,6 +11,7 @@ function feed_init(&$a) { $params['end'] = ((x($_REQUEST,'date_end')) ? $_REQUEST['date_end'] : ''); $params['type'] = ((stristr(argv(0),'json')) ? 'json' : 'xml'); $params['pages'] = ((x($_REQUEST,'pages')) ? intval($_REQUEST['pages']) : 0); + $params['top'] = ((x($_REQUEST,'top')) ? intval($_REQUEST['top']) : 0); $channel = ''; if(argc() > 1) { -- cgit v1.2.3 From 38f931618c779a0e10fb2549af8f35ac1c700268 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 22 Aug 2014 17:34:18 -0700 Subject: "false" issue --- include/items.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/include/items.php b/include/items.php index c0bc0ef83..12e00ddc9 100755 --- a/include/items.php +++ b/include/items.php @@ -2672,6 +2672,7 @@ function tgroup_check($uid,$item) { function start_delivery_chain($channel,$item,$item_id,$parent) { + // Change this copy of the post to a forum head message and deliver to all the tgroup members // also reset all the privacy bits to the forum default permissions @@ -2708,16 +2709,20 @@ function start_delivery_chain($channel,$item,$item_id,$parent) { if(!($flag_bits & ITEM_OBSCURED)) { $key = get_config('system','pubkey'); $flag_bits = $flag_bits|ITEM_OBSCURED; - $title = json_encode(aes_encapsulate($title,$key)); - $body = json_encode(aes_encapsulate($body,$key)); + if($title) + $title = json_encode(aes_encapsulate($title,$key)); + if($body) + $body = json_encode(aes_encapsulate($body,$key)); } } else { if($flag_bits & ITEM_OBSCURED) { $key = get_config('system','prvkey'); $flag_bits = $flag_bits ^ ITEM_OBSCURED; - $title = json_encode(aes_unencapsulate($title,$key)); - $body = json_encode(aes_unencapsulate($body,$key)); + if($title) + $title = crypto_unencapsulate(json_decode($title,true),$key); + if($body) + $body = crypto_unencapsulate(json_decode($body,true),$key); } } -- cgit v1.2.3 From 255ab8e9c9b86c7d38e03eb0d4913a823086366d Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 22 Aug 2014 18:01:21 -0700 Subject: issue #573 - this may not fix everything in that issue but should resolve some of it. --- include/items.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/items.php b/include/items.php index 12e00ddc9..1f2b33579 100755 --- a/include/items.php +++ b/include/items.php @@ -296,6 +296,9 @@ function post_activity_item($arr) { return $ret; } + $arr['public_policy'] = ((x($_REQUEST,'public_policy')) ? escape_tags($_REQUEST['public_policy']) : map_scope($channel['channel_r_stream'],true)); + if($arr['public_policy']) + $arr['item_private'] = 1; if(! array_key_exists('mimetype',$arr)) $arr['mimetype'] = 'text/bbcode'; -- cgit v1.2.3 From 9196c9eef091e7f4a41fbc9452521d6ca2de55a3 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 22 Aug 2014 21:37:08 -0700 Subject: We really can't do this without a hubloc. I was hoping we could, but notifier is setup to take hublocs, not xchans. --- boot.php | 2 +- include/notifier.php | 2 +- include/zot.php | 5 +++-- install/database.sql | 2 ++ install/update.php | 14 +++++++++++++- mod/import.php | 5 +++-- 6 files changed, 23 insertions(+), 7 deletions(-) diff --git a/boot.php b/boot.php index f8bd29f37..a6e5fc0b4 100755 --- a/boot.php +++ b/boot.php @@ -47,7 +47,7 @@ define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1123 ); +define ( 'DB_UPDATE_VERSION', 1124 ); define ( 'EOL', '
                ' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/include/notifier.php b/include/notifier.php index 9d5c7cb8e..180a538bc 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -382,7 +382,7 @@ function notifier_run($argv, $argc){ $env_recips = (($private) ? array() : null); - $details = q("select xchan_hash, xchan_instance_url, xchan_addr, xchan_guid, xchan_guid_sig from xchan where xchan_hash in (" . implode(',',$recipients) . ")"); + $details = q("select xchan_hash, xchan_instance_url, xchan_network, xchan_addr, xchan_guid, xchan_guid_sig from xchan where xchan_hash in (" . implode(',',$recipients) . ")"); $recip_list = array(); diff --git a/include/zot.php b/include/zot.php index 41d0bc1eb..a155b2588 100644 --- a/include/zot.php +++ b/include/zot.php @@ -959,12 +959,13 @@ function import_xchan($arr,$ud_flags = UPDATE_FLAGS_UPDATED, $ud_arr = null) { ); } logger('import_xchan: new hub: ' . $location['url']); - $r = q("insert into hubloc ( hubloc_guid, hubloc_guid_sig, hubloc_hash, hubloc_addr, hubloc_flags, hubloc_url, hubloc_url_sig, hubloc_host, hubloc_callback, hubloc_sitekey, hubloc_updated, hubloc_connected) - values ( '%s','%s','%s','%s', %d ,'%s','%s','%s','%s','%s','%s','%s')", + $r = q("insert into hubloc ( hubloc_guid, hubloc_guid_sig, hubloc_hash, hubloc_addr, hubloc_network, hubloc_flags, hubloc_url, hubloc_url_sig, hubloc_host, hubloc_callback, hubloc_sitekey, hubloc_updated, hubloc_connected) + values ( '%s','%s','%s','%s', '%s', %d ,'%s','%s','%s','%s','%s','%s','%s')", dbesc($arr['guid']), dbesc($arr['guid_sig']), dbesc($xchan_hash), dbesc($location['address']), + dbesc('zot'), intval((intval($location['primary'])) ? HUBLOC_FLAGS_PRIMARY : 0), dbesc($location['url']), dbesc($location['url_sig']), diff --git a/install/database.sql b/install/database.sql index 2791f94be..104f145e5 100644 --- a/install/database.sql +++ b/install/database.sql @@ -442,6 +442,7 @@ CREATE TABLE IF NOT EXISTS `hubloc` ( `hubloc_guid_sig` text NOT NULL, `hubloc_hash` char(255) NOT NULL, `hubloc_addr` char(255) NOT NULL DEFAULT '', + `hubloc_network` char(32) NOT NULL DEFAULT '', `hubloc_flags` int(10) unsigned NOT NULL DEFAULT '0', `hubloc_status` int(10) unsigned NOT NULL DEFAULT '0', `hubloc_url` char(255) NOT NULL DEFAULT '', @@ -459,6 +460,7 @@ CREATE TABLE IF NOT EXISTS `hubloc` ( KEY `hubloc_connect` (`hubloc_connect`), KEY `hubloc_host` (`hubloc_host`), KEY `hubloc_addr` (`hubloc_addr`), + KEY `hubloc_network` (`hubloc_network`), KEY `hubloc_updated` (`hubloc_updated`), KEY `hubloc_connected` (`hubloc_connected`), KEY `hubloc_status` (`hubloc_status`) diff --git a/install/update.php b/install/update.php index f7d6441dc..9e184428e 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ get_hostname()), + dbesc('zot'), intval(($seize) ? HUBLOC_FLAGS_PRIMARY : 0), dbesc(z_root()), dbesc(base64url_encode(rsa_sign(z_root(),$channel['channel_prvkey']))), -- cgit v1.2.3 From 5d2dc4e8fdb62785cf306496c7cdcefb31d4a0ed Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 23 Aug 2014 02:45:21 -0700 Subject: switch everything over to crypto_encapsulate() --- include/items.php | 8 ++++---- mod/item.php | 4 ++-- mod/zfinger.php | 2 +- version.inc | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/items.php b/include/items.php index 1f2b33579..bdf4007af 100755 --- a/include/items.php +++ b/include/items.php @@ -318,9 +318,9 @@ function post_activity_item($arr) { $key = get_config('system','pubkey'); $arr['item_flags'] = $arr['item_flags'] | ITEM_OBSCURED; if($arr['title']) - $arr['title'] = json_encode(aes_encapsulate($arr['title'],$key)); + $arr['title'] = json_encode(crypto_encapsulate($arr['title'],$key)); if($arr['body']) - $arr['body'] = json_encode(aes_encapsulate($arr['body'],$key)); + $arr['body'] = json_encode(crypto_encapsulate($arr['body'],$key)); } $arr['mid'] = ((x($arr,'mid')) ? $arr['mid'] : item_message_id()); @@ -2713,9 +2713,9 @@ function start_delivery_chain($channel,$item,$item_id,$parent) { $key = get_config('system','pubkey'); $flag_bits = $flag_bits|ITEM_OBSCURED; if($title) - $title = json_encode(aes_encapsulate($title,$key)); + $title = json_encode(crypto_encapsulate($title,$key)); if($body) - $body = json_encode(aes_encapsulate($body,$key)); + $body = json_encode(crypto_encapsulate($body,$key)); } } else { diff --git a/mod/item.php b/mod/item.php index 27691eb4f..df51c8a92 100644 --- a/mod/item.php +++ b/mod/item.php @@ -768,9 +768,9 @@ function item_post(&$a) { $key = get_config('system','pubkey'); $datarray['item_flags'] = $datarray['item_flags'] | ITEM_OBSCURED; if($datarray['title']) - $datarray['title'] = json_encode(aes_encapsulate($datarray['title'],$key)); + $datarray['title'] = json_encode(crypto_encapsulate($datarray['title'],$key)); if($datarray['body']) - $datarray['body'] = json_encode(aes_encapsulate($datarray['body'],$key)); + $datarray['body'] = json_encode(crypto_encapsulate($datarray['body'],$key)); } if($orig_post) { diff --git a/mod/zfinger.php b/mod/zfinger.php index cf8a3fda1..ef55085d6 100644 --- a/mod/zfinger.php +++ b/mod/zfinger.php @@ -203,7 +203,7 @@ function zfinger_init(&$a) { $permissions['connected'] = true; } - $ret['permissions'] = (($ztarget && $zkey) ? aes_encapsulate(json_encode($permissions),$zkey) : $permissions); + $ret['permissions'] = (($ztarget && $zkey) ? crypto_encapsulate(json_encode($permissions),$zkey) : $permissions); if($permissions['view_profile']) $ret['profile'] = $profile; diff --git a/version.inc b/version.inc index 66e432ce0..416f0207c 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-08-22.775 +2014-08-23.776 -- cgit v1.2.3 From ceabf2d4885e6c09ae5372ef92cef9825466183a Mon Sep 17 00:00:00 2001 From: Jeroen Date: Sat, 23 Aug 2014 17:01:19 +0000 Subject: Minor adjustment photo view + update nl (at 100\%\!) --- view/css/mod_photos.css | 2 +- view/nl/follow_notify_eml.tpl | 2 +- view/nl/friend_complete_eml.tpl | 24 +- view/nl/intro_complete_eml.tpl | 28 +- view/nl/lostpass_eml.tpl | 2 +- view/nl/messages.po | 1330 ++++++++++++++++++------------------ view/nl/passchanged_eml.tpl | 2 +- view/nl/register_open_eml.tpl | 12 +- view/nl/register_verify_eml.tpl | 19 +- view/nl/register_verify_member.tpl | 24 + view/nl/strings.php | 20 +- 11 files changed, 739 insertions(+), 726 deletions(-) create mode 100644 view/nl/register_verify_member.tpl diff --git a/view/css/mod_photos.css b/view/css/mod_photos.css index 12032d4c1..fa3b5b35a 100644 --- a/view/css/mod_photos.css +++ b/view/css/mod_photos.css @@ -13,7 +13,7 @@ #photo-view-wrapper { float:left; - min-width: 300px; + min-width: 500px; overflow: hidden; } diff --git a/view/nl/follow_notify_eml.tpl b/view/nl/follow_notify_eml.tpl index 830951e4d..a80fe087c 100644 --- a/view/nl/follow_notify_eml.tpl +++ b/view/nl/follow_notify_eml.tpl @@ -11,4 +11,4 @@ Je dient op je hub in te loggen om het verzoek te accepteren, het af te wijzen o Vriendelijke groet, - Beheerder {{$sitename}} \ No newline at end of file + Beheerder {{$sitename}} ({{$siteurl}}) \ No newline at end of file diff --git a/view/nl/friend_complete_eml.tpl b/view/nl/friend_complete_eml.tpl index 1c647b994..3688b2fcd 100644 --- a/view/nl/friend_complete_eml.tpl +++ b/view/nl/friend_complete_eml.tpl @@ -1,22 +1,22 @@ -Dear {{$username}}, +Beste {{$username}}, - Great news... '{{$fn}}' at '{{$dfrn_url}}' has accepted -your connection request at '{{$sitename}}'. + Groot nieuws... '{{$fn}}' op '{{$dfrn_url}}' heeft jouw +connectieverzoek op '{{$sitename}}' geaccepteerd. -You are now mutual friends and may exchange status updates, photos, and email -without restriction. +Jullie zijn nu met elkaar verbonden en kunnen zonder beperkingen berichten, foto's en +privéberichten uitwisselen. -Please visit your 'Connnections' page at {{$sitename}} if you wish to make -any changes to this relationship. +Bezoek jouw 'connecties'-pagina op {{$sitename}} wanneer je instellingen voor +deze connectie wil veranderen. {{$siteurl}} -[For instance, you may create a separate profile with information that is not -available to the general public - and assign viewing rights to '{{$fn}}']. +[Je kan bijvoorbeeld een apart profiel aanmaken (zie extra functies) die niet voor het +grote publiek te zien is en deze zichtbaar maken voor '{{$fn}}']. -Sincerely, +Vriendelijke groet, - {{$sitename}} Administrator + Beheerder {{$sitename}} ({{siteurl}}) - + \ No newline at end of file diff --git a/view/nl/intro_complete_eml.tpl b/view/nl/intro_complete_eml.tpl index 2c2428d68..e635327fc 100644 --- a/view/nl/intro_complete_eml.tpl +++ b/view/nl/intro_complete_eml.tpl @@ -1,22 +1,22 @@ -Dear {{$username}}, +Beste {{$username}}, - '{{$fn}}' at '{{$dfrn_url}}' has accepted -your connection request at '{{$sitename}}'. + '{{$fn}}' op '{{$dfrn_url}}' heeft jouw +connectieverzoek geaccepteerd op '{{$sitename}}'. - '{{$fn}}' has chosen to accept you a "fan", which restricts -some forms of communication - such as private messaging and some profile -interactions. If this is a celebrity or community page, these settings were -applied automatically. + '{{$fn}}' heeft er voor gekozen om jou als "fan" te accepteren. +Hierdoor worden sommige vormen van communicatie beperkt, zoals het sturen van privéberichten en sommige +profiel-interacties. Wanneer dit een kanaal van een beroemdheid of een groep/forum is werden +deze instellingen automatisch toegepast. - '{{$fn}}' may choose to extend this into a two-way or more permissive -relationship in the future. + '{{$fn}}' kan er voor kiezen om in de toekomst deze beperkingen op te heffen of +om juist meer beperkingen op te leggen. - You will start receiving public status updates from '{{$fn}}', -which will appear on your 'Matrix' page at + Vanaf nu ontvang je openbare berichten van '{{$fn}}'. +Deze zullen in jouw 'matrix' (tijdlijn) verschijnen op -{{$siteurl}} +{{$siteurl}}. -Sincerely, +Vriendelijke groet, - {{$sitename}} Administrator + Beheerder {{$sitename}} ({{$siteurl}}) \ No newline at end of file diff --git a/view/nl/lostpass_eml.tpl b/view/nl/lostpass_eml.tpl index f0bc5c314..af1c77f4f 100644 --- a/view/nl/lostpass_eml.tpl +++ b/view/nl/lostpass_eml.tpl @@ -27,6 +27,6 @@ Inlognaam: {{$email}} Vriendelijke groet, - Beheerder {{$sitename}} + Beheerder {{$sitename}} ({{$siteurl}}) \ No newline at end of file diff --git a/view/nl/messages.po b/view/nl/messages.po index 42d1113d1..0a004cdb1 100644 --- a/view/nl/messages.po +++ b/view/nl/messages.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Red Matrix\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-15 00:03-0700\n" -"PO-Revision-Date: 2014-08-22 14:38+0000\n" +"POT-Creation-Date: 2014-08-22 00:03-0700\n" +"PO-Revision-Date: 2014-08-23 16:06+0000\n" "Last-Translator: jeroenpraat <>\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/red-matrix/language/nl/)\n" "MIME-Version: 1.0\n" @@ -30,34 +30,25 @@ msgstr "Kan DNS-informatie voor databaseserver '%s' niet vinden" msgid "Profile Photos" msgstr "Profielfoto's" -#: ../../include/diaspora.php:610 -#, php-format -msgid "%1$s is now friends with %2$s" -msgstr "%1$s is nu bevriend met %2$s" - -#: ../../include/diaspora.php:693 -msgid "Sharing notification from Diaspora network" -msgstr "Notificatie delen vanuit het Diaspora-netwerk" - -#: ../../include/diaspora.php:1910 ../../include/text.php:1732 +#: ../../include/diaspora.php:1736 ../../include/text.php:1734 #: ../../include/conversation.php:120 ../../mod/subthread.php:72 #: ../../mod/subthread.php:174 ../../mod/tagger.php:45 ../../mod/like.php:294 msgid "photo" msgstr "foto" -#: ../../include/diaspora.php:1910 ../../include/text.php:1738 +#: ../../include/diaspora.php:1736 ../../include/text.php:1740 #: ../../include/conversation.php:148 ../../mod/subthread.php:72 #: ../../mod/subthread.php:174 ../../mod/tagger.php:53 ../../mod/like.php:294 msgid "status" msgstr "bericht" -#: ../../include/diaspora.php:1926 ../../include/conversation.php:164 +#: ../../include/diaspora.php:1752 ../../include/conversation.php:164 #: ../../mod/like.php:331 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "%1$s vindt %3$s van %2$s leuk" -#: ../../include/diaspora.php:2303 +#: ../../include/diaspora.php:2129 msgid "Attachments:" msgstr "Bijlagen:" @@ -82,8 +73,8 @@ msgstr "gaf een reactie op een bericht van %s" msgid "Site Admin" msgstr "Hubbeheerder" -#: ../../include/apps.php:124 ../../include/nav.php:100 -#: ../../include/conversation.php:1543 +#: ../../include/apps.php:124 ../../include/nav.php:113 +#: ../../include/conversation.php:1548 msgid "Bookmarks" msgstr "Bladwijzers" @@ -91,65 +82,65 @@ msgstr "Bladwijzers" msgid "Address Book" msgstr "Connecties" -#: ../../include/apps.php:126 ../../include/nav.php:106 ../../boot.php:1498 +#: ../../include/apps.php:126 ../../include/nav.php:119 ../../boot.php:1493 msgid "Login" msgstr "Inloggen" -#: ../../include/apps.php:127 ../../include/nav.php:196 +#: ../../include/apps.php:127 msgid "Channel Select" msgstr "Kanaalkiezer" -#: ../../include/apps.php:128 ../../include/nav.php:170 +#: ../../include/apps.php:128 ../../include/nav.php:183 msgid "Matrix" msgstr "Matrix" -#: ../../include/apps.php:129 ../../include/nav.php:198 -#: ../../include/widgets.php:514 ../../mod/admin.php:987 -#: ../../mod/admin.php:1192 +#: ../../include/apps.php:129 ../../include/nav.php:211 +#: ../../include/widgets.php:521 ../../mod/admin.php:947 +#: ../../mod/admin.php:1152 msgid "Settings" msgstr "Instellingen" -#: ../../include/apps.php:130 ../../include/nav.php:92 -#: ../../include/reddav.php:1280 ../../include/conversation.php:1521 +#: ../../include/apps.php:130 ../../include/nav.php:105 +#: ../../include/reddav.php:1280 ../../include/conversation.php:1526 #: ../../mod/fbrowser.php:114 msgid "Files" msgstr "Bestanden" -#: ../../include/apps.php:131 ../../include/nav.php:102 -#: ../../include/conversation.php:1554 ../../mod/webpages.php:79 +#: ../../include/apps.php:131 ../../include/nav.php:115 +#: ../../include/conversation.php:1559 ../../mod/webpages.php:79 msgid "Webpages" msgstr "Webpagina's" -#: ../../include/apps.php:132 ../../include/nav.php:173 +#: ../../include/apps.php:132 ../../include/nav.php:186 msgid "Channel Home" msgstr "Tijdlijn kanaal" -#: ../../include/apps.php:133 ../../include/identity.php:973 -#: ../../include/identity.php:1091 ../../mod/profperm.php:112 +#: ../../include/apps.php:133 ../../include/identity.php:991 +#: ../../include/identity.php:1109 ../../mod/profperm.php:112 msgid "Profile" msgstr "Profiel" -#: ../../include/apps.php:134 ../../include/nav.php:91 -#: ../../include/conversation.php:1512 ../../mod/fbrowser.php:25 +#: ../../include/apps.php:134 ../../include/nav.php:104 +#: ../../include/conversation.php:1517 ../../mod/fbrowser.php:25 msgid "Photos" msgstr "Foto's" -#: ../../include/apps.php:135 ../../include/nav.php:192 +#: ../../include/apps.php:135 ../../include/nav.php:205 #: ../../mod/events.php:396 msgid "Events" msgstr "Gebeurtenissen" -#: ../../include/apps.php:136 ../../include/nav.php:159 +#: ../../include/apps.php:136 ../../include/nav.php:172 #: ../../mod/directory.php:226 msgid "Directory" msgstr "Gids" -#: ../../include/apps.php:137 ../../include/nav.php:151 ../../mod/help.php:60 +#: ../../include/apps.php:137 ../../include/nav.php:164 ../../mod/help.php:60 #: ../../mod/help.php:65 msgid "Help" msgstr "Hulp" -#: ../../include/apps.php:138 ../../include/nav.php:184 +#: ../../include/apps.php:138 ../../include/nav.php:197 msgid "Mail" msgstr "Privéberichten" @@ -157,16 +148,16 @@ msgstr "Privéberichten" msgid "Mood" msgstr "Stemming" -#: ../../include/apps.php:140 ../../include/conversation.php:945 +#: ../../include/apps.php:140 ../../include/conversation.php:950 msgid "Poke" msgstr "Aanstoten" -#: ../../include/apps.php:141 ../../include/nav.php:97 +#: ../../include/apps.php:141 ../../include/nav.php:110 msgid "Chat" msgstr "Chatten" #: ../../include/apps.php:142 ../../include/text.php:815 -#: ../../include/text.php:829 ../../include/nav.php:156 +#: ../../include/text.php:829 ../../include/nav.php:169 #: ../../mod/search.php:30 msgid "Search" msgstr "Zoeken" @@ -220,7 +211,7 @@ msgstr "Aanschaffen" #: ../../include/page_widgets.php:36 ../../include/reddav.php:1289 #: ../../include/menu.php:42 ../../include/ItemObject.php:96 #: ../../mod/settings.php:579 ../../mod/blocks.php:94 -#: ../../mod/connections.php:393 ../../mod/editblock.php:111 +#: ../../mod/connections.php:396 ../../mod/editblock.php:111 #: ../../mod/editlayout.php:106 ../../mod/editpost.php:112 #: ../../mod/editwebpage.php:143 ../../mod/thing.php:235 #: ../../mod/layouts.php:112 ../../mod/menu.php:59 ../../mod/webpages.php:120 @@ -230,8 +221,8 @@ msgstr "Bewerken" #: ../../include/apps.php:247 ../../include/reddav.php:1290 #: ../../include/conversation.php:635 ../../include/ItemObject.php:108 #: ../../mod/settings.php:580 ../../mod/connedit.php:440 -#: ../../mod/photos.php:1052 ../../mod/group.php:176 ../../mod/admin.php:767 -#: ../../mod/admin.php:897 ../../mod/thing.php:236 +#: ../../mod/photos.php:1052 ../../mod/group.php:176 ../../mod/admin.php:727 +#: ../../mod/admin.php:857 ../../mod/thing.php:236 msgid "Delete" msgstr "Verwijderen" @@ -280,7 +271,7 @@ msgid "View Connections" msgstr "Connecties weergeven" #: ../../include/text.php:817 ../../include/text.php:831 -#: ../../include/widgets.php:186 ../../mod/rbmark.php:28 +#: ../../include/widgets.php:193 ../../mod/rbmark.php:28 #: ../../mod/rbmark.php:98 ../../mod/filer.php:50 msgid "Save" msgstr "Opslaan" @@ -417,153 +408,153 @@ msgstr "ontspannen" msgid "surprised" msgstr "verrast" -#: ../../include/text.php:1092 +#: ../../include/text.php:1094 msgid "Monday" msgstr "maandag" -#: ../../include/text.php:1092 +#: ../../include/text.php:1094 msgid "Tuesday" msgstr "dinsdag" -#: ../../include/text.php:1092 +#: ../../include/text.php:1094 msgid "Wednesday" msgstr "woensdag" -#: ../../include/text.php:1092 +#: ../../include/text.php:1094 msgid "Thursday" msgstr "donderdag" -#: ../../include/text.php:1092 +#: ../../include/text.php:1094 msgid "Friday" msgstr "vrijdag" -#: ../../include/text.php:1092 +#: ../../include/text.php:1094 msgid "Saturday" msgstr "zaterdag" -#: ../../include/text.php:1092 +#: ../../include/text.php:1094 msgid "Sunday" msgstr "zondag" -#: ../../include/text.php:1096 +#: ../../include/text.php:1098 msgid "January" msgstr "januari" -#: ../../include/text.php:1096 +#: ../../include/text.php:1098 msgid "February" msgstr "februari" -#: ../../include/text.php:1096 +#: ../../include/text.php:1098 msgid "March" msgstr "maart" -#: ../../include/text.php:1096 +#: ../../include/text.php:1098 msgid "April" msgstr "april" -#: ../../include/text.php:1096 +#: ../../include/text.php:1098 msgid "May" msgstr "mei" -#: ../../include/text.php:1096 +#: ../../include/text.php:1098 msgid "June" msgstr "juni" -#: ../../include/text.php:1096 +#: ../../include/text.php:1098 msgid "July" msgstr "juli" -#: ../../include/text.php:1096 +#: ../../include/text.php:1098 msgid "August" msgstr "augustus" -#: ../../include/text.php:1096 +#: ../../include/text.php:1098 msgid "September" msgstr "september" -#: ../../include/text.php:1096 +#: ../../include/text.php:1098 msgid "October" msgstr "oktober" -#: ../../include/text.php:1096 +#: ../../include/text.php:1098 msgid "November" msgstr "november" -#: ../../include/text.php:1096 +#: ../../include/text.php:1098 msgid "December" msgstr "december" -#: ../../include/text.php:1174 +#: ../../include/text.php:1176 msgid "unknown.???" msgstr "onbekend.???" -#: ../../include/text.php:1175 +#: ../../include/text.php:1177 msgid "bytes" msgstr "bytes" -#: ../../include/text.php:1210 +#: ../../include/text.php:1212 msgid "remove category" msgstr "categorie verwijderen" -#: ../../include/text.php:1280 +#: ../../include/text.php:1282 msgid "remove from file" msgstr "uit map verwijderen" -#: ../../include/text.php:1345 ../../include/text.php:1357 +#: ../../include/text.php:1347 ../../include/text.php:1359 msgid "Click to open/close" msgstr "Klik om te openen of te sluiten" -#: ../../include/text.php:1512 ../../mod/events.php:374 +#: ../../include/text.php:1514 ../../mod/events.php:374 msgid "Link to Source" msgstr "Originele locatie" -#: ../../include/text.php:1531 +#: ../../include/text.php:1533 msgid "Select a page layout: " msgstr "Kies een paginalayout: " -#: ../../include/text.php:1534 ../../include/text.php:1599 +#: ../../include/text.php:1536 ../../include/text.php:1601 msgid "default" msgstr "standaard" -#: ../../include/text.php:1570 +#: ../../include/text.php:1572 msgid "Page content type: " msgstr "Opmaakcode pagina" -#: ../../include/text.php:1611 +#: ../../include/text.php:1613 msgid "Select an alternate language" msgstr "Kies een andere taal" -#: ../../include/text.php:1735 ../../include/conversation.php:123 +#: ../../include/text.php:1737 ../../include/conversation.php:123 #: ../../mod/tagger.php:49 msgid "event" msgstr "gebeurtenis" -#: ../../include/text.php:1740 ../../include/conversation.php:150 +#: ../../include/text.php:1742 ../../include/conversation.php:150 #: ../../mod/tagger.php:55 msgid "comment" msgstr "reactie" -#: ../../include/text.php:1745 +#: ../../include/text.php:1747 msgid "activity" msgstr "activiteit" -#: ../../include/text.php:2004 +#: ../../include/text.php:2006 msgid "Design" msgstr "Ontwerp" -#: ../../include/text.php:2006 +#: ../../include/text.php:2008 msgid "Blocks" msgstr "Blokken" -#: ../../include/text.php:2007 +#: ../../include/text.php:2009 msgid "Menus" msgstr "Menu's" -#: ../../include/text.php:2008 +#: ../../include/text.php:2010 msgid "Layouts" msgstr "Layouts" -#: ../../include/text.php:2009 +#: ../../include/text.php:2011 msgid "Pages" msgstr "Pagina's" @@ -576,7 +567,7 @@ msgstr "Nieuwe pagina" msgid "View" msgstr "Weergeven" -#: ../../include/page_widgets.php:40 ../../include/conversation.php:1091 +#: ../../include/page_widgets.php:40 ../../include/conversation.php:1096 #: ../../include/ItemObject.php:592 ../../mod/editblock.php:141 #: ../../mod/editlayout.php:135 ../../mod/editpost.php:140 #: ../../mod/editwebpage.php:174 ../../mod/photos.php:1003 @@ -680,7 +671,7 @@ msgstr "Account is geverifieerd. Je kan inloggen." #: ../../include/attach.php:243 ../../include/attach.php:283 #: ../../include/attach.php:297 ../../include/attach.php:322 #: ../../include/attach.php:513 ../../include/attach.php:585 -#: ../../include/chat.php:116 ../../include/items.php:3711 +#: ../../include/chat.php:116 ../../include/items.php:3635 #: ../../mod/mood.php:112 ../../mod/mitem.php:73 ../../mod/achievements.php:27 #: ../../mod/settings.php:494 ../../mod/poke.php:128 ../../mod/api.php:26 #: ../../mod/api.php:31 ../../mod/authtest.php:13 ../../mod/profile.php:64 @@ -703,7 +694,7 @@ msgstr "Account is geverifieerd. Je kan inloggen." #: ../../mod/fsuggest.php:78 ../../mod/suggest.php:26 ../../mod/group.php:9 #: ../../mod/thing.php:249 ../../mod/thing.php:266 ../../mod/thing.php:301 #: ../../mod/invite.php:13 ../../mod/invite.php:104 ../../mod/item.php:178 -#: ../../mod/item.php:186 ../../mod/item.php:916 ../../mod/layouts.php:27 +#: ../../mod/item.php:186 ../../mod/item.php:915 ../../mod/layouts.php:27 #: ../../mod/layouts.php:39 ../../mod/like.php:154 #: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27 #: ../../mod/viewsrc.php:12 ../../mod/mail.php:108 ../../mod/manage.php:6 @@ -731,7 +722,7 @@ msgstr "Afbeelding kan niet verwerkt worden" msgid "Photo storage failed." msgstr "Foto kan niet worden opgeslagen" -#: ../../include/photos.php:339 ../../include/conversation.php:1515 +#: ../../include/photos.php:339 ../../include/conversation.php:1520 msgid "Photo Albums" msgstr "Fotoalbums" @@ -877,206 +868,210 @@ msgstr "Einde:" msgid "Location:" msgstr "Plaats:" -#: ../../include/nav.php:81 ../../include/nav.php:108 ../../boot.php:1497 +#: ../../include/nav.php:94 ../../include/nav.php:121 ../../boot.php:1492 msgid "Logout" msgstr "Uitloggen" -#: ../../include/nav.php:81 ../../include/nav.php:108 +#: ../../include/nav.php:94 ../../include/nav.php:121 msgid "End this session" msgstr "Beëindig deze sessie" -#: ../../include/nav.php:84 ../../include/nav.php:142 +#: ../../include/nav.php:97 ../../include/nav.php:155 msgid "Home" msgstr "Home" -#: ../../include/nav.php:84 +#: ../../include/nav.php:97 msgid "Your posts and conversations" msgstr "Jouw berichten en conversaties" -#: ../../include/nav.php:85 ../../include/conversation.php:940 +#: ../../include/nav.php:98 ../../include/conversation.php:944 #: ../../mod/connedit.php:393 ../../mod/connedit.php:507 msgid "View Profile" msgstr "Profiel weergeven" -#: ../../include/nav.php:85 +#: ../../include/nav.php:98 msgid "Your profile page" msgstr "Jouw profielpagina" -#: ../../include/nav.php:87 +#: ../../include/nav.php:100 msgid "Edit Profiles" msgstr "Bewerk profielen" -#: ../../include/nav.php:87 +#: ../../include/nav.php:100 msgid "Manage/Edit profiles" msgstr "Beheer/wijzig profielen" -#: ../../include/nav.php:89 ../../include/identity.php:730 +#: ../../include/nav.php:102 ../../include/identity.php:730 msgid "Edit Profile" msgstr "Profiel bewerken" -#: ../../include/nav.php:89 +#: ../../include/nav.php:102 msgid "Edit your profile" msgstr "Jouw profiel bewerken" -#: ../../include/nav.php:91 +#: ../../include/nav.php:104 msgid "Your photos" msgstr "Jouw foto's" -#: ../../include/nav.php:92 +#: ../../include/nav.php:105 msgid "Your files" msgstr "Jouw bestanden" -#: ../../include/nav.php:97 +#: ../../include/nav.php:110 msgid "Your chatrooms" msgstr "Jouw chatkanalen" -#: ../../include/nav.php:100 +#: ../../include/nav.php:113 msgid "Your bookmarks" msgstr "Jouw bladwijzers" -#: ../../include/nav.php:102 +#: ../../include/nav.php:115 msgid "Your webpages" msgstr "Jouw webpagina's" -#: ../../include/nav.php:106 +#: ../../include/nav.php:119 msgid "Sign in" msgstr "Inloggen" -#: ../../include/nav.php:123 +#: ../../include/nav.php:136 #, php-format msgid "%s - click to logout" msgstr "%s - klik om uit te loggen" -#: ../../include/nav.php:128 +#: ../../include/nav.php:141 msgid "Click to authenticate to your home hub" msgstr "Klik om jezelf te authenticeren via jouw eigen RedMatrix-hub" -#: ../../include/nav.php:142 +#: ../../include/nav.php:155 msgid "Home Page" msgstr "Homepage" -#: ../../include/nav.php:146 ../../mod/register.php:221 ../../boot.php:1474 +#: ../../include/nav.php:159 ../../mod/register.php:221 ../../boot.php:1469 msgid "Register" msgstr "Registreren " -#: ../../include/nav.php:146 +#: ../../include/nav.php:159 msgid "Create an account" msgstr "Maak een account aan" -#: ../../include/nav.php:151 +#: ../../include/nav.php:164 msgid "Help and documentation" msgstr "Hulp en documentatie" -#: ../../include/nav.php:154 ../../include/widgets.php:79 +#: ../../include/nav.php:167 ../../include/widgets.php:86 #: ../../mod/apps.php:33 msgid "Apps" msgstr "Apps" -#: ../../include/nav.php:154 +#: ../../include/nav.php:167 msgid "Applications, utilities, links, games" msgstr "Apps" -#: ../../include/nav.php:156 +#: ../../include/nav.php:169 msgid "Search site content" msgstr "Inhoud van deze RedMatrix-hub doorzoeken" -#: ../../include/nav.php:159 +#: ../../include/nav.php:172 msgid "Channel Locator" msgstr "Kanalengids" -#: ../../include/nav.php:170 +#: ../../include/nav.php:183 msgid "Your matrix" msgstr "Jouw matrix" -#: ../../include/nav.php:171 +#: ../../include/nav.php:184 msgid "Mark all matrix notifications seen" msgstr "Markeer alle matrixnotificaties als bekeken" -#: ../../include/nav.php:173 +#: ../../include/nav.php:186 msgid "Channel home" msgstr "Tijdlijn kanaal" -#: ../../include/nav.php:174 +#: ../../include/nav.php:187 msgid "Mark all channel notifications seen" msgstr "Alle kanaalnotificaties als gelezen markeren" -#: ../../include/nav.php:177 ../../mod/connections.php:386 +#: ../../include/nav.php:190 ../../mod/connections.php:389 msgid "Connections" msgstr "Connecties" -#: ../../include/nav.php:180 +#: ../../include/nav.php:193 msgid "Notices" msgstr "Notificaties" -#: ../../include/nav.php:180 +#: ../../include/nav.php:193 msgid "Notifications" msgstr "Notificaties" -#: ../../include/nav.php:181 +#: ../../include/nav.php:194 msgid "See all notifications" msgstr "Alle notificaties weergeven" -#: ../../include/nav.php:182 ../../mod/notifications.php:99 +#: ../../include/nav.php:195 ../../mod/notifications.php:99 msgid "Mark all system notifications seen" msgstr "Markeer alle systeemnotificaties als bekeken" -#: ../../include/nav.php:184 +#: ../../include/nav.php:197 msgid "Private mail" msgstr "Privéberichten" -#: ../../include/nav.php:185 +#: ../../include/nav.php:198 msgid "See all private messages" msgstr "Alle privéberichten weergeven" -#: ../../include/nav.php:186 +#: ../../include/nav.php:199 msgid "Mark all private messages seen" msgstr "Markeer alle privéberichten als bekeken" -#: ../../include/nav.php:187 +#: ../../include/nav.php:200 msgid "Inbox" msgstr "Postvak IN" -#: ../../include/nav.php:188 +#: ../../include/nav.php:201 msgid "Outbox" msgstr "Postvak UIT" -#: ../../include/nav.php:189 ../../include/widgets.php:536 +#: ../../include/nav.php:202 ../../include/widgets.php:543 msgid "New Message" msgstr "Nieuw bericht" -#: ../../include/nav.php:192 +#: ../../include/nav.php:205 msgid "Event Calendar" msgstr "Agenda" -#: ../../include/nav.php:193 +#: ../../include/nav.php:206 msgid "See all events" msgstr "Alle gebeurtenissen weergeven" -#: ../../include/nav.php:194 +#: ../../include/nav.php:207 msgid "Mark all events seen" msgstr "Markeer alle gebeurtenissen als bekeken" -#: ../../include/nav.php:196 +#: ../../include/nav.php:209 ../../mod/manage.php:148 +msgid "Channel Manager" +msgstr "Kanaalbeheerder" + +#: ../../include/nav.php:209 msgid "Manage Your Channels" msgstr "Beheer je kanalen" -#: ../../include/nav.php:198 +#: ../../include/nav.php:211 msgid "Account/Channel Settings" msgstr "Account-/kanaal-instellingen" -#: ../../include/nav.php:206 ../../mod/admin.php:123 +#: ../../include/nav.php:219 ../../mod/admin.php:123 msgid "Admin" msgstr "Beheer" -#: ../../include/nav.php:206 +#: ../../include/nav.php:219 msgid "Site Setup and Configuration" msgstr "Hub instellen en beheren" -#: ../../include/nav.php:231 +#: ../../include/nav.php:244 msgid "Nothing new here" msgstr "Niets nieuw hier" -#: ../../include/nav.php:235 +#: ../../include/nav.php:248 msgid "Please wait..." msgstr "Wachten aub..." @@ -1125,7 +1120,7 @@ msgstr "vind dit niet leuk" msgid "dislikes" msgstr "vindt dit niet leuk" -#: ../../include/taxonomy.php:338 ../../include/identity.php:999 +#: ../../include/taxonomy.php:338 ../../include/identity.php:1017 #: ../../include/ItemObject.php:134 msgctxt "noun" msgid "Like" @@ -1173,8 +1168,8 @@ msgstr "OStatus" msgid "RSS/Atom" msgstr "RSS/Atom" -#: ../../include/contact_selectors.php:79 ../../mod/admin.php:763 -#: ../../mod/admin.php:772 ../../boot.php:1500 +#: ../../include/contact_selectors.php:79 ../../mod/admin.php:723 +#: ../../mod/admin.php:732 ../../boot.php:1495 msgid "Email" msgstr "E-mail" @@ -1209,7 +1204,7 @@ msgid_plural "%d invitations available" msgstr[0] "%d uitnodiging beschikbaar" msgstr[1] "%d uitnodigingen beschikbaar" -#: ../../include/contact_widgets.php:19 ../../mod/admin.php:455 +#: ../../include/contact_widgets.php:19 ../../mod/admin.php:415 msgid "Advanced" msgstr "Geavanceerd" @@ -1229,7 +1224,7 @@ msgstr "Verbinden/volgen" msgid "Examples: Robert Morgenstein, Fishing" msgstr "Voorbeeld: Robert Morgenstein, vissen" -#: ../../include/contact_widgets.php:26 ../../mod/connections.php:392 +#: ../../include/contact_widgets.php:26 ../../mod/connections.php:395 #: ../../mod/directory.php:222 ../../mod/directory.php:227 msgid "Find" msgstr "Vinden" @@ -1254,13 +1249,13 @@ msgstr "Voorbeeld: (voor naam) name=herman en (voor land) country=nederland" msgid "Advanced Find" msgstr "Geavanceerd zoeken" -#: ../../include/contact_widgets.php:58 ../../include/features.php:69 -#: ../../include/widgets.php:296 +#: ../../include/contact_widgets.php:58 ../../include/features.php:72 +#: ../../include/widgets.php:303 msgid "Saved Folders" msgstr "Bewaarde mappen" #: ../../include/contact_widgets.php:61 ../../include/contact_widgets.php:96 -#: ../../include/widgets.php:299 +#: ../../include/widgets.php:306 msgid "Everything" msgstr "Alles" @@ -1283,15 +1278,15 @@ msgstr "meer connecties weergeven" msgid "This event has been added to your calendar." msgstr "Dit evenement is aan jouw agenda toegevoegd." -#: ../../include/zot.php:624 +#: ../../include/zot.php:640 msgid "Invalid data packet" msgstr "Datapakket ongeldig" -#: ../../include/zot.php:638 +#: ../../include/zot.php:654 msgid "Unable to verify channel signature" msgstr "Kanaal-kenmerk (channel signature) kon niet worden geverifieerd. " -#: ../../include/zot.php:835 +#: ../../include/zot.php:851 #, php-format msgid "Unable to verify site signature for %s" msgstr "Hub-kenmerk (site signature) voor %s kon niet worden geverifieerd" @@ -1422,7 +1417,7 @@ msgstr "Bedankt," #: ../../include/enotify.php:46 #, php-format msgid "%s Administrator" -msgstr "%s beheerder" +msgstr "Beheerder %s" #: ../../include/enotify.php:81 #, php-format @@ -1599,7 +1594,7 @@ msgstr "Foto:" msgid "Please visit %s to approve or reject the suggestion." msgstr "Bezoek %s om het voorstel te accepteren of af te wijzen." -#: ../../include/enotify.php:474 +#: ../../include/enotify.php:477 msgid "[Red:Notify]" msgstr "[Red:Notificatie]" @@ -1642,7 +1637,7 @@ msgid "%1$s used of %2$s (%3$s%)" msgstr "%1$s van %2$s gebruikt (%3$s%)" #: ../../include/reddav.php:1284 ../../mod/settings.php:519 -#: ../../mod/settings.php:545 ../../mod/admin.php:902 +#: ../../mod/settings.php:545 ../../mod/admin.php:862 msgid "Name" msgstr "Naam" @@ -1749,7 +1744,7 @@ msgstr "Verloopt: %s" msgid "View in context" msgstr "In context bekijken" -#: ../../include/conversation.php:714 ../../include/conversation.php:1130 +#: ../../include/conversation.php:714 ../../include/conversation.php:1135 #: ../../include/ItemObject.php:294 ../../mod/editblock.php:120 #: ../../mod/editlayout.php:115 ../../mod/editpost.php:121 #: ../../mod/editwebpage.php:152 ../../mod/photos.php:983 @@ -1769,334 +1764,342 @@ msgstr "Aan het laden..." msgid "Delete Selected Items" msgstr "Verwijder de geselecteerde items" -#: ../../include/conversation.php:937 +#: ../../include/conversation.php:941 msgid "View Source" msgstr "Bron weergeven" -#: ../../include/conversation.php:938 +#: ../../include/conversation.php:942 msgid "Follow Thread" msgstr "Conversatie volgen" -#: ../../include/conversation.php:939 +#: ../../include/conversation.php:943 msgid "View Status" msgstr "Status weergeven" -#: ../../include/conversation.php:941 +#: ../../include/conversation.php:945 msgid "View Photos" msgstr "Foto's weergeven" -#: ../../include/conversation.php:942 +#: ../../include/conversation.php:946 msgid "Matrix Activity" msgstr "Activiteit in de Matrix" -#: ../../include/conversation.php:943 +#: ../../include/conversation.php:947 ../../include/identity.php:706 +#: ../../include/widgets.php:135 ../../include/widgets.php:175 +#: ../../include/Contact.php:107 ../../mod/directory.php:183 +#: ../../mod/dirprofile.php:164 ../../mod/suggest.php:51 +#: ../../mod/match.php:62 +msgid "Connect" +msgstr "Verbinden" + +#: ../../include/conversation.php:948 msgid "Edit Contact" msgstr "Contact bewerken" -#: ../../include/conversation.php:944 +#: ../../include/conversation.php:949 msgid "Send PM" msgstr "Privébericht verzenden" -#: ../../include/conversation.php:1001 +#: ../../include/conversation.php:1006 #, php-format msgid "%s likes this." msgstr "%s vindt dit leuk." -#: ../../include/conversation.php:1001 +#: ../../include/conversation.php:1006 #, php-format msgid "%s doesn't like this." msgstr "%s vindt dit niet leuk." -#: ../../include/conversation.php:1005 +#: ../../include/conversation.php:1010 #, php-format msgid "%2$d people like this." msgid_plural "%2$d people like this." msgstr[0] "%2$d persoon vindt dit leuk." msgstr[1] "%2$d personen vinden dit leuk." -#: ../../include/conversation.php:1007 +#: ../../include/conversation.php:1012 #, php-format msgid "%2$d people don't like this." msgid_plural "%2$d people don't like this." msgstr[0] "%2$d persoon vindt dit niet leuk." msgstr[1] "%2$d personen vinden dit niet leuk." -#: ../../include/conversation.php:1013 +#: ../../include/conversation.php:1018 msgid "and" msgstr "en" -#: ../../include/conversation.php:1016 +#: ../../include/conversation.php:1021 #, php-format msgid ", and %d other people" msgid_plural ", and %d other people" msgstr[0] ", en %d ander persoon" msgstr[1] ", en %d andere personen" -#: ../../include/conversation.php:1017 +#: ../../include/conversation.php:1022 #, php-format msgid "%s like this." msgstr "%s vinden dit leuk." -#: ../../include/conversation.php:1017 +#: ../../include/conversation.php:1022 #, php-format msgid "%s don't like this." msgstr "%s vinden dit niet leuk." -#: ../../include/conversation.php:1074 +#: ../../include/conversation.php:1079 msgid "Visible to everybody" msgstr "Voor iedereen zichtbaar" -#: ../../include/conversation.php:1075 ../../mod/mail.php:167 +#: ../../include/conversation.php:1080 ../../mod/mail.php:167 #: ../../mod/mail.php:279 msgid "Please enter a link URL:" msgstr "Vul een internetadres/URL in:" -#: ../../include/conversation.php:1076 +#: ../../include/conversation.php:1081 msgid "Please enter a video link/URL:" msgstr "Vul een videolink/URL in:" -#: ../../include/conversation.php:1077 +#: ../../include/conversation.php:1082 msgid "Please enter an audio link/URL:" msgstr "Vul een audiolink/URL in:" -#: ../../include/conversation.php:1078 +#: ../../include/conversation.php:1083 msgid "Tag term:" msgstr "Label:" -#: ../../include/conversation.php:1079 ../../mod/filer.php:49 +#: ../../include/conversation.php:1084 ../../mod/filer.php:49 msgid "Save to Folder:" msgstr "Bewaar in map: " -#: ../../include/conversation.php:1080 +#: ../../include/conversation.php:1085 msgid "Where are you right now?" msgstr "Waar bevind je je op dit moment?" -#: ../../include/conversation.php:1081 ../../mod/editpost.php:52 +#: ../../include/conversation.php:1086 ../../mod/editpost.php:52 #: ../../mod/mail.php:168 ../../mod/mail.php:280 msgid "Expires YYYY-MM-DD HH:MM" msgstr "Verloopt op DD-MM-YYYY om HH:MM" -#: ../../include/conversation.php:1105 ../../mod/photos.php:982 +#: ../../include/conversation.php:1110 ../../mod/photos.php:982 #: ../../mod/layouts.php:113 msgid "Share" msgstr "Delen" -#: ../../include/conversation.php:1107 ../../mod/editwebpage.php:139 +#: ../../include/conversation.php:1112 ../../mod/editwebpage.php:139 msgid "Page link title" msgstr "Titel van paginalink" -#: ../../include/conversation.php:1110 +#: ../../include/conversation.php:1115 msgid "Post as" msgstr "Bericht plaatsen als" -#: ../../include/conversation.php:1111 ../../mod/editblock.php:112 +#: ../../include/conversation.php:1116 ../../mod/editblock.php:112 #: ../../mod/editlayout.php:107 ../../mod/editpost.php:113 #: ../../mod/editwebpage.php:144 ../../mod/mail.php:228 ../../mod/mail.php:342 msgid "Upload photo" msgstr "Foto uploaden" -#: ../../include/conversation.php:1112 +#: ../../include/conversation.php:1117 msgid "upload photo" msgstr "foto uploaden" -#: ../../include/conversation.php:1113 ../../mod/editblock.php:113 +#: ../../include/conversation.php:1118 ../../mod/editblock.php:113 #: ../../mod/editlayout.php:108 ../../mod/editpost.php:114 #: ../../mod/editwebpage.php:145 ../../mod/mail.php:229 ../../mod/mail.php:343 msgid "Attach file" msgstr "Bestand toevoegen" -#: ../../include/conversation.php:1114 +#: ../../include/conversation.php:1119 msgid "attach file" msgstr "bestand toevoegen" -#: ../../include/conversation.php:1115 ../../mod/editblock.php:114 +#: ../../include/conversation.php:1120 ../../mod/editblock.php:114 #: ../../mod/editlayout.php:109 ../../mod/editpost.php:115 #: ../../mod/editwebpage.php:146 ../../mod/mail.php:230 ../../mod/mail.php:344 msgid "Insert web link" msgstr "Weblink invoegen" -#: ../../include/conversation.php:1116 +#: ../../include/conversation.php:1121 msgid "web link" msgstr "Weblink" -#: ../../include/conversation.php:1117 +#: ../../include/conversation.php:1122 msgid "Insert video link" msgstr "Videolink invoegen" -#: ../../include/conversation.php:1118 +#: ../../include/conversation.php:1123 msgid "video link" msgstr "videolink" -#: ../../include/conversation.php:1119 +#: ../../include/conversation.php:1124 msgid "Insert audio link" msgstr "Audiolink invoegen" -#: ../../include/conversation.php:1120 +#: ../../include/conversation.php:1125 msgid "audio link" msgstr "audiolink" -#: ../../include/conversation.php:1121 ../../mod/editblock.php:118 +#: ../../include/conversation.php:1126 ../../mod/editblock.php:118 #: ../../mod/editlayout.php:113 ../../mod/editpost.php:119 #: ../../mod/editwebpage.php:150 msgid "Set your location" msgstr "Locatie instellen" -#: ../../include/conversation.php:1122 +#: ../../include/conversation.php:1127 msgid "set location" msgstr "locatie instellen" -#: ../../include/conversation.php:1123 ../../mod/editblock.php:119 +#: ../../include/conversation.php:1128 ../../mod/editblock.php:119 #: ../../mod/editlayout.php:114 ../../mod/editpost.php:120 #: ../../mod/editwebpage.php:151 msgid "Clear browser location" msgstr "Locatie van webbrowser wissen" -#: ../../include/conversation.php:1124 +#: ../../include/conversation.php:1129 msgid "clear location" msgstr "locatie wissen" -#: ../../include/conversation.php:1126 ../../mod/editblock.php:132 +#: ../../include/conversation.php:1131 ../../mod/editblock.php:132 #: ../../mod/editlayout.php:126 ../../mod/editpost.php:132 #: ../../mod/editwebpage.php:167 msgid "Set title" msgstr "Titel instellen" -#: ../../include/conversation.php:1129 ../../mod/editblock.php:135 +#: ../../include/conversation.php:1134 ../../mod/editblock.php:135 #: ../../mod/editlayout.php:129 ../../mod/editpost.php:134 #: ../../mod/editwebpage.php:169 msgid "Categories (comma-separated list)" msgstr "Categorieën (door komma's gescheiden lijst)" -#: ../../include/conversation.php:1131 ../../mod/editblock.php:121 +#: ../../include/conversation.php:1136 ../../mod/editblock.php:121 #: ../../mod/editlayout.php:116 ../../mod/editpost.php:122 #: ../../mod/editwebpage.php:153 msgid "Permission settings" msgstr "Privacy-rechten" -#: ../../include/conversation.php:1132 +#: ../../include/conversation.php:1137 msgid "permissions" msgstr "privacy-rechten" -#: ../../include/conversation.php:1139 ../../mod/editblock.php:129 +#: ../../include/conversation.php:1144 ../../mod/editblock.php:129 #: ../../mod/editlayout.php:123 ../../mod/editpost.php:129 #: ../../mod/editwebpage.php:162 msgid "Public post" msgstr "Openbaar bericht" -#: ../../include/conversation.php:1141 ../../mod/editblock.php:136 +#: ../../include/conversation.php:1146 ../../mod/editblock.php:136 #: ../../mod/editlayout.php:130 ../../mod/editpost.php:135 #: ../../mod/editwebpage.php:170 msgid "Example: bob@example.com, mary@example.com" msgstr "Voorbeeld: bob@voorbeeld.nl, mary@voorbeeld.be" -#: ../../include/conversation.php:1154 ../../mod/editblock.php:146 +#: ../../include/conversation.php:1159 ../../mod/editblock.php:146 #: ../../mod/editlayout.php:140 ../../mod/editpost.php:146 #: ../../mod/editwebpage.php:179 ../../mod/mail.php:235 ../../mod/mail.php:349 msgid "Set expiration date" msgstr "Verloopdatum instellen" -#: ../../include/conversation.php:1156 ../../include/ItemObject.php:595 +#: ../../include/conversation.php:1161 ../../include/ItemObject.php:595 #: ../../mod/editpost.php:148 ../../mod/mail.php:237 ../../mod/mail.php:351 msgid "Encrypt text" msgstr "Tekst versleutelen" -#: ../../include/conversation.php:1158 ../../mod/editpost.php:150 +#: ../../include/conversation.php:1163 ../../mod/editpost.php:150 msgid "OK" msgstr "OK" -#: ../../include/conversation.php:1159 ../../mod/settings.php:518 +#: ../../include/conversation.php:1164 ../../mod/settings.php:518 #: ../../mod/settings.php:544 ../../mod/editpost.php:151 #: ../../mod/fbrowser.php:82 ../../mod/fbrowser.php:117 ../../mod/tagrm.php:11 #: ../../mod/tagrm.php:94 msgid "Cancel" msgstr "Annuleren" -#: ../../include/conversation.php:1401 +#: ../../include/conversation.php:1406 msgid "Discover" msgstr "Ontdekken" -#: ../../include/conversation.php:1404 +#: ../../include/conversation.php:1409 msgid "Imported public streams" msgstr "Openbare streams importeren" -#: ../../include/conversation.php:1409 +#: ../../include/conversation.php:1414 msgid "Commented Order" msgstr "Nieuwe reacties bovenaan" -#: ../../include/conversation.php:1412 +#: ../../include/conversation.php:1417 msgid "Sort by Comment Date" msgstr "Berichten met nieuwe reacties bovenaan" -#: ../../include/conversation.php:1416 +#: ../../include/conversation.php:1421 msgid "Posted Order" msgstr "Nieuwe berichten bovenaan" -#: ../../include/conversation.php:1419 +#: ../../include/conversation.php:1424 msgid "Sort by Post Date" msgstr "Nieuwe berichten bovenaan" -#: ../../include/conversation.php:1424 ../../include/widgets.php:82 +#: ../../include/conversation.php:1429 ../../include/widgets.php:89 msgid "Personal" msgstr "Persoonlijk" -#: ../../include/conversation.php:1427 +#: ../../include/conversation.php:1432 msgid "Posts that mention or involve you" msgstr "Alleen berichten die jou vermelden of waar je op een andere manier bij betrokken bent" -#: ../../include/conversation.php:1433 ../../mod/connections.php:211 +#: ../../include/conversation.php:1438 ../../mod/connections.php:211 #: ../../mod/connections.php:224 ../../mod/menu.php:61 msgid "New" msgstr "Nieuw" -#: ../../include/conversation.php:1436 +#: ../../include/conversation.php:1441 msgid "Activity Stream - by date" msgstr "Activiteitenstroom - volgens datum" -#: ../../include/conversation.php:1442 +#: ../../include/conversation.php:1447 msgid "Starred" msgstr "Met ster" -#: ../../include/conversation.php:1445 +#: ../../include/conversation.php:1450 msgid "Favourite Posts" msgstr "Favoriete berichten" -#: ../../include/conversation.php:1452 +#: ../../include/conversation.php:1457 msgid "Spam" msgstr "Spam" -#: ../../include/conversation.php:1455 +#: ../../include/conversation.php:1460 msgid "Posts flagged as SPAM" msgstr "Berichten gemarkeerd als SPAM" -#: ../../include/conversation.php:1491 ../../mod/admin.php:901 +#: ../../include/conversation.php:1496 ../../mod/admin.php:861 msgid "Channel" msgstr "Kanaal" -#: ../../include/conversation.php:1494 +#: ../../include/conversation.php:1499 msgid "Status Messages and Posts" msgstr "Berichten in dit kanaal" -#: ../../include/conversation.php:1503 +#: ../../include/conversation.php:1508 msgid "About" msgstr "Over" -#: ../../include/conversation.php:1506 +#: ../../include/conversation.php:1511 msgid "Profile Details" msgstr "Profiel" -#: ../../include/conversation.php:1524 +#: ../../include/conversation.php:1529 msgid "Files and Storage" msgstr "Bestanden en opslagruimte" -#: ../../include/conversation.php:1533 ../../include/conversation.php:1536 +#: ../../include/conversation.php:1538 ../../include/conversation.php:1541 msgid "Chatrooms" msgstr "Chatkanalen" -#: ../../include/conversation.php:1546 +#: ../../include/conversation.php:1551 msgid "Saved Bookmarks" msgstr "Opgeslagen bladwijzers" -#: ../../include/conversation.php:1557 +#: ../../include/conversation.php:1562 msgid "Manage Webpages" msgstr "Webpagina's beheren" @@ -2152,185 +2155,193 @@ msgstr "Privé-aantekeningen" msgid "Enables a tool to store notes and reminders" msgstr "Schakelt een eenvoudige toepassing in om aantekeningen en herinneringen in op te slaan" -#: ../../include/features.php:35 +#: ../../include/features.php:34 +msgid "Navigation Channel Select" +msgstr "Kanaal kiezen in navigatiemenu" + +#: ../../include/features.php:34 +msgid "Change channels directly from within the navigation dropdown menu" +msgstr "Kies een ander kanaal direct vanuit het dropdown-menu op de navigatiebalk" + +#: ../../include/features.php:38 msgid "Extended Identity Sharing" msgstr "Uitgebreid identiteit delen" -#: ../../include/features.php:35 +#: ../../include/features.php:38 msgid "" "Share your identity with all websites on the internet. When disabled, " "identity is only shared with sites in the matrix." msgstr "Deel jouw RedMatrix-identiteit met alle websites op het internet. Wanneer dit is uitgeschakeld wordt je identiteit alleen binnen het RedMatrix-netwerk gedeeld. Schakel dit alleen als je weet wat je doet." -#: ../../include/features.php:36 +#: ../../include/features.php:39 msgid "Expert Mode" msgstr "Expertmodus" -#: ../../include/features.php:36 +#: ../../include/features.php:39 msgid "Enable Expert Mode to provide advanced configuration options" msgstr "Schakel de expertmodus in voor geavanceerde instellingen" -#: ../../include/features.php:37 +#: ../../include/features.php:40 msgid "Premium Channel" msgstr "Premiumkanaal" -#: ../../include/features.php:37 +#: ../../include/features.php:40 msgid "" "Allows you to set restrictions and terms on those that connect with your " "channel" msgstr "Stelt je in staat om beperkingen en voorwaarden in te stellen voor jouw kanaal" -#: ../../include/features.php:42 +#: ../../include/features.php:45 msgid "Post Composition Features" msgstr "Functies voor het opstellen van berichten" -#: ../../include/features.php:44 +#: ../../include/features.php:47 msgid "Use Markdown" msgstr "Markdown gebruiken" -#: ../../include/features.php:44 +#: ../../include/features.php:47 msgid "Allow use of \"Markdown\" to format posts" msgstr "Sta het gebruik van \"markdown\" toe om berichten mee op te maken." -#: ../../include/features.php:45 +#: ../../include/features.php:48 msgid "Post Preview" msgstr "Voorvertoning" -#: ../../include/features.php:45 +#: ../../include/features.php:48 msgid "Allow previewing posts and comments before publishing them" msgstr "Een optie om je berichten en reacties voor het definitief publiceren voor te vertonen" -#: ../../include/features.php:46 ../../include/widgets.php:503 +#: ../../include/features.php:49 ../../include/widgets.php:510 #: ../../mod/sources.php:88 msgid "Channel Sources" msgstr "Kanaalbronnen" -#: ../../include/features.php:46 +#: ../../include/features.php:49 msgid "Automatically import channel content from other channels or feeds" msgstr "Automatisch inhoud uit andere kanalen of feeds importeren." -#: ../../include/features.php:47 +#: ../../include/features.php:50 msgid "Even More Encryption" msgstr "Extra encryptie" -#: ../../include/features.php:47 +#: ../../include/features.php:50 msgid "" "Allow optional encryption of content end-to-end with a shared secret key" msgstr "Sta toe dat inhoud extra end-to-end wordt versleuteld met een gedeelde geheime sleutel." -#: ../../include/features.php:52 +#: ../../include/features.php:55 msgid "Network and Stream Filtering" msgstr "Netwerk- en streamfilter" -#: ../../include/features.php:53 +#: ../../include/features.php:56 msgid "Search by Date" msgstr "Zoek op datum" -#: ../../include/features.php:53 +#: ../../include/features.php:56 msgid "Ability to select posts by date ranges" msgstr "Mogelijkheid om berichten op datum te filteren " -#: ../../include/features.php:54 +#: ../../include/features.php:57 msgid "Collections Filter" msgstr "Filter op collecties" -#: ../../include/features.php:54 +#: ../../include/features.php:57 msgid "Enable widget to display Network posts only from selected collections" msgstr "Sta de widget toe om netwerkberichten te tonen van bepaalde collecties" -#: ../../include/features.php:55 ../../include/widgets.php:265 +#: ../../include/features.php:58 ../../include/widgets.php:272 msgid "Saved Searches" msgstr "Opgeslagen zoekopdrachten" -#: ../../include/features.php:55 +#: ../../include/features.php:58 msgid "Save search terms for re-use" msgstr "Sla zoekopdrachten op voor hergebruik" -#: ../../include/features.php:56 +#: ../../include/features.php:59 msgid "Network Personal Tab" msgstr "Persoonlijke netwerktab" -#: ../../include/features.php:56 +#: ../../include/features.php:59 msgid "Enable tab to display only Network posts that you've interacted on" msgstr "Sta het toe dat de tab netwerkberichten toont waarmee je interactie had" -#: ../../include/features.php:57 +#: ../../include/features.php:60 msgid "Network New Tab" msgstr "Nieuwe netwerktab" -#: ../../include/features.php:57 +#: ../../include/features.php:60 msgid "Enable tab to display all new Network activity" msgstr "Laat de tab alle nieuwe netwerkactiviteit tonen" -#: ../../include/features.php:58 +#: ../../include/features.php:61 msgid "Affinity Tool" msgstr "Verwantschapsfilter" -#: ../../include/features.php:58 +#: ../../include/features.php:61 msgid "Filter stream activity by depth of relationships" msgstr "Filter wat je in de Matrix ziet op hoe goed je iemand kent of mag" -#: ../../include/features.php:59 +#: ../../include/features.php:62 msgid "Suggest Channels" msgstr "Kanalen voorstellen" -#: ../../include/features.php:59 +#: ../../include/features.php:62 msgid "Show channel suggestions" msgstr "Voor jou mogelijk interessante kanalen voorstellen" -#: ../../include/features.php:64 +#: ../../include/features.php:67 msgid "Post/Comment Tools" msgstr "Bericht- en reactiehulpmiddelen" -#: ../../include/features.php:66 +#: ../../include/features.php:69 msgid "Edit Sent Posts" msgstr "Bewerk verzonden berichten" -#: ../../include/features.php:66 +#: ../../include/features.php:69 msgid "Edit and correct posts and comments after sending" msgstr "Bewerk en corrigeer berichten en reacties nadat deze zijn verzonden" -#: ../../include/features.php:67 +#: ../../include/features.php:70 msgid "Tagging" msgstr "Labelen" -#: ../../include/features.php:67 +#: ../../include/features.php:70 msgid "Ability to tag existing posts" msgstr "Mogelijkheid om bestaande berichten te labelen" -#: ../../include/features.php:68 +#: ../../include/features.php:71 msgid "Post Categories" msgstr "Categorieën berichten" -#: ../../include/features.php:68 +#: ../../include/features.php:71 msgid "Add categories to your posts" msgstr "Voeg categorieën toe aan je berichten" -#: ../../include/features.php:69 +#: ../../include/features.php:72 msgid "Ability to file posts under folders" msgstr "Mogelijkheid om berichten in mappen op te slaan" -#: ../../include/features.php:70 +#: ../../include/features.php:73 msgid "Dislike Posts" msgstr "Vind berichten niet leuk" -#: ../../include/features.php:70 +#: ../../include/features.php:73 msgid "Ability to dislike posts/comments" msgstr "Mogelijkheid om berichten en reacties niet leuk te vinden" -#: ../../include/features.php:71 +#: ../../include/features.php:74 msgid "Star Posts" msgstr "Geef berichten een ster" -#: ../../include/features.php:71 +#: ../../include/features.php:74 msgid "Ability to mark special posts with a star indicator" msgstr "Mogelijkheid om speciale berichten met een ster te markeren" -#: ../../include/features.php:72 +#: ../../include/features.php:75 msgid "Tag Cloud" msgstr "Wolk met trefwoorden/labels" -#: ../../include/features.php:72 +#: ../../include/features.php:75 msgid "Provide a personal tag cloud on your channel page" msgstr "Zorgt voor een persoonlijke wolk met trefwoorden of labels op jouw kanaalpagina" @@ -2384,7 +2395,7 @@ msgstr "Chatkanaal is vol" #: ../../include/items.php:295 ../../mod/profperm.php:23 #: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/like.php:242 -#: ../../mod/frphotos.php:69 ../../index.php:360 +#: ../../index.php:360 msgid "Permission denied" msgstr "Toegang geweigerd" @@ -2421,32 +2432,32 @@ msgstr "Voor alle connecties zichtbaar." msgid "Visible to approved connections." msgstr "Voor alle goedgekeurde connecties zichtbaar." -#: ../../include/items.php:3649 ../../mod/home.php:67 ../../mod/display.php:32 +#: ../../include/items.php:3573 ../../mod/home.php:67 ../../mod/display.php:32 #: ../../mod/filestorage.php:18 ../../mod/admin.php:168 -#: ../../mod/admin.php:932 ../../mod/admin.php:1135 ../../mod/thing.php:78 +#: ../../mod/admin.php:892 ../../mod/admin.php:1095 ../../mod/thing.php:78 #: ../../mod/viewsrc.php:18 msgid "Item not found." msgstr "Item niet gevonden." -#: ../../include/items.php:4082 ../../mod/group.php:38 ../../mod/group.php:140 +#: ../../include/items.php:4006 ../../mod/group.php:38 ../../mod/group.php:140 msgid "Collection not found." msgstr "Collectie niet gevonden." -#: ../../include/items.php:4097 +#: ../../include/items.php:4021 msgid "Collection is empty." msgstr "Collectie is leeg" -#: ../../include/items.php:4104 +#: ../../include/items.php:4028 #, php-format msgid "Collection: %s" msgstr "Collectie: %s" -#: ../../include/items.php:4115 +#: ../../include/items.php:4039 #, php-format msgid "Connection: %s" msgstr "Connectie: %s" -#: ../../include/items.php:4118 +#: ../../include/items.php:4042 msgid "Connection not found." msgstr "Connectie niet gevonden." @@ -2461,7 +2472,7 @@ msgstr "Een verwijderde collectie met deze naam is gereactiveerd. Bestaande item msgid "Default privacy group for new contacts" msgstr "Standaard privacy-collectie voor nieuwe kanalen" -#: ../../include/group.php:253 ../../mod/admin.php:772 +#: ../../include/group.php:253 ../../mod/admin.php:732 msgid "All Channels" msgstr "Alle kanalen" @@ -2485,11 +2496,11 @@ msgstr "Nieuwe collectie aanmaken" msgid "Channels not in any collection" msgstr "Kanalen die zich in geen enkele collectie bevinden" -#: ../../include/group.php:301 ../../include/widgets.php:266 +#: ../../include/group.php:301 ../../include/widgets.php:273 msgid "add" msgstr "toevoegen" -#: ../../include/identity.php:30 ../../mod/item.php:1297 +#: ../../include/identity.php:30 ../../mod/item.php:1296 msgid "Unable to obtain identity information from database" msgstr "Niet in staat om identiteitsinformatie uit de database te verkrijgen" @@ -2526,7 +2537,7 @@ msgstr "Niet in staat om aangemaakte identiteit te vinden" msgid "Default Profile" msgstr "Standaardprofiel" -#: ../../include/identity.php:342 ../../include/widgets.php:400 +#: ../../include/identity.php:342 ../../include/widgets.php:407 #: ../../include/profile_selectors.php:80 ../../mod/connedit.php:473 msgid "Friends" msgstr "Vrienden" @@ -2542,14 +2553,7 @@ msgstr "Opgevraagd kanaal is niet beschikbaar." msgid "Requested profile is not available." msgstr "Opgevraagd profiel is niet beschikbaar" -#: ../../include/identity.php:706 ../../include/widgets.php:128 -#: ../../include/widgets.php:168 ../../include/Contact.php:107 -#: ../../mod/directory.php:183 ../../mod/dirprofile.php:164 -#: ../../mod/suggest.php:51 ../../mod/match.php:62 -msgid "Connect" -msgstr "Verbinden" - -#: ../../include/identity.php:720 ../../mod/profiles.php:695 +#: ../../include/identity.php:720 ../../mod/profiles.php:714 msgid "Change profile photo" msgstr "Profielfoto veranderen" @@ -2561,11 +2565,11 @@ msgstr "Profielen" msgid "Manage/edit profiles" msgstr "Profielen beheren/bewerken" -#: ../../include/identity.php:727 ../../mod/profiles.php:696 +#: ../../include/identity.php:727 ../../mod/profiles.php:715 msgid "Create New Profile" msgstr "Nieuw profiel aanmaken" -#: ../../include/identity.php:741 ../../mod/profiles.php:707 +#: ../../include/identity.php:741 ../../mod/profiles.php:726 msgid "Profile Image" msgstr "Profielfoto" @@ -2573,22 +2577,22 @@ msgstr "Profielfoto" msgid "visible to everybody" msgstr "Voor iedereen zichtbaar" -#: ../../include/identity.php:745 ../../mod/profiles.php:591 -#: ../../mod/profiles.php:711 +#: ../../include/identity.php:745 ../../mod/profiles.php:609 +#: ../../mod/profiles.php:730 msgid "Edit visibility" msgstr "Zichtbaarheid bewerken" -#: ../../include/identity.php:759 ../../include/identity.php:983 +#: ../../include/identity.php:759 ../../include/identity.php:1001 #: ../../mod/directory.php:158 msgid "Gender:" msgstr "Geslacht:" -#: ../../include/identity.php:760 ../../include/identity.php:1027 +#: ../../include/identity.php:760 ../../include/identity.php:1045 #: ../../mod/directory.php:160 msgid "Status:" msgstr "Status:" -#: ../../include/identity.php:761 ../../include/identity.php:1038 +#: ../../include/identity.php:761 ../../include/identity.php:1056 #: ../../mod/directory.php:162 msgid "Homepage:" msgstr "Homepagina:" @@ -2597,146 +2601,146 @@ msgstr "Homepagina:" msgid "Online Now" msgstr "Nu online" -#: ../../include/identity.php:827 ../../include/identity.php:907 +#: ../../include/identity.php:845 ../../include/identity.php:925 #: ../../mod/ping.php:298 msgid "g A l F d" msgstr "G:i, l d F" -#: ../../include/identity.php:828 ../../include/identity.php:908 +#: ../../include/identity.php:846 ../../include/identity.php:926 msgid "F d" msgstr "d F" -#: ../../include/identity.php:873 ../../include/identity.php:948 +#: ../../include/identity.php:891 ../../include/identity.php:966 #: ../../mod/ping.php:320 msgid "[today]" msgstr "[vandaag]" -#: ../../include/identity.php:885 +#: ../../include/identity.php:903 msgid "Birthday Reminders" msgstr "Verjaardagsherinneringen" -#: ../../include/identity.php:886 +#: ../../include/identity.php:904 msgid "Birthdays this week:" msgstr "Verjaardagen deze week:" -#: ../../include/identity.php:941 +#: ../../include/identity.php:959 msgid "[No description]" msgstr "[Geen omschrijving]" -#: ../../include/identity.php:959 +#: ../../include/identity.php:977 msgid "Event Reminders" msgstr "Herinneringen voor gebeurtenissen" -#: ../../include/identity.php:960 +#: ../../include/identity.php:978 msgid "Events this week:" msgstr "Gebeurtenissen deze week:" -#: ../../include/identity.php:981 ../../mod/settings.php:942 +#: ../../include/identity.php:999 ../../mod/settings.php:943 msgid "Full Name:" msgstr "Volledige naam:" -#: ../../include/identity.php:988 +#: ../../include/identity.php:1006 msgid "Like this channel" msgstr "Vind dit kanaal leuk" -#: ../../include/identity.php:1012 +#: ../../include/identity.php:1030 msgid "j F, Y" msgstr "F j Y" -#: ../../include/identity.php:1013 +#: ../../include/identity.php:1031 msgid "j F" msgstr "F j" -#: ../../include/identity.php:1020 +#: ../../include/identity.php:1038 msgid "Birthday:" msgstr "Geboortedatum:" -#: ../../include/identity.php:1024 +#: ../../include/identity.php:1042 msgid "Age:" msgstr "Leeftijd:" -#: ../../include/identity.php:1033 +#: ../../include/identity.php:1051 #, php-format msgid "for %1$d %2$s" msgstr "voor %1$d %2$s" -#: ../../include/identity.php:1036 ../../mod/profiles.php:613 +#: ../../include/identity.php:1054 ../../mod/profiles.php:631 msgid "Sexual Preference:" msgstr "Seksuele voorkeur:" -#: ../../include/identity.php:1040 ../../mod/profiles.php:615 +#: ../../include/identity.php:1058 ../../mod/profiles.php:633 msgid "Hometown:" msgstr "Oorspronkelijk uit:" -#: ../../include/identity.php:1042 +#: ../../include/identity.php:1060 msgid "Tags:" msgstr "Trefwoorden:" -#: ../../include/identity.php:1044 ../../mod/profiles.php:616 +#: ../../include/identity.php:1062 ../../mod/profiles.php:634 msgid "Political Views:" msgstr "Politieke overtuigingen:" -#: ../../include/identity.php:1046 +#: ../../include/identity.php:1064 msgid "Religion:" msgstr "Religie:" -#: ../../include/identity.php:1048 ../../mod/directory.php:164 +#: ../../include/identity.php:1066 ../../mod/directory.php:164 msgid "About:" msgstr "Over:" -#: ../../include/identity.php:1050 +#: ../../include/identity.php:1068 msgid "Hobbies/Interests:" msgstr "Hobby's/interesses:" -#: ../../include/identity.php:1052 ../../mod/profiles.php:619 +#: ../../include/identity.php:1070 ../../mod/profiles.php:637 msgid "Likes:" msgstr "Houdt van:" -#: ../../include/identity.php:1054 ../../mod/profiles.php:620 +#: ../../include/identity.php:1072 ../../mod/profiles.php:638 msgid "Dislikes:" msgstr "Houdt niet van:" -#: ../../include/identity.php:1057 +#: ../../include/identity.php:1075 msgid "Contact information and Social Networks:" msgstr "Contactinformatie en sociale netwerken:" -#: ../../include/identity.php:1059 +#: ../../include/identity.php:1077 msgid "My other channels:" msgstr "Mijn andere kanalen" -#: ../../include/identity.php:1061 +#: ../../include/identity.php:1079 msgid "Musical interests:" msgstr "Muzikale interesses:" -#: ../../include/identity.php:1063 +#: ../../include/identity.php:1081 msgid "Books, literature:" msgstr "Boeken, literatuur:" -#: ../../include/identity.php:1065 +#: ../../include/identity.php:1083 msgid "Television:" msgstr "Televisie:" -#: ../../include/identity.php:1067 +#: ../../include/identity.php:1085 msgid "Film/dance/culture/entertainment:" msgstr "Films/dansen/cultuur/vermaak:" -#: ../../include/identity.php:1069 +#: ../../include/identity.php:1087 msgid "Love/Romance:" msgstr "Liefde/romantiek:" -#: ../../include/identity.php:1071 +#: ../../include/identity.php:1089 msgid "Work/employment:" msgstr "Werk/beroep:" -#: ../../include/identity.php:1073 +#: ../../include/identity.php:1091 msgid "School/education:" msgstr "School/opleiding:" -#: ../../include/identity.php:1093 +#: ../../include/identity.php:1111 msgid "Like this thing" msgstr "Vind dit ding leuk" -#: ../../include/network.php:652 +#: ../../include/network.php:557 msgid "view full size" msgstr "volledige grootte tonen" @@ -2787,136 +2791,136 @@ msgstr "Afzender kan niet bepaald worden." msgid "Stored post could not be verified." msgstr "Opgeslagen bericht kon niet worden geverifieerd." -#: ../../include/widgets.php:80 +#: ../../include/widgets.php:87 msgid "System" msgstr "Systeem" -#: ../../include/widgets.php:83 +#: ../../include/widgets.php:90 msgid "Create Personal App" msgstr "Persoonlijke app maken" -#: ../../include/widgets.php:84 +#: ../../include/widgets.php:91 msgid "Edit Personal App" msgstr "Persoonlijke app bewerken" -#: ../../include/widgets.php:130 ../../mod/suggest.php:53 +#: ../../include/widgets.php:137 ../../mod/suggest.php:53 msgid "Ignore/Hide" msgstr "Negeren/Verbergen" -#: ../../include/widgets.php:136 ../../mod/connections.php:267 +#: ../../include/widgets.php:143 ../../mod/connections.php:267 msgid "Suggestions" msgstr "Voorgestelde kanalen" -#: ../../include/widgets.php:137 +#: ../../include/widgets.php:144 msgid "See more..." msgstr "Meer..." -#: ../../include/widgets.php:159 +#: ../../include/widgets.php:166 #, php-format msgid "You have %1$.0f of %2$.0f allowed connections." msgstr "Je hebt %1$.0f van de %2$.0f toegestane connecties." -#: ../../include/widgets.php:165 +#: ../../include/widgets.php:172 msgid "Add New Connection" msgstr "Nieuwe connectie toevoegen" -#: ../../include/widgets.php:166 +#: ../../include/widgets.php:173 msgid "Enter the channel address" msgstr "Vul het adres van het nieuwe kanaal in" -#: ../../include/widgets.php:167 +#: ../../include/widgets.php:174 msgid "Example: bob@example.com, http://example.com/barbara" msgstr "Voorbeeld: bob@example.com, http://example.com/barbara" -#: ../../include/widgets.php:184 +#: ../../include/widgets.php:191 msgid "Notes" msgstr "Aantekeningen" -#: ../../include/widgets.php:256 +#: ../../include/widgets.php:263 msgid "Remove term" msgstr "Verwijder zoekterm" -#: ../../include/widgets.php:335 +#: ../../include/widgets.php:342 msgid "Archives" msgstr "Archieven" -#: ../../include/widgets.php:397 +#: ../../include/widgets.php:404 msgid "Refresh" msgstr "Vernieuwen" -#: ../../include/widgets.php:398 ../../mod/connedit.php:470 +#: ../../include/widgets.php:405 ../../mod/connedit.php:470 msgid "Me" msgstr "Ik" -#: ../../include/widgets.php:399 ../../mod/connedit.php:472 +#: ../../include/widgets.php:406 ../../mod/connedit.php:472 msgid "Best Friends" msgstr "Goede vrienden" -#: ../../include/widgets.php:401 +#: ../../include/widgets.php:408 msgid "Co-workers" msgstr "Collega's" -#: ../../include/widgets.php:402 ../../mod/connedit.php:474 +#: ../../include/widgets.php:409 ../../mod/connedit.php:474 msgid "Former Friends" msgstr "Oude vrienden" -#: ../../include/widgets.php:403 ../../mod/connedit.php:475 +#: ../../include/widgets.php:410 ../../mod/connedit.php:475 msgid "Acquaintances" msgstr "Kennissen" -#: ../../include/widgets.php:404 +#: ../../include/widgets.php:411 msgid "Everybody" msgstr "Iedereen" -#: ../../include/widgets.php:436 +#: ../../include/widgets.php:443 msgid "Account settings" msgstr "Account" -#: ../../include/widgets.php:442 +#: ../../include/widgets.php:449 msgid "Channel settings" msgstr "Kanaal" -#: ../../include/widgets.php:448 +#: ../../include/widgets.php:455 msgid "Additional features" msgstr "Extra functies" -#: ../../include/widgets.php:454 +#: ../../include/widgets.php:461 msgid "Feature settings" msgstr "Plug-ins" -#: ../../include/widgets.php:460 +#: ../../include/widgets.php:467 msgid "Display settings" msgstr "Weergave" -#: ../../include/widgets.php:466 +#: ../../include/widgets.php:473 msgid "Connected apps" msgstr "Verbonden applicaties" -#: ../../include/widgets.php:472 +#: ../../include/widgets.php:479 msgid "Export channel" msgstr "Kanaal exporteren" -#: ../../include/widgets.php:484 +#: ../../include/widgets.php:491 msgid "Automatic Permissions (Advanced)" msgstr "Automatische privacy-rechten (geavanceerd)" -#: ../../include/widgets.php:494 +#: ../../include/widgets.php:501 msgid "Premium Channel Settings" msgstr "Instellingen premiumkanaal" -#: ../../include/widgets.php:531 +#: ../../include/widgets.php:538 msgid "Check Mail" msgstr "Controleer op nieuwe berichten" -#: ../../include/widgets.php:612 +#: ../../include/widgets.php:619 msgid "Chat Rooms" msgstr "Chatkanalen" -#: ../../include/widgets.php:630 +#: ../../include/widgets.php:637 msgid "Bookmarked Chatrooms" msgstr "Bladwijzers van chatkanalen" -#: ../../include/widgets.php:648 +#: ../../include/widgets.php:655 msgid "Suggested Chatrooms" msgstr "Voorgestelde chatkanalen" @@ -3033,21 +3037,21 @@ msgstr "Reactie" #: ../../include/ItemObject.php:583 ../../mod/mood.php:135 #: ../../mod/settings.php:517 ../../mod/settings.php:629 -#: ../../mod/settings.php:657 ../../mod/settings.php:681 -#: ../../mod/settings.php:754 ../../mod/settings.php:934 -#: ../../mod/poke.php:166 ../../mod/profiles.php:589 ../../mod/chat.php:177 +#: ../../mod/settings.php:658 ../../mod/settings.php:682 +#: ../../mod/settings.php:755 ../../mod/settings.php:935 +#: ../../mod/poke.php:166 ../../mod/profiles.php:607 ../../mod/chat.php:177 #: ../../mod/chat.php:211 ../../mod/connect.php:92 ../../mod/connedit.php:518 #: ../../mod/setup.php:307 ../../mod/setup.php:350 ../../mod/pdledit.php:58 #: ../../mod/photos.php:563 ../../mod/photos.php:674 ../../mod/photos.php:962 #: ../../mod/photos.php:1002 ../../mod/photos.php:1089 #: ../../mod/sources.php:104 ../../mod/sources.php:138 #: ../../mod/events.php:511 ../../mod/filestorage.php:137 -#: ../../mod/fsuggest.php:108 ../../mod/group.php:81 ../../mod/admin.php:451 -#: ../../mod/admin.php:760 ../../mod/admin.php:895 ../../mod/admin.php:1028 -#: ../../mod/admin.php:1227 ../../mod/admin.php:1314 ../../mod/thing.php:286 +#: ../../mod/fsuggest.php:108 ../../mod/group.php:81 ../../mod/admin.php:411 +#: ../../mod/admin.php:720 ../../mod/admin.php:855 ../../mod/admin.php:988 +#: ../../mod/admin.php:1187 ../../mod/admin.php:1274 ../../mod/thing.php:286 #: ../../mod/thing.php:329 ../../mod/import.php:393 ../../mod/invite.php:142 #: ../../mod/mail.php:345 ../../mod/appman.php:99 ../../mod/poll.php:68 -#: ../../mod/frphotos.php:84 ../../view/theme/apw/php/config.php:256 +#: ../../view/theme/apw/php/config.php:256 #: ../../view/theme/blogga/php/config.php:67 #: ../../view/theme/blogga/view/theme/blog/config.php:67 #: ../../view/theme/redbasic/php/config.php:99 @@ -3211,6 +3215,11 @@ msgstr "Nieuw venster" msgid "Open the selected location in a different window or browser tab" msgstr "Open de geselecteerde locatie in een ander venster of tab" +#: ../../include/Contact.php:211 ../../mod/admin.php:646 +#, php-format +msgid "User '%s' deleted" +msgstr "Account '%s' verwijderd" + #: ../../include/profile_selectors.php:6 #: ../../include/profile_selectors.php:23 msgid "Male" @@ -3628,7 +3637,7 @@ msgstr "Nieuw menu-element" msgid "Menu Item Permissions" msgstr "Privacy-rechten menu-item" -#: ../../mod/mitem.php:134 ../../mod/mitem.php:177 ../../mod/settings.php:967 +#: ../../mod/mitem.php:134 ../../mod/mitem.php:177 ../../mod/settings.php:968 msgid "(click to open/close)" msgstr "(klik om te openen/sluiten)" @@ -3819,7 +3828,7 @@ msgstr "Bevestigen:" msgid "Leave password fields blank unless changing" msgstr "Laat de wachtwoordvelden leeg, behalve wanneer je deze wil veranderen" -#: ../../mod/settings.php:630 ../../mod/settings.php:943 +#: ../../mod/settings.php:630 ../../mod/settings.php:944 msgid "Email Address:" msgstr "E-mailadres:" @@ -3827,324 +3836,328 @@ msgstr "E-mailadres:" msgid "Remove Account" msgstr "Account verwijderen" -#: ../../mod/settings.php:632 ../../mod/settings.php:1006 +#: ../../mod/settings.php:632 +msgid "Remove this account from this server including all its channels" +msgstr "Dit account en al zijn kanalen van deze RedMatrix-hub verwijderen" + +#: ../../mod/settings.php:633 ../../mod/settings.php:1007 msgid "Warning: This action is permanent and cannot be reversed." msgstr "Waarschuwing: Deze handeling is van permanente aard en kan niet meer worden teruggedraaid." -#: ../../mod/settings.php:648 +#: ../../mod/settings.php:649 msgid "Off" msgstr "Uit" -#: ../../mod/settings.php:648 +#: ../../mod/settings.php:649 msgid "On" msgstr "Aan" -#: ../../mod/settings.php:655 +#: ../../mod/settings.php:656 msgid "Additional Features" msgstr "Extra functies" -#: ../../mod/settings.php:680 +#: ../../mod/settings.php:681 msgid "Connector Settings" msgstr "Instellingen externe koppelingen" -#: ../../mod/settings.php:710 ../../mod/admin.php:399 +#: ../../mod/settings.php:711 ../../mod/admin.php:359 msgid "No special theme for mobile devices" msgstr "Geen speciaal thema voor mobiele apparaten" -#: ../../mod/settings.php:719 +#: ../../mod/settings.php:720 #, php-format msgid "%s - (Experimental)" msgstr "%s - (experimenteel)" -#: ../../mod/settings.php:752 +#: ../../mod/settings.php:753 msgid "Display Settings" msgstr "Weergave-instellingen" -#: ../../mod/settings.php:758 +#: ../../mod/settings.php:759 msgid "Display Theme:" msgstr "Gebruik thema:" -#: ../../mod/settings.php:759 +#: ../../mod/settings.php:760 msgid "Mobile Theme:" msgstr "Mobiel thema:" -#: ../../mod/settings.php:760 +#: ../../mod/settings.php:761 msgid "Enable user zoom on mobile devices" msgstr "Inzoomen op smartphones en tablets toestaan" -#: ../../mod/settings.php:761 +#: ../../mod/settings.php:762 msgid "Update browser every xx seconds" msgstr "Ververs de webbrowser om de zoveel seconde" -#: ../../mod/settings.php:761 +#: ../../mod/settings.php:762 msgid "Minimum of 10 seconds, no maximum" msgstr "Minimaal 10 seconde, geen maximum" -#: ../../mod/settings.php:762 +#: ../../mod/settings.php:763 msgid "Maximum number of conversations to load at any time:" msgstr "Maximaal aantal conversaties die per keer geladen worden:" -#: ../../mod/settings.php:762 +#: ../../mod/settings.php:763 msgid "Maximum of 100 items" msgstr "Maximaal 100 conversaties" -#: ../../mod/settings.php:763 +#: ../../mod/settings.php:764 msgid "Don't show emoticons" msgstr "Geen emoticons weergeven" -#: ../../mod/settings.php:764 +#: ../../mod/settings.php:765 msgid "System Page Layout Editor - (advanced)" msgstr "Lay-out bewerken van systeempagina's (geavanceerd)" -#: ../../mod/settings.php:800 +#: ../../mod/settings.php:801 msgid "Nobody except yourself" msgstr "Niemand, behalve jezelf" -#: ../../mod/settings.php:801 +#: ../../mod/settings.php:802 msgid "Only those you specifically allow" msgstr "Alleen connecties met uitdrukkelijke toestemming" -#: ../../mod/settings.php:802 +#: ../../mod/settings.php:803 msgid "Approved connections" msgstr "Geaccepteerde connecties" -#: ../../mod/settings.php:803 +#: ../../mod/settings.php:804 msgid "Any connections" msgstr "Alle connecties" -#: ../../mod/settings.php:804 +#: ../../mod/settings.php:805 msgid "Anybody on this website" msgstr "Iedereen op deze hub" -#: ../../mod/settings.php:805 +#: ../../mod/settings.php:806 msgid "Anybody in this network" msgstr "Iedereen in dit netwerk" -#: ../../mod/settings.php:806 +#: ../../mod/settings.php:807 msgid "Anybody authenticated" msgstr "Geauthenticeerd" -#: ../../mod/settings.php:807 +#: ../../mod/settings.php:808 msgid "Anybody on the internet" msgstr "Iedereen op het internet" -#: ../../mod/settings.php:884 +#: ../../mod/settings.php:885 msgid "Publish your default profile in the network directory" msgstr "Publiceer je standaardprofiel in de kanalengids" -#: ../../mod/settings.php:884 ../../mod/settings.php:889 -#: ../../mod/settings.php:960 ../../mod/api.php:106 ../../mod/profiles.php:566 -#: ../../mod/admin.php:429 +#: ../../mod/settings.php:885 ../../mod/settings.php:890 +#: ../../mod/settings.php:961 ../../mod/api.php:106 ../../mod/profiles.php:566 +#: ../../mod/admin.php:389 msgid "No" msgstr "Nee" -#: ../../mod/settings.php:884 ../../mod/settings.php:889 -#: ../../mod/settings.php:960 ../../mod/api.php:105 ../../mod/profiles.php:565 -#: ../../mod/admin.php:431 +#: ../../mod/settings.php:885 ../../mod/settings.php:890 +#: ../../mod/settings.php:961 ../../mod/api.php:105 ../../mod/profiles.php:565 +#: ../../mod/admin.php:391 msgid "Yes" msgstr "Ja" -#: ../../mod/settings.php:889 +#: ../../mod/settings.php:890 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "Sta ons toe om jouw kanaal als mogelijke connectie voor te stellen aan nieuwe kanalen" -#: ../../mod/settings.php:893 ../../mod/profile_photo.php:365 +#: ../../mod/settings.php:894 ../../mod/profile_photo.php:365 msgid "or" msgstr "of" -#: ../../mod/settings.php:898 +#: ../../mod/settings.php:899 msgid "Your channel address is" msgstr "Jouw kanaaladres is" -#: ../../mod/settings.php:932 +#: ../../mod/settings.php:933 msgid "Channel Settings" msgstr "Kanaal-instellingen" -#: ../../mod/settings.php:941 +#: ../../mod/settings.php:942 msgid "Basic Settings" msgstr "Basis-instellingen" -#: ../../mod/settings.php:944 +#: ../../mod/settings.php:945 msgid "Your Timezone:" msgstr "Jouw tijdzone:" -#: ../../mod/settings.php:945 +#: ../../mod/settings.php:946 msgid "Default Post Location:" msgstr "Standaardlocatie bericht:" -#: ../../mod/settings.php:945 +#: ../../mod/settings.php:946 msgid "Geographical location to display on your posts" msgstr "Geografische locatie die bij het bericht moet worden vermeld" -#: ../../mod/settings.php:946 +#: ../../mod/settings.php:947 msgid "Use Browser Location:" msgstr "Locatie van webbrowser gebruiken:" -#: ../../mod/settings.php:948 +#: ../../mod/settings.php:949 msgid "Adult Content" msgstr "Inhoud voor volwassenen" -#: ../../mod/settings.php:948 +#: ../../mod/settings.php:949 msgid "" "This channel frequently or regularly publishes adult content. (Please tag " "any adult material and/or nudity with #NSFW)" msgstr "Dit kanaal publiceert regelmatig of vaak materiaal dat alleen geschikt is voor volwassen. (Gebruik de hashtag #NSFW in berichten met een seksueel getinte inhoud of ander voor minderjarigen ongeschikt materiaal)" -#: ../../mod/settings.php:950 +#: ../../mod/settings.php:951 msgid "Security and Privacy Settings" msgstr "Veiligheids- privacy-instellingen" -#: ../../mod/settings.php:952 +#: ../../mod/settings.php:953 msgid "Hide my online presence" msgstr "Verberg mijn aanwezigheid" -#: ../../mod/settings.php:952 +#: ../../mod/settings.php:953 msgid "Prevents displaying in your profile that you are online" msgstr "Voorkomt dat op je kanaal te zien valt dat je momenteel op de RedMatrix aanwezig bent" -#: ../../mod/settings.php:954 +#: ../../mod/settings.php:955 msgid "Simple Privacy Settings:" msgstr "Eenvoudige privacy-instellingen:" -#: ../../mod/settings.php:955 +#: ../../mod/settings.php:956 msgid "" "Very Public - extremely permissive (should be used with caution)" msgstr "Zeer openbaar (kanaal staat volledig open - moet met grote zorgvuldigheid gebruikt worden)" -#: ../../mod/settings.php:956 +#: ../../mod/settings.php:957 msgid "" "Typical - default public, privacy when desired (similar to social " "network permissions but with improved privacy)" msgstr "Normaal (standaard openbaar, maar privacy wanneer noodzakelijk - vergelijkbaar met die van sociale netwerken, maar met verbeterde privacy)" -#: ../../mod/settings.php:957 +#: ../../mod/settings.php:958 msgid "Private - default private, never open or public" msgstr "Privé (standaard privé en nooit openbaar)" -#: ../../mod/settings.php:958 +#: ../../mod/settings.php:959 msgid "Blocked - default blocked to/from everybody" msgstr "Geblokkeerd (standaard geblokkeerd naar/van iedereen)" -#: ../../mod/settings.php:960 +#: ../../mod/settings.php:961 msgid "Allow others to tag your posts" msgstr "Anderen toestaan om je berichten te labelen" -#: ../../mod/settings.php:960 +#: ../../mod/settings.php:961 msgid "" "Often used by the community to retro-actively flag inappropriate content" msgstr "Vaak in groepen/forums gebruikt om met terugwerkende kracht ongepast materiaal te markeren" -#: ../../mod/settings.php:962 +#: ../../mod/settings.php:963 msgid "Advanced Privacy Settings" msgstr "Geavanceerde privacy-instellingen" -#: ../../mod/settings.php:964 +#: ../../mod/settings.php:965 msgid "Expire other channel content after this many days" msgstr "Inhoud van andere kanalen na zoveel aantal dagen laten verlopen:" -#: ../../mod/settings.php:964 +#: ../../mod/settings.php:965 msgid "0 or blank prevents expiration" msgstr "0 of leeg voorkomt het verlopen" -#: ../../mod/settings.php:965 +#: ../../mod/settings.php:966 msgid "Maximum Friend Requests/Day:" msgstr "Maximum aantal connectieverzoeken per dag:" -#: ../../mod/settings.php:965 +#: ../../mod/settings.php:966 msgid "May reduce spam activity" msgstr "Kan eventuele spam verminderen" -#: ../../mod/settings.php:966 +#: ../../mod/settings.php:967 msgid "Default Post Permissions" msgstr "Standaard privacy-rechten voor nieuwe berichten" -#: ../../mod/settings.php:978 +#: ../../mod/settings.php:979 msgid "Maximum private messages per day from unknown people:" msgstr "Maximum aantal privé-berichten per dag van onbekende personen:" -#: ../../mod/settings.php:978 +#: ../../mod/settings.php:979 msgid "Useful to reduce spamming" msgstr "Kan eventuele spam verminderen" -#: ../../mod/settings.php:981 +#: ../../mod/settings.php:982 msgid "Notification Settings" msgstr "Notificatie-instellingen" -#: ../../mod/settings.php:982 +#: ../../mod/settings.php:983 msgid "By default post a status message when:" msgstr "Plaats automatisch een statusbericht wanneer:" -#: ../../mod/settings.php:983 +#: ../../mod/settings.php:984 msgid "accepting a friend request" msgstr "Een connectieverzoek wordt geaccepteerd" -#: ../../mod/settings.php:984 +#: ../../mod/settings.php:985 msgid "joining a forum/community" msgstr "Je lid wordt van een groep/forum" -#: ../../mod/settings.php:985 +#: ../../mod/settings.php:986 msgid "making an interesting profile change" msgstr "Er sprake is van een interessante profielwijziging" -#: ../../mod/settings.php:986 +#: ../../mod/settings.php:987 msgid "Send a notification email when:" msgstr "Verzend een notificatie per e-mail wanneer:" -#: ../../mod/settings.php:987 +#: ../../mod/settings.php:988 msgid "You receive a connection request" msgstr "Je een connectieverzoek ontvangt" -#: ../../mod/settings.php:988 +#: ../../mod/settings.php:989 msgid "Your connections are confirmed" msgstr "Jouw connecties zijn bevestigd" -#: ../../mod/settings.php:989 +#: ../../mod/settings.php:990 msgid "Someone writes on your profile wall" msgstr "Iemand iets op jouw kanaal heeft geschreven" -#: ../../mod/settings.php:990 +#: ../../mod/settings.php:991 msgid "Someone writes a followup comment" msgstr "Iemand een reactie schrijft" -#: ../../mod/settings.php:991 +#: ../../mod/settings.php:992 msgid "You receive a private message" msgstr "Je een privé-bericht ontvangt" -#: ../../mod/settings.php:992 +#: ../../mod/settings.php:993 msgid "You receive a friend suggestion" msgstr "Je een kanaalvoorstel ontvangt" -#: ../../mod/settings.php:993 +#: ../../mod/settings.php:994 msgid "You are tagged in a post" msgstr "Je expliciet in een bericht bent genoemd" -#: ../../mod/settings.php:994 +#: ../../mod/settings.php:995 msgid "You are poked/prodded/etc. in a post" msgstr "Je bent in een bericht aangestoten/gepord/etc." -#: ../../mod/settings.php:997 +#: ../../mod/settings.php:998 msgid "Advanced Account/Page Type Settings" msgstr "Instellingen geavanceerd account/paginatype" -#: ../../mod/settings.php:998 +#: ../../mod/settings.php:999 msgid "Change the behaviour of this account for special situations" msgstr "Verander het gedrag van dit account voor speciale situaties" -#: ../../mod/settings.php:1001 +#: ../../mod/settings.php:1002 msgid "" "Please enable expert mode (in Settings > " "Additional features) to adjust!" msgstr "Schakel de expertmodus in (in Instellingen > Extra functies) om aan te kunnen passen!" -#: ../../mod/settings.php:1002 +#: ../../mod/settings.php:1003 msgid "Miscellaneous Settings" msgstr "Diverse instellingen" -#: ../../mod/settings.php:1004 +#: ../../mod/settings.php:1005 msgid "Personal menu to display in your channel pages" msgstr "Persoonlijk menu om op je kanaalpagina's weer te geven" -#: ../../mod/settings.php:1005 +#: ../../mod/settings.php:1006 msgid "Remove this channel" msgstr "Verwijder dit kanaal" @@ -4369,7 +4382,7 @@ msgstr "Homepage" msgid "Interests" msgstr "Interesses" -#: ../../mod/profiles.php:397 ../../mod/admin.php:902 +#: ../../mod/profiles.php:397 ../../mod/admin.php:862 msgid "Address" msgstr "Kanaaladres" @@ -4385,177 +4398,177 @@ msgstr "Profiel bijgewerkt" msgid "Hide your contact/friend list from viewers of this profile?" msgstr "Laat de lijst met connecties niet aan bezoekers van dit profiel zien." -#: ../../mod/profiles.php:588 +#: ../../mod/profiles.php:606 msgid "Edit Profile Details" msgstr "Profiel bewerken" -#: ../../mod/profiles.php:590 +#: ../../mod/profiles.php:608 msgid "View this profile" msgstr "Profiel weergeven" -#: ../../mod/profiles.php:592 +#: ../../mod/profiles.php:610 msgid "Change Profile Photo" msgstr "Profielfoto wijzigen" -#: ../../mod/profiles.php:593 +#: ../../mod/profiles.php:611 msgid "Create a new profile using these settings" msgstr "Een nieuw profiel aanmaken met dit profiel als basis" -#: ../../mod/profiles.php:594 +#: ../../mod/profiles.php:612 msgid "Clone this profile" msgstr "Dit profiel klonen" -#: ../../mod/profiles.php:595 +#: ../../mod/profiles.php:613 msgid "Delete this profile" msgstr "Dit profiel verwijderen" -#: ../../mod/profiles.php:597 +#: ../../mod/profiles.php:615 msgid "Import profile from file" msgstr "Profiel vanuit bestand importeren" -#: ../../mod/profiles.php:598 +#: ../../mod/profiles.php:616 msgid "Export profile to file" msgstr "Profiel naar bestand exporteren" -#: ../../mod/profiles.php:599 +#: ../../mod/profiles.php:617 msgid "Profile Name:" msgstr "Profielnaam:" -#: ../../mod/profiles.php:600 +#: ../../mod/profiles.php:618 msgid "Your Full Name:" msgstr "Jouw volledige naam:" -#: ../../mod/profiles.php:601 +#: ../../mod/profiles.php:619 msgid "Title/Description:" msgstr "Titel/omschrijving:" -#: ../../mod/profiles.php:602 +#: ../../mod/profiles.php:620 msgid "Your Gender:" msgstr "Jouw geslacht" -#: ../../mod/profiles.php:603 +#: ../../mod/profiles.php:621 #, php-format msgid "Birthday (%s):" msgstr "Geboortedag (%s)" -#: ../../mod/profiles.php:604 +#: ../../mod/profiles.php:622 msgid "Street Address:" msgstr "Straat en huisnummer:" -#: ../../mod/profiles.php:605 +#: ../../mod/profiles.php:623 msgid "Locality/City:" msgstr "Woonplaats:" -#: ../../mod/profiles.php:606 +#: ../../mod/profiles.php:624 msgid "Postal/Zip Code:" msgstr "Postcode:" -#: ../../mod/profiles.php:607 +#: ../../mod/profiles.php:625 msgid "Country:" msgstr "Land:" -#: ../../mod/profiles.php:608 +#: ../../mod/profiles.php:626 msgid "Region/State:" msgstr "Provincie/gewest/deelstaat:" -#: ../../mod/profiles.php:609 +#: ../../mod/profiles.php:627 msgid " Marital Status:" msgstr " Huwelijkse staat:" -#: ../../mod/profiles.php:610 +#: ../../mod/profiles.php:628 msgid "Who: (if applicable)" msgstr "Wie (wanneer toepasselijk):" -#: ../../mod/profiles.php:611 +#: ../../mod/profiles.php:629 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "Voorbeelden: karin123, Karin Jansen, cathy@voorbeeld.nl" -#: ../../mod/profiles.php:612 +#: ../../mod/profiles.php:630 msgid "Since [date]:" msgstr "Sinds [datum]:" -#: ../../mod/profiles.php:614 +#: ../../mod/profiles.php:632 msgid "Homepage URL:" msgstr "Adres homepage:" -#: ../../mod/profiles.php:617 +#: ../../mod/profiles.php:635 msgid "Religious Views:" msgstr "Religieuze overtuigingen" -#: ../../mod/profiles.php:618 +#: ../../mod/profiles.php:636 msgid "Keywords:" msgstr "Trefwoorden" -#: ../../mod/profiles.php:621 +#: ../../mod/profiles.php:639 msgid "Example: fishing photography software" msgstr "Voorbeeld: muziek, fotografie, software" -#: ../../mod/profiles.php:622 +#: ../../mod/profiles.php:640 msgid "Used in directory listings" msgstr "Wordt in de kanalengids gebruikt" -#: ../../mod/profiles.php:623 +#: ../../mod/profiles.php:641 msgid "Tell us about yourself..." msgstr "Vertel ons iets over jezelf..." -#: ../../mod/profiles.php:624 +#: ../../mod/profiles.php:642 msgid "Hobbies/Interests" msgstr "Hobby's/interesses" -#: ../../mod/profiles.php:625 +#: ../../mod/profiles.php:643 msgid "Contact information and Social Networks" msgstr "Contactinformatie en sociale netwerken" -#: ../../mod/profiles.php:626 +#: ../../mod/profiles.php:644 msgid "My other channels" msgstr "Mijn andere kanalen" -#: ../../mod/profiles.php:627 +#: ../../mod/profiles.php:645 msgid "Musical interests" msgstr "Muzikale interesses" -#: ../../mod/profiles.php:628 +#: ../../mod/profiles.php:646 msgid "Books, literature" msgstr "Boeken/literatuur" -#: ../../mod/profiles.php:629 +#: ../../mod/profiles.php:647 msgid "Television" msgstr "Televisie" -#: ../../mod/profiles.php:630 +#: ../../mod/profiles.php:648 msgid "Film/dance/culture/entertainment" msgstr "Film/dans/cultuur/entertainment" -#: ../../mod/profiles.php:631 +#: ../../mod/profiles.php:649 msgid "Love/romance" msgstr "Liefde/romantiek" -#: ../../mod/profiles.php:632 +#: ../../mod/profiles.php:650 msgid "Work/employment" msgstr "Werk/arbeid" -#: ../../mod/profiles.php:633 +#: ../../mod/profiles.php:651 msgid "School/education" msgstr "School/onderwijs" -#: ../../mod/profiles.php:639 +#: ../../mod/profiles.php:657 msgid "This is your default profile." msgstr "Dit is jouw standaardprofiel" -#: ../../mod/profiles.php:650 ../../mod/directory.php:143 +#: ../../mod/profiles.php:668 ../../mod/directory.php:143 #: ../../mod/dirprofile.php:92 msgid "Age: " msgstr "Leeftijd:" -#: ../../mod/profiles.php:692 +#: ../../mod/profiles.php:711 msgid "Edit/Manage Profiles" msgstr "Profielen bewerken/beheren" -#: ../../mod/profiles.php:693 +#: ../../mod/profiles.php:712 msgid "Add profile things" msgstr "Dingen aan je profiel toevoegen" -#: ../../mod/profiles.php:694 +#: ../../mod/profiles.php:713 msgid "Include desirable objects in your profile" msgstr "Voeg door jou gewenste dingen aan jouw profiel toe" @@ -4736,7 +4749,7 @@ msgstr "Ik accepteer de %s van deze RedMatrix-hub" msgid "I am over 13 years of age and accept the %s for this website" msgstr "Ik accepteer de %s van deze RedMatrix-hub" -#: ../../mod/register.php:204 ../../mod/admin.php:452 +#: ../../mod/register.php:204 ../../mod/admin.php:412 msgid "Registration" msgstr "Registratie" @@ -4991,20 +5004,20 @@ msgstr "Toon alleen gearchiveerde connecties" msgid "Only show hidden connections" msgstr "Toon alleen verborgen connecties" -#: ../../mod/connections.php:368 +#: ../../mod/connections.php:371 #, php-format msgid "%1$s [%2$s]" msgstr "%1$s [%2$s]" -#: ../../mod/connections.php:369 +#: ../../mod/connections.php:372 msgid "Edit contact" msgstr "Connectie bewerken" -#: ../../mod/connections.php:390 +#: ../../mod/connections.php:393 msgid "Search your connections" msgstr "Doorzoek jouw connecties" -#: ../../mod/connections.php:391 +#: ../../mod/connections.php:394 msgid "Finding: " msgstr "Zoeken naar: " @@ -5096,12 +5109,12 @@ msgid "View recent posts and comments" msgstr "Recente berichten en reacties weergeven" #: ../../mod/connedit.php:414 ../../mod/connedit.php:557 -#: ../../mod/admin.php:769 +#: ../../mod/admin.php:729 msgid "Unblock" msgstr "Deblokkeren" #: ../../mod/connedit.php:414 ../../mod/connedit.php:557 -#: ../../mod/admin.php:768 +#: ../../mod/admin.php:728 msgid "Block" msgstr "Blokkeren" @@ -6344,7 +6357,7 @@ msgstr "Kies een label om te verwijderen" msgid "Theme settings updated." msgstr "Thema-instellingen bijgewerkt." -#: ../../mod/admin.php:97 ../../mod/admin.php:450 +#: ../../mod/admin.php:97 ../../mod/admin.php:410 msgid "Site" msgstr "Hub-instellingen" @@ -6352,19 +6365,19 @@ msgstr "Hub-instellingen" msgid "Accounts" msgstr "Accounts" -#: ../../mod/admin.php:99 ../../mod/admin.php:894 +#: ../../mod/admin.php:99 ../../mod/admin.php:854 msgid "Channels" msgstr "Kanalen" -#: ../../mod/admin.php:100 ../../mod/admin.php:985 ../../mod/admin.php:1027 +#: ../../mod/admin.php:100 ../../mod/admin.php:945 ../../mod/admin.php:987 msgid "Plugins" msgstr "Plug-ins" -#: ../../mod/admin.php:101 ../../mod/admin.php:1190 ../../mod/admin.php:1226 +#: ../../mod/admin.php:101 ../../mod/admin.php:1150 ../../mod/admin.php:1186 msgid "Themes" msgstr "Thema's" -#: ../../mod/admin.php:102 ../../mod/admin.php:550 +#: ../../mod/admin.php:102 ../../mod/admin.php:510 msgid "Server" msgstr "Hubbeheer" @@ -6376,7 +6389,7 @@ msgstr "Profielconfiguratie" msgid "DB updates" msgstr "Database-updates" -#: ../../mod/admin.php:118 ../../mod/admin.php:125 ../../mod/admin.php:1313 +#: ../../mod/admin.php:118 ../../mod/admin.php:125 ../../mod/admin.php:1273 msgid "Logs" msgstr "Logboeken" @@ -6392,10 +6405,10 @@ msgstr "Accountregistraties die op goedkeuring wachten" msgid "Message queues" msgstr "Berichtenwachtrij" -#: ../../mod/admin.php:211 ../../mod/admin.php:449 ../../mod/admin.php:549 -#: ../../mod/admin.php:758 ../../mod/admin.php:893 ../../mod/admin.php:984 -#: ../../mod/admin.php:1026 ../../mod/admin.php:1189 ../../mod/admin.php:1225 -#: ../../mod/admin.php:1312 +#: ../../mod/admin.php:211 ../../mod/admin.php:409 ../../mod/admin.php:509 +#: ../../mod/admin.php:718 ../../mod/admin.php:853 ../../mod/admin.php:944 +#: ../../mod/admin.php:986 ../../mod/admin.php:1149 ../../mod/admin.php:1185 +#: ../../mod/admin.php:1272 msgid "Administration" msgstr "Beheer" @@ -6407,7 +6420,7 @@ msgstr "Samenvatting" msgid "Registered users" msgstr "Geregistreerde gebruikers" -#: ../../mod/admin.php:216 ../../mod/admin.php:553 +#: ../../mod/admin.php:216 ../../mod/admin.php:513 msgid "Pending registrations" msgstr "Accounts die op goedkeuring wachten" @@ -6415,520 +6428,523 @@ msgstr "Accounts die op goedkeuring wachten" msgid "Version" msgstr "Versie" -#: ../../mod/admin.php:219 ../../mod/admin.php:554 +#: ../../mod/admin.php:219 ../../mod/admin.php:514 msgid "Active plugins" msgstr "Ingeschakelde plug-ins" -#: ../../mod/admin.php:370 +#: ../../mod/admin.php:330 msgid "Site settings updated." msgstr "Hub-instellingen bijgewerkt." -#: ../../mod/admin.php:401 +#: ../../mod/admin.php:361 msgid "No special theme for accessibility" msgstr "Geen speciaal thema voor universele toegang" -#: ../../mod/admin.php:430 +#: ../../mod/admin.php:390 msgid "Yes - with approval" msgstr "Ja - met goedkeuring" -#: ../../mod/admin.php:436 +#: ../../mod/admin.php:396 msgid "My site is not a public server" msgstr "Mijn RedMatrix-hub is niet openbaar" -#: ../../mod/admin.php:437 +#: ../../mod/admin.php:397 msgid "My site has paid access only" msgstr "Mijn RedMatrix-hub kent alleen betaalde toegang" -#: ../../mod/admin.php:438 +#: ../../mod/admin.php:398 msgid "My site has free access only" msgstr "Mijn RedMatrix-hub kent alleen gratis toegang" -#: ../../mod/admin.php:439 +#: ../../mod/admin.php:399 msgid "My site offers free accounts with optional paid upgrades" msgstr "Mijn RedMatrix-hub biedt gratis accounts aan met betaalde uitbreidingen als optie" -#: ../../mod/admin.php:453 +#: ../../mod/admin.php:413 msgid "File upload" msgstr "Bestand uploaden" -#: ../../mod/admin.php:454 +#: ../../mod/admin.php:414 msgid "Policies" msgstr "Beleid" -#: ../../mod/admin.php:459 +#: ../../mod/admin.php:419 msgid "Site name" msgstr "Naam van deze RedMatrix-hub" -#: ../../mod/admin.php:460 +#: ../../mod/admin.php:420 msgid "Banner/Logo" msgstr "Banner/logo" -#: ../../mod/admin.php:461 +#: ../../mod/admin.php:421 msgid "Administrator Information" msgstr "Informatie over de beheerder van deze hub" -#: ../../mod/admin.php:461 +#: ../../mod/admin.php:421 msgid "" "Contact information for site administrators. Displayed on siteinfo page. " "BBCode can be used here" msgstr "Contactinformatie voor hub-beheerders. Getoond op pagina met hub-informatie. Er kan hier bbcode gebruikt worden." -#: ../../mod/admin.php:462 +#: ../../mod/admin.php:422 msgid "System language" msgstr "Standaardtaal" -#: ../../mod/admin.php:463 +#: ../../mod/admin.php:423 msgid "System theme" msgstr "Standaardthema" -#: ../../mod/admin.php:463 +#: ../../mod/admin.php:423 msgid "" "Default system theme - may be over-ridden by user profiles - change theme settings" msgstr "Standaardthema voor RedMatrix-hub (kan door gebruiker veranderd worden) - verander thema-instellingen" -#: ../../mod/admin.php:464 +#: ../../mod/admin.php:424 msgid "Mobile system theme" msgstr "Standaardthema voor mobiel" -#: ../../mod/admin.php:464 +#: ../../mod/admin.php:424 msgid "Theme for mobile devices" msgstr "Thema voor mobiele apparaten" -#: ../../mod/admin.php:465 +#: ../../mod/admin.php:425 msgid "Accessibility system theme" msgstr "Standaardthema voor universele toegang" -#: ../../mod/admin.php:465 +#: ../../mod/admin.php:425 msgid "Accessibility theme" msgstr "Thema voor universele toegang" -#: ../../mod/admin.php:466 +#: ../../mod/admin.php:426 msgid "Channel to use for this website's static pages" msgstr "Kanaal die op deze hub als statische pagina op de homepage gebruikt moet worden" -#: ../../mod/admin.php:466 +#: ../../mod/admin.php:426 msgid "Site Channel" msgstr "Kanaal op deze RedMatrix-hub" -#: ../../mod/admin.php:468 +#: ../../mod/admin.php:427 +msgid "Allow Feeds as Connections" +msgstr "Sta feeds toe als connecties" + +#: ../../mod/admin.php:427 +msgid "(Heavy system resource usage)" +msgstr "(sterk negatieve invloed op systeembronnen hub)" + +#: ../../mod/admin.php:428 msgid "Maximum image size" msgstr "Maximale grootte van afbeeldingen" -#: ../../mod/admin.php:468 +#: ../../mod/admin.php:428 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "Maximale grootte in bytes voor afbeeldingen die worden geüpload. Standaard is 0, wat geen limiet betekend." -#: ../../mod/admin.php:469 +#: ../../mod/admin.php:429 msgid "Does this site allow new member registration?" msgstr "Staat deze hub registratie van nieuwe accounts toe?" -#: ../../mod/admin.php:470 +#: ../../mod/admin.php:430 msgid "Which best describes the types of account offered by this hub?" msgstr "Wat voor soort accounts biedt deze RedMatrix-hub aan? Kies wat het meest in de buurt komt." -#: ../../mod/admin.php:471 +#: ../../mod/admin.php:431 msgid "Register text" msgstr "Registratietekst" -#: ../../mod/admin.php:471 +#: ../../mod/admin.php:431 msgid "Will be displayed prominently on the registration page." msgstr "Wordt prominent op de registratiepagina getoond." -#: ../../mod/admin.php:472 +#: ../../mod/admin.php:432 msgid "Accounts abandoned after x days" msgstr "Accounts als verlaten beschouwen na zoveel aantal dagen:" -#: ../../mod/admin.php:472 +#: ../../mod/admin.php:432 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "Zal geen systeembronnen verspillen door polling van externe hubs voor verlaten accounts. Vul 0 in voor geen tijdslimiet." -#: ../../mod/admin.php:473 +#: ../../mod/admin.php:433 msgid "Allowed friend domains" msgstr "Toegestane domeinen" -#: ../../mod/admin.php:473 +#: ../../mod/admin.php:433 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "Komma-gescheiden lijst van domeinen waarvan kanalen connecties kunnen aangaan met kanalen op deze RedMatrix-hub. Wildcards zijn toegestaan.\nLaat leeg om alle domeinen toe te laten." -#: ../../mod/admin.php:474 +#: ../../mod/admin.php:434 msgid "Allowed email domains" msgstr "Toegestane e-maildomeinen" -#: ../../mod/admin.php:474 +#: ../../mod/admin.php:434 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 "Door komma's gescheiden lijst met e-maildomeinen die op deze hub mogen registeren. Wildcards zijn toegestaan.\nLaat leeg om alle domeinen toe te laten." -#: ../../mod/admin.php:475 +#: ../../mod/admin.php:435 msgid "Block public" msgstr "Openbare toegang blokkeren" -#: ../../mod/admin.php:475 +#: ../../mod/admin.php:435 msgid "" "Check to block public access to all otherwise public personal pages on this " "site unless you are currently logged in." msgstr "Vink dit aan om alle normaliter openbare persoonlijke pagina's op deze hub alleen toegankelijk te maken voor ingelogde gebruikers." -#: ../../mod/admin.php:476 +#: ../../mod/admin.php:436 msgid "Force publish" msgstr "Dwing kanaalvermelding af" -#: ../../mod/admin.php:476 +#: ../../mod/admin.php:436 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "Vink dit aan om af te dwingen dat alle kanalen op deze hub in de kanalengids worden vermeld." -#: ../../mod/admin.php:477 +#: ../../mod/admin.php:437 msgid "Disable discovery tab" msgstr "Ontdekkingstab" -#: ../../mod/admin.php:477 +#: ../../mod/admin.php:437 msgid "" "Remove the tab in the network view with public content pulled from sources " "chosen for this site." msgstr "Verwijder de tab in de matrix-weergave waarin zich een selectie aan openbare berichten bevindt, die automatisch voor deze hub zijn uitgekozen." -#: ../../mod/admin.php:478 +#: ../../mod/admin.php:438 msgid "No login on Homepage" msgstr "Geen inlogformulier op de homepage" -#: ../../mod/admin.php:478 +#: ../../mod/admin.php:438 msgid "" "Check to hide the login form from your sites homepage when visitors arrive " "who are not logged in (e.g. when you put the content of the homepage in via " "the site channel)." msgstr "Vink dit aan om het inlogformulier op de homepage van deze hub, die niet-ingelogde gebruikers te zien krijgen, te verbergen. (bijvoorbeeld wanneer je een kanaal op deze RedMatrix-hub als homepage gebruikt)" -#: ../../mod/admin.php:480 +#: ../../mod/admin.php:440 msgid "Proxy user" msgstr "Proxy-gebruiker" -#: ../../mod/admin.php:481 +#: ../../mod/admin.php:441 msgid "Proxy URL" msgstr "Proxy-URL" -#: ../../mod/admin.php:482 +#: ../../mod/admin.php:442 msgid "Network timeout" msgstr "Netwerktimeout" -#: ../../mod/admin.php:482 +#: ../../mod/admin.php:442 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "Waarde is in seconden. Zet op 0 voor onbeperkt (niet aanbevolen)" -#: ../../mod/admin.php:483 +#: ../../mod/admin.php:443 msgid "Delivery interval" msgstr "Afleveringsinterval" -#: ../../mod/admin.php:483 +#: ../../mod/admin.php:443 msgid "" "Delay background delivery processes by this many seconds to reduce system " "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " "for large dedicated servers." msgstr "Vertraag de achtergrondprocessen voor het afleveren met een aantal seconden om de systeembelasting te verminderen. Aanbevolen: 4-5 voor shared hosts, 2-3 voor virtual private servers (VPS) en 0-1 voor grote dedicated servers." -#: ../../mod/admin.php:484 +#: ../../mod/admin.php:444 msgid "Poll interval" msgstr "Poll-interval" -#: ../../mod/admin.php:484 +#: ../../mod/admin.php:444 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "De achtergrondprocessen voor het afleveren met zoveel seconden vertragen om de systeembelasting te verminderen. 0 om de afleveringsinterval te gebruiken." -#: ../../mod/admin.php:485 +#: ../../mod/admin.php:445 msgid "Maximum Load Average" msgstr "Maximaal gemiddelde systeembelasting" -#: ../../mod/admin.php:485 +#: ../../mod/admin.php:445 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "Maximale systeembelasting voordat de afleverings- en polllingsprocessen worden uitgesteld. Standaard is 50." -#: ../../mod/admin.php:541 +#: ../../mod/admin.php:501 msgid "No server found" msgstr "Geen hub gevonden" -#: ../../mod/admin.php:548 ../../mod/admin.php:772 +#: ../../mod/admin.php:508 ../../mod/admin.php:732 msgid "ID" msgstr "ID" -#: ../../mod/admin.php:548 +#: ../../mod/admin.php:508 msgid "for channel" msgstr "voor kanaal" -#: ../../mod/admin.php:548 +#: ../../mod/admin.php:508 msgid "on server" msgstr "op hub" -#: ../../mod/admin.php:548 +#: ../../mod/admin.php:508 msgid "Status" msgstr "Status" -#: ../../mod/admin.php:569 +#: ../../mod/admin.php:529 msgid "Update has been marked successful" msgstr "Update is als succesvol gemarkeerd" -#: ../../mod/admin.php:579 +#: ../../mod/admin.php:539 #, php-format msgid "Executing %s failed. Check system logs." msgstr "Uitvoeren van %s is mislukt. Controleer systeemlogboek." -#: ../../mod/admin.php:582 +#: ../../mod/admin.php:542 #, php-format msgid "Update %s was successfully applied." msgstr "Update %s was geslaagd." -#: ../../mod/admin.php:586 +#: ../../mod/admin.php:546 #, php-format msgid "Update %s did not return a status. Unknown if it succeeded." msgstr "Update %s gaf geen melding. Het is daarom niet bekend of deze geslaagd is." -#: ../../mod/admin.php:589 +#: ../../mod/admin.php:549 #, php-format msgid "Update function %s could not be found." msgstr "Update-functie %s kon niet gevonden worden." -#: ../../mod/admin.php:604 +#: ../../mod/admin.php:564 msgid "No failed updates." msgstr "Geen mislukte updates." -#: ../../mod/admin.php:608 +#: ../../mod/admin.php:568 msgid "Failed Updates" msgstr "Mislukte updates" -#: ../../mod/admin.php:610 +#: ../../mod/admin.php:570 msgid "Mark success (if update was manually applied)" msgstr "Markeer als geslaagd (wanneer de update handmatig was uitgevoerd)" -#: ../../mod/admin.php:611 +#: ../../mod/admin.php:571 msgid "Attempt to execute this update step automatically" msgstr "Poging om deze stap van de update automatisch uit te voeren." -#: ../../mod/admin.php:637 +#: ../../mod/admin.php:597 #, php-format msgid "%s user blocked/unblocked" msgid_plural "%s users blocked/unblocked" msgstr[0] "%s account geblokkeerd/gedeblokkeerd" msgstr[1] "%s accounts geblokkeerd/gedeblokkeerd" -#: ../../mod/admin.php:644 +#: ../../mod/admin.php:604 #, php-format msgid "%s user deleted" msgid_plural "%s users deleted" msgstr[0] "%s account verwijderd" msgstr[1] "%s accounts verwijderd" -#: ../../mod/admin.php:675 +#: ../../mod/admin.php:635 msgid "Account not found" msgstr "Account niet gevonden" -#: ../../mod/admin.php:686 -#, php-format -msgid "User '%s' deleted" -msgstr "Account '%s' verwijderd" - -#: ../../mod/admin.php:695 +#: ../../mod/admin.php:655 #, php-format msgid "User '%s' unblocked" msgstr "Account '%s' gedeblokkeerd" -#: ../../mod/admin.php:695 +#: ../../mod/admin.php:655 #, php-format msgid "User '%s' blocked" msgstr "Gebruiker '%s' geblokkeerd" -#: ../../mod/admin.php:759 ../../mod/admin.php:771 +#: ../../mod/admin.php:719 ../../mod/admin.php:731 msgid "Users" msgstr "Accounts" -#: ../../mod/admin.php:761 ../../mod/admin.php:896 +#: ../../mod/admin.php:721 ../../mod/admin.php:856 msgid "select all" msgstr "alles selecteren" -#: ../../mod/admin.php:762 +#: ../../mod/admin.php:722 msgid "User registrations waiting for confirm" msgstr "Accounts die op goedkeuring wachten" -#: ../../mod/admin.php:763 +#: ../../mod/admin.php:723 msgid "Request date" msgstr "Tijd/datum verzoek" -#: ../../mod/admin.php:764 +#: ../../mod/admin.php:724 msgid "No registrations." msgstr "Geen verzoeken." -#: ../../mod/admin.php:765 +#: ../../mod/admin.php:725 msgid "Approve" msgstr "Goedkeuren" -#: ../../mod/admin.php:766 +#: ../../mod/admin.php:726 msgid "Deny" msgstr "Afkeuren" -#: ../../mod/admin.php:772 +#: ../../mod/admin.php:732 msgid "Register date" msgstr "Geregistreerd" -#: ../../mod/admin.php:772 +#: ../../mod/admin.php:732 msgid "Last login" msgstr "Laatste keer ingelogd" -#: ../../mod/admin.php:772 +#: ../../mod/admin.php:732 msgid "Expires" msgstr "Verloopt" -#: ../../mod/admin.php:772 +#: ../../mod/admin.php:732 msgid "Service Class" msgstr "Abonnementen" -#: ../../mod/admin.php:774 +#: ../../mod/admin.php:734 msgid "" "Selected users will be deleted!\\n\\nEverything these users had posted on " "this site will be permanently deleted!\\n\\nAre you sure?" msgstr "Geselecteerde accounts (met bijbehorende kanalen) worden verwijderd!\\n\\nAlles wat deze accounts op deze hub hebben gepubliceerd wordt definitief verwijderd!\\n\\Weet je het zeker?" -#: ../../mod/admin.php:775 +#: ../../mod/admin.php:735 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 "Account {0} (met bijbehorende kanalen) wordt verwijderd !\\n\\nAlles wat dit account op deze hub heeft gepubliceerd wordt definitief verwijderd!\\n\\nWeet je het zeker?" -#: ../../mod/admin.php:808 +#: ../../mod/admin.php:768 #, php-format msgid "%s channel censored/uncensored" msgid_plural "%s channelss censored/uncensored" msgstr[0] "%s kanalen gecensureerd/ongecensureerd" msgstr[1] "%s kanaal gecensureerd/ongecensureerd" -#: ../../mod/admin.php:815 +#: ../../mod/admin.php:775 #, php-format msgid "%s channel deleted" msgid_plural "%s channels deleted" msgstr[0] "%s kanaal verwijderd" msgstr[1] "%s kanalen verwijderd" -#: ../../mod/admin.php:834 +#: ../../mod/admin.php:794 msgid "Channel not found" msgstr "Kanaal niet gevonden" -#: ../../mod/admin.php:845 +#: ../../mod/admin.php:805 #, php-format msgid "Channel '%s' deleted" msgstr "Kanaal '%s' verwijderd" -#: ../../mod/admin.php:855 +#: ../../mod/admin.php:815 #, php-format msgid "Channel '%s' uncensored" msgstr "Kanaal '%s' ongecensureerd" -#: ../../mod/admin.php:855 +#: ../../mod/admin.php:815 #, php-format msgid "Channel '%s' censored" msgstr "Kanaal '%s' gecensureerd" -#: ../../mod/admin.php:898 +#: ../../mod/admin.php:858 msgid "Censor" msgstr "Censureren" -#: ../../mod/admin.php:899 +#: ../../mod/admin.php:859 msgid "Uncensor" msgstr "Niet censureren" -#: ../../mod/admin.php:902 +#: ../../mod/admin.php:862 msgid "UID" msgstr "UID" -#: ../../mod/admin.php:904 +#: ../../mod/admin.php:864 msgid "" "Selected channels will be deleted!\\n\\nEverything that was posted in these " "channels on this site will be permanently deleted!\\n\\nAre you sure?" msgstr "Geselecteerde kanalen worden verwijderd!\\n\\nAlles wat in deze kanalen op deze hub werd gepubliceerd wordt definitief verwijderd!\\n\\nWeet je het zeker?" -#: ../../mod/admin.php:905 +#: ../../mod/admin.php:865 msgid "" "The channel {0} will be deleted!\\n\\nEverything that was posted in this " "channel on this site will be permanently deleted!\\n\\nAre you sure?" msgstr "Kanaal {0} wordt verwijderd!\\n\\nAlles wat in dit kanaal op deze hub werd gepubliceerd wordt definitief verwijderd!\\n\\nWeet je het zeker?" -#: ../../mod/admin.php:944 +#: ../../mod/admin.php:904 #, php-format msgid "Plugin %s disabled." msgstr "Plug-in %s uitgeschakeld." -#: ../../mod/admin.php:948 +#: ../../mod/admin.php:908 #, php-format msgid "Plugin %s enabled." msgstr "Plug-in %s ingeschakeld" -#: ../../mod/admin.php:958 ../../mod/admin.php:1160 +#: ../../mod/admin.php:918 ../../mod/admin.php:1120 msgid "Disable" msgstr "Uitschakelen" -#: ../../mod/admin.php:960 ../../mod/admin.php:1162 +#: ../../mod/admin.php:920 ../../mod/admin.php:1122 msgid "Enable" msgstr "Inschakelen" -#: ../../mod/admin.php:986 ../../mod/admin.php:1191 +#: ../../mod/admin.php:946 ../../mod/admin.php:1151 msgid "Toggle" msgstr "Omschakelen" -#: ../../mod/admin.php:994 ../../mod/admin.php:1201 +#: ../../mod/admin.php:954 ../../mod/admin.php:1161 msgid "Author: " msgstr "Auteur: " -#: ../../mod/admin.php:995 ../../mod/admin.php:1202 +#: ../../mod/admin.php:955 ../../mod/admin.php:1162 msgid "Maintainer: " msgstr "Beheerder: " -#: ../../mod/admin.php:1124 +#: ../../mod/admin.php:1084 msgid "No themes found." msgstr "Geen thema's gevonden" -#: ../../mod/admin.php:1183 +#: ../../mod/admin.php:1143 msgid "Screenshot" msgstr "Schermafdruk" -#: ../../mod/admin.php:1231 +#: ../../mod/admin.php:1191 msgid "[Experimental]" msgstr "[Experimenteel]" -#: ../../mod/admin.php:1232 +#: ../../mod/admin.php:1192 msgid "[Unsupported]" msgstr "[Niet ondersteund]" -#: ../../mod/admin.php:1259 +#: ../../mod/admin.php:1219 msgid "Log settings updated." msgstr "Logboek-instellingen bijgewerkt." -#: ../../mod/admin.php:1315 +#: ../../mod/admin.php:1275 msgid "Clear" msgstr "Leegmaken" -#: ../../mod/admin.php:1321 +#: ../../mod/admin.php:1281 msgid "Debugging" msgstr "Debuggen" -#: ../../mod/admin.php:1322 +#: ../../mod/admin.php:1282 msgid "Log file" msgstr "Logbestand" -#: ../../mod/admin.php:1322 +#: ../../mod/admin.php:1282 msgid "" "Must be writable by web server. Relative to your Red top-level directory." msgstr "Moet door de webserver beschrijfbaar zijn. Relatief ten opzichte van de bovenste map van je RedMatrix-installatie." -#: ../../mod/admin.php:1323 +#: ../../mod/admin.php:1283 msgid "Log level" msgstr "Logniveau" @@ -7147,16 +7163,16 @@ msgstr "Leeg bericht geannuleerd" msgid "Executable content type not permitted to this channel." msgstr "Uitvoerbare bestanden zijn niet toegestaan op dit kanaal." -#: ../../mod/item.php:850 +#: ../../mod/item.php:849 msgid "System error. Post not saved." msgstr "Systeemfout. Bericht niet opgeslagen." -#: ../../mod/item.php:1302 +#: ../../mod/item.php:1301 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "Je hebt jouw limiet van %1$.0f berichten bereikt." -#: ../../mod/item.php:1308 +#: ../../mod/item.php:1307 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "Je hebt jouw limiet van %1$.0f webpagina's bereikt." @@ -7212,11 +7228,11 @@ msgstr "Actie voltooid" msgid "Thank you." msgstr "Bedankt" -#: ../../mod/lockview.php:35 ../../mod/lockview.php:41 +#: ../../mod/lockview.php:30 msgid "Remote privacy information not available." msgstr "Privacy-informatie op afstand niet beschikbaar." -#: ../../mod/lockview.php:50 +#: ../../mod/lockview.php:51 msgid "Visible to:" msgstr "Zichtbaar voor:" @@ -7257,7 +7273,7 @@ msgid "" "Password reset failed." msgstr "Het verzoek kon niet worden geverifieerd. (Mogelijk heb je al eerder een verzoek ingediend.) Opnieuw instellen van wachtwoord is mislukt." -#: ../../mod/lostpass.php:85 ../../boot.php:1508 +#: ../../mod/lostpass.php:85 ../../boot.php:1503 msgid "Password Reset" msgstr "Wachtwoord vergeten?" @@ -7405,10 +7421,6 @@ msgstr "Je hebt %1$.0f van totaal %2$.0f toegestane kanalen aangemaakt." msgid "Create a new channel" msgstr "Nieuw kanaal aanmaken" -#: ../../mod/manage.php:148 -msgid "Channel Manager" -msgstr "Kanaalbeheerder" - #: ../../mod/manage.php:149 msgid "Current Channel" msgstr "Huidig kanaal" @@ -7659,26 +7671,6 @@ msgstr "Poll" msgid "View Results" msgstr "Bekijk resultaten" -#: ../../mod/frphotos.php:79 -msgid "Friendica Photo Album Import" -msgstr "Fotoalbums importeren vanuit Friendica" - -#: ../../mod/frphotos.php:80 -msgid "This will import all your Friendica photo albums to this Red channel." -msgstr "Hiermee importeer je al jouw Friendica-fotoalbums in dit RedMatrix-kanaal." - -#: ../../mod/frphotos.php:81 -msgid "Friendica Server base URL" -msgstr "Basis-URL van Friendica-server" - -#: ../../mod/frphotos.php:82 -msgid "Friendica Login Username" -msgstr "Gebruikersnaam Friendica-account" - -#: ../../mod/frphotos.php:83 -msgid "Friendica Login Password" -msgstr "Wachtwoord Friendica-account" - #: ../../mod/removeaccount.php:30 msgid "" "Account removals are not allowed within 48 hours of changing the account " @@ -7992,41 +7984,41 @@ msgstr "Rommelig vormgegeven fotoalbums" msgid "Are you a clean desk or a messy desk person?" msgstr "Ben je iemand die van een opgeruimd bureau houdt of van een rommelig bureau?" -#: ../../boot.php:1296 +#: ../../boot.php:1291 #, php-format msgid "Update %s failed. See error logs." msgstr "Update %s mislukt. Zie foutenlogboek." -#: ../../boot.php:1299 +#: ../../boot.php:1294 #, php-format msgid "Update Error at %s" msgstr "Update-fout op %s" -#: ../../boot.php:1473 +#: ../../boot.php:1468 msgid "" "Create an account to access services and applications within the Red Matrix" msgstr "Maak een account aan om toegang te krijgen tot diensten en toepassingen van de RedMatrix" -#: ../../boot.php:1501 +#: ../../boot.php:1496 msgid "Password" msgstr "Wachtwoord" -#: ../../boot.php:1502 +#: ../../boot.php:1497 msgid "Remember me" msgstr "Aangemeld blijven" -#: ../../boot.php:1507 +#: ../../boot.php:1502 msgid "Forgot your password?" msgstr "Wachtwoord vergeten?" -#: ../../boot.php:1572 +#: ../../boot.php:1567 msgid "permission denied" msgstr "toegang geweigerd" -#: ../../boot.php:1573 +#: ../../boot.php:1568 msgid "Got Zot?" msgstr "Heb je Zot?" -#: ../../boot.php:2003 +#: ../../boot.php:1998 msgid "toggle mobile" msgstr "mobiele weergave omschakelen" diff --git a/view/nl/passchanged_eml.tpl b/view/nl/passchanged_eml.tpl index ddfc3af69..bb4888e26 100644 --- a/view/nl/passchanged_eml.tpl +++ b/view/nl/passchanged_eml.tpl @@ -15,6 +15,6 @@ Wij adviseren om dit wachtwoord te veranderen onder 'instellingen' nadat je bent Vriendelijke groet, - Beheerder {{$sitename}} + Beheerder {{$sitename}} ({{$siteurl}}) \ No newline at end of file diff --git a/view/nl/register_open_eml.tpl b/view/nl/register_open_eml.tpl index d1f0c89d1..07e7beb76 100644 --- a/view/nl/register_open_eml.tpl +++ b/view/nl/register_open_eml.tpl @@ -6,14 +6,14 @@ Hub: {{$siteurl}} Inlognaam: {{$email}} Wachtwoord: (het wachtwoord dat je tijdens de registratie hebt opgegeven) -Wanneer dit account was aangemaakt zonder jouw medeweten en tevens niet gewenst, dan kan je -bezoeken en een nieuwe wachtwoord aanvragen. Je kan daarna inloggen en via 'instellingen > kanaal' (onderaan) -het kanaal verwijderen dat ten onrechte jouw e-mailadres gebruikt. Wanneer dat is voltooid, je een e-mail sturen naar de beheerder van deze hub om het account volledig te laten verwijderen. -Zie voor de beheerder {{$siteurl}}/siteinfo . Excuses voor het ongemak. +Wanneer dit account was aangemaakt zonder jouw medeweten en tevens niet gewenst, dan kan je {{$siteurl}} +bezoeken en een nieuwe wachtwoord aanvragen. Je kan daarna inloggen, een kanaal aanmaken en +meteen via 'instellingen > account' (linksboven) het account verwijderen (onderaan). +Excuses voor het eventuele ongemak. -Dank je en welkom op +Wanneer dit account wel door jou is aangemaakt: Dank je en welkom op de {{sitename}}. Vriendelijke groet, - Beheerder {{$sitename}} + Beheerder {{sitename}} ({{$siteurl}}) \ No newline at end of file diff --git a/view/nl/register_verify_eml.tpl b/view/nl/register_verify_eml.tpl index 85d9a12d3..e4be9551a 100644 --- a/view/nl/register_verify_eml.tpl +++ b/view/nl/register_verify_eml.tpl @@ -1,25 +1,24 @@ -A new user registration request was received at {{$sitename}} which requires -your approval. +{{$sitename}} heeft een nieuwe accountregistratie ontvangen die jouw goedkeuring +nodig heeft. -The login details are as follows: +De inloggegevens zijn als volgt: -Site Location: {{$siteurl}} -Login Name: {{$email}} -IP Address: {{$details}} +Hub: {{$siteurl}} +Inlognaam: {{$email}} +IP-adres: -To approve this request please visit the following link: +Om dit verzoek goed te keuren bezoek je de volgende link: {{$siteurl}}/regmod/allow/{{$hash}} -To deny the request and remove the account, please visit: +Om dit verzoek af te keuren en het account te verwijderen bezoek je: {{$siteurl}}/regmod/deny/{{$hash}} -Thank you. - +Bedankt diff --git a/view/nl/register_verify_member.tpl b/view/nl/register_verify_member.tpl new file mode 100644 index 000000000..7bcd63009 --- /dev/null +++ b/view/nl/register_verify_member.tpl @@ -0,0 +1,24 @@ + +Dank je voor je aanmelding op {{$sitename}}. + +Jouw inloggegevens zijn als volgt: + +Hub: {{$siteurl}} +Inlognaam: {{$email}} + +Log in met het wachtwoord die je tijdens het registeren hebt gekozen. + +Wij dienen jouw e-mailadres te verifiëren om je volledig toegang te kunnen geven. + +Wanneer jij dit account hebt aangemaakt, bezoek dan de volgende link: + +{{$siteurl}}/regver/allow/{{$hash}} + + +Om de registratie van dit account te annuleren en deze te verwijderen bezoek je: + + +{{$siteurl}}/regver/deny/{{$hash}} + + +Bedankt diff --git a/view/nl/strings.php b/view/nl/strings.php index d1b1359b0..c9c88d533 100644 --- a/view/nl/strings.php +++ b/view/nl/strings.php @@ -7,8 +7,6 @@ function string_plural_select_nl($n){ ; $a->strings["Cannot locate DNS info for database server '%s'"] = "Kan DNS-informatie voor databaseserver '%s' niet vinden"; $a->strings["Profile Photos"] = "Profielfoto's"; -$a->strings["%1\$s is now friends with %2\$s"] = "%1\$s is nu bevriend met %2\$s"; -$a->strings["Sharing notification from Diaspora network"] = "Notificatie delen vanuit het Diaspora-netwerk"; $a->strings["photo"] = "foto"; $a->strings["status"] = "bericht"; $a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s vindt %3\$s van %2\$s leuk"; @@ -241,6 +239,7 @@ $a->strings["New Message"] = "Nieuw bericht"; $a->strings["Event Calendar"] = "Agenda"; $a->strings["See all events"] = "Alle gebeurtenissen weergeven"; $a->strings["Mark all events seen"] = "Markeer alle gebeurtenissen als bekeken"; +$a->strings["Channel Manager"] = "Kanaalbeheerder"; $a->strings["Manage Your Channels"] = "Beheer je kanalen"; $a->strings["Account/Channel Settings"] = "Account-/kanaal-instellingen"; $a->strings["Admin"] = "Beheer"; @@ -336,7 +335,7 @@ $a->strings["Safe Mode"] = "Veilig zoeken"; $a->strings["Red Matrix Notification"] = "RedMatrix-notificatie"; $a->strings["redmatrix"] = "RedMatrix"; $a->strings["Thank You,"] = "Bedankt,"; -$a->strings["%s Administrator"] = "%s beheerder"; +$a->strings["%s Administrator"] = "Beheerder %s"; $a->strings["%s "] = "%s "; $a->strings["[Red:Notify] New mail received at %s"] = "[Red:Notificatie] Nieuw privébericht ontvangen op %s"; $a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s zond jou een nieuw privébericht om %3\$s."; @@ -415,6 +414,7 @@ $a->strings["Follow Thread"] = "Conversatie volgen"; $a->strings["View Status"] = "Status weergeven"; $a->strings["View Photos"] = "Foto's weergeven"; $a->strings["Matrix Activity"] = "Activiteit in de Matrix"; +$a->strings["Connect"] = "Verbinden"; $a->strings["Edit Contact"] = "Contact bewerken"; $a->strings["Send PM"] = "Privébericht verzenden"; $a->strings["%s likes this."] = "%s vindt dit leuk."; @@ -504,6 +504,8 @@ $a->strings["Web Pages"] = "Webpagina's"; $a->strings["Provide managed web pages on your channel"] = "Sta beheerde webpagina's op jouw kanaal toe"; $a->strings["Private Notes"] = "Privé-aantekeningen"; $a->strings["Enables a tool to store notes and reminders"] = "Schakelt een eenvoudige toepassing in om aantekeningen en herinneringen in op te slaan"; +$a->strings["Navigation Channel Select"] = "Kanaal kiezen in navigatiemenu"; +$a->strings["Change channels directly from within the navigation dropdown menu"] = "Kies een ander kanaal direct vanuit het dropdown-menu op de navigatiebalk"; $a->strings["Extended Identity Sharing"] = "Uitgebreid identiteit delen"; $a->strings["Share your identity with all websites on the internet. When disabled, identity is only shared with sites in the matrix."] = "Deel jouw RedMatrix-identiteit met alle websites op het internet. Wanneer dit is uitgeschakeld wordt je identiteit alleen binnen het RedMatrix-netwerk gedeeld. Schakel dit alleen als je weet wat je doet."; $a->strings["Expert Mode"] = "Expertmodus"; @@ -596,7 +598,6 @@ $a->strings["Default Profile"] = "Standaardprofiel"; $a->strings["Friends"] = "Vrienden"; $a->strings["Requested channel is not available."] = "Opgevraagd kanaal is niet beschikbaar."; $a->strings["Requested profile is not available."] = "Opgevraagd profiel is niet beschikbaar"; -$a->strings["Connect"] = "Verbinden"; $a->strings["Change profile photo"] = "Profielfoto veranderen"; $a->strings["Profiles"] = "Profielen"; $a->strings["Manage/edit profiles"] = "Profielen beheren/bewerken"; @@ -756,6 +757,7 @@ $a->strings[" "] = " "; $a->strings["timeago.numbers"] = "timeago.numbers"; $a->strings["New window"] = "Nieuw venster"; $a->strings["Open the selected location in a different window or browser tab"] = "Open de geselecteerde locatie in een ander venster of tab"; +$a->strings["User '%s' deleted"] = "Account '%s' verwijderd"; $a->strings["Male"] = "Man"; $a->strings["Female"] = "Vrouw"; $a->strings["Currently Male"] = "Momenteel man"; @@ -905,6 +907,7 @@ $a->strings["Confirm:"] = "Bevestigen:"; $a->strings["Leave password fields blank unless changing"] = "Laat de wachtwoordvelden leeg, behalve wanneer je deze wil veranderen"; $a->strings["Email Address:"] = "E-mailadres:"; $a->strings["Remove Account"] = "Account verwijderen"; +$a->strings["Remove this account from this server including all its channels"] = "Dit account en al zijn kanalen van deze RedMatrix-hub verwijderen"; $a->strings["Warning: This action is permanent and cannot be reversed."] = "Waarschuwing: Deze handeling is van permanente aard en kan niet meer worden teruggedraaid."; $a->strings["Off"] = "Uit"; $a->strings["On"] = "Aan"; @@ -1530,6 +1533,8 @@ $a->strings["Accessibility system theme"] = "Standaardthema voor universele toeg $a->strings["Accessibility theme"] = "Thema voor universele toegang"; $a->strings["Channel to use for this website's static pages"] = "Kanaal die op deze hub als statische pagina op de homepage gebruikt moet worden"; $a->strings["Site Channel"] = "Kanaal op deze RedMatrix-hub"; +$a->strings["Allow Feeds as Connections"] = "Sta feeds toe als connecties"; +$a->strings["(Heavy system resource usage)"] = "(sterk negatieve invloed op systeembronnen hub)"; $a->strings["Maximum image size"] = "Maximale grootte van afbeeldingen"; $a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Maximale grootte in bytes voor afbeeldingen die worden geüpload. Standaard is 0, wat geen limiet betekend."; $a->strings["Does this site allow new member registration?"] = "Staat deze hub registratie van nieuwe accounts toe?"; @@ -1583,7 +1588,6 @@ $a->strings["%s user deleted"] = array( 1 => "%s accounts verwijderd", ); $a->strings["Account not found"] = "Account niet gevonden"; -$a->strings["User '%s' deleted"] = "Account '%s' verwijderd"; $a->strings["User '%s' unblocked"] = "Account '%s' gedeblokkeerd"; $a->strings["User '%s' blocked"] = "Gebruiker '%s' geblokkeerd"; $a->strings["Users"] = "Accounts"; @@ -1746,7 +1750,6 @@ $a->strings["No secure communications available. You may be abl $a->strings["Send Reply"] = "Antwoord versturen"; $a->strings["You have created %1$.0f of %2$.0f allowed channels."] = "Je hebt %1$.0f van totaal %2$.0f toegestane kanalen aangemaakt."; $a->strings["Create a new channel"] = "Nieuw kanaal aanmaken"; -$a->strings["Channel Manager"] = "Kanaalbeheerder"; $a->strings["Current Channel"] = "Huidig kanaal"; $a->strings["Attach to one of your channels by selecting it."] = "Gebruik een van jouw kanalen door op een te klikken."; $a->strings["Default Channel"] = "Standaardkanaal"; @@ -1808,11 +1811,6 @@ $a->strings["Price of app"] = "Prijs van de app"; $a->strings["Location (URL) to purchase app"] = "Locatie (URL) om de app aan te schaffen"; $a->strings["Poll"] = "Poll"; $a->strings["View Results"] = "Bekijk resultaten"; -$a->strings["Friendica Photo Album Import"] = "Fotoalbums importeren vanuit Friendica"; -$a->strings["This will import all your Friendica photo albums to this Red channel."] = "Hiermee importeer je al jouw Friendica-fotoalbums in dit RedMatrix-kanaal."; -$a->strings["Friendica Server base URL"] = "Basis-URL van Friendica-server"; -$a->strings["Friendica Login Username"] = "Gebruikersnaam Friendica-account"; -$a->strings["Friendica Login Password"] = "Wachtwoord Friendica-account"; $a->strings["Account removals are not allowed within 48 hours of changing the account password."] = "Het verwijderen van een account is niet toegestaan binnen 48 uur nadat het wachtwoord is veranderd."; $a->strings["Remove This Account"] = "Verwijder dit account"; $a->strings["This will completely remove this account including all its channels from the network. Once this has been done it is not recoverable."] = "Deze actie verwijderd dit account volledig, inclusief al zijn kanalen. Dit kan hierna op geen enkele manier ongedaan gemaakt worden."; -- cgit v1.2.3 From b11e9fe03c17164c6a5767d62fef0bd289006ffe Mon Sep 17 00:00:00 2001 From: Jeroen Date: Sat, 23 Aug 2014 20:13:23 +0000 Subject: fix nl --- view/nl/messages.po | 14 +++++++------- view/nl/strings.php | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/view/nl/messages.po b/view/nl/messages.po index 0a004cdb1..7798a323f 100644 --- a/view/nl/messages.po +++ b/view/nl/messages.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Red Matrix\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-08-22 00:03-0700\n" -"PO-Revision-Date: 2014-08-23 16:06+0000\n" +"PO-Revision-Date: 2014-08-23 20:09+0000\n" "Last-Translator: jeroenpraat <>\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/red-matrix/language/nl/)\n" "MIME-Version: 1.0\n" @@ -7093,7 +7093,7 @@ msgstr "%s : Geen geldig e-mailadres." #: ../../mod/invite.php:76 msgid "Please join us on Red" -msgstr "Kom op de RedMatrix" +msgstr "Uitnodiging voor de RedMatrix" #: ../../mod/invite.php:87 msgid "Invitation limit exceeded. Please contact your site administrator." @@ -7129,7 +7129,7 @@ msgstr "Jouw bericht:" #: ../../mod/invite.php:132 msgid "Please join my community on RedMatrix." -msgstr "Vergezel ons op de RedMatrix." +msgstr "Hierbij nodig ik je uit om mij, en andere vrienden en kennissen, op de RedMatrix te vergezellen. Lees meer over de RedMatrix op https://redmatrix.me." #: ../../mod/invite.php:134 msgid "You will need to supply this invitation code: " @@ -7137,19 +7137,19 @@ msgstr "Je moet deze uitnodigingscode opgeven:" #: ../../mod/invite.php:135 msgid "1. Register at any RedMatrix location (they are all inter-connected)" -msgstr "1. Registreer je op een willekeurige RedMatrix-hub (ze zijn allemaal onderling met elkaar verbonden)" +msgstr "1. Registreer je op een willekeurige RedMatrix-hub (ze zijn allemaal onderling met elkaar verbonden):" #: ../../mod/invite.php:137 msgid "2. Enter my RedMatrix network address into the site searchbar." -msgstr "2. Nadat je bent ingelogd en een kanaal hebt aangemaakt kan je mijn kanaaladres in het zoekveld invullen." +msgstr "2. Nadat je bent ingelogd en een kanaal hebt aangemaakt kan je mijn kanaaladres in het zoekveld invullen:" #: ../../mod/invite.php:138 msgid "or visit " -msgstr "of bezoek" +msgstr "of bezoek " #: ../../mod/invite.php:140 msgid "3. Click [Connect]" -msgstr "3. Klik [+ Verbinden]" +msgstr "3. Klik op [+ Verbinden]" #: ../../mod/item.php:146 msgid "Unable to locate original post." diff --git a/view/nl/strings.php b/view/nl/strings.php index c9c88d533..99996210d 100644 --- a/view/nl/strings.php +++ b/view/nl/strings.php @@ -1670,7 +1670,7 @@ $a->strings["For either option, please choose whether to make this hub your new $a->strings["Make this hub my primary location"] = "Stel deze hub als mijn primaire locatie in"; $a->strings["Total invitation limit exceeded."] = "Limiet voor aantal uitnodigingen overschreden."; $a->strings["%s : Not a valid email address."] = "%s : Geen geldig e-mailadres."; -$a->strings["Please join us on Red"] = "Kom op de RedMatrix"; +$a->strings["Please join us on Red"] = "Uitnodiging voor de RedMatrix"; $a->strings["Invitation limit exceeded. Please contact your site administrator."] = "Limiet voor aantal uitnodigingen overschreden. Neem contact op met je hub-beheerder."; $a->strings["%s : Message delivery failed."] = "%s: Aflevering bericht mislukt."; $a->strings["%d message sent."] = array( @@ -1681,12 +1681,12 @@ $a->strings["You have no more invitations available"] = "Je hebt geen uitnodigin $a->strings["Send invitations"] = "Uitnodigingen verzenden"; $a->strings["Enter email addresses, one per line:"] = "Voer e-mailadressen in, één per regel:"; $a->strings["Your message:"] = "Jouw bericht:"; -$a->strings["Please join my community on RedMatrix."] = "Vergezel ons op de RedMatrix."; +$a->strings["Please join my community on RedMatrix."] = "Hierbij nodig ik je uit om mij, en andere vrienden en kennissen, op de RedMatrix te vergezellen. Lees meer over de RedMatrix op https://redmatrix.me."; $a->strings["You will need to supply this invitation code: "] = "Je moet deze uitnodigingscode opgeven:"; -$a->strings["1. Register at any RedMatrix location (they are all inter-connected)"] = "1. Registreer je op een willekeurige RedMatrix-hub (ze zijn allemaal onderling met elkaar verbonden)"; -$a->strings["2. Enter my RedMatrix network address into the site searchbar."] = "2. Nadat je bent ingelogd en een kanaal hebt aangemaakt kan je mijn kanaaladres in het zoekveld invullen."; -$a->strings["or visit "] = "of bezoek"; -$a->strings["3. Click [Connect]"] = "3. Klik [+ Verbinden]"; +$a->strings["1. Register at any RedMatrix location (they are all inter-connected)"] = "1. Registreer je op een willekeurige RedMatrix-hub (ze zijn allemaal onderling met elkaar verbonden):"; +$a->strings["2. Enter my RedMatrix network address into the site searchbar."] = "2. Nadat je bent ingelogd en een kanaal hebt aangemaakt kan je mijn kanaaladres in het zoekveld invullen:"; +$a->strings["or visit "] = "of bezoek "; +$a->strings["3. Click [Connect]"] = "3. Klik op [+ Verbinden]"; $a->strings["Unable to locate original post."] = "Niet in staat om de originele locatie van het bericht te vinden. "; $a->strings["Empty post discarded."] = "Leeg bericht geannuleerd"; $a->strings["Executable content type not permitted to this channel."] = "Uitvoerbare bestanden zijn niet toegestaan op dit kanaal."; -- cgit v1.2.3 From 56e8b2b9714336059d3b19a28ab0593c22068b0b Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 23 Aug 2014 15:22:26 -0700 Subject: add "any connections" to can_comment_on_post() - was missing --- include/items.php | 1 + 1 file changed, 1 insertion(+) diff --git a/include/items.php b/include/items.php index bdf4007af..f10a5c570 100755 --- a/include/items.php +++ b/include/items.php @@ -132,6 +132,7 @@ function can_comment_on_post($observer_xchan,$item) { // false. return false; break; + case 'any connections': case 'contacts': case '': if(array_key_exists('owner',$item)) { -- cgit v1.2.3 From 9b524c9bc4553a82b98f46e4c4804d76ee1495f2 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 23 Aug 2014 21:12:33 -0700 Subject: unobscure viewsrc items --- mod/viewsrc.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mod/viewsrc.php b/mod/viewsrc.php index 0f4df9b9b..ddf39535c 100644 --- a/mod/viewsrc.php +++ b/mod/viewsrc.php @@ -19,13 +19,16 @@ function viewsrc_content(&$a) { } if(local_user() && $item_id) { - $r = q("select body from item where item_restrict = 0 and uid = %d and id = %d limit 1", + $r = q("select item_flags, body from item where item_restrict = 0 and uid = %d and id = %d limit 1", intval(local_user()), intval($item_id) ); - if($r) + if($r) { + if($r[0]['item_flags'] & ITEM_OBSCURED) + $r[0]['body'] = crypto_unencapsulate(json_decode($r[0]['body'],true),get_config('system','prvkey')); $o = (($json) ? json_encode($r[0]['body']) : str_replace("\n",'
                ',$r[0]['body'])); + } } if(is_ajax()) { -- cgit v1.2.3 From 5cba2096043cc16083da346f321834a0ef8a3f54 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 24 Aug 2014 04:27:10 -0700 Subject: diaspora discovery --- include/network.php | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++ version.inc | 2 +- 2 files changed, 114 insertions(+), 1 deletion(-) diff --git a/include/network.php b/include/network.php index 614049299..e06f4f80a 100644 --- a/include/network.php +++ b/include/network.php @@ -820,6 +820,7 @@ function email_send($addr, $subject, $headers, $item) { function discover_by_webbie($webbie) { + require_once('library/HTML5/Parser.php'); $x = webfinger_rfc7033($webbie); if($x && array_key_exists('links',$x) && $x['links']) { @@ -836,9 +837,121 @@ function discover_by_webbie($webbie) { } } + $result = array(); + $network = null; + $diaspora = false; + + $diaspora_base = ''; + $diaspora_guid = ''; + $diaspora_key = ''; + $dfrn = false; + $x = old_webfinger($webbie); if($x) { logger('old_webfinger: ' . print_r($x,true)); + foreach($x as $link) { + if($link['@attributes']['rel'] === NAMESPACE_DFRN) + $dfrn = unamp($link['@attributes']['href']); + if($link['@attributes']['rel'] === 'salmon') + $notify = unamp($link['@attributes']['href']); + if($link['@attributes']['rel'] === NAMESPACE_FEED) + $poll = unamp($link['@attributes']['href']); + if($link['@attributes']['rel'] === 'http://microformats.org/profile/hcard') + $hcard = unamp($link['@attributes']['href']); + if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page') + $profile = unamp($link['@attributes']['href']); + if($link['@attributes']['rel'] === 'http://portablecontacts.net/spec/1.0') + $poco = unamp($link['@attributes']['href']); + if($link['@attributes']['rel'] === 'http://joindiaspora.com/seed_location') { + $diaspora_base = unamp($link['@attributes']['href']); + $diaspora = true; + } + if($link['@attributes']['rel'] === 'http://joindiaspora.com/guid') { + $diaspora_guid = unamp($link['@attributes']['href']); + $diaspora = true; + } + if($link['@attributes']['rel'] === 'diaspora-public-key') { + $diaspora_key = base64_decode(unamp($link['@attributes']['href'])); + if(strstr($diaspora_key,'RSA ')) + $pubkey = rsatopem($diaspora_key); + else + $pubkey = $diaspora_key; + $diaspora = true; + } + } + + if($diaspora && $diaspora_base && $diaspora_guid) { + $notify = $diaspora_base . 'receive/users/' . $diaspora_guid; + $batch = $diaspora_base . 'receive/public' ; + if(strpos($webbie,'@')) + $addr = str_replace('acct:', '', $webbie); + $network = 'diaspora'; + if($dfrn) + $network = 'f-diaspora'; + if($hcard) + $vcard = scrape_vcard($hcard); + } + + $vcard['fn'] = notags($vcard['fn']); + $vcard['nick'] = str_replace(' ','',notags($vcard['nick'])); + + $result['name'] = $vcard['fn']; + $result['nick'] = $vcard['nick']; + $result['url'] = $profile; + $result['addr'] = $addr; + $result['batch'] = $batch; + $result['notify'] = $notify; + $result['poll'] = $poll; + $result['request'] = $request; + $result['confirm'] = $confirm; + $result['poco'] = $poco; + $result['photo'] = $vcard['photo']; + $result['priority'] = $priority; + $result['network'] = $network; + $result['alias'] = $alias; + $result['pubkey'] = $pubkey; + + logger('probe_url: ' . print_r($result,true), LOGGER_DEBUG); + + return $result; +/* +Array +( + [name] => Mike Macgirvin + [nick] => MikeMacgirvin + [url] => https://joindiaspora.com/u/macgirvin + [addr] => macgirvin@joindiaspora.com + [batch] => https://joindiaspora.com/receive/public + [notify] => https://joindiaspora.com/receive/users/a9174a618f8d269a + [poll] => https://joindiaspora.com/public/macgirvin.atom + [request] => + [confirm] => + [poco] => + [photo] => https://joindiaspora.s3.amazonaws.com/uploads/images/thumb_large_fec4e6eef13ae5e56207.jpg + [priority] => + [network] => diaspora + [alias] => + [pubkey] => -----BEGIN PUBLIC KEY----- +MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAtihtyIuRDWkDpCA+I1UaQ +jI4S7k625+A7EEJm+pL2ZVSJxeCKiFeEgHBQENjLMNNm8l8F6blxgQqE6ZJ9Spa7f +tlaXYTRCrfxKzh02L3hR7sNA+JS/nXJaUAIo+IwpIEspmcIRbD9GB7Wv/rr+M28uH +31EeYyDz8QL6InU/bJmnCdFvmEMBQxJOw1ih9tQp7UNJAbUMCje0WYFzBz7sfcaHL +OyYcCOqOCBLdGucUoJzTQ9iDBVzB8j1r1JkIHoEb2moUoKUp+tkCylNfd/3IVELF9 +7w1Qjmit3m50OrJk2DQOXvCW9KQxaQNdpRPSwhvemIt98zXSeyZ1q/YjjOwG0DWDq +AF8aLj3/oQaZndTPy/6tMiZogKaijoxj8xFLuPYDTw5VpKquriVC0z8oxyRbv4t9v +8JZZ9BXqzmayvY3xZGGp8NulrfjW+me2bKh0/df1aHaBwpZdDTXQ6kqAiS2FfsuPN +vg57fhfHbL1yJ4oDbNNNeI0kJTGchXqerr8C20khU/cQ2Xt31VyEZtnTB665Ceugv +kp3t2qd8UpAVKl430S5Quqx2ymfUIdxdW08CEjnoRNEL3aOWOXfbf4gSVaXmPCR4i +LSIeXnd14lQYK/uxW/8cTFjcmddsKxeXysoQxbSa9VdDK+KkpZdgYXYrTTofXs6v+ +4afAEhRaaY+MCAwEAAQ== +-----END PUBLIC KEY----- + +) +*/ + + + + } } diff --git a/version.inc b/version.inc index 416f0207c..5eaf3e43a 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-08-23.776 +2014-08-24.777 -- cgit v1.2.3 From d57c57ad59f311aa8d1488a6985874bae7beae38 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 24 Aug 2014 05:26:00 -0700 Subject: onepoll: don't poll archived, blocked, or ignored connections --- include/onepoll.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/onepoll.php b/include/onepoll.php index e81d8bcf7..947e936ac 100644 --- a/include/onepoll.php +++ b/include/onepoll.php @@ -35,10 +35,12 @@ function onepoll_run($argv, $argc){ FROM abook LEFT JOIN account on abook_account = account_id left join xchan on xchan_hash = abook_xchan where abook_id = %d AND (( abook_flags & %d ) OR ( abook_flags = %d )) + AND NOT ( abook_flags & %d ) AND (( account_flags = %d ) OR ( account_flags = %d )) limit 1", intval($contact_id), intval(ABOOK_FLAG_HIDDEN|ABOOK_FLAG_PENDING|ABOOK_FLAG_UNCONNECTED), intval(0), + intval(ABOOK_FLAG_ARCHIVED|ABOOK_FLAG_BLOCKED|ABOOK_FLAG_IGNORED), intval(ACCOUNT_OK), intval(ACCOUNT_UNVERIFIED) ); -- cgit v1.2.3 From e0ee66d0b40247e05d4cbc1ca7687b74b1bc88d9 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 24 Aug 2014 17:52:26 -0700 Subject: Add d* folks to address book. WARNING - DO NOT ATTEMPT THIS. LEAVE IT THE FRUCK ALONE until the feature is stable. I won't help you if you try this and end up with a borked site. You are completely on your own. --- include/follow.php | 17 +- include/network.php | 656 +++++++++++++++++++++++++++++----------------------- 2 files changed, 378 insertions(+), 295 deletions(-) diff --git a/include/follow.php b/include/follow.php index d98a58198..55249db2b 100644 --- a/include/follow.php +++ b/include/follow.php @@ -117,14 +117,25 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) } else { - // attempt network auto-discovery - $my_perms = 0; $their_perms = 0; $xchan_hash = ''; - + $r = q("select * from xchan where xchan_hash = '%s' limit 1", + dbesc($url) + ); + if(! $r) { + // attempt network auto-discovery + if(strpos($url,'@')) { + $r = discover_by_webbie($url); + } + } + if($r) { + $xchan_hash = $url; + $their_perms = 0; + $my_perms = PERMS_W_STREAM|PERMS_W_MAIL; + } } diff --git a/include/network.php b/include/network.php index e06f4f80a..83a3ea4d0 100644 --- a/include/network.php +++ b/include/network.php @@ -280,7 +280,7 @@ function xml_status($st, $message = '') { function http_status_exit($val,$msg = '') { - $err = ''; + $err = ''; if($val >= 400) $msg = (($msg) ? $msg : 'Error'); if($val >= 200 && $val < 300) @@ -298,43 +298,43 @@ function http_status_exit($val,$msg = '') { function convert_xml_element_to_array($xml_element, &$recursion_depth=0) { - // If we're getting too deep, bail out - if ($recursion_depth > 512) { - return(null); - } - - if (!is_string($xml_element) && - !is_array($xml_element) && - (get_class($xml_element) == 'SimpleXMLElement')) { - $xml_element_copy = $xml_element; - $xml_element = get_object_vars($xml_element); - } - - if (is_array($xml_element)) { - $result_array = array(); - if (count($xml_element) <= 0) { - return (trim(strval($xml_element_copy))); - } - - foreach($xml_element as $key=>$value) { - - $recursion_depth++; - $result_array[strtolower($key)] = - convert_xml_element_to_array($value, $recursion_depth); - $recursion_depth--; - } - if ($recursion_depth == 0) { - $temp_array = $result_array; - $result_array = array( - strtolower($xml_element_copy->getName()) => $temp_array, - ); - } - - return ($result_array); - - } else { - return (trim(strval($xml_element))); - } + // If we're getting too deep, bail out + if ($recursion_depth > 512) { + return(null); + } + + if (!is_string($xml_element) && + !is_array($xml_element) && + (get_class($xml_element) == 'SimpleXMLElement')) { + $xml_element_copy = $xml_element; + $xml_element = get_object_vars($xml_element); + } + + if (is_array($xml_element)) { + $result_array = array(); + if (count($xml_element) <= 0) { + return (trim(strval($xml_element_copy))); + } + + foreach($xml_element as $key=>$value) { + + $recursion_depth++; + $result_array[strtolower($key)] = + convert_xml_element_to_array($value, $recursion_depth); + $recursion_depth--; + } + if ($recursion_depth == 0) { + $temp_array = $result_array; + $result_array = array( + strtolower($xml_element_copy->getName()) => $temp_array, + ); + } + + return ($result_array); + + } else { + return (trim(strval($xml_element))); + } } // Take a URL from the wild, prepend http:// if necessary @@ -584,35 +584,35 @@ function scale_external_images($s, $include_link = true, $scale_replace = false) */ function xml2array($contents, $namespaces = true, $get_attributes=1, $priority = 'attribute') { - if(!$contents) return array(); + if(!$contents) return array(); - if(!function_exists('xml_parser_create')) { - logger('xml2array: parser function missing'); - return array(); - } + if(!function_exists('xml_parser_create')) { + logger('xml2array: parser function missing'); + return array(); + } libxml_use_internal_errors(true); libxml_clear_errors(); if($namespaces) - $parser = @xml_parser_create_ns("UTF-8",':'); + $parser = @xml_parser_create_ns("UTF-8",':'); else - $parser = @xml_parser_create(); + $parser = @xml_parser_create(); if(! $parser) { logger('xml2array: xml_parser_create: no resource'); return array(); } - xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, "UTF-8"); + xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, "UTF-8"); // http://minutillo.com/steve/weblog/2004/6/17/php-xml-and-character-encodings-a-tale-of-sadness-rage-and-data-loss - xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0); - xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1); - @xml_parse_into_struct($parser, trim($contents), $xml_values); - @xml_parser_free($parser); + xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0); + xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1); + @xml_parse_into_struct($parser, trim($contents), $xml_values); + @xml_parser_free($parser); - if(! $xml_values) { + if(! $xml_values) { logger('xml2array: libxml: parse error: ' . $contents, LOGGER_DATA); foreach(libxml_get_errors() as $err) logger('libxml: parse: ' . $err->code . " at " . $err->line . ":" . $err->column . " : " . $err->message, LOGGER_DATA); @@ -620,40 +620,40 @@ function xml2array($contents, $namespaces = true, $get_attributes=1, $priority = return; } - //Initializations - $xml_array = array(); - $parents = array(); - $opened_tags = array(); - $arr = array(); - - $current = &$xml_array; // Reference - - // Go through the tags. - $repeated_tag_index = array(); // Multiple tags with same name will be turned into an array - foreach($xml_values as $data) { - unset($attributes,$value); // Remove existing values, or there will be trouble - - // This command will extract these variables into the foreach scope - // tag(string), type(string), level(int), attributes(array). - extract($data); // We could use the array by itself, but this cooler. - - $result = array(); - $attributes_data = array(); - - if(isset($value)) { - if($priority == 'tag') $result = $value; - else $result['value'] = $value; // Put the value in a assoc array if we are in the 'Attribute' mode - } - - //Set the attributes too. - if(isset($attributes) and $get_attributes) { - foreach($attributes as $attr => $val) { - if($priority == 'tag') $attributes_data[$attr] = $val; - else $result['@attributes'][$attr] = $val; // Set all the attributes in a array called 'attr' - } - } - - // See tag status and do the needed. + //Initializations + $xml_array = array(); + $parents = array(); + $opened_tags = array(); + $arr = array(); + + $current = &$xml_array; // Reference + + // Go through the tags. + $repeated_tag_index = array(); // Multiple tags with same name will be turned into an array + foreach($xml_values as $data) { + unset($attributes,$value); // Remove existing values, or there will be trouble + + // This command will extract these variables into the foreach scope + // tag(string), type(string), level(int), attributes(array). + extract($data); // We could use the array by itself, but this cooler. + + $result = array(); + $attributes_data = array(); + + if(isset($value)) { + if($priority == 'tag') $result = $value; + else $result['value'] = $value; // Put the value in a assoc array if we are in the 'Attribute' mode + } + + //Set the attributes too. + if(isset($attributes) and $get_attributes) { + foreach($attributes as $attr => $val) { + if($priority == 'tag') $attributes_data[$attr] = $val; + else $result['@attributes'][$attr] = $val; // Set all the attributes in a array called 'attr' + } + } + + // See tag status and do the needed. if($namespaces && strpos($tag,':')) { $namespc = substr($tag,0,strrpos($tag,':')); $tag = strtolower(substr($tag,strlen($namespc)+1)); @@ -662,80 +662,80 @@ function xml2array($contents, $namespaces = true, $get_attributes=1, $priority = $tag = strtolower($tag); if($type == "open") { // The starting of the tag '' - $parent[$level-1] = &$current; - if(!is_array($current) or (!in_array($tag, array_keys($current)))) { // Insert New tag - $current[$tag] = $result; - if($attributes_data) $current[$tag. '_attr'] = $attributes_data; - $repeated_tag_index[$tag.'_'.$level] = 1; - - $current = &$current[$tag]; - - } else { // There was another element with the same tag name - - if(isset($current[$tag][0])) { // If there is a 0th element it is already an array - $current[$tag][$repeated_tag_index[$tag.'_'.$level]] = $result; - $repeated_tag_index[$tag.'_'.$level]++; - } else { // This section will make the value an array if multiple tags with the same name appear together - $current[$tag] = array($current[$tag],$result); // This will combine the existing item and the new item together to make an array - $repeated_tag_index[$tag.'_'.$level] = 2; - - if(isset($current[$tag.'_attr'])) { // The attribute of the last(0th) tag must be moved as well - $current[$tag]['0_attr'] = $current[$tag.'_attr']; - unset($current[$tag.'_attr']); - } - - } - $last_item_index = $repeated_tag_index[$tag.'_'.$level]-1; - $current = &$current[$tag][$last_item_index]; - } - - } elseif($type == "complete") { // Tags that ends in 1 line '' - //See if the key is already taken. - if(!isset($current[$tag])) { //New Key - $current[$tag] = $result; - $repeated_tag_index[$tag.'_'.$level] = 1; - if($priority == 'tag' and $attributes_data) $current[$tag. '_attr'] = $attributes_data; - - } else { // If taken, put all things inside a list(array) - if(isset($current[$tag][0]) and is_array($current[$tag])) { // If it is already an array... - - // ...push the new element into that array. - $current[$tag][$repeated_tag_index[$tag.'_'.$level]] = $result; - - if($priority == 'tag' and $get_attributes and $attributes_data) { - $current[$tag][$repeated_tag_index[$tag.'_'.$level] . '_attr'] = $attributes_data; - } - $repeated_tag_index[$tag.'_'.$level]++; - - } else { // If it is not an array... - $current[$tag] = array($current[$tag],$result); //...Make it an array using using the existing value and the new value - $repeated_tag_index[$tag.'_'.$level] = 1; - if($priority == 'tag' and $get_attributes) { - if(isset($current[$tag.'_attr'])) { // The attribute of the last(0th) tag must be moved as well - - $current[$tag]['0_attr'] = $current[$tag.'_attr']; - unset($current[$tag.'_attr']); - } - - if($attributes_data) { - $current[$tag][$repeated_tag_index[$tag.'_'.$level] . '_attr'] = $attributes_data; - } - } - $repeated_tag_index[$tag.'_'.$level]++; // 0 and 1 indexes are already taken - } - } - - } elseif($type == 'close') { // End of tag '' - $current = &$parent[$level-1]; - } - } - - return($xml_array); + $parent[$level-1] = &$current; + if(!is_array($current) or (!in_array($tag, array_keys($current)))) { // Insert New tag + $current[$tag] = $result; + if($attributes_data) $current[$tag. '_attr'] = $attributes_data; + $repeated_tag_index[$tag.'_'.$level] = 1; + + $current = &$current[$tag]; + + } else { // There was another element with the same tag name + + if(isset($current[$tag][0])) { // If there is a 0th element it is already an array + $current[$tag][$repeated_tag_index[$tag.'_'.$level]] = $result; + $repeated_tag_index[$tag.'_'.$level]++; + } else { // This section will make the value an array if multiple tags with the same name appear together + $current[$tag] = array($current[$tag],$result); // This will combine the existing item and the new item together to make an array + $repeated_tag_index[$tag.'_'.$level] = 2; + + if(isset($current[$tag.'_attr'])) { // The attribute of the last(0th) tag must be moved as well + $current[$tag]['0_attr'] = $current[$tag.'_attr']; + unset($current[$tag.'_attr']); + } + + } + $last_item_index = $repeated_tag_index[$tag.'_'.$level]-1; + $current = &$current[$tag][$last_item_index]; + } + + } elseif($type == "complete") { // Tags that ends in 1 line '' + //See if the key is already taken. + if(!isset($current[$tag])) { //New Key + $current[$tag] = $result; + $repeated_tag_index[$tag.'_'.$level] = 1; + if($priority == 'tag' and $attributes_data) $current[$tag. '_attr'] = $attributes_data; + + } else { // If taken, put all things inside a list(array) + if(isset($current[$tag][0]) and is_array($current[$tag])) { // If it is already an array... + + // ...push the new element into that array. + $current[$tag][$repeated_tag_index[$tag.'_'.$level]] = $result; + + if($priority == 'tag' and $get_attributes and $attributes_data) { + $current[$tag][$repeated_tag_index[$tag.'_'.$level] . '_attr'] = $attributes_data; + } + $repeated_tag_index[$tag.'_'.$level]++; + + } else { // If it is not an array... + $current[$tag] = array($current[$tag],$result); //...Make it an array using using the existing value and the new value + $repeated_tag_index[$tag.'_'.$level] = 1; + if($priority == 'tag' and $get_attributes) { + if(isset($current[$tag.'_attr'])) { // The attribute of the last(0th) tag must be moved as well + + $current[$tag]['0_attr'] = $current[$tag.'_attr']; + unset($current[$tag.'_attr']); + } + + if($attributes_data) { + $current[$tag][$repeated_tag_index[$tag.'_'.$level] . '_attr'] = $attributes_data; + } + } + $repeated_tag_index[$tag.'_'.$level]++; // 0 and 1 indexes are already taken + } + } + + } elseif($type == 'close') { // End of tag '' + $current = &$parent[$level-1]; + } + } + + return($xml_array); } function email_header_encode($in_str, $charset = 'UTF-8') { - $out_str = $in_str; + $out_str = $in_str; $need_to_convert = false; for($x = 0; $x < strlen($in_str); $x ++) { @@ -747,42 +747,42 @@ function email_header_encode($in_str, $charset = 'UTF-8') { if(! $need_to_convert) return $in_str; - if ($out_str && $charset) { - - // define start delimimter, end delimiter and spacer - $end = "?="; - $start = "=?" . $charset . "?B?"; - $spacer = $end . "\r\n " . $start; - - // determine length of encoded text within chunks - // and ensure length is even - $length = 75 - strlen($start) - strlen($end); - - /* - [EDIT BY danbrown AT php DOT net: The following - is a bugfix provided by (gardan AT gmx DOT de) - on 31-MAR-2005 with the following note: - "This means: $length should not be even, - but divisible by 4. The reason is that in - base64-encoding 3 8-bit-chars are represented - by 4 6-bit-chars. These 4 chars must not be - split between two encoded words, according - to RFC-2047. - */ - $length = $length - ($length % 4); - - // encode the string and split it into chunks - // with spacers after each chunk - $out_str = base64_encode($out_str); - $out_str = chunk_split($out_str, $length, $spacer); - - // remove trailing spacer and - // add start and end delimiters - $spacer = preg_quote($spacer,'/'); - $out_str = preg_replace("/" . $spacer . "$/", "", $out_str); - $out_str = $start . $out_str . $end; - } - return $out_str; + if ($out_str && $charset) { + + // define start delimimter, end delimiter and spacer + $end = "?="; + $start = "=?" . $charset . "?B?"; + $spacer = $end . "\r\n " . $start; + + // determine length of encoded text within chunks + // and ensure length is even + $length = 75 - strlen($start) - strlen($end); + + /* + [EDIT BY danbrown AT php DOT net: The following + is a bugfix provided by (gardan AT gmx DOT de) + on 31-MAR-2005 with the following note: + "This means: $length should not be even, + but divisible by 4. The reason is that in + base64-encoding 3 8-bit-chars are represented + by 4 6-bit-chars. These 4 chars must not be + split between two encoded words, according + to RFC-2047. + */ + $length = $length - ($length % 4); + + // encode the string and split it into chunks + // with spacers after each chunk + $out_str = base64_encode($out_str); + $out_str = chunk_split($out_str, $length, $spacer); + + // remove trailing spacer and + // add start and end delimiters + $spacer = preg_quote($spacer,'/'); + $out_str = preg_replace("/" . $spacer . "$/", "", $out_str); + $out_str = $start . $out_str . $end; + } + return $out_str; } function email_send($addr, $subject, $headers, $item) { @@ -793,7 +793,7 @@ function email_send($addr, $subject, $headers, $item) { $part = uniqid("", true); - $html = prepare_body($item); + $html = prepare_body($item); $headers .= "Mime-Version: 1.0\n"; $headers .= 'Content-Type: multipart/alternative; boundary="=_'.$part.'"'."\n\n"; @@ -822,11 +822,13 @@ function email_send($addr, $subject, $headers, $item) { function discover_by_webbie($webbie) { require_once('library/HTML5/Parser.php'); + $webbie = strtolower($webbie); + $x = webfinger_rfc7033($webbie); if($x && array_key_exists('links',$x) && $x['links']) { foreach($x['links'] as $link) { if(array_key_exists('rel',$link) && $link['rel'] == 'http://purl.org/zot/protocol') { - logger('discover_by_webbie: zot found for ' . $webbie); + logger('discover_by_webbie: zot found for ' . $webbie, LOGGER_DEBUG); $z = z_fetch_url($link['href']); if($z['success']) { $j = json_decode($z['body'],true); @@ -838,12 +840,12 @@ function discover_by_webbie($webbie) { } $result = array(); - $network = null; - $diaspora = false; + $network = null; + $diaspora = false; - $diaspora_base = ''; - $diaspora_guid = ''; - $diaspora_key = ''; + $diaspora_base = ''; + $diaspora_guid = ''; + $diaspora_key = ''; $dfrn = false; $x = old_webfinger($webbie); @@ -881,48 +883,118 @@ function discover_by_webbie($webbie) { } if($diaspora && $diaspora_base && $diaspora_guid) { - $notify = $diaspora_base . 'receive/users/' . $diaspora_guid; - $batch = $diaspora_base . 'receive/public' ; - if(strpos($webbie,'@')) - $addr = str_replace('acct:', '', $webbie); + $guid = $diaspora_guid; + $diaspora_base = trim($diaspora_base,'/'); + + $notify = $diaspora_base . '/receive'; + +// // '/users/' . $diaspora_guid; +// $batch = $diaspora_base . '/receive/public' ; + if(strpos($webbie,'@')) { + $addr = str_replace('acct:', '', $webbie); + $hostname = substr($webbie,strpos($webbie,'@')+1); + } $network = 'diaspora'; + // until we get a dfrn layer, we'll use diaspora protocols for Friendica, + // but give it a different network so we can go back and fix these when we get proper support. + // It really should be just 'friendica' but we also want to distinguish + // between Friendica sites that we can use D* protocols with and those we can't. + // Some Friendica sites will have Diaspora disabled. if($dfrn) - $network = 'f-diaspora'; - if($hcard) + $network = 'friendica-over-diaspora'; + if($hcard) { $vcard = scrape_vcard($hcard); + $vcard['nick'] = substr($webbie,0,strpos($webbie,'@')); + } + + $r = q("select * from xchan where xchan_hash = '%s' limit 1", + dbesc($webbie) + ); + if($r) + return true; + + $r = q("insert into xchan ( xchan_hash, xchan_guid, xchan_pubkey, xchan_addr, xchan_url, xchan_name, xchan_network, xchan_instance_url, xchan_name_date ) values ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s') ", + dbesc($addr), + dbesc($guid), + dbesc($pubkey), + dbesc($addr), + dbesc($profile), + dbesc($vcard['fn']), + dbesc($network), + dbesc(z_root()), + dbesc(datetime_convert()) + ); + + $r = q("select * from hubloc where hubloc_hash = '%s' limit 1", + dbesc($webbie) + ); + if(! $r) { + $r = q("insert into hubloc ( hubloc_guid, hubloc_hash, hubloc_addr, hubloc_network, hubloc_url, hubloc_host, hubloc_callback, hubloc_updated ) values ('%s','%s','%s','%s','%s','%s','%s','%s')", + dbesc($guid), + dbesc($addr), + dbesc($addr), + dbesc($network), + dbesc(trim($diaspora_base,'/')), + dbesc($hostname), + dbesc($notify), + dbesc(datetime_convert()) + ); + } + $photos = import_profile_photo($vcard['photo'],$addr); + $r = q("update xchan set xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s' where xchan_hash = '%s' limit 1", + dbesc(datetime_convert('UTC','UTC',$arr['photo_updated'])), + dbesc($photos[0]), + dbesc($photos[1]), + dbesc($photos[2]), + dbesc($photos[3]), + dbesc($addr) + ); + return true; + } - $vcard['fn'] = notags($vcard['fn']); - $vcard['nick'] = str_replace(' ','',notags($vcard['nick'])); - - $result['name'] = $vcard['fn']; - $result['nick'] = $vcard['nick']; - $result['url'] = $profile; - $result['addr'] = $addr; - $result['batch'] = $batch; - $result['notify'] = $notify; - $result['poll'] = $poll; - $result['request'] = $request; - $result['confirm'] = $confirm; - $result['poco'] = $poco; - $result['photo'] = $vcard['photo']; - $result['priority'] = $priority; - $result['network'] = $network; - $result['alias'] = $alias; - $result['pubkey'] = $pubkey; - - logger('probe_url: ' . print_r($result,true), LOGGER_DEBUG); - - return $result; + return false; + /* + $vcard['fn'] = notags($vcard['fn']); + $vcard['nick'] = str_replace(' ','',notags($vcard['nick'])); + + $result['name'] = $vcard['fn']; + $result['nick'] = $vcard['nick']; + $result['guid'] = $guid; + $result['url'] = $profile; + $result['hostname'] = $hostname; + $result['addr'] = $addr; + $result['batch'] = $batch; + $result['notify'] = $notify; + $result['poll'] = $poll; + $result['request'] = $request; + $result['confirm'] = $confirm; + $result['poco'] = $poco; + $result['photo'] = $vcard['photo']; + $result['priority'] = $priority; + $result['network'] = $network; + $result['alias'] = $alias; + $result['pubkey'] = $pubkey; + + logger('probe_url: ' . print_r($result,true), LOGGER_DEBUG); + + return $result; + +*/ + +/* Sample Diaspora result. + Array ( [name] => Mike Macgirvin - [nick] => MikeMacgirvin + [nick] => macgirvin + [guid] => a9174a618f8d269a [url] => https://joindiaspora.com/u/macgirvin + [hostname] => joindiaspora.com [addr] => macgirvin@joindiaspora.com - [batch] => https://joindiaspora.com/receive/public - [notify] => https://joindiaspora.com/receive/users/a9174a618f8d269a + [batch] => + [notify] => https://joindiaspora.com/receive [poll] => https://joindiaspora.com/public/macgirvin.atom [request] => [confirm] => @@ -996,33 +1068,33 @@ function old_webfinger($webbie) { $links = fetch_xrd_links($pxrd); } return $links; - } + } } - return array(); + return array(); } function fetch_lrdd_template($host) { - $tpl = ''; - - $url1 = 'https://' . $host . '/.well-known/host-meta' ; - $url2 = 'http://' . $host . '/.well-known/host-meta' ; - $links = fetch_xrd_links($url1); - logger('fetch_lrdd_template from: ' . $url1, LOGGER_DEBUG); - logger('template (https): ' . print_r($links,true),LOGGER_DEBUG); - if(! count($links)) { - logger('fetch_lrdd_template from: ' . $url2); - $links = fetch_xrd_links($url2); - logger('template (http): ' . print_r($links,true),LOGGER_DEBUG); - } - if(count($links)) { - foreach($links as $link) - if($link['@attributes']['rel'] && $link['@attributes']['rel'] === 'lrdd' && (!$link['@attributes']['type'] || $link['@attributes']['type'] === 'application/xrd+xml')) - $tpl = $link['@attributes']['template']; - } - if(! strpos($tpl,'{uri}')) - $tpl = ''; - return $tpl; + $tpl = ''; + + $url1 = 'https://' . $host . '/.well-known/host-meta' ; + $url2 = 'http://' . $host . '/.well-known/host-meta' ; + $links = fetch_xrd_links($url1); + logger('fetch_lrdd_template from: ' . $url1, LOGGER_DEBUG); + logger('template (https): ' . print_r($links,true),LOGGER_DEBUG); + if(! count($links)) { + logger('fetch_lrdd_template from: ' . $url2); + $links = fetch_xrd_links($url2); + logger('template (http): ' . print_r($links,true),LOGGER_DEBUG); + } + if(count($links)) { + foreach($links as $link) + if($link['@attributes']['rel'] && $link['@attributes']['rel'] === 'lrdd' && (!$link['@attributes']['type'] || $link['@attributes']['type'] === 'application/xrd+xml')) + $tpl = $link['@attributes']['template']; + } + if(! strpos($tpl,'{uri}')) + $tpl = ''; + return $tpl; } @@ -1032,52 +1104,52 @@ function fetch_xrd_links($url) { logger('fetch_xrd_links: ' . $url); $redirects = 0; - $x = z_fetch_url($url,false,$redirects,array('timeout' => 20)); + $x = z_fetch_url($url,false,$redirects,array('timeout' => 20)); if(! $x['success']) return array(); $xml = $x['body']; - logger('fetch_xrd_links: ' . $xml, LOGGER_DATA); - - if ((! $xml) || (! stristr($xml,''),array('href="','"/>'),$xml); - - $h = parse_xml_string($xml); - if(! $h) - return array(); - - $arr = convert_xml_element_to_array($h); - - $links = array(); - - if(isset($arr['xrd']['link'])) { - $link = $arr['xrd']['link']; - - if(! isset($link[0])) - $links = array($link); - else - $links = $link; - } - if(isset($arr['xrd']['alias'])) { - $alias = $arr['xrd']['alias']; - if(! isset($alias[0])) - $aliases = array($alias); - else - $aliases = $alias; - if(is_array($aliases) && count($aliases)) { - foreach($aliases as $alias) { - $links[]['@attributes'] = array('rel' => 'alias' , 'href' => $alias); - } - } - } - - logger('fetch_xrd_links: ' . print_r($links,true), LOGGER_DATA); - - return $links; + logger('fetch_xrd_links: ' . $xml, LOGGER_DATA); + + if ((! $xml) || (! stristr($xml,''),array('href="','"/>'),$xml); + + $h = parse_xml_string($xml); + if(! $h) + return array(); + + $arr = convert_xml_element_to_array($h); + + $links = array(); + + if(isset($arr['xrd']['link'])) { + $link = $arr['xrd']['link']; + + if(! isset($link[0])) + $links = array($link); + else + $links = $link; + } + if(isset($arr['xrd']['alias'])) { + $alias = $arr['xrd']['alias']; + if(! isset($alias[0])) + $aliases = array($alias); + else + $aliases = $alias; + if(is_array($aliases) && count($aliases)) { + foreach($aliases as $alias) { + $links[]['@attributes'] = array('rel' => 'alias' , 'href' => $alias); + } + } + } + + logger('fetch_xrd_links: ' . print_r($links,true), LOGGER_DATA); + + return $links; } -- cgit v1.2.3 From 86fb165dc98e096c71cd94ccfccea29283e42f4b Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 25 Aug 2014 02:14:48 -0700 Subject: re-obscure item body if localize_item() changes it. It's already flagged as obscured so we need it to actually be obscured. --- include/conversation.php | 13 +++++++++++++ version.inc | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/include/conversation.php b/include/conversation.php index daf1c723f..b14e609dd 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -262,6 +262,8 @@ function localize_item(&$item){ $item['body'] = sprintf($txt, $A, t($verb)); } + + /* // FIXME store parent item as object or target // (and update to json storage) @@ -363,6 +365,17 @@ function localize_item(&$item){ // if($sparkle) // $item['plink'] = $y . '?f=&url=' . $item['plink']; // } + + // if item body was obscured and we changed it, re-obscure it + // FIXME - we need a better filter than just the string 'data'; try and + // match the fact that it's json encoded + + if(($item['item_flags'] & ITEM_OBSCURED) + && strlen($item['body']) && (! strpos($item['body'],'data'))) { + $item['body'] = json_encode(crypto_encapsulate($item['body'],get_config('system','pubkey'))); + } + + } /** diff --git a/version.inc b/version.inc index 5eaf3e43a..ccd4c24d1 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-08-24.777 +2014-08-25.778 -- cgit v1.2.3 From df634f9853fb18a7c70f5dea80368e3665782f2d Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 25 Aug 2014 20:55:37 -0700 Subject: notifications/system not marking all notifications seen --- view/tpl/notifications.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/tpl/notifications.tpl b/view/tpl/notifications.tpl index ae87c8ec8..285efbae0 100755 --- a/view/tpl/notifications.tpl +++ b/view/tpl/notifications.tpl @@ -1,6 +1,6 @@

                {{$notif_header}}

                {{if $notifications_available}} -{{$notif_link_mark_seen}} +{{$notif_link_mark_seen}} {{/if}}
                {{$notif_content}} -- cgit v1.2.3 From 84ff380302764703dcc0bdf9ab5d69bac549726e Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 25 Aug 2014 20:57:10 -0700 Subject: more diaspora heavy lifting --- include/account.php | 2 +- include/diaspora.php | 235 ++++++++++++++++++++++++++++++++++++++++----------- include/notifier.php | 77 +++++++++++++---- 3 files changed, 248 insertions(+), 66 deletions(-) diff --git a/include/account.php b/include/account.php index 138db3290..4ded069d5 100644 --- a/include/account.php +++ b/include/account.php @@ -423,7 +423,7 @@ function user_deny($hash) { if(! count($register)) return false; - $account = q("SELECT account_id FROM account WHERE account_id = %d LIMIT 1", + $account = q("SELECT account_id, account_email FROM account WHERE account_id = %d LIMIT 1", intval($register[0]['uid']) ); diff --git a/include/diaspora.php b/include/diaspora.php index 982e40f2f..d93baaaa0 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -121,7 +121,129 @@ function diaspora_is_blacklisted($s) { return false; } +function diaspora_process_outbound($arr) { +/* + + We are passed the following array from the notifier, providing everything we need to make delivery decisions. + + diaspora_process_outbound(array( + 'channel' => $channel, + 'env_recips' => $env_recips, + 'recipients' => $recipients, + 'item' => $item, + 'target_item' => $target_item, + 'hub' => $hub, + 'top_level_post' => $top_level_post, + 'private' => $private, + 'followup' => $followup, + 'relay_to_owner' => $relay_to_owner, + 'uplink' => $uplink, + 'cmd' => $cmd, + 'expire' => $expire, + 'mail' => $mail, + 'fsuggest' => $fsuggest, + 'normal_mode' => $normal_mode, + 'packet_type' => $packet_type, + 'walltowall' => $walltowall, + )); +*/ + + + if($arr['walltowall']) + return; + + if($arr['recipients']) { + $r = q("select * from xchan left join hubloc on xchan_hash = hubloc_hash where hubloc_url = '%s' + and xchan_hash in (" . implode(',',$arr['recipients']) . ") + and xchan_network in ('diaspora', 'friendica-over-diaspora') ", + dbesc($arr['hub']['hubloc_url']) + ); + if(! $r) { + logger('diaspora_process_outbound: no recipients'); + return; + } + + foreach($r as $contact) { + + if($arr['mail']) { + diaspora_send_mail($arr['item'],$arr['channel'],$contact); + continue; + } + + if(! $arr['normal_mode']) + continue; + + // special handling for followup to public post + // all other public posts processed as public batches further below + + if((! $arr['private']) && ($arr['followup'])) { + diaspora_send_followup($arr['target_item'],$arr['channel'],$contact, true); + continue; + } + + if(! $contact['xchan_pubkey']) + continue; + + if(activity_match($arr['target_item']['verb'],ACTIVITY_DISLIKE)) { + continue; + } + elseif(($arr['target_item']['item_restrict'] & ITEM_DELETED) + && (($arr['target_item']['mid'] === $arr['target_item']['parent_mid']) || $arr['followup'])) { + // send both top-level retractions and relayable retractions for owner to relay + diaspora_send_retraction($arr['target_item'],$arr['channel'],$contact); + continue; + } + elseif($arr['followup']) { + // send comments and likes to owner to relay + diaspora_send_followup($arr['target_item'],$arr['channel'],$contact); + continue; + } + + elseif($target_item['mid'] !== $target_item['parent_mid']) { + // we are the relay - send comments, likes and relayable_retractions + // (of comments and likes) to our conversants + diaspora_send_relay($arr['target_item'],$arr['channel'],$contact); + continue; + } + elseif($arr['top_level']) { + diaspora_send_status($arr['target_item'],$arr['channel'],$contact); + continue; + } + } + } + else { + // public message + + $contact = array('hubloc_callback' => $arr['hub']['hubloc_callback']); + + if($target_item['verb'] === ACTIVITY_DISLIKE) { + // unsupported + return; + } + elseif(($arr['target_item']['deleted']) + && ($arr['target_item']['mid'] === $arr['target_item']['parent_mod'])) { + // top-level retraction + logger('delivery: diaspora retract: ' . $loc); + diaspora_send_retraction($arr['target_item'],$arr['channel'],$contact,true); + return; + } + elseif($arr['target_item']['mid'] !== $mid['target_item']['parent_mid']) { + // we are the relay - send comments, likes and relayable_retractions to our conversants + logger('delivery: diaspora relay: ' . $loc); + diaspora_send_relay($arr['target_item'],$arr['channel'],$contact,true); + return; + } + elseif(($arr['top_level_post']) && (! $arr['walltowall'])) { + // currently no workable solution for sending walltowall + logger('delivery: diaspora status: ' . $loc); + diaspora_send_status($arr['target_item'],$arr['channel'],$contact,true); + return; + } + + } + +} @@ -226,13 +348,13 @@ $magic_env = <<< EOT
                - $handle + $handle
                - base64url - RSA-SHA256 - $data - $sig + base64url + RSA-SHA256 + $data + $sig
                EOT; @@ -323,10 +445,10 @@ $magic_env = <<< EOT $encrypted_header - base64url - RSA-SHA256 - $data - $sig + base64url + RSA-SHA256 + $data + $sig EOT; @@ -386,19 +508,19 @@ function diaspora_decode($importer,$xml) { * $decrypted now contains something like * * - * 8e+G2+ET8l5BPuW0sVTnQw== - * UvSMb4puPeB14STkcDWq+4QE302Edu15oaprAQSkLKU= + * 8e+G2+ET8l5BPuW0sVTnQw== + * UvSMb4puPeB14STkcDWq+4QE302Edu15oaprAQSkLKU= ***** OBSOLETE - * - * Ryan Hughes - * acct:galaxor@diaspora.pirateship.org - * + * + * Ryan Hughes + * acct:galaxor@diaspora.pirateship.org + * ***** CURRENT - * galaxor@diaspora.priateship.org + * galaxor@diaspora.priateship.org ***** END DIFFS @@ -576,7 +698,7 @@ function diaspora_request($importer,$xml) { if($new_connection) { require_once('include/enotify.php'); notification(array( - 'type' => NOTIFY_INTRO, + 'type' => NOTIFY_INTRO, 'from_xchan' => $ret['xchan_hash'], 'to_xchan' => $importer['channel_hash'], 'link' => z_root() . '/connedit/' . $new_connection[0]['abook_id'], @@ -585,7 +707,7 @@ function diaspora_request($importer,$xml) { if($default_perms) { // Send back a sharing notification to them diaspora_share($importer['channel_id'],$new_connection[0]); - + } } } @@ -1309,11 +1431,11 @@ function diaspora_conversation($importer,$xml,$msg) { ); if($r) $c = q("select * from conv where uid = %d and guid = '%s' limit 1", - intval($importer['channel_id']), - dbesc($guid) - ); - if(count($c)) - $conversation = $c[0]; + intval($importer['channel_id']), + dbesc($guid) + ); + if(count($c)) + $conversation = $c[0]; } if(! $conversation) { logger('diaspora_conversation: unable to create conversation.'); @@ -1578,7 +1700,7 @@ function diaspora_photo($importer,$xml,$msg,$attempt=1) { $link_text = '[img]' . $remote_photo_path . $remote_photo_name . '[/img]' . "\n"; $link_text = scale_external_images($link_text, true, - array($remote_photo_name, 'scaled_full_' . $remote_photo_name)); + array($remote_photo_name, 'scaled_full_' . $remote_photo_name)); if(strpos($parent_item['body'],$link_text) === false) { $r = q("update item set `body` = '%s', `visible` = 1 where `id` = %d and `uid` = %d", @@ -2044,6 +2166,18 @@ function diaspora_profile($importer,$xml,$msg) { function diaspora_share($me,$contact) { $a = get_app(); $myaddr = $me['channel_address'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3); + + if(! array_key_exists('xchan_hash',$contact)) { + $c = q("select * from xchan left join hubloc on xchan_hash = hubloc_hash where xchan_hash = '%s' limit 1", + dbesc($contact['hubloc_hash']) + ); + if(! $c) { + logger('diaspora_share: ' . $contact['hubloc_hash'] . ' not found.'); + return; + } + $contact = $c[0]; + } + $theiraddr = $contact['xchan_addr']; $tpl = get_markup_template('diaspora_share.tpl'); @@ -2052,29 +2186,25 @@ function diaspora_share($me,$contact) { '$recipient' => $theiraddr )); - $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$me,$contact,$me['prvkey'],$contact['pubkey']))); - //$slap = 'xml=' . urlencode(diaspora_msg_build($msg,$me,$contact,$me['prvkey'],$contact['pubkey'])); - + $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$me,$contact,$me['channel_prvkey'],$contact['xchan_pubkey']))); return(diaspora_transmit($owner,$contact,$slap, false)); } function diaspora_unshare($me,$contact) { $a = get_app(); - $myaddr = $me['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3); + $myaddr = $me['channel_address'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3); $tpl = get_markup_template('diaspora_retract.tpl'); $msg = replace_macros($tpl, array( - '$guid' => $me['guid'], + '$guid' => $me['channel_guid'], '$type' => 'Person', '$handle' => $myaddr )); - $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$me,$contact,$me['prvkey'],$contact['pubkey']))); - //$slap = 'xml=' . urlencode(diaspora_msg_build($msg,$me,$contact,$me['prvkey'],$contact['pubkey'])); + $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$me,$contact,$me['channel_prvkey'],$contact['xchan_pubkey']))); return(diaspora_transmit($owner,$contact,$slap, false)); - } @@ -2082,7 +2212,6 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) { $a = get_app(); $myaddr = $owner['channel_address'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3); - $theiraddr = $contact['xchan_addr']; $images = array(); @@ -2167,7 +2296,6 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) { logger('diaspora_send_status: '.$owner['channel_name'].' -> '.$contact['xchan_name'].' base message: '.$msg, LOGGER_DATA); $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['channel_prvkey'],$contact['xchan_pubkey'],$public_batch))); - //$slap = 'xml=' . urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],$public_batch)); $return_code = diaspora_transmit($owner,$contact,$slap,$public_batch); @@ -2210,7 +2338,7 @@ function diaspora_is_reshare($body) { $ret= array(); $ret["root_handle"] = preg_replace("=https?://(.*)/u/(.*)=ism", "$2@$1", $profile); - if (($ret["root_handle"] == $profile) OR ($ret["root_handle"] == "")) + if (($ret["root_handle"] == $profile) OR ($ret["root_handle"] == "")) return(false); $link = ""; @@ -2262,7 +2390,6 @@ function diaspora_send_images($item,$owner,$contact,$images,$public_batch = fals logger('diaspora_send_photo: base message: ' . $msg, LOGGER_DATA); $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['channel_prvkey'],$contact['xchan_pubkey'],$public_batch))); - //$slap = 'xml=' . urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],$public_batch)); diaspora_transmit($owner,$contact,$slap,$public_batch); } @@ -2346,7 +2473,7 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) { $a = get_app(); $myaddr = $owner['channel_address'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3); -// $theiraddr = $contact['addr']; + $body = $item['body']; $text = html_entity_decode(bb2diaspora($body)); @@ -2356,7 +2483,7 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) { // likes on comments if($item['verb'] === ACTIVITY_LIKE && $item['thr_parent']) { $p = q("select * from item where mid = '%s' limit 1", - dbesc($item['thr_parent']) + dbesc($item['thr_parent']) ); } else { @@ -2364,9 +2491,9 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) { // return the items ordered by `item`.`id`, in which case the wrong item is chosen as the parent. // The only item with `parent` and `id` as the parent id is the parent item. $p = q("select * from item where parent = %d and id = %d limit 1", - intval($item['parent']), - intval($item['parent']) - ); + intval($item['parent']), + intval($item['parent']) + ); } if($p) $parent = $p[0]; @@ -2471,8 +2598,7 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) { logger('diaspora_send_relay: base message: ' . $msg, LOGGER_DATA); - $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],$public_batch))); - //$slap = 'xml=' . urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],$public_batch)); + $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['channel_prvkey'],$contact['xchan_pubkey'],$public_batch))); return(diaspora_transmit($owner,$contact,$slap,$public_batch)); @@ -2506,8 +2632,7 @@ function diaspora_send_retraction($item,$owner,$contact,$public_batch = false) { '$signature' => xmlify(base64_encode(rsa_sign($signed_text,$owner['uprvkey'],'sha256'))) )); - $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],$public_batch))); - //$slap = 'xml=' . urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],$public_batch)); + $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['channel_prvkey'],$contact['xchan_pubkey'],$public_batch))); return(diaspora_transmit($owner,$contact,$slap,$public_batch)); } @@ -2542,7 +2667,7 @@ function diaspora_send_mail($item,$owner,$contact) { $signed_text = $item['guid'] . ';' . $cnv['guid'] . ';' . $body . ';' . $created . ';' . $myaddr . ';' . $cnv['guid']; - $sig = base64_encode(rsa_sign($signed_text,$owner['uprvkey'],'sha256')); + $sig = base64_encode(rsa_sign($signed_text,$owner['channel_prvkey'],'sha256')); $msg = array( 'guid' => xmlify($item['guid']), @@ -2567,8 +2692,7 @@ function diaspora_send_mail($item,$owner,$contact) { logger('diaspora_conversation: ' . print_r($xmsg,true), LOGGER_DATA); - $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($xmsg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],false))); - //$slap = 'xml=' . urlencode(diaspora_msg_build($xmsg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],false)); + $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($xmsg,$owner,$contact,$owner['channel_prvkey'],$contact['xchan_pubkey'],false))); return(diaspora_transmit($owner,$contact,$slap,false)); @@ -2582,6 +2706,21 @@ function diaspora_transmit($owner,$contact,$slap,$public_batch,$queue_run=false) return 200; } + if($public_batch) + $dest_url = $contact['hubloc_callback'] . '/public'; + else + $dest_url = $contact['hubloc_callback'] . '/users/' . $contact['guid']; + + + + if(intval(get_config('system','diaspora_test'))) + return 200; + + + +return 200; + + $a = get_app(); $logid = random_string(4); $dest_url = (($public_batch) ? $contact['batch'] : $contact['notify']); diff --git a/include/notifier.php b/include/notifier.php index 180a538bc..0a5cf3f4c 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -103,28 +103,33 @@ function notifier_run($argv, $argc){ ); if($r) { // Get the sender - $s = q("select * from channel where channel_id = %d limit 1", + $s = q("select * from channel left join xchan on channel_hash = xchan_hash where channel_id = %d limit 1", intval($r[0]['abook_channel']) ); if($s) { - - // send a refresh message to each hub they have registered here - $h = q("select * from hubloc where hubloc_hash = '%s'", - dbesc($r[0]['hubloc_hash']) - ); - if($h) { - foreach($h as $hh) { - $data = zot_build_packet($s[0],'refresh',array(array( - 'guid' => $hh['hubloc_guid'], - 'guid_sig' => $hh['hubloc_guid_sig'], - 'url' => $hh['hubloc_url']) - )); - if($data) { - $result = zot_zot($hh['hubloc_callback'],$data); + if($r[0]['hubloc_network'] === 'diaspora' || $r[0]['hubloc_network'] === 'friendica_over_diaspora') { + require_once('include/diaspora.php'); + diaspora_share($s[0],$r[0]); + } + else { + // send a refresh message to each hub they have registered here + $h = q("select * from hubloc where hubloc_hash = '%s'", + dbesc($r[0]['hubloc_hash']) + ); + if($h) { + foreach($h as $hh) { + $data = zot_build_packet($s[0],'refresh',array(array( + 'guid' => $hh['hubloc_guid'], + 'guid_sig' => $hh['hubloc_guid_sig'], + 'url' => $hh['hubloc_url']) + )); + if($data) { + $result = zot_zot($hh['hubloc_callback'],$data); // zot_queue_item is not yet written // if(! $result['success']) // zot_queue_item(); + } } } } @@ -366,6 +371,8 @@ function notifier_run($argv, $argc){ } + $walltowall = (($top_level_post && $channel['xchan_hash'] === $target_item['author_xchan']) ? true : false); + // Generic delivery section, we have an encoded item and recipients // Now start the delivery process @@ -438,11 +445,11 @@ function notifier_run($argv, $argc){ // aren't the owner or author. - $r = q("select hubloc_sitekey, hubloc_flags, hubloc_callback, hubloc_host from hubloc + $r = q("select hubloc_sitekey, hubloc_network, hubloc_flags, hubloc_callback, hubloc_host from hubloc where hubloc_hash in (" . implode(',',$recipients) . ") group by hubloc_sitekey order by hubloc_connected desc limit 1"); } else { - $r = q("select hubloc_sitekey, hubloc_flags, hubloc_callback, hubloc_host from hubloc + $r = q("select hubloc_sitekey, hubloc_network, hubloc_flags, hubloc_callback, hubloc_host from hubloc where hubloc_hash in (" . implode(',',$recipients) . ") $sql_extra group by hubloc_sitekey"); } @@ -485,6 +492,42 @@ function notifier_run($argv, $argc){ } } + + if($hub['network'] === 'diaspora' || $hub['network'] === 'friendica-over-diaspora') { + if(! get_config('system','diaspora_enabled')) + continue; + + require_once('include/diaspora.php'); + + diaspora_process_outbound(array( + 'channel' => $channel, + 'env_recips' => $env_recips, + 'recipients' => $recipients, + 'item' => $item, + 'target_item' => $target_item, + 'hub' => $hub, + 'top_level_post' => $top_level_post, + 'private' => $private, + 'followup' => $followup, + 'relay_to_owner' => $relay_to_owner, + 'uplink' => $uplink, + 'cmd' => $cmd, + 'expire' => $expire, + 'mail' => $mail, + 'fsuggest' => $fsuggest, + 'normal_mode' => $normal_mode, + 'packet_type' => $packet_type, + 'walltowall' => $walltowall + )); + + continue; + + } + + + // default: zot protocol + + $hash = random_string(); if($packet_type === 'refresh' || $packet_type === 'purge') { $n = zot_build_packet($channel,$packet_type); -- cgit v1.2.3 From eb8f194419975a6cd3debba145c8769da055b8dc Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 25 Aug 2014 21:42:46 -0700 Subject: sort out some anomalies --- include/diaspora.php | 6 +++--- include/network.php | 5 +++-- include/notifier.php | 4 ++-- include/zot.php | 13 ++++++++++++- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/include/diaspora.php b/include/diaspora.php index d93baaaa0..ebd1906f3 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -215,7 +215,7 @@ function diaspora_process_outbound($arr) { else { // public message - $contact = array('hubloc_callback' => $arr['hub']['hubloc_callback']); + $contact = $arr['hub']; if($target_item['verb'] === ACTIVITY_DISLIKE) { // unsupported @@ -2709,9 +2709,9 @@ function diaspora_transmit($owner,$contact,$slap,$public_batch,$queue_run=false) if($public_batch) $dest_url = $contact['hubloc_callback'] . '/public'; else - $dest_url = $contact['hubloc_callback'] . '/users/' . $contact['guid']; + $dest_url = $contact['hubloc_callback'] . '/users/' . $contact['hubloc_guid']; - + logger('diaspora_transmit: URL: ' . $dest_url, LOGGER_DEBUG); if(intval(get_config('system','diaspora_test'))) return 200; diff --git a/include/network.php b/include/network.php index 83a3ea4d0..ff0502f5a 100644 --- a/include/network.php +++ b/include/network.php @@ -929,7 +929,7 @@ function discover_by_webbie($webbie) { dbesc($webbie) ); if(! $r) { - $r = q("insert into hubloc ( hubloc_guid, hubloc_hash, hubloc_addr, hubloc_network, hubloc_url, hubloc_host, hubloc_callback, hubloc_updated ) values ('%s','%s','%s','%s','%s','%s','%s','%s')", + $r = q("insert into hubloc ( hubloc_guid, hubloc_hash, hubloc_addr, hubloc_network, hubloc_url, hubloc_host, hubloc_callback, hubloc_updated, hubloc_flags ) values ('%s','%s','%s','%s','%s','%s','%s','%s', %d)", dbesc($guid), dbesc($addr), dbesc($addr), @@ -937,7 +937,8 @@ function discover_by_webbie($webbie) { dbesc(trim($diaspora_base,'/')), dbesc($hostname), dbesc($notify), - dbesc(datetime_convert()) + dbesc(datetime_convert()), + intval(HUBLOC_FLAGS_PRIMARY) ); } $photos = import_profile_photo($vcard['photo'],$addr); diff --git a/include/notifier.php b/include/notifier.php index 0a5cf3f4c..7c4f64ae0 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -445,11 +445,11 @@ function notifier_run($argv, $argc){ // aren't the owner or author. - $r = q("select hubloc_sitekey, hubloc_network, hubloc_flags, hubloc_callback, hubloc_host from hubloc + $r = q("select hubloc_guid, hubloc_sitekey, hubloc_network, hubloc_flags, hubloc_callback, hubloc_host from hubloc where hubloc_hash in (" . implode(',',$recipients) . ") group by hubloc_sitekey order by hubloc_connected desc limit 1"); } else { - $r = q("select hubloc_sitekey, hubloc_network, hubloc_flags, hubloc_callback, hubloc_host from hubloc + $r = q("select hubloc_guid, hubloc_sitekey, hubloc_network, hubloc_flags, hubloc_callback, hubloc_host from hubloc where hubloc_hash in (" . implode(',',$recipients) . ") $sql_extra group by hubloc_sitekey"); } diff --git a/include/zot.php b/include/zot.php index a155b2588..65c092b93 100644 --- a/include/zot.php +++ b/include/zot.php @@ -198,11 +198,17 @@ function zot_finger($webbie,$channel,$autofallback = true) { if($r) { $url = $r[0]['hubloc_url']; + + if($r[0]['hubloc_network'] && $r[0]['hubloc_network'] !== 'zot') { + logger('zot_finger: alternate network: ' . $webbie); + return array('success' => false); + } } else { $url = 'https://' . $host; } - + + $rhs = '/.well-known/zot-info'; $https = ((strpos($url,'https://') === 0) ? true : false); @@ -271,6 +277,11 @@ function zot_finger($webbie,$channel,$autofallback = true) { function zot_refresh($them,$channel = null, $force = false) { + if(array_key_exists('xchan_network',$them) && ($them['xchan_network'] !== 'zot')) { + logger('zot_refresh: not got zot. ' . $them['xchan_name']); + return true; + } + logger('zot_refresh: them: ' . print_r($them,true), LOGGER_DATA); if($channel) logger('zot_refresh: channel: ' . print_r($channel,true), LOGGER_DATA); -- cgit v1.2.3 From 6e99848043d198af5013c2439e7a2d16d8a32c52 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 25 Aug 2014 22:43:44 -0700 Subject: more diaspora stuff - most of the basic bits are there except queueing and physical delivery (I'm keeping delivery turned off until some of the bugs are fixed so we don't cause inifinite loops or network meltdowns) - now it's just a matter of going through and methodically finding all the bugs --- include/diaspora.php | 47 +++++++++++++++++++++++------- include/items.php | 1 + include/notifier.php | 2 +- view/tpl/diaspora_comment.tpl | 16 ++++++++++ view/tpl/diaspora_comment_relay.tpl | 17 +++++++++++ view/tpl/diaspora_conversation.tpl | 34 +++++++++++++++++++++ view/tpl/diaspora_like.tpl | 17 +++++++++++ view/tpl/diaspora_like_relay.tpl | 18 ++++++++++++ view/tpl/diaspora_message.tpl | 18 ++++++++++++ view/tpl/diaspora_photo.tpl | 18 ++++++++++++ view/tpl/diaspora_post.tpl | 12 ++++++++ view/tpl/diaspora_profile.tpl | 21 +++++++++++++ view/tpl/diaspora_relay_retraction.tpl | 15 ++++++++++ view/tpl/diaspora_relayable_retraction.tpl | 16 ++++++++++ view/tpl/diaspora_reshare.tpl | 18 ++++++++++++ view/tpl/diaspora_retract.tpl | 14 +++++++++ view/tpl/diaspora_share.tpl | 13 +++++++++ view/tpl/diaspora_signed_retract.tpl | 15 ++++++++++ 18 files changed, 300 insertions(+), 12 deletions(-) create mode 100644 view/tpl/diaspora_comment.tpl create mode 100644 view/tpl/diaspora_comment_relay.tpl create mode 100644 view/tpl/diaspora_conversation.tpl create mode 100644 view/tpl/diaspora_like.tpl create mode 100644 view/tpl/diaspora_like_relay.tpl create mode 100644 view/tpl/diaspora_message.tpl create mode 100644 view/tpl/diaspora_photo.tpl create mode 100644 view/tpl/diaspora_post.tpl create mode 100644 view/tpl/diaspora_profile.tpl create mode 100644 view/tpl/diaspora_relay_retraction.tpl create mode 100644 view/tpl/diaspora_relayable_retraction.tpl create mode 100644 view/tpl/diaspora_reshare.tpl create mode 100644 view/tpl/diaspora_retract.tpl create mode 100644 view/tpl/diaspora_share.tpl create mode 100644 view/tpl/diaspora_signed_retract.tpl diff --git a/include/diaspora.php b/include/diaspora.php index ebd1906f3..1e101b4a7 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -153,9 +153,9 @@ function diaspora_process_outbound($arr) { if($arr['walltowall']) return; - if($arr['recipients']) { + if($arr['env_recips']) { $r = q("select * from xchan left join hubloc on xchan_hash = hubloc_hash where hubloc_url = '%s' - and xchan_hash in (" . implode(',',$arr['recipients']) . ") + and xchan_hash in (" . implode(',',$arr['env_recips']) . ") and xchan_network in ('diaspora', 'friendica-over-diaspora') ", dbesc($arr['hub']['hubloc_url']) ); @@ -228,13 +228,13 @@ function diaspora_process_outbound($arr) { diaspora_send_retraction($arr['target_item'],$arr['channel'],$contact,true); return; } - elseif($arr['target_item']['mid'] !== $mid['target_item']['parent_mid']) { + elseif($arr['target_item']['mid'] !== $arr['target_item']['parent_mid']) { // we are the relay - send comments, likes and relayable_retractions to our conversants logger('delivery: diaspora relay: ' . $loc); diaspora_send_relay($arr['target_item'],$arr['channel'],$contact,true); return; } - elseif(($arr['top_level_post']) && (! $arr['walltowall'])) { + elseif($arr['top_level_post']) { // currently no workable solution for sending walltowall logger('delivery: diaspora status: ' . $loc); diaspora_send_status($arr['target_item'],$arr['channel'],$contact,true); @@ -2241,12 +2241,38 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) { } */ - //if(strlen($title)) - // $body = "[b]".html_entity_decode($title)."[/b]\n\n".$body; + + $body = str_ireplace("[quote", "\n\n[quote", $body); + $body = str_ireplace("[/quote]", "[/quote]\n\n", $body); + + // strip bookmark indicators + + $body = preg_replace('/\#\^\[([zu])rl/i', '[$1rl', $body); + $body = preg_replace('/\#\^http/i', 'http', $body); + + // protect tags and mentions from hijacking + + if(! intval(get_pconfig($owner['channel_id'],'system','allow_tag_hijacking'))) { + $new_tag = html_entity_decode('⋕',ENT_COMPAT,'UTF-8'); + $new_mention = html_entity_decode('@',ENT_COMPAT,'UTF-8'); + + // #-tags + $body = preg_replace('/\#\[url/i', $new_tag . '[url', $body); + $body = preg_replace('/\#\[zrl/i', $new_tag . '[zrl', $body); + // @-mentions + $body = preg_replace('/\@\[url/i', $new_mention . '[url', $body); + $body = preg_replace('/\@\[zrl/i', $new_mention . '[zrl', $body); + } + + // remove multiple newlines + do { + $oldbody = $body; + $body = str_replace("\n\n\n", "\n\n", $body); + } while ($oldbody != $body); + // convert to markdown $body = xmlify(html_entity_decode(bb2diaspora($body))); - //$body = bb2diaspora($body); // Adding the title if(strlen($title)) @@ -2262,7 +2288,6 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) { } } - $public = (($item['item_private']) ? 'false' : 'true'); require_once('include/datetime.php'); @@ -2279,7 +2304,7 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) { '$handle' => xmlify($myaddr), '$public' => $public, '$created' => $created, - '$provider' => $item['app'] + '$provider' => (($item['app']) ? $item['app'] : 'redmatrix') )); } else { $tpl = get_markup_template('diaspora_post.tpl'); @@ -2289,11 +2314,11 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) { '$handle' => xmlify($myaddr), '$public' => $public, '$created' => $created, - '$provider' => $item['app'] + '$provider' => (($item['app']) ? $item['app'] : 'redmatrix') )); } - logger('diaspora_send_status: '.$owner['channel_name'].' -> '.$contact['xchan_name'].' base message: '.$msg, LOGGER_DATA); + logger('diaspora_send_status: '.$owner['channel_name'].' -> '.$contact['xchan_name'].' base message: ' . $msg, LOGGER_DATA); $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['channel_prvkey'],$contact['xchan_pubkey'],$public_batch))); diff --git a/include/items.php b/include/items.php index f10a5c570..e9f11ee4a 100755 --- a/include/items.php +++ b/include/items.php @@ -95,6 +95,7 @@ function collect_recipients($item,&$private_envelope) { $recipients[] = $item['author_xchan']; if($item['owner_xchan'] != $item['author_xchan']) $recipients[] = $item['owner_xchan']; + return $recipients; } diff --git a/include/notifier.php b/include/notifier.php index 7c4f64ae0..7f4d7a9f8 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -493,7 +493,7 @@ function notifier_run($argv, $argc){ } - if($hub['network'] === 'diaspora' || $hub['network'] === 'friendica-over-diaspora') { + if($hub['hubloc_network'] === 'diaspora' || $hub['hubloc_network'] === 'friendica-over-diaspora') { if(! get_config('system','diaspora_enabled')) continue; diff --git a/view/tpl/diaspora_comment.tpl b/view/tpl/diaspora_comment.tpl new file mode 100644 index 000000000..8df3842d0 --- /dev/null +++ b/view/tpl/diaspora_comment.tpl @@ -0,0 +1,16 @@ +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} + + + + {{$guid}} + {{$parent_guid}} + {{$authorsig}} + {{$body}} + {{$handle}} + + + \ No newline at end of file diff --git a/view/tpl/diaspora_comment_relay.tpl b/view/tpl/diaspora_comment_relay.tpl new file mode 100644 index 000000000..c01441e3c --- /dev/null +++ b/view/tpl/diaspora_comment_relay.tpl @@ -0,0 +1,17 @@ +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} + + + + {{$guid}} + {{$parent_guid}} + {{$parentsig}} + {{$authorsig}} + {{$body}} + {{$handle}} + + + \ No newline at end of file diff --git a/view/tpl/diaspora_conversation.tpl b/view/tpl/diaspora_conversation.tpl new file mode 100644 index 000000000..fd11b826a --- /dev/null +++ b/view/tpl/diaspora_conversation.tpl @@ -0,0 +1,34 @@ +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} + + + + {{$conv.guid}} + {{$conv.subject}} + {{$conv.created_at}} + + {{foreach $conv.messages as $msg}} + + + {{$msg.guid}} + {{$msg.parent_guid}} + {{if $msg.parent_author_signature}} + {{$msg.parent_author_signature}} + {{/if}} + {{$msg.author_signature}} + {{$msg.text}} + {{$msg.created_at}} + {{$msg.diaspora_handle}} + {{$msg.conversation_guid}} + + + {{/foreach}} + + {{$conv.diaspora_handle}} + {{$conv.participant_handles}} + + + diff --git a/view/tpl/diaspora_like.tpl b/view/tpl/diaspora_like.tpl new file mode 100644 index 000000000..b35ec46ad --- /dev/null +++ b/view/tpl/diaspora_like.tpl @@ -0,0 +1,17 @@ +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} + + + + {{$positive}} + {{$guid}} + {{$target_type}} + {{$parent_guid}} + {{$authorsig}} + {{$handle}} + + + diff --git a/view/tpl/diaspora_like_relay.tpl b/view/tpl/diaspora_like_relay.tpl new file mode 100644 index 000000000..379bf0f45 --- /dev/null +++ b/view/tpl/diaspora_like_relay.tpl @@ -0,0 +1,18 @@ +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} + + + + {{$positive}} + {{$guid}} + {{$target_type}} + {{$parent_guid}} + {{$parentsig}} + {{$authorsig}} + {{$handle}} + + + diff --git a/view/tpl/diaspora_message.tpl b/view/tpl/diaspora_message.tpl new file mode 100644 index 000000000..e1690734f --- /dev/null +++ b/view/tpl/diaspora_message.tpl @@ -0,0 +1,18 @@ +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} + + + + {{$msg.guid}} + {{$msg.parent_guid}} + {{$msg.author_signature}} + {{$msg.text}} + {{$msg.created_at}} + {{$msg.diaspora_handle}} + {{$msg.conversation_guid}} + + + diff --git a/view/tpl/diaspora_photo.tpl b/view/tpl/diaspora_photo.tpl new file mode 100644 index 000000000..258a9c2f4 --- /dev/null +++ b/view/tpl/diaspora_photo.tpl @@ -0,0 +1,18 @@ +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} + + + + {{$guid}} + {{$handle}} + {{$public}} + {{$created_at}} + {{$path}} + {{$filename}} + {{$msg_guid}} + + + diff --git a/view/tpl/diaspora_post.tpl b/view/tpl/diaspora_post.tpl new file mode 100644 index 000000000..2fe916e00 --- /dev/null +++ b/view/tpl/diaspora_post.tpl @@ -0,0 +1,12 @@ + + + + {{$body}} + {{$guid}} + {{$handle}} + {{$public}} + {{$created}} + {{$provider}} + + + diff --git a/view/tpl/diaspora_profile.tpl b/view/tpl/diaspora_profile.tpl new file mode 100644 index 000000000..e57b82820 --- /dev/null +++ b/view/tpl/diaspora_profile.tpl @@ -0,0 +1,21 @@ +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} + + + {{$handle}} + {{$first}} + {{$last}} + {{$large}} + {{$medium}} + {{$small}} + {{$dob}} + {{$gender}} + {{$about}} + {{$location}} + {{$searchable}} + {{$tags}} + + diff --git a/view/tpl/diaspora_relay_retraction.tpl b/view/tpl/diaspora_relay_retraction.tpl new file mode 100644 index 000000000..97a1344c9 --- /dev/null +++ b/view/tpl/diaspora_relay_retraction.tpl @@ -0,0 +1,15 @@ +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} + + + + {{$type}} + {{$guid}} + {{$signature}} + {{$handle}} + + + diff --git a/view/tpl/diaspora_relayable_retraction.tpl b/view/tpl/diaspora_relayable_retraction.tpl new file mode 100644 index 000000000..c25e13db1 --- /dev/null +++ b/view/tpl/diaspora_relayable_retraction.tpl @@ -0,0 +1,16 @@ +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} + + + + {{$parentsig}} + {{$guid}} + {{$target_type}} + {{$handle}} + {{$authorsig}} + + + diff --git a/view/tpl/diaspora_reshare.tpl b/view/tpl/diaspora_reshare.tpl new file mode 100644 index 000000000..c2b4bf774 --- /dev/null +++ b/view/tpl/diaspora_reshare.tpl @@ -0,0 +1,18 @@ +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} + + + + {{$root_handle}} + {{$root_guid}} + {{$guid}} + {{$handle}} + {{$public}} + {{$created}} + {{$provider}} + + + diff --git a/view/tpl/diaspora_retract.tpl b/view/tpl/diaspora_retract.tpl new file mode 100644 index 000000000..345f4bcb6 --- /dev/null +++ b/view/tpl/diaspora_retract.tpl @@ -0,0 +1,14 @@ +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} + + + + {{$guid}} + {{$handle}} + {{$type}} + + + diff --git a/view/tpl/diaspora_share.tpl b/view/tpl/diaspora_share.tpl new file mode 100644 index 000000000..5ff04440d --- /dev/null +++ b/view/tpl/diaspora_share.tpl @@ -0,0 +1,13 @@ +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} + + + + {{$sender}} + {{$recipient}} + + + \ No newline at end of file diff --git a/view/tpl/diaspora_signed_retract.tpl b/view/tpl/diaspora_signed_retract.tpl new file mode 100644 index 000000000..58c5cc237 --- /dev/null +++ b/view/tpl/diaspora_signed_retract.tpl @@ -0,0 +1,15 @@ +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} + + + + {{$guid}} + {{$type}} + {{$handle}} + {{$signature}} + + + -- cgit v1.2.3 From c99d89e441c742ceaaa299c9de9c2fb322b41993 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 25 Aug 2014 22:58:30 -0700 Subject: get rid of template "auto generated" warnings --- view/tpl/diaspora_comment.tpl | 5 ----- view/tpl/diaspora_comment_relay.tpl | 5 ----- view/tpl/diaspora_conversation.tpl | 5 ----- view/tpl/diaspora_like.tpl | 5 ----- view/tpl/diaspora_like_relay.tpl | 5 ----- view/tpl/diaspora_message.tpl | 5 ----- view/tpl/diaspora_photo.tpl | 5 ----- view/tpl/diaspora_profile.tpl | 5 ----- view/tpl/diaspora_relay_retraction.tpl | 5 ----- view/tpl/diaspora_relayable_retraction.tpl | 5 ----- view/tpl/diaspora_reshare.tpl | 5 ----- view/tpl/diaspora_retract.tpl | 5 ----- view/tpl/diaspora_share.tpl | 5 ----- view/tpl/diaspora_signed_retract.tpl | 5 ----- view/tpl/xrd_diaspora.tpl | 5 ----- 15 files changed, 75 deletions(-) diff --git a/view/tpl/diaspora_comment.tpl b/view/tpl/diaspora_comment.tpl index 8df3842d0..27ec3dffc 100644 --- a/view/tpl/diaspora_comment.tpl +++ b/view/tpl/diaspora_comment.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} diff --git a/view/tpl/diaspora_comment_relay.tpl b/view/tpl/diaspora_comment_relay.tpl index c01441e3c..37a9e88b3 100644 --- a/view/tpl/diaspora_comment_relay.tpl +++ b/view/tpl/diaspora_comment_relay.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} diff --git a/view/tpl/diaspora_conversation.tpl b/view/tpl/diaspora_conversation.tpl index fd11b826a..dc4482e4b 100644 --- a/view/tpl/diaspora_conversation.tpl +++ b/view/tpl/diaspora_conversation.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} diff --git a/view/tpl/diaspora_like.tpl b/view/tpl/diaspora_like.tpl index b35ec46ad..a27e92240 100644 --- a/view/tpl/diaspora_like.tpl +++ b/view/tpl/diaspora_like.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} diff --git a/view/tpl/diaspora_like_relay.tpl b/view/tpl/diaspora_like_relay.tpl index 379bf0f45..8209540c5 100644 --- a/view/tpl/diaspora_like_relay.tpl +++ b/view/tpl/diaspora_like_relay.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} diff --git a/view/tpl/diaspora_message.tpl b/view/tpl/diaspora_message.tpl index e1690734f..3413d79b0 100644 --- a/view/tpl/diaspora_message.tpl +++ b/view/tpl/diaspora_message.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} diff --git a/view/tpl/diaspora_photo.tpl b/view/tpl/diaspora_photo.tpl index 258a9c2f4..256459d8d 100644 --- a/view/tpl/diaspora_photo.tpl +++ b/view/tpl/diaspora_photo.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} diff --git a/view/tpl/diaspora_profile.tpl b/view/tpl/diaspora_profile.tpl index e57b82820..cf53f51c0 100644 --- a/view/tpl/diaspora_profile.tpl +++ b/view/tpl/diaspora_profile.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} {{$handle}} diff --git a/view/tpl/diaspora_relay_retraction.tpl b/view/tpl/diaspora_relay_retraction.tpl index 97a1344c9..5e7aed41f 100644 --- a/view/tpl/diaspora_relay_retraction.tpl +++ b/view/tpl/diaspora_relay_retraction.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} diff --git a/view/tpl/diaspora_relayable_retraction.tpl b/view/tpl/diaspora_relayable_retraction.tpl index c25e13db1..4e3ff3243 100644 --- a/view/tpl/diaspora_relayable_retraction.tpl +++ b/view/tpl/diaspora_relayable_retraction.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} diff --git a/view/tpl/diaspora_reshare.tpl b/view/tpl/diaspora_reshare.tpl index c2b4bf774..963bb9e12 100644 --- a/view/tpl/diaspora_reshare.tpl +++ b/view/tpl/diaspora_reshare.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} diff --git a/view/tpl/diaspora_retract.tpl b/view/tpl/diaspora_retract.tpl index 345f4bcb6..9df066d38 100644 --- a/view/tpl/diaspora_retract.tpl +++ b/view/tpl/diaspora_retract.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} diff --git a/view/tpl/diaspora_share.tpl b/view/tpl/diaspora_share.tpl index 5ff04440d..59eb06124 100644 --- a/view/tpl/diaspora_share.tpl +++ b/view/tpl/diaspora_share.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} diff --git a/view/tpl/diaspora_signed_retract.tpl b/view/tpl/diaspora_signed_retract.tpl index 58c5cc237..f0f346da8 100644 --- a/view/tpl/diaspora_signed_retract.tpl +++ b/view/tpl/diaspora_signed_retract.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} diff --git a/view/tpl/xrd_diaspora.tpl b/view/tpl/xrd_diaspora.tpl index 143980bcc..aa0d8c740 100644 --- a/view/tpl/xrd_diaspora.tpl +++ b/view/tpl/xrd_diaspora.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} -- cgit v1.2.3 From cc2bef67dd17ac2d9352442aeac39963470ba67f Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Tue, 26 Aug 2014 19:09:00 +0100 Subject: HTML doesn't work without ACCOUNT_ROLE_ALLOWCODE, so don't offer it as an option. --- include/text.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/text.php b/include/text.php index d3d8b84a6..42fad13b5 100755 --- a/include/text.php +++ b/include/text.php @@ -1552,7 +1552,6 @@ function mimetype_select($channel_id, $current = 'text/bbcode') { $x = array( 'text/bbcode', - 'text/html', 'text/markdown', 'text/plain' ); @@ -1564,8 +1563,10 @@ function mimetype_select($channel_id, $current = 'text/bbcode') { if($r) { if($r[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE) { - if(local_user() && get_account_id() == $r[0]['account_id']) + if(local_user() && get_account_id() == $r[0]['account_id']) { + $x[] = 'text/html'; $x[] = 'application/x-php'; + } } } -- cgit v1.2.3 From 450434a6903790aacf70864633cd3ccb57b739f0 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Tue, 26 Aug 2014 20:13:27 +0100 Subject: Revert - see comments. --- include/text.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) mode change 100755 => 100644 include/text.php diff --git a/include/text.php b/include/text.php old mode 100755 new mode 100644 index 42fad13b5..410d9bc96 --- a/include/text.php +++ b/include/text.php @@ -1552,6 +1552,7 @@ function mimetype_select($channel_id, $current = 'text/bbcode') { $x = array( 'text/bbcode', + 'text/html', 'text/markdown', 'text/plain' ); @@ -1563,10 +1564,8 @@ function mimetype_select($channel_id, $current = 'text/bbcode') { if($r) { if($r[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE) { - if(local_user() && get_account_id() == $r[0]['account_id']) { - $x[] = 'text/html'; + if(local_user() && get_account_id() == $r[0]['account_id']) $x[] = 'application/x-php'; - } } } @@ -2023,3 +2022,4 @@ function normalise_openid($s) { return trim(str_replace(array('http://','https://'),array('',''),$s),'/'); } + -- cgit v1.2.3 From c703d833508a43f559a6031bac8b040070e6b2f9 Mon Sep 17 00:00:00 2001 From: marijus Date: Tue, 26 Aug 2014 22:35:00 +0200 Subject: add background color to widgets --- view/css/default.css | 2 +- view/css/widgets.css | 34 ++++++---------------------------- view/theme/redbasic/css/style.css | 2 +- view/theme/redbasic/php/style.php | 2 +- 4 files changed, 9 insertions(+), 31 deletions(-) diff --git a/view/css/default.css b/view/css/default.css index d47fdfe80..40d5cfc59 100644 --- a/view/css/default.css +++ b/view/css/default.css @@ -31,5 +31,5 @@ section { width: 100%; display: table-cell; vertical-align: top; - padding: 65px 10px 200px 10px; + padding: 65px 7px 200px 7px; } diff --git a/view/css/widgets.css b/view/css/widgets.css index 8607cb562..8bf5a9e97 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -2,12 +2,14 @@ /* Easiest way to indent the widget body - indent the entire widget and then shift the header label back to the left */ .widget { - margin-left: 10px; - padding: 0 8px 8px 8px; + margin-bottom: 10px; + padding: 10px 10px 10px 20px; } .widget h3 { margin-left: -10px; + margin-top: 0px; + margin-bottom: 10px; } /* suggest */ @@ -109,34 +111,10 @@ /* group */ -#group-sidebar { - margin-bottom: 10px; -} - -#sidebar-new-group { +#sidebar-group-list { margin-bottom: 10px; } -#sidebar-group-list .icon, #sidebar-group-list .iconspacer { - display: inline-block; - height: 12px; - width: 12px; -} - -.sidebar-group-name { - display: block; - width: 170px; - overflow: hidden; -} - -#sidebar-group-ul { - margin-bottom: 10px; -} - -#sidebar-group-list li { - margin-top: 3px; -} - .sidebar-group-li input { float: right; } @@ -175,4 +153,4 @@ li:hover .group-edit-icon { .chatroomlist td { padding: 0 5px 0; -} \ No newline at end of file +} diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 478f1efee..c001b3b5f 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2118,6 +2118,7 @@ img.mail-list-sender-photo { /* widgets */ .widget { + background-color: $comment_item_colour; border-bottom: 1px solid $widget_brdrcolour; -moz-border-radius: $radiuspx; -webkit-border-radius: $radiuspx; @@ -2408,7 +2409,6 @@ blockquote { background-image: linear-gradient(to bottom, $advperm_gradientcol 0px, $advperm_bgcolour 100%); } - @media screen and (max-width: 767px) { aside#region_1 { background: rgba(0, 0, 0, .1); diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index ee9c6d4d0..4ffdcbef8 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -140,7 +140,7 @@ if(! $a->install) { if (! $selected_active_deco) $selected_active_deco = "none"; if (! $widget_brdrcolour) - $widget_brdrcolour = "#eec"; + $widget_brdrcolour = "rgba(238,238,238,0.8)"; if (! $blockquote_colour) $blockquote_colour = "#000"; if (! $blockquote_bgcolour) -- cgit v1.2.3 From 2df4c44de5601053635e23a7af01a57bdc4fa9fa Mon Sep 17 00:00:00 2001 From: marijus Date: Wed, 27 Aug 2014 00:59:07 +0200 Subject: make vcard and contact block widget look-alike --- view/theme/redbasic/css/style.css | 80 ++++++++++++++++++--------------------- view/tpl/profile_vcard.tpl | 4 +- 2 files changed, 38 insertions(+), 46 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index c001b3b5f..209e32c52 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -410,37 +410,35 @@ aside li { .fn { - padding: 0px 0px 5px 0px; - font-size: 120%; font-weight: bold; + font-size: 16px; color: #444444; } .vcard { - padding: 8px; + margin-bottom: 10px; + padding: 10px; + background-color: $comment_item_colour; + border-bottom: 1px solid $widget_brdrcolour; + -moz-border-radius: $radiuspx; + -webkit-border-radius: $radiuspx; + border-radius: $radiuspx; } .vcard .title { - margin-bottom: 5px; -} + margin-bottom: 10px; -.vcard dl { - clear: both; - word-wrap:break-word; } -.vcard-profile-edit-icon { - font-size: 1.2em; +.vcard dl { + margin-top: 10px; + margin-bottom: 0px; } + .vcard-profile-edit-icon:hover { text-decoration: none; } -.vcard .dropdown-menu { - position: absolute; - left: 200px; - top: 18px; -} #profile-extra-links { clear: both; @@ -454,21 +452,22 @@ aside li { #profile-extra-links li { - margin-top: 5px; + margin-top: 10px; } .profile-edit-side-link { - opacity: 0.3; + opacity: 0; filter:alpha(opacity=30); float: right; - margin-top: -3px; } -.profile-edit-side-link:hover { - opacity: 1.0; + +.vcard:hover .profile-edit-side-link { + opacity: 1; filter:alpha(opacity=100); } + .view-contact-wrapper { margin-top: 20px; float: left; @@ -494,9 +493,9 @@ aside li { #profile-photo-wrapper img { - padding: 12px; - width: 201px; - height: 201px; + padding: 10px; + width: 197px; + height: 197px; } #profile-in-dir-yes-label, @@ -777,19 +776,25 @@ aside li { } #contact-block { - margin-top: 25px; - padding: 8px; + float: left; + background-color: $comment_item_colour; + border-bottom: 1px solid $widget_brdrcolour; + -moz-border-radius: $radiuspx; + -webkit-border-radius: $radiuspx; + border-radius: $radiuspx; + padding: 10px; + margin-bottom:10px; } #contact-block-numcontacts { font-weight: bold; - margin-bottom:8px; + margin-bottom:10px; } .contact-block-div { float: left; - width: 50px; - height: 50px; + width: 49px; + height: 49px; } .contact-block-textdiv { float: left; @@ -804,8 +809,8 @@ aside li { float: left; } .contact-block-img { - width:48px; - height:48px; + width:47px; + height:47px; } #tag-remove { @@ -886,19 +891,6 @@ aside li { font-family: FontAwesome; } -.location-label, .gender-label, .marital-label, .homepage-label { - float: left; - display: block; - width: 70px; - -} - -.adr, .x-gender, .marital-text, .homepage-url { - float: left; - display: block; - width: 130px; -} - .profile-clear { clear: both; } @@ -1722,7 +1714,7 @@ header { } .contact-block-content { - margin-top: 8px; + margin-top: 10px; } .contact-block-img.archived { opacity: 0.3; diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index 7dff8fdeb..3c83cd685 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -2,7 +2,7 @@ {{if $profile.edit}} {{/if}} -
                {{$profile.name}}{{if $profile.online}} {{/if}}
                +
                {{$profile.name}}{{if $profile.online}} {{/if}}
                {{if $pdesc}}
                {{$profile.pdesc}}
                {{/if}}
                {{$profile.name}}
                -- cgit v1.2.3 From 289ec34ae6890a2d82071b61a12fad866be9f0d0 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 26 Aug 2014 16:35:06 -0700 Subject: take off the kid gloves --- include/Contact.php | 14 ++++++------ include/deliver.php | 14 ++++++++++++ include/diaspora.php | 63 ++++++++++++++++------------------------------------ version.inc | 2 +- 4 files changed, 41 insertions(+), 52 deletions(-) diff --git a/include/Contact.php b/include/Contact.php index 140f449af..66c94ef50 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -245,12 +245,12 @@ function channel_remove($channel_id, $local = true, $unset_session=true) { intval($channel_id) ); - $r = q("update hubloc set hubloc_flags = hubloc_flags | %d where hubloc_hash = '%s'", + $r = q("update hubloc set hubloc_flags = (hubloc_flags | %d) where hubloc_hash = '%s'", intval(HUBLOC_FLAGS_DELETED), dbesc($channel['channel_hash']) ); - $r = q("update xchan set xchan_flags = xchan_flags | %d where xchan_hash = '%s'", + $r = q("update xchan set xchan_flags = (xchan_flags | %d) where xchan_hash = '%s'", intval(XCHAN_FLAGS_DELETED), dbesc($channel['channel_hash']) ); @@ -274,7 +274,7 @@ function channel_remove($channel_id, $local = true, $unset_session=true) { q("DELETE FROM `spam` WHERE `uid` = %d", intval($channel_id)); - q("delete from abook where abook_xchan = '%s' and abook_flags & %d limit 1", + q("delete from abook where abook_xchan = '%s' and (abook_flags & %d) limit 1", dbesc($channel['channel_hash']), dbesc(ABOOK_FLAG_SELF) ); @@ -285,13 +285,13 @@ function channel_remove($channel_id, $local = true, $unset_session=true) { intval($channel_id) ); - $r = q("update hubloc set hubloc_flags = hubloc_flags | %d where hubloc_hash = '%s' and hubloc_url = '%s' ", + $r = q("update hubloc set hubloc_flags = (hubloc_flags | %d) where hubloc_hash = '%s' and hubloc_url = '%s' ", intval(HUBLOC_FLAGS_DELETED), dbesc($channel['channel_hash']), dbesc(z_root()) ); - $r = q("update xchan set xchan_flags = xchan_flags | %d where xchan_hash = '%s' ", + $r = q("update xchan set xchan_flags = (xchan_flags | %d) where xchan_hash = '%s' ", intval(XCHAN_FLAGS_DELETED), dbesc($channel['channel_hash']) ); @@ -435,12 +435,12 @@ function remove_all_xchan_resources($xchan, $channel_id = 0) { // directory servers need to keep the record around for sync purposes - mark it deleted - $r = q("update hubloc set hubloc_flags = hubloc_flags | %d where hubloc_hash = '%s'", + $r = q("update hubloc set hubloc_flags = (hubloc_flags | %d) where hubloc_hash = '%s'", intval(HUBLOC_FLAGS_DELETED), dbesc($xchan) ); - $r = q("update xchan set xchan_flags = xchan_flags | %d where xchan_hash = '%s'", + $r = q("update xchan set xchan_flags = (xchan_flags | %d) where xchan_hash = '%s'", intval(XCHAN_FLAGS_DELETED), dbesc($xchan) ); diff --git a/include/deliver.php b/include/deliver.php index 0ad008c23..6edf3d60f 100644 --- a/include/deliver.php +++ b/include/deliver.php @@ -20,6 +20,20 @@ function deliver_run($argv, $argc) { dbesc($argv[$x]) ); if($r) { + if($r[0]['outq_driver'] === 'post') { + $result = z_post_url($r[0]['outq_posturl'],$r[0]['outq_msg']); + if($result['success'] && $result['status_code'] < 300) { + logger('deliver: queue post success to ' . $r[0]['outq_posturl'], LOGGER_DEBUG); + } + else { + $y = q("update outq set outq_updated = '%s' where outq_hash = '%s' limit 1", + dbesc(datetime_convert()), + dbesc($argv[$x]) + ); + } + continue; + } + if($r[0]['outq_posturl'] === z_root() . '/post') { logger('deliver: local delivery', LOGGER_DEBUG); // local delivery diff --git a/include/diaspora.php b/include/diaspora.php index 1e101b4a7..8471cfbd7 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -2741,56 +2741,31 @@ function diaspora_transmit($owner,$contact,$slap,$public_batch,$queue_run=false) if(intval(get_config('system','diaspora_test'))) return 200; - - -return 200; - - $a = get_app(); $logid = random_string(4); - $dest_url = (($public_batch) ? $contact['batch'] : $contact['notify']); - if(! $dest_url) { - logger('diaspora_transmit: no url for contact: ' . $contact['id'] . ' batch mode =' . $public_batch); - return 0; - } - - logger('diaspora_transmit: ' . $logid . ' ' . $dest_url); - if( (! $queue_run) && (was_recently_delayed($contact['id'])) ) { - $return_code = 0; - } - else { - if (!intval(get_config('system','diaspora_test'))) { - post_url($dest_url . '/', $slap); - $return_code = $a->get_curl_code(); - } else { - logger('diaspora_transmit: test_mode'); - return 200; - } - } + logger('diaspora_transmit: ' . $logid . ' ' . $dest_url, LOGGER_DEBUG); - logger('diaspora_transmit: ' . $logid . ' returns: ' . $return_code); + $hash = random_string(); - if((! $return_code) || (($return_code == 503) && (stristr($a->get_curl_headers(),'retry-after')))) { - logger('diaspora_transmit: queue message'); + $interval = ((get_config('system','delivery_interval') !== false) + ? intval(get_config('system','delivery_interval')) : 2 ); - $r = q("SELECT id from queue where cid = %d and network = '%s' and content = '%s' and batch = %d limit 1", - intval($contact['id']), - dbesc(NETWORK_DIASPORA), - dbesc($slap), - intval($public_batch) - ); - if(count($r)) { - logger('diaspora_transmit: add_to_queue ignored - identical item already in queue'); - } - else { - // queue message for redelivery - add_to_queue($contact['id'],NETWORK_DIASPORA,$slap,$public_batch); - } - } + q("insert into outq ( outq_hash, outq_account, outq_channel, outq_driver, outq_posturl, outq_async, outq_created, outq_updated, outq_notify, outq_msg ) values ( '%s', %d, %d, '%s', '%s', %d, '%s', '%s', '%s', '%s' )", + dbesc($hash), + intval($owner['account_id']), + intval($owner['channel_id']), + dbesc('post'), + dbesc($dest_url), + intval(1), + dbesc(datetime_convert()), + dbesc(datetime_convert()), + dbesc(''), + dbesc($slap) + ); + proc_run('php','include/deliver.php',$hash); + if($interval) + @time_sleep_until(microtime(true) + (float) $interval); - return(($return_code) ? $return_code : (-1)); } - - diff --git a/version.inc b/version.inc index ccd4c24d1..452e15850 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-08-25.778 +2014-08-26.779 -- cgit v1.2.3 From e42205cec25fbe7ee93fde4a0f267d54b0e30193 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 26 Aug 2014 17:32:51 -0700 Subject: houston we have liftoff --- include/diaspora.php | 24 +++++++++++++----------- include/notifier.php | 2 +- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/include/diaspora.php b/include/diaspora.php index 8471cfbd7..0d2037666 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -330,7 +330,7 @@ function diaspora_pubmsg_build($msg,$user,$contact,$prvkey,$pubkey) { $handle = $user['xchan_addr']; - $b64url_data = base64url_encode($msg); + $b64url_data = base64url_encode($msg,false); $data = str_replace(array("\n","\r"," ","\t"),array('','','',''),$b64url_data); @@ -338,11 +338,11 @@ function diaspora_pubmsg_build($msg,$user,$contact,$prvkey,$pubkey) { $encoding = 'base64url'; $alg = 'RSA-SHA256'; - $signable_data = $data . '.' . base64url_encode($type) . '.' - . base64url_encode($encoding) . '.' . base64url_encode($alg) ; + $signable_data = $data . '.' . base64url_encode($type,false) . '.' + . base64url_encode($encoding,false) . '.' . base64url_encode($alg,false) ; $signature = rsa_sign($signable_data,$prvkey); - $sig = base64url_encode($signature); + $sig = base64url_encode($signature,false); $magic_env = <<< EOT @@ -400,18 +400,20 @@ function diaspora_msg_build($msg,$user,$contact,$prvkey,$pubkey,$public = false) $b64_data = base64_encode($inner_encrypted); - $b64url_data = base64url_encode($b64_data); + $b64url_data = base64url_encode($b64_data,false); $data = str_replace(array("\n","\r"," ","\t"),array('','','',''),$b64url_data); $type = 'application/xml'; $encoding = 'base64url'; $alg = 'RSA-SHA256'; - $signable_data = $data . '.' . base64url_encode($type) . '.' - . base64url_encode($encoding) . '.' . base64url_encode($alg) ; + $signable_data = $data . '.' . base64url_encode($type,false) . '.' + . base64url_encode($encoding,false) . '.' . base64url_encode($alg,false) ; + + logger('diaspora_msg_build: signable_data: ' . $signable_data, LOGGER_DATA); $signature = rsa_sign($signable_data,$prvkey); - $sig = base64url_encode($signature); + $sig = base64url_encode($signature,false); $decrypted_header = <<< EOT @@ -570,7 +572,7 @@ function diaspora_decode($importer,$xml) { $encoding = $base->encoding; $alg = $base->alg; - $signed_data = $data . '.' . base64url_encode($type) . '.' . base64url_encode($encoding) . '.' . base64url_encode($alg); + $signed_data = $data . '.' . base64url_encode($type,false) . '.' . base64url_encode($encoding,false) . '.' . base64url_encode($alg,false); // decode the data @@ -642,7 +644,7 @@ function diaspora_request($importer,$xml) { // perhaps we were already sharing with this person. Now they're sharing with us. // That makes us friends. Maybe. - $newperms = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTO|PERMS_R_ABOOK|PERMS_W_STREAM|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT; + $newperms = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK|PERMS_W_STREAM|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT; $r = q("update abook set abook_their_perms = %d where abook_id = %d and abook_channel = %d limit 1", intval($newperms), @@ -655,7 +657,7 @@ function diaspora_request($importer,$xml) { $ret = find_diaspora_person_by_handle($sender_handle); - if((! $ret) || ($ret['xchan_network'] != 'diaspora')) { + if((! $ret) || (! strstr($ret['xchan_network'],'diaspora'))) { logger('diaspora_request: Cannot resolve diaspora handle ' . $sender_handle . ' for ' . $recipient_handle); return; } diff --git a/include/notifier.php b/include/notifier.php index 7f4d7a9f8..5f4462b6a 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -107,7 +107,7 @@ function notifier_run($argv, $argc){ intval($r[0]['abook_channel']) ); if($s) { - if($r[0]['hubloc_network'] === 'diaspora' || $r[0]['hubloc_network'] === 'friendica_over_diaspora') { + if($r[0]['hubloc_network'] === 'diaspora' || $r[0]['hubloc_network'] === 'friendica-over-diaspora') { require_once('include/diaspora.php'); diaspora_share($s[0],$r[0]); } -- cgit v1.2.3 From 6a42d6fe3b1e50af16942d0f22e8cfa01abfde39 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 26 Aug 2014 18:58:48 -0700 Subject: works one way sort of - now to go the other way - which will require fixing a whole slew of FIXMEs --- include/deliver.php | 2 +- include/diaspora.php | 67 +++++++++++++++++++++++++++++++++------------------- include/notifier.php | 6 ++--- include/zot.php | 5 +++- 4 files changed, 51 insertions(+), 29 deletions(-) diff --git a/include/deliver.php b/include/deliver.php index 6edf3d60f..08c4f9b64 100644 --- a/include/deliver.php +++ b/include/deliver.php @@ -22,7 +22,7 @@ function deliver_run($argv, $argc) { if($r) { if($r[0]['outq_driver'] === 'post') { $result = z_post_url($r[0]['outq_posturl'],$r[0]['outq_msg']); - if($result['success'] && $result['status_code'] < 300) { + if($result['success'] && $result['return_code'] < 300) { logger('deliver: queue post success to ' . $r[0]['outq_posturl'], LOGGER_DEBUG); } else { diff --git a/include/diaspora.php b/include/diaspora.php index 0d2037666..017fd4ed8 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -150,15 +150,32 @@ function diaspora_process_outbound($arr) { */ + $target_item = $arr['target_item']; + + if($target_item && array_key_exists('item_flags',$target_item) && ($target_item['item_flags'] & ITEM_OBSCURED)) { + $key = get_config('system','prvkey'); + if($target_item['title']) + $target_item['title'] = crypto_unencapsulate(json_decode($target_item['title'],true),$key); + if($target_item['body']) + $target_item['body'] = crypto_unencapsulate(json_decode($target_item['body'],true),$key); + } + if($arr['walltowall']) return; if($arr['env_recips']) { + $hashes = array(); + + // re-explode the recipients, but only for this hub/pod + + foreach($arr['env_recips'] as $recip) + $hashes[] = "'" . $recip['hash'] . "'"; + $r = q("select * from xchan left join hubloc on xchan_hash = hubloc_hash where hubloc_url = '%s' - and xchan_hash in (" . implode(',',$arr['env_recips']) . ") - and xchan_network in ('diaspora', 'friendica-over-diaspora') ", + and xchan_hash in (" . implode(',', $hashes) . ") and xchan_network in ('diaspora', 'friendica-over-diaspora') ", dbesc($arr['hub']['hubloc_url']) ); + if(! $r) { logger('diaspora_process_outbound: no recipients'); return; @@ -178,36 +195,36 @@ function diaspora_process_outbound($arr) { // all other public posts processed as public batches further below if((! $arr['private']) && ($arr['followup'])) { - diaspora_send_followup($arr['target_item'],$arr['channel'],$contact, true); + diaspora_send_followup($target_item,$arr['channel'],$contact, true); continue; } if(! $contact['xchan_pubkey']) continue; - if(activity_match($arr['target_item']['verb'],ACTIVITY_DISLIKE)) { + if(activity_match($target_item['verb'],ACTIVITY_DISLIKE)) { continue; } - elseif(($arr['target_item']['item_restrict'] & ITEM_DELETED) - && (($arr['target_item']['mid'] === $arr['target_item']['parent_mid']) || $arr['followup'])) { + elseif(($target_item['item_restrict'] & ITEM_DELETED) + && (($target_item['mid'] === $target_item['parent_mid']) || $arr['followup'])) { // send both top-level retractions and relayable retractions for owner to relay - diaspora_send_retraction($arr['target_item'],$arr['channel'],$contact); + diaspora_send_retraction($target_item,$arr['channel'],$contact); continue; } elseif($arr['followup']) { // send comments and likes to owner to relay - diaspora_send_followup($arr['target_item'],$arr['channel'],$contact); + diaspora_send_followup($target_item,$arr['channel'],$contact); continue; } elseif($target_item['mid'] !== $target_item['parent_mid']) { // we are the relay - send comments, likes and relayable_retractions // (of comments and likes) to our conversants - diaspora_send_relay($arr['target_item'],$arr['channel'],$contact); + diaspora_send_relay($target_item,$arr['channel'],$contact); continue; } - elseif($arr['top_level']) { - diaspora_send_status($arr['target_item'],$arr['channel'],$contact); + elseif($arr['top_level_post']) { + diaspora_send_status($target_item,$arr['channel'],$contact); continue; } } @@ -221,23 +238,23 @@ function diaspora_process_outbound($arr) { // unsupported return; } - elseif(($arr['target_item']['deleted']) - && ($arr['target_item']['mid'] === $arr['target_item']['parent_mod'])) { + elseif(($target_item['deleted']) + && ($target_item['mid'] === $target_item['parent_mod'])) { // top-level retraction logger('delivery: diaspora retract: ' . $loc); - diaspora_send_retraction($arr['target_item'],$arr['channel'],$contact,true); + diaspora_send_retraction($target_item,$arr['channel'],$contact,true); return; } - elseif($arr['target_item']['mid'] !== $arr['target_item']['parent_mid']) { + elseif($target_item['mid'] !== $target_item['parent_mid']) { // we are the relay - send comments, likes and relayable_retractions to our conversants logger('delivery: diaspora relay: ' . $loc); - diaspora_send_relay($arr['target_item'],$arr['channel'],$contact,true); + diaspora_send_relay($target_item,$arr['channel'],$contact,true); return; } elseif($arr['top_level_post']) { // currently no workable solution for sending walltowall logger('delivery: diaspora status: ' . $loc); - diaspora_send_status($arr['target_item'],$arr['channel'],$contact,true); + diaspora_send_status($target_item,$arr['channel'],$contact,true); return; } @@ -392,7 +409,7 @@ function diaspora_msg_build($msg,$user,$contact,$prvkey,$pubkey,$public = false) $outer_iv = random_string(16); $b_outer_iv = base64_encode($outer_iv); - $handle = $user['xchan_addr']; + $handle = $user['channel_address'] . '@' . get_app()->get_hostname(); $padded_data = pkcs5_pad($msg,16); $inner_encrypted = mcrypt_encrypt(MCRYPT_RIJNDAEL_128, $inner_aes_key, $padded_data, MCRYPT_MODE_CBC, $inner_iv); @@ -1174,18 +1191,20 @@ function diaspora_comment($importer,$xml,$msg) { return 202; } - $r = q("SELECT * FROM `item` WHERE `uid` = %d AND `mid` = '%s' LIMIT 1", + // Friendica is truncating guids at 64 chars + + $r = q("SELECT * FROM item WHERE uid = %d AND mid like '%s' LIMIT 1", intval($importer['channel_id']), - dbesc($guid) + dbesc($guid . '%') ); if($r) { logger('diaspora_comment: our comment just got relayed back to us (or there was a guid collision) : ' . $guid); return; } - $r = q("SELECT * FROM `item` WHERE `uid` = %d AND `mid` = '%s' LIMIT 1", + $r = q("SELECT * FROM item WHERE uid = %d AND mid LIKE '%s' LIMIT 1", intval($importer['channel_id']), - dbesc($parent_guid) + dbesc($parent_guid . '%') ); if(! $r) { logger('diaspora_comment: parent item not found: parent: ' . $parent_guid . ' item: ' . $guid); @@ -1298,7 +1317,7 @@ function diaspora_comment($importer,$xml,$msg) { // No timestamps for comments? OK, we'll the use current time. $datarray['changed'] = $datarray['created'] = $datarray['edited'] = datetime_convert(); - $datarray['private'] = $parent_item['private']; + $datarray['item_private'] = $parent_item['item_private']; $datarray['owner_xchan'] = $parent_item['owner_xchan']; $datarray['author_xchan'] = $person['xchan_hash']; @@ -2326,7 +2345,7 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) { $return_code = diaspora_transmit($owner,$contact,$slap,$public_batch); - logger('diaspora_send_status: guid: '.$item['mid'].' result '.$return_code, LOGGER_DEBUG); +// logger('diaspora_send_status: guid: '.$item['mid'].' result '.$return_code, LOGGER_DEBUG); if(count($images)) { diaspora_send_images($item,$owner,$contact,$images,$public_batch); diff --git a/include/notifier.php b/include/notifier.php index 5f4462b6a..88bb9a0cb 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -412,7 +412,7 @@ function notifier_run($argv, $argc){ $recip_list[] = $d['xchan_addr'] . ' (' . $d['xchan_hash'] . ')'; if($private) - $env_recips[] = array('guid' => $d['xchan_guid'],'guid_sig' => $d['xchan_guid_sig']); + $env_recips[] = array('guid' => $d['xchan_guid'],'guid_sig' => $d['xchan_guid_sig'],'hash' => $d['xchan_hash']); } } @@ -445,11 +445,11 @@ function notifier_run($argv, $argc){ // aren't the owner or author. - $r = q("select hubloc_guid, hubloc_sitekey, hubloc_network, hubloc_flags, hubloc_callback, hubloc_host from hubloc + $r = q("select hubloc_guid, hubloc_url, hubloc_sitekey, hubloc_network, hubloc_flags, hubloc_callback, hubloc_host from hubloc where hubloc_hash in (" . implode(',',$recipients) . ") group by hubloc_sitekey order by hubloc_connected desc limit 1"); } else { - $r = q("select hubloc_guid, hubloc_sitekey, hubloc_network, hubloc_flags, hubloc_callback, hubloc_host from hubloc + $r = q("select hubloc_guid, hubloc_url, hubloc_sitekey, hubloc_network, hubloc_flags, hubloc_callback, hubloc_host from hubloc where hubloc_hash in (" . implode(',',$recipients) . ") $sql_extra group by hubloc_sitekey"); } diff --git a/include/zot.php b/include/zot.php index 65c092b93..54efe1343 100644 --- a/include/zot.php +++ b/include/zot.php @@ -117,8 +117,11 @@ function zot_build_packet($channel,$type = 'notify',$recipients = null, $remote_ 'version' => ZOT_REVISION ); - if($recipients) + if($recipients) { + for($x = 0; $x < count($recipients); $x ++) + unset($recipients[$x]['hash']); $data['recipients'] = $recipients; + } if($secret) { $data['secret'] = $secret; -- cgit v1.2.3 From 8c6067b411ee7f69b3df1341a8696ec1e5811601 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 26 Aug 2014 20:51:59 -0700 Subject: more hard work --- boot.php | 2 +- include/diaspora.php | 220 +++++++++++++++++++++++---------------------------- install/database.sql | 26 ++++++ install/update.php | 34 +++++++- 4 files changed, 159 insertions(+), 123 deletions(-) diff --git a/boot.php b/boot.php index a6e5fc0b4..04534f80a 100755 --- a/boot.php +++ b/boot.php @@ -47,7 +47,7 @@ define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1124 ); +define ( 'DB_UPDATE_VERSION', 1125 ); define ( 'EOL', '
                ' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/include/diaspora.php b/include/diaspora.php index 017fd4ed8..9add80d36 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -293,11 +293,6 @@ function diaspora_get_contact_by_handle($uid,$handle) { function find_diaspora_person_by_handle($handle) { $person = false; - $update = false; - $got_lock = false; - - $endlessloop = 0; - $maxloops = 10; if(diaspora_is_blacklisted($handle)) return false; @@ -308,25 +303,25 @@ function find_diaspora_person_by_handle($handle) { if($r) { $person = $r[0]; logger('find_diaspora_person_by handle: in cache ' . print_r($r,true), LOGGER_DATA); - - // update record occasionally so it doesn't get stale -// $d = strtotime($person['updated'] . ' +00:00'); -// if($d < strtotime('now - 14 days')) -// $update = true; } - if((! $person) || ($update)) { + if(! $person) { // try webfinger. Make sure to distinguish between diaspora, // redmatrix w/diaspora protocol and friendica w/diaspora protocol. $result = discover_by_webbie($handle); - - - + if($result) { + $r = q("select * from xchan where xchan_addr = '%s' limit 1", + dbesc($handle) + ); + if($r) { + $person = $r[0]; + logger('find_diaspora_person_by handle: discovered ' . print_r($r,true), LOGGER_DATA); + } + } } - return $person; } @@ -338,14 +333,13 @@ function get_diaspora_key($handle) { } -function diaspora_pubmsg_build($msg,$user,$contact,$prvkey,$pubkey) { +function diaspora_pubmsg_build($msg,$channel,$contact,$prvkey,$pubkey) { $a = get_app(); logger('diaspora_pubmsg_build: ' . $msg, LOGGER_DATA); - - $handle = $user['xchan_addr']; + $handle = $channel['xchan_addr']; $b64url_data = base64url_encode($msg,false); @@ -384,11 +378,11 @@ EOT; -function diaspora_msg_build($msg,$user,$contact,$prvkey,$pubkey,$public = false) { +function diaspora_msg_build($msg,$channel,$contact,$prvkey,$pubkey,$public = false) { $a = get_app(); if($public) - return diaspora_pubmsg_build($msg,$user,$contact,$prvkey,$pubkey); + return diaspora_pubmsg_build($msg,$channel,$contact,$prvkey,$pubkey); logger('diaspora_msg_build: ' . $msg, LOGGER_DATA); @@ -409,7 +403,7 @@ function diaspora_msg_build($msg,$user,$contact,$prvkey,$pubkey,$public = false) $outer_iv = random_string(16); $b_outer_iv = base64_encode($outer_iv); - $handle = $user['channel_address'] . '@' . get_app()->get_hostname(); + $handle = $channel['channel_address'] . '@' . get_app()->get_hostname(); $padded_data = pkcs5_pad($msg,16); $inner_encrypted = mcrypt_encrypt(MCRYPT_RIJNDAEL_128, $inner_aes_key, $padded_data, MCRYPT_MODE_CBC, $inner_iv); @@ -661,7 +655,10 @@ function diaspora_request($importer,$xml) { // perhaps we were already sharing with this person. Now they're sharing with us. // That makes us friends. Maybe. - $newperms = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK|PERMS_W_STREAM|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT; + // Please note some of these permissions such as PERMS_R_PAGES are impossible for Disapora. + // They cannot authenticate to our system. + + $newperms = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK|PERMS_W_STREAM|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT|PERMS_R_STORAGE|PERMS_R_PAGES; $r = q("update abook set abook_their_perms = %d where abook_id = %d and abook_channel = %d limit 1", intval($newperms), @@ -689,7 +686,7 @@ function diaspora_request($importer,$xml) { if($z) $default_perms = intval($z[0]['abook_my_perms']); - $their_perms = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTO|PERMS_R_ABOOK|PERMS_W_STREAM|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_CHAT; + $their_perms = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK|PERMS_W_STREAM|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT|PERMS_R_STORAGE|PERMS_R_PAGES; $r = q("insert into abook ( abook_account, abook_channel, abook_xchan, abook_my_perms, abook_their_perms, abook_closeness, abook_rating, abook_created, abook_updated, abook_connected, abook_dob, abook_flags, abook_profile) values ( %d, %d, '%s' %d %d, %d, %d, '%s', '%s', '%s', '%s', %d, '%s')", intval($importer['channel_account_id']), @@ -796,13 +793,17 @@ function diaspora_post($importer,$xml,$msg) { $datarray = array(); - $str_tags = ''; - + $tags = get_tags($body); -// FIXME call handle_tags() + + + if(count($tags)) { + + $datarray['term'] = array(); + foreach($tags as $tag) { if(strpos($tag,'#') === 0) { if(strpos($tag,'[url=')) @@ -817,20 +818,28 @@ function diaspora_post($importer,$xml,$msg) { $basetag = str_replace('_',' ',substr($tag,1)); $body = str_replace($tag,'#[url=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]',$body); - if(strlen($str_tags)) - $str_tags .= ','; - $str_tags .= '#[url=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]'; - continue; + + $datarray['term'][] = array( + 'uid' => $importer['channel_id'], + 'type' => TERM_HASHTAG, + 'otype' => TERM_OBJ_POST, + 'term' => $basetag, + 'url' => z_root() . '/search?tag=' . rawurlencode($basetag) + ); } } } - $cnt = preg_match_all('/@\[url=(.*?)\[\/url\]/ism',$body,$matches,PREG_SET_ORDER); + $cnt = preg_match_all('/@\[url=(.*?)\](.*?)\[\/url\]/ism',$body,$matches,PREG_SET_ORDER); if($cnt) { foreach($matches as $mtch) { - if(strlen($str_tags)) - $str_tags .= ','; - $str_tags .= '@[url=' . $mtch[1] . '[/url]'; + $datarray['term'][] = array( + 'uid' => $importer['channel_id'], + 'type' => TERM_MENTION, + 'otype' => TERM_OBJ_POST, + 'term' => $mtch[2], + 'url' => $mtch[1] + ); } } @@ -838,11 +847,8 @@ function diaspora_post($importer,$xml,$msg) { $datarray['uid'] = $importer['channel_id']; -// FIXME - - $datarray['verb'] = ACTIVITY_POST; - $datarray['mid'] = $datarray['parent-mid'] = $guid; + $datarray['mid'] = $datarray['parent_mid'] = $guid; $datarray['changed'] = $datarray['created'] = $datarray['edited'] = datetime_convert('UTC','UTC',$created); $datarray['item_private'] = $private; @@ -854,13 +860,10 @@ function diaspora_post($importer,$xml,$msg) { $datarray['body'] = $body; -// FIXME -// $datarray['tag'] = $str_tags; - $datarray['app'] = 'Diaspora'; - // if empty content it might be a photo that hasn't arrived yet. If a photo arrives, we'll make it visible. -// $datarray['visible'] = ((strlen($body)) ? 1 : 0); + $datarray['item_flags'] = ITEM_UNSEEN|ITEM_THREAD_TOP; + $result = item_store($datarray); return; @@ -1191,20 +1194,29 @@ function diaspora_comment($importer,$xml,$msg) { return 202; } - // Friendica is truncating guids at 64 chars + // Friendica is currently truncating guids at 64 chars + + $search_guid = $guid; + if(strlen($guid) == 64) + $search_guid = $guid . '%'; $r = q("SELECT * FROM item WHERE uid = %d AND mid like '%s' LIMIT 1", intval($importer['channel_id']), - dbesc($guid . '%') + dbesc($search_guid) ); if($r) { logger('diaspora_comment: our comment just got relayed back to us (or there was a guid collision) : ' . $guid); return; } + $search_guid = $parent_guid; + if(strlen($parent_guid) == 64) + $search_guid = $parent_guid . '%'; + + $r = q("SELECT * FROM item WHERE uid = %d AND mid LIKE '%s' LIMIT 1", intval($importer['channel_id']), - dbesc($parent_guid . '%') + dbesc($search_guid) ); if(! $r) { logger('diaspora_comment: parent item not found: parent: ' . $parent_guid . ' item: ' . $guid); @@ -1259,6 +1271,7 @@ function diaspora_comment($importer,$xml,$msg) { // Find the original comment author information. // We need this to make sure we display the comment author // information (name and avatar) correctly. + if(strcasecmp($diaspora_handle,$msg['author']) == 0) $person = $contact; else { @@ -1270,15 +1283,17 @@ function diaspora_comment($importer,$xml,$msg) { } } + $body = diaspora2bb($text); $datarray = array(); - $str_tags = ''; - $tags = get_tags($body); if(count($tags)) { + + $datarray['term'] = array(); + foreach($tags as $tag) { if(strpos($tag,'#') === 0) { if(strpos($tag,'[url=')) @@ -1291,24 +1306,32 @@ function diaspora_comment($importer,$xml,$msg) { if(preg_match('/\[(.*?)\]\((.*?)' . preg_quote($tag,'/') . '(.*?)\)/',$body)) continue; - $basetag = str_replace('_',' ',substr($tag,1)); $body = str_replace($tag,'#[url=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]',$body); - if(strlen($str_tags)) - $str_tags .= ','; - $str_tags .= '#[url=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]'; - continue; + + $datarray['term'][] = array( + 'uid' => $importer['channel_id'], + 'type' => TERM_HASHTAG, + 'otype' => TERM_OBJ_POST, + 'term' => $basetag, + 'url' => z_root() . '/search?tag=' . rawurlencode($basetag) + ); } } } - $datarray['uid'] = $importer['channel_id']; - -//FIXME -// $datarray['contact-id'] = $contact['id']; -// $datarray['type'] = 'remote-comment'; -// $datarray['wall'] = $parent_item['wall']; -// $datarray['network'] = NETWORK_DIASPORA; + $cnt = preg_match_all('/@\[url=(.*?)\](.*?)\[\/url\]/ism',$body,$matches,PREG_SET_ORDER); + if($cnt) { + foreach($matches as $mtch) { + $datarray['term'][] = array( + 'uid' => $importer['channel_id'], + 'type' => TERM_MENTION, + 'otype' => TERM_OBJ_POST, + 'term' => $mtch[2], + 'url' => $mtch[1] + ); + } + } $datarray['verb'] = ACTIVITY_POST; $datarray['mid'] = $guid; @@ -1324,77 +1347,32 @@ function diaspora_comment($importer,$xml,$msg) { $datarray['body'] = $body; -// FIXME -// $datarray['tag'] = $str_tags; - - // We can't be certain what the original app is if the message is relayed. -// if(($parent_item['origin']) && (! $parent_author_signature)) -// $datarray['app'] = 'Diaspora'; + $datarray['app'] = 'Diaspora'; $result = item_store($datarray); -// if(($parent_item['origin']) && (! $parent_author_signature)) { -// q("insert into sign (`iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ", -// intval($message_id), -// dbesc($signed_data), -// dbesc(base64_encode($author_signature)), -// dbesc($diaspora_handle) -// ); + if(($parent_item['item_flags'] & ITEM_ORIGIN) && (! $parent_author_signature)) { + q("insert into sign (`iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ", + intval($message_id), + dbesc($signed_data), + dbesc(base64_encode($author_signature)), + dbesc($diaspora_handle) + ); // if the message isn't already being relayed, notify others // the existence of parent_author_signature means the parent_author or owner // is already relaying. -// proc_run('php','include/notifier.php','comment-import',$message_id); -// } - - -// FIXME -/* - $myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 AND `deleted` = 0 ", - dbesc($parent_item['uri']), - intval($importer['channel_id']) - ); - - if(count($myconv)) { - $importer_url = $a->get_baseurl() . '/profile/' . $importer['nickname']; - - foreach($myconv as $conv) { - - // now if we find a match, it means we're in this conversation - - if(! link_compare($conv['author-link'],$importer_url)) - continue; - - require_once('include/enotify.php'); - - $conv_parent = $conv['parent']; - - notification(array( - 'type' => NOTIFY_COMMENT, - 'notify_flags' => $importer['notify-flags'], - 'language' => $importer['language'], - 'to_name' => $importer['username'], - 'to_email' => $importer['email'], - 'uid' => $importer['channel_id'], - 'item' => $datarray, - //'link' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $message_id, - 'link' => $a->get_baseurl().'/display/'.$datarray['guid'], - 'source_name' => $datarray['author-name'], - 'source_link' => $datarray['author-link'], - 'source_photo' => $datarray['author-avatar'], - 'verb' => ACTIVITY_POST, - 'otype' => 'item', - 'parent' => $conv_parent, - 'parent_uri' => $parent_uri - )); - - // only send one notification - break; - } + proc_run('php','include/notifier.php','comment-import',$message_id); } -*/ + if($result['item_id']) { + $r = q("select * from item where id = %d limit 1", + intval($result['item_id']) + ); + if($r) + send_status_notifications($result['item_id'],$r[0]); + } return; } diff --git a/install/database.sql b/install/database.sql index 104f145e5..953f4aba1 100644 --- a/install/database.sql +++ b/install/database.sql @@ -311,6 +311,20 @@ CREATE TABLE IF NOT EXISTS `config` ( UNIQUE KEY `access` (`cat`,`k`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE IF NOT EXISTS `conv` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `guid` char(255) NOT NULL, + `recips` mediumtext NOT NULL, + `uid` int(11) NOT NULL, + `creator` char(255) NOT NULL, + `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `subject` mediumtext NOT NULL, + PRIMARY KEY (`id`), + KEY `created` (`created`), + KEY `updated` (`updated`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + CREATE TABLE IF NOT EXISTS `event` ( `id` int(11) NOT NULL AUTO_INCREMENT, `aid` int(10) unsigned NOT NULL DEFAULT '0', @@ -936,6 +950,18 @@ CREATE TABLE IF NOT EXISTS `shares` ( KEY `share_xchan` (`share_xchan`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE IF NOT EXISTS `sign` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `iid` int(10) unsigned NOT NULL DEFAULT '0', + `retract_iid` int(10) unsigned NOT NULL DEFAULT '0', + `signed_text` mediumtext NOT NULL, + `signature` text NOT NULL, + `signer` char(255) NOT NULL, + PRIMARY KEY (`id`), + KEY `iid` (`iid`), + KEY `retract_iid` (`retract_iid`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + CREATE TABLE IF NOT EXISTS `site` ( `site_url` char(255) NOT NULL, `site_access` int(11) NOT NULL DEFAULT '0', diff --git a/install/update.php b/install/update.php index 9e184428e..d7a10e11b 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ Date: Tue, 26 Aug 2014 21:00:51 -0700 Subject: and ... we've got a comment coming the other way --- include/diaspora.php | 1 + 1 file changed, 1 insertion(+) diff --git a/include/diaspora.php b/include/diaspora.php index 9add80d36..0f0f50208 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -1333,6 +1333,7 @@ function diaspora_comment($importer,$xml,$msg) { } } + $datarray['uid'] = $importer['channel_id']; $datarray['verb'] = ACTIVITY_POST; $datarray['mid'] = $guid; $datarray['parent_mid'] = $parent_item['mid']; -- cgit v1.2.3 From e179dca446b4e604b7486e79d694d39679d1209f Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 26 Aug 2014 22:37:04 -0700 Subject: place to store multiple choice and select items for extensible profiles --- boot.php | 2 +- install/database.sql | 1 + install/update.php | 11 ++++++++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/boot.php b/boot.php index 04534f80a..f19b1f117 100755 --- a/boot.php +++ b/boot.php @@ -47,7 +47,7 @@ define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1125 ); +define ( 'DB_UPDATE_VERSION', 1126 ); define ( 'EOL', '
                ' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/install/database.sql b/install/database.sql index 953f4aba1..7f6a128c9 100644 --- a/install/database.sql +++ b/install/database.sql @@ -823,6 +823,7 @@ CREATE TABLE IF NOT EXISTS `profdef` ( `field_type` char(16) NOT NULL DEFAULT '', `field_desc` char(255) NOT NULL DEFAULT '', `field_help` char(255) NOT NULL DEFAULT '', + `field_inputs` mediumtext NOT NULL DEFAULT '', PRIMARY KEY (`id`), KEY `field_name` (`field_name`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; diff --git a/install/update.php b/install/update.php index d7a10e11b..7c05173c0 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ Date: Wed, 27 Aug 2014 16:48:43 -0700 Subject: compatibility notes --- doc/main.bb | 1 + version.inc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/main.bb b/doc/main.bb index db06071fa..0c34ced55 100644 --- a/doc/main.bb +++ b/doc/main.bb @@ -33,6 +33,7 @@ Zot is the great new communicaton protocol invented especially for the Red Matri [zrl=[baseurl]/help/AdvancedSearch]Advanced Directory Search[/zrl] [zrl=[baseurl]/help/addons]Help With Addons[/zrl] [zrl=[baseurl]/help/nomadic-identity]Got Zot? Nomadic Identity, Channel Cloning And More[/zrl] +[zrl=[baseurl]/help/diaspora_compat]Diaspora Communications Compatibility (Diaspora and Friendica)[/zrl] [size=large][b]Frequently Asked Questions For Users[/b][/size] [zrl=[baseurl]/help/faq_users]FAQ For Users[/zrl] diff --git a/version.inc b/version.inc index 452e15850..dccb62428 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-08-26.779 +2014-08-27.780 -- cgit v1.2.3 From 287ce2576f3b1a077e19ec700a1578cb3a5b0a4b Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 27 Aug 2014 17:25:11 -0700 Subject: thanks thomas... --- doc/diaspora_compat.md | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 doc/diaspora_compat.md diff --git a/doc/diaspora_compat.md b/doc/diaspora_compat.md new file mode 100644 index 000000000..2e38dc443 --- /dev/null +++ b/doc/diaspora_compat.md @@ -0,0 +1,68 @@ +##Diaspora Compatibility + +Diaspora protocol compatibility is presently considered an ***experimental*** feature. It may not be available on all sites and presents some serious compatibility issues with redmatrix. At the moment these compatibility issues will be shared with "Friendica-over-Diaspora" protocol communications. + +Private mail is currently not working. Eventually this will be fixed. Posts and comments are partially working. + +Private mail retraction will not be possible on Diaspora. + +Access control only works on posts and comments. Diaspora members will get permission denied trying to access any other access controlled redmatrix objects such as files, photos, webpages, chatrooms, etc. In the case of private photos that are linked to posts, they will see a "prohibited sign" instead of the photo. Diaspora has no concept of private media. There is no workaround except to make your media resources public (to everybody on the internet). + + +Edited posts will not be delivered. Diaspora members will see the original post/comment without edits. There is no mechanism in the protocol to update an existing post. We cannot delete it and submit another invisibly because the message-id will change and we need to keep the same message-id on our own network. The only workaround is to delete the post/comment and do it over. + +Nomadic identity will not work with Diaspora. We will eventually provide an **option** which will allow you to "start sharing" from all of your clones when you make the first connection. The Diaspora person does not have to accept this, but it will allow your communications to continue if they accept this connection. Without this option, if you go to another server from where you made the connection originally or you make the connection before creating the clone, you will need to make friends with them again from the new location. + +Post expiration is not supported on Diaspora. We will provide you an option to not send expiring posts to that network. In the future this may be provided with a remote delete request. + +End-to-end encryption is not supported. We will translate these posts into a lock icon, which can never be unlocked from the Diaspora side. + +Message verification will eventually be supported. + +Multiple profiles are not supported. Diaspora members can only see your default profile. + +Birthday events will not appear in Diaspora. Other events will be translated and sent as a post, but all times will either be in the origination channel's timezone or in GMT. We do not know the recipient's timezone because Diaspora doesn't have this concept. + +Tags are converted into "un-hijackable" tags by default and will link back to your redmatrix resources. We will provide an option to allow you to let the other end of the network hijack your tags and point them at its own resources. + +Community tags will not work. We will send a tagging activity as a comment. It won't do anything. + +Forum tags (@forum+) and privacy tags (@!somebody) will not be available to Diaspora members. These tags may have to be stripped or obscured to prevent them from being hijacked - which could result in privacy issues. + +Premium channel redirects will not be sent. If you allow Diaspora connections, they will not see that you have a premium channel. + +You cannot use Diaspora channels as channel sources. + + +Dislikes of posts will be converted to comments and you will have the option to send these as comments or not send them to Diaspora (which does not provide dislike). + +We will do the same for both likes and dislikes of comments. They can either be sent as comments or you will have the ability to prevent them from being transmitted to Diaspora. + + +"observer tags" will be converted to empty text. + + +Embedded apps will be translated into links. + + +Embedded page design elements (work in progress) will be either stripped or converted to an error message. + + +Diaspora members will not appear in the directory. + + +There are differences in oembed compatibility between the networks. Some embedded resources will turn into a link on one side or the other. + + +On the bright side, pokes should work. + + + + + + + + + + + \ No newline at end of file -- cgit v1.2.3 From bbcf0be16a2140069fe2826c57bb0c7278f7cb52 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 27 Aug 2014 18:19:56 -0700 Subject: Admin setting for Diaspora Protocol enable. We may want to have this also at a channel level since there are privacy issues and quirks and trade-offs. --- mod/admin.php | 3 +++ view/tpl/admin_site.tpl | 1 + 2 files changed, 4 insertions(+) diff --git a/mod/admin.php b/mod/admin.php index 5df63636a..bcbb6fc26 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -266,9 +266,11 @@ function admin_page_site_post(&$a){ $poll_interval = ((x($_POST,'poll_interval'))? intval(trim($_POST['poll_interval'])) : 0); $maxloadavg = ((x($_POST,'maxloadavg'))? intval(trim($_POST['maxloadavg'])) : 50); $feed_contacts = ((x($_POST,'feed_contacts')) ? intval($_POST['feed_contacts']) : 0); + $diaspora_enable = ((x($_POST,'diaspora_enable')) ? intval($_POST['diaspora_enable']) : 0); set_config('system','feed_contacts',$feed_contacts); + set_config('system','diaspora_enable',$diaspora_enable); set_config('system','delivery_interval',$delivery_interval); set_config('system','poll_interval',$poll_interval); set_config('system','maxloadavg',$maxloadavg); @@ -424,6 +426,7 @@ function admin_page_site(&$a) { '$theme_mobile' => array('theme_mobile', t("Mobile system theme"), get_config('system','mobile_theme'), t("Theme for mobile devices"), $theme_choices_mobile), '$theme_accessibility' => array('theme_accessibility', t("Accessibility system theme"), get_config('system','accessibility_theme'), t("Accessibility theme"), $theme_choices_accessibility), '$site_channel' => array('site_channel', t("Channel to use for this website's static pages"), get_config('system','site_channel'), t("Site Channel")), + '$diaspora_enable' => array('diaspora_enable',t('Enable Diaspora Protocol'), get_config('system','diaspora_enable'), t('Communicate with Diaspora and Friendica - experimental')), '$feed_contacts' => array('feed_contacts', t('Allow Feeds as Connections'),get_config('system','feed_contacts'),t('(Heavy system resource usage)')), '$maximagesize' => array('maximagesize', t("Maximum image size"), intval(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("Does this site allow new member registration?"), get_config('system','register_policy'), "", $register_choices), diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 2a7742a3e..6736792a8 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -65,6 +65,7 @@

                {{$corporate}}

                {{include file="field_checkbox.tpl" field=$block_public}} + {{include file="field_checkbox.tpl" field=$diaspora_enable}} {{include file="field_checkbox.tpl" field=$feed_contacts}} {{include file="field_checkbox.tpl" field=$force_publish}} {{include file="field_checkbox.tpl" field=$disable_discover_tab}} -- cgit v1.2.3 From eb27bea794d5aff547be9722f7c058678b8cbb1d Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 27 Aug 2014 19:15:34 -0700 Subject: mind numbing drudgery continued... --- boot.php | 2 +- include/diaspora.php | 145 ++++++++++++++++++++++----------------------------- install/database.sql | 2 + install/update.php | 12 ++++- 4 files changed, 76 insertions(+), 85 deletions(-) diff --git a/boot.php b/boot.php index f19b1f117..89d09b0d9 100755 --- a/boot.php +++ b/boot.php @@ -47,7 +47,7 @@ define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1126 ); +define ( 'DB_UPDATE_VERSION', 1127 ); define ( 'EOL', '
                ' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/include/diaspora.php b/include/diaspora.php index 0f0f50208..9652ecce7 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -772,10 +772,13 @@ function diaspora_post($importer,$xml,$msg) { return 202; } - $r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' LIMIT 1", + $search_guid = ((strlen($guid) == 64) ? $guid . '%' : $guid); + + $r = q("SELECT id FROM item WHERE uid = %d AND mid like '%s' LIMIT 1", intval($importer['channel_id']), - dbesc($guid) + dbesc($search_guid) ); + if($r) { // check dates if post editing is implemented logger('diaspora_post: message exists: ' . $guid); @@ -797,9 +800,6 @@ function diaspora_post($importer,$xml,$msg) { $tags = get_tags($body); - - - if(count($tags)) { $datarray['term'] = array(); @@ -843,6 +843,7 @@ function diaspora_post($importer,$xml,$msg) { } } + // this won't work for Friendica or Redmatrix but it's probably the best we can do. $plink = 'https://'.substr($diaspora_handle,strpos($diaspora_handle,'@')+1).'/posts/'.$guid; $datarray['uid'] = $importer['channel_id']; @@ -893,13 +894,12 @@ function diaspora_reshare($importer,$xml,$msg) { return 202; } - $message_id = $diaspora_handle . ':' . $guid; - $r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' AND `guid` = '%s' LIMIT 1", + $search_guid = ((strlen($guid) == 64) ? $guid . '%' : $guid); + $r = q("SELECT id FROM item WHERE uid = %d AND mid like '%s' LIMIT 1", intval($importer['channel_id']), - dbesc($message_id), - dbesc($guid) + dbesc($search_guid) ); - if(count($r)) { + if($r) { logger('diaspora_reshare: message exists: ' . $guid); return; } @@ -909,16 +909,17 @@ function diaspora_reshare($importer,$xml,$msg) { $source_url = 'https://' . substr($orig_author,strpos($orig_author,'@')+1) . '/p/' . $orig_guid . '.xml'; $orig_url = 'https://'.substr($orig_author,strpos($orig_author,'@')+1).'/posts/'.$orig_guid; - $x = fetch_url($source_url); - if(! $x) - $x = fetch_url(str_replace('https://','http://',$source_url)); - if(! $x) { + $x = z_fetch_url($source_url); + if(! $x['success']) + $x = z_fetch_url(str_replace('https://','http://',$source_url)); + if(! $x['success']) { logger('diaspora_reshare: unable to fetch source url ' . $source_url); return; } - logger('diaspora_reshare: source: ' . $x); + logger('diaspora_reshare: source: ' . $x['body']); + + $x = str_replace(array('',''),array('',''),$x['body']); - $x = str_replace(array('',''),array('',''),$x); $source_xml = parse_xml_string($x,false); if(strlen($source_xml->post->asphoto->objectId) && ($source_xml->post->asphoto->objectId != 0) && ($source_xml->post->asphoto->image_url)) { @@ -947,7 +948,7 @@ function diaspora_reshare($importer,$xml,$msg) { $body = scale_external_images($body); // Add OEmbed and other information to the body - $body = add_page_info_to_body($body, false, true); +// $body = add_page_info_to_body($body, false, true); } else { // Maybe it is a reshare of a photo that will be delivered at a later time (testing) @@ -971,18 +972,6 @@ function diaspora_reshare($importer,$xml,$msg) { $prefix = html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8') . $details . "\n";*/ - // allocate a guid on our system - we aren't fixing any collisions. - // we're ignoring them - - $g = q("select * from guid where guid = '%s' limit 1", - dbesc($guid) - ); - if(! count($g)) { - q("insert into guid ( guid ) values ( '%s' )", - dbesc($guid) - ); - } - $created = unxmlify($xml->created_at); $private = ((unxmlify($xml->public) == 'false') ? 1 : 0); @@ -992,7 +981,11 @@ function diaspora_reshare($importer,$xml,$msg) { $tags = get_tags($body); + if(count($tags)) { + + $datarray['term'] = array(); + foreach($tags as $tag) { if(strpos($tag,'#') === 0) { if(strpos($tag,'[url=')) @@ -1005,63 +998,49 @@ function diaspora_reshare($importer,$xml,$msg) { if(preg_match('/\[(.*?)\]\((.*?)' . preg_quote($tag,'/') . '(.*?)\)/',$body)) continue; - $basetag = str_replace('_',' ',substr($tag,1)); $body = str_replace($tag,'#[url=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]',$body); - if(strlen($str_tags)) - $str_tags .= ','; - $str_tags .= '#[url=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]'; - continue; + + $datarray['term'][] = array( + 'uid' => $importer['channel_id'], + 'type' => TERM_HASHTAG, + 'otype' => TERM_OBJ_POST, + 'term' => $basetag, + 'url' => z_root() . '/search?tag=' . rawurlencode($basetag) + ); } } } + $cnt = preg_match_all('/@\[url=(.*?)\](.*?)\[\/url\]/ism',$body,$matches,PREG_SET_ORDER); + if($cnt) { + foreach($matches as $mtch) { + $datarray['term'][] = array( + 'uid' => $importer['channel_id'], + 'type' => TERM_MENTION, + 'otype' => TERM_OBJ_POST, + 'term' => $mtch[2], + 'url' => $mtch[1] + ); + } + } + + // This won't work $plink = 'https://'.substr($diaspora_handle,strpos($diaspora_handle,'@')+1).'/posts/'.$guid; $datarray['uid'] = $importer['channel_id']; - $datarray['contact-id'] = $contact['id']; - $datarray['wall'] = 0; - $datarray['network'] = NETWORK_DIASPORA; - $datarray['guid'] = $guid; - $datarray['uri'] = $datarray['parent-uri'] = $message_id; + $datarray['mid'] = $datarray['parent_mid'] = $guid; $datarray['changed'] = $datarray['created'] = $datarray['edited'] = datetime_convert('UTC','UTC',$created); - $datarray['private'] = $private; - $datarray['parent'] = 0; + $datarray['item_private'] = $private; $datarray['plink'] = $plink; - $datarray['owner-name'] = $contact['name']; - $datarray['owner-link'] = $contact['url']; - $datarray['owner-avatar'] = ((x($contact,'thumb')) ? $contact['thumb'] : $contact['photo']); - if (!intval(get_config('system','wall-to-wall_share'))) { - $prefix = "[share author='".str_replace(array("'", "[", "]"), array("'", "[", "]"),$person['name']). - "' profile='".$person['url']. - "' avatar='".((x($person,'thumb')) ? $person['thumb'] : $person['photo']). - "' link='".str_replace(array("'", "[", "]"), array("'", "[", "]"),$orig_url)."']"; - $datarray['author-name'] = $contact['name']; - $datarray['author-link'] = $contact['url']; - $datarray['author-avatar'] = $contact['thumb']; - $datarray['body'] = $prefix.$body."[/share]"; - } else { - // Let reshared messages look like wall-to-wall posts - $datarray['author-name'] = $person['name']; - $datarray['author-link'] = $person['url']; - $datarray['author-avatar'] = ((x($person,'thumb')) ? $person['thumb'] : $person['photo']); - $datarray['body'] = $body; - } + $datarray['owner_xchan'] = $contact['xchan_hash']; + $datarray['author_xchan'] = $person['xchan_hash']; - $datarray['tag'] = $str_tags; + $datarray['body'] = $body; $datarray['app'] = 'Diaspora'; - // if empty content it might be a photo that hasn't arrived yet. If a photo arrives, we'll make it visible. (testing) - $datarray['visible'] = ((strlen($body)) ? 1 : 0); - - $message_id = item_store($datarray); - //if($message_id) { - // q("update item set plink = '%s' where id = %d", - // dbesc($a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $message_id), - // intval($message_id) - // ); - //} + $result = item_store($datarray); return; @@ -1460,7 +1439,6 @@ function diaspora_conversation($importer,$xml,$msg) { } $body = diaspora2bb($msg_text); - $message_id = $msg_diaspora_handle . ':' . $msg_guid; $author_signed_data = $msg_guid . ';' . $msg_parent_guid . ';' . $msg_text . ';' . unxmlify($mesg->created_at) . ';' . $msg_diaspora_handle . ';' . $msg_conversation_guid; @@ -1473,8 +1451,8 @@ function diaspora_conversation($importer,$xml,$msg) { else { $person = find_diaspora_person_by_handle($msg_diaspora_handle); - if(is_array($person) && x($person,'pubkey')) - $key = $person['pubkey']; + if(is_array($person) && x($person,'xchan_pubkey')) + $key = $person['xchan_pubkey']; else { logger('diaspora_conversation: unable to find author details'); continue; @@ -1499,7 +1477,7 @@ function diaspora_conversation($importer,$xml,$msg) { } } - $r = q("select id from mail where `uri` = '%s' limit 1", + $r = q("select id from mail where mid = '%s' limit 1", dbesc($message_id) ); if(count($r)) { @@ -1507,19 +1485,15 @@ function diaspora_conversation($importer,$xml,$msg) { continue; } - q("insert into mail ( `uid`, `guid`, `convid`, `from-name`,`from-photo`,`from-url`,`contact-id`,`title`,`body`,`seen`,`reply`,`uri`,`parent-uri`,`created`) values ( %d, '%s', %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, '%s','%s','%s')", + q("insert into mail ( `uid`, `convid`, `from_xchan`,`to_xchan`,`title`,`body`,`mail_flags`,`mid`,`parent_mid`,`created`) values ( %d, %d, '%s', '%s', '%s', '%s', %d, '%s', '%s', '%s')", intval($importer['channel_id']), - dbesc($msg_guid), intval($conversation['id']), - dbesc($person['name']), - dbesc($person['photo']), - dbesc($person['url']), - intval($contact['id']), + dbesc($person['xchan_hash']), + dbesc($importer['channel_hash']), dbesc($subject), dbesc($body), 0, - 0, - dbesc($message_id), + dbesc($msg_guid), dbesc($parent_uri), dbesc($msg_created_at) ); @@ -1530,6 +1504,9 @@ function diaspora_conversation($importer,$xml,$msg) { ); require_once('include/enotify.php'); +/****** +//FIXME + notification(array( 'type' => NOTIFY_MAIL, 'notify_flags' => $importer['notify-flags'], @@ -1544,6 +1521,8 @@ function diaspora_conversation($importer,$xml,$msg) { 'verb' => ACTIVITY_POST, 'otype' => 'mail' )); +*******/ + } return; diff --git a/install/database.sql b/install/database.sql index 7f6a128c9..acf59a36d 100644 --- a/install/database.sql +++ b/install/database.sql @@ -615,6 +615,7 @@ CREATE TABLE IF NOT EXISTS `likes` ( CREATE TABLE IF NOT EXISTS `mail` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `convid` int(10) unsigned NOT NULL DEFAULT '0', `mail_flags` int(10) unsigned NOT NULL DEFAULT '0', `from_xchan` char(255) NOT NULL DEFAULT '', `to_xchan` char(255) NOT NULL DEFAULT '', @@ -628,6 +629,7 @@ CREATE TABLE IF NOT EXISTS `mail` ( `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `expires` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY (`id`), + KEY `convid` (`convid`), KEY `created` (`created`), KEY `mail_flags` (`mail_flags`), KEY `account_id` (`account_id`), diff --git a/install/update.php b/install/update.php index 7c05173c0..5319942ee 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ Date: Wed, 27 Aug 2014 22:01:02 -0700 Subject: ability to create/edit/delete custom profile field definitions - read the source. Currently the created entries aren't added to the allowed fields arrays, but this can be done by hand until that bit is made available. Only choice for input type at the moment is 'text' or a text input, not a textarea. Multiple choice will be added later. --- doc/diaspora_compat.md | 2 +- mod/admin.php | 63 +++++++++++++++++++++++++++++++++++++++ view/theme/redbasic/css/style.css | 11 +++++++ view/tpl/profdef_edit.tpl | 16 ++++++++++ 4 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 view/tpl/profdef_edit.tpl diff --git a/doc/diaspora_compat.md b/doc/diaspora_compat.md index 2e38dc443..29ec0a78a 100644 --- a/doc/diaspora_compat.md +++ b/doc/diaspora_compat.md @@ -9,7 +9,7 @@ Private mail retraction will not be possible on Diaspora. Access control only works on posts and comments. Diaspora members will get permission denied trying to access any other access controlled redmatrix objects such as files, photos, webpages, chatrooms, etc. In the case of private photos that are linked to posts, they will see a "prohibited sign" instead of the photo. Diaspora has no concept of private media. There is no workaround except to make your media resources public (to everybody on the internet). -Edited posts will not be delivered. Diaspora members will see the original post/comment without edits. There is no mechanism in the protocol to update an existing post. We cannot delete it and submit another invisibly because the message-id will change and we need to keep the same message-id on our own network. The only workaround is to delete the post/comment and do it over. +Edited posts will not be delivered. Diaspora members will see the original post/comment without edits. There is no mechanism in the protocol to update an existing post. We cannot delete it and submit another invisibly because the message-id will change and we need to keep the same message-id on our own network. The only workaround is to delete the post/comment and do it over. We may eventually provide a way to delete the out of date copy only from Diaspora and keep it intact on networks that can handle edits. Nomadic identity will not work with Diaspora. We will eventually provide an **option** which will allow you to "start sharing" from all of your clones when you make the first connection. The Diaspora person does not have to accept this, but it will allow your communications to continue if they accept this connection. Without this option, if you go to another server from where you made the connection originally or you make the connection before creating the clone, you will need to make friends with them again from the new location. diff --git a/mod/admin.php b/mod/admin.php index bcbb6fc26..e54163c62 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -1291,11 +1291,74 @@ readable."); function admin_page_profs_post(&$a) { + if($_REQUEST['id']) { + $r = q("update profdef set field_name = '%s', field_type = '%s', field_desc = '%s' field_help = '%s', field_inputs = '%s' where id = %d limit 1", + dbesc($_REQUEST['field_name']), + dbesc($_REQUEST['field_type']), + dbesc($_REQUEST['field_desc']), + dbesc($_REQUEST['field_help']), + dbesc($_REQUEST['field_inputs']), + intval($_REQUEST['id']) + ); + } + else { + $r = q("insert into profdef ( field_name, field_type, field_desc, field_help, field_inputs ) values ( '%s' , '%s', '%s', '%s', '%s' )", + dbesc($_REQUEST['field_name']), + dbesc($_REQUEST['field_type']), + dbesc($_REQUEST['field_desc']), + dbesc($_REQUEST['field_help']), + dbesc($_REQUEST['field_inputs']) + ); + } + + // add to chosen array basic or advanced + + goaway(z_root() . '/admin/profs'); } function admin_page_profs(&$a) { + if((argc() > 3) && argv(2) == 'drop' && intval(argv(3))) { + $r = q("delete from profdef where id = %d limit 1", + intval(argv(3)) + ); + // remove from allowed fields + + goaway(z_root() . '/admin/profs'); + } + + if((argc() > 2) && argv(2) === 'new') { + return replace_macros(get_markup_template('profdef_edit.tpl'),array( + '$header' => t('New Profile Field'), + '$field_name' => array('field_name',t('Field nickname'),$_REQUEST['field_name'],t('System name of field')), + '$field_type' => array('field_type',t('Input type'),(($_REQUEST['field_type']) ? $_REQUEST['field_type'] : 'text'),''), + '$field_desc' => array('field_desc',t('Field Name'),$_REQUEST['field_desc'],t('Label on profile pages')), + '$field_help' => array('field_help',t('Help text'),$_REQUEST['field_help'],t('Additional info (optional)')), + '$submit' => t('Save') + )); + + } + + if((argc() > 2) && intval(argv(2))) { + $r = q("select * from profdef where id = %d limit 1", + intval(argv(2)) + ); + if(! $r) { + notice( t('Field definition not found') . EOL); + goaway(z_root() . '/admin/profs'); + } + + return replace_macros(get_markup_template('profdef_edit.tpl'),array( + '$id' => intval($r[0]['id']), + '$header' => t('New Profile Field'), + '$field_name' => array('field_name',t('Field nickname'),$r[0]['field_name'],t('System name of field')), + '$field_type' => array('field_type',t('Input type'),$r[0]['field_type'],''), + '$field_desc' => array('field_desc',t('Field Name'),$r[0]['field_desc'],t('Label on profile pages')), + '$field_help' => array('field_help',t('Help text'),$r[0]['field_help'],t('Additional info (optional)')), + '$submit' => t('Save') + )); + } } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 209e32c52..85ab4adb8 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -371,6 +371,17 @@ aside li { clear: both; } +#profile-edit-wrapper .field label { + margin-top: 20px; + width: 175px; +} + +#profile-edit-wrapper .field input[type="text"] { + margin-top: 20px; + width: 220px; +} + + #profile-edit-links { max-width: $converse_width; padding-top: 15px; diff --git a/view/tpl/profdef_edit.tpl b/view/tpl/profdef_edit.tpl new file mode 100644 index 000000000..bfe85314d --- /dev/null +++ b/view/tpl/profdef_edit.tpl @@ -0,0 +1,16 @@ +

                {{$header}}

                + +
                + +{{if $id}} + +{{/if}} + +{{include file="field_input.tpl" field=$field_name}} +{{include file="field_input.tpl" field=$field_type}} +{{include file="field_input.tpl" field=$field_desc}} +{{include file="field_input.tpl" field=$field_help}} + + + +
                -- cgit v1.2.3 From a4f734e37c2092b91d3915b5f4bb90eba6a4b605 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 27 Aug 2014 22:56:24 -0700 Subject: begin embeddable/shareable design elements (blocks, webpages, layouts, menus, etc.) --- include/apps.php | 34 +++++++++++++++++++++++++++++++++- mod/admin.php | 2 +- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/include/apps.php b/include/apps.php index bd50b953a..7cfa07868 100644 --- a/include/apps.php +++ b/include/apps.php @@ -467,4 +467,36 @@ function app_encode($app,$embed = false) { function papp_encode($papp) { return chunk_split(base64_encode(json_encode($papp)),72,"\n"); -} \ No newline at end of file +} + + +/** + * install a shared design element (layout, webpage, block, menu, whatever) + * + */ + +function element_install($channel,$s) { + + $ret = array('success' => false); + + $s = str_replace(array('[element]','[/element]'),array('',''),$s); + $s = base64url_decode($s); + if(! $s) + return $ret; + $x = json_decode($s,true); + if(! $x) + return $ret; + + $d = array(); + + + + + + + + + $result = item_store($d); + +} + diff --git a/mod/admin.php b/mod/admin.php index e54163c62..82d199a9b 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -1351,7 +1351,7 @@ function admin_page_profs(&$a) { return replace_macros(get_markup_template('profdef_edit.tpl'),array( '$id' => intval($r[0]['id']), - '$header' => t('New Profile Field'), + '$header' => t('Edit Profile Field'), '$field_name' => array('field_name',t('Field nickname'),$r[0]['field_name'],t('System name of field')), '$field_type' => array('field_type',t('Input type'),$r[0]['field_type'],''), '$field_desc' => array('field_desc',t('Field Name'),$r[0]['field_desc'],t('Label on profile pages')), -- cgit v1.2.3 From ed4896def1f90d903919311312fee974384540d7 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 28 Aug 2014 01:08:42 -0700 Subject: make blocks, webpages, and layouts postable (pre-filled forms if supplied from elsewhere). The only serious issue is with ordering - you have to process and save a named layout before you can save a webpage that uses that layout name. Otherwise it will get unset during the save. --- mod/blocks.php | 17 +++++++++++------ mod/layouts.php | 11 ++++++++++- mod/webpages.php | 11 +++++++++-- version.inc | 2 +- 4 files changed, 31 insertions(+), 10 deletions(-) diff --git a/mod/blocks.php b/mod/blocks.php index 74a980c25..3f2bef116 100644 --- a/mod/blocks.php +++ b/mod/blocks.php @@ -45,14 +45,10 @@ function blocks_content(&$a) { return; } -// if(local_user() && local_user() == $owner) { - // $a->set_widget('design',design_tools()); - // } - - // Create a status editor (for now - we'll need a WYSIWYG eventually) to create pages -// Nickname is set to the observers xchan, and profile_uid to the owners. This lets you post pages at other people's channels. +// Nickname is set to the observers xchan, and profile_uid to the owners. +// This lets you post pages at other people's channels. require_once ('include/conversation.php'); $x = array( 'webpage' => ITEM_BUILDBLOCK, @@ -67,6 +63,15 @@ require_once ('include/conversation.php'); 'profile_uid' => intval($owner), ); + if($_REQUEST['title']) + $x['title'] = $_REQUEST['title']; + if($_REQUEST['body']) + $x['body'] = $_REQUEST['body']; + if($_REQUEST['pagetitle']) + $x['pagetitle'] = $_REQUEST['pagetitle']; + + + $o .= status_editor($a,$x); //Get a list of blocks. We can't display all them because endless scroll makes that unusable, so just list titles and an edit link. diff --git a/mod/layouts.php b/mod/layouts.php index 318e6e29f..2d14212cf 100644 --- a/mod/layouts.php +++ b/mod/layouts.php @@ -68,7 +68,8 @@ function layouts_content(&$a) { // Create a status editor (for now - we'll need a WYSIWYG eventually) to create pages - // Nickname is set to the observers xchan, and profile_uid to the owners. This lets you post pages at other people's channels. + // Nickname is set to the observers xchan, and profile_uid to the owners. + // This lets you post pages at other people's channels. require_once ('include/conversation.php'); @@ -85,6 +86,14 @@ function layouts_content(&$a) { 'profile_uid' => intval($owner), ); + if($_REQUEST['title']) + $x['title'] = $_REQUEST['title']; + if($_REQUEST['body']) + $x['body'] = $_REQUEST['body']; + if($_REQUEST['pagetitle']) + $x['pagetitle'] = $_REQUEST['pagetitle']; + + $o .= status_editor($a,$x); // Get a list of blocks. We can't display all them because endless scroll makes that unusable, so just list titles and an edit link. diff --git a/mod/webpages.php b/mod/webpages.php index 431caa628..bfa2ebd7d 100644 --- a/mod/webpages.php +++ b/mod/webpages.php @@ -46,11 +46,11 @@ function webpages_content(&$a) { // } - $mimetype = get_config('system','page_mimetype'); + $mimetype = (($_REQUEST['mimetype']) ? $_REQUEST['mimetype'] : get_config('system','page_mimetype')); if(! $mimetype) $mimetype = 'choose'; - $layout = get_config('system','page_layout'); + $layout = (($_REQUEST['layout']) ? $_REQUEST['layout'] : get_config('system','page_layout')); if(! $layout) $layout = 'choose'; @@ -91,6 +91,13 @@ function webpages_content(&$a) { 'layout' => $layout, ); + if($_REQUEST['title']) + $x['title'] = $_REQUEST['title']; + if($_REQUEST['body']) + $x['body'] = $_REQUEST['body']; + if($_REQUEST['pagetitle']) + $x['pagetitle'] = $_REQUEST['pagetitle']; + $o .= status_editor($a,$x); diff --git a/version.inc b/version.inc index dccb62428..6f8fc6806 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-08-27.780 +2014-08-28.781 -- cgit v1.2.3 From 5e5c6c90002908ed2052659a5fe13319c09883b0 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 28 Aug 2014 03:33:19 -0700 Subject: consistency: the diaspora post plugin uses "diaspora_enable". The protocol driver uses "diaspora_enabled" with a 'd'. They got mixed up in a couple of places. --- mod/admin.php | 6 +++--- view/tpl/admin_site.tpl | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mod/admin.php b/mod/admin.php index 82d199a9b..31d3873ff 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -266,11 +266,11 @@ function admin_page_site_post(&$a){ $poll_interval = ((x($_POST,'poll_interval'))? intval(trim($_POST['poll_interval'])) : 0); $maxloadavg = ((x($_POST,'maxloadavg'))? intval(trim($_POST['maxloadavg'])) : 50); $feed_contacts = ((x($_POST,'feed_contacts')) ? intval($_POST['feed_contacts']) : 0); - $diaspora_enable = ((x($_POST,'diaspora_enable')) ? intval($_POST['diaspora_enable']) : 0); + $diaspora_enabled = ((x($_POST,'diaspora_enabled')) ? intval($_POST['diaspora_enabled']) : 0); set_config('system','feed_contacts',$feed_contacts); - set_config('system','diaspora_enable',$diaspora_enable); + set_config('system','diaspora_enabled',$diaspora_enabled); set_config('system','delivery_interval',$delivery_interval); set_config('system','poll_interval',$poll_interval); set_config('system','maxloadavg',$maxloadavg); @@ -426,7 +426,7 @@ function admin_page_site(&$a) { '$theme_mobile' => array('theme_mobile', t("Mobile system theme"), get_config('system','mobile_theme'), t("Theme for mobile devices"), $theme_choices_mobile), '$theme_accessibility' => array('theme_accessibility', t("Accessibility system theme"), get_config('system','accessibility_theme'), t("Accessibility theme"), $theme_choices_accessibility), '$site_channel' => array('site_channel', t("Channel to use for this website's static pages"), get_config('system','site_channel'), t("Site Channel")), - '$diaspora_enable' => array('diaspora_enable',t('Enable Diaspora Protocol'), get_config('system','diaspora_enable'), t('Communicate with Diaspora and Friendica - experimental')), + '$diaspora_enabled' => array('diaspora_enabled',t('Enable Diaspora Protocol'), get_config('system','diaspora_enabled'), t('Communicate with Diaspora and Friendica - experimental')), '$feed_contacts' => array('feed_contacts', t('Allow Feeds as Connections'),get_config('system','feed_contacts'),t('(Heavy system resource usage)')), '$maximagesize' => array('maximagesize', t("Maximum image size"), intval(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("Does this site allow new member registration?"), get_config('system','register_policy'), "", $register_choices), diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 6736792a8..930486b5f 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -65,7 +65,7 @@

                {{$corporate}}

                {{include file="field_checkbox.tpl" field=$block_public}} - {{include file="field_checkbox.tpl" field=$diaspora_enable}} + {{include file="field_checkbox.tpl" field=$diaspora_enabled}} {{include file="field_checkbox.tpl" field=$feed_contacts}} {{include file="field_checkbox.tpl" field=$force_publish}} {{include file="field_checkbox.tpl" field=$disable_discover_tab}} -- cgit v1.2.3 From d0af6b501fa13c39abd5319e4fce80f3f22d6947 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 28 Aug 2014 04:04:38 -0700 Subject: really really really fix lockview - maybe --- mod/lockview.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mod/lockview.php b/mod/lockview.php index 6673ae709..51f7c29f3 100644 --- a/mod/lockview.php +++ b/mod/lockview.php @@ -16,11 +16,12 @@ function lockview_content(&$a) { if (!in_array($type, array('item','photo','event'))) killme(); - + $r = q("SELECT * FROM %s WHERE id = %d LIMIT 1", dbesc($type), intval($item_id) ); + if(! $r) killme(); @@ -39,7 +40,7 @@ function lockview_content(&$a) { // as unknown specific recipients. The sender will have the visibility list and will fall through to the // next section. - echo '
              • ' . translate_scope((! $item['public_policy']) ? PERMS_SPECIFIC : $item['public_policy']) . '
              • '; + echo '
              • ' . translate_scope((! $item['public_policy']) ? 'contacts' : $item['public_policy']) . '
              • '; killme(); } -- cgit v1.2.3 From f526a10f07086ffeb5018b913916827a556f2fa1 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 28 Aug 2014 04:14:49 -0700 Subject: let's make this "specific" since that's what it is. --- include/items.php | 2 ++ mod/lockview.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/items.php b/include/items.php index e9f11ee4a..16670b731 100755 --- a/include/items.php +++ b/include/items.php @@ -976,6 +976,8 @@ function translate_scope($scope) { return t('Visible to all connections.'); if(strpos($scope,'contacts') === 0) return t('Visible to approved connections.'); + if(strpos($scope,'specific') === 0) + return t('Visible to specific connections.'); } function encode_item_xchan($xchan) { diff --git a/mod/lockview.php b/mod/lockview.php index 51f7c29f3..e39f2707b 100644 --- a/mod/lockview.php +++ b/mod/lockview.php @@ -40,7 +40,7 @@ function lockview_content(&$a) { // as unknown specific recipients. The sender will have the visibility list and will fall through to the // next section. - echo '
              • ' . translate_scope((! $item['public_policy']) ? 'contacts' : $item['public_policy']) . '
              • '; + echo '
              • ' . translate_scope((! $item['public_policy']) ? 'specific' : $item['public_policy']) . '
              • '; killme(); } -- cgit v1.2.3 From 9945cc71290b51743b6ddd9b400bf4df1188df55 Mon Sep 17 00:00:00 2001 From: marijus Date: Thu, 28 Aug 2014 23:05:47 +0200 Subject: minor css fixes and cleanup --- view/theme/redbasic/css/style.css | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 85ab4adb8..0f2949a49 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -366,11 +366,6 @@ aside li { font-weight: bold; } - -#profile-vcard-break { - clear: both; -} - #profile-edit-wrapper .field label { margin-top: 20px; width: 175px; @@ -446,11 +441,6 @@ aside li { margin-bottom: 0px; } -.vcard-profile-edit-icon:hover { - text-decoration: none; -} - - #profile-extra-links { clear: both; margin-top: 10px; @@ -468,6 +458,7 @@ aside li { .profile-edit-side-link { + padding: 3px 0px; opacity: 0; filter:alpha(opacity=30); float: right; @@ -787,6 +778,7 @@ aside li { } #contact-block { + width: 100%; float: left; background-color: $comment_item_colour; border-bottom: 1px solid $widget_brdrcolour; -- cgit v1.2.3 From f53b1ff9bb954bfb3b041d4778a1b854ec67d18c Mon Sep 17 00:00:00 2001 From: Charles Date: Thu, 28 Aug 2014 16:33:23 -0700 Subject: change the name of the app from Channel Select to Channel Manager --- app/manage.apd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/manage.apd b/app/manage.apd index ed6cb9f0a..2e0a92d74 100644 --- a/app/manage.apd +++ b/app/manage.apd @@ -1,4 +1,4 @@ url: $baseurl/manage requires: local_user -name: Channel Select +name: Channel Manager photo: $baseurl/app/manage.png -- cgit v1.2.3 From 53b5cf7f507df53d3e382b6714caacf9551ed6db Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 28 Aug 2014 16:56:13 -0700 Subject: Ability to close comments at a certain date/time - needed for loom.io emulation (and many other uses) --- boot.php | 2 +- include/ConversationObject.php | 29 +++++----- include/apps.php | 2 +- include/items.php | 118 ++++++++++++++++++++++++++++------------- install/database.sql | 3 ++ install/update.php | 10 +++- 6 files changed, 106 insertions(+), 58 deletions(-) diff --git a/boot.php b/boot.php index 89d09b0d9..2e12e60f9 100755 --- a/boot.php +++ b/boot.php @@ -47,7 +47,7 @@ define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1127 ); +define ( 'DB_UPDATE_VERSION', 1128 ); define ( 'EOL', '
                ' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/include/ConversationObject.php b/include/ConversationObject.php index 9bf410358..767ef7360 100644 --- a/include/ConversationObject.php +++ b/include/ConversationObject.php @@ -159,28 +159,23 @@ class Conversation extends BaseObject { return false; } -// if(local_user() && $item->get_data_value('uid') == local_user()) -// $this->commentable = true; - -// if($this->writable) -// $this->commentable = true; - $item->set_commentable(false); $ob_hash = (($this->observer) ? $this->observer['xchan_hash'] : ''); - if(($item->get_data_value('author_xchan') === $ob_hash) || ($item->get_data_value('owner_xchan') === $ob_hash)) - $item->set_commentable(true); + if(! comments_are_now_closed($item->get_data())) { + if(($item->get_data_value('author_xchan') === $ob_hash) || ($item->get_data_value('owner_xchan') === $ob_hash)) + $item->set_commentable(true); - if($item->get_data_value('item_flags') & ITEM_NOCOMMENT) { - $item->set_commentable(false); - } - elseif(($this->observer) && (! $item->is_commentable())) { - if((array_key_exists('owner',$item->data)) && ($item->data['owner']['abook_flags'] & ABOOK_FLAG_SELF)) - $item->set_commentable(perm_is_allowed($this->profile_owner,$this->observer['xchan_hash'],'post_comments')); - else - $item->set_commentable(can_comment_on_post($this->observer['xchan_hash'],$item->data)); + if($item->get_data_value('item_flags') & ITEM_NOCOMMENT) { + $item->set_commentable(false); + } + elseif(($this->observer) && (! $item->is_commentable())) { + if((array_key_exists('owner',$item->data)) && ($item->data['owner']['abook_flags'] & ABOOK_FLAG_SELF)) + $item->set_commentable(perm_is_allowed($this->profile_owner,$this->observer['xchan_hash'],'post_comments')); + else + $item->set_commentable(can_comment_on_post($this->observer['xchan_hash'],$item->data)); + } } - require_once('include/identity.php'); $sys = get_sys_channel(); diff --git a/include/apps.php b/include/apps.php index 7cfa07868..7ac4c7e4b 100644 --- a/include/apps.php +++ b/include/apps.php @@ -124,7 +124,7 @@ function translate_system_apps(&$arr) { 'Bookmarks' => t('Bookmarks'), 'Address Book' => t('Address Book'), 'Login' => t('Login'), - 'Channel Select' => t('Channel Select'), + 'Channel Manager' => t('Channel Manager'), 'Matrix' => t('Matrix'), 'Settings' => t('Settings'), 'Files' => t('Files'), diff --git a/include/items.php b/include/items.php index 16670b731..cf9b86f06 100755 --- a/include/items.php +++ b/include/items.php @@ -100,6 +100,17 @@ function collect_recipients($item,&$private_envelope) { } + +function comments_are_now_closed($item) { + if($item['comments_closed'] !== '0000-00-00 00:00:00') { + $d = datetime_convert(); + if($d > $item['comments_closed']) + return true; + } + return false; +} + + /** * @function can_comment_on_post($observer_xchan,$item); * @@ -109,6 +120,7 @@ function collect_recipients($item,&$private_envelope) { * Generally we should look at the item - in particular the author['book_flags'] and see if ABOOK_FLAG_SELF is set. * If it is, you should be able to use perm_is_allowed( ... 'post_comments'), and if it isn't you need to call * can_comment_on_post() + * We also check the comments_closed date/time on the item if this is set. */ function can_comment_on_post($observer_xchan,$item) { @@ -117,8 +129,14 @@ function can_comment_on_post($observer_xchan,$item) { if(! $observer_xchan) return false; + + if($item['comment_policy'] === 'none') return false; + + if(comments_are_now_closed($item)) + return false; + if($observer_xchan === $item['author_xchan'] || $observer_xchan === $item['owner_xchan']) return true; switch($item['comment_policy']) { @@ -703,6 +721,9 @@ function get_item_elements($x) { $arr['commented'] = ((x($x,'commented') && $x['commented']) ? datetime_convert('UTC','UTC',$x['commented']) : $arr['created']); + $arr['comments_closed'] = ((x($x,'comments_closed') && $x['comments_closed']) + ? datetime_convert('UTC','UTC',$x['comments_closed']) + : '0000-00-00 00:00:00'); $arr['title'] = (($x['title']) ? htmlspecialchars($x['title'], ENT_COMPAT,'UTF-8',false) : ''); @@ -891,38 +912,41 @@ function encode_item($item) { } - $x['message_id'] = $item['mid']; - $x['message_top'] = $item['parent_mid']; - $x['message_parent'] = $item['thr_parent']; - $x['created'] = $item['created']; - $x['edited'] = $item['edited']; - $x['expires'] = $item['expires']; - $x['commented'] = $item['commented']; - $x['mimetype'] = $item['mimetype']; - $x['title'] = $item['title']; - $x['body'] = $item['body']; - $x['app'] = $item['app']; - $x['verb'] = $item['verb']; - $x['object_type'] = $item['obj_type']; - $x['target_type'] = $item['tgt_type']; - $x['permalink'] = $item['plink']; - $x['location'] = $item['location']; - $x['longlat'] = $item['coord']; - $x['signature'] = $item['sig']; - $x['route'] = $item['route']; - - $x['owner'] = encode_item_xchan($item['owner']); - $x['author'] = encode_item_xchan($item['author']); + $x['message_id'] = $item['mid']; + $x['message_top'] = $item['parent_mid']; + $x['message_parent'] = $item['thr_parent']; + $x['created'] = $item['created']; + $x['edited'] = $item['edited']; + $x['expires'] = $item['expires']; + $x['commented'] = $item['commented']; + $x['mimetype'] = $item['mimetype']; + $x['title'] = $item['title']; + $x['body'] = $item['body']; + $x['app'] = $item['app']; + $x['verb'] = $item['verb']; + $x['object_type'] = $item['obj_type']; + $x['target_type'] = $item['tgt_type']; + $x['permalink'] = $item['plink']; + $x['location'] = $item['location']; + $x['longlat'] = $item['coord']; + $x['signature'] = $item['sig']; + $x['route'] = $item['route']; + + $x['owner'] = encode_item_xchan($item['owner']); + $x['author'] = encode_item_xchan($item['author']); if($item['object']) - $x['object'] = json_decode_plus($item['object']); + $x['object'] = json_decode_plus($item['object']); if($item['target']) - $x['target'] = json_decode_plus($item['target']); + $x['target'] = json_decode_plus($item['target']); if($item['attach']) - $x['attach'] = json_decode_plus($item['attach']); + $x['attach'] = json_decode_plus($item['attach']); if($y = encode_item_flags($item)) - $x['flags'] = $y; + $x['flags'] = $y; - $x['public_scope'] = $scope; + if($item['comments_closed'] !== '0000-00-00 00:00:00') + $x['comments_closed'] = $item['comments_closed']; + + $x['public_scope'] = $scope; if($item['item_flags'] & ITEM_NOCOMMENT) $x['comment_scope'] = 'none'; @@ -930,7 +954,7 @@ function encode_item($item) { $x['comment_scope'] = $c_scope; if($item['term']) - $x['tags'] = encode_item_terms($item['term']); + $x['tags'] = encode_item_terms($item['term']); logger('encode_item: ' . print_r($x,true), LOGGER_DATA); @@ -1749,6 +1773,8 @@ function item_store($arr,$allow_exec = false) { $arr['edited'] = ((x($arr,'edited') !== false) ? datetime_convert('UTC','UTC',$arr['edited']) : datetime_convert()); $arr['expires'] = ((x($arr,'expires') !== false) ? datetime_convert('UTC','UTC',$arr['expires']) : '0000-00-00 00:00:00'); $arr['commented'] = ((x($arr,'commented') !== false) ? datetime_convert('UTC','UTC',$arr['commented']) : datetime_convert()); + $arr['comments_closed'] = ((x($arr,'comments_closed') !== false) ? datetime_convert('UTC','UTC',$arr['comments_closed']) : '0000-00-00 00:00:00'); + $arr['received'] = datetime_convert(); $arr['changed'] = datetime_convert(); $arr['location'] = ((x($arr,'location')) ? notags(trim($arr['location'])) : ''); @@ -1768,7 +1794,6 @@ function item_store($arr,$allow_exec = false) { $arr['public_policy'] = ((x($arr,'public_policy')) ? notags(trim($arr['public_policy'])) : '' ); $arr['comment_policy'] = ((x($arr,'comment_policy')) ? notags(trim($arr['comment_policy'])) : 'contacts' ); - $arr['item_flags'] = $arr['item_flags'] | ITEM_UNSEEN; @@ -1800,6 +1825,7 @@ function item_store($arr,$allow_exec = false) { $deny_cid = $arr['deny_cid']; $deny_gid = $arr['deny_gid']; $public_policy = $arr['public_policy']; + $comments_closed = $arr['comments_closed']; $arr['item_flags'] = $arr['item_flags'] | ITEM_THREAD_TOP; } else { @@ -1814,6 +1840,12 @@ function item_store($arr,$allow_exec = false) { if($r) { + if(comments_are_now_closed($r[0])) { + logger('item_store: comments closed'); + $ret['message'] = 'Comments closed.'; + return ret; + } + // is the new message multi-level threaded? // even though we don't support it now, preserve the info // and re-attach to the conversation parent. @@ -1830,13 +1862,14 @@ function item_store($arr,$allow_exec = false) { $r = $z; } - $parent_id = $r[0]['id']; - $parent_deleted = $r[0]['item_restrict'] & ITEM_DELETED; - $allow_cid = $r[0]['allow_cid']; - $allow_gid = $r[0]['allow_gid']; - $deny_cid = $r[0]['deny_cid']; - $deny_gid = $r[0]['deny_gid']; - $public_policy = $r[0]['public_policy']; + $parent_id = $r[0]['id']; + $parent_deleted = $r[0]['item_restrict'] & ITEM_DELETED; + $allow_cid = $r[0]['allow_cid']; + $allow_gid = $r[0]['allow_gid']; + $deny_cid = $r[0]['deny_cid']; + $deny_gid = $r[0]['deny_gid']; + $public_policy = $r[0]['public_policy']; + $comments_closed = $r[0]['comments_closed']; if($r[0]['item_flags'] & ITEM_WALL) $arr['item_flags'] = $arr['item_flags'] | ITEM_WALL; @@ -1950,7 +1983,8 @@ function item_store($arr,$allow_exec = false) { // Set parent id - and also make sure to inherit the parent's ACL's. $r = q("UPDATE item SET parent = %d, allow_cid = '%s', allow_gid = '%s', - deny_cid = '%s', deny_gid = '%s', public_policy = '%s', item_private = %d WHERE id = %d LIMIT 1", + deny_cid = '%s', deny_gid = '%s', public_policy = '%s', item_private = %d, comments_closed = '%s' + WHERE id = %d LIMIT 1", intval($parent_id), dbesc($allow_cid), dbesc($allow_gid), @@ -1958,6 +1992,7 @@ function item_store($arr,$allow_exec = false) { dbesc($deny_gid), dbesc($public_policy), intval($private), + dbesc($comments_closed), intval($current_post) ); @@ -1970,7 +2005,8 @@ function item_store($arr,$allow_exec = false) { $arr['deny_gid'] = $deny_gid; $arr['public_policy'] = $public_policy; $arr['item_private'] = $private; - + $arr['comments_closed'] = $comments_closed; + // Store taxonomy if(($terms) && (is_array($terms))) { @@ -2142,6 +2178,12 @@ function item_store_update($arr,$allow_exec = false) { $arr['edited'] = ((x($arr,'edited') !== false) ? datetime_convert('UTC','UTC',$arr['edited']) : datetime_convert()); $arr['expires'] = ((x($arr,'expires') !== false) ? datetime_convert('UTC','UTC',$arr['expires']) : $orig[0]['expires']); + + if(array_key_exists('comments_closed',$arr) && $arr['comments_closed'] != '0000-00-00 00:00:00') + $arr['comments_closed'] = datetime_convert('UTC','UTC',$arr['comments_closed']); + else + $arr['comments_closed'] = $orig[0]['comments_closed']; + $arr['commented'] = $orig[0]['commented']; $arr['received'] = datetime_convert(); $arr['changed'] = datetime_convert(); diff --git a/install/database.sql b/install/database.sql index acf59a36d..c773fab10 100644 --- a/install/database.sql +++ b/install/database.sql @@ -511,6 +511,7 @@ CREATE TABLE IF NOT EXISTS `item` ( `commented` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `received` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `changed` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `comments_closed` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `owner_xchan` char(255) NOT NULL DEFAULT '', `author_xchan` char(255) NOT NULL DEFAULT '', `source_xchan` char(255) NOT NULL DEFAULT '', @@ -553,6 +554,8 @@ CREATE TABLE IF NOT EXISTS `item` ( KEY `received` (`received`), KEY `uid_commented` (`uid`,`commented`), KEY `uid_created` (`uid`,`created`), + KEY `changed` (`changed`), + KEY `comments_closed` (`comments_closed`), KEY `aid` (`aid`), KEY `owner_xchan` (`owner_xchan`), KEY `author_xchan` (`author_xchan`), diff --git a/install/update.php b/install/update.php index 5319942ee..92cb200a3 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ Date: Thu, 28 Aug 2014 17:25:00 -0700 Subject: when updating the commented timestamp on the parent post (item_store) don't include any time travelling posts. They can mess up the conversation sort order in a big way until they're actually published. --- include/conversation.php | 2 ++ include/items.php | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index b14e609dd..15ce8ce25 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1270,6 +1270,8 @@ function conv_sort($arr,$order) { } } +logger('conv_sort: ' . print_r($ret,true)); + return $ret; } diff --git a/include/items.php b/include/items.php index cf9b86f06..2a4242ea6 100755 --- a/include/items.php +++ b/include/items.php @@ -2029,9 +2029,10 @@ function item_store($arr,$allow_exec = false) { // update the commented timestamp on the parent - $z = q("select max(created) as commented from item where parent_mid = '%s' and uid = %d ", + $z = q("select max(created) as commented from item where parent_mid = '%s' and uid = %d and not ( item_restrict & %d ) ", dbesc($arr['parent_mid']), - intval($arr['uid']) + intval($arr['uid']), + intval(ITEM_DELAYED_PUBLISH) ); q("UPDATE item set commented = '%s', changed = '%s' WHERE id = %d LIMIT 1", -- cgit v1.2.3 From e20fe41f2310e77f57bece8e593a856b34bedc34 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 28 Aug 2014 17:26:53 -0700 Subject: remove noisy log statement --- include/conversation.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index 15ce8ce25..b14e609dd 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1270,8 +1270,6 @@ function conv_sort($arr,$order) { } } -logger('conv_sort: ' . print_r($ret,true)); - return $ret; } -- cgit v1.2.3 From 95def2a247eca54a52744e405e837d5810cca83d Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 28 Aug 2014 19:05:13 -0700 Subject: retro-actively set standalone directory fix, also a fix for directory endless scroll when you hit the end. --- mod/directory.php | 5 +++++ mod/dirsearch.php | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/mod/directory.php b/mod/directory.php index 8dbed4115..39eeb36ce 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -233,6 +233,11 @@ function directory_content(&$a) { } else { + if($_REQUEST['aj']) { + $o = '
                '; + echo $o; + killme(); + } if($a->pager['page'] == 1 && $j['records'] == 0 && strpos($search,'@')) { goaway(z_root() . '/chanview/?f=&address=' . $search); } diff --git a/mod/dirsearch.php b/mod/dirsearch.php index 96e576a19..e292553ad 100644 --- a/mod/dirsearch.php +++ b/mod/dirsearch.php @@ -29,6 +29,7 @@ function dirsearch_content(&$a) { $sql_extra = ''; + $tables = array('name','address','locale','region','postcode','country','gender','marital','sexual','keywords'); if($_REQUEST['query']) { @@ -145,6 +146,11 @@ function dirsearch_content(&$a) { if($hash) $logic = 1; + if($dirmode == DIRECTORY_MODE_STANDALONE) { + $sql_extra .= " and xchan_addr like '%%" . get_app()->get_hostname() . "' "; + } + + $safesql = (($safe > 0) ? " and not ( xchan_flags & " . intval(XCHAN_FLAGS_CENSORED|XCHAN_FLAGS_SELFCENSORED) . " ) " : ''); if($safe < 0) $safesql = " and ( xchan_flags & " . intval(XCHAN_FLAGS_CENSORED|XCHAN_FLAGS_SELFCENSORED) . " ) "; @@ -254,8 +260,8 @@ function dirsearch_content(&$a) { } } } - json_return_and_die($ret); + json_return_and_die($ret); } function dir_query_build($joiner,$field,$s) { -- cgit v1.2.3 From 8a62b824f98ca55c94a2fc04afbea0c118d44486 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 28 Aug 2014 21:49:13 -0700 Subject: lots of little Diaspora issues --- include/deliver.php | 3 +++ include/diaspora.php | 23 +++++++++++++++++++---- include/queue.php | 17 +++++++++++++++++ include/zot.php | 13 +++++++------ 4 files changed, 46 insertions(+), 10 deletions(-) diff --git a/include/deliver.php b/include/deliver.php index 08c4f9b64..6f8bf0c98 100644 --- a/include/deliver.php +++ b/include/deliver.php @@ -24,6 +24,9 @@ function deliver_run($argv, $argc) { $result = z_post_url($r[0]['outq_posturl'],$r[0]['outq_msg']); if($result['success'] && $result['return_code'] < 300) { logger('deliver: queue post success to ' . $r[0]['outq_posturl'], LOGGER_DEBUG); + $y = q("update outq set outq_delivered = '%s' where outq_hash = '%s' limit 1", + dbesc($argv[$x]) + ); } else { $y = q("update outq set outq_updated = '%s' where outq_hash = '%s' limit 1", diff --git a/include/diaspora.php b/include/diaspora.php index 9652ecce7..352ed48e4 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -18,7 +18,7 @@ function diaspora_dispatch_public($msg) { // find everybody following or allowing this author - $r = q("SELECT * from channel where channel_id in ( SELECT abook_channel from abook WHERE abook_network = 'diaspora' and abook_xchan = '%s' )", + $r = q("SELECT * from channel where channel_id in ( SELECT abook_channel from abook left join xchan on abook_xchan = xchan_hash WHERE xchan_network like '%%diaspora%%' and xchan_addr = '%s' )", dbesc($msg['author']) ); @@ -339,7 +339,8 @@ function diaspora_pubmsg_build($msg,$channel,$contact,$prvkey,$pubkey) { logger('diaspora_pubmsg_build: ' . $msg, LOGGER_DATA); - $handle = $channel['xchan_addr']; + $handle = $channel['channel_address'] . '@' . get_app()->get_hostname(); + $b64url_data = base64url_encode($msg,false); @@ -757,6 +758,10 @@ function diaspora_post($importer,$xml,$msg) { $a = get_app(); $guid = notags(unxmlify($xml->guid)); $diaspora_handle = notags(unxmlify($xml->diaspora_handle)); + $app = notags(xmlify($xml->provider_display_name)); + + + if($diaspora_handle != $msg['author']) { logger('diaspora_post: Potential forgery. Message handle is not the same as envelope sender.'); @@ -767,6 +772,16 @@ function diaspora_post($importer,$xml,$msg) { if(! $contact) return; + + + if(! $app) { + if(strstr($contact['xchan_network'],'friendica')) + $app = 'Friendica'; + else + $app = 'Diaspora'; + } + + if(! perm_is_allowed($importer['channel_id'],$contact['xchan_hash'],'send_stream')) { logger('diaspora_post: Ignoring this author.'); return 202; @@ -857,11 +872,11 @@ function diaspora_post($importer,$xml,$msg) { $datarray['plink'] = $plink; $datarray['author_xchan'] = $contact['xchan_hash']; - $datarray['owner_xchan'] = $importer['channel_hash']; + $datarray['owner_xchan'] = $contact['xchan_hash']; $datarray['body'] = $body; - $datarray['app'] = 'Diaspora'; + $datarray['app'] = $app; $datarray['item_flags'] = ITEM_UNSEEN|ITEM_THREAD_TOP; diff --git a/include/queue.php b/include/queue.php index 239d61fc0..378cc7816 100644 --- a/include/queue.php +++ b/include/queue.php @@ -46,6 +46,23 @@ function queue_run($argv, $argc){ foreach($r as $rr) { if(in_array($rr['outq_posturl'],$deadguys)) continue; + + if($rr['outq_driver'] === 'post') { + $result = z_post_url($rr['outq_posturl'],$rr['outq_msg']); + if($result['success'] && $result['return_code'] < 300) { + logger('deliver: queue post success to ' . $rr['outq_posturl'], LOGGER_DEBUG); + $y = q("update outq set outq_delivered = '%s' where outq_hash = '%s' limit 1", + dbesc($rr['ouq_hash']) + ); + } + else { + $y = q("update outq set outq_updated = '%s' where outq_hash = '%s' limit 1", + dbesc(datetime_convert()), + dbesc($rr['outq_hash']) + ); + } + continue; + } $result = zot_zot($rr['outq_posturl'],$rr['outq_notify']); if($result['success']) { zot_process_response($rr['outq_posturl'],$result, $rr); diff --git a/include/zot.php b/include/zot.php index 54efe1343..8627656c2 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1595,12 +1595,13 @@ function process_delivery($sender,$arr,$deliveries,$relay,$public = false) { $arr['aid'] = $channel['channel_account_id']; $arr['uid'] = $channel['channel_id']; $item_result = item_store($arr); - $item_id = $item_result['item_id']; - $parr = array('item_id' => $item_id,'item' => $arr,'sender' => $sender,'channel' => $channel); - call_hooks('activity_received',$parr); - - add_source_route($item_id,$sender['hash']); - + $item_id = 0; + if($item_result['success']) { + $item_id = $item_result['item_id']; + $parr = array('item_id' => $item_id,'item' => $arr,'sender' => $sender,'channel' => $channel); + call_hooks('activity_received',$parr); + add_source_route($item_id,$sender['hash']); + } $result[] = array($d['hash'],(($item_id) ? 'posted' : 'storage failed:' . $item_result['message']),$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>',$arr['mid']); } -- cgit v1.2.3 From feddf5d7fb1d0cecbad69ecd314af0d106c0a9be Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 28 Aug 2014 22:18:11 -0700 Subject: fix saving of extended profile attributes --- mod/profiles.php | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/mod/profiles.php b/mod/profiles.php index d6df09e9a..1504f55f0 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -254,6 +254,7 @@ function profiles_post(&$a) { // $month = 1; $day = 1; // } + $dob = '0000-00-00'; $dob = sprintf('%04d-%02d-%02d',$year,$month,$day); @@ -264,6 +265,9 @@ function profiles_post(&$a) { $namechanged = true; + + + $pdesc = escape_tags(trim($_POST['pdesc'])); $gender = escape_tags(trim($_POST['gender'])); $address = escape_tags(trim($_POST['address'])); @@ -344,7 +348,41 @@ function profiles_post(&$a) { $with = $orig[0]['with']; } + $profile_fields_basic = get_profile_fields_basic(); + $profile_fields_advanced = get_profile_fields_advanced(); + $advanced = ((feature_enabled(local_user(),'advanced_profiles')) ? true : false); + if($advanced) + $fields = $profile_fields_advanced; + else + $fields = $profile_fields_basic; + $z = q("select * from profdef where true"); + if($z) { + foreach($z as $zz) { + if(array_key_exists($zz['field_name'],$fields)) { + $w = q("select * from profext where channel_id = %d and hash = '%s' and k = '%s' limit 1", + intval(local_user()), + dbesc($orig[0]['profile_guid']), + dbesc($zz['field_name']) + ); + if($w) { + q("update profext set v = '%s' where id = %d limit 1", + dbesc(escape_tags(trim($_POST[$zz['field_name']]))), + intval($w[0]['id']) + ); + } + else { + q("insert into profdef ( channel_id, hash, k, v ) values ( %d, '%s', '%s', '%s') ", + intval(local_user()), + dbesc($orig[0]['profile_guid']), + dbesc($zz['field_name']), + dbesc(escape_tags(trim($_POST[$zz['field_name']]))) + ); + } + } + } + } + $changes = array(); -- cgit v1.2.3 From 0825ec81c130621bdaccba3aa1f627b08c91128e Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 28 Aug 2014 22:27:05 -0700 Subject: except for a typo --- mod/profiles.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mod/profiles.php b/mod/profiles.php index 1504f55f0..6361f56a3 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -372,7 +372,7 @@ function profiles_post(&$a) { ); } else { - q("insert into profdef ( channel_id, hash, k, v ) values ( %d, '%s', '%s', '%s') ", + q("insert into profext ( channel_id, hash, k, v ) values ( %d, '%s', '%s', '%s') ", intval(local_user()), dbesc($orig[0]['profile_guid']), dbesc($zz['field_name']), @@ -383,8 +383,6 @@ function profiles_post(&$a) { } } - - $changes = array(); $value = ''; if($is_default) { -- cgit v1.2.3 From 00004e1a12c74eb600919a3fe37c8f2c253a552f Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 28 Aug 2014 22:42:19 -0700 Subject: the queue driver is universal now - we don't need to filter it. --- include/queue.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/queue.php b/include/queue.php index 378cc7816..c1b891f3c 100644 --- a/include/queue.php +++ b/include/queue.php @@ -38,7 +38,7 @@ function queue_run($argv, $argc){ // The zot driver will deliver everything destined for a single hub once contact is made (*if* contact is made). // Other drivers will have to do something different here and may need their own query. - $r = q("SELECT * FROM outq WHERE outq_delivered = 0 and (( outq_created > UTC_TIMESTAMP() - INTERVAL 12 HOUR and outq_updated < UTC_TIMESTAMP() - INTERVAL 15 MINUTE ) OR ( outq_updated < UTC_TIMESTAMP() - INTERVAL 1 HOUR )) and outq_driver in ('','zot') group by outq_posturl"); + $r = q("SELECT * FROM outq WHERE outq_delivered = 0 and (( outq_created > UTC_TIMESTAMP() - INTERVAL 12 HOUR and outq_updated < UTC_TIMESTAMP() - INTERVAL 15 MINUTE ) OR ( outq_updated < UTC_TIMESTAMP() - INTERVAL 1 HOUR )) group by outq_posturl"); } if(! $r) return; -- cgit v1.2.3 From c6b67518d64fc74524938510ad15e49538847179 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 28 Aug 2014 22:55:40 -0700 Subject: more queue tweaks --- include/deliver.php | 2 +- include/queue.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/deliver.php b/include/deliver.php index 6f8bf0c98..2693fe165 100644 --- a/include/deliver.php +++ b/include/deliver.php @@ -24,7 +24,7 @@ function deliver_run($argv, $argc) { $result = z_post_url($r[0]['outq_posturl'],$r[0]['outq_msg']); if($result['success'] && $result['return_code'] < 300) { logger('deliver: queue post success to ' . $r[0]['outq_posturl'], LOGGER_DEBUG); - $y = q("update outq set outq_delivered = '%s' where outq_hash = '%s' limit 1", + $y = q("delete from outq where outq_hash = '%s' limit 1", dbesc($argv[$x]) ); } diff --git a/include/queue.php b/include/queue.php index c1b891f3c..cd81e2aa4 100644 --- a/include/queue.php +++ b/include/queue.php @@ -51,7 +51,7 @@ function queue_run($argv, $argc){ $result = z_post_url($rr['outq_posturl'],$rr['outq_msg']); if($result['success'] && $result['return_code'] < 300) { logger('deliver: queue post success to ' . $rr['outq_posturl'], LOGGER_DEBUG); - $y = q("update outq set outq_delivered = '%s' where outq_hash = '%s' limit 1", + $y = q("delete from outq where outq_hash = '%s' limit 1", dbesc($rr['ouq_hash']) ); } -- cgit v1.2.3 From 345d170236572866c0aa29698d5089f4d2bf7c11 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 29 Aug 2014 17:31:29 -0700 Subject: doc update --- doc/html/apw_2php_2style_8php.html | 2 +- doc/html/boot_8php.html | 72 +- doc/html/crypto_8php.html | 14 +- doc/html/datetime_8php.html | 2 +- doc/html/dba__driver_8php.html | 4 +- doc/html/diaspora_8php.html | 50 +- doc/html/diaspora_8php.js | 5 +- doc/html/enotify_8php.html | 2 +- doc/html/extract_8php.html | 4 +- doc/html/features_8php.html | 2 +- doc/html/globals_0x63.html | 3 + doc/html/globals_0x64.html | 7 +- doc/html/globals_0x65.html | 7 +- doc/html/globals_func_0x63.html | 3 + doc/html/globals_func_0x64.html | 7 +- doc/html/globals_func_0x65.html | 3 + doc/html/identity_8php.html | 2 +- doc/html/include_2apps_8php.html | 29 + doc/html/include_2apps_8php.js | 1 + doc/html/include_2config_8php.html | 4 +- doc/html/include_2network_8php.html | 8 +- doc/html/items_8php.html | 26 +- doc/html/items_8php.js | 1 + doc/html/language_8php.html | 2 +- doc/html/navtree.js | 12 +- doc/html/navtreeindex3.js | 40 +- doc/html/navtreeindex4.js | 8 +- doc/html/navtreeindex5.js | 14 +- doc/html/navtreeindex6.js | 126 +-- doc/html/navtreeindex7.js | 8 +- doc/html/navtreeindex8.js | 8 +- doc/html/navtreeindex9.js | 3 + doc/html/photo__driver_8php.html | 2 +- doc/html/php_2theme__init_8php.html | 2 +- doc/html/plugin_8php.html | 2 +- doc/html/search/all_63.js | 1 + doc/html/search/all_64.js | 5 +- doc/html/search/all_65.js | 1 + doc/html/search/functions_63.js | 1 + doc/html/search/functions_64.js | 5 +- doc/html/search/functions_65.js | 1 + doc/html/text_8php.html | 18 +- doc/html/typo_8php.html | 2 +- doc/html/typohelper_8php.html | 2 +- util/messages.po | 1786 ++++++++++++++++++----------------- version.inc | 2 +- 46 files changed, 1238 insertions(+), 1071 deletions(-) diff --git a/doc/html/apw_2php_2style_8php.html b/doc/html/apw_2php_2style_8php.html index 002ed8871..ce77cd3fb 100644 --- a/doc/html/apw_2php_2style_8php.html +++ b/doc/html/apw_2php_2style_8php.html @@ -260,7 +260,7 @@ Variables
                -

                Referenced by Template\_replcb_for(), Template\_replcb_if(), account_remove(), acl_init(), activity_sanitise(), admin_page_channels(), admin_page_themes(), advanced_profile(), aes_encapsulate(), api_login(), app_decode(), app_install(), app_list(), app_render(), app_store(), app_update(), apps_content(), argv(), array_sanitise(), attach_change_permissions(), attach_delete(), attach_store(), autoname(), bb_parse_crypt(), bbcode(), block_content(), blocks_content(), bookmark_add(), bookmarks_content(), build_sync_packet(), change_channel(), channel_content(), chat_content(), chat_message(), chat_post(), chatroom_create(), chatroom_enter(), chatsvc_content(), chatsvc_init(), chatsvc_post(), check_config(), check_form_security_token(), check_item_source(), check_list_permissions(), check_webbie(), RedDirectory\childExists(), cloud_init(), common_init(), construct_page(), conversation(), RedDirectory\createFile(), photo_gd\cropImage(), photo_imagick\cropImage(), datesel(), datesel_format(), decode_tags(), deliver_run(), diaspora_reshare(), dir_tagadelic(), directory_content(), directory_run(), dirprofile_init(), discover_by_webbie(), display_content(), downgrade_accounts(), email_header_encode(), encode_item(), encode_mail(), event_store_item(), events_post(), expand_groups(), expire_run(), externals_run(), feature_enabled(), fetch_post_tags(), fetch_xrd_links(), filer_content(), find_xchan_in_array(), findpeople_widget(), fix_private_photos(), fix_system_urls(), photo_gd\flip(), fsuggest_post(), get_all_perms(), get_directory_realm(), get_item_elements(), get_mail_elements(), get_mentions(), get_online_status(), get_profile_elements(), get_profile_fields_advanced(), get_profile_fields_basic(), get_system_apps(), get_terms_oftype(), get_theme_uid(), get_things(), RedDirectory\getChild(), RedDirectory\getDir(), RedDirectory\getQuotaInfo(), gprobe_run(), handle_feed(), hcard_init(), hostxrd_init(), ids_to_querystr(), import_author_rss(), import_author_xchan(), import_author_zot(), import_directory_keywords(), import_directory_profile(), import_post(), import_site(), import_xchan(), invite_content(), invite_post(), item_post(), item_remove_cid(), items_fetch(), json_decode_plus(), json_return_and_die(), layouts_content(), legal_webbie(), FKOAuth1\loginUser(), magic_init(), mail_post(), manage_content(), mark_orphan_hubsxchans(), match_content(), menu_content(), menu_delete_id(), menu_fetch(), menu_render(), mimetype_select(), nav(), navbar_complete(), netgrowth_content(), network_content(), new_channel_init(), new_contact(), notification(), notifier_run(), oembed_fetch_url(), onedirsync_run(), onepoll_run(), openid_content(), page_content(), parse_app_description(), parse_xml_string(), pdledit_content(), pemtome(), perm_is_allowed(), photos_list_photos(), photos_post(), ping_init(), poco_load(), poller_run(), post_init(), post_post(), preg_heart(), print_template(), private_messages_list(), proc_run(), process_channel_sync_delivery(), process_mail_delivery(), profile_init(), profile_load(), profile_photo_post(), prune_hub_reinstalls(), public_recips(), pubrsatome(), RedFile\put(), dba_mysql\q(), dba_mysqli\q(), randprof_init(), red_item_new(), RedCollectionData(), RedFileData(), remote_online_status(), remove_community_tag(), rpost_content(), photo_driver\save(), scrape_feed(), scrape_vcard(), search_ac_init(), send_status_notifications(), share_init(), share_unshield(), site_default_perms(), smilies(), sources_content(), sslify_init(), photo_driver\store(), string_splitter(), stringify_array_elms(), sync_directories(), tag_deliver(), tagadelic(), tagrm_content(), tagrm_post(), theme_status(), thing_content(), timesel(), toggle_theme(), update_directory_entry(), update_imported_item(), upgrade_bool_message(), upgrade_message(), valid_email(), RedBasicAuth\validateUserPass(), webpages_content(), what_next(), widget_affinity(), widget_bookmarkedchats(), widget_suggestedchats(), widget_suggestions(), xchan_query(), xmlify(), zfinger_init(), zot_process_response(), zot_refresh(), zot_register_hub(), and zotfeed_init().

                +

                Referenced by Template\_replcb_for(), Template\_replcb_if(), account_remove(), acl_init(), activity_sanitise(), admin_page_channels(), admin_page_themes(), advanced_profile(), aes_encapsulate(), api_login(), app_decode(), app_install(), app_list(), app_render(), app_store(), app_update(), apps_content(), argv(), array_sanitise(), attach_change_permissions(), attach_delete(), attach_store(), autoname(), bb_parse_crypt(), bbcode(), block_content(), blocks_content(), bookmark_add(), bookmarks_content(), build_sync_packet(), change_channel(), channel_content(), chat_content(), chat_message(), chat_post(), chatroom_create(), chatroom_enter(), chatsvc_content(), chatsvc_init(), chatsvc_post(), check_config(), check_form_security_token(), check_item_source(), check_list_permissions(), check_webbie(), RedDirectory\childExists(), cloud_init(), common_init(), construct_page(), conversation(), RedDirectory\createFile(), photo_gd\cropImage(), photo_imagick\cropImage(), datesel(), datesel_format(), decode_tags(), deliver_run(), diaspora_reshare(), dir_tagadelic(), directory_content(), directory_run(), dirprofile_init(), discover_by_webbie(), display_content(), downgrade_accounts(), element_install(), email_header_encode(), encode_item(), encode_mail(), event_store_item(), events_post(), expand_groups(), expire_run(), externals_run(), feature_enabled(), fetch_post_tags(), fetch_xrd_links(), filer_content(), find_xchan_in_array(), findpeople_widget(), fix_private_photos(), fix_system_urls(), photo_gd\flip(), fsuggest_post(), get_all_perms(), get_directory_realm(), get_item_elements(), get_mail_elements(), get_mentions(), get_online_status(), get_profile_elements(), get_profile_fields_advanced(), get_profile_fields_basic(), get_system_apps(), get_terms_oftype(), get_theme_uid(), get_things(), RedDirectory\getChild(), RedDirectory\getDir(), RedDirectory\getQuotaInfo(), gprobe_run(), handle_feed(), hcard_init(), hostxrd_init(), ids_to_querystr(), import_author_rss(), import_author_xchan(), import_author_zot(), import_directory_keywords(), import_directory_profile(), import_post(), import_site(), import_xchan(), invite_content(), invite_post(), item_post(), item_remove_cid(), items_fetch(), json_decode_plus(), json_return_and_die(), layouts_content(), legal_webbie(), FKOAuth1\loginUser(), magic_init(), mail_post(), manage_content(), mark_orphan_hubsxchans(), match_content(), menu_content(), menu_delete_id(), menu_fetch(), menu_render(), mimetype_select(), nav(), navbar_complete(), netgrowth_content(), network_content(), new_channel_init(), new_contact(), notification(), notifier_run(), oembed_fetch_url(), onedirsync_run(), onepoll_run(), openid_content(), page_content(), parse_app_description(), parse_xml_string(), pdledit_content(), pemtome(), perm_is_allowed(), photos_list_photos(), photos_post(), ping_init(), poco_load(), poller_run(), post_init(), post_post(), preg_heart(), print_template(), private_messages_list(), proc_run(), process_channel_sync_delivery(), process_mail_delivery(), profile_init(), profile_load(), profile_photo_post(), prune_hub_reinstalls(), public_recips(), pubrsatome(), RedFile\put(), dba_mysql\q(), dba_mysqli\q(), randprof_init(), red_item_new(), RedCollectionData(), RedFileData(), remote_online_status(), remove_community_tag(), rpost_content(), photo_driver\save(), scrape_feed(), scrape_vcard(), search_ac_init(), send_status_notifications(), share_init(), share_unshield(), site_default_perms(), smilies(), sources_content(), sslify_init(), photo_driver\store(), string_splitter(), stringify_array_elms(), sync_directories(), tag_deliver(), tagadelic(), tagrm_content(), tagrm_post(), theme_status(), thing_content(), timesel(), toggle_theme(), update_directory_entry(), update_imported_item(), upgrade_bool_message(), upgrade_message(), valid_email(), RedBasicAuth\validateUserPass(), webpages_content(), what_next(), widget_affinity(), widget_bookmarkedchats(), widget_suggestedchats(), widget_suggestions(), xchan_query(), xmlify(), zfinger_init(), zot_build_packet(), zot_process_response(), zot_refresh(), zot_register_hub(), and zotfeed_init().

                diff --git a/doc/html/boot_8php.html b/doc/html/boot_8php.html index 560a01771..9168675a4 100644 --- a/doc/html/boot_8php.html +++ b/doc/html/boot_8php.html @@ -208,7 +208,7 @@ Variables   const ZOT_REVISION 1   -const DB_UPDATE_VERSION 1123 +const DB_UPDATE_VERSION 1128   const EOL '<br />' . "\r\n"   @@ -756,7 +756,7 @@ Variables
                -

                Referenced by App\__construct(), _well_known_init(), achievements_content(), admin_content(), admin_page_channels(), admin_page_dbsync(), admin_page_users(), admin_post(), api_get_user(), apps_content(), attach_init(), block_content(), blocks_content(), channel_init(), chat_content(), chat_init(), cloud_init(), common_init(), connect_init(), connections_content(), connedit_content(), connedit_init(), contactgroup_content(), dirsearch_content(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), feed_init(), filestorage_content(), group_content(), group_post(), hcard_init(), help_content(), importelm_post(), item_content(), layouts_content(), like_content(), lockview_content(), mail_content(), manage_content(), menu_content(), menu_post(), message_content(), mitem_content(), mitem_init(), mitem_post(), new_channel_init(), notes_init(), notify_init(), oembed_init(), oexchange_content(), oexchange_init(), online_init(), page_content(), pdledit_content(), photo_init(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), profile_init(), profile_photo_post(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), queue_run(), rbmark_content(), receive_post(), register_init(), regmod_content(), regver_content(), rpost_content(), settings_init(), settings_post(), setup_init(), share_init(), sources_content(), starred_init(), subthread_content(), tagger_content(), thing_content(), uexport_init(), update_channel_content(), update_display_content(), update_network_content(), update_search_content(), viewconnections_init(), viewsrc_content(), wall_attach_post(), wall_upload_post(), webpages_content(), xref_init(), and zotfeed_init().

                +

                Referenced by App\__construct(), _well_known_init(), achievements_content(), admin_content(), admin_page_channels(), admin_page_dbsync(), admin_page_profs(), admin_page_users(), admin_post(), api_get_user(), apps_content(), attach_init(), block_content(), blocks_content(), channel_init(), chat_content(), chat_init(), cloud_init(), common_init(), connect_init(), connections_content(), connedit_content(), connedit_init(), contactgroup_content(), dirsearch_content(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), feed_init(), filestorage_content(), group_content(), group_post(), hcard_init(), help_content(), importelm_post(), item_content(), layouts_content(), like_content(), lockview_content(), mail_content(), manage_content(), menu_content(), menu_post(), message_content(), mitem_content(), mitem_init(), mitem_post(), new_channel_init(), notes_init(), notify_init(), oembed_init(), oexchange_content(), oexchange_init(), online_init(), page_content(), pdledit_content(), photo_init(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), profile_init(), profile_photo_post(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), queue_run(), rbmark_content(), receive_post(), register_init(), regmod_content(), regver_content(), rpost_content(), settings_init(), settings_post(), setup_init(), share_init(), sources_content(), starred_init(), subthread_content(), tagger_content(), thing_content(), uexport_init(), update_channel_content(), update_display_content(), update_network_content(), update_search_content(), viewconnections_init(), viewsrc_content(), wall_attach_post(), wall_upload_post(), webpages_content(), xref_init(), and zotfeed_init().

                @@ -774,7 +774,7 @@ Variables
                -

                Referenced by App\__construct(), _well_known_init(), achievements_content(), admin_content(), admin_page_channels(), admin_page_dbsync(), admin_page_users(), admin_post(), api_get_user(), api_statuses_destroy(), api_statuses_repeat(), api_statuses_show(), apps_content(), attach_init(), block_content(), block_init(), blocks_content(), channel_init(), chat_content(), chat_init(), cloud_init(), common_init(), connect_init(), connections_content(), connections_post(), connedit_content(), connedit_init(), connedit_post(), contactgroup_content(), dirsearch_content(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), feed_init(), filestorage_content(), get_online_status(), group_content(), group_post(), hcard_init(), help_content(), importelm_post(), item_content(), layouts_content(), like_content(), lockview_content(), mail_content(), manage_content(), menu_content(), menu_post(), message_content(), mitem_content(), mitem_init(), mitem_post(), new_channel_init(), notes_init(), notify_init(), oembed_init(), oexchange_content(), oexchange_init(), online_init(), page_content(), page_init(), pdledit_content(), photo_init(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), profile_init(), profile_photo_post(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), queue_run(), rbmark_content(), receive_post(), register_init(), regmod_content(), regver_content(), rpost_content(), settings_post(), setup_init(), share_init(), sources_content(), starred_init(), subthread_content(), tagger_content(), thing_content(), uexport_init(), update_channel_content(), update_display_content(), update_network_content(), update_search_content(), view_init(), viewconnections_init(), viewsrc_content(), wall_attach_post(), wall_upload_post(), webpages_content(), widget_collections(), widget_mailmenu(), widget_settings_menu(), xref_init(), and zotfeed_init().

                +

                Referenced by App\__construct(), _well_known_init(), achievements_content(), admin_content(), admin_page_channels(), admin_page_dbsync(), admin_page_profs(), admin_page_users(), admin_post(), api_get_user(), api_statuses_destroy(), api_statuses_repeat(), api_statuses_show(), apps_content(), attach_init(), block_content(), block_init(), blocks_content(), channel_init(), chat_content(), chat_init(), cloud_init(), common_init(), connect_init(), connections_content(), connections_post(), connedit_content(), connedit_init(), connedit_post(), contactgroup_content(), dirsearch_content(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), feed_init(), filestorage_content(), get_online_status(), group_content(), group_post(), hcard_init(), help_content(), importelm_post(), item_content(), layouts_content(), like_content(), lockview_content(), mail_content(), manage_content(), menu_content(), menu_post(), message_content(), mitem_content(), mitem_init(), mitem_post(), new_channel_init(), notes_init(), notify_init(), oembed_init(), oexchange_content(), oexchange_init(), online_init(), page_content(), page_init(), pdledit_content(), photo_init(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), profile_init(), profile_photo_post(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), queue_run(), rbmark_content(), receive_post(), register_init(), regmod_content(), regver_content(), rpost_content(), settings_post(), setup_init(), share_init(), sources_content(), starred_init(), subthread_content(), tagger_content(), thing_content(), uexport_init(), update_channel_content(), update_display_content(), update_network_content(), update_search_content(), view_init(), viewconnections_init(), viewsrc_content(), wall_attach_post(), wall_upload_post(), webpages_content(), widget_collections(), widget_mailmenu(), widget_settings_menu(), xref_init(), and zotfeed_init().

                @@ -996,7 +996,7 @@ Variables
                -

                Referenced by FriendicaSmarty\__construct(), FriendicaSmartyEngine\__construct(), abook_toggle_flag(), account_remove(), allowed_public_recips(), api_apply_template(), api_format_items(), api_get_user(), api_statuses_home_timeline(), api_statuses_repeat(), api_statuses_user_timeline(), api_user(), app_render(), app_store(), argc(), argv(), atom_entry(), authenticate_success(), avatar_img(), bbcode(), best_link_url(), blogtheme_imgurl(), build_sync_packet(), call_hooks(), can_comment_on_post(), categories_widget(), change_channel(), channel_remove(), check_form_security_token(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), check_htaccess(), cli_suggest_run(), comanche_get_channel_id(), comanche_replace_region(), comanche_widget(), common_friends_visitor_widget(), connedit_content(), contact_block(), contact_select(), create_identity(), current_theme(), deliver_run(), design_tools(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_like(), diaspora_message(), diaspora_msg_build(), diaspora_photo(), diaspora_post(), diaspora_profile(), diaspora_pubmsg_build(), diaspora_request(), diaspora_reshare(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_retraction(), diaspora_send_status(), diaspora_share(), diaspora_transmit(), diaspora_unshare(), dir_tagblock(), drop_item(), editpost_content(), event_store_item(), externals_run(), fileas_widget(), findpeople_widget(), fix_attached_photo_permissions(), fix_private_photos(), format_event_diaspora(), RedBrowser\generateDirectoryIndex(), get_account_id(), get_best_language(), get_birthdays(), get_events(), get_feed_for(), get_form_security_token(), FriendicaSmartyEngine\get_intltext_template(), get_intltext_template(), get_markup_template(), get_observer_hash(), get_plink(), get_theme_config_file(), get_theme_screenshot(), gprobe_run(), group_select(), guess_image_type(), handle_tag(), head_add_css(), head_add_js(), head_get_css(), head_get_js(), head_remove_css(), head_remove_js(), identity_selector(), import_channel_photo(), import_directory_profile(), import_post(), import_profile_photo(), import_xchan(), info(), insert_hook(), is_developer(), is_public_profile(), is_site_admin(), item_message_id(), item_photo_menu(), item_redir_and_replace_images(), item_store(), item_store_update(), items_fetch(), load_contact_links(), load_hooks(), local_dir_update(), login(), FKOAuth1\loginUser(), manage_content(), map_scope(), menu_add_item(), menu_edit_item(), nav_set_selected(), new_contact(), notice(), notification(), notifier_run(), oembed_fetch_url(), oembed_format_object(), oembed_iframe(), onedirsync_run(), onepoll_run(), page_content(), parse_app_description(), photos_album_widget(), photos_content(), ping_init(), poco_load(), poller_run(), post_activity_item(), preg_heart(), prepare_body(), proc_run(), process_delivery(), profile_activity(), profile_sidebar(), public_permissions_sql(), register_page_template(), replace_macros(), rmagic_init(), rpost_callback(), scale_external_images(), scrape_feed(), scrape_vcard(), search(), searchbox(), send_message(), send_reg_approval_email(), send_status_notifications(), send_verification_email(), service_class_allows(), service_class_fetch(), smilies(), tag_deliver(), tgroup_check(), theme_include(), tryzrlvideo(), tt(), update_suggestions(), user_allow(), user_approve(), vcard_from_xchan(), verify_email_address(), wfinger_init(), what_next(), widget_archive(), widget_categories(), widget_chatroom_list(), widget_collections(), widget_design_tools(), widget_filer(), widget_follow(), widget_fullprofile(), widget_mailmenu(), widget_menu_preview(), widget_photo_albums(), widget_profile(), widget_savedsearch(), widget_settings_menu(), widget_tagcloud(), widget_tagcloud_wall(), widget_vcard(), z_fetch_url(), and zot_finger().

                +

                Referenced by FriendicaSmarty\__construct(), FriendicaSmartyEngine\__construct(), abook_toggle_flag(), account_remove(), allowed_public_recips(), api_apply_template(), api_format_items(), api_get_user(), api_statuses_home_timeline(), api_statuses_repeat(), api_statuses_user_timeline(), api_user(), app_render(), app_store(), argc(), argv(), atom_entry(), authenticate_success(), avatar_img(), bbcode(), best_link_url(), blogtheme_imgurl(), build_sync_packet(), call_hooks(), can_comment_on_post(), categories_widget(), change_channel(), channel_remove(), check_form_security_token(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), check_htaccess(), cli_suggest_run(), comanche_get_channel_id(), comanche_replace_region(), comanche_widget(), common_friends_visitor_widget(), connedit_content(), contact_block(), contact_select(), create_identity(), current_theme(), deliver_run(), design_tools(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_like(), diaspora_message(), diaspora_msg_build(), diaspora_photo(), diaspora_post(), diaspora_profile(), diaspora_pubmsg_build(), diaspora_request(), diaspora_reshare(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_retraction(), diaspora_send_status(), diaspora_share(), diaspora_transmit(), diaspora_unshare(), dir_tagblock(), dirsearch_content(), drop_item(), editpost_content(), event_store_item(), externals_run(), fileas_widget(), findpeople_widget(), fix_attached_photo_permissions(), fix_private_photos(), format_event_diaspora(), RedBrowser\generateDirectoryIndex(), get_account_id(), get_best_language(), get_birthdays(), get_events(), get_feed_for(), get_form_security_token(), FriendicaSmartyEngine\get_intltext_template(), get_intltext_template(), get_markup_template(), get_observer_hash(), get_plink(), get_theme_config_file(), get_theme_screenshot(), gprobe_run(), group_select(), guess_image_type(), handle_tag(), head_add_css(), head_add_js(), head_get_css(), head_get_js(), head_remove_css(), head_remove_js(), identity_selector(), import_channel_photo(), import_directory_profile(), import_post(), import_profile_photo(), import_xchan(), info(), insert_hook(), is_developer(), is_public_profile(), is_site_admin(), item_message_id(), item_photo_menu(), item_redir_and_replace_images(), item_store(), item_store_update(), items_fetch(), load_contact_links(), load_hooks(), local_dir_update(), login(), FKOAuth1\loginUser(), manage_content(), map_scope(), menu_add_item(), menu_edit_item(), nav_set_selected(), new_contact(), notice(), notification(), notifier_run(), oembed_fetch_url(), oembed_format_object(), oembed_iframe(), onedirsync_run(), onepoll_run(), page_content(), parse_app_description(), photos_album_widget(), photos_content(), ping_init(), poco_load(), poller_run(), post_activity_item(), preg_heart(), prepare_body(), proc_run(), process_delivery(), profile_activity(), profile_sidebar(), public_permissions_sql(), register_page_template(), replace_macros(), rmagic_init(), rpost_callback(), scale_external_images(), scrape_feed(), scrape_vcard(), search(), searchbox(), send_message(), send_reg_approval_email(), send_status_notifications(), send_verification_email(), service_class_allows(), service_class_fetch(), smilies(), tag_deliver(), tgroup_check(), theme_include(), tryzrlvideo(), tt(), update_suggestions(), user_allow(), user_approve(), vcard_from_xchan(), verify_email_address(), wfinger_init(), what_next(), widget_archive(), widget_categories(), widget_chatroom_list(), widget_collections(), widget_design_tools(), widget_filer(), widget_follow(), widget_fullprofile(), widget_mailmenu(), widget_menu_preview(), widget_photo_albums(), widget_profile(), widget_savedsearch(), widget_settings_menu(), widget_tagcloud(), widget_tagcloud_wall(), widget_vcard(), z_fetch_url(), and zot_finger().

                @@ -1093,7 +1093,7 @@ Variables
                -

                Referenced by account_remove(), admin_page_channels(), admin_page_channels_post(), admin_page_dbsync(), admin_page_hubloc(), admin_page_hubloc_post(), admin_page_logs_post(), admin_page_plugins(), admin_page_site_post(), admin_page_themes(), admin_page_users(), admin_page_users_post(), admin_post(), api_content(), appman_post(), authenticate_success(), channel_content(), channel_remove(), chanview_content(), chat_content(), chat_post(), chatsvc_content(), check_form_security_token_redirectOnErr(), connect_post(), connections_post(), connedit_content(), connedit_post(), delegate_content(), directory_content(), display_content(), drop_item(), events_post(), filerm_content(), filestorage_content(), filestorage_post(), follow_init(), group_content(), group_post(), home_init(), import_post(), item_post(), login_content(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_post(), manage_content(), menu_content(), menu_post(), message_content(), mitem_content(), mitem_post(), mood_init(), network_content(), new_channel_post(), new_contact(), notifications_post(), notify_init(), openid_content(), pdledit_post(), photos_post(), post_init(), profile_photo_post(), profiles_init(), randprof_init(), rbmark_content(), rbmark_post(), register_post(), removeaccount_content(), removeme_content(), rmagic_init(), rmagic_post(), rpost_content(), search_content(), settings_post(), sources_content(), sources_post(), sslify_init(), tagrm_content(), tagrm_post(), toggle_mobile_init(), toggle_safesearch_init(), wfinger_init(), xref_init(), and zid_init().

                +

                Referenced by account_remove(), admin_page_channels(), admin_page_channels_post(), admin_page_dbsync(), admin_page_hubloc(), admin_page_hubloc_post(), admin_page_logs_post(), admin_page_plugins(), admin_page_profs(), admin_page_profs_post(), admin_page_site_post(), admin_page_themes(), admin_page_users(), admin_page_users_post(), admin_post(), api_content(), appman_post(), authenticate_success(), channel_content(), channel_remove(), chanview_content(), chat_content(), chat_post(), chatsvc_content(), check_form_security_token_redirectOnErr(), connect_post(), connections_post(), connedit_content(), connedit_post(), delegate_content(), directory_content(), display_content(), drop_item(), events_post(), filerm_content(), filestorage_content(), filestorage_post(), follow_init(), group_content(), group_post(), home_init(), import_post(), item_post(), login_content(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_post(), manage_content(), menu_content(), menu_post(), message_content(), mitem_content(), mitem_post(), mood_init(), network_content(), new_channel_post(), new_contact(), notifications_post(), notify_init(), openid_content(), pdledit_post(), photos_post(), post_init(), profile_photo_post(), profiles_init(), randprof_init(), rbmark_content(), rbmark_post(), register_post(), removeaccount_content(), removeme_content(), rmagic_init(), rmagic_post(), rpost_content(), search_content(), settings_post(), sources_content(), sources_post(), sslify_init(), tagrm_content(), tagrm_post(), toggle_mobile_init(), toggle_safesearch_init(), wfinger_init(), xref_init(), and zid_init().

                @@ -1314,7 +1314,7 @@ Variables
                -

                Referenced by account_remove(), achievements_content(), admin_content(), admin_page_channels(), admin_page_channels_post(), admin_page_hubloc(), admin_page_plugins(), admin_page_themes(), admin_page_users(), admin_page_users_post(), api_content(), api_post(), appman_content(), appman_post(), attach_init(), block_content(), blocks_content(), bookmarks_content(), channel_content(), channel_init(), chanview_content(), chat_content(), chat_init(), chatroom_enter(), check_form_security_token_redirectOnErr(), common_content(), common_init(), connect_init(), connect_post(), connections_content(), connections_post(), connedit_content(), connedit_post(), delegate_content(), directory_content(), dirprofile_init(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), filestorage_content(), filestorage_post(), follow_init(), fsuggest_content(), fsuggest_post(), group_add(), group_content(), group_post(), hcard_init(), home_content(), import_content(), import_post(), importelm_post(), invite_content(), invite_post(), item_content(), item_post(), layouts_content(), like_content(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_post(), manage_content(), match_content(), menu_content(), menu_post(), message_content(), mitem_content(), mitem_init(), mitem_post(), mood_content(), network_content(), network_init(), new_channel_content(), new_channel_post(), notifications_content(), notifications_post(), oexchange_content(), openid_content(), page_content(), pdledit_content(), photos_content(), photos_post(), poke_content(), post_init(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), register_content(), register_post(), regmod_content(), removeaccount_post(), removeme_post(), rmagic_post(), search_content(), settings_post(), sources_content(), sources_post(), subthread_content(), suggest_content(), thing_content(), thing_init(), user_deny(), viewconnections_content(), viewsrc_content(), wall_attach_post(), wall_upload_post(), webpages_content(), and xchan_content().

                +

                Referenced by account_remove(), achievements_content(), admin_content(), admin_page_channels(), admin_page_channels_post(), admin_page_hubloc(), admin_page_plugins(), admin_page_profs(), admin_page_themes(), admin_page_users(), admin_page_users_post(), api_content(), api_post(), appman_content(), appman_post(), attach_init(), block_content(), blocks_content(), bookmarks_content(), channel_content(), channel_init(), chanview_content(), chat_content(), chat_init(), chatroom_enter(), check_form_security_token_redirectOnErr(), common_content(), common_init(), connect_init(), connect_post(), connections_content(), connections_post(), connedit_content(), connedit_post(), delegate_content(), directory_content(), dirprofile_init(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), filestorage_content(), filestorage_post(), follow_init(), fsuggest_content(), fsuggest_post(), group_add(), group_content(), group_post(), hcard_init(), home_content(), import_content(), import_post(), importelm_post(), invite_content(), invite_post(), item_content(), item_post(), layouts_content(), like_content(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_post(), manage_content(), match_content(), menu_content(), menu_post(), message_content(), mitem_content(), mitem_init(), mitem_post(), mood_content(), network_content(), network_init(), new_channel_content(), new_channel_post(), notifications_content(), notifications_post(), oexchange_content(), openid_content(), page_content(), pdledit_content(), photos_content(), photos_post(), poke_content(), post_init(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), register_content(), register_post(), regmod_content(), removeaccount_post(), removeme_post(), rmagic_post(), search_content(), settings_post(), sources_content(), sources_post(), subthread_content(), suggest_content(), thing_content(), thing_init(), user_deny(), viewconnections_content(), viewsrc_content(), wall_attach_post(), wall_upload_post(), webpages_content(), and xchan_content().

                @@ -1370,7 +1370,7 @@ Variables

                e.g.: proc_run("ls","-la","/tmp");

                $cmd and string args are surrounded with ""

                -

                Referenced by admin_page_channels_post(), build_sync_packet(), channel_remove(), connect_post(), connections_post(), connedit_content(), connedit_post(), create_identity(), diaspora_like(), diaspora_signed_retraction(), directory_run(), drop_item(), drop_items(), events_post(), fix_system_urls(), follow_init(), fsuggest_post(), import_post(), item_post(), like_content(), mail_content(), mood_init(), new_contact(), notifier_run(), photo_upload(), photos_post(), poller_run(), post_activity_item(), process_delivery(), profile_activity(), profile_photo_post(), profiles_post(), send_message(), settings_post(), start_delivery_chain(), tag_deliver(), tagger_content(), zid_init(), and zot_refresh().

                +

                Referenced by admin_page_channels_post(), build_sync_packet(), channel_remove(), connect_post(), connections_post(), connedit_content(), connedit_post(), create_identity(), diaspora_comment(), diaspora_like(), diaspora_signed_retraction(), diaspora_transmit(), directory_run(), drop_item(), drop_items(), events_post(), fix_system_urls(), follow_init(), fsuggest_post(), import_post(), item_post(), like_content(), mail_content(), mood_init(), new_contact(), notifier_run(), photo_upload(), photos_post(), poller_run(), post_activity_item(), process_delivery(), profile_activity(), profile_photo_post(), profiles_post(), send_message(), settings_post(), start_delivery_chain(), tag_deliver(), tagger_content(), zid_init(), and zot_refresh().

                @@ -1448,7 +1448,7 @@ Variables
                -

                Referenced by FriendicaSmarty\__construct(), App\__construct(), acl_init(), admin_page_channels_post(), admin_page_logs_post(), admin_page_plugins(), admin_page_site(), admin_page_site_post(), admin_page_themes(), admin_page_users_post(), api_content(), api_direct_messages_box(), api_direct_messages_new(), api_favorites(), api_format_messages(), api_get_user(), api_login(), api_post(), api_statuses_f(), api_statuses_home_timeline(), api_statuses_mentions(), api_statuses_public_timeline(), api_statuses_show(), api_statuses_update(), api_statuses_user_timeline(), api_user(), app_store(), app_update(), attach_store(), authenticate_success(), bbcode(), bbtoevent(), best_link_url(), bookmark_add(), App\build_pagehead(), channel_content(), chatsvc_content(), check_form_security_token(), cloud_init(), connections_content(), connections_post(), connedit_content(), construct_page(), consume_feed(), conversation(), create_account(), create_identity(), current_theme(), current_theme_url(), del_pconfig(), del_xconfig(), delegate_content(), detect_language(), diaspora_asphoto(), diaspora_conversation(), diaspora_like(), diaspora_message(), diaspora_reshare(), directory_content(), dirprofile_init(), dirsearch_content(), display_content(), encode_rel_links(), event_addtocal(), events_content(), events_post(), feed_init(), filerm_content(), filestorage_post(), get_atom_elements(), get_browser_language(), get_item_elements(), get_my_address(), get_my_url(), get_plink(), get_public_feed(), Item\get_template_data(), group_add(), group_rmv(), group_side(), home_content(), import_post(), import_xchan(), info(), invite_post(), item_post(), item_store(), item_store_update(), lang_selector(), load_contact_links(), local_user(), lostpass_content(), magic_init(), mail_content(), mail_post(), mail_store(), mood_content(), mood_init(), nav(), navbar_complete(), network_content(), new_channel_content(), new_cookie(), notice(), oexchange_content(), openid_content(), parse_url_content(), photo_upload(), photos_content(), photos_post(), ping_init(), poco_init(), poco_load(), poke_content(), poke_init(), post_activity_item(), post_init(), printable(), probe_content(), proc_run(), profile_photo_post(), profile_photo_set_profile_perms(), profile_sidebar(), profiles_post(), rbmark_content(), rbmark_post(), red_item_new(), ref_session_read(), register_content(), register_post(), App\register_template_engine(), regmod_content(), remote_user(), removeaccount_post(), removeme_post(), rpost_content(), scrape_feed(), script_path(), search_ac_init(), search_content(), search_init(), service_class_allows(), service_class_fetch(), App\set_baseurl(), settings_post(), setup_content(), setup_init(), siteinfo_init(), suggest_init(), t(), tagrm_post(), App\template_engine(), tt(), validate_channelname(), wall_upload_post(), webfinger_content(), wfinger_init(), widget_affinity(), widget_categories(), widget_filer(), widget_savedsearch(), widget_tagcloud(), xchan_content(), z_fetch_url(), z_post_url(), and zfinger_init().

                +

                Referenced by FriendicaSmarty\__construct(), App\__construct(), acl_init(), admin_page_channels_post(), admin_page_logs_post(), admin_page_plugins(), admin_page_site(), admin_page_site_post(), admin_page_themes(), admin_page_users_post(), api_content(), api_direct_messages_box(), api_direct_messages_new(), api_favorites(), api_format_messages(), api_get_user(), api_login(), api_post(), api_statuses_f(), api_statuses_home_timeline(), api_statuses_mentions(), api_statuses_public_timeline(), api_statuses_show(), api_statuses_update(), api_statuses_user_timeline(), api_user(), app_store(), app_update(), attach_store(), authenticate_success(), bbcode(), bbtoevent(), best_link_url(), bookmark_add(), App\build_pagehead(), channel_content(), chatsvc_content(), check_form_security_token(), cloud_init(), connections_content(), connections_post(), connedit_content(), construct_page(), consume_feed(), conversation(), create_account(), create_identity(), current_theme(), current_theme_url(), del_pconfig(), del_xconfig(), delegate_content(), detect_language(), diaspora_asphoto(), diaspora_conversation(), diaspora_like(), diaspora_message(), directory_content(), dirprofile_init(), dirsearch_content(), display_content(), encode_rel_links(), event_addtocal(), events_content(), events_post(), feed_init(), filerm_content(), filestorage_post(), get_atom_elements(), get_browser_language(), get_item_elements(), get_my_address(), get_my_url(), get_plink(), get_public_feed(), Item\get_template_data(), group_add(), group_rmv(), group_side(), home_content(), import_post(), import_xchan(), info(), invite_post(), item_post(), item_store(), item_store_update(), lang_selector(), load_contact_links(), local_user(), lostpass_content(), magic_init(), mail_content(), mail_post(), mail_store(), mood_content(), mood_init(), nav(), navbar_complete(), network_content(), new_channel_content(), new_cookie(), notice(), oexchange_content(), openid_content(), parse_url_content(), photo_upload(), photos_content(), photos_post(), ping_init(), poco_init(), poco_load(), poke_content(), poke_init(), post_activity_item(), post_init(), printable(), probe_content(), proc_run(), profile_photo_post(), profile_photo_set_profile_perms(), profile_sidebar(), profiles_post(), rbmark_content(), rbmark_post(), red_item_new(), ref_session_read(), register_content(), register_post(), App\register_template_engine(), regmod_content(), remote_user(), removeaccount_post(), removeme_post(), rpost_content(), scrape_feed(), script_path(), search_ac_init(), search_content(), search_init(), service_class_allows(), service_class_fetch(), App\set_baseurl(), settings_post(), setup_content(), setup_init(), siteinfo_init(), suggest_init(), t(), tagrm_post(), App\template_engine(), tt(), validate_channelname(), wall_upload_post(), webfinger_content(), wfinger_init(), widget_affinity(), widget_categories(), widget_filer(), widget_savedsearch(), widget_tagcloud(), xchan_content(), z_fetch_url(), z_post_url(), and zfinger_init().

                @@ -1482,7 +1482,7 @@ Variables
                -

                Referenced by admin_content(), allowed_public_recips(), app_render(), app_store(), app_update(), appman_post(), authenticate_success(), bb_parse_crypt(), bbcode(), blocks_content(), chanlink_cid(), chanlink_hash(), chanlink_url(), channel_content(), channel_remove(), chat_content(), chat_post(), chatsvc_content(), check_config(), connect_post(), connections_content(), connections_post(), conversation(), create_identity(), deliver_run(), diaspora_request(), directory_content(), dirprofile_init(), display_content(), event_store_item(), externals_run(), filestorage_content(), find_upstream_directory(), follow_init(), format_categories(), format_filer(), get_parent_cloudpath(), RedBrowser\getAssetUrl(), group_post(), handle_tag(), App\head_get_icon(), head_get_icon(), home_init(), hostxrd_init(), import_post(), import_xchan(), invite_content(), item_photo_menu(), item_post(), item_store(), layouts_content(), like_content(), login_content(), lostpass_content(), lostpass_post(), magic_init(), magiclink_url(), mail_post(), manage_content(), menu_content(), menu_post(), mitem_content(), mitem_post(), mood_init(), nav(), navbar_complete(), network_content(), new_channel_post(), notification(), notifications_post(), notifier_run(), openid_content(), pagelist_widget(), parse_app_description(), pdledit_post(), photo_upload(), photos_album_widget(), photos_albums_list(), photos_create_item(), photos_list_photos(), poll_content(), post_activity_item(), post_init(), post_post(), profile_activity(), profile_sidebar(), public_recips(), pubsites_content(), rbmark_content(), rbmark_post(), register_post(), removeaccount_content(), removeme_content(), rmagic_init(), rmagic_post(), rpost_content(), script_path(), search_content(), searchbox(), send_reg_approval_email(), send_verification_email(), setup_content(), setup_post(), siteinfo_content(), siteinfo_init(), sources_content(), sources_post(), sslify(), sync_directories(), tagger_content(), theme_attachments(), thing_init(), toggle_safesearch_init(), update_suggestions(), user_allow(), vcard_from_xchan(), verify_email_address(), webpages_content(), wfinger_init(), widget_archive(), widget_chatroom_list(), widget_dirtags(), widget_filer(), widget_savedsearch(), widget_suggestions(), xref_init(), zfinger_init(), zid_init(), zot_build_packet(), zot_fetch(), zot_new_uid(), and zot_refresh().

                +

                Referenced by admin_content(), admin_page_profs(), admin_page_profs_post(), allowed_public_recips(), app_render(), app_store(), app_update(), appman_post(), authenticate_success(), bb_parse_crypt(), bbcode(), blocks_content(), chanlink_cid(), chanlink_hash(), chanlink_url(), channel_content(), channel_remove(), chat_content(), chat_post(), chatsvc_content(), check_config(), connect_post(), connections_content(), connections_post(), conversation(), create_identity(), deliver_run(), diaspora_comment(), diaspora_post(), diaspora_request(), diaspora_reshare(), directory_content(), dirprofile_init(), discover_by_webbie(), display_content(), event_store_item(), externals_run(), filestorage_content(), find_upstream_directory(), follow_init(), format_categories(), format_filer(), get_parent_cloudpath(), RedBrowser\getAssetUrl(), group_post(), handle_tag(), App\head_get_icon(), head_get_icon(), home_init(), hostxrd_init(), import_post(), import_xchan(), invite_content(), item_photo_menu(), item_post(), item_store(), layouts_content(), like_content(), login_content(), lostpass_content(), lostpass_post(), magic_init(), magiclink_url(), mail_post(), manage_content(), menu_content(), menu_post(), mitem_content(), mitem_post(), mood_init(), nav(), navbar_complete(), network_content(), new_channel_post(), notification(), notifications_post(), notifier_run(), openid_content(), pagelist_widget(), parse_app_description(), pdledit_post(), photo_upload(), photos_album_widget(), photos_albums_list(), photos_create_item(), photos_list_photos(), poll_content(), post_activity_item(), post_init(), post_post(), profile_activity(), profile_sidebar(), public_recips(), pubsites_content(), rbmark_content(), rbmark_post(), register_post(), removeaccount_content(), removeme_content(), rmagic_init(), rmagic_post(), rpost_content(), script_path(), search_content(), searchbox(), send_reg_approval_email(), send_verification_email(), setup_content(), setup_post(), siteinfo_content(), siteinfo_init(), sources_content(), sources_post(), sslify(), sync_directories(), tagger_content(), theme_attachments(), thing_init(), toggle_safesearch_init(), update_suggestions(), user_allow(), vcard_from_xchan(), verify_email_address(), webpages_content(), wfinger_init(), widget_archive(), widget_chatroom_list(), widget_dirtags(), widget_filer(), widget_savedsearch(), widget_suggestions(), xref_init(), zfinger_init(), zid_init(), zot_build_packet(), zot_fetch(), zot_new_uid(), and zot_refresh().

                @@ -1520,7 +1520,7 @@ Variables @@ -1534,7 +1534,7 @@ Variables @@ -1562,7 +1562,7 @@ Variables @@ -1813,7 +1813,7 @@ Variables @@ -2080,7 +2080,7 @@ Variables @@ -2278,7 +2278,7 @@ Variables
                - +
                const DB_UPDATE_VERSION 1123const DB_UPDATE_VERSION 1128
                @@ -2366,7 +2366,7 @@ Variables
                @@ -2436,7 +2436,7 @@ Variables
                -

                Referenced by account_remove(), achievements_content(), admin_page_channels(), admin_page_dbsync(), admin_page_hubloc(), admin_page_site_post(), admin_page_users(), api_content(), api_post(), appman_content(), appman_post(), attach_init(), block_content(), blocks_content(), bookmarks_content(), bookmarks_init(), channel_content(), channel_init(), chanview_content(), chat_content(), chat_init(), chatroom_enter(), check_account_email(), check_account_invite(), check_form_security_std_err_msg(), check_htaccess(), check_keys(), check_php(), check_smarty3(), check_store(), common_content(), common_init(), connect_init(), connections_content(), connections_post(), connedit_content(), connedit_post(), delegate_content(), directory_content(), dirprofile_init(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), filestorage_content(), filestorage_post(), follow_init(), format_like(), fsuggest_content(), fsuggest_post(), group_add(), group_content(), group_post(), hcard_init(), home_content(), import_post(), import_xchan(), importelm_post(), invite_content(), invite_post(), item_content(), item_post(), layouts_content(), like_content(), load_database(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_post(), manage_content(), match_content(), menu_content(), menu_post(), message_content(), mitem_content(), mitem_init(), mitem_post(), mood_content(), network_content(), network_init(), new_channel_content(), new_channel_post(), notifications_content(), notifications_post(), oexchange_content(), openid_content(), page_content(), pdledit_content(), pdledit_post(), photos_content(), photos_post(), poke_content(), post_init(), post_post(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), pubsites_content(), register_content(), register_post(), regmod_content(), removeaccount_post(), removeme_post(), rmagic_post(), search_content(), settings_post(), setup_content(), sources_content(), sources_post(), subthread_content(), suggest_content(), tagrm_post(), thing_content(), thing_init(), user_allow(), user_approve(), user_deny(), viewconnections_content(), viewsrc_content(), wall_attach_post(), wall_upload_post(), webpages_content(), and xchan_content().

                +

                Referenced by account_remove(), achievements_content(), admin_page_channels(), admin_page_dbsync(), admin_page_hubloc(), admin_page_profs(), admin_page_site_post(), admin_page_users(), api_content(), api_post(), appman_content(), appman_post(), attach_init(), block_content(), blocks_content(), bookmarks_content(), bookmarks_init(), channel_content(), channel_init(), chanview_content(), chat_content(), chat_init(), chatroom_enter(), check_account_email(), check_account_invite(), check_form_security_std_err_msg(), check_htaccess(), check_keys(), check_php(), check_smarty3(), check_store(), common_content(), common_init(), connect_init(), connections_content(), connections_post(), connedit_content(), connedit_post(), delegate_content(), directory_content(), dirprofile_init(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), filestorage_content(), filestorage_post(), follow_init(), format_like(), fsuggest_content(), fsuggest_post(), group_add(), group_content(), group_post(), hcard_init(), home_content(), import_post(), import_xchan(), importelm_post(), invite_content(), invite_post(), item_content(), item_post(), layouts_content(), like_content(), load_database(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_post(), manage_content(), match_content(), menu_content(), menu_post(), message_content(), mitem_content(), mitem_init(), mitem_post(), mood_content(), network_content(), network_init(), new_channel_content(), new_channel_post(), notifications_content(), notifications_post(), oexchange_content(), openid_content(), page_content(), pdledit_content(), pdledit_post(), photos_content(), photos_post(), poke_content(), post_init(), post_post(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), pubsites_content(), register_content(), register_post(), regmod_content(), removeaccount_post(), removeme_post(), rmagic_post(), search_content(), settings_post(), setup_content(), sources_content(), sources_post(), subthread_content(), suggest_content(), tagrm_post(), thing_content(), thing_init(), user_allow(), user_approve(), user_deny(), viewconnections_content(), viewsrc_content(), wall_attach_post(), wall_upload_post(), webpages_content(), and xchan_content().

                @@ -2517,7 +2517,7 @@ Variables @@ -2663,7 +2663,7 @@ Variables @@ -2761,7 +2761,7 @@ Variables @@ -2776,7 +2776,7 @@ Variables @@ -2870,7 +2870,7 @@ Variables @@ -2898,7 +2898,7 @@ Variables @@ -3053,7 +3053,7 @@ Variables
                -

                Referenced by RedDirectory\__construct(), RedFile\__construct(), admin_page_logs(), build_sync_packet(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), RedDirectory\childExists(), consume_feed(), RedDirectory\createFile(), deliver_run(), detect_language(), diaspora_msg_build(), diaspora_pubmsg_build(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_status(), dir_parse_query(), directory_content(), dirprofile_init(), encode_item(), fetch_xrd_links(), find_diaspora_person_by_handle(), fix_private_photos(), get_atom_elements(), RedDirectory\getChild(), RedDirectory\getChildren(), RedDirectory\getDir(), RedDirectory\getName(), import_xchan(), item_post(), item_store(), item_store_update(), RedDirectory\log(), RedBasicAuth\log(), magic_init(), mail_post(), mail_store(), mini_group_select(), new_contact(), notifier_run(), old_webfinger(), onepoll_run(), openid_content(), parse_xml_string(), photos_post(), ping_init(), poco_load(), post_post(), public_recips(), receive_post(), RedChannelList(), RedCollectionData(), RedDirectory\setName(), sync_directories(), tag_deliver(), tgroup_check(), update_directory_entry(), update_feed_item(), xml2array(), z_fetch_url(), z_post_url(), zot_build_packet(), zot_fetch(), zot_import(), zot_process_response(), zot_refresh(), and zot_register_hub().

                +

                Referenced by RedDirectory\__construct(), RedFile\__construct(), admin_page_logs(), build_sync_packet(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), RedDirectory\childExists(), consume_feed(), RedDirectory\createFile(), deliver_run(), detect_language(), diaspora_msg_build(), diaspora_pubmsg_build(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_status(), dir_parse_query(), directory_content(), dirprofile_init(), encode_item(), fetch_xrd_links(), find_diaspora_person_by_handle(), fix_private_photos(), get_atom_elements(), RedDirectory\getChild(), RedDirectory\getChildren(), RedDirectory\getDir(), RedDirectory\getName(), import_xchan(), item_post(), item_store(), item_store_update(), RedDirectory\log(), RedBasicAuth\log(), magic_init(), mail_post(), mail_store(), mini_group_select(), new_contact(), notifier_run(), old_webfinger(), onepoll_run(), openid_content(), parse_xml_string(), photos_post(), ping_init(), poco_load(), post_post(), public_recips(), receive_post(), RedChannelList(), RedCollectionData(), RedDirectory\setName(), sync_directories(), tag_deliver(), tgroup_check(), update_directory_entry(), update_feed_item(), xml2array(), z_fetch_url(), z_post_url(), zot_build_packet(), zot_fetch(), zot_import(), zot_process_response(), zot_refresh(), and zot_register_hub().

                @@ -3067,7 +3067,7 @@ Variables
                -

                Referenced by Item\add_child(), Conversation\add_thread(), admin_content(), admin_page_hubloc_post(), admin_page_logs(), admin_post(), api_login(), api_statuses_user_timeline(), avatar_img(), bookmark_add(), consume_feed(), conversation(), RedDirectory\createDirectory(), RedDirectory\createFile(), RedFile\delete(), delete_imported_item(), deliver_run(), diaspora_conversation(), diaspora_decode(), diaspora_dispatch(), diaspora_handle_from_contact(), diaspora_message(), diaspora_photo(), diaspora_reshare(), diaspora_send_status(), directory_content(), directory_run(), dirprofile_init(), expire_run(), externals_run(), fetch_lrdd_template(), fix_private_photos(), RedFile\get(), get_diaspora_key(), get_language_name(), Conversation\get_template_data(), RedDirectory\getDir(), RedFile\getName(), group_content(), guess_image_type(), import_author_rss(), import_author_zot(), import_channel_photo(), import_directory_profile(), import_profile_photo(), import_xchan(), item_post(), item_store(), item_store_update(), like_content(), limit_body_size(), load_plugin(), local_dir_update(), FKOAuth1\loginUser(), magic_init(), mail_store(), mood_init(), new_contact(), notes_init(), notification(), notifier_run(), parse_url_content(), photo_upload(), photos_post(), poco_init(), poco_load(), poke_init(), post_post(), process_delivery(), process_profile_delivery(), profile_load(), RedFile\put(), receive_post(), RedFileData(), Item\remove_child(), scale_external_images(), scrape_feed(), enotify\send(), Conversation\set_mode(), RedFile\setName(), stream_perms_api_uids(), stream_perms_xchans(), tag_deliver(), unload_plugin(), z_fetch_url(), z_post_url(), zot_feed(), zot_finger(), zot_gethub(), zot_register_hub(), and zotfeed_init().

                +

                Referenced by Item\add_child(), Conversation\add_thread(), admin_content(), admin_page_hubloc_post(), admin_page_logs(), admin_post(), api_login(), api_statuses_user_timeline(), avatar_img(), bookmark_add(), consume_feed(), conversation(), RedDirectory\createDirectory(), RedDirectory\createFile(), RedFile\delete(), delete_imported_item(), deliver_run(), diaspora_conversation(), diaspora_decode(), diaspora_dispatch(), diaspora_handle_from_contact(), diaspora_message(), diaspora_photo(), diaspora_reshare(), diaspora_transmit(), directory_content(), directory_run(), dirprofile_init(), discover_by_webbie(), expire_run(), externals_run(), fetch_lrdd_template(), fix_private_photos(), RedFile\get(), get_diaspora_key(), get_language_name(), Conversation\get_template_data(), RedDirectory\getDir(), RedFile\getName(), group_content(), guess_image_type(), import_author_rss(), import_author_zot(), import_channel_photo(), import_directory_profile(), import_profile_photo(), import_xchan(), item_post(), item_store(), item_store_update(), like_content(), limit_body_size(), load_plugin(), local_dir_update(), FKOAuth1\loginUser(), magic_init(), mail_store(), mood_init(), new_contact(), notes_init(), notification(), notifier_run(), parse_url_content(), photo_upload(), photos_post(), poco_init(), poco_load(), poke_init(), post_post(), process_delivery(), process_profile_delivery(), profile_load(), RedFile\put(), queue_run(), receive_post(), RedFileData(), Item\remove_child(), scale_external_images(), scrape_feed(), enotify\send(), Conversation\set_mode(), RedFile\setName(), stream_perms_api_uids(), stream_perms_xchans(), tag_deliver(), unload_plugin(), z_fetch_url(), z_post_url(), zot_feed(), zot_finger(), zot_gethub(), zot_register_hub(), and zotfeed_init().

                @@ -3334,7 +3334,7 @@ Variables
                -

                Referenced by get_atom_elements().

                +

                Referenced by discover_by_webbie(), and get_atom_elements().

                @@ -3348,6 +3348,8 @@ Variables
                +

                Referenced by discover_by_webbie().

                +
                @@ -3510,7 +3512,7 @@ Variables @@ -3715,7 +3717,7 @@ Variables @@ -4072,7 +4074,7 @@ Variables
                -

                Referenced by get_perms(), and get_role_perms().

                +

                Referenced by diaspora_request(), get_perms(), and get_role_perms().

                @@ -4086,7 +4088,7 @@ Variables
                -

                Referenced by get_perms(), and get_role_perms().

                +

                Referenced by diaspora_request(), get_perms(), and get_role_perms().

                @@ -4114,7 +4116,7 @@ Variables
                -

                Referenced by get_perms(), and get_role_perms().

                +

                Referenced by diaspora_request(), get_perms(), and get_role_perms().

                @@ -4157,7 +4159,7 @@ Variables @@ -4619,7 +4621,7 @@ Variables @@ -4633,7 +4635,7 @@ Variables @@ -4695,7 +4697,7 @@ Variables diff --git a/doc/html/crypto_8php.html b/doc/html/crypto_8php.html index de1976f8e..8110477ff 100644 --- a/doc/html/crypto_8php.html +++ b/doc/html/crypto_8php.html @@ -254,7 +254,7 @@ Functions @@ -282,7 +282,7 @@ Functions @@ -316,7 +316,7 @@ Functions @@ -344,7 +344,7 @@ Functions @@ -598,7 +598,7 @@ Functions @@ -738,7 +738,7 @@ Functions @@ -796,6 +796,8 @@ Functions
                +

                Referenced by discover_by_webbie().

                +
                diff --git a/doc/html/datetime_8php.html b/doc/html/datetime_8php.html index 19c6fe448..a4e987b31 100644 --- a/doc/html/datetime_8php.html +++ b/doc/html/datetime_8php.html @@ -336,7 +336,7 @@ Functions
                -

                Referenced by abook_toggle_flag(), account_verify_password(), advanced_profile(), age(), api_account_rate_limit_status(), api_date(), api_rss_extra(), atom_entry(), attach_delete(), attach_mkdir(), attach_store(), authenticate_success(), build_sync_packet(), cal(), channel_content(), channel_remove(), chat_message(), chatroom_create(), chatroom_enter(), chatsvc_content(), chatsvc_post(), Cache\clear(), consume_feed(), conversation(), create_account(), create_identity(), RedDirectory\createFile(), cronhooks_run(), delete_item_lowlevel(), deliver_run(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_message(), diaspora_post(), diaspora_profile(), diaspora_request(), diaspora_reshare(), diaspora_retraction(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_status(), diaspora_signed_retraction(), directory_run(), dirsearch_content(), dlogger(), dob(), editpost_content(), ev_compare(), event_store_event(), events_content(), events_post(), externals_run(), first_post_date(), fix_system_urls(), format_event_diaspora(), format_event_html(), fsuggest_post(), RedBrowser\generateDirectoryIndex(), get_atom_elements(), get_birthdays(), get_events(), get_feed_for(), get_first_dim(), get_item_elements(), get_mail_elements(), get_profile_elements(), get_public_feed(), Item\get_template_data(), RedDirectory\getLastModified(), RedFile\getLastModified(), import_author_rss(), import_directory_profile(), import_post(), import_site(), import_xchan(), invite_post(), item_post(), item_store(), item_store_update(), items_fetch(), like_content(), list_post_dates(), logger(), magic_init(), mail_content(), mail_post(), mail_store(), manage_content(), message_content(), network_content(), new_contact(), notification(), notifier_run(), onepoll_run(), openid_content(), pagelist_widget(), photo_upload(), photos_post(), ping_init(), poco_load(), poller_run(), post_post(), posted_dates(), profile_photo_post(), profiles_content(), profiles_post(), prune_hub_reinstalls(), RedFile\put(), dba_mysql\q(), dba_mysqli\q(), queue_run(), relative_date(), removeaccount_post(), removeme_post(), photo_driver\save(), send_message(), send_reg_approval_email(), Cache\set(), settings_post(), photo_driver\store(), sync_directories(), tag_deliver(), update_birthdays(), update_directory_entry(), update_modtime(), update_queue_time(), verify_email_address(), webpages_content(), z_birthday(), zot_feed(), zot_process_response(), zot_refresh(), and zotfeed_init().

                +

                Referenced by abook_toggle_flag(), account_verify_password(), advanced_profile(), age(), api_account_rate_limit_status(), api_date(), api_rss_extra(), atom_entry(), attach_delete(), attach_mkdir(), attach_store(), authenticate_success(), build_sync_packet(), cal(), channel_content(), channel_remove(), chat_message(), chatroom_create(), chatroom_enter(), chatsvc_content(), chatsvc_post(), Cache\clear(), comments_are_now_closed(), consume_feed(), conversation(), create_account(), create_identity(), RedDirectory\createFile(), cronhooks_run(), delete_item_lowlevel(), deliver_run(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_message(), diaspora_post(), diaspora_profile(), diaspora_request(), diaspora_reshare(), diaspora_retraction(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_status(), diaspora_signed_retraction(), diaspora_transmit(), directory_run(), dirsearch_content(), discover_by_webbie(), dlogger(), dob(), editpost_content(), ev_compare(), event_store_event(), events_content(), events_post(), externals_run(), first_post_date(), fix_system_urls(), format_event_diaspora(), format_event_html(), fsuggest_post(), RedBrowser\generateDirectoryIndex(), get_atom_elements(), get_birthdays(), get_events(), get_feed_for(), get_first_dim(), get_item_elements(), get_mail_elements(), get_profile_elements(), get_public_feed(), Item\get_template_data(), RedDirectory\getLastModified(), RedFile\getLastModified(), import_author_rss(), import_directory_profile(), import_post(), import_site(), import_xchan(), invite_post(), item_post(), item_store(), item_store_update(), items_fetch(), like_content(), list_post_dates(), logger(), magic_init(), mail_content(), mail_post(), mail_store(), manage_content(), message_content(), network_content(), new_contact(), notification(), notifier_run(), onepoll_run(), openid_content(), pagelist_widget(), photo_upload(), photos_post(), ping_init(), poco_load(), poller_run(), post_post(), posted_dates(), profile_photo_post(), profiles_content(), profiles_post(), prune_hub_reinstalls(), RedFile\put(), dba_mysql\q(), dba_mysqli\q(), queue_run(), relative_date(), removeaccount_post(), removeme_post(), photo_driver\save(), send_message(), send_reg_approval_email(), Cache\set(), settings_post(), photo_driver\store(), sync_directories(), tag_deliver(), update_birthdays(), update_directory_entry(), update_modtime(), update_queue_time(), verify_email_address(), webpages_content(), z_birthday(), zot_feed(), zot_process_response(), zot_refresh(), and zotfeed_init().

                diff --git a/doc/html/dba__driver_8php.html b/doc/html/dba__driver_8php.html index f29aafa86..bec1003b1 100644 --- a/doc/html/dba__driver_8php.html +++ b/doc/html/dba__driver_8php.html @@ -202,7 +202,7 @@ Functions
                -

                Referenced by abook_toggle_flag(), account_verify_password(), achievements_content(), acl_init(), add_source_route(), admin_page_users(), advanced_profile(), allowed_public_recips(), api_direct_messages_new(), api_get_user(), api_login(), api_status_show(), api_statuses_destroy(), api_statuses_mentions(), api_user(), api_users_show(), app_destroy(), app_installed(), app_store(), app_update(), appman_content(), attach_by_hash(), attach_by_hash_nodata(), attach_change_permissions(), attach_count_files(), attach_delete(), attach_list_files(), attach_mkdir(), attach_store(), authenticate_success(), block_content(), blocks_content(), bookmark_add(), bookmarks_init(), build_sync_packet(), call_hooks(), categories_widget(), change_channel(), channel_content(), channel_remove(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), chanview_content(), chat_message(), chat_post(), chatroom_create(), chatroom_destroy(), chatroom_enter(), chatroom_leave(), chatsvc_content(), chatsvc_post(), check_account_email(), check_account_invite(), check_item_source(), check_webbie(), Cache\clear(), comanche_block(), common_friends(), connect_init(), connect_post(), connections_content(), connections_post(), connedit_post(), consume_feed(), contact_remove(), contactgroup_content(), count_common_friends(), create_account(), create_identity(), RedDirectory\createFile(), dbesc_array_cb(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_dispatch_public(), diaspora_get_contact_by_handle(), diaspora_like(), diaspora_message(), diaspora_photo(), diaspora_post(), diaspora_profile(), diaspora_request(), diaspora_reshare(), diaspora_retraction(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_relay(), diaspora_signed_retraction(), diaspora_transmit(), dir_query_build(), directory_run(), dirsearch_content(), display_content(), downgrade_accounts(), editlayout_content(), editpost_content(), editwebpage_content(), event_addtocal(), event_store_event(), event_store_item(), events_content(), events_post(), externals_run(), fbrowser_content(), feed_init(), fetch_post_tags(), file_tag_file_query(), filerm_content(), filestorage_content(), find_diaspora_person_by_handle(), find_filename_by_hash(), find_folder_hash_by_attach_hash(), RedBrowser\findAttachHash(), RedBrowser\findAttachIdByHash(), fix_attached_photo_permissions(), fix_private_photos(), fix_system_urls(), fsuggest_post(), Cache\get(), RedFile\get(), get_all_perms(), get_birthdays(), get_channel_by_nick(), get_cloudpath(), get_config_from_storage(), get_events(), get_item_elements(), get_online_status(), get_things(), RedDirectory\getDir(), RedDirectory\getLastModified(), gprobe_run(), group_add(), group_add_member(), group_byname(), group_content(), group_post(), group_rec_byhash(), group_rmv(), group_rmv_member(), groups_containing(), handle_feed(), handle_tag(), hcard_init(), home_content(), import_author_rss(), import_author_zot(), import_directory_keywords(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), invite_post(), is_matrix_url(), item_add_cid(), item_message_id(), item_permissions_sql(), item_post(), item_remove_cid(), item_store(), item_store_update(), items_fetch(), layouts_content(), like_content(), list_public_sites(), load_config(), load_plugin(), load_xconfig(), local_dir_update(), lockview_content(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_nonce(), FKOAuthDataStore\lookup_token(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_store(), manage_content(), mark_orphan_hubsxchans(), match_openid(), member_of(), menu_add_item(), menu_create(), menu_delete(), menu_edit(), menu_edit_item(), menu_fetch(), menu_list(), msearch_post(), netgrowth_content(), network_content(), FKOAuthDataStore\new_access_token(), new_contact(), new_cookie(), FKOAuthDataStore\new_request_token(), notification(), notifier_run(), notify_init(), oauth_get_client(), onedirsync_run(), onepoll_run(), openid_content(), page_content(), perm_is_allowed(), permissions_sql(), photo_init(), photo_new_resource(), photo_upload(), photos_album_exists(), photos_album_get_db_idstr(), photos_album_rename(), photos_content(), photos_list_photos(), photos_post(), ping_init(), plugin_is_installed(), poco_init(), poco_load(), poll_post(), poller_run(), post_init(), post_post(), private_messages_drop(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_init(), profile_load(), profile_photo_post(), profile_photo_set_profile_perms(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), prune_hub_reinstalls(), public_permissions_sql(), public_recips(), RedFile\put(), queue_run(), rconnect_url(), receive_post(), RedCollectionData(), RedFileData(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_hook(), register_post(), remote_online_status(), remove_all_xchan_resources(), remove_community_tag(), remove_queue_item(), rmagic_init(), rmagic_post(), rpost_content(), photo_driver\save(), search_ac_init(), search_content(), send_message(), send_reg_approval_email(), send_status_notifications(), Cache\set(), set_config(), set_pconfig(), set_xconfig(), RedDirectory\setName(), RedFile\setName(), settings_post(), siteinfo_init(), sitelist_init(), sources_content(), sources_post(), start_delivery_chain(), photo_driver\store(), store_item_tag(), stream_perms_xchans(), stringify_array_elms(), subthread_content(), suggest_init(), sync_directories(), tag_deliver(), tagger_content(), tagrm_post(), term_query(), tgroup_check(), thing_content(), thing_init(), uninstall_plugin(), unregister_hook(), update_birthdays(), update_directory_entry(), update_modtime(), update_queue_time(), update_remote_id(), user_allow(), user_approve(), user_deny(), RedBasicAuth\validateUserPass(), vcard_from_xchan(), verify_email_address(), vote_post(), webpages_content(), wfinger_init(), widget_bookmarkedchats(), widget_item(), widget_savedsearch(), xchan_content(), xchan_mail_query(), xchan_query(), xrd_init(), z_readdir(), zfinger_init(), zid_init(), zot_feed(), zot_finger(), zot_get_hublocs(), zot_gethub(), zot_process_response(), zot_refresh(), and zotfeed_init().

                +

                Referenced by abook_toggle_flag(), account_verify_password(), achievements_content(), acl_init(), add_source_route(), admin_page_profs_post(), admin_page_users(), advanced_profile(), allowed_public_recips(), api_direct_messages_new(), api_get_user(), api_login(), api_status_show(), api_statuses_destroy(), api_statuses_mentions(), api_user(), api_users_show(), app_destroy(), app_installed(), app_store(), app_update(), appman_content(), attach_by_hash(), attach_by_hash_nodata(), attach_change_permissions(), attach_count_files(), attach_delete(), attach_list_files(), attach_mkdir(), attach_store(), authenticate_success(), block_content(), blocks_content(), bookmark_add(), bookmarks_init(), build_sync_packet(), call_hooks(), categories_widget(), change_channel(), channel_content(), channel_remove(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), chanview_content(), chat_message(), chat_post(), chatroom_create(), chatroom_destroy(), chatroom_enter(), chatroom_leave(), chatsvc_content(), chatsvc_post(), check_account_email(), check_account_invite(), check_item_source(), check_webbie(), Cache\clear(), comanche_block(), common_friends(), connect_init(), connect_post(), connections_content(), connections_post(), connedit_post(), consume_feed(), contact_remove(), contactgroup_content(), count_common_friends(), create_account(), create_identity(), RedDirectory\createFile(), dbesc_array_cb(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_dispatch_public(), diaspora_get_contact_by_handle(), diaspora_like(), diaspora_message(), diaspora_photo(), diaspora_post(), diaspora_process_outbound(), diaspora_profile(), diaspora_request(), diaspora_reshare(), diaspora_retraction(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_relay(), diaspora_share(), diaspora_signed_retraction(), diaspora_transmit(), dir_query_build(), directory_run(), dirsearch_content(), discover_by_webbie(), display_content(), downgrade_accounts(), editlayout_content(), editpost_content(), editwebpage_content(), event_addtocal(), event_store_event(), event_store_item(), events_content(), events_post(), externals_run(), fbrowser_content(), feed_init(), fetch_post_tags(), file_tag_file_query(), filerm_content(), filestorage_content(), find_diaspora_person_by_handle(), find_filename_by_hash(), find_folder_hash_by_attach_hash(), RedBrowser\findAttachHash(), RedBrowser\findAttachIdByHash(), fix_attached_photo_permissions(), fix_private_photos(), fix_system_urls(), fsuggest_post(), Cache\get(), RedFile\get(), get_all_perms(), get_birthdays(), get_channel_by_nick(), get_cloudpath(), get_config_from_storage(), get_events(), get_item_elements(), get_online_status(), get_things(), RedDirectory\getDir(), RedDirectory\getLastModified(), gprobe_run(), group_add(), group_add_member(), group_byname(), group_content(), group_post(), group_rec_byhash(), group_rmv(), group_rmv_member(), groups_containing(), handle_feed(), handle_tag(), hcard_init(), home_content(), import_author_rss(), import_author_zot(), import_directory_keywords(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), invite_post(), is_matrix_url(), item_add_cid(), item_message_id(), item_permissions_sql(), item_post(), item_remove_cid(), item_store(), item_store_update(), items_fetch(), layouts_content(), like_content(), list_public_sites(), load_config(), load_plugin(), load_xconfig(), local_dir_update(), lockview_content(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_nonce(), FKOAuthDataStore\lookup_token(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_store(), manage_content(), mark_orphan_hubsxchans(), match_openid(), member_of(), menu_add_item(), menu_create(), menu_delete(), menu_edit(), menu_edit_item(), menu_fetch(), menu_list(), msearch_post(), netgrowth_content(), network_content(), FKOAuthDataStore\new_access_token(), new_contact(), new_cookie(), FKOAuthDataStore\new_request_token(), notification(), notifier_run(), notify_init(), oauth_get_client(), onedirsync_run(), onepoll_run(), openid_content(), page_content(), perm_is_allowed(), permissions_sql(), photo_init(), photo_new_resource(), photo_upload(), photos_album_exists(), photos_album_get_db_idstr(), photos_album_rename(), photos_content(), photos_list_photos(), photos_post(), ping_init(), plugin_is_installed(), poco_init(), poco_load(), poll_post(), poller_run(), post_init(), post_post(), private_messages_drop(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_init(), profile_load(), profile_photo_post(), profile_photo_set_profile_perms(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), prune_hub_reinstalls(), public_permissions_sql(), public_recips(), RedFile\put(), queue_run(), rconnect_url(), receive_post(), RedCollectionData(), RedFileData(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_hook(), register_post(), remote_online_status(), remove_all_xchan_resources(), remove_community_tag(), remove_queue_item(), rmagic_init(), rmagic_post(), rpost_content(), photo_driver\save(), search_ac_init(), search_content(), send_message(), send_reg_approval_email(), send_status_notifications(), Cache\set(), set_config(), set_pconfig(), set_xconfig(), RedDirectory\setName(), RedFile\setName(), settings_post(), siteinfo_init(), sitelist_init(), sources_content(), sources_post(), start_delivery_chain(), photo_driver\store(), store_item_tag(), stream_perms_xchans(), stringify_array_elms(), subthread_content(), suggest_init(), sync_directories(), tag_deliver(), tagger_content(), tagrm_post(), term_query(), tgroup_check(), thing_content(), thing_init(), uninstall_plugin(), unregister_hook(), update_birthdays(), update_directory_entry(), update_modtime(), update_queue_time(), update_remote_id(), user_allow(), user_approve(), user_deny(), RedBasicAuth\validateUserPass(), vcard_from_xchan(), verify_email_address(), vote_post(), webpages_content(), wfinger_init(), widget_bookmarkedchats(), widget_item(), widget_savedsearch(), xchan_content(), xchan_mail_query(), xchan_query(), xrd_init(), z_readdir(), zfinger_init(), zid_init(), zot_feed(), zot_finger(), zot_get_hublocs(), zot_gethub(), zot_process_response(), zot_refresh(), and zotfeed_init().

                @@ -318,7 +318,7 @@ Functions

                This will happen occasionally trying to store the session data after abnormal program termination

                -

                Referenced by abook_connections(), abook_self(), abook_toggle_flag(), account_remove(), account_total(), account_verify_password(), achievements_content(), acl_init(), add_source_route(), admin_content(), admin_page_channels(), admin_page_channels_post(), admin_page_dbsync(), admin_page_hubloc(), admin_page_hubloc_post(), admin_page_summary(), admin_page_users(), admin_page_users_post(), advanced_profile(), all_friends(), allowed_public_recips(), api_direct_messages_box(), api_direct_messages_new(), api_favorites(), api_ff_ids(), api_format_items(), api_get_user(), api_login(), api_status_show(), api_statuses_destroy(), api_statuses_f(), api_statuses_home_timeline(), api_statuses_mentions(), api_statuses_public_timeline(), api_statuses_repeat(), api_statuses_show(), api_user(), api_users_show(), app_destroy(), app_installed(), app_list(), app_store(), app_update(), appman_content(), attach_by_hash(), attach_by_hash_nodata(), attach_change_permissions(), attach_count_files(), attach_delete(), attach_init(), attach_list_files(), attach_mkdir(), attach_store(), authenticate_success(), block_content(), blocks_content(), bookmark_add(), bookmarks_init(), build_sync_packet(), call_hooks(), categories_widget(), change_channel(), chanman_remove_everything_from_network(), channel_content(), channel_remove(), channel_total(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), chanview_content(), chat_content(), chat_message(), chat_post(), chatroom_create(), chatroom_destroy(), chatroom_enter(), chatroom_leave(), chatroom_list(), chatsvc_content(), chatsvc_init(), chatsvc_post(), check_account_email(), check_account_invite(), check_config(), check_item_source(), check_webbie(), Cache\clear(), collect_recipients(), comanche_block(), common_friends(), common_friends_zcid(), common_init(), connect_init(), connect_post(), connections_content(), connections_post(), connedit_content(), connedit_init(), connedit_post(), consume_feed(), contact_block(), contact_profile_assign(), contact_remove(), contact_select(), contactgroup_content(), count_all_friends(), count_common_friends(), count_common_friends_zcid(), create_account(), create_identity(), RedDirectory\createDirectory(), RedDirectory\createFile(), current_theme(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_dispatch_public(), diaspora_get_contact_by_handle(), diaspora_handle_from_contact(), diaspora_like(), diaspora_message(), diaspora_photo(), diaspora_post(), diaspora_profile(), diaspora_request(), diaspora_reshare(), diaspora_retraction(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_signed_retraction(), diaspora_transmit(), dir_parse_query(), dir_tagadelic(), directory_content(), directory_run(), dirprofile_init(), dirsearch_content(), display_content(), downgrade_accounts(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), encode_item(), event_addtocal(), event_store_event(), event_store_item(), events_content(), events_post(), expand_groups(), expire_run(), externals_run(), fbrowser_content(), feed_init(), fetch_post_tags(), fileas_widget(), filer_content(), filerm_content(), filestorage_content(), find_diaspora_person_by_handle(), find_filename_by_hash(), find_folder_hash_by_attach_hash(), RedBrowser\findAttachHash(), RedBrowser\findAttachIdByHash(), first_post_date(), fix_attached_photo_permissions(), fix_private_photos(), fix_system_urls(), fsuggest_content(), fsuggest_post(), RedBrowser\generateDirectoryIndex(), Cache\get(), RedFile\get(), get_all_perms(), get_birthdays(), get_channel_by_nick(), get_cloudpath(), get_config_from_storage(), get_events(), get_item_elements(), get_online_status(), get_sys_channel(), get_things(), get_words(), RedDirectory\getDir(), RedDirectory\getLastModified(), RedDirectory\getQuotaInfo(), gprobe_run(), group_add(), group_add_member(), group_byname(), group_content(), group_get_members(), group_post(), group_rec_byhash(), group_rmv(), group_rmv_member(), group_select(), group_side(), groups_containing(), handle_feed(), handle_tag(), hcard_init(), home_content(), identity_basic_export(), identity_check_service_class(), identity_selector(), import_author_rss(), import_author_zot(), import_directory_keywords(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), invite_post(), is_matrix_url(), is_sys_channel(), item_add_cid(), item_check_service_class(), item_content(), item_expire(), item_message_id(), item_post(), item_remove_cid(), item_store(), item_store_update(), items_fetch(), layout_select(), layouts_content(), like_content(), list_public_sites(), load_config(), load_contact_links(), load_hooks(), load_pconfig(), load_plugin(), load_translation_table(), load_xconfig(), local_dir_update(), lockview_content(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_nonce(), FKOAuthDataStore\lookup_token(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_store(), manage_content(), mark_orphan_hubsxchans(), match_content(), match_openid(), member_of(), menu_add_item(), menu_create(), menu_del_item(), menu_delete(), menu_delete_id(), menu_edit(), menu_edit_item(), menu_fetch(), menu_fetch_id(), menu_list(), mimetype_select(), mini_group_select(), mitem_content(), mood_init(), msearch_post(), nav(), netgrowth_content(), network_content(), FKOAuthDataStore\new_access_token(), new_contact(), new_cookie(), FKOAuthDataStore\new_request_token(), notification(), notifications_content(), notifications_post(), notifier_run(), notify_content(), notify_init(), oauth_get_client(), onedirsync_run(), onepoll_run(), openid_content(), page_content(), pagelist_widget(), pdl_selector(), perm_is_allowed(), photo_init(), photo_new_resource(), photo_upload(), photos_album_exists(), photos_album_get_db_idstr(), photos_album_rename(), photos_albums_list(), photos_content(), photos_list_photos(), photos_post(), ping_init(), plugin_is_installed(), poco_init(), poco_load(), poke_content(), poke_init(), poll_content(), poll_post(), poller_run(), post_activity_item(), post_init(), post_post(), private_messages_drop(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_init(), profile_load(), profile_photo_post(), profile_photo_set_profile_perms(), profile_sidebar(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), prune_hub_reinstalls(), public_recips(), RedFile\put(), queue_run(), random_profile(), rconnect_url(), receive_post(), RedChannelList(), RedCollectionData(), RedFileData(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_content(), register_hook(), register_post(), reload_plugins(), remote_online_status(), remove_all_xchan_resources(), remove_community_tag(), remove_queue_item(), retain_item(), rmagic_init(), rmagic_post(), rpost_content(), photo_driver\save(), search_ac_init(), search_content(), send_message(), send_reg_approval_email(), send_status_notifications(), service_class_allows(), service_class_fetch(), Cache\set(), set_config(), set_default_login_identity(), set_pconfig(), set_xconfig(), RedDirectory\setName(), RedFile\setName(), settings_post(), setup_content(), share_init(), siteinfo_content(), siteinfo_init(), sitelist_init(), sources_content(), sources_post(), starred_init(), start_delivery_chain(), photo_driver\store(), store_item_tag(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), suggest_init(), suggestion_query(), sync_directories(), tag_deliver(), tagadelic(), tagger_content(), tagrm_content(), tagrm_post(), tgroup_check(), thing_content(), thing_init(), uninstall_plugin(), unregister_hook(), update_birthdays(), update_directory_entry(), update_modtime(), update_queue_time(), update_remote_id(), update_suggestions(), user_allow(), user_approve(), user_deny(), RedBasicAuth\validateUserPass(), vcard_from_xchan(), verify_email_address(), viewconnections_content(), viewsrc_content(), vote_content(), vote_init(), vote_post(), webpages_content(), wfinger_init(), widget_bookmarkedchats(), widget_filer(), widget_follow(), widget_item(), widget_savedsearch(), widget_settings_menu(), widget_suggestedchats(), xchan_content(), xchan_mail_query(), xchan_query(), xrd_init(), z_input_filter(), z_readdir(), zfinger_init(), zid_init(), zot_feed(), zot_finger(), zot_get_hublocs(), zot_gethub(), zot_import(), zot_process_response(), zot_refresh(), and zotfeed_init().

                +

                Referenced by abook_connections(), abook_self(), abook_toggle_flag(), account_remove(), account_total(), account_verify_password(), achievements_content(), acl_init(), add_source_route(), admin_content(), admin_page_channels(), admin_page_channels_post(), admin_page_dbsync(), admin_page_hubloc(), admin_page_hubloc_post(), admin_page_profs(), admin_page_profs_post(), admin_page_summary(), admin_page_users(), admin_page_users_post(), advanced_profile(), all_friends(), allowed_public_recips(), api_direct_messages_box(), api_direct_messages_new(), api_favorites(), api_ff_ids(), api_format_items(), api_get_user(), api_login(), api_status_show(), api_statuses_destroy(), api_statuses_f(), api_statuses_home_timeline(), api_statuses_mentions(), api_statuses_public_timeline(), api_statuses_repeat(), api_statuses_show(), api_user(), api_users_show(), app_destroy(), app_installed(), app_list(), app_store(), app_update(), appman_content(), attach_by_hash(), attach_by_hash_nodata(), attach_change_permissions(), attach_count_files(), attach_delete(), attach_init(), attach_list_files(), attach_mkdir(), attach_store(), authenticate_success(), block_content(), blocks_content(), bookmark_add(), bookmarks_init(), build_sync_packet(), call_hooks(), categories_widget(), change_channel(), chanman_remove_everything_from_network(), channel_content(), channel_remove(), channel_total(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), chanview_content(), chat_content(), chat_message(), chat_post(), chatroom_create(), chatroom_destroy(), chatroom_enter(), chatroom_leave(), chatroom_list(), chatsvc_content(), chatsvc_init(), chatsvc_post(), check_account_email(), check_account_invite(), check_config(), check_item_source(), check_webbie(), Cache\clear(), collect_recipients(), comanche_block(), common_friends(), common_friends_zcid(), common_init(), connect_init(), connect_post(), connections_content(), connections_post(), connedit_content(), connedit_init(), connedit_post(), consume_feed(), contact_block(), contact_profile_assign(), contact_remove(), contact_select(), contactgroup_content(), count_all_friends(), count_common_friends(), count_common_friends_zcid(), create_account(), create_identity(), RedDirectory\createDirectory(), RedDirectory\createFile(), current_theme(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_dispatch_public(), diaspora_get_contact_by_handle(), diaspora_handle_from_contact(), diaspora_like(), diaspora_message(), diaspora_photo(), diaspora_post(), diaspora_process_outbound(), diaspora_profile(), diaspora_request(), diaspora_reshare(), diaspora_retraction(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_share(), diaspora_signed_retraction(), diaspora_transmit(), dir_parse_query(), dir_tagadelic(), directory_content(), directory_run(), dirprofile_init(), dirsearch_content(), discover_by_webbie(), display_content(), downgrade_accounts(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), encode_item(), event_addtocal(), event_store_event(), event_store_item(), events_content(), events_post(), expand_groups(), expire_run(), externals_run(), fbrowser_content(), feed_init(), fetch_post_tags(), fileas_widget(), filer_content(), filerm_content(), filestorage_content(), find_diaspora_person_by_handle(), find_filename_by_hash(), find_folder_hash_by_attach_hash(), RedBrowser\findAttachHash(), RedBrowser\findAttachIdByHash(), first_post_date(), fix_attached_photo_permissions(), fix_private_photos(), fix_system_urls(), fsuggest_content(), fsuggest_post(), RedBrowser\generateDirectoryIndex(), Cache\get(), RedFile\get(), get_all_perms(), get_birthdays(), get_channel_by_nick(), get_cloudpath(), get_config_from_storage(), get_events(), get_item_elements(), get_online_status(), get_sys_channel(), get_things(), get_words(), RedDirectory\getDir(), RedDirectory\getLastModified(), RedDirectory\getQuotaInfo(), gprobe_run(), group_add(), group_add_member(), group_byname(), group_content(), group_get_members(), group_post(), group_rec_byhash(), group_rmv(), group_rmv_member(), group_select(), group_side(), groups_containing(), handle_feed(), handle_tag(), hcard_init(), home_content(), identity_basic_export(), identity_check_service_class(), identity_selector(), import_author_rss(), import_author_zot(), import_directory_keywords(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), invite_post(), is_matrix_url(), is_sys_channel(), item_add_cid(), item_check_service_class(), item_content(), item_expire(), item_message_id(), item_post(), item_remove_cid(), item_store(), item_store_update(), items_fetch(), layout_select(), layouts_content(), like_content(), list_public_sites(), load_config(), load_contact_links(), load_hooks(), load_pconfig(), load_plugin(), load_translation_table(), load_xconfig(), local_dir_update(), lockview_content(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_nonce(), FKOAuthDataStore\lookup_token(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_store(), manage_content(), mark_orphan_hubsxchans(), match_content(), match_openid(), member_of(), menu_add_item(), menu_create(), menu_del_item(), menu_delete(), menu_delete_id(), menu_edit(), menu_edit_item(), menu_fetch(), menu_fetch_id(), menu_list(), mimetype_select(), mini_group_select(), mitem_content(), mood_init(), msearch_post(), nav(), netgrowth_content(), network_content(), FKOAuthDataStore\new_access_token(), new_contact(), new_cookie(), FKOAuthDataStore\new_request_token(), notification(), notifications_content(), notifications_post(), notifier_run(), notify_content(), notify_init(), oauth_get_client(), onedirsync_run(), onepoll_run(), openid_content(), page_content(), pagelist_widget(), pdl_selector(), perm_is_allowed(), photo_init(), photo_new_resource(), photo_upload(), photos_album_exists(), photos_album_get_db_idstr(), photos_album_rename(), photos_albums_list(), photos_content(), photos_list_photos(), photos_post(), ping_init(), plugin_is_installed(), poco_init(), poco_load(), poke_content(), poke_init(), poll_content(), poll_post(), poller_run(), post_activity_item(), post_init(), post_post(), private_messages_drop(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_init(), profile_load(), profile_photo_post(), profile_photo_set_profile_perms(), profile_sidebar(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), prune_hub_reinstalls(), public_recips(), RedFile\put(), queue_run(), random_profile(), rconnect_url(), receive_post(), RedChannelList(), RedCollectionData(), RedFileData(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_content(), register_hook(), register_post(), reload_plugins(), remote_online_status(), remove_all_xchan_resources(), remove_community_tag(), remove_queue_item(), retain_item(), rmagic_init(), rmagic_post(), rpost_content(), photo_driver\save(), search_ac_init(), search_content(), send_message(), send_reg_approval_email(), send_status_notifications(), service_class_allows(), service_class_fetch(), Cache\set(), set_config(), set_default_login_identity(), set_pconfig(), set_xconfig(), RedDirectory\setName(), RedFile\setName(), settings_post(), setup_content(), share_init(), siteinfo_content(), siteinfo_init(), sitelist_init(), sources_content(), sources_post(), starred_init(), start_delivery_chain(), photo_driver\store(), store_item_tag(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), suggest_init(), suggestion_query(), sync_directories(), tag_deliver(), tagadelic(), tagger_content(), tagrm_content(), tagrm_post(), tgroup_check(), thing_content(), thing_init(), uninstall_plugin(), unregister_hook(), update_birthdays(), update_directory_entry(), update_modtime(), update_queue_time(), update_remote_id(), update_suggestions(), user_allow(), user_approve(), user_deny(), RedBasicAuth\validateUserPass(), vcard_from_xchan(), verify_email_address(), viewconnections_content(), viewsrc_content(), vote_content(), vote_init(), vote_post(), webpages_content(), wfinger_init(), widget_bookmarkedchats(), widget_filer(), widget_follow(), widget_item(), widget_savedsearch(), widget_settings_menu(), widget_suggestedchats(), xchan_content(), xchan_mail_query(), xchan_query(), xrd_init(), z_input_filter(), z_readdir(), zfinger_init(), zid_init(), zot_feed(), zot_finger(), zot_get_hublocs(), zot_gethub(), zot_import(), zot_process_response(), zot_refresh(), and zotfeed_init().

                diff --git a/doc/html/diaspora_8php.html b/doc/html/diaspora_8php.html index fa14301e9..5d5b0102d 100644 --- a/doc/html/diaspora_8php.html +++ b/doc/html/diaspora_8php.html @@ -118,6 +118,8 @@ Functions    diaspora_is_blacklisted ($s)   + diaspora_process_outbound ($arr) +   diaspora_handle_from_contact ($contact_hash)    diaspora_get_contact_by_handle ($uid, $handle) @@ -126,10 +128,10 @@ Functions    get_diaspora_key ($handle)   - diaspora_pubmsg_build ($msg, $user, $contact, $prvkey, $pubkey) -  - diaspora_msg_build ($msg, $user, $contact, $prvkey, $pubkey, $public=false) -  + diaspora_pubmsg_build ($msg, $channel, $contact, $prvkey, $pubkey) +  + diaspora_msg_build ($msg, $channel, $contact, $prvkey, $pubkey, $public=false) +   diaspora_decode ($importer, $xml)    diaspora_request ($importer, $xml) @@ -527,7 +529,7 @@ Functions - +
                @@ -541,7 +543,7 @@ Functions - + @@ -651,6 +653,24 @@ Functions

                Referenced by diaspora_dispatch().

                + + + +
                +
                +
                 $user, $channel,
                + + + + + + + +
                diaspora_process_outbound ( $arr)
                +
                + +

                Referenced by notifier_run().

                +
                @@ -687,7 +707,7 @@ Functions - +
                @@ -701,7 +721,7 @@ Functions - + @@ -729,7 +749,7 @@ Functions
                 $user, $channel,
                -

                Referenced by diaspora_msg_build().

                +

                Referenced by diaspora_msg_build().

                @@ -860,6 +880,8 @@ Functions
                +

                Referenced by diaspora_process_outbound().

                +
                @@ -938,6 +960,8 @@ Functions
                +

                Referenced by diaspora_process_outbound().

                +
                @@ -976,6 +1000,8 @@ Functions
                +

                Referenced by diaspora_process_outbound().

                +
                @@ -1014,6 +1040,8 @@ Functions
                +

                Referenced by diaspora_process_outbound().

                +
                @@ -1052,6 +1080,8 @@ Functions
                +

                Referenced by diaspora_process_outbound().

                +
                @@ -1078,7 +1108,7 @@ Functions
                -

                Referenced by diaspora_request().

                +

                Referenced by diaspora_request(), and notifier_run().

                diff --git a/doc/html/diaspora_8php.js b/doc/html/diaspora_8php.js index 4d6263fd4..98cfef962 100644 --- a/doc/html/diaspora_8php.js +++ b/doc/html/diaspora_8php.js @@ -12,11 +12,12 @@ var diaspora_8php = [ "diaspora_is_reshare", "diaspora_8php.html#ad9985cc4214bdfc14878785c838c8690", null ], [ "diaspora_like", "diaspora_8php.html#a5d57518545baa31cf8a85a937a267681", null ], [ "diaspora_message", "diaspora_8php.html#a7cff2f8f11044c1b3a360f20e1bbee46", null ], - [ "diaspora_msg_build", "diaspora_8php.html#aca23425928635776dc17927041fc3fa8", null ], + [ "diaspora_msg_build", "diaspora_8php.html#a4901762cba5cd8dcdc57bdf285eefb1b", null ], [ "diaspora_photo", "diaspora_8php.html#a71fe9bb66626b4197ae018a230778bb2", null ], [ "diaspora_post", "diaspora_8php.html#a20b968d64ef26afe5cb0cc75a7570a31", null ], + [ "diaspora_process_outbound", "diaspora_8php.html#a131abd521b218d6ae6f7d2917d8b2605", null ], [ "diaspora_profile", "diaspora_8php.html#a900abf51398b2ef26cd2cd31c52f1b0f", null ], - [ "diaspora_pubmsg_build", "diaspora_8php.html#addaf8f202e52e3f0a49ed05681f9405c", null ], + [ "diaspora_pubmsg_build", "diaspora_8php.html#a586d5a3ba92d35cee14f879f290072aa", null ], [ "diaspora_request", "diaspora_8php.html#ac1ab782a34552a7c6b4dc961754ed598", null ], [ "diaspora_reshare", "diaspora_8php.html#a2bf43f6b5890897f425ef4325d34b007", null ], [ "diaspora_retraction", "diaspora_8php.html#a938c7ee808d38725c0988fa6006805b9", null ], diff --git a/doc/html/enotify_8php.html b/doc/html/enotify_8php.html index 8a31b7368..b896e9bbf 100644 --- a/doc/html/enotify_8php.html +++ b/doc/html/enotify_8php.html @@ -136,7 +136,7 @@ Functions diff --git a/doc/html/extract_8php.html b/doc/html/extract_8php.html index eeb8660b9..fdd9e1fa1 100644 --- a/doc/html/extract_8php.html +++ b/doc/html/extract_8php.html @@ -132,7 +132,7 @@ Variables
                -

                Referenced by _well_known_init(), activity_sanitise(), api_rss_extra(), api_statuses_user_timeline(), app_store(), app_update(), appman_post(), array_sanitise(), attach_mkdir(), attach_store(), bookmark_add(), chat_message(), chat_post(), chatroom_create(), chatroom_destroy(), chatsvc_post(), check_account_admin(), check_account_email(), check_account_invite(), check_account_password(), check_list_permissions(), check_webbie(), connect_content(), connections_post(), connedit_content(), connedit_post(), construct_page(), contact_block(), contact_select(), conversation(), create_account(), create_identity(), dbesc_array(), diaspora_like(), directory_content(), drop_item(), event_store_event(), event_store_item(), externals_run(), feature_enabled(), fetch_xrd_links(), find_xchan_in_array(), format_like(), get_all_perms(), get_atom_elements(), get_cloudpath(), get_features(), get_item_elements(), get_mail_elements(), get_mood_verbs(), get_poke_verbs(), get_profile_elements(), Item\get_template_data(), get_terms_oftype(), App\get_widgets(), group_select(), hostxrd_init(), ids_to_querystr(), import_author_rss(), import_author_xchan(), import_directory_profile(), import_post(), import_site(), import_xchan(), item_getfeedattach(), item_store(), item_store_update(), items_fetch(), like_content(), like_puller(), load_database(), magic_init(), mail_store(), menu_add_item(), menu_create(), menu_edit(), menu_edit_item(), mood_init(), network_content(), new_channel_post(), new_contact(), obj_verbs(), openid_content(), parse_url_content(), pdl_selector(), perm_is_allowed(), photo_upload(), photos_album_get_db_idstr(), photos_create_item(), ping_init(), po2php_run(), poke_init(), post_activity_item(), post_init(), post_post(), proc_run(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_activity(), profile_sidebar(), profiles_content(), redbasic_form(), register_page_template(), register_post(), remove_community_tag(), replace_macros(), rmagic_post(), photo_driver\save(), send_reg_approval_email(), service_class_allows(), service_class_fetch(), App\set_apps(), settings_post(), sort_by_date(), stringify_array_elms(), subthread_content(), suggest_content(), tag_deliver(), tagger_content(), tagrm_content(), tagrm_post(), theme_attachments(), theme_content(), thing_init(), translate_system_apps(), validate_channelname(), verify_email_address(), wfinger_init(), widget_affinity(), widget_archive(), widget_clock(), widget_item(), widget_photo(), widget_suggestions(), widget_tagcloud_wall(), xchan_mail_query(), xchan_query(), xml2array(), xrd_init(), zfinger_init(), zid(), zid_init(), zot_fetch(), zot_gethub(), zot_import(), zot_process_response(), and zot_register_hub().

                +

                Referenced by _well_known_init(), activity_sanitise(), api_rss_extra(), api_statuses_user_timeline(), app_store(), app_update(), appman_post(), array_sanitise(), attach_mkdir(), attach_store(), bookmark_add(), chat_message(), chat_post(), chatroom_create(), chatroom_destroy(), chatsvc_post(), check_account_admin(), check_account_email(), check_account_invite(), check_account_password(), check_list_permissions(), check_webbie(), connect_content(), connections_post(), connedit_content(), connedit_post(), construct_page(), contact_block(), contact_select(), conversation(), create_account(), create_identity(), dbesc_array(), diaspora_like(), diaspora_process_outbound(), directory_content(), discover_by_webbie(), drop_item(), event_store_event(), event_store_item(), externals_run(), feature_enabled(), fetch_xrd_links(), find_xchan_in_array(), format_like(), get_all_perms(), get_atom_elements(), get_cloudpath(), get_features(), get_item_elements(), get_mail_elements(), get_mood_verbs(), get_poke_verbs(), get_profile_elements(), Item\get_template_data(), get_terms_oftype(), App\get_widgets(), group_select(), hostxrd_init(), ids_to_querystr(), import_author_rss(), import_author_xchan(), import_directory_profile(), import_post(), import_site(), import_xchan(), item_getfeedattach(), item_store(), item_store_update(), items_fetch(), like_content(), like_puller(), load_database(), magic_init(), mail_store(), menu_add_item(), menu_create(), menu_edit(), menu_edit_item(), mood_init(), network_content(), new_channel_post(), new_contact(), obj_verbs(), openid_content(), parse_url_content(), pdl_selector(), perm_is_allowed(), photo_upload(), photos_album_get_db_idstr(), photos_create_item(), ping_init(), po2php_run(), poke_init(), post_activity_item(), post_init(), post_post(), proc_run(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_activity(), profile_sidebar(), profiles_content(), redbasic_form(), register_page_template(), register_post(), remove_community_tag(), replace_macros(), rmagic_post(), photo_driver\save(), send_reg_approval_email(), service_class_allows(), service_class_fetch(), App\set_apps(), settings_post(), sort_by_date(), stringify_array_elms(), subthread_content(), suggest_content(), tag_deliver(), tagger_content(), tagrm_content(), tagrm_post(), theme_attachments(), theme_content(), thing_init(), translate_system_apps(), validate_channelname(), verify_email_address(), wfinger_init(), widget_affinity(), widget_archive(), widget_clock(), widget_item(), widget_photo(), widget_suggestions(), widget_tagcloud_wall(), xchan_mail_query(), xchan_query(), xml2array(), xrd_init(), zfinger_init(), zid(), zid_init(), zot_fetch(), zot_gethub(), zot_import(), zot_process_response(), and zot_register_hub().

                @@ -160,7 +160,7 @@ Variables
                -

                Referenced by Template\_build_nodes(), Template\_replcb_node(), admin_page_themes(), app_decode(), attribute_contains(), base64url_decode(), base64url_encode(), bb_tag_preg_replace(), bb_translate_video(), bbtoevent(), bbtovcal(), bookmarks_init(), chanlink_hash(), chanlink_url(), comanche_parser(), comanche_region(), comanche_webpage(), construct_page(), datetime_convert(), day_translate(), detect_language(), diaspora2bb(), diaspora_is_blacklisted(), diaspora_ol(), diaspora_ul(), dir_parse_query(), dir_query_build(), expand_acl(), file_tag_decode(), file_tag_encode(), file_tag_file_query(), fix_mce_lf(), fix_private_photos(), format_categories(), format_filer(), format_hashtags(), format_mentions(), format_term_for_display(), get_bb_tag_pos(), get_intltext_template(), get_language_name(), get_markup_template(), get_tags(), html2bb_video(), info(), is_a_date_arg(), is_foreigner(), is_member(), json_decode_plus(), legal_webbie(), linkify(), magic_link(), mail_content(), network_to_name(), normalise_openid(), notice(), notifier_run(), oembed_iframe(), oembed_replacecb(), oexchange_content(), parse_xml_string(), photos_post(), poco_load(), prepare_body(), print_template(), printable(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), protect_sprintf(), purify_html(), qp(), random_string(), Template\replace(), replace_macros(), FriendicaSmartyEngine\replace_macros(), Template\replace_macros(), scale_external_images(), scrape_feed(), scrape_vcard(), search(), searchbox(), siteinfo_content(), smilies(), sslify(), string_splitter(), strip_zids(), stripdcode_br_cb(), t(), template_escape(), template_unescape(), term_query(), theme_attachments(), unamp(), undo_post_tagging(), unxmlify(), Template\var_replace(), webfinger_rfc7033(), x(), z_fetch_url(), z_input_filter(), z_post_url(), zfinger_init(), and zid().

                +

                Referenced by Template\_build_nodes(), Template\_replcb_node(), admin_page_themes(), app_decode(), attribute_contains(), base64url_decode(), base64url_encode(), bb_tag_preg_replace(), bb_translate_video(), bbtoevent(), bbtovcal(), bookmarks_init(), chanlink_hash(), chanlink_url(), comanche_parser(), comanche_region(), comanche_webpage(), construct_page(), datetime_convert(), day_translate(), detect_language(), diaspora2bb(), diaspora_is_blacklisted(), diaspora_ol(), diaspora_ul(), dir_parse_query(), dir_query_build(), element_install(), expand_acl(), file_tag_decode(), file_tag_encode(), file_tag_file_query(), fix_mce_lf(), fix_private_photos(), format_categories(), format_filer(), format_hashtags(), format_mentions(), format_term_for_display(), get_bb_tag_pos(), get_intltext_template(), get_language_name(), get_markup_template(), get_tags(), html2bb_video(), info(), is_a_date_arg(), is_foreigner(), is_member(), json_decode_plus(), legal_webbie(), linkify(), magic_link(), mail_content(), network_to_name(), normalise_openid(), notice(), notifier_run(), oembed_iframe(), oembed_replacecb(), oexchange_content(), parse_xml_string(), photos_post(), poco_load(), prepare_body(), print_template(), printable(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), protect_sprintf(), purify_html(), qp(), random_string(), Template\replace(), replace_macros(), FriendicaSmartyEngine\replace_macros(), Template\replace_macros(), scale_external_images(), scrape_feed(), scrape_vcard(), search(), searchbox(), siteinfo_content(), smilies(), sslify(), string_splitter(), strip_zids(), stripdcode_br_cb(), t(), template_escape(), template_unescape(), term_query(), theme_attachments(), unamp(), undo_post_tagging(), unxmlify(), Template\var_replace(), webfinger_rfc7033(), x(), z_fetch_url(), z_input_filter(), z_post_url(), zfinger_init(), and zid().

                diff --git a/doc/html/features_8php.html b/doc/html/features_8php.html index 7219c3302..ad454827d 100644 --- a/doc/html/features_8php.html +++ b/doc/html/features_8php.html @@ -142,7 +142,7 @@ Functions diff --git a/doc/html/globals_0x63.html b/doc/html/globals_0x63.html index 29a719812..3aa2e901b 100644 --- a/doc/html/globals_0x63.html +++ b/doc/html/globals_0x63.html @@ -345,6 +345,9 @@ $(document).ready(function(){initNavTree('globals_0x63.html','');});
              • comanche_widget() : comanche.php
              • +
              • comments_are_now_closed() +: items.php +
              • common_content() : common.php
              • diff --git a/doc/html/globals_0x64.html b/doc/html/globals_0x64.html index a40fe3c56..679a4f838 100644 --- a/doc/html/globals_0x64.html +++ b/doc/html/globals_0x64.html @@ -262,7 +262,7 @@ $(document).ready(function(){initNavTree('globals_0x64.html','');}); : diaspora.php
              • diaspora_msg_build() -: diaspora.php +: diaspora.php
              • diaspora_ol() : bb2diaspora.php @@ -273,11 +273,14 @@ $(document).ready(function(){initNavTree('globals_0x64.html','');});
              • diaspora_post() : diaspora.php
              • +
              • diaspora_process_outbound() +: diaspora.php +
              • diaspora_profile() : diaspora.php
              • diaspora_pubmsg_build() -: diaspora.php +: diaspora.php
              • diaspora_request() : diaspora.php diff --git a/doc/html/globals_0x65.html b/doc/html/globals_0x65.html index e79e01487..3c07fee10 100644 --- a/doc/html/globals_0x65.html +++ b/doc/html/globals_0x65.html @@ -156,11 +156,14 @@ $(document).ready(function(){initNavTree('globals_0x65.html','');});
              • editwebpage_content() : editwebpage.php
              • +
              • element_install() +: apps.php +
              • else -: style.php +: tpldebug.php +, style.php , auth.php , fpostit.php -, tpldebug.php
              • email_header_encode() : network.php diff --git a/doc/html/globals_func_0x63.html b/doc/html/globals_func_0x63.html index c6c03977e..7a8b375dc 100644 --- a/doc/html/globals_func_0x63.html +++ b/doc/html/globals_func_0x63.html @@ -335,6 +335,9 @@ $(document).ready(function(){initNavTree('globals_func_0x63.html','');});
              • comanche_widget() : comanche.php
              • +
              • comments_are_now_closed() +: items.php +
              • common_content() : common.php
              • diff --git a/doc/html/globals_func_0x64.html b/doc/html/globals_func_0x64.html index 59d294110..e54fd48ad 100644 --- a/doc/html/globals_func_0x64.html +++ b/doc/html/globals_func_0x64.html @@ -255,7 +255,7 @@ $(document).ready(function(){initNavTree('globals_func_0x64.html','');}); : diaspora.php
              • diaspora_msg_build() -: diaspora.php +: diaspora.php
              • diaspora_ol() : bb2diaspora.php @@ -266,11 +266,14 @@ $(document).ready(function(){initNavTree('globals_func_0x64.html','');});
              • diaspora_post() : diaspora.php
              • +
              • diaspora_process_outbound() +: diaspora.php +
              • diaspora_profile() : diaspora.php
              • diaspora_pubmsg_build() -: diaspora.php +: diaspora.php
              • diaspora_request() : diaspora.php diff --git a/doc/html/globals_func_0x65.html b/doc/html/globals_func_0x65.html index 9b7b41459..375332588 100644 --- a/doc/html/globals_func_0x65.html +++ b/doc/html/globals_func_0x65.html @@ -155,6 +155,9 @@ $(document).ready(function(){initNavTree('globals_func_0x65.html','');});
              • editwebpage_content() : editwebpage.php
              • +
              • element_install() +: apps.php +
              • email_header_encode() : network.php
              • diff --git a/doc/html/identity_8php.html b/doc/html/identity_8php.html index 0c39feab2..5474c3758 100644 --- a/doc/html/identity_8php.html +++ b/doc/html/identity_8php.html @@ -413,7 +413,7 @@ Functions diff --git a/doc/html/include_2apps_8php.html b/doc/html/include_2apps_8php.html index 9f8ab7072..d8fe20714 100644 --- a/doc/html/include_2apps_8php.html +++ b/doc/html/include_2apps_8php.html @@ -140,6 +140,8 @@ Functions    papp_encode ($papp)   + element_install ($channel, $s) + 

                Function Documentation

                @@ -379,6 +381,33 @@ Functions

                Referenced by app_install().

                + + + +
                +
                + + + + + + + + + + + + + + + + + + +
                element_install ( $channel,
                 $s 
                )
                +
                +

                install a shared design element (layout, webpage, block, menu, whatever)

                +
                diff --git a/doc/html/include_2apps_8php.js b/doc/html/include_2apps_8php.js index 1be75a9e0..4b28e1dc9 100644 --- a/doc/html/include_2apps_8php.js +++ b/doc/html/include_2apps_8php.js @@ -10,6 +10,7 @@ var include_2apps_8php = [ "app_render", "include_2apps_8php.html#a1b2e737f477a2e0d9d11ef14adc5aa66", null ], [ "app_store", "include_2apps_8php.html#a15626f24069c18816f7cdaf4735f58f9", null ], [ "app_update", "include_2apps_8php.html#aeab6a62d2f3dfaa86ed043a006305f46", null ], + [ "element_install", "include_2apps_8php.html#a7c8bf17bd61a310bacb21ba9ad7a061b", null ], [ "get_system_apps", "include_2apps_8php.html#ae64f72eb4f126e03b4eb65ed1702a3ca", null ], [ "papp_encode", "include_2apps_8php.html#ad6ba3f254003f69f8f3f94ca5bda0680", null ], [ "parse_app_description", "include_2apps_8php.html#a32fe4ed9666228fd4b67dc487cc57a83", null ], diff --git a/doc/html/include_2config_8php.html b/doc/html/include_2config_8php.html index 0335acdf3..39065742f 100644 --- a/doc/html/include_2config_8php.html +++ b/doc/html/include_2config_8php.html @@ -258,7 +258,7 @@ Functions
                -

                Referenced by account_verify_password(), acl_init(), admin_page_dbsync(), admin_page_logs(), admin_page_site(), admin_page_summary(), admin_page_themes(), allowed_email(), allowed_url(), api_statuses_mentions(), api_statusnet_config(), attach_store(), bbcode(), build_sync_packet(), channel_content(), check_account_admin(), check_account_invite(), check_config(), cli_startup(), create_account(), create_identity(), create_sys_channel(), RedDirectory\createFile(), detect_language(), diaspora_dispatch(), diaspora_dispatch_public(), diaspora_is_blacklisted(), diaspora_like(), diaspora_reshare(), diaspora_transmit(), directory_content(), directory_run(), dirprofile_init(), dirsearch_content(), display_content(), dlogger(), dob(), downgrade_accounts(), editblock_content(), editpost_content(), editwebpage_content(), encode_item(), encode_mail(), events_content(), expire_run(), externals_run(), feature_enabled(), feed_init(), find_upstream_directory(), findpeople_widget(), get_all_perms(), Item\get_comment_box(), get_default_profile_photo(), get_directory_realm(), get_item_elements(), get_mail_elements(), get_max_import_size(), get_online_status(), get_profile_fields_advanced(), get_profile_fields_basic(), RedDirectory\getChild(), RedDirectory\getChildren(), group_content(), home_content(), home_init(), photo_gd\imageString(), import_post(), import_xchan(), invite_content(), invite_post(), is_public_profile(), item_post(), item_store(), item_store_update(), photo_imagick\load(), logger(), login(), lostpass_content(), lostpass_post(), mark_orphan_hubsxchans(), nav(), navbar_complete(), network_content(), FKOAuthDataStore\new_access_token(), new_channel_post(), new_keypair(), notification(), notifier_run(), oembed_bbcode2html(), openid_content(), parse_url_content(), perm_is_allowed(), photo_upload(), photos_content(), photos_init(), poco_init(), poller_run(), post_activity_item(), post_post(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), profile_content(), profile_create_sidebar(), profile_photo_post(), profile_sidebar(), profiles_content(), profperm_content(), pubsites_content(), RedFile\put(), receive_post(), register_content(), register_post(), reload_plugins(), remove_all_xchan_resources(), scale_external_images(), search_content(), send_message(), send_reg_approval_email(), send_verification_email(), service_class_allows(), service_class_fetch(), set_config(), settings_post(), site_default_perms(), siteinfo_content(), smilies(), start_delivery_chain(), tag_deliver(), theme_admin(), unobscure(), update_modtime(), update_suggestions(), upgrade_link(), user_allow(), valid_email(), validate_email(), verify_email_address(), viewconnections_content(), viewconnections_init(), webpages_content(), widget_fullprofile(), widget_profile(), xrd_init(), z_fetch_url(), z_post_url(), zfinger_init(), zot_fetch(), zot_gethub(), zot_import(), and zotfeed_init().

                +

                Referenced by account_verify_password(), acl_init(), admin_page_dbsync(), admin_page_logs(), admin_page_site(), admin_page_summary(), admin_page_themes(), allowed_email(), allowed_url(), api_statuses_mentions(), api_statusnet_config(), attach_store(), bbcode(), build_sync_packet(), channel_content(), check_account_admin(), check_account_invite(), check_config(), cli_startup(), create_account(), create_identity(), create_sys_channel(), RedDirectory\createFile(), detect_language(), diaspora_dispatch(), diaspora_dispatch_public(), diaspora_is_blacklisted(), diaspora_like(), diaspora_process_outbound(), diaspora_transmit(), directory_content(), directory_run(), dirprofile_init(), dirsearch_content(), display_content(), dlogger(), dob(), downgrade_accounts(), editblock_content(), editpost_content(), editwebpage_content(), encode_item(), encode_mail(), events_content(), expire_run(), externals_run(), feature_enabled(), feed_init(), find_upstream_directory(), findpeople_widget(), get_all_perms(), Item\get_comment_box(), get_default_profile_photo(), get_directory_realm(), get_item_elements(), get_mail_elements(), get_max_import_size(), get_online_status(), get_profile_fields_advanced(), get_profile_fields_basic(), RedDirectory\getChild(), RedDirectory\getChildren(), group_content(), home_content(), home_init(), photo_gd\imageString(), import_post(), import_xchan(), invite_content(), invite_post(), is_public_profile(), item_post(), item_store(), item_store_update(), photo_imagick\load(), localize_item(), logger(), login(), lostpass_content(), lostpass_post(), mark_orphan_hubsxchans(), nav(), navbar_complete(), network_content(), FKOAuthDataStore\new_access_token(), new_channel_post(), new_keypair(), notification(), notifier_run(), oembed_bbcode2html(), openid_content(), parse_url_content(), perm_is_allowed(), photo_upload(), photos_content(), photos_init(), poco_init(), poller_run(), post_activity_item(), post_post(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), profile_content(), profile_create_sidebar(), profile_photo_post(), profile_sidebar(), profiles_content(), profperm_content(), pubsites_content(), RedFile\put(), receive_post(), register_content(), register_post(), reload_plugins(), remove_all_xchan_resources(), scale_external_images(), search_content(), send_message(), send_reg_approval_email(), send_verification_email(), service_class_allows(), service_class_fetch(), set_config(), settings_post(), site_default_perms(), siteinfo_content(), smilies(), start_delivery_chain(), tag_deliver(), theme_admin(), unobscure(), update_modtime(), update_suggestions(), upgrade_link(), user_allow(), valid_email(), validate_email(), verify_email_address(), viewconnections_content(), viewconnections_init(), viewsrc_content(), webpages_content(), widget_fullprofile(), widget_profile(), xrd_init(), z_fetch_url(), z_post_url(), zfinger_init(), zot_fetch(), zot_gethub(), zot_import(), and zotfeed_init().

                @@ -326,7 +326,7 @@ Functions
                -

                Referenced by Conversation\__construct(), acl_init(), App\build_pagehead(), change_channel(), channel_content(), connect_content(), connedit_post(), construct_page(), contact_block(), contact_remove(), conversation(), current_theme(), display_content(), editpost_content(), feature_enabled(), findpeople_widget(), Item\get_comment_box(), get_online_status(), get_theme_uid(), group_content(), home_init(), invite_content(), invite_post(), item_post(), item_store(), item_store_update(), items_fetch(), FKOAuth1\loginUser(), mail_content(), message_content(), network_content(), notification(), pdledit_content(), post_post(), profile_activity(), profile_load(), profile_sidebar(), profperm_content(), remove_community_tag(), rpost_content(), search_content(), set_pconfig(), smilies(), tag_deliver(), theme_content(), and widget_notes().

                +

                Referenced by Conversation\__construct(), acl_init(), App\build_pagehead(), change_channel(), channel_content(), connect_content(), connedit_post(), construct_page(), contact_block(), contact_remove(), conversation(), current_theme(), diaspora_send_status(), display_content(), editpost_content(), feature_enabled(), findpeople_widget(), Item\get_comment_box(), get_online_status(), get_theme_uid(), group_content(), home_init(), invite_content(), invite_post(), item_post(), item_store(), item_store_update(), items_fetch(), FKOAuth1\loginUser(), mail_content(), message_content(), network_content(), notification(), pdledit_content(), post_post(), profile_activity(), profile_load(), profile_sidebar(), profperm_content(), remove_community_tag(), rpost_content(), search_content(), set_pconfig(), smilies(), tag_deliver(), theme_content(), and widget_notes().

                diff --git a/doc/html/include_2network_8php.html b/doc/html/include_2network_8php.html index 2a15e46b1..5d8838356 100644 --- a/doc/html/include_2network_8php.html +++ b/doc/html/include_2network_8php.html @@ -256,7 +256,7 @@ Functions @@ -545,6 +545,8 @@ Functions
                +

                Referenced by discover_by_webbie().

                +
                @@ -711,7 +713,7 @@ Functions
                Returns
                array 'return_code' => HTTP return code or 0 if timeout or failure 'success' => boolean true (if HTTP 2xx result) or false 'header' => HTTP headers 'body' => fetched content
                -

                Referenced by check_htaccess(), directory_content(), dirprofile_init(), discover_by_webbie(), externals_run(), fetch_xrd_links(), handle_feed(), import_post(), import_profile_photo(), import_site(), import_xchan(), navbar_complete(), oembed_fetch_url(), oexchange_content(), onepoll_run(), parseurl_getsiteinfo(), poco_load(), pubsites_content(), remote_online_status(), scale_external_images(), scrape_feed(), scrape_vcard(), setup_post(), sslify_init(), sync_directories(), update_suggestions(), webfinger_rfc7033(), z_post_url(), zot_finger(), and zot_register_hub().

                +

                Referenced by check_htaccess(), diaspora_reshare(), directory_content(), dirprofile_init(), discover_by_webbie(), externals_run(), fetch_xrd_links(), handle_feed(), import_post(), import_profile_photo(), import_site(), import_xchan(), navbar_complete(), oembed_fetch_url(), oexchange_content(), onepoll_run(), parseurl_getsiteinfo(), poco_load(), pubsites_content(), remote_online_status(), scale_external_images(), scrape_feed(), scrape_vcard(), setup_post(), sslify_init(), sync_directories(), update_suggestions(), webfinger_rfc7033(), z_post_url(), zot_finger(), and zot_register_hub().

                @@ -751,7 +753,7 @@ Functions diff --git a/doc/html/items_8php.html b/doc/html/items_8php.html index 5e7c4ff11..358d5a31c 100644 --- a/doc/html/items_8php.html +++ b/doc/html/items_8php.html @@ -114,6 +114,8 @@ $(document).ready(function(){initNavTree('items_8php.html','');}); Functions  collect_recipients ($item, &$private_envelope)   + comments_are_now_closed ($item) +   can_comment_on_post ($observer_xchan, $item)    add_source_route ($iid, $hash) @@ -457,7 +459,7 @@ Functions

                can_comment_on_post($observer_xchan,$item);

                -

                This function examines the comment_policy attached to an item and decides if the current observer has sufficient privileges to comment. This will normally be called on a remote site where perm_is_allowed() will not be suitable because the post owner does not have a local channel_id. Generally we should look at the item - in particular the author['book_flags'] and see if ABOOK_FLAG_SELF is set. If it is, you should be able to use perm_is_allowed( ... 'post_comments'), and if it isn't you need to call can_comment_on_post()

                +

                This function examines the comment_policy attached to an item and decides if the current observer has sufficient privileges to comment. This will normally be called on a remote site where perm_is_allowed() will not be suitable because the post owner does not have a local channel_id. Generally we should look at the item - in particular the author['book_flags'] and see if ABOOK_FLAG_SELF is set. If it is, you should be able to use perm_is_allowed( ... 'post_comments'), and if it isn't you need to call can_comment_on_post() We also check the comments_closed date/time on the item if this is set.

                Referenced by Conversation\add_thread(), and item_post().

                @@ -525,6 +527,24 @@ Functions

                Referenced by notifier_run().

                +
                + + +
                +
                + + + + + + + + +
                comments_are_now_closed ( $item)
                +
                @@ -1386,7 +1406,7 @@ Functions @@ -1733,7 +1753,7 @@ Functions diff --git a/doc/html/items_8php.js b/doc/html/items_8php.js index f0e2953c9..a666c156a 100644 --- a/doc/html/items_8php.js +++ b/doc/html/items_8php.js @@ -8,6 +8,7 @@ var items_8php = [ "can_comment_on_post", "items_8php.html#a1e75047cf175aaee8dd16aa761913ff9", null ], [ "check_item_source", "items_8php.html#a87ac9e359591721a824ecd23bbb56296", null ], [ "collect_recipients", "items_8php.html#a772f0ae77ad77c8ab68ed918a3870946", null ], + [ "comments_are_now_closed", "items_8php.html#abeb7886cde44d9a83dbaf2bc4ab18723", null ], [ "compare_permissions", "items_8php.html#a0790a4550b829e85504af548623002ca", null ], [ "construct_activity_object", "items_8php.html#aa9e99613d38a97b39c8cf5449699c2ee", null ], [ "construct_activity_target", "items_8php.html#aa579bc4445d60098b1410961ca8e96b7", null ], diff --git a/doc/html/language_8php.html b/doc/html/language_8php.html index 63615621a..19a08acd2 100644 --- a/doc/html/language_8php.html +++ b/doc/html/language_8php.html @@ -372,7 +372,7 @@ Functions
                Returns
                translated string if exsists, otherwise s
                -

                Referenced by account_remove(), achievements_content(), acl_init(), admin_content(), admin_page_channels(), admin_page_dbsync(), admin_page_hubloc(), admin_page_logs(), admin_page_logs_post(), admin_page_plugins(), admin_page_site(), admin_page_site_post(), admin_page_summary(), admin_page_themes(), admin_page_users(), admin_post(), advanced_profile(), alt_pager(), api_content(), api_post(), api_statuses_public_timeline(), app_render(), app_store(), app_update(), appman_content(), appman_post(), apps_content(), apw_form(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_init(), attach_list_files(), attach_mkdir(), attach_store(), bbcode(), block_content(), blocks_content(), blogtheme_form(), bookmark_add(), bookmarks_content(), bookmarks_init(), categories_widget(), channel_content(), channel_init(), chanview_content(), chat_content(), chat_init(), chatroom_create(), chatroom_destroy(), chatroom_enter(), chatsvc_content(), check_account_email(), check_account_invite(), check_config(), check_form_security_std_err_msg(), check_funcs(), check_htaccess(), check_htconfig(), check_keys(), check_php(), check_smarty3(), check_store(), cloud_init(), common_content(), common_friends_visitor_widget(), common_init(), connect_content(), connect_init(), connect_post(), connections_content(), connections_post(), connedit_content(), connedit_post(), construct_page(), contact_block(), contact_poll_interval(), conversation(), create_account(), create_identity(), datesel_format(), day_translate(), delegate_content(), design_tools(), diaspora_like(), diaspora_send_status(), dir_safe_mode(), dir_sort_links(), dir_tagblock(), directory_content(), dirprofile_init(), dirsearch_content(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), event_store_item(), events_content(), events_post(), fbrowser_content(), fileas_widget(), filer_content(), filestorage_content(), filestorage_post(), findpeople_widget(), follow_init(), format_categories(), format_event_diaspora(), format_event_html(), format_filer(), format_like(), format_notification(), fsuggest_content(), fsuggest_post(), gender_selector(), gender_selector_min(), RedBrowser\generateDirectoryIndex(), get_birthdays(), Item\get_comment_box(), get_events(), get_features(), get_mood_verbs(), get_perms(), get_plink(), get_poke_verbs(), Item\get_template_data(), group_add(), group_content(), group_post(), group_side(), hcard_init(), help_content(), home_content(), RedBrowser\htmlActionsPanel(), identity_check_service_class(), import_author_rss(), import_channel_photo(), import_content(), import_post(), import_xchan(), dba_driver\install(), invite_content(), invite_post(), item_check_service_class(), item_content(), item_photo_menu(), item_post(), item_post_type(), items_fetch(), lang_selector(), layout_select(), layouts_content(), like_content(), load_database(), localize_item(), lockview_content(), login(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_post(), manage_content(), manual_config(), marital_selector(), marital_selector_min(), match_content(), menu_content(), menu_post(), menu_render(), message_content(), mimetype_select(), mini_group_select(), mitem_content(), mitem_init(), mitem_post(), mood_content(), mood_init(), nav(), network_content(), network_init(), network_to_name(), new_channel_content(), new_channel_post(), new_contact(), notice(), notification(), notifications_content(), notifications_post(), notify_content(), obj_verbs(), oembed_bbcode2html(), oembed_iframe(), oexchange_content(), openid_content(), page_content(), pagelist_widget(), paginate(), pdl_selector(), pdledit_content(), pdledit_post(), photo_upload(), photos_album_widget(), photos_content(), photos_init(), photos_post(), ping_init(), poke_content(), poke_init(), poll_content(), populate_acl(), post_activity_item(), post_init(), probe_content(), profile_activity(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profile_sidebar(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), pubsites_content(), rbmark_content(), rbmark_post(), redbasic_form(), register_content(), register_post(), regmod_content(), relative_date(), removeaccount_content(), removeaccount_post(), removeme_content(), removeme_post(), rmagic_content(), rmagic_post(), rpost_content(), scale_external_images(), search(), search_content(), searchbox(), select_timezone(), send_message(), send_reg_approval_email(), send_verification_email(), settings_post(), setup_content(), sexpref_selector(), sexpref_selector_min(), siteinfo_content(), sources_content(), sources_post(), subthread_content(), suggest_content(), tagblock(), tagger_content(), tagrm_content(), tagrm_post(), theme_attachments(), thing_content(), thing_init(), timezone_cmp(), translate_scope(), translate_system_apps(), update_birthdays(), update_channel_content(), update_display_content(), update_network_content(), update_search_content(), upgrade_bool_message(), upgrade_link(), upgrade_message(), user_allow(), user_approve(), user_deny(), validate_channelname(), vcard_from_xchan(), verify_email_address(), viewconnections_content(), viewsrc_content(), vote_content(), wall_upload_post(), webpages_content(), what_next(), widget_affinity(), widget_appselect(), widget_archive(), widget_bookmarkedchats(), widget_chatroom_list(), widget_filer(), widget_follow(), widget_mailmenu(), widget_notes(), widget_savedsearch(), widget_settings_menu(), widget_suggestedchats(), widget_suggestions(), widget_tagcloud(), writepages_widget(), xchan_content(), z_readdir(), and zfinger_init().

                +

                Referenced by account_remove(), achievements_content(), acl_init(), admin_content(), admin_page_channels(), admin_page_dbsync(), admin_page_hubloc(), admin_page_logs(), admin_page_logs_post(), admin_page_plugins(), admin_page_profs(), admin_page_site(), admin_page_site_post(), admin_page_summary(), admin_page_themes(), admin_page_users(), admin_post(), advanced_profile(), alt_pager(), api_content(), api_post(), api_statuses_public_timeline(), app_render(), app_store(), app_update(), appman_content(), appman_post(), apps_content(), apw_form(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_init(), attach_list_files(), attach_mkdir(), attach_store(), bbcode(), block_content(), blocks_content(), blogtheme_form(), bookmark_add(), bookmarks_content(), bookmarks_init(), categories_widget(), channel_content(), channel_init(), chanview_content(), chat_content(), chat_init(), chatroom_create(), chatroom_destroy(), chatroom_enter(), chatsvc_content(), check_account_email(), check_account_invite(), check_config(), check_form_security_std_err_msg(), check_funcs(), check_htaccess(), check_htconfig(), check_keys(), check_php(), check_smarty3(), check_store(), cloud_init(), common_content(), common_friends_visitor_widget(), common_init(), connect_content(), connect_init(), connect_post(), connections_content(), connections_post(), connedit_content(), connedit_post(), construct_page(), contact_block(), contact_poll_interval(), conversation(), create_account(), create_identity(), datesel_format(), day_translate(), delegate_content(), design_tools(), diaspora_like(), diaspora_send_status(), dir_safe_mode(), dir_sort_links(), dir_tagblock(), directory_content(), dirprofile_init(), dirsearch_content(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), event_store_item(), events_content(), events_post(), fbrowser_content(), fileas_widget(), filer_content(), filestorage_content(), filestorage_post(), findpeople_widget(), follow_init(), format_categories(), format_event_diaspora(), format_event_html(), format_filer(), format_like(), format_notification(), fsuggest_content(), fsuggest_post(), gender_selector(), gender_selector_min(), RedBrowser\generateDirectoryIndex(), get_birthdays(), Item\get_comment_box(), get_events(), get_features(), get_mood_verbs(), get_perms(), get_plink(), get_poke_verbs(), Item\get_template_data(), group_add(), group_content(), group_post(), group_side(), hcard_init(), help_content(), home_content(), RedBrowser\htmlActionsPanel(), identity_check_service_class(), import_author_rss(), import_channel_photo(), import_content(), import_post(), import_xchan(), dba_driver\install(), invite_content(), invite_post(), item_check_service_class(), item_content(), item_photo_menu(), item_post(), item_post_type(), items_fetch(), lang_selector(), layout_select(), layouts_content(), like_content(), load_database(), localize_item(), lockview_content(), login(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_post(), manage_content(), manual_config(), marital_selector(), marital_selector_min(), match_content(), menu_content(), menu_post(), menu_render(), message_content(), mimetype_select(), mini_group_select(), mitem_content(), mitem_init(), mitem_post(), mood_content(), mood_init(), nav(), network_content(), network_init(), network_to_name(), new_channel_content(), new_channel_post(), new_contact(), notice(), notification(), notifications_content(), notifications_post(), notify_content(), obj_verbs(), oembed_bbcode2html(), oembed_iframe(), oexchange_content(), openid_content(), page_content(), pagelist_widget(), paginate(), pdl_selector(), pdledit_content(), pdledit_post(), photo_upload(), photos_album_widget(), photos_content(), photos_init(), photos_post(), ping_init(), poke_content(), poke_init(), poll_content(), populate_acl(), post_activity_item(), post_init(), probe_content(), profile_activity(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profile_sidebar(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), pubsites_content(), rbmark_content(), rbmark_post(), redbasic_form(), register_content(), register_post(), regmod_content(), relative_date(), removeaccount_content(), removeaccount_post(), removeme_content(), removeme_post(), rmagic_content(), rmagic_post(), rpost_content(), scale_external_images(), search(), search_content(), searchbox(), select_timezone(), send_message(), send_reg_approval_email(), send_verification_email(), settings_post(), setup_content(), sexpref_selector(), sexpref_selector_min(), siteinfo_content(), sources_content(), sources_post(), subthread_content(), suggest_content(), tagblock(), tagger_content(), tagrm_content(), tagrm_post(), theme_attachments(), thing_content(), thing_init(), timezone_cmp(), translate_scope(), translate_system_apps(), update_birthdays(), update_channel_content(), update_display_content(), update_network_content(), update_search_content(), upgrade_bool_message(), upgrade_link(), upgrade_message(), user_allow(), user_approve(), user_deny(), validate_channelname(), vcard_from_xchan(), verify_email_address(), viewconnections_content(), viewsrc_content(), vote_content(), wall_upload_post(), webpages_content(), what_next(), widget_affinity(), widget_appselect(), widget_archive(), widget_bookmarkedchats(), widget_chatroom_list(), widget_filer(), widget_follow(), widget_mailmenu(), widget_notes(), widget_savedsearch(), widget_settings_menu(), widget_suggestedchats(), widget_suggestions(), widget_tagcloud(), writepages_widget(), xchan_content(), z_readdir(), and zfinger_init().

                diff --git a/doc/html/navtree.js b/doc/html/navtree.js index 8e8e44674..a469c162f 100644 --- a/doc/html/navtree.js +++ b/doc/html/navtree.js @@ -40,12 +40,12 @@ var NAVTREEINDEX = "boot_8php.html#a6626f383c3d2d459f731ab8b4f237d16", "classApp.html#a8863703a0305eaa45eb970dbd2046291", "classphoto__driver.html#a00cb166c00b7502dbc456c94330e5b03", -"dir_f19da925ee886ec38f19b0e8c19779bc.html", -"identity_8php.html#a332df795f684788002f5a6424abacfd7", -"items_8php.html#a02ca33c31ed535d24894f8a9a91ce9df", -"photo__imagick_8php.html", -"system__unavailable_8php.html#a73751a6bcc17ad3ca503496e2fb020fa", -"xref_8php.html#a9bee399213b8de8226b0d60834307473" +"dir_d520c5cf583201d9437764f209363c22.html", +"identity_8php.html#a2ab5172eabd375869060c9ad68323f5c", +"items_8php.html#a004e89d86b0f29b2c4da20108ecc4091", +"photo__driver_8php.html#a32e2817faa25d7f11f60a8abff565035", +"suggest_8php.html#a58748a8235d4523f8333847f3e42dd91", +"xrd_8php.html" ]; var SYNCONMSG = 'click to disable panel synchronisation'; diff --git a/doc/html/navtreeindex3.js b/doc/html/navtreeindex3.js index a73928279..28c4c8389 100644 --- a/doc/html/navtreeindex3.js +++ b/doc/html/navtreeindex3.js @@ -188,12 +188,15 @@ var NAVTREEINDEX3 = "deliver_8php.html#a397afcb9afecf0c1816b0951189dd346":[6,0,0,28,0], "diaspora_8php.html":[6,0,0,29], "diaspora_8php.html#a006731620a5242d410358b32678e48e3":[6,0,0,29,0], -"diaspora_8php.html#a0b3628a5e53332c3d3196b689fe2b94d":[6,0,0,29,23], +"diaspora_8php.html#a0b3628a5e53332c3d3196b689fe2b94d":[6,0,0,29,24], "diaspora_8php.html#a0fb2abe304aae19efc040a5e6b917829":[6,0,0,29,1], -"diaspora_8php.html#a1704748aa2384c73e43f10e71defd31a":[6,0,0,29,24], +"diaspora_8php.html#a131abd521b218d6ae6f7d2917d8b2605":[6,0,0,29,15], +"diaspora_8php.html#a1704748aa2384c73e43f10e71defd31a":[6,0,0,29,25], "diaspora_8php.html#a20b968d64ef26afe5cb0cc75a7570a31":[6,0,0,29,14], -"diaspora_8php.html#a2bf43f6b5890897f425ef4325d34b007":[6,0,0,29,18], -"diaspora_8php.html#a33ae0c4606a7df4d801c05507d87f668":[6,0,0,29,25], +"diaspora_8php.html#a2bf43f6b5890897f425ef4325d34b007":[6,0,0,29,19], +"diaspora_8php.html#a33ae0c4606a7df4d801c05507d87f668":[6,0,0,29,26], +"diaspora_8php.html#a4901762cba5cd8dcdc57bdf285eefb1b":[6,0,0,29,12], +"diaspora_8php.html#a586d5a3ba92d35cee14f879f290072aa":[6,0,0,29,17], "diaspora_8php.html#a5d57518545baa31cf8a85a937a267681":[6,0,0,29,10], "diaspora_8php.html#a5ed66b910d7b0284f9b3ee04e72306ff":[6,0,0,29,7], "diaspora_8php.html#a6f0a67b6b17503c125af32763be931b7":[6,0,0,29,4], @@ -201,24 +204,22 @@ var NAVTREEINDEX3 = "diaspora_8php.html#a7cff2f8f11044c1b3a360f20e1bbee46":[6,0,0,29,11], "diaspora_8php.html#a849754ec369e1a60fadae5c14584ca36":[6,0,0,29,3], "diaspora_8php.html#a858f70153c384f8778082cf7843a19da":[6,0,0,29,8], -"diaspora_8php.html#a900abf51398b2ef26cd2cd31c52f1b0f":[6,0,0,29,15], -"diaspora_8php.html#a938c7ee808d38725c0988fa6006805b9":[6,0,0,29,19], -"diaspora_8php.html#a9bf7ef4094e0e14f6e2b7fe76ab7ad2e":[6,0,0,29,31], -"diaspora_8php.html#aa34d2748bb97e9e193cacd572f335055":[6,0,0,29,27], -"diaspora_8php.html#aa4b1cc0bca5c3fe8d11557685e0238a9":[6,0,0,29,29], -"diaspora_8php.html#aa704d6aa2ac77be345c0f501168e6e56":[6,0,0,29,28], +"diaspora_8php.html#a900abf51398b2ef26cd2cd31c52f1b0f":[6,0,0,29,16], +"diaspora_8php.html#a938c7ee808d38725c0988fa6006805b9":[6,0,0,29,20], +"diaspora_8php.html#a9bf7ef4094e0e14f6e2b7fe76ab7ad2e":[6,0,0,29,32], +"diaspora_8php.html#aa34d2748bb97e9e193cacd572f335055":[6,0,0,29,28], +"diaspora_8php.html#aa4b1cc0bca5c3fe8d11557685e0238a9":[6,0,0,29,30], +"diaspora_8php.html#aa704d6aa2ac77be345c0f501168e6e56":[6,0,0,29,29], "diaspora_8php.html#aa8e551a53fcce34be3942d0c3e20d1f4":[6,0,0,29,6], -"diaspora_8php.html#aade0c165fcdded71352c7a67bf6ce37b":[6,0,0,29,30], +"diaspora_8php.html#aade0c165fcdded71352c7a67bf6ce37b":[6,0,0,29,31], "diaspora_8php.html#ab99505944728d46585b8312989de533d":[6,0,0,29,5], -"diaspora_8php.html#ac1ab782a34552a7c6b4dc961754ed598":[6,0,0,29,17], -"diaspora_8php.html#aca23425928635776dc17927041fc3fa8":[6,0,0,29,12], +"diaspora_8php.html#ac1ab782a34552a7c6b4dc961754ed598":[6,0,0,29,18], "diaspora_8php.html#ad9985cc4214bdfc14878785c838c8690":[6,0,0,29,9], -"diaspora_8php.html#addaf8f202e52e3f0a49ed05681f9405c":[6,0,0,29,16], "diaspora_8php.html#adef30b6fac948baedcc7194d5d155b5f":[6,0,0,29,2], -"diaspora_8php.html#ae6f52efd81fe515cd9912bc8293abf5b":[6,0,0,29,21], -"diaspora_8php.html#aeb2bb78f620dbf51d9335e6eb7444f2c":[6,0,0,29,22], -"diaspora_8php.html#af3a7f9879c14fec761dcc5563fb39bac":[6,0,0,29,26], -"diaspora_8php.html#af4698b165766f83d89ec1ea964bc92cc":[6,0,0,29,20], +"diaspora_8php.html#ae6f52efd81fe515cd9912bc8293abf5b":[6,0,0,29,22], +"diaspora_8php.html#aeb2bb78f620dbf51d9335e6eb7444f2c":[6,0,0,29,23], +"diaspora_8php.html#af3a7f9879c14fec761dcc5563fb39bac":[6,0,0,29,27], +"diaspora_8php.html#af4698b165766f83d89ec1ea964bc92cc":[6,0,0,29,21], "dir_032dd9e2cfe278a2cfa5eb9547448eb9.html":[6,0,3,1,3,0], "dir_05f4fba29266e8fd7869afcd6cefb5cb.html":[6,0,3,1,0,2], "dir_0eaa4a0adae8ba4811e133c6e594aeee.html":[6,0,2,0], @@ -248,6 +249,5 @@ var NAVTREEINDEX3 = "dir_c02447ad39a5307c81c64e880ec9e8d3.html":[6,0,3,1,1,0], "dir_cb8a8f75dcdd0b3fbfcc82e9eda410c5.html":[6,0,3,1,0,1], "dir_d41ce877eb409a4791b288730010abe2.html":[6,0,1], -"dir_d44c64559bbebec7f509842c48db8b23.html":[6,0,0], -"dir_d520c5cf583201d9437764f209363c22.html":[6,0,3,1,0] +"dir_d44c64559bbebec7f509842c48db8b23.html":[6,0,0] }; diff --git a/doc/html/navtreeindex4.js b/doc/html/navtreeindex4.js index 39fc46897..ce6278c8c 100644 --- a/doc/html/navtreeindex4.js +++ b/doc/html/navtreeindex4.js @@ -1,5 +1,6 @@ var NAVTREEINDEX4 = { +"dir_d520c5cf583201d9437764f209363c22.html":[6,0,3,1,0], "dir_f19da925ee886ec38f19b0e8c19779bc.html":[6,0,3,1,0,0], "dirprofile_8php.html":[6,0,1,24], "dirprofile_8php.html#a3e1d30d3d93863ff5615f2df4ac7f052":[6,0,1,24,0], @@ -168,8 +169,8 @@ var NAVTREEINDEX4 = "globals_0x77.html":[6,1,0,24], "globals_0x78.html":[6,1,0,25], "globals_0x7a.html":[6,1,0,26], -"globals_func.html":[6,1,1], "globals_func.html":[6,1,1,0], +"globals_func.html":[6,1,1], "globals_func_0x61.html":[6,1,1,1], "globals_func_0x62.html":[6,1,1,2], "globals_func_0x63.html":[6,1,1,3], @@ -195,8 +196,8 @@ var NAVTREEINDEX4 = "globals_func_0x77.html":[6,1,1,23], "globals_func_0x78.html":[6,1,1,24], "globals_func_0x7a.html":[6,1,1,25], -"globals_vars.html":[6,1,2,0], "globals_vars.html":[6,1,2], +"globals_vars.html":[6,1,2,0], "globals_vars_0x61.html":[6,1,2,1], "globals_vars_0x63.html":[6,1,2,2], "globals_vars_0x64.html":[6,1,2,3], @@ -248,6 +249,5 @@ var NAVTREEINDEX4 = "hubloc_8php.html#aebd244b4616ded022cbbee5e82926951":[6,0,0,42,0], "identity_8php.html":[6,0,0,43], "identity_8php.html#a1cf83ac2b645de12868edaa3a5718f05":[6,0,0,43,3], -"identity_8php.html#a224710dfb7465b706c91134247c20afa":[6,0,0,43,11], -"identity_8php.html#a2ab5172eabd375869060c9ad68323f5c":[6,0,0,43,17] +"identity_8php.html#a224710dfb7465b706c91134247c20afa":[6,0,0,43,11] }; diff --git a/doc/html/navtreeindex5.js b/doc/html/navtreeindex5.js index 6d4c64dce..daacc1a78 100644 --- a/doc/html/navtreeindex5.js +++ b/doc/html/navtreeindex5.js @@ -1,5 +1,6 @@ var NAVTREEINDEX5 = { +"identity_8php.html#a2ab5172eabd375869060c9ad68323f5c":[6,0,0,43,17], "identity_8php.html#a332df795f684788002f5a6424abacfd7":[6,0,0,43,10], "identity_8php.html#a345f4c943d84de502ec6e72d2c813945":[6,0,0,43,2], "identity_8php.html#a3570a4eb77332b292d394c4132cb8f03":[6,0,0,43,15], @@ -92,14 +93,15 @@ var NAVTREEINDEX5 = "include_2apps_8php.html#a1adcd1aff4d36ad0277daca9f3d2bbe2":[6,0,0,6,4], "include_2apps_8php.html#a1b2e737f477a2e0d9d11ef14adc5aa66":[6,0,0,6,7], "include_2apps_8php.html#a1cb5c016510e39bcdc1d1c096d51c5c7":[6,0,0,6,2], -"include_2apps_8php.html#a32fe4ed9666228fd4b67dc487cc57a83":[6,0,0,6,12], -"include_2apps_8php.html#a48289d5cc44b7638191738106ac5d030":[6,0,0,6,13], +"include_2apps_8php.html#a32fe4ed9666228fd4b67dc487cc57a83":[6,0,0,6,13], +"include_2apps_8php.html#a48289d5cc44b7638191738106ac5d030":[6,0,0,6,14], "include_2apps_8php.html#a6b472df85ed875e7ae75642cece5206f":[6,0,0,6,1], "include_2apps_8php.html#a72756e1601489eb77971eeda011446d0":[6,0,0,6,3], +"include_2apps_8php.html#a7c8bf17bd61a310bacb21ba9ad7a061b":[6,0,0,6,10], "include_2apps_8php.html#ab93a3310b7de99ee90f673518eccb658":[6,0,0,6,6], "include_2apps_8php.html#ad5f6f1443725386cc7af5ed34a5fe185":[6,0,0,6,0], -"include_2apps_8php.html#ad6ba3f254003f69f8f3f94ca5bda0680":[6,0,0,6,11], -"include_2apps_8php.html#ae64f72eb4f126e03b4eb65ed1702a3ca":[6,0,0,6,10], +"include_2apps_8php.html#ad6ba3f254003f69f8f3f94ca5bda0680":[6,0,0,6,12], +"include_2apps_8php.html#ae64f72eb4f126e03b4eb65ed1702a3ca":[6,0,0,6,11], "include_2apps_8php.html#aeab6a62d2f3dfaa86ed043a006305f46":[6,0,0,6,9], "include_2attach_8php.html":[6,0,0,7], "include_2attach_8php.html#a052f14487ff2ce72f62a09fac8d7e997":[6,0,0,7,9], @@ -247,7 +249,5 @@ var NAVTREEINDEX5 = "item_8php.html#a764bbb2e9a885a86fb23d0b5e4a09221":[6,0,1,47,4], "item_8php.html#a7b63a9d0cd02096e17dcf11f4afa7c10":[6,0,1,47,1], "item_8php.html#aa22feef4de326e1d7078dedd892e615c":[6,0,1,47,2], -"items_8php.html":[6,0,0,46], -"items_8php.html#a004e89d86b0f29b2c4da20108ecc4091":[6,0,0,46,67], -"items_8php.html#a016dd86c827d08db89061ea81d15c6cb":[6,0,0,46,3] +"items_8php.html":[6,0,0,46] }; diff --git a/doc/html/navtreeindex6.js b/doc/html/navtreeindex6.js index e4e5bba06..fad41d01c 100644 --- a/doc/html/navtreeindex6.js +++ b/doc/html/navtreeindex6.js @@ -1,71 +1,74 @@ var NAVTREEINDEX6 = { -"items_8php.html#a02ca33c31ed535d24894f8a9a91ce9df":[6,0,0,46,38], -"items_8php.html#a04a35b610acfe54434df08adec39c0c7":[6,0,0,46,28], -"items_8php.html#a0790a4550b829e85504af548623002ca":[6,0,0,46,8], -"items_8php.html#a079e099e15d88d47aeb6ca6d60da7107":[6,0,0,46,33], -"items_8php.html#a09d425596b9f8663472cf7474ad36d96":[6,0,0,46,40], -"items_8php.html#a0cf98bb619f07dd18f602683a55a5f59":[6,0,0,46,25], +"items_8php.html#a004e89d86b0f29b2c4da20108ecc4091":[6,0,0,46,68], +"items_8php.html#a016dd86c827d08db89061ea81d15c6cb":[6,0,0,46,3], +"items_8php.html#a02ca33c31ed535d24894f8a9a91ce9df":[6,0,0,46,39], +"items_8php.html#a04a35b610acfe54434df08adec39c0c7":[6,0,0,46,29], +"items_8php.html#a0790a4550b829e85504af548623002ca":[6,0,0,46,9], +"items_8php.html#a079e099e15d88d47aeb6ca6d60da7107":[6,0,0,46,34], +"items_8php.html#a09d425596b9f8663472cf7474ad36d96":[6,0,0,46,41], +"items_8php.html#a0cf98bb619f07dd18f602683a55a5f59":[6,0,0,46,26], "items_8php.html#a1e75047cf175aaee8dd16aa761913ff9":[6,0,0,46,5], -"items_8php.html#a251343637ff40a50cca93452cd530c26":[6,0,0,46,32], -"items_8php.html#a2541e6861a56d145c9281877cc501615":[6,0,0,46,43], +"items_8php.html#a251343637ff40a50cca93452cd530c26":[6,0,0,46,33], +"items_8php.html#a2541e6861a56d145c9281877cc501615":[6,0,0,46,44], "items_8php.html#a275108c050f7eb18bcbb5018e6b81cf6":[6,0,0,46,4], -"items_8php.html#a2baa9e05f1e8aa3dd61c85803ae39bd6":[6,0,0,46,66], -"items_8php.html#a2d840c74ed23d1b6c7daee05cf89dda7":[6,0,0,46,21], +"items_8php.html#a2baa9e05f1e8aa3dd61c85803ae39bd6":[6,0,0,46,67], +"items_8php.html#a2d840c74ed23d1b6c7daee05cf89dda7":[6,0,0,46,22], "items_8php.html#a36e656667193c83aa2cc03a024fc131b":[6,0,0,46,0], -"items_8php.html#a410f9c743877c125ca06312373346903":[6,0,0,46,50], -"items_8php.html#a49905ea75adfe8a2d110be344d18d6a6":[6,0,0,46,52], -"items_8php.html#a4e6d7639431e0dd8e9f4dba8e1ac408b":[6,0,0,46,55], -"items_8php.html#a52c24114b73c0bdb605a03cd29712223":[6,0,0,46,34], -"items_8php.html#a536d0313b6ffe33b9d2490c4e25c5361":[6,0,0,46,30], -"items_8php.html#a555762e1022a4b8e3c3abd32e7812408":[6,0,0,46,15], -"items_8php.html#a566c601726697e044e75284af7fb6f17":[6,0,0,46,20], -"items_8php.html#a56b2a4abcadfac71175cd50555528cc3":[6,0,0,46,13], -"items_8php.html#a5e5be7bf1f8257dec0b2647e60a3f3f1":[6,0,0,46,27], -"items_8php.html#a5ed782ff5b9cf050bec931e06de12c00":[6,0,0,46,42], -"items_8php.html#a5f690fc2484abec07840b4f9dd525bd9":[6,0,0,46,18], -"items_8php.html#a649dc3e53ed794d0ead4b5d037f8d8d7":[6,0,0,46,41], -"items_8php.html#a668ece2c37f05cc3abe538eb0dabfe55":[6,0,0,46,16], -"items_8php.html#a6bee35961f2e32905f20367a9309d627":[6,0,0,46,36], -"items_8php.html#a6f7e1334af5d684a987fa6a3eb37f4cc":[6,0,0,46,39], -"items_8php.html#a756738301f2ed96be50232500677d58a":[6,0,0,46,45], -"items_8php.html#a77051724d1784074ff187e73a4db93fe":[6,0,0,46,35], +"items_8php.html#a410f9c743877c125ca06312373346903":[6,0,0,46,51], +"items_8php.html#a49905ea75adfe8a2d110be344d18d6a6":[6,0,0,46,53], +"items_8php.html#a4e6d7639431e0dd8e9f4dba8e1ac408b":[6,0,0,46,56], +"items_8php.html#a52c24114b73c0bdb605a03cd29712223":[6,0,0,46,35], +"items_8php.html#a536d0313b6ffe33b9d2490c4e25c5361":[6,0,0,46,31], +"items_8php.html#a555762e1022a4b8e3c3abd32e7812408":[6,0,0,46,16], +"items_8php.html#a566c601726697e044e75284af7fb6f17":[6,0,0,46,21], +"items_8php.html#a56b2a4abcadfac71175cd50555528cc3":[6,0,0,46,14], +"items_8php.html#a5e5be7bf1f8257dec0b2647e60a3f3f1":[6,0,0,46,28], +"items_8php.html#a5ed782ff5b9cf050bec931e06de12c00":[6,0,0,46,43], +"items_8php.html#a5f690fc2484abec07840b4f9dd525bd9":[6,0,0,46,19], +"items_8php.html#a649dc3e53ed794d0ead4b5d037f8d8d7":[6,0,0,46,42], +"items_8php.html#a668ece2c37f05cc3abe538eb0dabfe55":[6,0,0,46,17], +"items_8php.html#a6bee35961f2e32905f20367a9309d627":[6,0,0,46,37], +"items_8php.html#a6f7e1334af5d684a987fa6a3eb37f4cc":[6,0,0,46,40], +"items_8php.html#a756738301f2ed96be50232500677d58a":[6,0,0,46,46], +"items_8php.html#a77051724d1784074ff187e73a4db93fe":[6,0,0,46,36], "items_8php.html#a772f0ae77ad77c8ab68ed918a3870946":[6,0,0,46,7], -"items_8php.html#a77da7ce9a117601d49ac4a67c71b514f":[6,0,0,46,48], -"items_8php.html#a78a60e39f6991bd3324a24dcbf9dac5a":[6,0,0,46,56], +"items_8php.html#a77da7ce9a117601d49ac4a67c71b514f":[6,0,0,46,49], +"items_8php.html#a78a60e39f6991bd3324a24dcbf9dac5a":[6,0,0,46,57], "items_8php.html#a81565acf729e629e588d823308448e3c":[6,0,0,46,1], -"items_8php.html#a82955cc578f0fa600acec84475026194":[6,0,0,46,17], -"items_8php.html#a83a349062945d585edb4b3c5d763ab6e":[6,0,0,46,53], -"items_8php.html#a8675e62674de6fb7c42e4a408c7116cc":[6,0,0,46,49], +"items_8php.html#a82955cc578f0fa600acec84475026194":[6,0,0,46,18], +"items_8php.html#a83a349062945d585edb4b3c5d763ab6e":[6,0,0,46,54], +"items_8php.html#a8675e62674de6fb7c42e4a408c7116cc":[6,0,0,46,50], "items_8php.html#a87ac9e359591721a824ecd23bbb56296":[6,0,0,46,6], -"items_8php.html#a88c6cf7649ac836fbbed82a7a0315110":[6,0,0,46,62], -"items_8php.html#a8f3c85c584ccd2b98c3ca440e45b40f8":[6,0,0,46,11], -"items_8php.html#a94ddb1d6c8fa21dd7433677e85168037":[6,0,0,46,31], -"items_8php.html#a9b449eeae50003414b8b30ca927af434":[6,0,0,46,65], -"items_8php.html#aa2d3caa2f27720762b5c729e07df40fb":[6,0,0,46,47], -"items_8php.html#aa371905f0a211b307cb3f7188c6cba04":[6,0,0,46,63], -"items_8php.html#aa579bc4445d60098b1410961ca8e96b7":[6,0,0,46,10], -"items_8php.html#aa723c0571e314a1853a24c5854b4f54f":[6,0,0,46,22], -"items_8php.html#aa9e99613d38a97b39c8cf5449699c2ee":[6,0,0,46,9], -"items_8php.html#aab9c6bae4c40799867596bdaae9829fd":[6,0,0,46,29], -"items_8php.html#aab9e0c58247427126de0699c729c3b6c":[6,0,0,46,58], -"items_8php.html#aabfaa193b83154c2a81e91284e5d5e59":[6,0,0,46,64], -"items_8php.html#aac8c9eb4338e2a996c43914392c6cfdb":[6,0,0,46,14], -"items_8php.html#ab1bce4261bcf75ad62753b498a144d17":[6,0,0,46,60], -"items_8php.html#aba98fcbbcd7044a7e9ea34edabc14c87":[6,0,0,46,26], +"items_8php.html#a88c6cf7649ac836fbbed82a7a0315110":[6,0,0,46,63], +"items_8php.html#a8f3c85c584ccd2b98c3ca440e45b40f8":[6,0,0,46,12], +"items_8php.html#a94ddb1d6c8fa21dd7433677e85168037":[6,0,0,46,32], +"items_8php.html#a9b449eeae50003414b8b30ca927af434":[6,0,0,46,66], +"items_8php.html#aa2d3caa2f27720762b5c729e07df40fb":[6,0,0,46,48], +"items_8php.html#aa371905f0a211b307cb3f7188c6cba04":[6,0,0,46,64], +"items_8php.html#aa579bc4445d60098b1410961ca8e96b7":[6,0,0,46,11], +"items_8php.html#aa723c0571e314a1853a24c5854b4f54f":[6,0,0,46,23], +"items_8php.html#aa9e99613d38a97b39c8cf5449699c2ee":[6,0,0,46,10], +"items_8php.html#aab9c6bae4c40799867596bdaae9829fd":[6,0,0,46,30], +"items_8php.html#aab9e0c58247427126de0699c729c3b6c":[6,0,0,46,59], +"items_8php.html#aabfaa193b83154c2a81e91284e5d5e59":[6,0,0,46,65], +"items_8php.html#aac8c9eb4338e2a996c43914392c6cfdb":[6,0,0,46,15], +"items_8php.html#ab1bce4261bcf75ad62753b498a144d17":[6,0,0,46,61], +"items_8php.html#aba98fcbbcd7044a7e9ea34edabc14c87":[6,0,0,46,27], +"items_8php.html#abeb7886cde44d9a83dbaf2bc4ab18723":[6,0,0,46,8], "items_8php.html#abf7a1b73eb352d79acd36309b0dababd":[6,0,0,46,2], -"items_8php.html#ac6673627d289ee4f547de0fe3b7acd0a":[6,0,0,46,19], -"items_8php.html#acf0bf7c9d21ac84f32effb754f7ad484":[6,0,0,46,44], -"items_8php.html#ad2abb4644ff1f20fefbc80326fe01cf0":[6,0,0,46,51], -"items_8php.html#ad34827ed330898456783fb14c7b46154":[6,0,0,46,61], -"items_8php.html#ad4ee16e3ff1eaf60428c61f82ba25e6a":[6,0,0,46,54], -"items_8php.html#adc26e08aa61f5666da04ab5d2a9d68a6":[6,0,0,46,12], -"items_8php.html#adf2b8137dc4ad9ec958de2842f16f3c2":[6,0,0,46,59], -"items_8php.html#adf980098b6de9c3993bc3ff26a8dd6f9":[6,0,0,46,24], -"items_8php.html#ae73794179b62d39bb597ff670ab1c1e5":[6,0,0,46,37], -"items_8php.html#af6237605c60d69abdd959ddbbee3420c":[6,0,0,46,57], -"items_8php.html#af94c281016c6c912d06e064113336c5c":[6,0,0,46,46], -"items_8php.html#afbcf26dfcf8a83fff952aa858c1b7b67":[6,0,0,46,23], +"items_8php.html#ac6673627d289ee4f547de0fe3b7acd0a":[6,0,0,46,20], +"items_8php.html#acf0bf7c9d21ac84f32effb754f7ad484":[6,0,0,46,45], +"items_8php.html#ad2abb4644ff1f20fefbc80326fe01cf0":[6,0,0,46,52], +"items_8php.html#ad34827ed330898456783fb14c7b46154":[6,0,0,46,62], +"items_8php.html#ad4ee16e3ff1eaf60428c61f82ba25e6a":[6,0,0,46,55], +"items_8php.html#adc26e08aa61f5666da04ab5d2a9d68a6":[6,0,0,46,13], +"items_8php.html#adf2b8137dc4ad9ec958de2842f16f3c2":[6,0,0,46,60], +"items_8php.html#adf980098b6de9c3993bc3ff26a8dd6f9":[6,0,0,46,25], +"items_8php.html#ae73794179b62d39bb597ff670ab1c1e5":[6,0,0,46,38], +"items_8php.html#af6237605c60d69abdd959ddbbee3420c":[6,0,0,46,58], +"items_8php.html#af94c281016c6c912d06e064113336c5c":[6,0,0,46,47], +"items_8php.html#afbcf26dfcf8a83fff952aa858c1b7b67":[6,0,0,46,24], "lang_8php.html":[6,0,1,48], "lang_8php.html#a4c5c1140f51a638f224275cd618c2f37":[6,0,1,48,0], "language_8php.html":[6,0,0,47], @@ -246,8 +249,5 @@ var NAVTREEINDEX6 = "photo_8php.html#a582779d24882b0d31ee909a91d70a448":[6,0,1,77,0], "photo__driver_8php.html":[6,0,0,1,0], "photo__driver_8php.html#a1d0bc7161dec0d177b7d3bbe4421af9a":[6,0,0,1,0,2], -"photo__driver_8php.html#a243cee492ce443afb6a7d77d54b6c4aa":[6,0,0,1,0,1], -"photo__driver_8php.html#a32e2817faa25d7f11f60a8abff565035":[6,0,0,1,0,4], -"photo__driver_8php.html#a78f5a10c568d2a9bbbb129dc96548887":[6,0,0,1,0,3], -"photo__gd_8php.html":[6,0,0,1,1] +"photo__driver_8php.html#a243cee492ce443afb6a7d77d54b6c4aa":[6,0,0,1,0,1] }; diff --git a/doc/html/navtreeindex7.js b/doc/html/navtreeindex7.js index bb4f1dace..6e6983abb 100644 --- a/doc/html/navtreeindex7.js +++ b/doc/html/navtreeindex7.js @@ -1,5 +1,8 @@ var NAVTREEINDEX7 = { +"photo__driver_8php.html#a32e2817faa25d7f11f60a8abff565035":[6,0,0,1,0,4], +"photo__driver_8php.html#a78f5a10c568d2a9bbbb129dc96548887":[6,0,0,1,0,3], +"photo__gd_8php.html":[6,0,0,1,1], "photo__imagick_8php.html":[6,0,0,1,2], "php2po_8php.html":[6,0,2,6], "php2po_8php.html#a1594a11499d06cc8a789ee7ca0c7a12b":[6,0,2,6,7], @@ -246,8 +249,5 @@ var NAVTREEINDEX7 = "starred_8php.html#a63024fb418c678e49fd535e3752d349a":[6,0,1,113,0], "subthread_8php.html":[6,0,1,114], "subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3":[6,0,1,114,0], -"suggest_8php.html":[6,0,1,115], -"suggest_8php.html#a58748a8235d4523f8333847f3e42dd91":[6,0,1,115,0], -"suggest_8php.html#a696acf1dd8070e479adcc80c63c6718c":[6,0,1,115,1], -"system__unavailable_8php.html":[6,0,0,74] +"suggest_8php.html":[6,0,1,115] }; diff --git a/doc/html/navtreeindex8.js b/doc/html/navtreeindex8.js index 5ec9e888f..a7746cd2e 100644 --- a/doc/html/navtreeindex8.js +++ b/doc/html/navtreeindex8.js @@ -1,5 +1,8 @@ var NAVTREEINDEX8 = { +"suggest_8php.html#a58748a8235d4523f8333847f3e42dd91":[6,0,1,115,0], +"suggest_8php.html#a696acf1dd8070e479adcc80c63c6718c":[6,0,1,115,1], +"system__unavailable_8php.html":[6,0,0,74], "system__unavailable_8php.html#a73751a6bcc17ad3ca503496e2fb020fa":[6,0,0,74,0], "tagger_8php.html":[6,0,1,116], "tagger_8php.html#a0e4a3eb177d1684553c547503d67161c":[6,0,1,116,0], @@ -246,8 +249,5 @@ var NAVTREEINDEX8 = "widgets_8php.html#af37fdad3b2e861d860a4a8c4d8a76c0b":[6,0,0,78,4], "widgets_8php.html#afa2e55a78f95667a6da082efac7fec74":[6,0,0,78,17], "xchan_8php.html":[6,0,1,135], -"xchan_8php.html#a9853348bf1a35c644460221ba75edc2d":[6,0,1,135,0], -"xrd_8php.html":[6,0,1,136], -"xrd_8php.html#aee3cf087968e4a0ff3a87de16eb23270":[6,0,1,136,0], -"xref_8php.html":[6,0,1,137] +"xchan_8php.html#a9853348bf1a35c644460221ba75edc2d":[6,0,1,135,0] }; diff --git a/doc/html/navtreeindex9.js b/doc/html/navtreeindex9.js index 3160df6d3..f629f514c 100644 --- a/doc/html/navtreeindex9.js +++ b/doc/html/navtreeindex9.js @@ -1,5 +1,8 @@ var NAVTREEINDEX9 = { +"xrd_8php.html":[6,0,1,136], +"xrd_8php.html#aee3cf087968e4a0ff3a87de16eb23270":[6,0,1,136,0], +"xref_8php.html":[6,0,1,137], "xref_8php.html#a9bee399213b8de8226b0d60834307473":[6,0,1,137,0], "zfinger_8php.html":[6,0,1,138], "zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0":[6,0,1,138,0], diff --git a/doc/html/photo__driver_8php.html b/doc/html/photo__driver_8php.html index 2697b71ff..272c6eb87 100644 --- a/doc/html/photo__driver_8php.html +++ b/doc/html/photo__driver_8php.html @@ -232,7 +232,7 @@ Functions diff --git a/doc/html/php_2theme__init_8php.html b/doc/html/php_2theme__init_8php.html index 359dfe491..5ff696a06 100644 --- a/doc/html/php_2theme__init_8php.html +++ b/doc/html/php_2theme__init_8php.html @@ -127,7 +127,7 @@ Variables

                Those who require this feature will know what to do with it. Those who don't, won't. Eventually this functionality needs to be provided by a module such that permissions can be enforced. At the moment it's more of a proof of concept; but sufficient for our immediate needs.

                -

                Referenced by admin_page_channels(), api_call(), api_user(), appman_content(), attach_mkdir(), attach_store(), bbcode(), blocks_content(), bookmark_add(), bookmarks_content(), build_sync_packet(), channel_content(), channel_init(), channel_remove(), chat_content(), chat_init(), chat_post(), chatroom_create(), chatroom_destroy(), cloud_init(), connections_init(), connections_post(), connedit_content(), connedit_init(), connedit_post(), conversation(), design_tools(), directory_run(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), event_addtocal(), events_content(), events_post(), feed_init(), filestorage_content(), filestorage_post(), fix_attached_file_permissions(), get_feed_for(), get_public_feed(), handle_feed(), handle_tag(), hcard_init(), home_init(), import_post(), importelm_post(), invite_content(), is_public_profile(), item_photo_menu(), item_post(), item_store(), item_store_update(), items_fetch(), layouts_content(), magic_init(), mail_content(), mail_post(), menu_add_item(), menu_edit_item(), message_content(), mitem_content(), mitem_post(), mood_init(), nav(), network_content(), network_init(), new_contact(), notifier_run(), parse_app_description(), photo_upload(), photos_albums_list(), photos_content(), photos_create_item(), photos_list_photos(), ping_init(), poke_init(), post_activity_item(), post_to_red_delete_comment(), post_to_red_delete_post(), post_to_red_displayAdminContent(), post_to_red_post(), probe_content(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), profile_init(), profile_photo_init(), profile_photo_post(), profiles_content(), profiles_post(), profperm_init(), rbmark_content(), rbmark_post(), rpost_content(), send_message(), settings_post(), sources_post(), start_delivery_chain(), tagger_content(), thing_content(), thing_init(), uexport_init(), update_remote_id(), wall_attach_post(), wall_upload_post(), webpages_content(), wfinger_init(), widget_settings_menu(), zot_build_packet(), zot_finger(), and zot_refresh().

                +

                Referenced by admin_page_channels(), api_call(), api_user(), appman_content(), attach_mkdir(), attach_store(), bbcode(), blocks_content(), bookmark_add(), bookmarks_content(), build_sync_packet(), channel_content(), channel_init(), channel_remove(), chat_content(), chat_init(), chat_post(), chatroom_create(), chatroom_destroy(), cloud_init(), connections_init(), connections_post(), connedit_content(), connedit_init(), connedit_post(), conversation(), design_tools(), diaspora_msg_build(), diaspora_pubmsg_build(), directory_run(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), event_addtocal(), events_content(), events_post(), feed_init(), filestorage_content(), filestorage_post(), fix_attached_file_permissions(), get_feed_for(), get_public_feed(), handle_feed(), handle_tag(), hcard_init(), home_init(), import_post(), importelm_post(), invite_content(), is_public_profile(), item_photo_menu(), item_post(), item_store(), item_store_update(), items_fetch(), layouts_content(), magic_init(), mail_content(), mail_post(), menu_add_item(), menu_edit_item(), message_content(), mitem_content(), mitem_post(), mood_init(), nav(), network_content(), network_init(), new_contact(), notifier_run(), parse_app_description(), photo_upload(), photos_albums_list(), photos_content(), photos_create_item(), photos_list_photos(), ping_init(), poke_init(), post_activity_item(), post_to_red_delete_comment(), post_to_red_delete_post(), post_to_red_displayAdminContent(), post_to_red_post(), probe_content(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), profile_init(), profile_photo_init(), profile_photo_post(), profiles_content(), profiles_post(), profperm_init(), rbmark_content(), rbmark_post(), rpost_content(), send_message(), settings_post(), sources_post(), start_delivery_chain(), tagger_content(), thing_content(), thing_init(), uexport_init(), update_remote_id(), wall_attach_post(), wall_upload_post(), webpages_content(), wfinger_init(), widget_settings_menu(), zot_build_packet(), zot_finger(), and zot_refresh().

                diff --git a/doc/html/plugin_8php.html b/doc/html/plugin_8php.html index 2f5ab3c62..140eff3e9 100644 --- a/doc/html/plugin_8php.html +++ b/doc/html/plugin_8php.html @@ -308,7 +308,7 @@ Functions
                -

                Referenced by admin_content(), admin_page_channels(), admin_page_dbsync(), admin_page_hubloc(), admin_page_logs(), admin_page_plugins(), admin_page_site(), admin_page_summary(), admin_page_themes(), admin_page_users(), advanced_profile(), alt_pager(), api_apply_template(), api_content(), app_render(), appman_content(), apps_content(), apw_form(), blocks_content(), blogtheme_form(), App\build_pagehead(), categories_widget(), channel_content(), chat_content(), check_php(), common_content(), common_friends_visitor_widget(), connect_content(), connections_content(), connedit_content(), construct_page(), contact_block(), conversation(), delegate_content(), design_tools(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_retraction(), diaspora_send_status(), diaspora_share(), diaspora_unshare(), dir_safe_mode(), dir_sort_links(), directory_content(), dirprofile_init(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), fbrowser_content(), field_timezone(), fileas_widget(), filer_content(), filestorage_content(), findpeople_widget(), format_categories(), format_filer(), RedBrowser\generateDirectoryIndex(), get_birthdays(), Item\get_comment_box(), get_events(), get_feed_for(), group_content(), group_side(), help_content(), hostxrd_init(), RedBrowser\htmlActionsPanel(), identity_selector(), import_content(), invite_content(), lang_selector(), layouts_content(), login(), lostpass_content(), mail_content(), manage_content(), match_content(), menu_content(), menu_render(), message_content(), micropro(), mini_group_select(), mitem_content(), mood_content(), nav(), network_content(), new_channel_content(), notification(), notifications_content(), notify_content(), oembed_format_object(), oexchange_init(), opensearch_init(), pagelist_widget(), pdledit_content(), photos_album_widget(), photos_content(), poco_init(), poke_content(), poll_content(), populate_acl(), profile_sidebar(), profiles_content(), rbmark_content(), redbasic_form(), register_content(), removeaccount_content(), removeme_content(), rmagic_content(), rpost_content(), search_content(), setup_content(), siteinfo_content(), sources_content(), suggest_content(), theme_attachments(), thing_content(), vcard_from_xchan(), viewconnections_content(), vote_content(), webpages_content(), widget_affinity(), widget_appselect(), widget_archive(), widget_bookmarkedchats(), widget_chatroom_list(), widget_filer(), widget_follow(), widget_mailmenu(), widget_notes(), widget_savedsearch(), widget_settings_menu(), widget_suggestedchats(), widget_suggestions(), writepages_widget(), and xrd_init().

                +

                Referenced by admin_content(), admin_page_channels(), admin_page_dbsync(), admin_page_hubloc(), admin_page_logs(), admin_page_plugins(), admin_page_profs(), admin_page_site(), admin_page_summary(), admin_page_themes(), admin_page_users(), advanced_profile(), alt_pager(), api_apply_template(), api_content(), app_render(), appman_content(), apps_content(), apw_form(), blocks_content(), blogtheme_form(), App\build_pagehead(), categories_widget(), channel_content(), chat_content(), check_php(), common_content(), common_friends_visitor_widget(), connect_content(), connections_content(), connedit_content(), construct_page(), contact_block(), conversation(), delegate_content(), design_tools(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_retraction(), diaspora_send_status(), diaspora_share(), diaspora_unshare(), dir_safe_mode(), dir_sort_links(), directory_content(), dirprofile_init(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), fbrowser_content(), field_timezone(), fileas_widget(), filer_content(), filestorage_content(), findpeople_widget(), format_categories(), format_filer(), RedBrowser\generateDirectoryIndex(), get_birthdays(), Item\get_comment_box(), get_events(), get_feed_for(), group_content(), group_side(), help_content(), hostxrd_init(), RedBrowser\htmlActionsPanel(), identity_selector(), import_content(), invite_content(), lang_selector(), layouts_content(), login(), lostpass_content(), mail_content(), manage_content(), match_content(), menu_content(), menu_render(), message_content(), micropro(), mini_group_select(), mitem_content(), mood_content(), nav(), network_content(), new_channel_content(), notification(), notifications_content(), notify_content(), oembed_format_object(), oexchange_init(), opensearch_init(), pagelist_widget(), pdledit_content(), photos_album_widget(), photos_content(), poco_init(), poke_content(), poll_content(), populate_acl(), profile_sidebar(), profiles_content(), rbmark_content(), redbasic_form(), register_content(), removeaccount_content(), removeme_content(), rmagic_content(), rpost_content(), search_content(), setup_content(), siteinfo_content(), sources_content(), suggest_content(), theme_attachments(), thing_content(), vcard_from_xchan(), viewconnections_content(), vote_content(), webpages_content(), widget_affinity(), widget_appselect(), widget_archive(), widget_bookmarkedchats(), widget_chatroom_list(), widget_filer(), widget_follow(), widget_mailmenu(), widget_notes(), widget_savedsearch(), widget_settings_menu(), widget_suggestedchats(), widget_suggestions(), writepages_widget(), and xrd_init().

                diff --git a/doc/html/search/all_63.js b/doc/html/search/all_63.js index 4b92715be..5d1a3a072 100644 --- a/doc/html/search/all_63.js +++ b/doc/html/search/all_63.js @@ -88,6 +88,7 @@ var searchData= ['comanche_5freplace_5fregion',['comanche_replace_region',['../comanche_8php.html#a028f004d5b8c23d6367816d899e17cfe',1,'comanche.php']]], ['comanche_5fwebpage',['comanche_webpage',['../comanche_8php.html#ae9fe1ce574db3dd0931eada80234f82a',1,'comanche.php']]], ['comanche_5fwidget',['comanche_widget',['../comanche_8php.html#a6b0191c1a63db1696a2eb139d90d9e7f',1,'comanche.php']]], + ['comments_5fare_5fnow_5fclosed',['comments_are_now_closed',['../items_8php.html#abeb7886cde44d9a83dbaf2bc4ab18723',1,'items.php']]], ['common_2ephp',['common.php',['../common_8php.html',1,'']]], ['common_5fcontent',['common_content',['../common_8php.html#ab63408f39abef7a6915186e8dabc5a96',1,'common.php']]], ['common_5ffriends',['common_friends',['../socgraph_8php.html#a7d34cd58025bcd9e575282f44db75918',1,'socgraph.php']]], diff --git a/doc/html/search/all_64.js b/doc/html/search/all_64.js index 2adecb72f..512283299 100644 --- a/doc/html/search/all_64.js +++ b/doc/html/search/all_64.js @@ -62,12 +62,13 @@ var searchData= ['diaspora_5fis_5freshare',['diaspora_is_reshare',['../diaspora_8php.html#ad9985cc4214bdfc14878785c838c8690',1,'diaspora.php']]], ['diaspora_5flike',['diaspora_like',['../diaspora_8php.html#a5d57518545baa31cf8a85a937a267681',1,'diaspora.php']]], ['diaspora_5fmessage',['diaspora_message',['../diaspora_8php.html#a7cff2f8f11044c1b3a360f20e1bbee46',1,'diaspora.php']]], - ['diaspora_5fmsg_5fbuild',['diaspora_msg_build',['../diaspora_8php.html#aca23425928635776dc17927041fc3fa8',1,'diaspora.php']]], + ['diaspora_5fmsg_5fbuild',['diaspora_msg_build',['../diaspora_8php.html#a4901762cba5cd8dcdc57bdf285eefb1b',1,'diaspora.php']]], ['diaspora_5fol',['diaspora_ol',['../bb2diaspora_8php.html#a8b96bd45884fa1c40b942939354197d4',1,'bb2diaspora.php']]], ['diaspora_5fphoto',['diaspora_photo',['../diaspora_8php.html#a71fe9bb66626b4197ae018a230778bb2',1,'diaspora.php']]], ['diaspora_5fpost',['diaspora_post',['../diaspora_8php.html#a20b968d64ef26afe5cb0cc75a7570a31',1,'diaspora.php']]], + ['diaspora_5fprocess_5foutbound',['diaspora_process_outbound',['../diaspora_8php.html#a131abd521b218d6ae6f7d2917d8b2605',1,'diaspora.php']]], ['diaspora_5fprofile',['diaspora_profile',['../diaspora_8php.html#a900abf51398b2ef26cd2cd31c52f1b0f',1,'diaspora.php']]], - ['diaspora_5fpubmsg_5fbuild',['diaspora_pubmsg_build',['../diaspora_8php.html#addaf8f202e52e3f0a49ed05681f9405c',1,'diaspora.php']]], + ['diaspora_5fpubmsg_5fbuild',['diaspora_pubmsg_build',['../diaspora_8php.html#a586d5a3ba92d35cee14f879f290072aa',1,'diaspora.php']]], ['diaspora_5frequest',['diaspora_request',['../diaspora_8php.html#ac1ab782a34552a7c6b4dc961754ed598',1,'diaspora.php']]], ['diaspora_5freshare',['diaspora_reshare',['../diaspora_8php.html#a2bf43f6b5890897f425ef4325d34b007',1,'diaspora.php']]], ['diaspora_5fretraction',['diaspora_retraction',['../diaspora_8php.html#a938c7ee808d38725c0988fa6006805b9',1,'diaspora.php']]], diff --git a/doc/html/search/all_65.js b/doc/html/search/all_65.js index 10bddfec9..d8149217e 100644 --- a/doc/html/search/all_65.js +++ b/doc/html/search/all_65.js @@ -8,6 +8,7 @@ var searchData= ['editpost_5fcontent',['editpost_content',['../editpost_8php.html#a34011690864d122680c802e9e748ccfb',1,'editpost.php']]], ['editwebpage_2ephp',['editwebpage.php',['../editwebpage_8php.html',1,'']]], ['editwebpage_5fcontent',['editwebpage_content',['../editwebpage_8php.html#a375e945255fad79a71036528f7480650',1,'editwebpage.php']]], + ['element_5finstall',['element_install',['../include_2apps_8php.html#a7c8bf17bd61a310bacb21ba9ad7a061b',1,'apps.php']]], ['else',['else',['../auth_8php.html#a0950af7c2888ca1d4743fe5d0bff9ae5',1,'else(): auth.php'],['../fpostit_8php.html#a501b5ca82f287509fc691c88524064c1',1,'else(): fpostit.php'],['../tpldebug_8php.html#afbc7aadb3f7ff1edf0aaaa326a42179c',1,'else(): tpldebug.php'],['../redbasic_2php_2style_8php.html#ab3afb90d611eca90819f597a2c0bb459',1,'else(): style.php']]], ['email_5fheader_5fencode',['email_header_encode',['../include_2network_8php.html#a469b9bd700269cd07d954f1a16c5899b',1,'network.php']]], ['email_5fsend',['email_send',['../include_2network_8php.html#a1ff07d9fad93b713b93da0ab77aab7f0',1,'network.php']]], diff --git a/doc/html/search/functions_63.js b/doc/html/search/functions_63.js index b719c2a50..d11551d2d 100644 --- a/doc/html/search/functions_63.js +++ b/doc/html/search/functions_63.js @@ -71,6 +71,7 @@ var searchData= ['comanche_5freplace_5fregion',['comanche_replace_region',['../comanche_8php.html#a028f004d5b8c23d6367816d899e17cfe',1,'comanche.php']]], ['comanche_5fwebpage',['comanche_webpage',['../comanche_8php.html#ae9fe1ce574db3dd0931eada80234f82a',1,'comanche.php']]], ['comanche_5fwidget',['comanche_widget',['../comanche_8php.html#a6b0191c1a63db1696a2eb139d90d9e7f',1,'comanche.php']]], + ['comments_5fare_5fnow_5fclosed',['comments_are_now_closed',['../items_8php.html#abeb7886cde44d9a83dbaf2bc4ab18723',1,'items.php']]], ['common_5fcontent',['common_content',['../common_8php.html#ab63408f39abef7a6915186e8dabc5a96',1,'common.php']]], ['common_5ffriends',['common_friends',['../socgraph_8php.html#a7d34cd58025bcd9e575282f44db75918',1,'socgraph.php']]], ['common_5ffriends_5fvisitor_5fwidget',['common_friends_visitor_widget',['../contact__widgets_8php.html#a552f8544528cec0c995cea7287ea9d65',1,'contact_widgets.php']]], diff --git a/doc/html/search/functions_64.js b/doc/html/search/functions_64.js index 3fa1e0b1c..7c43a67b3 100644 --- a/doc/html/search/functions_64.js +++ b/doc/html/search/functions_64.js @@ -41,12 +41,13 @@ var searchData= ['diaspora_5fis_5freshare',['diaspora_is_reshare',['../diaspora_8php.html#ad9985cc4214bdfc14878785c838c8690',1,'diaspora.php']]], ['diaspora_5flike',['diaspora_like',['../diaspora_8php.html#a5d57518545baa31cf8a85a937a267681',1,'diaspora.php']]], ['diaspora_5fmessage',['diaspora_message',['../diaspora_8php.html#a7cff2f8f11044c1b3a360f20e1bbee46',1,'diaspora.php']]], - ['diaspora_5fmsg_5fbuild',['diaspora_msg_build',['../diaspora_8php.html#aca23425928635776dc17927041fc3fa8',1,'diaspora.php']]], + ['diaspora_5fmsg_5fbuild',['diaspora_msg_build',['../diaspora_8php.html#a4901762cba5cd8dcdc57bdf285eefb1b',1,'diaspora.php']]], ['diaspora_5fol',['diaspora_ol',['../bb2diaspora_8php.html#a8b96bd45884fa1c40b942939354197d4',1,'bb2diaspora.php']]], ['diaspora_5fphoto',['diaspora_photo',['../diaspora_8php.html#a71fe9bb66626b4197ae018a230778bb2',1,'diaspora.php']]], ['diaspora_5fpost',['diaspora_post',['../diaspora_8php.html#a20b968d64ef26afe5cb0cc75a7570a31',1,'diaspora.php']]], + ['diaspora_5fprocess_5foutbound',['diaspora_process_outbound',['../diaspora_8php.html#a131abd521b218d6ae6f7d2917d8b2605',1,'diaspora.php']]], ['diaspora_5fprofile',['diaspora_profile',['../diaspora_8php.html#a900abf51398b2ef26cd2cd31c52f1b0f',1,'diaspora.php']]], - ['diaspora_5fpubmsg_5fbuild',['diaspora_pubmsg_build',['../diaspora_8php.html#addaf8f202e52e3f0a49ed05681f9405c',1,'diaspora.php']]], + ['diaspora_5fpubmsg_5fbuild',['diaspora_pubmsg_build',['../diaspora_8php.html#a586d5a3ba92d35cee14f879f290072aa',1,'diaspora.php']]], ['diaspora_5frequest',['diaspora_request',['../diaspora_8php.html#ac1ab782a34552a7c6b4dc961754ed598',1,'diaspora.php']]], ['diaspora_5freshare',['diaspora_reshare',['../diaspora_8php.html#a2bf43f6b5890897f425ef4325d34b007',1,'diaspora.php']]], ['diaspora_5fretraction',['diaspora_retraction',['../diaspora_8php.html#a938c7ee808d38725c0988fa6006805b9',1,'diaspora.php']]], diff --git a/doc/html/search/functions_65.js b/doc/html/search/functions_65.js index 8424dbba4..213d3e89b 100644 --- a/doc/html/search/functions_65.js +++ b/doc/html/search/functions_65.js @@ -4,6 +4,7 @@ var searchData= ['editlayout_5fcontent',['editlayout_content',['../editlayout_8php.html#aa877e4157a26b099de904164181dd386',1,'editlayout.php']]], ['editpost_5fcontent',['editpost_content',['../editpost_8php.html#a34011690864d122680c802e9e748ccfb',1,'editpost.php']]], ['editwebpage_5fcontent',['editwebpage_content',['../editwebpage_8php.html#a375e945255fad79a71036528f7480650',1,'editwebpage.php']]], + ['element_5finstall',['element_install',['../include_2apps_8php.html#a7c8bf17bd61a310bacb21ba9ad7a061b',1,'apps.php']]], ['email_5fheader_5fencode',['email_header_encode',['../include_2network_8php.html#a469b9bd700269cd07d954f1a16c5899b',1,'network.php']]], ['email_5fsend',['email_send',['../include_2network_8php.html#a1ff07d9fad93b713b93da0ab77aab7f0',1,'network.php']]], ['encode_5fitem',['encode_item',['../items_8php.html#a82955cc578f0fa600acec84475026194',1,'items.php']]], diff --git a/doc/html/text_8php.html b/doc/html/text_8php.html index 09389d84b..0af692d99 100644 --- a/doc/html/text_8php.html +++ b/doc/html/text_8php.html @@ -328,7 +328,7 @@ Variables @@ -459,7 +459,7 @@ Variables @@ -487,7 +487,7 @@ Variables @@ -698,7 +698,7 @@ Variables
                Returns
                string
                -

                Referenced by admin_page_logs(), app_store(), app_update(), appman_post(), bookmark_add(), chatsvc_post(), connect_post(), create_identity(), events_post(), fsuggest_post(), get_atom_elements(), item_post(), mail_post(), mail_store(), menu_add_item(), menu_create(), menu_edit(), menu_edit_item(), network_content(), notes_init(), pdledit_post(), poco_load(), printable(), profiles_post(), rbmark_content(), rbmark_post(), thing_init(), and z_input_filter().

                +

                Referenced by admin_page_logs(), app_store(), app_update(), appman_post(), bookmark_add(), chatsvc_post(), connect_post(), create_identity(), events_post(), fsuggest_post(), get_atom_elements(), item_post(), mail_post(), mail_store(), menu_add_item(), menu_create(), menu_edit(), menu_edit_item(), network_content(), notes_init(), pdledit_post(), poco_load(), post_activity_item(), printable(), profiles_post(), rbmark_content(), rbmark_post(), thing_init(), and z_input_filter().

                @@ -1320,7 +1320,7 @@ Variables
                -

                Referenced by RedDirectory\__construct(), RedFile\__construct(), account_remove(), account_verify_password(), Item\add_child(), Conversation\add_thread(), admin_content(), admin_page_hubloc_post(), admin_post(), aes_encapsulate(), allowed_public_recips(), api_call(), api_channel_stream(), api_export_basic(), api_favorites(), api_get_user(), api_login(), api_oauth_request_token(), api_statuses_destroy(), api_statuses_mediap(), api_statuses_repeat(), api_statuses_show(), api_statuses_update(), api_statuses_user_timeline(), attach_mkdir(), avatar_img(), base64url_decode(), blog_install(), blog_uninstall(), bookmark_add(), bookmarks_init(), build_sync_packet(), chanman_remove_everything_from_network(), channel_remove(), chanview_content(), chat_post(), check_config(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), RedDirectory\childExists(), cloud_init(), connedit_post(), consume_feed(), conversation(), create_account(), create_identity(), RedDirectory\createDirectory(), RedDirectory\createFile(), cronhooks_run(), datetime_convert(), RedFile\delete(), delete_imported_item(), deliver_run(), detect_language(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_decode(), diaspora_dispatch(), diaspora_dispatch_public(), diaspora_handle_from_contact(), diaspora_is_blacklisted(), diaspora_like(), diaspora_message(), diaspora_msg_build(), diaspora_photo(), diaspora_post(), diaspora_profile(), diaspora_pubmsg_build(), diaspora_request(), diaspora_reshare(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_status(), diaspora_signed_retraction(), diaspora_transmit(), dir_parse_query(), directory_content(), directory_run(), dirprofile_init(), discover_by_webbie(), downgrade_accounts(), email_send(), encode_item(), expire_run(), externals_run(), feed_init(), fetch_lrdd_template(), fetch_xrd_links(), filer_content(), filerm_content(), find_diaspora_person_by_handle(), fix_private_photos(), fix_system_urls(), RedFile\get(), get_atom_elements(), get_diaspora_key(), get_item_elements(), get_language_name(), Conversation\get_template_data(), RedDirectory\getChild(), RedDirectory\getChildren(), RedDirectory\getDir(), RedDirectory\getName(), RedFile\getName(), group_content(), guess_image_type(), handle_feed(), http_status_exit(), import_author_rss(), import_author_zot(), import_channel_photo(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), item_post(), item_store(), item_store_update(), like_content(), limit_body_size(), load_plugin(), local_dir_update(), localize_item(), RedDirectory\log(), RedBasicAuth\log(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_token(), magic_init(), mail_post(), mail_store(), menu_edit(), mini_group_select(), mood_init(), FKOAuthDataStore\new_access_token(), new_contact(), new_keypair(), FKOAuthDataStore\new_request_token(), notes_init(), notification(), notifier_run(), old_webfinger(), onedirsync_run(), onepoll_run(), openid_content(), parse_url_content(), parse_xml_string(), photo_init(), photo_upload(), photos_content(), photos_post(), ping_init(), poco_init(), poco_load(), poke_init(), poller_run(), post_activity_item(), post_init(), post_post(), private_messages_list(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_load(), profile_photo_set_profile_perms(), profile_sidebar(), profiles_content(), prune_hub_reinstalls(), public_recips(), RedFile\put(), dba_mysql\q(), dba_mysqli\q(), q(), queue_run(), rbmark_post(), receive_post(), red_item_new(), RedChannelList(), RedCollectionData(), RedFileData(), register_content(), reload_plugins(), Item\remove_child(), remove_community_tag(), remove_queue_item(), scale_external_images(), scrape_feed(), scrape_vcard(), search_ac_init(), enotify\send(), send_reg_approval_email(), Conversation\set_mode(), RedDirectory\setName(), RedFile\setName(), start_delivery_chain(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), sync_directories(), tag_deliver(), tagger_content(), tgroup_check(), uninstall_plugin(), unload_plugin(), update_directory_entry(), update_feed_item(), update_imported_item(), update_queue_time(), RedBasicAuth\validateUserPass(), verify_email_address(), xml2array(), xml_status(), z_fetch_url(), z_post_url(), zfinger_init(), zid_init(), zot_build_packet(), zot_feed(), zot_fetch(), zot_finger(), zot_gethub(), zot_import(), zot_process_response(), zot_refresh(), zot_register_hub(), and zotfeed_init().

                +

                Referenced by RedDirectory\__construct(), RedFile\__construct(), account_remove(), account_verify_password(), Item\add_child(), Conversation\add_thread(), admin_content(), admin_page_hubloc_post(), admin_post(), aes_encapsulate(), allowed_public_recips(), api_call(), api_channel_stream(), api_export_basic(), api_favorites(), api_get_user(), api_login(), api_oauth_request_token(), api_statuses_destroy(), api_statuses_mediap(), api_statuses_repeat(), api_statuses_show(), api_statuses_update(), api_statuses_user_timeline(), attach_mkdir(), avatar_img(), base64url_decode(), blog_install(), blog_uninstall(), bookmark_add(), bookmarks_init(), build_sync_packet(), chanman_remove_everything_from_network(), channel_remove(), chanview_content(), chat_post(), check_config(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), RedDirectory\childExists(), cloud_init(), connedit_post(), consume_feed(), conversation(), create_account(), create_identity(), RedDirectory\createDirectory(), RedDirectory\createFile(), cronhooks_run(), datetime_convert(), RedFile\delete(), delete_imported_item(), deliver_run(), detect_language(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_decode(), diaspora_dispatch(), diaspora_dispatch_public(), diaspora_handle_from_contact(), diaspora_is_blacklisted(), diaspora_like(), diaspora_message(), diaspora_msg_build(), diaspora_photo(), diaspora_post(), diaspora_process_outbound(), diaspora_profile(), diaspora_pubmsg_build(), diaspora_request(), diaspora_reshare(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_status(), diaspora_share(), diaspora_signed_retraction(), diaspora_transmit(), dir_parse_query(), directory_content(), directory_run(), dirprofile_init(), discover_by_webbie(), downgrade_accounts(), email_send(), encode_item(), expire_run(), externals_run(), feed_init(), fetch_lrdd_template(), fetch_xrd_links(), filer_content(), filerm_content(), find_diaspora_person_by_handle(), fix_private_photos(), fix_system_urls(), RedFile\get(), get_atom_elements(), get_diaspora_key(), get_item_elements(), get_language_name(), Conversation\get_template_data(), RedDirectory\getChild(), RedDirectory\getChildren(), RedDirectory\getDir(), RedDirectory\getName(), RedFile\getName(), group_content(), guess_image_type(), handle_feed(), http_status_exit(), import_author_rss(), import_author_zot(), import_channel_photo(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), item_post(), item_store(), item_store_update(), like_content(), limit_body_size(), load_plugin(), local_dir_update(), localize_item(), RedDirectory\log(), RedBasicAuth\log(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_token(), magic_init(), mail_post(), mail_store(), menu_edit(), mini_group_select(), mood_init(), FKOAuthDataStore\new_access_token(), new_contact(), new_keypair(), FKOAuthDataStore\new_request_token(), notes_init(), notification(), notifier_run(), old_webfinger(), onedirsync_run(), onepoll_run(), openid_content(), parse_url_content(), parse_xml_string(), photo_init(), photo_upload(), photos_content(), photos_post(), ping_init(), poco_init(), poco_load(), poke_init(), poller_run(), post_activity_item(), post_init(), post_post(), private_messages_list(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_load(), profile_photo_set_profile_perms(), profile_sidebar(), profiles_content(), prune_hub_reinstalls(), public_recips(), RedFile\put(), dba_mysql\q(), dba_mysqli\q(), q(), queue_run(), rbmark_post(), receive_post(), red_item_new(), RedChannelList(), RedCollectionData(), RedFileData(), register_content(), reload_plugins(), Item\remove_child(), remove_community_tag(), remove_queue_item(), scale_external_images(), scrape_feed(), scrape_vcard(), search_ac_init(), enotify\send(), send_reg_approval_email(), Conversation\set_mode(), RedDirectory\setName(), RedFile\setName(), start_delivery_chain(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), sync_directories(), tag_deliver(), tagger_content(), tgroup_check(), uninstall_plugin(), unload_plugin(), update_directory_entry(), update_feed_item(), update_imported_item(), update_queue_time(), RedBasicAuth\validateUserPass(), verify_email_address(), xml2array(), xml_status(), z_fetch_url(), z_post_url(), zfinger_init(), zid_init(), zot_build_packet(), zot_feed(), zot_fetch(), zot_finger(), zot_gethub(), zot_import(), zot_process_response(), zot_refresh(), zot_register_hub(), and zotfeed_init().

                @@ -1742,7 +1742,7 @@ Variables @@ -1807,7 +1807,7 @@ Variables
                Returns
                string substituted string
                -

                Referenced by admin_content(), admin_page_channels(), admin_page_dbsync(), admin_page_hubloc(), admin_page_logs(), admin_page_plugins(), admin_page_site(), admin_page_summary(), admin_page_themes(), admin_page_users(), advanced_profile(), alt_pager(), api_apply_template(), api_content(), app_render(), appman_content(), apps_content(), apw_form(), blocks_content(), blogtheme_form(), App\build_pagehead(), categories_widget(), channel_content(), chat_content(), check_config(), check_php(), common_content(), common_friends_visitor_widget(), connect_content(), connections_content(), connedit_content(), construct_page(), contact_block(), conversation(), delegate_content(), design_tools(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_retraction(), diaspora_send_status(), diaspora_share(), diaspora_unshare(), dir_safe_mode(), dir_sort_links(), directory_content(), dirprofile_init(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), fbrowser_content(), field_timezone(), fileas_widget(), filer_content(), filestorage_content(), findpeople_widget(), format_categories(), format_filer(), RedBrowser\generateDirectoryIndex(), get_birthdays(), Item\get_comment_box(), get_events(), get_feed_for(), group_content(), group_side(), help_content(), hostxrd_init(), RedBrowser\htmlActionsPanel(), identity_selector(), import_content(), invite_content(), lang_selector(), layouts_content(), login(), lostpass_content(), lostpass_post(), mail_content(), manage_content(), match_content(), menu_content(), menu_render(), message_content(), micropro(), mini_group_select(), mitem_content(), mood_content(), nav(), network_content(), new_channel_content(), notification(), notifications_content(), notify_content(), oembed_format_object(), oexchange_init(), opensearch_init(), pagelist_widget(), pdledit_content(), photos_album_widget(), photos_content(), poco_init(), poke_content(), poll_content(), populate_acl(), profile_sidebar(), profiles_content(), rbmark_content(), redbasic_form(), register_content(), removeaccount_content(), removeme_content(), rmagic_content(), rpost_content(), search_content(), send_reg_approval_email(), send_verification_email(), setup_content(), setup_post(), siteinfo_content(), sources_content(), suggest_content(), theme_attachments(), thing_content(), user_allow(), vcard_from_xchan(), verify_email_address(), viewconnections_content(), vote_content(), webpages_content(), widget_affinity(), widget_appselect(), widget_archive(), widget_bookmarkedchats(), widget_chatroom_list(), widget_filer(), widget_follow(), widget_mailmenu(), widget_notes(), widget_savedsearch(), widget_settings_menu(), widget_suggestedchats(), widget_suggestions(), writepages_widget(), and xrd_init().

                +

                Referenced by admin_content(), admin_page_channels(), admin_page_dbsync(), admin_page_hubloc(), admin_page_logs(), admin_page_plugins(), admin_page_profs(), admin_page_site(), admin_page_summary(), admin_page_themes(), admin_page_users(), advanced_profile(), alt_pager(), api_apply_template(), api_content(), app_render(), appman_content(), apps_content(), apw_form(), blocks_content(), blogtheme_form(), App\build_pagehead(), categories_widget(), channel_content(), chat_content(), check_config(), check_php(), common_content(), common_friends_visitor_widget(), connect_content(), connections_content(), connedit_content(), construct_page(), contact_block(), conversation(), delegate_content(), design_tools(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_retraction(), diaspora_send_status(), diaspora_share(), diaspora_unshare(), dir_safe_mode(), dir_sort_links(), directory_content(), dirprofile_init(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), fbrowser_content(), field_timezone(), fileas_widget(), filer_content(), filestorage_content(), findpeople_widget(), format_categories(), format_filer(), RedBrowser\generateDirectoryIndex(), get_birthdays(), Item\get_comment_box(), get_events(), get_feed_for(), group_content(), group_side(), help_content(), hostxrd_init(), RedBrowser\htmlActionsPanel(), identity_selector(), import_content(), invite_content(), lang_selector(), layouts_content(), login(), lostpass_content(), lostpass_post(), mail_content(), manage_content(), match_content(), menu_content(), menu_render(), message_content(), micropro(), mini_group_select(), mitem_content(), mood_content(), nav(), network_content(), new_channel_content(), notification(), notifications_content(), notify_content(), oembed_format_object(), oexchange_init(), opensearch_init(), pagelist_widget(), pdledit_content(), photos_album_widget(), photos_content(), poco_init(), poke_content(), poll_content(), populate_acl(), profile_sidebar(), profiles_content(), rbmark_content(), redbasic_form(), register_content(), removeaccount_content(), removeme_content(), rmagic_content(), rpost_content(), search_content(), send_reg_approval_email(), send_verification_email(), setup_content(), setup_post(), siteinfo_content(), sources_content(), suggest_content(), theme_attachments(), thing_content(), user_allow(), vcard_from_xchan(), verify_email_address(), viewconnections_content(), vote_content(), webpages_content(), widget_affinity(), widget_appselect(), widget_archive(), widget_bookmarkedchats(), widget_chatroom_list(), widget_filer(), widget_follow(), widget_mailmenu(), widget_notes(), widget_savedsearch(), widget_settings_menu(), widget_suggestedchats(), widget_suggestions(), writepages_widget(), and xrd_init().

                @@ -2119,6 +2119,8 @@ Variables
                +

                Referenced by discover_by_webbie().

                +
                @@ -2261,7 +2263,7 @@ Variables
                Returns
                string Escaped text.
                -

                Referenced by array_xmlify(), atom_author(), atom_entry(), construct_activity_object(), construct_activity_target(), diaspora_like(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_retraction(), diaspora_send_status(), encode_rel_links(), get_atom_elements(), get_feed_for(), item_getfeedattach(), subthread_content(), tagger_content(), and xml_status().

                +

                Referenced by array_xmlify(), atom_author(), atom_entry(), construct_activity_object(), construct_activity_target(), diaspora_like(), diaspora_post(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_retraction(), diaspora_send_status(), encode_rel_links(), get_atom_elements(), get_feed_for(), item_getfeedattach(), subthread_content(), tagger_content(), and xml_status().

                diff --git a/doc/html/typo_8php.html b/doc/html/typo_8php.html index c4c576785..b48ab1f3c 100644 --- a/doc/html/typo_8php.html +++ b/doc/html/typo_8php.html @@ -134,7 +134,7 @@ Variables
                -

                Referenced by FriendicaSmarty\__construct(), Item\__construct(), FriendicaSmartyEngine\__construct(), Template\_replcb_if(), Template\_replcb_inc(), _well_known_init(), abook_toggle_flag(), achievements_content(), acl_init(), admin_content(), admin_page_channels(), admin_page_channels_post(), admin_page_dbsync(), admin_page_hubloc(), admin_page_hubloc_post(), admin_page_logs(), admin_page_logs_post(), admin_page_plugins(), admin_page_site(), admin_page_site_post(), admin_page_summary(), admin_page_themes(), admin_page_users(), admin_page_users_post(), admin_post(), advanced_profile(), allowed_email(), allowed_url(), alt_pager(), api_account_verify_credentials(), api_albums(), api_apply_template(), api_call(), api_content(), api_direct_messages_all(), api_direct_messages_box(), api_direct_messages_conversation(), api_direct_messages_inbox(), api_direct_messages_new(), api_direct_messages_sentbox(), api_favorites(), api_followers_ids(), api_format_as(), api_format_items(), api_friends_ids(), api_get_user(), api_item_get_user(), api_login(), api_photos(), api_post(), api_rss_extra(), api_status_show(), api_statuses_destroy(), api_statuses_f(), api_statuses_followers(), api_statuses_friends(), api_statuses_home_timeline(), api_statuses_mediap(), api_statuses_mentions(), api_statuses_public_timeline(), api_statuses_repeat(), api_statuses_show(), api_statuses_update(), api_statuses_user_timeline(), api_statusnet_config(), api_users_show(), app_name_compare(), appman_content(), apw_form(), atom_entry(), attribute_contains(), authenticate_success(), avatar_img(), bb_sanitize_style(), bbcode(), best_link_url(), block_content(), block_init(), blocks_content(), blog_init(), blogtheme_display_item(), blogtheme_form(), blogtheme_imgurl(), bookmarks_content(), bookmarks_init(), build_sync_packet(), cal(), call_hooks(), categories_widget(), channel_content(), channel_init(), channel_remove(), chanview_content(), chat_content(), chat_init(), chat_post(), chatsvc_content(), chatsvc_init(), chatsvc_post(), check_config(), check_form_security_token(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), check_htaccess(), clean_urls(), cli_startup(), cli_suggest_run(), cloud_init(), comanche_parser(), comanche_replace_region(), comanche_widget(), common_content(), common_friends_visitor_widget(), common_init(), connect_content(), connect_init(), connect_post(), connections_clone(), connections_content(), connections_init(), connections_post(), connedit_clone(), connedit_content(), connedit_init(), connedit_post(), construct_page(), contact_block(), contact_select(), conversation(), create_identity(), current_theme(), current_theme_url(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), deliver_run(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_like(), diaspora_message(), diaspora_msg_build(), diaspora_photo(), diaspora_post(), diaspora_profile(), diaspora_pubmsg_build(), diaspora_request(), diaspora_reshare(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_retraction(), diaspora_send_status(), diaspora_share(), diaspora_transmit(), diaspora_unshare(), directory_content(), directory_init(), dirsearch_init(), display_content(), dlogger(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), ev_compare(), event_store_item(), events_content(), events_post(), expand_acl(), expand_groups(), externals_run(), fbrowser_content(), fileas_widget(), filer_content(), filerm_content(), filestorage_content(), filestorage_post(), findpeople_widget(), fix_private_photos(), follow_init(), format_event_diaspora(), fsuggest_content(), fsuggest_post(), BaseObject\get_app(), get_app(), get_best_language(), get_birthdays(), Item\get_comment_box(), get_config(), get_custom_nav(), get_events(), get_form_security_token(), FriendicaSmartyEngine\get_intltext_template(), get_intltext_template(), get_markup_template(), get_pconfig(), get_plink(), Item\get_template_data(), get_theme_screenshot(), get_xconfig(), gprobe_run(), group_content(), group_post(), group_select(), guess_image_type(), handle_tag(), hcard_init(), head_get_icon(), head_remove_css(), head_remove_js(), head_set_icon(), help_content(), home_content(), home_init(), hostxrd_init(), import_channel_photo(), import_post(), import_profile_photo(), info(), insert_hook(), invite_content(), invite_post(), is_developer(), is_site_admin(), item_photo_menu(), item_post(), items_fetch(), lang_selector(), layouts_content(), like_content(), link_compare(), load_config(), load_contact_links(), load_database(), load_hooks(), load_pconfig(), load_translation_table(), load_xconfig(), logger(), login(), login_content(), FKOAuth1\loginUser(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_post(), manual_config(), match_content(), message_content(), mitem_content(), mitem_init(), mitem_post(), mood_init(), msearch_post(), mytheme_init(), nav(), nav_set_selected(), network_content(), network_init(), new_contact(), notice(), notification(), notifications_content(), notifications_post(), notifier_run(), notify_content(), notify_init(), oembed_fetch_url(), oembed_format_object(), oembed_iframe(), oexchange_content(), oexchange_init(), onedirsync_run(), onepoll_run(), openid_content(), opensearch_init(), page_content(), page_init(), paginate(), photo_init(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), poco_load(), poke_init(), poller_run(), pop_lang(), post_init(), preg_heart(), prepare_body(), probe_content(), proc_run(), profile_activity(), profile_content(), profile_create_sidebar(), profile_init(), profile_load(), profile_photo_init(), profile_photo_post(), profile_sidebar(), profiles_content(), profiles_init(), profiles_post(), profperm_init(), push_lang(), queue_run(), randprof_init(), rbmark_content(), rbmark_post(), red_item_new(), redbasic_form(), register_content(), regmod_content(), regver_content(), relative_date(), removeaccount_content(), removeaccount_post(), removeme_content(), removeme_post(), replace_macros(), rmagic_post(), rpost_content(), scale_external_images(), scrape_feed(), scrape_vcard(), search(), search_ac_init(), search_content(), search_init(), searchbox(), send_message(), service_class_allows(), service_class_fetch(), set_config(), Conversation\set_mode(), set_pconfig(), set_xconfig(), settings_init(), settings_post(), setup_content(), setup_post(), share_init(), siteinfo_content(), siteinfo_init(), smilies(), sources_post(), subthread_content(), suggest_content(), t(), tag_deliver(), tag_sort_length(), tagger_content(), tagrm_content(), tagrm_post(), tags_sort(), tgroup_check(), theme_admin(), theme_content(), theme_include(), thing_content(), thing_init(), timezone_cmp(), toggle_mobile_init(), tt(), uexport_init(), update_channel_content(), update_display_content(), update_network_content(), update_search_content(), update_suggestions(), user_allow(), user_approve(), vcard_from_xchan(), viewconnections_content(), viewconnections_init(), viewsrc_content(), vote_content(), vote_init(), vote_post(), wall_upload_post(), webpages_content(), wfinger_init(), what_next(), widget_archive(), widget_categories(), widget_chatroom_list(), widget_design_tools(), widget_filer(), widget_follow(), widget_fullprofile(), widget_item(), widget_mailmenu(), widget_photo_albums(), widget_profile(), widget_savedsearch(), widget_settings_menu(), widget_tagcloud(), widget_tagcloud_wall(), xrd_init(), z_fetch_url(), z_path(), z_root(), zfinger_init(), zid_init(), zotfeed_init(), and zping_content().

                +

                Referenced by FriendicaSmarty\__construct(), Item\__construct(), FriendicaSmartyEngine\__construct(), Template\_replcb_if(), Template\_replcb_inc(), _well_known_init(), abook_toggle_flag(), achievements_content(), acl_init(), admin_content(), admin_page_channels(), admin_page_channels_post(), admin_page_dbsync(), admin_page_hubloc(), admin_page_hubloc_post(), admin_page_logs(), admin_page_logs_post(), admin_page_plugins(), admin_page_site(), admin_page_site_post(), admin_page_summary(), admin_page_themes(), admin_page_users(), admin_page_users_post(), admin_post(), advanced_profile(), allowed_email(), allowed_url(), alt_pager(), api_account_verify_credentials(), api_albums(), api_apply_template(), api_call(), api_content(), api_direct_messages_all(), api_direct_messages_box(), api_direct_messages_conversation(), api_direct_messages_inbox(), api_direct_messages_new(), api_direct_messages_sentbox(), api_favorites(), api_followers_ids(), api_format_as(), api_format_items(), api_friends_ids(), api_get_user(), api_item_get_user(), api_login(), api_photos(), api_post(), api_rss_extra(), api_status_show(), api_statuses_destroy(), api_statuses_f(), api_statuses_followers(), api_statuses_friends(), api_statuses_home_timeline(), api_statuses_mediap(), api_statuses_mentions(), api_statuses_public_timeline(), api_statuses_repeat(), api_statuses_show(), api_statuses_update(), api_statuses_user_timeline(), api_statusnet_config(), api_users_show(), app_name_compare(), appman_content(), apw_form(), atom_entry(), attribute_contains(), authenticate_success(), avatar_img(), bb_sanitize_style(), bbcode(), best_link_url(), block_content(), block_init(), blocks_content(), blog_init(), blogtheme_display_item(), blogtheme_form(), blogtheme_imgurl(), bookmarks_content(), bookmarks_init(), build_sync_packet(), cal(), call_hooks(), categories_widget(), channel_content(), channel_init(), channel_remove(), chanview_content(), chat_content(), chat_init(), chat_post(), chatsvc_content(), chatsvc_init(), chatsvc_post(), check_config(), check_form_security_token(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), check_htaccess(), clean_urls(), cli_startup(), cli_suggest_run(), cloud_init(), comanche_parser(), comanche_replace_region(), comanche_widget(), common_content(), common_friends_visitor_widget(), common_init(), connect_content(), connect_init(), connect_post(), connections_clone(), connections_content(), connections_init(), connections_post(), connedit_clone(), connedit_content(), connedit_init(), connedit_post(), construct_page(), contact_block(), contact_select(), conversation(), create_identity(), current_theme(), current_theme_url(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), deliver_run(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_like(), diaspora_message(), diaspora_msg_build(), diaspora_photo(), diaspora_post(), diaspora_profile(), diaspora_pubmsg_build(), diaspora_request(), diaspora_reshare(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_retraction(), diaspora_send_status(), diaspora_share(), diaspora_transmit(), diaspora_unshare(), directory_content(), directory_init(), dirsearch_init(), display_content(), dlogger(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), ev_compare(), event_store_item(), events_content(), events_post(), expand_acl(), expand_groups(), externals_run(), fbrowser_content(), fileas_widget(), filer_content(), filerm_content(), filestorage_content(), filestorage_post(), findpeople_widget(), fix_private_photos(), follow_init(), format_event_diaspora(), fsuggest_content(), fsuggest_post(), BaseObject\get_app(), get_app(), get_best_language(), get_birthdays(), Item\get_comment_box(), get_config(), get_custom_nav(), get_events(), get_form_security_token(), FriendicaSmartyEngine\get_intltext_template(), get_intltext_template(), get_markup_template(), get_pconfig(), get_plink(), Item\get_template_data(), get_theme_screenshot(), get_xconfig(), gprobe_run(), group_content(), group_post(), group_select(), guess_image_type(), handle_tag(), hcard_init(), head_get_icon(), head_remove_css(), head_remove_js(), head_set_icon(), help_content(), home_content(), home_init(), hostxrd_init(), import_channel_photo(), import_post(), import_profile_photo(), info(), insert_hook(), invite_content(), invite_post(), is_developer(), is_site_admin(), item_photo_menu(), item_post(), items_fetch(), lang_selector(), layouts_content(), like_content(), link_compare(), load_config(), load_contact_links(), load_database(), load_hooks(), load_pconfig(), load_translation_table(), load_xconfig(), logger(), login(), login_content(), FKOAuth1\loginUser(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_post(), manual_config(), match_content(), message_content(), mitem_content(), mitem_init(), mitem_post(), mood_init(), msearch_post(), mytheme_init(), nav(), nav_set_selected(), network_content(), network_init(), new_contact(), notice(), notification(), notifications_content(), notifications_post(), notifier_run(), notify_content(), notify_init(), oembed_fetch_url(), oembed_format_object(), oembed_iframe(), oexchange_content(), oexchange_init(), onedirsync_run(), onepoll_run(), openid_content(), opensearch_init(), page_content(), page_init(), paginate(), photo_init(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), poco_load(), poke_init(), poller_run(), pop_lang(), post_init(), preg_heart(), prepare_body(), probe_content(), proc_run(), profile_activity(), profile_content(), profile_create_sidebar(), profile_init(), profile_load(), profile_photo_init(), profile_photo_post(), profile_sidebar(), profiles_content(), profiles_init(), profiles_post(), profperm_init(), push_lang(), queue_run(), randprof_init(), rbmark_content(), rbmark_post(), red_item_new(), redbasic_form(), register_content(), regmod_content(), regver_content(), relative_date(), removeaccount_content(), removeaccount_post(), removeme_content(), removeme_post(), replace_macros(), rmagic_post(), rpost_content(), scale_external_images(), scrape_feed(), scrape_vcard(), search(), search_ac_init(), search_content(), search_init(), searchbox(), send_message(), service_class_allows(), service_class_fetch(), set_config(), Conversation\set_mode(), set_pconfig(), set_xconfig(), settings_init(), settings_post(), setup_content(), setup_post(), share_init(), siteinfo_content(), siteinfo_init(), smilies(), sources_post(), subthread_content(), suggest_content(), t(), tag_deliver(), tag_sort_length(), tagger_content(), tagrm_content(), tagrm_post(), tags_sort(), tgroup_check(), theme_admin(), theme_content(), theme_include(), thing_content(), thing_init(), timezone_cmp(), toggle_mobile_init(), tt(), uexport_init(), update_channel_content(), update_display_content(), update_network_content(), update_search_content(), update_suggestions(), user_allow(), user_approve(), vcard_from_xchan(), viewconnections_content(), viewconnections_init(), viewsrc_content(), vote_content(), vote_init(), vote_post(), wall_upload_post(), webpages_content(), wfinger_init(), what_next(), widget_archive(), widget_categories(), widget_chatroom_list(), widget_design_tools(), widget_filer(), widget_follow(), widget_fullprofile(), widget_item(), widget_mailmenu(), widget_photo_albums(), widget_profile(), widget_savedsearch(), widget_settings_menu(), widget_tagcloud(), widget_tagcloud_wall(), xrd_init(), z_fetch_url(), z_path(), z_root(), zfinger_init(), zid_init(), zotfeed_init(), and zping_content().

                diff --git a/doc/html/typohelper_8php.html b/doc/html/typohelper_8php.html index b382181cf..d4367e382 100644 --- a/doc/html/typohelper_8php.html +++ b/doc/html/typohelper_8php.html @@ -144,7 +144,7 @@ Variables diff --git a/util/messages.po b/util/messages.po index 6f135bcb3..489c14a26 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2014-08-22.775\n" +"Project-Id-Version: 2014-08-29.782\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-22 00:03-0700\n" +"POT-Creation-Date: 2014-08-29 00:03-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -29,26 +29,8 @@ msgstr "" msgid "Profile Photos" msgstr "" -#: ../../include/diaspora.php:1736 ../../include/text.php:1734 -#: ../../include/conversation.php:120 ../../mod/subthread.php:72 -#: ../../mod/subthread.php:174 ../../mod/tagger.php:45 ../../mod/like.php:294 -msgid "photo" -msgstr "" - -#: ../../include/diaspora.php:1736 ../../include/text.php:1740 -#: ../../include/conversation.php:148 ../../mod/subthread.php:72 -#: ../../mod/subthread.php:174 ../../mod/tagger.php:53 ../../mod/like.php:294 -msgid "status" -msgstr "" - -#: ../../include/diaspora.php:1752 ../../include/conversation.php:164 -#: ../../mod/like.php:331 -#, php-format -msgid "%1$s likes %2$s's %3$s" -msgstr "" - -#: ../../include/diaspora.php:2129 -msgid "Attachments:" +#: ../../include/network.php:557 +msgid "view full size" msgstr "" #: ../../include/oembed.php:163 @@ -73,7 +55,7 @@ msgid "Site Admin" msgstr "" #: ../../include/apps.php:124 ../../include/nav.php:113 -#: ../../include/conversation.php:1548 +#: ../../include/conversation.php:1561 msgid "Bookmarks" msgstr "" @@ -85,8 +67,9 @@ msgstr "" msgid "Login" msgstr "" -#: ../../include/apps.php:127 -msgid "Channel Select" +#: ../../include/apps.php:127 ../../include/nav.php:209 +#: ../../mod/manage.php:148 +msgid "Channel Manager" msgstr "" #: ../../include/apps.php:128 ../../include/nav.php:183 @@ -94,19 +77,19 @@ msgid "Matrix" msgstr "" #: ../../include/apps.php:129 ../../include/nav.php:211 -#: ../../include/widgets.php:521 ../../mod/admin.php:947 -#: ../../mod/admin.php:1152 +#: ../../include/widgets.php:521 ../../mod/admin.php:950 +#: ../../mod/admin.php:1155 msgid "Settings" msgstr "" #: ../../include/apps.php:130 ../../include/nav.php:105 -#: ../../include/reddav.php:1280 ../../include/conversation.php:1526 +#: ../../include/reddav.php:1280 ../../include/conversation.php:1539 #: ../../mod/fbrowser.php:114 msgid "Files" msgstr "" #: ../../include/apps.php:131 ../../include/nav.php:115 -#: ../../include/conversation.php:1559 ../../mod/webpages.php:79 +#: ../../include/conversation.php:1572 ../../mod/webpages.php:79 msgid "Webpages" msgstr "" @@ -120,7 +103,7 @@ msgid "Profile" msgstr "" #: ../../include/apps.php:134 ../../include/nav.php:104 -#: ../../include/conversation.php:1517 ../../mod/fbrowser.php:25 +#: ../../include/conversation.php:1530 ../../mod/fbrowser.php:25 msgid "Photos" msgstr "" @@ -147,7 +130,7 @@ msgstr "" msgid "Mood" msgstr "" -#: ../../include/apps.php:140 ../../include/conversation.php:950 +#: ../../include/apps.php:140 ../../include/conversation.php:963 msgid "Poke" msgstr "" @@ -155,8 +138,8 @@ msgstr "" msgid "Chat" msgstr "" -#: ../../include/apps.php:142 ../../include/text.php:815 -#: ../../include/text.php:829 ../../include/nav.php:169 +#: ../../include/apps.php:142 ../../include/nav.php:169 +#: ../../include/text.php:815 ../../include/text.php:829 #: ../../mod/search.php:30 msgid "Search" msgstr "" @@ -209,19 +192,19 @@ msgstr "" #: ../../include/apps.php:246 ../../include/page_widgets.php:8 #: ../../include/page_widgets.php:36 ../../include/reddav.php:1289 #: ../../include/menu.php:42 ../../include/ItemObject.php:96 -#: ../../mod/settings.php:579 ../../mod/blocks.php:94 +#: ../../mod/settings.php:579 ../../mod/blocks.php:99 #: ../../mod/connections.php:396 ../../mod/editblock.php:111 #: ../../mod/editlayout.php:106 ../../mod/editpost.php:112 #: ../../mod/editwebpage.php:143 ../../mod/thing.php:235 -#: ../../mod/layouts.php:112 ../../mod/menu.php:59 ../../mod/webpages.php:120 +#: ../../mod/layouts.php:121 ../../mod/menu.php:59 ../../mod/webpages.php:127 msgid "Edit" msgstr "" #: ../../include/apps.php:247 ../../include/reddav.php:1290 -#: ../../include/conversation.php:635 ../../include/ItemObject.php:108 +#: ../../include/conversation.php:648 ../../include/ItemObject.php:108 #: ../../mod/settings.php:580 ../../mod/connedit.php:440 -#: ../../mod/photos.php:1052 ../../mod/group.php:176 ../../mod/admin.php:727 -#: ../../mod/admin.php:857 ../../mod/thing.php:236 +#: ../../mod/photos.php:1052 ../../mod/group.php:176 ../../mod/admin.php:730 +#: ../../mod/admin.php:860 ../../mod/thing.php:236 msgid "Delete" msgstr "" @@ -230,853 +213,810 @@ msgstr "" msgid "Unknown" msgstr "" -#: ../../include/text.php:321 -msgid "prev" +#: ../../include/page_widgets.php:6 +msgid "New Page" msgstr "" -#: ../../include/text.php:323 -msgid "first" +#: ../../include/page_widgets.php:39 ../../mod/blocks.php:102 +#: ../../mod/layouts.php:125 ../../mod/webpages.php:130 +msgid "View" msgstr "" -#: ../../include/text.php:352 -msgid "last" +#: ../../include/page_widgets.php:40 ../../include/conversation.php:1109 +#: ../../include/ItemObject.php:592 ../../mod/editblock.php:141 +#: ../../mod/editlayout.php:135 ../../mod/editpost.php:140 +#: ../../mod/editwebpage.php:174 ../../mod/photos.php:1003 +#: ../../mod/webpages.php:131 +msgid "Preview" msgstr "" -#: ../../include/text.php:355 -msgid "next" +#: ../../include/page_widgets.php:41 ../../mod/webpages.php:132 +msgid "Actions" msgstr "" -#: ../../include/text.php:367 -msgid "older" +#: ../../include/page_widgets.php:42 ../../mod/webpages.php:133 +msgid "Page Link" msgstr "" -#: ../../include/text.php:369 -msgid "newer" +#: ../../include/page_widgets.php:43 ../../mod/webpages.php:134 +msgid "Title" msgstr "" -#: ../../include/text.php:730 -msgid "No connections" +#: ../../include/page_widgets.php:44 ../../mod/webpages.php:135 +msgid "Created" msgstr "" -#: ../../include/text.php:743 -#, php-format -msgid "%d Connection" -msgid_plural "%d Connections" -msgstr[0] "" -msgstr[1] "" +#: ../../include/page_widgets.php:45 ../../mod/webpages.php:136 +msgid "Edited" +msgstr "" -#: ../../include/text.php:756 -msgid "View Connections" +#: ../../include/security.php:301 +msgid "" +"The form security token was not correct. This probably happened because the " +"form has been opened for too long (>3 hours) before submitting it." msgstr "" -#: ../../include/text.php:817 ../../include/text.php:831 -#: ../../include/widgets.php:193 ../../mod/rbmark.php:28 -#: ../../mod/rbmark.php:98 ../../mod/filer.php:50 -msgid "Save" +#: ../../include/zot.php:654 +msgid "Invalid data packet" msgstr "" -#: ../../include/text.php:897 -msgid "poke" +#: ../../include/zot.php:668 +msgid "Unable to verify channel signature" msgstr "" -#: ../../include/text.php:897 ../../include/conversation.php:243 -msgid "poked" +#: ../../include/zot.php:865 +#, php-format +msgid "Unable to verify site signature for %s" msgstr "" -#: ../../include/text.php:898 -msgid "ping" +#: ../../include/photos.php:15 ../../include/attach.php:119 +#: ../../include/attach.php:166 ../../include/attach.php:229 +#: ../../include/attach.php:243 ../../include/attach.php:283 +#: ../../include/attach.php:297 ../../include/attach.php:322 +#: ../../include/attach.php:513 ../../include/attach.php:585 +#: ../../include/chat.php:116 ../../include/items.php:3692 +#: ../../mod/mood.php:112 ../../mod/mitem.php:73 ../../mod/achievements.php:27 +#: ../../mod/settings.php:494 ../../mod/poke.php:128 ../../mod/api.php:26 +#: ../../mod/api.php:31 ../../mod/authtest.php:13 ../../mod/profile.php:64 +#: ../../mod/profile.php:72 ../../mod/block.php:22 ../../mod/block.php:72 +#: ../../mod/profile_photo.php:263 ../../mod/profile_photo.php:276 +#: ../../mod/blocks.php:29 ../../mod/blocks.php:44 ../../mod/profiles.php:179 +#: ../../mod/profiles.php:560 ../../mod/bookmarks.php:46 +#: ../../mod/channel.php:89 ../../mod/channel.php:193 +#: ../../mod/channel.php:236 ../../mod/chat.php:90 ../../mod/chat.php:95 +#: ../../mod/register.php:71 ../../mod/regmod.php:18 ../../mod/common.php:35 +#: ../../mod/network.php:12 ../../mod/connections.php:169 +#: ../../mod/connedit.php:254 ../../mod/delegate.php:6 ../../mod/page.php:30 +#: ../../mod/page.php:80 ../../mod/setup.php:203 ../../mod/editblock.php:34 +#: ../../mod/pdledit.php:21 ../../mod/editlayout.php:48 +#: ../../mod/editpost.php:13 ../../mod/editwebpage.php:44 +#: ../../mod/editwebpage.php:83 ../../mod/photos.php:68 +#: ../../mod/photos.php:526 ../../mod/sources.php:66 ../../mod/events.php:160 +#: ../../mod/filestorage.php:10 ../../mod/filestorage.php:59 +#: ../../mod/filestorage.php:75 ../../mod/filestorage.php:98 +#: ../../mod/fsuggest.php:78 ../../mod/suggest.php:26 ../../mod/group.php:9 +#: ../../mod/thing.php:249 ../../mod/thing.php:266 ../../mod/thing.php:301 +#: ../../mod/invite.php:13 ../../mod/invite.php:104 ../../mod/item.php:178 +#: ../../mod/item.php:186 ../../mod/item.php:915 ../../mod/layouts.php:27 +#: ../../mod/layouts.php:39 ../../mod/like.php:154 +#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27 +#: ../../mod/viewsrc.php:12 ../../mod/mail.php:108 ../../mod/manage.php:6 +#: ../../mod/menu.php:44 ../../mod/webpages.php:40 ../../mod/message.php:16 +#: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97 +#: ../../mod/notifications.php:66 ../../mod/appman.php:66 ../../index.php:186 +#: ../../index.php:361 +msgid "Permission denied." msgstr "" -#: ../../include/text.php:898 -msgid "pinged" +#: ../../include/photos.php:104 +#, php-format +msgid "Image exceeds website size limit of %lu bytes" msgstr "" -#: ../../include/text.php:899 -msgid "prod" +#: ../../include/photos.php:111 +msgid "Image file is empty." msgstr "" -#: ../../include/text.php:899 -msgid "prodded" +#: ../../include/photos.php:140 ../../mod/profile_photo.php:216 +msgid "Unable to process image" msgstr "" -#: ../../include/text.php:900 -msgid "slap" +#: ../../include/photos.php:212 +msgid "Photo storage failed." msgstr "" -#: ../../include/text.php:900 -msgid "slapped" +#: ../../include/photos.php:339 ../../include/conversation.php:1533 +msgid "Photo Albums" msgstr "" -#: ../../include/text.php:901 -msgid "finger" +#: ../../include/photos.php:343 ../../mod/photos.php:697 +#: ../../mod/photos.php:1199 +msgid "Upload New Photos" msgstr "" -#: ../../include/text.php:901 -msgid "fingered" +#: ../../include/acl_selectors.php:240 +msgid "Visible to your default audience" msgstr "" -#: ../../include/text.php:902 -msgid "rebuff" +#: ../../include/acl_selectors.php:241 +msgid "Show" msgstr "" -#: ../../include/text.php:902 -msgid "rebuffed" +#: ../../include/acl_selectors.php:242 +msgid "Don't show" msgstr "" -#: ../../include/text.php:911 -msgid "happy" +#: ../../include/acl_selectors.php:248 ../../mod/chat.php:209 +#: ../../mod/photos.php:604 ../../mod/photos.php:958 +#: ../../mod/filestorage.php:128 +msgid "Permissions" msgstr "" -#: ../../include/text.php:912 -msgid "sad" +#: ../../include/acl_selectors.php:249 ../../include/ItemObject.php:289 +msgid "Close" msgstr "" -#: ../../include/text.php:913 -msgid "mellow" +#: ../../include/activities.php:39 +msgid " and " msgstr "" -#: ../../include/text.php:914 -msgid "tired" +#: ../../include/activities.php:47 +msgid "public profile" msgstr "" -#: ../../include/text.php:915 -msgid "perky" +#: ../../include/activities.php:52 +#, php-format +msgid "%1$s changed %2$s to “%3$s”" msgstr "" -#: ../../include/text.php:916 -msgid "angry" +#: ../../include/activities.php:53 +#, php-format +msgid "Visit %1$s's %2$s" msgstr "" -#: ../../include/text.php:917 -msgid "stupified" +#: ../../include/activities.php:56 +#, php-format +msgid "%1$s has an updated %2$s, changing %3$s." msgstr "" -#: ../../include/text.php:918 -msgid "puzzled" +#: ../../include/api.php:1036 +msgid "Public Timeline" msgstr "" -#: ../../include/text.php:919 -msgid "interested" +#: ../../include/attach.php:224 ../../include/attach.php:278 +msgid "Item was not found." msgstr "" -#: ../../include/text.php:920 -msgid "bitter" +#: ../../include/attach.php:335 +msgid "No source file." msgstr "" -#: ../../include/text.php:921 -msgid "cheerful" +#: ../../include/attach.php:352 +msgid "Cannot locate file to replace" msgstr "" -#: ../../include/text.php:922 -msgid "alive" +#: ../../include/attach.php:370 +msgid "Cannot locate file to revise/update" msgstr "" -#: ../../include/text.php:923 -msgid "annoyed" +#: ../../include/attach.php:381 +#, php-format +msgid "File exceeds size limit of %d" msgstr "" -#: ../../include/text.php:924 -msgid "anxious" +#: ../../include/attach.php:393 +#, php-format +msgid "You have reached your limit of %1$.0f Mbytes attachment storage." msgstr "" -#: ../../include/text.php:925 -msgid "cranky" +#: ../../include/attach.php:475 +msgid "File upload failed. Possible system limit or action terminated." msgstr "" -#: ../../include/text.php:926 -msgid "disturbed" +#: ../../include/attach.php:487 +msgid "Stored file could not be verified. Upload failed." msgstr "" -#: ../../include/text.php:927 -msgid "frustrated" +#: ../../include/attach.php:528 ../../include/attach.php:545 +msgid "Path not available." msgstr "" -#: ../../include/text.php:928 -msgid "depressed" +#: ../../include/attach.php:590 +msgid "Empty pathname" msgstr "" -#: ../../include/text.php:929 -msgid "motivated" +#: ../../include/attach.php:606 +msgid "duplicate filename or path" msgstr "" -#: ../../include/text.php:930 -msgid "relaxed" +#: ../../include/attach.php:630 +msgid "Path not found." msgstr "" -#: ../../include/text.php:931 -msgid "surprised" +#: ../../include/attach.php:681 +msgid "mkdir failed." msgstr "" -#: ../../include/text.php:1094 -msgid "Monday" +#: ../../include/attach.php:685 +msgid "database storage failed." msgstr "" -#: ../../include/text.php:1094 -msgid "Tuesday" +#: ../../include/plugin.php:504 ../../include/plugin.php:506 +msgid "Click here to upgrade." msgstr "" -#: ../../include/text.php:1094 -msgid "Wednesday" +#: ../../include/plugin.php:512 +msgid "This action exceeds the limits set by your subscription plan." msgstr "" -#: ../../include/text.php:1094 -msgid "Thursday" +#: ../../include/plugin.php:517 +msgid "This action is not available under your subscription plan." msgstr "" -#: ../../include/text.php:1094 -msgid "Friday" +#: ../../include/bb2diaspora.php:463 ../../include/event.php:11 +msgid "l F d, Y \\@ g:i A" msgstr "" -#: ../../include/text.php:1094 -msgid "Saturday" -msgstr "" - -#: ../../include/text.php:1094 -msgid "Sunday" -msgstr "" - -#: ../../include/text.php:1098 -msgid "January" -msgstr "" - -#: ../../include/text.php:1098 -msgid "February" -msgstr "" - -#: ../../include/text.php:1098 -msgid "March" +#: ../../include/bb2diaspora.php:469 ../../include/event.php:20 +msgid "Starts:" msgstr "" -#: ../../include/text.php:1098 -msgid "April" +#: ../../include/bb2diaspora.php:477 ../../include/event.php:30 +msgid "Finishes:" msgstr "" -#: ../../include/text.php:1098 -msgid "May" +#: ../../include/bb2diaspora.php:485 ../../include/event.php:40 +#: ../../include/identity.php:757 ../../mod/directory.php:156 +#: ../../mod/dirprofile.php:105 ../../mod/events.php:504 +msgid "Location:" msgstr "" -#: ../../include/text.php:1098 -msgid "June" +#: ../../include/nav.php:94 ../../include/nav.php:121 ../../boot.php:1492 +msgid "Logout" msgstr "" -#: ../../include/text.php:1098 -msgid "July" +#: ../../include/nav.php:94 ../../include/nav.php:121 +msgid "End this session" msgstr "" -#: ../../include/text.php:1098 -msgid "August" +#: ../../include/nav.php:97 ../../include/nav.php:155 +msgid "Home" msgstr "" -#: ../../include/text.php:1098 -msgid "September" +#: ../../include/nav.php:97 +msgid "Your posts and conversations" msgstr "" -#: ../../include/text.php:1098 -msgid "October" +#: ../../include/nav.php:98 ../../include/conversation.php:957 +#: ../../mod/connedit.php:393 ../../mod/connedit.php:507 +msgid "View Profile" msgstr "" -#: ../../include/text.php:1098 -msgid "November" +#: ../../include/nav.php:98 +msgid "Your profile page" msgstr "" -#: ../../include/text.php:1098 -msgid "December" +#: ../../include/nav.php:100 +msgid "Edit Profiles" msgstr "" -#: ../../include/text.php:1176 -msgid "unknown.???" +#: ../../include/nav.php:100 +msgid "Manage/Edit profiles" msgstr "" -#: ../../include/text.php:1177 -msgid "bytes" +#: ../../include/nav.php:102 ../../include/identity.php:730 +msgid "Edit Profile" msgstr "" -#: ../../include/text.php:1212 -msgid "remove category" +#: ../../include/nav.php:102 +msgid "Edit your profile" msgstr "" -#: ../../include/text.php:1282 -msgid "remove from file" +#: ../../include/nav.php:104 +msgid "Your photos" msgstr "" -#: ../../include/text.php:1347 ../../include/text.php:1359 -msgid "Click to open/close" +#: ../../include/nav.php:105 +msgid "Your files" msgstr "" -#: ../../include/text.php:1514 ../../mod/events.php:374 -msgid "Link to Source" +#: ../../include/nav.php:110 +msgid "Your chatrooms" msgstr "" -#: ../../include/text.php:1533 -msgid "Select a page layout: " +#: ../../include/nav.php:113 +msgid "Your bookmarks" msgstr "" -#: ../../include/text.php:1536 ../../include/text.php:1601 -msgid "default" +#: ../../include/nav.php:115 +msgid "Your webpages" msgstr "" -#: ../../include/text.php:1572 -msgid "Page content type: " +#: ../../include/nav.php:119 +msgid "Sign in" msgstr "" -#: ../../include/text.php:1613 -msgid "Select an alternate language" +#: ../../include/nav.php:136 +#, php-format +msgid "%s - click to logout" msgstr "" -#: ../../include/text.php:1737 ../../include/conversation.php:123 -#: ../../mod/tagger.php:49 -msgid "event" +#: ../../include/nav.php:141 +msgid "Click to authenticate to your home hub" msgstr "" -#: ../../include/text.php:1742 ../../include/conversation.php:150 -#: ../../mod/tagger.php:55 -msgid "comment" +#: ../../include/nav.php:155 +msgid "Home Page" msgstr "" -#: ../../include/text.php:1747 -msgid "activity" +#: ../../include/nav.php:159 ../../mod/register.php:221 ../../boot.php:1469 +msgid "Register" msgstr "" -#: ../../include/text.php:2006 -msgid "Design" +#: ../../include/nav.php:159 +msgid "Create an account" msgstr "" -#: ../../include/text.php:2008 -msgid "Blocks" +#: ../../include/nav.php:164 +msgid "Help and documentation" msgstr "" -#: ../../include/text.php:2009 -msgid "Menus" +#: ../../include/nav.php:167 ../../include/widgets.php:86 +#: ../../mod/apps.php:33 +msgid "Apps" msgstr "" -#: ../../include/text.php:2010 -msgid "Layouts" +#: ../../include/nav.php:167 +msgid "Applications, utilities, links, games" msgstr "" -#: ../../include/text.php:2011 -msgid "Pages" +#: ../../include/nav.php:169 +msgid "Search site content" msgstr "" -#: ../../include/page_widgets.php:6 -msgid "New Page" +#: ../../include/nav.php:172 +msgid "Channel Locator" msgstr "" -#: ../../include/page_widgets.php:39 ../../mod/blocks.php:97 -#: ../../mod/layouts.php:116 ../../mod/webpages.php:123 -msgid "View" +#: ../../include/nav.php:183 +msgid "Your matrix" msgstr "" -#: ../../include/page_widgets.php:40 ../../include/conversation.php:1096 -#: ../../include/ItemObject.php:592 ../../mod/editblock.php:141 -#: ../../mod/editlayout.php:135 ../../mod/editpost.php:140 -#: ../../mod/editwebpage.php:174 ../../mod/photos.php:1003 -#: ../../mod/webpages.php:124 -msgid "Preview" +#: ../../include/nav.php:184 +msgid "Mark all matrix notifications seen" msgstr "" -#: ../../include/page_widgets.php:41 ../../mod/webpages.php:125 -msgid "Actions" +#: ../../include/nav.php:186 +msgid "Channel home" msgstr "" -#: ../../include/page_widgets.php:42 ../../mod/webpages.php:126 -msgid "Page Link" +#: ../../include/nav.php:187 +msgid "Mark all channel notifications seen" msgstr "" -#: ../../include/page_widgets.php:43 ../../mod/webpages.php:127 -msgid "Title" +#: ../../include/nav.php:190 ../../mod/connections.php:389 +msgid "Connections" msgstr "" -#: ../../include/page_widgets.php:44 ../../mod/webpages.php:128 -msgid "Created" +#: ../../include/nav.php:193 +msgid "Notices" msgstr "" -#: ../../include/page_widgets.php:45 ../../mod/webpages.php:129 -msgid "Edited" +#: ../../include/nav.php:193 +msgid "Notifications" msgstr "" -#: ../../include/security.php:301 -msgid "" -"The form security token was not correct. This probably happened because the " -"form has been opened for too long (>3 hours) before submitting it." +#: ../../include/nav.php:194 +msgid "See all notifications" msgstr "" -#: ../../include/account.php:23 -msgid "Not a valid email address" +#: ../../include/nav.php:195 ../../mod/notifications.php:99 +msgid "Mark all system notifications seen" msgstr "" -#: ../../include/account.php:25 -msgid "Your email domain is not among those allowed on this site" +#: ../../include/nav.php:197 +msgid "Private mail" msgstr "" -#: ../../include/account.php:31 -msgid "Your email address is already registered at this site." +#: ../../include/nav.php:198 +msgid "See all private messages" msgstr "" -#: ../../include/account.php:64 -msgid "An invitation is required." +#: ../../include/nav.php:199 +msgid "Mark all private messages seen" msgstr "" -#: ../../include/account.php:68 -msgid "Invitation could not be verified." +#: ../../include/nav.php:200 +msgid "Inbox" msgstr "" -#: ../../include/account.php:119 -msgid "Please enter the required information." +#: ../../include/nav.php:201 +msgid "Outbox" msgstr "" -#: ../../include/account.php:187 -msgid "Failed to store account information." +#: ../../include/nav.php:202 ../../include/widgets.php:543 +msgid "New Message" msgstr "" -#: ../../include/account.php:245 -#, php-format -msgid "Registration confirmation for %s" +#: ../../include/nav.php:205 +msgid "Event Calendar" msgstr "" -#: ../../include/account.php:313 -#, php-format -msgid "Registration request at %s" +#: ../../include/nav.php:206 +msgid "See all events" msgstr "" -#: ../../include/account.php:315 ../../include/account.php:342 -#: ../../include/account.php:399 -msgid "Administrator" +#: ../../include/nav.php:207 +msgid "Mark all events seen" msgstr "" -#: ../../include/account.php:337 -msgid "your registration password" +#: ../../include/nav.php:209 +msgid "Manage Your Channels" msgstr "" -#: ../../include/account.php:340 ../../include/account.php:397 -#, php-format -msgid "Registration details for %s" +#: ../../include/nav.php:211 +msgid "Account/Channel Settings" msgstr "" -#: ../../include/account.php:406 -msgid "Account approved." +#: ../../include/nav.php:219 ../../mod/admin.php:123 +msgid "Admin" msgstr "" -#: ../../include/account.php:440 -#, php-format -msgid "Registration revoked for %s" +#: ../../include/nav.php:219 +msgid "Site Setup and Configuration" msgstr "" -#: ../../include/account.php:486 -msgid "Account verified. Please login." +#: ../../include/nav.php:244 +msgid "Nothing new here" msgstr "" -#: ../../include/photos.php:15 ../../include/attach.php:119 -#: ../../include/attach.php:166 ../../include/attach.php:229 -#: ../../include/attach.php:243 ../../include/attach.php:283 -#: ../../include/attach.php:297 ../../include/attach.php:322 -#: ../../include/attach.php:513 ../../include/attach.php:585 -#: ../../include/chat.php:116 ../../include/items.php:3635 -#: ../../mod/mood.php:112 ../../mod/mitem.php:73 ../../mod/achievements.php:27 -#: ../../mod/settings.php:494 ../../mod/poke.php:128 ../../mod/api.php:26 -#: ../../mod/api.php:31 ../../mod/authtest.php:13 ../../mod/profile.php:64 -#: ../../mod/profile.php:72 ../../mod/block.php:22 ../../mod/block.php:72 -#: ../../mod/profile_photo.php:263 ../../mod/profile_photo.php:276 -#: ../../mod/blocks.php:29 ../../mod/blocks.php:44 ../../mod/profiles.php:179 -#: ../../mod/profiles.php:524 ../../mod/bookmarks.php:46 -#: ../../mod/channel.php:89 ../../mod/channel.php:193 -#: ../../mod/channel.php:236 ../../mod/chat.php:90 ../../mod/chat.php:95 -#: ../../mod/register.php:71 ../../mod/regmod.php:18 ../../mod/common.php:35 -#: ../../mod/network.php:12 ../../mod/connections.php:169 -#: ../../mod/connedit.php:254 ../../mod/delegate.php:6 ../../mod/page.php:30 -#: ../../mod/page.php:80 ../../mod/setup.php:203 ../../mod/editblock.php:34 -#: ../../mod/pdledit.php:21 ../../mod/editlayout.php:48 -#: ../../mod/editpost.php:13 ../../mod/editwebpage.php:44 -#: ../../mod/editwebpage.php:83 ../../mod/photos.php:68 -#: ../../mod/photos.php:526 ../../mod/sources.php:66 ../../mod/events.php:160 -#: ../../mod/filestorage.php:10 ../../mod/filestorage.php:59 -#: ../../mod/filestorage.php:75 ../../mod/filestorage.php:98 -#: ../../mod/fsuggest.php:78 ../../mod/suggest.php:26 ../../mod/group.php:9 -#: ../../mod/thing.php:249 ../../mod/thing.php:266 ../../mod/thing.php:301 -#: ../../mod/invite.php:13 ../../mod/invite.php:104 ../../mod/item.php:178 -#: ../../mod/item.php:186 ../../mod/item.php:915 ../../mod/layouts.php:27 -#: ../../mod/layouts.php:39 ../../mod/like.php:154 -#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27 -#: ../../mod/viewsrc.php:12 ../../mod/mail.php:108 ../../mod/manage.php:6 -#: ../../mod/menu.php:44 ../../mod/webpages.php:40 ../../mod/message.php:16 -#: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97 -#: ../../mod/notifications.php:66 ../../mod/appman.php:66 ../../index.php:186 -#: ../../index.php:361 -msgid "Permission denied." +#: ../../include/nav.php:248 +msgid "Please wait..." msgstr "" -#: ../../include/photos.php:104 +#: ../../include/bookmarks.php:35 #, php-format -msgid "Image exceeds website size limit of %lu bytes" -msgstr "" - -#: ../../include/photos.php:111 -msgid "Image file is empty." -msgstr "" - -#: ../../include/photos.php:140 ../../mod/profile_photo.php:216 -msgid "Unable to process image" -msgstr "" - -#: ../../include/photos.php:212 -msgid "Photo storage failed." -msgstr "" - -#: ../../include/photos.php:339 ../../include/conversation.php:1520 -msgid "Photo Albums" -msgstr "" - -#: ../../include/photos.php:343 ../../mod/photos.php:697 -#: ../../mod/photos.php:1199 -msgid "Upload New Photos" -msgstr "" - -#: ../../include/acl_selectors.php:240 -msgid "Visible to your default audience" -msgstr "" - -#: ../../include/acl_selectors.php:241 -msgid "Show" +msgid "%1$s's bookmarks" msgstr "" -#: ../../include/acl_selectors.php:242 -msgid "Don't show" +#: ../../include/text.php:321 +msgid "prev" msgstr "" -#: ../../include/acl_selectors.php:248 ../../mod/chat.php:209 -#: ../../mod/photos.php:604 ../../mod/photos.php:958 -#: ../../mod/filestorage.php:128 -msgid "Permissions" +#: ../../include/text.php:323 +msgid "first" msgstr "" -#: ../../include/acl_selectors.php:249 ../../include/ItemObject.php:289 -msgid "Close" +#: ../../include/text.php:352 +msgid "last" msgstr "" -#: ../../include/activities.php:39 -msgid " and " +#: ../../include/text.php:355 +msgid "next" msgstr "" -#: ../../include/activities.php:47 -msgid "public profile" +#: ../../include/text.php:367 +msgid "older" msgstr "" -#: ../../include/activities.php:52 -#, php-format -msgid "%1$s changed %2$s to “%3$s”" +#: ../../include/text.php:369 +msgid "newer" msgstr "" -#: ../../include/activities.php:53 -#, php-format -msgid "Visit %1$s's %2$s" +#: ../../include/text.php:730 +msgid "No connections" msgstr "" -#: ../../include/activities.php:56 +#: ../../include/text.php:743 #, php-format -msgid "%1$s has an updated %2$s, changing %3$s." -msgstr "" - -#: ../../include/api.php:1036 -msgid "Public Timeline" -msgstr "" +msgid "%d Connection" +msgid_plural "%d Connections" +msgstr[0] "" +msgstr[1] "" -#: ../../include/attach.php:224 ../../include/attach.php:278 -msgid "Item was not found." +#: ../../include/text.php:756 +msgid "View Connections" msgstr "" -#: ../../include/attach.php:335 -msgid "No source file." +#: ../../include/text.php:817 ../../include/text.php:831 +#: ../../include/widgets.php:193 ../../mod/rbmark.php:28 +#: ../../mod/rbmark.php:98 ../../mod/filer.php:50 ../../mod/admin.php:1338 +#: ../../mod/admin.php:1359 +msgid "Save" msgstr "" -#: ../../include/attach.php:352 -msgid "Cannot locate file to replace" +#: ../../include/text.php:897 +msgid "poke" msgstr "" -#: ../../include/attach.php:370 -msgid "Cannot locate file to revise/update" +#: ../../include/text.php:897 ../../include/conversation.php:243 +msgid "poked" msgstr "" -#: ../../include/attach.php:381 -#, php-format -msgid "File exceeds size limit of %d" +#: ../../include/text.php:898 +msgid "ping" msgstr "" -#: ../../include/attach.php:393 -#, php-format -msgid "You have reached your limit of %1$.0f Mbytes attachment storage." +#: ../../include/text.php:898 +msgid "pinged" msgstr "" -#: ../../include/attach.php:475 -msgid "File upload failed. Possible system limit or action terminated." +#: ../../include/text.php:899 +msgid "prod" msgstr "" -#: ../../include/attach.php:487 -msgid "Stored file could not be verified. Upload failed." +#: ../../include/text.php:899 +msgid "prodded" msgstr "" -#: ../../include/attach.php:528 ../../include/attach.php:545 -msgid "Path not available." +#: ../../include/text.php:900 +msgid "slap" msgstr "" -#: ../../include/attach.php:590 -msgid "Empty pathname" +#: ../../include/text.php:900 +msgid "slapped" msgstr "" -#: ../../include/attach.php:606 -msgid "duplicate filename or path" +#: ../../include/text.php:901 +msgid "finger" msgstr "" -#: ../../include/attach.php:630 -msgid "Path not found." +#: ../../include/text.php:901 +msgid "fingered" msgstr "" -#: ../../include/attach.php:681 -msgid "mkdir failed." +#: ../../include/text.php:902 +msgid "rebuff" msgstr "" -#: ../../include/attach.php:685 -msgid "database storage failed." +#: ../../include/text.php:902 +msgid "rebuffed" msgstr "" -#: ../../include/plugin.php:504 ../../include/plugin.php:506 -msgid "Click here to upgrade." +#: ../../include/text.php:911 +msgid "happy" msgstr "" -#: ../../include/plugin.php:512 -msgid "This action exceeds the limits set by your subscription plan." +#: ../../include/text.php:912 +msgid "sad" msgstr "" -#: ../../include/plugin.php:517 -msgid "This action is not available under your subscription plan." +#: ../../include/text.php:913 +msgid "mellow" msgstr "" -#: ../../include/bb2diaspora.php:463 ../../include/event.php:11 -msgid "l F d, Y \\@ g:i A" +#: ../../include/text.php:914 +msgid "tired" msgstr "" -#: ../../include/bb2diaspora.php:469 ../../include/event.php:20 -msgid "Starts:" +#: ../../include/text.php:915 +msgid "perky" msgstr "" -#: ../../include/bb2diaspora.php:477 ../../include/event.php:30 -msgid "Finishes:" +#: ../../include/text.php:916 +msgid "angry" msgstr "" -#: ../../include/bb2diaspora.php:485 ../../include/event.php:40 -#: ../../include/identity.php:757 ../../mod/directory.php:156 -#: ../../mod/dirprofile.php:105 ../../mod/events.php:504 -msgid "Location:" +#: ../../include/text.php:917 +msgid "stupified" msgstr "" -#: ../../include/nav.php:94 ../../include/nav.php:121 ../../boot.php:1492 -msgid "Logout" +#: ../../include/text.php:918 +msgid "puzzled" msgstr "" -#: ../../include/nav.php:94 ../../include/nav.php:121 -msgid "End this session" +#: ../../include/text.php:919 +msgid "interested" msgstr "" -#: ../../include/nav.php:97 ../../include/nav.php:155 -msgid "Home" +#: ../../include/text.php:920 +msgid "bitter" msgstr "" -#: ../../include/nav.php:97 -msgid "Your posts and conversations" +#: ../../include/text.php:921 +msgid "cheerful" msgstr "" -#: ../../include/nav.php:98 ../../include/conversation.php:944 -#: ../../mod/connedit.php:393 ../../mod/connedit.php:507 -msgid "View Profile" +#: ../../include/text.php:922 +msgid "alive" msgstr "" -#: ../../include/nav.php:98 -msgid "Your profile page" +#: ../../include/text.php:923 +msgid "annoyed" msgstr "" -#: ../../include/nav.php:100 -msgid "Edit Profiles" +#: ../../include/text.php:924 +msgid "anxious" msgstr "" -#: ../../include/nav.php:100 -msgid "Manage/Edit profiles" +#: ../../include/text.php:925 +msgid "cranky" msgstr "" -#: ../../include/nav.php:102 ../../include/identity.php:730 -msgid "Edit Profile" +#: ../../include/text.php:926 +msgid "disturbed" msgstr "" -#: ../../include/nav.php:102 -msgid "Edit your profile" +#: ../../include/text.php:927 +msgid "frustrated" msgstr "" -#: ../../include/nav.php:104 -msgid "Your photos" +#: ../../include/text.php:928 +msgid "depressed" msgstr "" -#: ../../include/nav.php:105 -msgid "Your files" +#: ../../include/text.php:929 +msgid "motivated" msgstr "" -#: ../../include/nav.php:110 -msgid "Your chatrooms" +#: ../../include/text.php:930 +msgid "relaxed" msgstr "" -#: ../../include/nav.php:113 -msgid "Your bookmarks" +#: ../../include/text.php:931 +msgid "surprised" msgstr "" -#: ../../include/nav.php:115 -msgid "Your webpages" +#: ../../include/text.php:1094 +msgid "Monday" msgstr "" -#: ../../include/nav.php:119 -msgid "Sign in" +#: ../../include/text.php:1094 +msgid "Tuesday" msgstr "" -#: ../../include/nav.php:136 -#, php-format -msgid "%s - click to logout" +#: ../../include/text.php:1094 +msgid "Wednesday" msgstr "" -#: ../../include/nav.php:141 -msgid "Click to authenticate to your home hub" +#: ../../include/text.php:1094 +msgid "Thursday" msgstr "" -#: ../../include/nav.php:155 -msgid "Home Page" +#: ../../include/text.php:1094 +msgid "Friday" msgstr "" -#: ../../include/nav.php:159 ../../mod/register.php:221 ../../boot.php:1469 -msgid "Register" +#: ../../include/text.php:1094 +msgid "Saturday" msgstr "" -#: ../../include/nav.php:159 -msgid "Create an account" +#: ../../include/text.php:1094 +msgid "Sunday" msgstr "" -#: ../../include/nav.php:164 -msgid "Help and documentation" +#: ../../include/text.php:1098 +msgid "January" msgstr "" -#: ../../include/nav.php:167 ../../include/widgets.php:86 -#: ../../mod/apps.php:33 -msgid "Apps" +#: ../../include/text.php:1098 +msgid "February" msgstr "" -#: ../../include/nav.php:167 -msgid "Applications, utilities, links, games" +#: ../../include/text.php:1098 +msgid "March" msgstr "" -#: ../../include/nav.php:169 -msgid "Search site content" +#: ../../include/text.php:1098 +msgid "April" msgstr "" -#: ../../include/nav.php:172 -msgid "Channel Locator" +#: ../../include/text.php:1098 +msgid "May" msgstr "" -#: ../../include/nav.php:183 -msgid "Your matrix" +#: ../../include/text.php:1098 +msgid "June" msgstr "" -#: ../../include/nav.php:184 -msgid "Mark all matrix notifications seen" +#: ../../include/text.php:1098 +msgid "July" msgstr "" -#: ../../include/nav.php:186 -msgid "Channel home" +#: ../../include/text.php:1098 +msgid "August" msgstr "" -#: ../../include/nav.php:187 -msgid "Mark all channel notifications seen" +#: ../../include/text.php:1098 +msgid "September" msgstr "" -#: ../../include/nav.php:190 ../../mod/connections.php:389 -msgid "Connections" +#: ../../include/text.php:1098 +msgid "October" msgstr "" -#: ../../include/nav.php:193 -msgid "Notices" +#: ../../include/text.php:1098 +msgid "November" msgstr "" -#: ../../include/nav.php:193 -msgid "Notifications" +#: ../../include/text.php:1098 +msgid "December" msgstr "" -#: ../../include/nav.php:194 -msgid "See all notifications" +#: ../../include/text.php:1176 +msgid "unknown.???" msgstr "" -#: ../../include/nav.php:195 ../../mod/notifications.php:99 -msgid "Mark all system notifications seen" +#: ../../include/text.php:1177 +msgid "bytes" msgstr "" -#: ../../include/nav.php:197 -msgid "Private mail" +#: ../../include/text.php:1212 +msgid "remove category" msgstr "" -#: ../../include/nav.php:198 -msgid "See all private messages" +#: ../../include/text.php:1282 +msgid "remove from file" msgstr "" -#: ../../include/nav.php:199 -msgid "Mark all private messages seen" +#: ../../include/text.php:1347 ../../include/text.php:1359 +msgid "Click to open/close" msgstr "" -#: ../../include/nav.php:200 -msgid "Inbox" +#: ../../include/text.php:1514 ../../mod/events.php:374 +msgid "Link to Source" msgstr "" -#: ../../include/nav.php:201 -msgid "Outbox" +#: ../../include/text.php:1533 +msgid "Select a page layout: " msgstr "" -#: ../../include/nav.php:202 ../../include/widgets.php:543 -msgid "New Message" +#: ../../include/text.php:1536 ../../include/text.php:1601 +msgid "default" msgstr "" -#: ../../include/nav.php:205 -msgid "Event Calendar" +#: ../../include/text.php:1572 +msgid "Page content type: " msgstr "" -#: ../../include/nav.php:206 -msgid "See all events" +#: ../../include/text.php:1613 +msgid "Select an alternate language" msgstr "" -#: ../../include/nav.php:207 -msgid "Mark all events seen" +#: ../../include/text.php:1734 ../../include/diaspora.php:1852 +#: ../../include/conversation.php:120 ../../mod/subthread.php:72 +#: ../../mod/subthread.php:174 ../../mod/tagger.php:45 ../../mod/like.php:294 +msgid "photo" msgstr "" -#: ../../include/nav.php:209 ../../mod/manage.php:148 -msgid "Channel Manager" +#: ../../include/text.php:1737 ../../include/conversation.php:123 +#: ../../mod/tagger.php:49 +msgid "event" msgstr "" -#: ../../include/nav.php:209 -msgid "Manage Your Channels" +#: ../../include/text.php:1740 ../../include/diaspora.php:1852 +#: ../../include/conversation.php:148 ../../mod/subthread.php:72 +#: ../../mod/subthread.php:174 ../../mod/tagger.php:53 ../../mod/like.php:294 +msgid "status" msgstr "" -#: ../../include/nav.php:211 -msgid "Account/Channel Settings" +#: ../../include/text.php:1742 ../../include/conversation.php:150 +#: ../../mod/tagger.php:55 +msgid "comment" msgstr "" -#: ../../include/nav.php:219 ../../mod/admin.php:123 -msgid "Admin" +#: ../../include/text.php:1747 +msgid "activity" msgstr "" -#: ../../include/nav.php:219 -msgid "Site Setup and Configuration" +#: ../../include/text.php:2006 +msgid "Design" msgstr "" -#: ../../include/nav.php:244 -msgid "Nothing new here" +#: ../../include/text.php:2008 +msgid "Blocks" msgstr "" -#: ../../include/nav.php:248 -msgid "Please wait..." +#: ../../include/text.php:2009 +msgid "Menus" msgstr "" -#: ../../include/bookmarks.php:35 -#, php-format -msgid "%1$s's bookmarks" +#: ../../include/text.php:2010 +msgid "Layouts" +msgstr "" + +#: ../../include/text.php:2011 +msgid "Pages" msgstr "" #: ../../include/taxonomy.php:210 @@ -1167,8 +1107,8 @@ msgstr "" msgid "RSS/Atom" msgstr "" -#: ../../include/contact_selectors.php:79 ../../mod/admin.php:723 -#: ../../mod/admin.php:732 ../../boot.php:1495 +#: ../../include/contact_selectors.php:79 ../../mod/admin.php:726 +#: ../../mod/admin.php:735 ../../boot.php:1495 msgid "Email" msgstr "" @@ -1203,7 +1143,7 @@ msgid_plural "%d invitations available" msgstr[0] "" msgstr[1] "" -#: ../../include/contact_widgets.php:19 ../../mod/admin.php:415 +#: ../../include/contact_widgets.php:19 ../../mod/admin.php:417 msgid "Advanced" msgstr "" @@ -1277,17 +1217,79 @@ msgstr "" msgid "This event has been added to your calendar." msgstr "" -#: ../../include/zot.php:640 -msgid "Invalid data packet" +#: ../../include/account.php:23 +msgid "Not a valid email address" msgstr "" -#: ../../include/zot.php:654 -msgid "Unable to verify channel signature" +#: ../../include/account.php:25 +msgid "Your email domain is not among those allowed on this site" +msgstr "" + +#: ../../include/account.php:31 +msgid "Your email address is already registered at this site." +msgstr "" + +#: ../../include/account.php:64 +msgid "An invitation is required." +msgstr "" + +#: ../../include/account.php:68 +msgid "Invitation could not be verified." +msgstr "" + +#: ../../include/account.php:119 +msgid "Please enter the required information." +msgstr "" + +#: ../../include/account.php:187 +msgid "Failed to store account information." +msgstr "" + +#: ../../include/account.php:245 +#, php-format +msgid "Registration confirmation for %s" msgstr "" -#: ../../include/zot.php:851 +#: ../../include/account.php:313 #, php-format -msgid "Unable to verify site signature for %s" +msgid "Registration request at %s" +msgstr "" + +#: ../../include/account.php:315 ../../include/account.php:342 +#: ../../include/account.php:399 +msgid "Administrator" +msgstr "" + +#: ../../include/account.php:337 +msgid "your registration password" +msgstr "" + +#: ../../include/account.php:340 ../../include/account.php:397 +#, php-format +msgid "Registration details for %s" +msgstr "" + +#: ../../include/account.php:406 +msgid "Account approved." +msgstr "" + +#: ../../include/account.php:440 +#, php-format +msgid "Registration revoked for %s" +msgstr "" + +#: ../../include/account.php:486 +msgid "Account verified. Please login." +msgstr "" + +#: ../../include/diaspora.php:1868 ../../include/conversation.php:164 +#: ../../mod/like.php:331 +#, php-format +msgid "%1$s likes %2$s's %3$s" +msgstr "" + +#: ../../include/diaspora.php:2278 +msgid "Attachments:" msgstr "" #: ../../include/datetime.php:43 ../../include/datetime.php:45 @@ -1635,7 +1637,7 @@ msgid "%1$s used of %2$s (%3$s%)" msgstr "" #: ../../include/reddav.php:1284 ../../mod/settings.php:519 -#: ../../mod/settings.php:545 ../../mod/admin.php:862 +#: ../../mod/settings.php:545 ../../mod/admin.php:865 msgid "Name" msgstr "" @@ -1697,52 +1699,52 @@ msgctxt "mood" msgid "%1$s is %2$s" msgstr "" -#: ../../include/conversation.php:634 ../../include/ItemObject.php:114 +#: ../../include/conversation.php:647 ../../include/ItemObject.php:114 msgid "Select" msgstr "" -#: ../../include/conversation.php:642 ../../include/ItemObject.php:89 +#: ../../include/conversation.php:655 ../../include/ItemObject.php:89 #: ../../mod/photos.php:850 msgid "Private Message" msgstr "" -#: ../../include/conversation.php:649 ../../include/ItemObject.php:182 +#: ../../include/conversation.php:662 ../../include/ItemObject.php:182 msgid "Message is verified" msgstr "" -#: ../../include/conversation.php:669 +#: ../../include/conversation.php:682 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: ../../include/conversation.php:683 +#: ../../include/conversation.php:696 msgid "Categories:" msgstr "" -#: ../../include/conversation.php:684 +#: ../../include/conversation.php:697 msgid "Filed under:" msgstr "" -#: ../../include/conversation.php:693 ../../include/ItemObject.php:250 +#: ../../include/conversation.php:706 ../../include/ItemObject.php:250 #, php-format msgid " from %s" msgstr "" -#: ../../include/conversation.php:696 ../../include/ItemObject.php:253 +#: ../../include/conversation.php:709 ../../include/ItemObject.php:253 #, php-format msgid "last edited: %s" msgstr "" -#: ../../include/conversation.php:697 ../../include/ItemObject.php:254 +#: ../../include/conversation.php:710 ../../include/ItemObject.php:254 #, php-format msgid "Expires: %s" msgstr "" -#: ../../include/conversation.php:712 +#: ../../include/conversation.php:725 msgid "View in context" msgstr "" -#: ../../include/conversation.php:714 ../../include/conversation.php:1135 +#: ../../include/conversation.php:727 ../../include/conversation.php:1148 #: ../../include/ItemObject.php:294 ../../mod/editblock.php:120 #: ../../mod/editlayout.php:115 ../../mod/editpost.php:121 #: ../../mod/editwebpage.php:152 ../../mod/photos.php:983 @@ -1750,39 +1752,39 @@ msgstr "" msgid "Please wait" msgstr "" -#: ../../include/conversation.php:841 +#: ../../include/conversation.php:854 msgid "remove" msgstr "" -#: ../../include/conversation.php:845 +#: ../../include/conversation.php:858 msgid "Loading..." msgstr "" -#: ../../include/conversation.php:846 +#: ../../include/conversation.php:859 msgid "Delete Selected Items" msgstr "" -#: ../../include/conversation.php:941 +#: ../../include/conversation.php:954 msgid "View Source" msgstr "" -#: ../../include/conversation.php:942 +#: ../../include/conversation.php:955 msgid "Follow Thread" msgstr "" -#: ../../include/conversation.php:943 +#: ../../include/conversation.php:956 msgid "View Status" msgstr "" -#: ../../include/conversation.php:945 +#: ../../include/conversation.php:958 msgid "View Photos" msgstr "" -#: ../../include/conversation.php:946 +#: ../../include/conversation.php:959 msgid "Matrix Activity" msgstr "" -#: ../../include/conversation.php:947 ../../include/identity.php:706 +#: ../../include/conversation.php:960 ../../include/identity.php:706 #: ../../include/widgets.php:135 ../../include/widgets.php:175 #: ../../include/Contact.php:107 ../../mod/directory.php:183 #: ../../mod/dirprofile.php:164 ../../mod/suggest.php:51 @@ -1790,314 +1792,314 @@ msgstr "" msgid "Connect" msgstr "" -#: ../../include/conversation.php:948 +#: ../../include/conversation.php:961 msgid "Edit Contact" msgstr "" -#: ../../include/conversation.php:949 +#: ../../include/conversation.php:962 msgid "Send PM" msgstr "" -#: ../../include/conversation.php:1006 +#: ../../include/conversation.php:1019 #, php-format msgid "%s likes this." msgstr "" -#: ../../include/conversation.php:1006 +#: ../../include/conversation.php:1019 #, php-format msgid "%s doesn't like this." msgstr "" -#: ../../include/conversation.php:1010 +#: ../../include/conversation.php:1023 #, php-format msgid "%2$d people like this." msgid_plural "%2$d people like this." msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1012 +#: ../../include/conversation.php:1025 #, php-format msgid "%2$d people don't like this." msgid_plural "%2$d people don't like this." msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1018 +#: ../../include/conversation.php:1031 msgid "and" msgstr "" -#: ../../include/conversation.php:1021 +#: ../../include/conversation.php:1034 #, php-format msgid ", and %d other people" msgid_plural ", and %d other people" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1022 +#: ../../include/conversation.php:1035 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:1022 +#: ../../include/conversation.php:1035 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:1079 +#: ../../include/conversation.php:1092 msgid "Visible to everybody" msgstr "" -#: ../../include/conversation.php:1080 ../../mod/mail.php:167 +#: ../../include/conversation.php:1093 ../../mod/mail.php:167 #: ../../mod/mail.php:279 msgid "Please enter a link URL:" msgstr "" -#: ../../include/conversation.php:1081 +#: ../../include/conversation.php:1094 msgid "Please enter a video link/URL:" msgstr "" -#: ../../include/conversation.php:1082 +#: ../../include/conversation.php:1095 msgid "Please enter an audio link/URL:" msgstr "" -#: ../../include/conversation.php:1083 +#: ../../include/conversation.php:1096 msgid "Tag term:" msgstr "" -#: ../../include/conversation.php:1084 ../../mod/filer.php:49 +#: ../../include/conversation.php:1097 ../../mod/filer.php:49 msgid "Save to Folder:" msgstr "" -#: ../../include/conversation.php:1085 +#: ../../include/conversation.php:1098 msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:1086 ../../mod/editpost.php:52 +#: ../../include/conversation.php:1099 ../../mod/editpost.php:52 #: ../../mod/mail.php:168 ../../mod/mail.php:280 msgid "Expires YYYY-MM-DD HH:MM" msgstr "" -#: ../../include/conversation.php:1110 ../../mod/photos.php:982 -#: ../../mod/layouts.php:113 +#: ../../include/conversation.php:1123 ../../mod/photos.php:982 +#: ../../mod/layouts.php:122 msgid "Share" msgstr "" -#: ../../include/conversation.php:1112 ../../mod/editwebpage.php:139 +#: ../../include/conversation.php:1125 ../../mod/editwebpage.php:139 msgid "Page link title" msgstr "" -#: ../../include/conversation.php:1115 +#: ../../include/conversation.php:1128 msgid "Post as" msgstr "" -#: ../../include/conversation.php:1116 ../../mod/editblock.php:112 +#: ../../include/conversation.php:1129 ../../mod/editblock.php:112 #: ../../mod/editlayout.php:107 ../../mod/editpost.php:113 #: ../../mod/editwebpage.php:144 ../../mod/mail.php:228 ../../mod/mail.php:342 msgid "Upload photo" msgstr "" -#: ../../include/conversation.php:1117 +#: ../../include/conversation.php:1130 msgid "upload photo" msgstr "" -#: ../../include/conversation.php:1118 ../../mod/editblock.php:113 +#: ../../include/conversation.php:1131 ../../mod/editblock.php:113 #: ../../mod/editlayout.php:108 ../../mod/editpost.php:114 #: ../../mod/editwebpage.php:145 ../../mod/mail.php:229 ../../mod/mail.php:343 msgid "Attach file" msgstr "" -#: ../../include/conversation.php:1119 +#: ../../include/conversation.php:1132 msgid "attach file" msgstr "" -#: ../../include/conversation.php:1120 ../../mod/editblock.php:114 +#: ../../include/conversation.php:1133 ../../mod/editblock.php:114 #: ../../mod/editlayout.php:109 ../../mod/editpost.php:115 #: ../../mod/editwebpage.php:146 ../../mod/mail.php:230 ../../mod/mail.php:344 msgid "Insert web link" msgstr "" -#: ../../include/conversation.php:1121 +#: ../../include/conversation.php:1134 msgid "web link" msgstr "" -#: ../../include/conversation.php:1122 +#: ../../include/conversation.php:1135 msgid "Insert video link" msgstr "" -#: ../../include/conversation.php:1123 +#: ../../include/conversation.php:1136 msgid "video link" msgstr "" -#: ../../include/conversation.php:1124 +#: ../../include/conversation.php:1137 msgid "Insert audio link" msgstr "" -#: ../../include/conversation.php:1125 +#: ../../include/conversation.php:1138 msgid "audio link" msgstr "" -#: ../../include/conversation.php:1126 ../../mod/editblock.php:118 +#: ../../include/conversation.php:1139 ../../mod/editblock.php:118 #: ../../mod/editlayout.php:113 ../../mod/editpost.php:119 #: ../../mod/editwebpage.php:150 msgid "Set your location" msgstr "" -#: ../../include/conversation.php:1127 +#: ../../include/conversation.php:1140 msgid "set location" msgstr "" -#: ../../include/conversation.php:1128 ../../mod/editblock.php:119 +#: ../../include/conversation.php:1141 ../../mod/editblock.php:119 #: ../../mod/editlayout.php:114 ../../mod/editpost.php:120 #: ../../mod/editwebpage.php:151 msgid "Clear browser location" msgstr "" -#: ../../include/conversation.php:1129 +#: ../../include/conversation.php:1142 msgid "clear location" msgstr "" -#: ../../include/conversation.php:1131 ../../mod/editblock.php:132 +#: ../../include/conversation.php:1144 ../../mod/editblock.php:132 #: ../../mod/editlayout.php:126 ../../mod/editpost.php:132 #: ../../mod/editwebpage.php:167 msgid "Set title" msgstr "" -#: ../../include/conversation.php:1134 ../../mod/editblock.php:135 +#: ../../include/conversation.php:1147 ../../mod/editblock.php:135 #: ../../mod/editlayout.php:129 ../../mod/editpost.php:134 #: ../../mod/editwebpage.php:169 msgid "Categories (comma-separated list)" msgstr "" -#: ../../include/conversation.php:1136 ../../mod/editblock.php:121 +#: ../../include/conversation.php:1149 ../../mod/editblock.php:121 #: ../../mod/editlayout.php:116 ../../mod/editpost.php:122 #: ../../mod/editwebpage.php:153 msgid "Permission settings" msgstr "" -#: ../../include/conversation.php:1137 +#: ../../include/conversation.php:1150 msgid "permissions" msgstr "" -#: ../../include/conversation.php:1144 ../../mod/editblock.php:129 +#: ../../include/conversation.php:1157 ../../mod/editblock.php:129 #: ../../mod/editlayout.php:123 ../../mod/editpost.php:129 #: ../../mod/editwebpage.php:162 msgid "Public post" msgstr "" -#: ../../include/conversation.php:1146 ../../mod/editblock.php:136 +#: ../../include/conversation.php:1159 ../../mod/editblock.php:136 #: ../../mod/editlayout.php:130 ../../mod/editpost.php:135 #: ../../mod/editwebpage.php:170 msgid "Example: bob@example.com, mary@example.com" msgstr "" -#: ../../include/conversation.php:1159 ../../mod/editblock.php:146 +#: ../../include/conversation.php:1172 ../../mod/editblock.php:146 #: ../../mod/editlayout.php:140 ../../mod/editpost.php:146 #: ../../mod/editwebpage.php:179 ../../mod/mail.php:235 ../../mod/mail.php:349 msgid "Set expiration date" msgstr "" -#: ../../include/conversation.php:1161 ../../include/ItemObject.php:595 +#: ../../include/conversation.php:1174 ../../include/ItemObject.php:595 #: ../../mod/editpost.php:148 ../../mod/mail.php:237 ../../mod/mail.php:351 msgid "Encrypt text" msgstr "" -#: ../../include/conversation.php:1163 ../../mod/editpost.php:150 +#: ../../include/conversation.php:1176 ../../mod/editpost.php:150 msgid "OK" msgstr "" -#: ../../include/conversation.php:1164 ../../mod/settings.php:518 +#: ../../include/conversation.php:1177 ../../mod/settings.php:518 #: ../../mod/settings.php:544 ../../mod/editpost.php:151 #: ../../mod/fbrowser.php:82 ../../mod/fbrowser.php:117 ../../mod/tagrm.php:11 #: ../../mod/tagrm.php:94 msgid "Cancel" msgstr "" -#: ../../include/conversation.php:1406 +#: ../../include/conversation.php:1419 msgid "Discover" msgstr "" -#: ../../include/conversation.php:1409 +#: ../../include/conversation.php:1422 msgid "Imported public streams" msgstr "" -#: ../../include/conversation.php:1414 +#: ../../include/conversation.php:1427 msgid "Commented Order" msgstr "" -#: ../../include/conversation.php:1417 +#: ../../include/conversation.php:1430 msgid "Sort by Comment Date" msgstr "" -#: ../../include/conversation.php:1421 +#: ../../include/conversation.php:1434 msgid "Posted Order" msgstr "" -#: ../../include/conversation.php:1424 +#: ../../include/conversation.php:1437 msgid "Sort by Post Date" msgstr "" -#: ../../include/conversation.php:1429 ../../include/widgets.php:89 +#: ../../include/conversation.php:1442 ../../include/widgets.php:89 msgid "Personal" msgstr "" -#: ../../include/conversation.php:1432 +#: ../../include/conversation.php:1445 msgid "Posts that mention or involve you" msgstr "" -#: ../../include/conversation.php:1438 ../../mod/connections.php:211 +#: ../../include/conversation.php:1451 ../../mod/connections.php:211 #: ../../mod/connections.php:224 ../../mod/menu.php:61 msgid "New" msgstr "" -#: ../../include/conversation.php:1441 +#: ../../include/conversation.php:1454 msgid "Activity Stream - by date" msgstr "" -#: ../../include/conversation.php:1447 +#: ../../include/conversation.php:1460 msgid "Starred" msgstr "" -#: ../../include/conversation.php:1450 +#: ../../include/conversation.php:1463 msgid "Favourite Posts" msgstr "" -#: ../../include/conversation.php:1457 +#: ../../include/conversation.php:1470 msgid "Spam" msgstr "" -#: ../../include/conversation.php:1460 +#: ../../include/conversation.php:1473 msgid "Posts flagged as SPAM" msgstr "" -#: ../../include/conversation.php:1496 ../../mod/admin.php:861 +#: ../../include/conversation.php:1509 ../../mod/admin.php:864 msgid "Channel" msgstr "" -#: ../../include/conversation.php:1499 +#: ../../include/conversation.php:1512 msgid "Status Messages and Posts" msgstr "" -#: ../../include/conversation.php:1508 +#: ../../include/conversation.php:1521 msgid "About" msgstr "" -#: ../../include/conversation.php:1511 +#: ../../include/conversation.php:1524 msgid "Profile Details" msgstr "" -#: ../../include/conversation.php:1529 +#: ../../include/conversation.php:1542 msgid "Files and Storage" msgstr "" -#: ../../include/conversation.php:1538 ../../include/conversation.php:1541 +#: ../../include/conversation.php:1551 ../../include/conversation.php:1554 msgid "Chatrooms" msgstr "" -#: ../../include/conversation.php:1551 +#: ../../include/conversation.php:1564 msgid "Saved Bookmarks" msgstr "" -#: ../../include/conversation.php:1562 +#: ../../include/conversation.php:1575 msgid "Manage Webpages" msgstr "" @@ -2359,15 +2361,15 @@ msgstr "" msgid "Channel was deleted and no longer exists." msgstr "" -#: ../../include/follow.php:132 +#: ../../include/follow.php:143 msgid "Channel discovery failed." msgstr "" -#: ../../include/follow.php:149 +#: ../../include/follow.php:160 msgid "local account not found." msgstr "" -#: ../../include/follow.php:158 +#: ../../include/follow.php:169 msgid "Cannot connect to yourself." msgstr "" @@ -2391,71 +2393,75 @@ msgstr "" msgid "Room is full" msgstr "" -#: ../../include/items.php:295 ../../mod/profperm.php:23 +#: ../../include/items.php:315 ../../mod/profperm.php:23 #: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/like.php:242 #: ../../index.php:360 msgid "Permission denied" msgstr "" -#: ../../include/items.php:830 +#: ../../include/items.php:858 msgid "(Unknown)" msgstr "" -#: ../../include/items.php:959 +#: ../../include/items.php:990 msgid "Visible to anybody on the internet." msgstr "" -#: ../../include/items.php:961 +#: ../../include/items.php:992 msgid "Visible to you only." msgstr "" -#: ../../include/items.php:963 +#: ../../include/items.php:994 msgid "Visible to anybody in this network." msgstr "" -#: ../../include/items.php:965 +#: ../../include/items.php:996 msgid "Visible to anybody authenticated." msgstr "" -#: ../../include/items.php:967 +#: ../../include/items.php:998 #, php-format msgid "Visible to anybody on %s." msgstr "" -#: ../../include/items.php:969 +#: ../../include/items.php:1000 msgid "Visible to all connections." msgstr "" -#: ../../include/items.php:971 +#: ../../include/items.php:1002 msgid "Visible to approved connections." msgstr "" -#: ../../include/items.php:3573 ../../mod/home.php:67 ../../mod/display.php:32 +#: ../../include/items.php:1004 +msgid "Visible to specific connections." +msgstr "" + +#: ../../include/items.php:3630 ../../mod/home.php:67 ../../mod/display.php:32 #: ../../mod/filestorage.php:18 ../../mod/admin.php:168 -#: ../../mod/admin.php:892 ../../mod/admin.php:1095 ../../mod/thing.php:78 +#: ../../mod/admin.php:895 ../../mod/admin.php:1098 ../../mod/thing.php:78 #: ../../mod/viewsrc.php:18 msgid "Item not found." msgstr "" -#: ../../include/items.php:4006 ../../mod/group.php:38 ../../mod/group.php:140 +#: ../../include/items.php:4063 ../../mod/group.php:38 ../../mod/group.php:140 msgid "Collection not found." msgstr "" -#: ../../include/items.php:4021 +#: ../../include/items.php:4078 msgid "Collection is empty." msgstr "" -#: ../../include/items.php:4028 +#: ../../include/items.php:4085 #, php-format msgid "Collection: %s" msgstr "" -#: ../../include/items.php:4039 +#: ../../include/items.php:4096 #, php-format msgid "Connection: %s" msgstr "" -#: ../../include/items.php:4042 +#: ../../include/items.php:4099 msgid "Connection not found." msgstr "" @@ -2470,7 +2476,7 @@ msgstr "" msgid "Default privacy group for new contacts" msgstr "" -#: ../../include/group.php:253 ../../mod/admin.php:732 +#: ../../include/group.php:253 ../../mod/admin.php:735 msgid "All Channels" msgstr "" @@ -2551,7 +2557,7 @@ msgstr "" msgid "Requested profile is not available." msgstr "" -#: ../../include/identity.php:720 ../../mod/profiles.php:714 +#: ../../include/identity.php:720 ../../mod/profiles.php:750 msgid "Change profile photo" msgstr "" @@ -2563,11 +2569,11 @@ msgstr "" msgid "Manage/edit profiles" msgstr "" -#: ../../include/identity.php:727 ../../mod/profiles.php:715 +#: ../../include/identity.php:727 ../../mod/profiles.php:751 msgid "Create New Profile" msgstr "" -#: ../../include/identity.php:741 ../../mod/profiles.php:726 +#: ../../include/identity.php:741 ../../mod/profiles.php:762 msgid "Profile Image" msgstr "" @@ -2575,8 +2581,8 @@ msgstr "" msgid "visible to everybody" msgstr "" -#: ../../include/identity.php:745 ../../mod/profiles.php:609 -#: ../../mod/profiles.php:730 +#: ../../include/identity.php:745 ../../mod/profiles.php:645 +#: ../../mod/profiles.php:766 msgid "Edit visibility" msgstr "" @@ -2662,11 +2668,11 @@ msgstr "" msgid "for %1$d %2$s" msgstr "" -#: ../../include/identity.php:1054 ../../mod/profiles.php:631 +#: ../../include/identity.php:1054 ../../mod/profiles.php:667 msgid "Sexual Preference:" msgstr "" -#: ../../include/identity.php:1058 ../../mod/profiles.php:633 +#: ../../include/identity.php:1058 ../../mod/profiles.php:669 msgid "Hometown:" msgstr "" @@ -2674,7 +2680,7 @@ msgstr "" msgid "Tags:" msgstr "" -#: ../../include/identity.php:1062 ../../mod/profiles.php:634 +#: ../../include/identity.php:1062 ../../mod/profiles.php:670 msgid "Political Views:" msgstr "" @@ -2690,11 +2696,11 @@ msgstr "" msgid "Hobbies/Interests:" msgstr "" -#: ../../include/identity.php:1070 ../../mod/profiles.php:637 +#: ../../include/identity.php:1070 ../../mod/profiles.php:673 msgid "Likes:" msgstr "" -#: ../../include/identity.php:1072 ../../mod/profiles.php:638 +#: ../../include/identity.php:1072 ../../mod/profiles.php:674 msgid "Dislikes:" msgstr "" @@ -2738,10 +2744,6 @@ msgstr "" msgid "Like this thing" msgstr "" -#: ../../include/network.php:557 -msgid "view full size" -msgstr "" - #: ../../include/bbcode.php:112 ../../include/bbcode.php:645 #: ../../include/bbcode.php:648 ../../include/bbcode.php:653 #: ../../include/bbcode.php:656 ../../include/bbcode.php:659 @@ -3037,17 +3039,17 @@ msgstr "" #: ../../mod/settings.php:517 ../../mod/settings.php:629 #: ../../mod/settings.php:658 ../../mod/settings.php:682 #: ../../mod/settings.php:755 ../../mod/settings.php:935 -#: ../../mod/poke.php:166 ../../mod/profiles.php:607 ../../mod/chat.php:177 +#: ../../mod/poke.php:166 ../../mod/profiles.php:643 ../../mod/chat.php:177 #: ../../mod/chat.php:211 ../../mod/connect.php:92 ../../mod/connedit.php:518 #: ../../mod/setup.php:307 ../../mod/setup.php:350 ../../mod/pdledit.php:58 #: ../../mod/photos.php:563 ../../mod/photos.php:674 ../../mod/photos.php:962 #: ../../mod/photos.php:1002 ../../mod/photos.php:1089 #: ../../mod/sources.php:104 ../../mod/sources.php:138 #: ../../mod/events.php:511 ../../mod/filestorage.php:137 -#: ../../mod/fsuggest.php:108 ../../mod/group.php:81 ../../mod/admin.php:411 -#: ../../mod/admin.php:720 ../../mod/admin.php:855 ../../mod/admin.php:988 -#: ../../mod/admin.php:1187 ../../mod/admin.php:1274 ../../mod/thing.php:286 -#: ../../mod/thing.php:329 ../../mod/import.php:393 ../../mod/invite.php:142 +#: ../../mod/fsuggest.php:108 ../../mod/group.php:81 ../../mod/admin.php:413 +#: ../../mod/admin.php:723 ../../mod/admin.php:858 ../../mod/admin.php:991 +#: ../../mod/admin.php:1190 ../../mod/admin.php:1277 ../../mod/thing.php:286 +#: ../../mod/thing.php:329 ../../mod/import.php:394 ../../mod/invite.php:142 #: ../../mod/mail.php:345 ../../mod/appman.php:99 ../../mod/poll.php:68 #: ../../view/theme/apw/php/config.php:256 #: ../../view/theme/blogga/php/config.php:67 @@ -3213,7 +3215,7 @@ msgstr "" msgid "Open the selected location in a different window or browser tab" msgstr "" -#: ../../include/Contact.php:211 ../../mod/admin.php:646 +#: ../../include/Contact.php:211 ../../mod/admin.php:649 #, php-format msgid "User '%s' deleted" msgstr "" @@ -3856,7 +3858,7 @@ msgstr "" msgid "Connector Settings" msgstr "" -#: ../../mod/settings.php:711 ../../mod/admin.php:359 +#: ../../mod/settings.php:711 ../../mod/admin.php:361 msgid "No special theme for mobile devices" msgstr "" @@ -3942,14 +3944,14 @@ msgid "Publish your default profile in the network directory" msgstr "" #: ../../mod/settings.php:885 ../../mod/settings.php:890 -#: ../../mod/settings.php:961 ../../mod/api.php:106 ../../mod/profiles.php:566 -#: ../../mod/admin.php:389 +#: ../../mod/settings.php:961 ../../mod/api.php:106 ../../mod/profiles.php:602 +#: ../../mod/admin.php:391 msgid "No" msgstr "" #: ../../mod/settings.php:885 ../../mod/settings.php:890 -#: ../../mod/settings.php:961 ../../mod/api.php:105 ../../mod/profiles.php:565 -#: ../../mod/admin.php:391 +#: ../../mod/settings.php:961 ../../mod/api.php:105 ../../mod/profiles.php:601 +#: ../../mod/admin.php:393 msgid "Yes" msgstr "" @@ -4301,12 +4303,12 @@ msgstr "" msgid "Image size reduction [%s] failed." msgstr "" -#: ../../mod/blocks.php:66 +#: ../../mod/blocks.php:62 msgid "Block Name" msgstr "" #: ../../mod/profiles.php:18 ../../mod/profiles.php:165 -#: ../../mod/profiles.php:222 ../../mod/profiles.php:539 +#: ../../mod/profiles.php:222 ../../mod/profiles.php:575 msgid "Profile not found." msgstr "" @@ -4334,237 +4336,237 @@ msgstr "" msgid "Profile Name is required." msgstr "" -#: ../../mod/profiles.php:354 +#: ../../mod/profiles.php:390 msgid "Marital Status" msgstr "" -#: ../../mod/profiles.php:358 +#: ../../mod/profiles.php:394 msgid "Romantic Partner" msgstr "" -#: ../../mod/profiles.php:362 +#: ../../mod/profiles.php:398 msgid "Likes" msgstr "" -#: ../../mod/profiles.php:366 +#: ../../mod/profiles.php:402 msgid "Dislikes" msgstr "" -#: ../../mod/profiles.php:370 +#: ../../mod/profiles.php:406 msgid "Work/Employment" msgstr "" -#: ../../mod/profiles.php:373 +#: ../../mod/profiles.php:409 msgid "Religion" msgstr "" -#: ../../mod/profiles.php:377 +#: ../../mod/profiles.php:413 msgid "Political Views" msgstr "" -#: ../../mod/profiles.php:381 +#: ../../mod/profiles.php:417 msgid "Gender" msgstr "" -#: ../../mod/profiles.php:385 +#: ../../mod/profiles.php:421 msgid "Sexual Preference" msgstr "" -#: ../../mod/profiles.php:389 +#: ../../mod/profiles.php:425 msgid "Homepage" msgstr "" -#: ../../mod/profiles.php:393 +#: ../../mod/profiles.php:429 msgid "Interests" msgstr "" -#: ../../mod/profiles.php:397 ../../mod/admin.php:862 +#: ../../mod/profiles.php:433 ../../mod/admin.php:865 msgid "Address" msgstr "" -#: ../../mod/profiles.php:404 ../../mod/pubsites.php:25 +#: ../../mod/profiles.php:440 ../../mod/pubsites.php:25 msgid "Location" msgstr "" -#: ../../mod/profiles.php:487 +#: ../../mod/profiles.php:523 msgid "Profile updated." msgstr "" -#: ../../mod/profiles.php:564 +#: ../../mod/profiles.php:600 msgid "Hide your contact/friend list from viewers of this profile?" msgstr "" -#: ../../mod/profiles.php:606 +#: ../../mod/profiles.php:642 msgid "Edit Profile Details" msgstr "" -#: ../../mod/profiles.php:608 +#: ../../mod/profiles.php:644 msgid "View this profile" msgstr "" -#: ../../mod/profiles.php:610 +#: ../../mod/profiles.php:646 msgid "Change Profile Photo" msgstr "" -#: ../../mod/profiles.php:611 +#: ../../mod/profiles.php:647 msgid "Create a new profile using these settings" msgstr "" -#: ../../mod/profiles.php:612 +#: ../../mod/profiles.php:648 msgid "Clone this profile" msgstr "" -#: ../../mod/profiles.php:613 +#: ../../mod/profiles.php:649 msgid "Delete this profile" msgstr "" -#: ../../mod/profiles.php:615 +#: ../../mod/profiles.php:651 msgid "Import profile from file" msgstr "" -#: ../../mod/profiles.php:616 +#: ../../mod/profiles.php:652 msgid "Export profile to file" msgstr "" -#: ../../mod/profiles.php:617 +#: ../../mod/profiles.php:653 msgid "Profile Name:" msgstr "" -#: ../../mod/profiles.php:618 +#: ../../mod/profiles.php:654 msgid "Your Full Name:" msgstr "" -#: ../../mod/profiles.php:619 +#: ../../mod/profiles.php:655 msgid "Title/Description:" msgstr "" -#: ../../mod/profiles.php:620 +#: ../../mod/profiles.php:656 msgid "Your Gender:" msgstr "" -#: ../../mod/profiles.php:621 +#: ../../mod/profiles.php:657 #, php-format msgid "Birthday (%s):" msgstr "" -#: ../../mod/profiles.php:622 +#: ../../mod/profiles.php:658 msgid "Street Address:" msgstr "" -#: ../../mod/profiles.php:623 +#: ../../mod/profiles.php:659 msgid "Locality/City:" msgstr "" -#: ../../mod/profiles.php:624 +#: ../../mod/profiles.php:660 msgid "Postal/Zip Code:" msgstr "" -#: ../../mod/profiles.php:625 +#: ../../mod/profiles.php:661 msgid "Country:" msgstr "" -#: ../../mod/profiles.php:626 +#: ../../mod/profiles.php:662 msgid "Region/State:" msgstr "" -#: ../../mod/profiles.php:627 +#: ../../mod/profiles.php:663 msgid " Marital Status:" msgstr "" -#: ../../mod/profiles.php:628 +#: ../../mod/profiles.php:664 msgid "Who: (if applicable)" msgstr "" -#: ../../mod/profiles.php:629 +#: ../../mod/profiles.php:665 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "" -#: ../../mod/profiles.php:630 +#: ../../mod/profiles.php:666 msgid "Since [date]:" msgstr "" -#: ../../mod/profiles.php:632 +#: ../../mod/profiles.php:668 msgid "Homepage URL:" msgstr "" -#: ../../mod/profiles.php:635 +#: ../../mod/profiles.php:671 msgid "Religious Views:" msgstr "" -#: ../../mod/profiles.php:636 +#: ../../mod/profiles.php:672 msgid "Keywords:" msgstr "" -#: ../../mod/profiles.php:639 +#: ../../mod/profiles.php:675 msgid "Example: fishing photography software" msgstr "" -#: ../../mod/profiles.php:640 +#: ../../mod/profiles.php:676 msgid "Used in directory listings" msgstr "" -#: ../../mod/profiles.php:641 +#: ../../mod/profiles.php:677 msgid "Tell us about yourself..." msgstr "" -#: ../../mod/profiles.php:642 +#: ../../mod/profiles.php:678 msgid "Hobbies/Interests" msgstr "" -#: ../../mod/profiles.php:643 +#: ../../mod/profiles.php:679 msgid "Contact information and Social Networks" msgstr "" -#: ../../mod/profiles.php:644 +#: ../../mod/profiles.php:680 msgid "My other channels" msgstr "" -#: ../../mod/profiles.php:645 +#: ../../mod/profiles.php:681 msgid "Musical interests" msgstr "" -#: ../../mod/profiles.php:646 +#: ../../mod/profiles.php:682 msgid "Books, literature" msgstr "" -#: ../../mod/profiles.php:647 +#: ../../mod/profiles.php:683 msgid "Television" msgstr "" -#: ../../mod/profiles.php:648 +#: ../../mod/profiles.php:684 msgid "Film/dance/culture/entertainment" msgstr "" -#: ../../mod/profiles.php:649 +#: ../../mod/profiles.php:685 msgid "Love/romance" msgstr "" -#: ../../mod/profiles.php:650 +#: ../../mod/profiles.php:686 msgid "Work/employment" msgstr "" -#: ../../mod/profiles.php:651 +#: ../../mod/profiles.php:687 msgid "School/education" msgstr "" -#: ../../mod/profiles.php:657 +#: ../../mod/profiles.php:693 msgid "This is your default profile." msgstr "" -#: ../../mod/profiles.php:668 ../../mod/directory.php:143 +#: ../../mod/profiles.php:704 ../../mod/directory.php:143 #: ../../mod/dirprofile.php:92 msgid "Age: " msgstr "" -#: ../../mod/profiles.php:711 +#: ../../mod/profiles.php:747 msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/profiles.php:712 +#: ../../mod/profiles.php:748 msgid "Add profile things" msgstr "" -#: ../../mod/profiles.php:713 +#: ../../mod/profiles.php:749 msgid "Include desirable objects in your profile" msgstr "" @@ -4744,7 +4746,7 @@ msgstr "" msgid "I am over 13 years of age and accept the %s for this website" msgstr "" -#: ../../mod/register.php:204 ../../mod/admin.php:412 +#: ../../mod/register.php:204 ../../mod/admin.php:414 msgid "Registration" msgstr "" @@ -5104,12 +5106,12 @@ msgid "View recent posts and comments" msgstr "" #: ../../mod/connedit.php:414 ../../mod/connedit.php:557 -#: ../../mod/admin.php:729 +#: ../../mod/admin.php:732 msgid "Unblock" msgstr "" #: ../../mod/connedit.php:414 ../../mod/connedit.php:557 -#: ../../mod/admin.php:728 +#: ../../mod/admin.php:731 msgid "Block" msgstr "" @@ -5385,7 +5387,7 @@ msgstr "" msgid "Finding:" msgstr "" -#: ../../mod/directory.php:239 +#: ../../mod/directory.php:244 msgid "No entries (some entries may be hidden)." msgstr "" @@ -6347,7 +6349,7 @@ msgstr "" msgid "Theme settings updated." msgstr "" -#: ../../mod/admin.php:97 ../../mod/admin.php:410 +#: ../../mod/admin.php:97 ../../mod/admin.php:412 msgid "Site" msgstr "" @@ -6355,19 +6357,19 @@ msgstr "" msgid "Accounts" msgstr "" -#: ../../mod/admin.php:99 ../../mod/admin.php:854 +#: ../../mod/admin.php:99 ../../mod/admin.php:857 msgid "Channels" msgstr "" -#: ../../mod/admin.php:100 ../../mod/admin.php:945 ../../mod/admin.php:987 +#: ../../mod/admin.php:100 ../../mod/admin.php:948 ../../mod/admin.php:990 msgid "Plugins" msgstr "" -#: ../../mod/admin.php:101 ../../mod/admin.php:1150 ../../mod/admin.php:1186 +#: ../../mod/admin.php:101 ../../mod/admin.php:1153 ../../mod/admin.php:1189 msgid "Themes" msgstr "" -#: ../../mod/admin.php:102 ../../mod/admin.php:510 +#: ../../mod/admin.php:102 ../../mod/admin.php:513 msgid "Server" msgstr "" @@ -6379,7 +6381,7 @@ msgstr "" msgid "DB updates" msgstr "" -#: ../../mod/admin.php:118 ../../mod/admin.php:125 ../../mod/admin.php:1273 +#: ../../mod/admin.php:118 ../../mod/admin.php:125 ../../mod/admin.php:1276 msgid "Logs" msgstr "" @@ -6395,10 +6397,10 @@ msgstr "" msgid "Message queues" msgstr "" -#: ../../mod/admin.php:211 ../../mod/admin.php:409 ../../mod/admin.php:509 -#: ../../mod/admin.php:718 ../../mod/admin.php:853 ../../mod/admin.php:944 -#: ../../mod/admin.php:986 ../../mod/admin.php:1149 ../../mod/admin.php:1185 -#: ../../mod/admin.php:1272 +#: ../../mod/admin.php:211 ../../mod/admin.php:411 ../../mod/admin.php:512 +#: ../../mod/admin.php:721 ../../mod/admin.php:856 ../../mod/admin.php:947 +#: ../../mod/admin.php:989 ../../mod/admin.php:1152 ../../mod/admin.php:1188 +#: ../../mod/admin.php:1275 msgid "Administration" msgstr "" @@ -6410,7 +6412,7 @@ msgstr "" msgid "Registered users" msgstr "" -#: ../../mod/admin.php:216 ../../mod/admin.php:513 +#: ../../mod/admin.php:216 ../../mod/admin.php:516 msgid "Pending registrations" msgstr "" @@ -6418,526 +6420,574 @@ msgstr "" msgid "Version" msgstr "" -#: ../../mod/admin.php:219 ../../mod/admin.php:514 +#: ../../mod/admin.php:219 ../../mod/admin.php:517 msgid "Active plugins" msgstr "" -#: ../../mod/admin.php:330 +#: ../../mod/admin.php:332 msgid "Site settings updated." msgstr "" -#: ../../mod/admin.php:361 +#: ../../mod/admin.php:363 msgid "No special theme for accessibility" msgstr "" -#: ../../mod/admin.php:390 +#: ../../mod/admin.php:392 msgid "Yes - with approval" msgstr "" -#: ../../mod/admin.php:396 +#: ../../mod/admin.php:398 msgid "My site is not a public server" msgstr "" -#: ../../mod/admin.php:397 +#: ../../mod/admin.php:399 msgid "My site has paid access only" msgstr "" -#: ../../mod/admin.php:398 +#: ../../mod/admin.php:400 msgid "My site has free access only" msgstr "" -#: ../../mod/admin.php:399 +#: ../../mod/admin.php:401 msgid "My site offers free accounts with optional paid upgrades" msgstr "" -#: ../../mod/admin.php:413 +#: ../../mod/admin.php:415 msgid "File upload" msgstr "" -#: ../../mod/admin.php:414 +#: ../../mod/admin.php:416 msgid "Policies" msgstr "" -#: ../../mod/admin.php:419 +#: ../../mod/admin.php:421 msgid "Site name" msgstr "" -#: ../../mod/admin.php:420 +#: ../../mod/admin.php:422 msgid "Banner/Logo" msgstr "" -#: ../../mod/admin.php:421 +#: ../../mod/admin.php:423 msgid "Administrator Information" msgstr "" -#: ../../mod/admin.php:421 +#: ../../mod/admin.php:423 msgid "" "Contact information for site administrators. Displayed on siteinfo page. " "BBCode can be used here" msgstr "" -#: ../../mod/admin.php:422 +#: ../../mod/admin.php:424 msgid "System language" msgstr "" -#: ../../mod/admin.php:423 +#: ../../mod/admin.php:425 msgid "System theme" msgstr "" -#: ../../mod/admin.php:423 +#: ../../mod/admin.php:425 msgid "" "Default system theme - may be over-ridden by user profiles - change theme settings" msgstr "" -#: ../../mod/admin.php:424 +#: ../../mod/admin.php:426 msgid "Mobile system theme" msgstr "" -#: ../../mod/admin.php:424 +#: ../../mod/admin.php:426 msgid "Theme for mobile devices" msgstr "" -#: ../../mod/admin.php:425 +#: ../../mod/admin.php:427 msgid "Accessibility system theme" msgstr "" -#: ../../mod/admin.php:425 +#: ../../mod/admin.php:427 msgid "Accessibility theme" msgstr "" -#: ../../mod/admin.php:426 +#: ../../mod/admin.php:428 msgid "Channel to use for this website's static pages" msgstr "" -#: ../../mod/admin.php:426 +#: ../../mod/admin.php:428 msgid "Site Channel" msgstr "" -#: ../../mod/admin.php:427 +#: ../../mod/admin.php:429 +msgid "Enable Diaspora Protocol" +msgstr "" + +#: ../../mod/admin.php:429 +msgid "Communicate with Diaspora and Friendica - experimental" +msgstr "" + +#: ../../mod/admin.php:430 msgid "Allow Feeds as Connections" msgstr "" -#: ../../mod/admin.php:427 +#: ../../mod/admin.php:430 msgid "(Heavy system resource usage)" msgstr "" -#: ../../mod/admin.php:428 +#: ../../mod/admin.php:431 msgid "Maximum image size" msgstr "" -#: ../../mod/admin.php:428 +#: ../../mod/admin.php:431 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "" -#: ../../mod/admin.php:429 +#: ../../mod/admin.php:432 msgid "Does this site allow new member registration?" msgstr "" -#: ../../mod/admin.php:430 +#: ../../mod/admin.php:433 msgid "Which best describes the types of account offered by this hub?" msgstr "" -#: ../../mod/admin.php:431 +#: ../../mod/admin.php:434 msgid "Register text" msgstr "" -#: ../../mod/admin.php:431 +#: ../../mod/admin.php:434 msgid "Will be displayed prominently on the registration page." msgstr "" -#: ../../mod/admin.php:432 +#: ../../mod/admin.php:435 msgid "Accounts abandoned after x days" msgstr "" -#: ../../mod/admin.php:432 +#: ../../mod/admin.php:435 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: ../../mod/admin.php:433 +#: ../../mod/admin.php:436 msgid "Allowed friend domains" msgstr "" -#: ../../mod/admin.php:433 +#: ../../mod/admin.php:436 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:434 +#: ../../mod/admin.php:437 msgid "Allowed email domains" msgstr "" -#: ../../mod/admin.php:434 +#: ../../mod/admin.php:437 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:435 +#: ../../mod/admin.php:438 msgid "Block public" msgstr "" -#: ../../mod/admin.php:435 +#: ../../mod/admin.php:438 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:436 +#: ../../mod/admin.php:439 msgid "Force publish" msgstr "" -#: ../../mod/admin.php:436 +#: ../../mod/admin.php:439 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "" -#: ../../mod/admin.php:437 +#: ../../mod/admin.php:440 msgid "Disable discovery tab" msgstr "" -#: ../../mod/admin.php:437 +#: ../../mod/admin.php:440 msgid "" "Remove the tab in the network view with public content pulled from sources " "chosen for this site." msgstr "" -#: ../../mod/admin.php:438 +#: ../../mod/admin.php:441 msgid "No login on Homepage" msgstr "" -#: ../../mod/admin.php:438 +#: ../../mod/admin.php:441 msgid "" "Check to hide the login form from your sites homepage when visitors arrive " "who are not logged in (e.g. when you put the content of the homepage in via " "the site channel)." msgstr "" -#: ../../mod/admin.php:440 +#: ../../mod/admin.php:443 msgid "Proxy user" msgstr "" -#: ../../mod/admin.php:441 +#: ../../mod/admin.php:444 msgid "Proxy URL" msgstr "" -#: ../../mod/admin.php:442 +#: ../../mod/admin.php:445 msgid "Network timeout" msgstr "" -#: ../../mod/admin.php:442 +#: ../../mod/admin.php:445 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "" -#: ../../mod/admin.php:443 +#: ../../mod/admin.php:446 msgid "Delivery interval" msgstr "" -#: ../../mod/admin.php:443 +#: ../../mod/admin.php:446 msgid "" "Delay background delivery processes by this many seconds to reduce system " "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " "for large dedicated servers." msgstr "" -#: ../../mod/admin.php:444 +#: ../../mod/admin.php:447 msgid "Poll interval" msgstr "" -#: ../../mod/admin.php:444 +#: ../../mod/admin.php:447 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "" -#: ../../mod/admin.php:445 +#: ../../mod/admin.php:448 msgid "Maximum Load Average" msgstr "" -#: ../../mod/admin.php:445 +#: ../../mod/admin.php:448 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "" -#: ../../mod/admin.php:501 +#: ../../mod/admin.php:504 msgid "No server found" msgstr "" -#: ../../mod/admin.php:508 ../../mod/admin.php:732 +#: ../../mod/admin.php:511 ../../mod/admin.php:735 msgid "ID" msgstr "" -#: ../../mod/admin.php:508 +#: ../../mod/admin.php:511 msgid "for channel" msgstr "" -#: ../../mod/admin.php:508 +#: ../../mod/admin.php:511 msgid "on server" msgstr "" -#: ../../mod/admin.php:508 +#: ../../mod/admin.php:511 msgid "Status" msgstr "" -#: ../../mod/admin.php:529 +#: ../../mod/admin.php:532 msgid "Update has been marked successful" msgstr "" -#: ../../mod/admin.php:539 +#: ../../mod/admin.php:542 #, php-format msgid "Executing %s failed. Check system logs." msgstr "" -#: ../../mod/admin.php:542 +#: ../../mod/admin.php:545 #, php-format msgid "Update %s was successfully applied." msgstr "" -#: ../../mod/admin.php:546 +#: ../../mod/admin.php:549 #, php-format msgid "Update %s did not return a status. Unknown if it succeeded." msgstr "" -#: ../../mod/admin.php:549 +#: ../../mod/admin.php:552 #, php-format msgid "Update function %s could not be found." msgstr "" -#: ../../mod/admin.php:564 +#: ../../mod/admin.php:567 msgid "No failed updates." msgstr "" -#: ../../mod/admin.php:568 +#: ../../mod/admin.php:571 msgid "Failed Updates" msgstr "" -#: ../../mod/admin.php:570 +#: ../../mod/admin.php:573 msgid "Mark success (if update was manually applied)" msgstr "" -#: ../../mod/admin.php:571 +#: ../../mod/admin.php:574 msgid "Attempt to execute this update step automatically" msgstr "" -#: ../../mod/admin.php:597 +#: ../../mod/admin.php:600 #, php-format msgid "%s user blocked/unblocked" msgid_plural "%s users blocked/unblocked" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:604 +#: ../../mod/admin.php:607 #, php-format msgid "%s user deleted" msgid_plural "%s users deleted" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:635 +#: ../../mod/admin.php:638 msgid "Account not found" msgstr "" -#: ../../mod/admin.php:655 +#: ../../mod/admin.php:658 #, php-format msgid "User '%s' unblocked" msgstr "" -#: ../../mod/admin.php:655 +#: ../../mod/admin.php:658 #, php-format msgid "User '%s' blocked" msgstr "" -#: ../../mod/admin.php:719 ../../mod/admin.php:731 +#: ../../mod/admin.php:722 ../../mod/admin.php:734 msgid "Users" msgstr "" -#: ../../mod/admin.php:721 ../../mod/admin.php:856 +#: ../../mod/admin.php:724 ../../mod/admin.php:859 msgid "select all" msgstr "" -#: ../../mod/admin.php:722 +#: ../../mod/admin.php:725 msgid "User registrations waiting for confirm" msgstr "" -#: ../../mod/admin.php:723 +#: ../../mod/admin.php:726 msgid "Request date" msgstr "" -#: ../../mod/admin.php:724 +#: ../../mod/admin.php:727 msgid "No registrations." msgstr "" -#: ../../mod/admin.php:725 +#: ../../mod/admin.php:728 msgid "Approve" msgstr "" -#: ../../mod/admin.php:726 +#: ../../mod/admin.php:729 msgid "Deny" msgstr "" -#: ../../mod/admin.php:732 +#: ../../mod/admin.php:735 msgid "Register date" msgstr "" -#: ../../mod/admin.php:732 +#: ../../mod/admin.php:735 msgid "Last login" msgstr "" -#: ../../mod/admin.php:732 +#: ../../mod/admin.php:735 msgid "Expires" msgstr "" -#: ../../mod/admin.php:732 +#: ../../mod/admin.php:735 msgid "Service Class" msgstr "" -#: ../../mod/admin.php:734 +#: ../../mod/admin.php:737 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:735 +#: ../../mod/admin.php:738 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:768 +#: ../../mod/admin.php:771 #, php-format msgid "%s channel censored/uncensored" msgid_plural "%s channelss censored/uncensored" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:775 +#: ../../mod/admin.php:778 #, php-format msgid "%s channel deleted" msgid_plural "%s channels deleted" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:794 +#: ../../mod/admin.php:797 msgid "Channel not found" msgstr "" -#: ../../mod/admin.php:805 +#: ../../mod/admin.php:808 #, php-format msgid "Channel '%s' deleted" msgstr "" -#: ../../mod/admin.php:815 +#: ../../mod/admin.php:818 #, php-format msgid "Channel '%s' uncensored" msgstr "" -#: ../../mod/admin.php:815 +#: ../../mod/admin.php:818 #, php-format msgid "Channel '%s' censored" msgstr "" -#: ../../mod/admin.php:858 +#: ../../mod/admin.php:861 msgid "Censor" msgstr "" -#: ../../mod/admin.php:859 +#: ../../mod/admin.php:862 msgid "Uncensor" msgstr "" -#: ../../mod/admin.php:862 +#: ../../mod/admin.php:865 msgid "UID" msgstr "" -#: ../../mod/admin.php:864 +#: ../../mod/admin.php:867 msgid "" "Selected channels will be deleted!\\n\\nEverything that was posted in these " "channels on this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:865 +#: ../../mod/admin.php:868 msgid "" "The channel {0} will be deleted!\\n\\nEverything that was posted in this " "channel on this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:904 +#: ../../mod/admin.php:907 #, php-format msgid "Plugin %s disabled." msgstr "" -#: ../../mod/admin.php:908 +#: ../../mod/admin.php:911 #, php-format msgid "Plugin %s enabled." msgstr "" -#: ../../mod/admin.php:918 ../../mod/admin.php:1120 +#: ../../mod/admin.php:921 ../../mod/admin.php:1123 msgid "Disable" msgstr "" -#: ../../mod/admin.php:920 ../../mod/admin.php:1122 +#: ../../mod/admin.php:923 ../../mod/admin.php:1125 msgid "Enable" msgstr "" -#: ../../mod/admin.php:946 ../../mod/admin.php:1151 +#: ../../mod/admin.php:949 ../../mod/admin.php:1154 msgid "Toggle" msgstr "" -#: ../../mod/admin.php:954 ../../mod/admin.php:1161 +#: ../../mod/admin.php:957 ../../mod/admin.php:1164 msgid "Author: " msgstr "" -#: ../../mod/admin.php:955 ../../mod/admin.php:1162 +#: ../../mod/admin.php:958 ../../mod/admin.php:1165 msgid "Maintainer: " msgstr "" -#: ../../mod/admin.php:1084 +#: ../../mod/admin.php:1087 msgid "No themes found." msgstr "" -#: ../../mod/admin.php:1143 +#: ../../mod/admin.php:1146 msgid "Screenshot" msgstr "" -#: ../../mod/admin.php:1191 +#: ../../mod/admin.php:1194 msgid "[Experimental]" msgstr "" -#: ../../mod/admin.php:1192 +#: ../../mod/admin.php:1195 msgid "[Unsupported]" msgstr "" -#: ../../mod/admin.php:1219 +#: ../../mod/admin.php:1222 msgid "Log settings updated." msgstr "" -#: ../../mod/admin.php:1275 +#: ../../mod/admin.php:1278 msgid "Clear" msgstr "" -#: ../../mod/admin.php:1281 +#: ../../mod/admin.php:1284 msgid "Debugging" msgstr "" -#: ../../mod/admin.php:1282 +#: ../../mod/admin.php:1285 msgid "Log file" msgstr "" -#: ../../mod/admin.php:1282 +#: ../../mod/admin.php:1285 msgid "" "Must be writable by web server. Relative to your Red top-level directory." msgstr "" -#: ../../mod/admin.php:1283 +#: ../../mod/admin.php:1286 msgid "Log level" msgstr "" +#: ../../mod/admin.php:1333 +msgid "New Profile Field" +msgstr "" + +#: ../../mod/admin.php:1334 ../../mod/admin.php:1355 +msgid "Field nickname" +msgstr "" + +#: ../../mod/admin.php:1334 ../../mod/admin.php:1355 +msgid "System name of field" +msgstr "" + +#: ../../mod/admin.php:1335 ../../mod/admin.php:1356 +msgid "Input type" +msgstr "" + +#: ../../mod/admin.php:1336 ../../mod/admin.php:1357 +msgid "Field Name" +msgstr "" + +#: ../../mod/admin.php:1336 ../../mod/admin.php:1357 +msgid "Label on profile pages" +msgstr "" + +#: ../../mod/admin.php:1337 ../../mod/admin.php:1358 +msgid "Help text" +msgstr "" + +#: ../../mod/admin.php:1337 ../../mod/admin.php:1358 +msgid "Additional info (optional)" +msgstr "" + +#: ../../mod/admin.php:1348 +msgid "Field definition not found" +msgstr "" + +#: ../../mod/admin.php:1354 +msgid "Edit Profile Field" +msgstr "" + #: ../../mod/thing.php:98 msgid "Thing updated" msgstr "" @@ -7020,19 +7070,19 @@ msgstr "" msgid "Cloned channel not found. Import failed." msgstr "" -#: ../../mod/import.php:364 +#: ../../mod/import.php:365 msgid "Import completed." msgstr "" -#: ../../mod/import.php:377 +#: ../../mod/import.php:378 msgid "You must be logged in to use this feature." msgstr "" -#: ../../mod/import.php:382 +#: ../../mod/import.php:383 msgid "Import Channel" msgstr "" -#: ../../mod/import.php:383 +#: ../../mod/import.php:384 msgid "" "Use this form to import an existing channel from a different server/hub. You " "may retrieve the channel identity from the old server/hub via the network or " @@ -7040,27 +7090,27 @@ msgid "" "imported. Importation of content is not yet available." msgstr "" -#: ../../mod/import.php:384 +#: ../../mod/import.php:385 msgid "File to Upload" msgstr "" -#: ../../mod/import.php:385 +#: ../../mod/import.php:386 msgid "Or provide the old server/hub details" msgstr "" -#: ../../mod/import.php:386 +#: ../../mod/import.php:387 msgid "Your old identity address (xyz@example.com)" msgstr "" -#: ../../mod/import.php:387 +#: ../../mod/import.php:388 msgid "Your old login email address" msgstr "" -#: ../../mod/import.php:388 +#: ../../mod/import.php:389 msgid "Your old login password" msgstr "" -#: ../../mod/import.php:389 +#: ../../mod/import.php:390 msgid "" "For either option, please choose whether to make this hub your new primary " "address, or whether your old location should continue this role. You will be " @@ -7068,7 +7118,7 @@ msgid "" "location for files, photos, and media." msgstr "" -#: ../../mod/import.php:390 +#: ../../mod/import.php:391 msgid "Make this hub my primary location" msgstr "" @@ -7176,7 +7226,7 @@ msgstr "" msgid "Help with this feature" msgstr "" -#: ../../mod/layouts.php:84 +#: ../../mod/layouts.php:85 msgid "Layout Name" msgstr "" @@ -7218,11 +7268,11 @@ msgstr "" msgid "Thank you." msgstr "" -#: ../../mod/lockview.php:30 +#: ../../mod/lockview.php:31 msgid "Remote privacy information not available." msgstr "" -#: ../../mod/lockview.php:51 +#: ../../mod/lockview.php:52 msgid "Visible to:" msgstr "" diff --git a/version.inc b/version.inc index 6f8fc6806..642d6ea4c 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-08-28.781 +2014-08-29.782 -- cgit v1.2.3 From 88f8900ac52aa1b4bba90d000691dfa311ad2a92 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 29 Aug 2014 17:31:40 -0700 Subject: various diaspora issues --- include/deliver.php | 1 + include/diaspora.php | 44 +++++++++++++++++++++++++------------------- include/items.php | 50 ++++++++++++++++++++++++++++++++++++++++++++++++-- include/queue.php | 3 ++- mod/item.php | 6 ++++++ 5 files changed, 82 insertions(+), 22 deletions(-) diff --git a/include/deliver.php b/include/deliver.php index 2693fe165..f4fae6061 100644 --- a/include/deliver.php +++ b/include/deliver.php @@ -29,6 +29,7 @@ function deliver_run($argv, $argc) { ); } else { + logger('deliver: queue post returned ' . $result['return_code'] . ' from ' . $r[0]['outq_posturl'],LOGGER_DEBUG); $y = q("update outq set outq_updated = '%s' where outq_hash = '%s' limit 1", dbesc(datetime_convert()), dbesc($argv[$x]) diff --git a/include/diaspora.php b/include/diaspora.php index 352ed48e4..b544dad53 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -1228,7 +1228,7 @@ function diaspora_comment($importer,$xml,$msg) { check only the parent_author_signature. Basically, they trust that the top-level post owner has already verified the authenticity of anything he/she sends out - In either case, the signature that get checked is the signature created by the person - who sent the salmon + who sent the psuedo-salmon */ $signed_data = $guid . ';' . $parent_guid . ';' . $text . ';' . $diaspora_handle; @@ -1346,6 +1346,9 @@ function diaspora_comment($importer,$xml,$msg) { $result = item_store($datarray); + if($result && $result['success']) + $message_id = $result['item_id']; + if(($parent_item['item_flags'] & ITEM_ORIGIN) && (! $parent_author_signature)) { q("insert into sign (`iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ", intval($message_id), @@ -2500,6 +2503,7 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) { // Diaspora doesn't support threaded comments, but some // versions of Diaspora (i.e. Diaspora-pistos) support // likes on comments + if($item['verb'] === ACTIVITY_LIKE && $item['thr_parent']) { $p = q("select * from item where mid = '%s' limit 1", dbesc($item['thr_parent']) @@ -2514,14 +2518,18 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) { intval($item['parent']) ); } + if($p) $parent = $p[0]; - else + else { + logger('diaspora_send_relay: no parent'); return; + } $like = false; $relay_retract = false; $sql_sign_id = 'iid'; + if( $item['item_restrict'] & ITEM_DELETED) { $relay_retract = true; @@ -2544,10 +2552,10 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) { } - // fetch the original signature if the relayable was created by a Diaspora - // or DFRN user. Relayables for other networks are not supported. + // fetch the original signature if the relayable was created by a Diaspora, Friendica-over Diaspora, + // or zot user. Relayables for other networks are not supported. -/* $r = q("select * from sign where " . $sql_sign_id . " = %d limit 1", + $r = q("select * from sign where " . $sql_sign_id . " = %d limit 1", intval($item['id']) ); if(count($r)) { @@ -2557,13 +2565,12 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) { $handle = $orig_sign['signer']; } else { - // Author signature information (for likes, comments, and retractions of likes or comments, // whether from Diaspora or Friendica) must be placed in the `sign` table before this // function is called logger('diaspora_send_relay: original author signature not found, cannot send relayable'); return; - }*/ + } /* Since the author signature is only checked by the parent, not by the relay recipients, * I think it may not be necessary for us to do so much work to preserve all the original @@ -2574,14 +2581,14 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) { * versions of Diaspora (diaspora-pistos), but since there are a number of problems with * doing that, let's ignore it for now. * - * Currently, only DFRN contacts are supported. StatusNet shouldn't be hard, but it hasn't - * been done yet + * */ $handle = diaspora_handle_from_contact($item['author_xchan']); - if(! $handle) + if(! $handle) { + logger('diaspora_send_relay: no handle'); return; - + } if($relay_retract) $sender_signed_text = $item['guid'] . ';' . $target_type; @@ -2601,11 +2608,11 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) { // markup at the top of this function, which is AFTER we placed the original $signed_text // in the database, it's hazardous to trust the original $signed_text. - $parentauthorsig = base64_encode(rsa_sign($sender_signed_text,$owner['uprvkey'],'sha256')); + $parentauthorsig = base64_encode(rsa_sign($sender_signed_text,$owner['channel_prvkey'],'sha256')); $msg = replace_macros($tpl,array( - '$guid' => xmlify($item['guid']), - '$parent_guid' => xmlify($parent['guid']), + '$guid' => xmlify($item['mid']), + '$parent_guid' => xmlify($parent['mid']), '$target_type' =>xmlify($target_type), '$authorsig' => xmlify($authorsig), '$parentsig' => xmlify($parentauthorsig), @@ -2616,7 +2623,6 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) { logger('diaspora_send_relay: base message: ' . $msg, LOGGER_DATA); - $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['channel_prvkey'],$contact['xchan_pubkey'],$public_batch))); return(diaspora_transmit($owner,$contact,$slap,$public_batch)); @@ -2631,7 +2637,7 @@ function diaspora_send_retraction($item,$owner,$contact,$public_batch = false) { $myaddr = $owner['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3); // Check whether the retraction is for a top-level post or whether it's a relayable - if( $item['uri'] !== $item['parent-uri'] ) { + if( $item['mid'] !== $item['parent_mid'] ) { $tpl = get_markup_template('diaspora_relay_retraction.tpl'); $target_type = (($item['verb'] === ACTIVITY_LIKE) ? 'Like' : 'Comment'); @@ -2642,13 +2648,13 @@ function diaspora_send_retraction($item,$owner,$contact,$public_batch = false) { $target_type = 'StatusMessage'; } - $signed_text = $item['guid'] . ';' . $target_type; + $signed_text = $item['mid'] . ';' . $target_type; $msg = replace_macros($tpl, array( - '$guid' => xmlify($item['guid']), + '$guid' => xmlify($item['mid']), '$type' => xmlify($target_type), '$handle' => xmlify($myaddr), - '$signature' => xmlify(base64_encode(rsa_sign($signed_text,$owner['uprvkey'],'sha256'))) + '$signature' => xmlify(base64_encode(rsa_sign($signed_text,$owner['channel_prvkey'],'sha256'))) )); $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['channel_prvkey'],$contact['xchan_pubkey'],$public_batch))); diff --git a/include/items.php b/include/items.php index 2a4242ea6..c0ff2ac81 100755 --- a/include/items.php +++ b/include/items.php @@ -1665,7 +1665,7 @@ function item_store($arr,$allow_exec = false) { if(! $arr['uid']) { logger('item_store: no uid'); $ret['message'] = 'No uid.'; - return ret; + return $ret; } $uplinked_comment = false; @@ -1843,7 +1843,7 @@ function item_store($arr,$allow_exec = false) { if(comments_are_now_closed($r[0])) { logger('item_store: comments closed'); $ret['message'] = 'Comments closed.'; - return ret; + return $ret; } // is the new message multi-level threaded? @@ -2287,6 +2287,52 @@ function item_store_update($arr,$allow_exec = false) { return $ret; } +function store_diaspora_comment_sig($datarray, $channel, $parent_item, $post_id) { + + // We won't be able to sign Diaspora comments for authenticated visitors + // - we don't have their private key + + // since Diaspora doesn't handle edits we can only do this for the original text and not update it. + + $enabled = intval(get_config('system','diaspora_enabled')); + if(! $enabled) { + logger('mod_item: diaspora support disabled, not storing comment signature', LOGGER_DEBUG); + return; + } + + $body = $datarray['body']; + if(array_key_exists('item_flags',$datarray) && ($datarray['item_flags'] & ITEM_OBSCURED)) { + $key = get_config('system','prvkey'); + if($datarray['body']) + $body = crypto_unencapsulate(json_decode($datarray['body'],true),$key); + } + + logger('mod_item: storing diaspora comment signature',LOGGER_DEBUG); + + require_once('include/bb2diaspora.php'); + + $signed_body = html_entity_decode(bb2diaspora($body)); + + $diaspora_handle = $channel['channel_address'] . '@' . get_app()->get_hostname(); + + $signed_text = $datarray['mid'] . ';' . $parent_item['mid'] . ';' . $signed_body . ';' . $diaspora_handle; + + if( $uprvkey !== false ) + $authorsig = base64_encode(rsa_sign($signed_text,$channel['channel_prvkey'],'sha256')); + else + $authorsig = ''; + + $r = q("insert into sign (`iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ", + intval($post_id), + dbesc($signed_text), + dbesc(base64_encode($authorsig)), + dbesc($diaspora_handle) + ); + if(! $r) + logger('store_diaspora_comment_sig: DB write failed'); + + return; +} diff --git a/include/queue.php b/include/queue.php index cd81e2aa4..222ebada4 100644 --- a/include/queue.php +++ b/include/queue.php @@ -50,12 +50,13 @@ function queue_run($argv, $argc){ if($rr['outq_driver'] === 'post') { $result = z_post_url($rr['outq_posturl'],$rr['outq_msg']); if($result['success'] && $result['return_code'] < 300) { - logger('deliver: queue post success to ' . $rr['outq_posturl'], LOGGER_DEBUG); + logger('queue: queue post success to ' . $rr['outq_posturl'], LOGGER_DEBUG); $y = q("delete from outq where outq_hash = '%s' limit 1", dbesc($rr['ouq_hash']) ); } else { + logger('queue: queue post returned ' . $result['return_code'] . ' from ' . $rr['outq_posturl'],LOGGER_DEBUG); $y = q("update outq set outq_updated = '%s' where outq_hash = '%s' limit 1", dbesc(datetime_convert()), dbesc($rr['outq_hash']) diff --git a/mod/item.php b/mod/item.php index df51c8a92..c1dd15eb1 100644 --- a/mod/item.php +++ b/mod/item.php @@ -851,6 +851,11 @@ function item_post(&$a) { // NOTREACHED } + if($parent) { + // Store the comment signature information in case we need to relay to Diaspora +//FIXME + store_diaspora_comment_sig($datarray,$channel,$parent_item, $post_id); + } update_remote_id($channel,$post_id,$webpage,$pagetitle,$namespace,$remote_id,$mid); @@ -1312,3 +1317,4 @@ function item_check_service_class($channel_id,$iswebpage) { $ret['success'] = true; return $ret; } + -- cgit v1.2.3 From 3e8f9e8b62179e5bb7ce5f7951aef800cb722048 Mon Sep 17 00:00:00 2001 From: Jeroen Date: Sat, 30 Aug 2014 14:07:38 +0000 Subject: update nl + Friendica>RedMatrix in two text files --- install/INSTALL.txt | 4 +- util/README | 2 +- view/nl/messages.po | 2167 ++++++++++++++++++++++++++------------------------- view/nl/strings.php | 230 +++--- 4 files changed, 1233 insertions(+), 1170 deletions(-) diff --git a/install/INSTALL.txt b/install/INSTALL.txt index 946e83ca3..ee9900cb8 100644 --- a/install/INSTALL.txt +++ b/install/INSTALL.txt @@ -173,7 +173,7 @@ one shown, substituting for your unique paths and settings: You can generally find the location of PHP by executing "which php". If you have troubles with this section please contact your hosting provider for -assistance. Friendica will not work correctly if you cannot perform this step. +assistance. The RedMatrix will not work correctly if you cannot perform this step. You should also be sure that $a->config['system']['php_path'] is set correctly, it should look like (changing it to the correct PHP location) @@ -220,7 +220,7 @@ generally be world-readable. Ensure that mod-rewite is installed and working, and that your .htaccess file is being used. To verify the latter, create a file test.out -containing the word "test" in the top directory of Friendica, make it world +containing the word "test" in the top directory of the RedMatrix, make it world readable and point your web browser to http://yoursitenamehere.com/test.out diff --git a/util/README b/util/README index aceade3e2..9d8fe299c 100644 --- a/util/README +++ b/util/README @@ -115,7 +115,7 @@ When strings are added or modified in source, you could run to extract strings from source files and join them with the existing .po file: new strings are added, the existing are not overwritten. -If you already translated Friendica using strings.php, you could import your old +If you already translated the RedMatrix using strings.php, you could import your old translation to messages.po. Run: $ php util/php2po.php view//strings.php diff --git a/view/nl/messages.po b/view/nl/messages.po index 7798a323f..3c7485790 100644 --- a/view/nl/messages.po +++ b/view/nl/messages.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the Red package. # # Translators: -# jeroenpraat <>, 2013-2014 +# jeroenpraat , 2013-2014 +# jeroenpraat , 2014 msgid "" msgstr "" "Project-Id-Version: Red Matrix\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-22 00:03-0700\n" -"PO-Revision-Date: 2014-08-23 20:09+0000\n" -"Last-Translator: jeroenpraat <>\n" +"POT-Creation-Date: 2014-08-29 00:03-0700\n" +"PO-Revision-Date: 2014-08-30 14:00+0000\n" +"Last-Translator: jeroenpraat \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/red-matrix/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,27 +31,9 @@ msgstr "Kan DNS-informatie voor databaseserver '%s' niet vinden" msgid "Profile Photos" msgstr "Profielfoto's" -#: ../../include/diaspora.php:1736 ../../include/text.php:1734 -#: ../../include/conversation.php:120 ../../mod/subthread.php:72 -#: ../../mod/subthread.php:174 ../../mod/tagger.php:45 ../../mod/like.php:294 -msgid "photo" -msgstr "foto" - -#: ../../include/diaspora.php:1736 ../../include/text.php:1740 -#: ../../include/conversation.php:148 ../../mod/subthread.php:72 -#: ../../mod/subthread.php:174 ../../mod/tagger.php:53 ../../mod/like.php:294 -msgid "status" -msgstr "bericht" - -#: ../../include/diaspora.php:1752 ../../include/conversation.php:164 -#: ../../mod/like.php:331 -#, php-format -msgid "%1$s likes %2$s's %3$s" -msgstr "%1$s vindt %3$s van %2$s leuk" - -#: ../../include/diaspora.php:2129 -msgid "Attachments:" -msgstr "Bijlagen:" +#: ../../include/network.php:557 +msgid "view full size" +msgstr "volledige grootte tonen" #: ../../include/oembed.php:163 msgid "Embedded content" @@ -74,7 +57,7 @@ msgid "Site Admin" msgstr "Hubbeheerder" #: ../../include/apps.php:124 ../../include/nav.php:113 -#: ../../include/conversation.php:1548 +#: ../../include/conversation.php:1561 msgid "Bookmarks" msgstr "Bladwijzers" @@ -86,28 +69,29 @@ msgstr "Connecties" msgid "Login" msgstr "Inloggen" -#: ../../include/apps.php:127 -msgid "Channel Select" -msgstr "Kanaalkiezer" +#: ../../include/apps.php:127 ../../include/nav.php:209 +#: ../../mod/manage.php:148 +msgid "Channel Manager" +msgstr "Kanaalbeheer" #: ../../include/apps.php:128 ../../include/nav.php:183 msgid "Matrix" msgstr "Matrix" #: ../../include/apps.php:129 ../../include/nav.php:211 -#: ../../include/widgets.php:521 ../../mod/admin.php:947 -#: ../../mod/admin.php:1152 +#: ../../include/widgets.php:521 ../../mod/admin.php:950 +#: ../../mod/admin.php:1155 msgid "Settings" msgstr "Instellingen" #: ../../include/apps.php:130 ../../include/nav.php:105 -#: ../../include/reddav.php:1280 ../../include/conversation.php:1526 +#: ../../include/reddav.php:1280 ../../include/conversation.php:1539 #: ../../mod/fbrowser.php:114 msgid "Files" msgstr "Bestanden" #: ../../include/apps.php:131 ../../include/nav.php:115 -#: ../../include/conversation.php:1559 ../../mod/webpages.php:79 +#: ../../include/conversation.php:1572 ../../mod/webpages.php:79 msgid "Webpages" msgstr "Webpagina's" @@ -121,7 +105,7 @@ msgid "Profile" msgstr "Profiel" #: ../../include/apps.php:134 ../../include/nav.php:104 -#: ../../include/conversation.php:1517 ../../mod/fbrowser.php:25 +#: ../../include/conversation.php:1530 ../../mod/fbrowser.php:25 msgid "Photos" msgstr "Foto's" @@ -148,7 +132,7 @@ msgstr "Privéberichten" msgid "Mood" msgstr "Stemming" -#: ../../include/apps.php:140 ../../include/conversation.php:950 +#: ../../include/apps.php:140 ../../include/conversation.php:963 msgid "Poke" msgstr "Aanstoten" @@ -156,8 +140,8 @@ msgstr "Aanstoten" msgid "Chat" msgstr "Chatten" -#: ../../include/apps.php:142 ../../include/text.php:815 -#: ../../include/text.php:829 ../../include/nav.php:169 +#: ../../include/apps.php:142 ../../include/nav.php:169 +#: ../../include/text.php:815 ../../include/text.php:829 #: ../../mod/search.php:30 msgid "Search" msgstr "Zoeken" @@ -210,19 +194,19 @@ msgstr "Aanschaffen" #: ../../include/apps.php:246 ../../include/page_widgets.php:8 #: ../../include/page_widgets.php:36 ../../include/reddav.php:1289 #: ../../include/menu.php:42 ../../include/ItemObject.php:96 -#: ../../mod/settings.php:579 ../../mod/blocks.php:94 +#: ../../mod/settings.php:579 ../../mod/blocks.php:99 #: ../../mod/connections.php:396 ../../mod/editblock.php:111 #: ../../mod/editlayout.php:106 ../../mod/editpost.php:112 #: ../../mod/editwebpage.php:143 ../../mod/thing.php:235 -#: ../../mod/layouts.php:112 ../../mod/menu.php:59 ../../mod/webpages.php:120 +#: ../../mod/layouts.php:121 ../../mod/menu.php:59 ../../mod/webpages.php:127 msgid "Edit" msgstr "Bewerken" #: ../../include/apps.php:247 ../../include/reddav.php:1290 -#: ../../include/conversation.php:635 ../../include/ItemObject.php:108 +#: ../../include/conversation.php:648 ../../include/ItemObject.php:108 #: ../../mod/settings.php:580 ../../mod/connedit.php:440 -#: ../../mod/photos.php:1052 ../../mod/group.php:176 ../../mod/admin.php:727 -#: ../../mod/admin.php:857 ../../mod/thing.php:236 +#: ../../mod/photos.php:1052 ../../mod/group.php:176 ../../mod/admin.php:730 +#: ../../mod/admin.php:860 ../../mod/thing.php:236 msgid "Delete" msgstr "Verwijderen" @@ -231,854 +215,811 @@ msgstr "Verwijderen" msgid "Unknown" msgstr "Onbekend" -#: ../../include/text.php:321 -msgid "prev" -msgstr "vorige" +#: ../../include/page_widgets.php:6 +msgid "New Page" +msgstr "Nieuwe pagina" -#: ../../include/text.php:323 -msgid "first" -msgstr "eerste" +#: ../../include/page_widgets.php:39 ../../mod/blocks.php:102 +#: ../../mod/layouts.php:125 ../../mod/webpages.php:130 +msgid "View" +msgstr "Weergeven" -#: ../../include/text.php:352 -msgid "last" -msgstr "laatste" +#: ../../include/page_widgets.php:40 ../../include/conversation.php:1109 +#: ../../include/ItemObject.php:592 ../../mod/editblock.php:141 +#: ../../mod/editlayout.php:135 ../../mod/editpost.php:140 +#: ../../mod/editwebpage.php:174 ../../mod/photos.php:1003 +#: ../../mod/webpages.php:131 +msgid "Preview" +msgstr "Voorvertoning" -#: ../../include/text.php:355 -msgid "next" -msgstr "volgende" +#: ../../include/page_widgets.php:41 ../../mod/webpages.php:132 +msgid "Actions" +msgstr "Acties" -#: ../../include/text.php:367 -msgid "older" -msgstr "ouder" +#: ../../include/page_widgets.php:42 ../../mod/webpages.php:133 +msgid "Page Link" +msgstr "Paginalink" -#: ../../include/text.php:369 -msgid "newer" -msgstr "nieuwer" +#: ../../include/page_widgets.php:43 ../../mod/webpages.php:134 +msgid "Title" +msgstr "Titel" -#: ../../include/text.php:730 -msgid "No connections" -msgstr "Geen connecties" +#: ../../include/page_widgets.php:44 ../../mod/webpages.php:135 +msgid "Created" +msgstr "Aangemaakt" -#: ../../include/text.php:743 -#, php-format -msgid "%d Connection" -msgid_plural "%d Connections" -msgstr[0] "%d connectie" -msgstr[1] "%d connecties" +#: ../../include/page_widgets.php:45 ../../mod/webpages.php:136 +msgid "Edited" +msgstr "Bewerkt" -#: ../../include/text.php:756 -msgid "View Connections" -msgstr "Connecties weergeven" +#: ../../include/security.php:301 +msgid "" +"The form security token was not correct. This probably happened because the " +"form has been opened for too long (>3 hours) before submitting it." +msgstr "De beveiligings-token van het tekstvak was ongeldig. Dit is mogelijk het gevolg van dat er te lang (meer dan 3 uur) gewacht is om de tekst op te slaan. " -#: ../../include/text.php:817 ../../include/text.php:831 -#: ../../include/widgets.php:193 ../../mod/rbmark.php:28 -#: ../../mod/rbmark.php:98 ../../mod/filer.php:50 -msgid "Save" -msgstr "Opslaan" +#: ../../include/zot.php:654 +msgid "Invalid data packet" +msgstr "Datapakket ongeldig" -#: ../../include/text.php:897 -msgid "poke" -msgstr "aanstoten" +#: ../../include/zot.php:668 +msgid "Unable to verify channel signature" +msgstr "Kanaal-kenmerk (channel signature) kon niet worden geverifieerd. " -#: ../../include/text.php:897 ../../include/conversation.php:243 -msgid "poked" -msgstr "aangestoten" +#: ../../include/zot.php:865 +#, php-format +msgid "Unable to verify site signature for %s" +msgstr "Hub-kenmerk (site signature) voor %s kon niet worden geverifieerd" -#: ../../include/text.php:898 -msgid "ping" -msgstr "ping" +#: ../../include/photos.php:15 ../../include/attach.php:119 +#: ../../include/attach.php:166 ../../include/attach.php:229 +#: ../../include/attach.php:243 ../../include/attach.php:283 +#: ../../include/attach.php:297 ../../include/attach.php:322 +#: ../../include/attach.php:513 ../../include/attach.php:585 +#: ../../include/chat.php:116 ../../include/items.php:3692 +#: ../../mod/mood.php:112 ../../mod/mitem.php:73 ../../mod/achievements.php:27 +#: ../../mod/settings.php:494 ../../mod/poke.php:128 ../../mod/api.php:26 +#: ../../mod/api.php:31 ../../mod/authtest.php:13 ../../mod/profile.php:64 +#: ../../mod/profile.php:72 ../../mod/block.php:22 ../../mod/block.php:72 +#: ../../mod/profile_photo.php:263 ../../mod/profile_photo.php:276 +#: ../../mod/blocks.php:29 ../../mod/blocks.php:44 ../../mod/profiles.php:179 +#: ../../mod/profiles.php:560 ../../mod/bookmarks.php:46 +#: ../../mod/channel.php:89 ../../mod/channel.php:193 +#: ../../mod/channel.php:236 ../../mod/chat.php:90 ../../mod/chat.php:95 +#: ../../mod/register.php:71 ../../mod/regmod.php:18 ../../mod/common.php:35 +#: ../../mod/network.php:12 ../../mod/connections.php:169 +#: ../../mod/connedit.php:254 ../../mod/delegate.php:6 ../../mod/page.php:30 +#: ../../mod/page.php:80 ../../mod/setup.php:203 ../../mod/editblock.php:34 +#: ../../mod/pdledit.php:21 ../../mod/editlayout.php:48 +#: ../../mod/editpost.php:13 ../../mod/editwebpage.php:44 +#: ../../mod/editwebpage.php:83 ../../mod/photos.php:68 +#: ../../mod/photos.php:526 ../../mod/sources.php:66 ../../mod/events.php:160 +#: ../../mod/filestorage.php:10 ../../mod/filestorage.php:59 +#: ../../mod/filestorage.php:75 ../../mod/filestorage.php:98 +#: ../../mod/fsuggest.php:78 ../../mod/suggest.php:26 ../../mod/group.php:9 +#: ../../mod/thing.php:249 ../../mod/thing.php:266 ../../mod/thing.php:301 +#: ../../mod/invite.php:13 ../../mod/invite.php:104 ../../mod/item.php:178 +#: ../../mod/item.php:186 ../../mod/item.php:915 ../../mod/layouts.php:27 +#: ../../mod/layouts.php:39 ../../mod/like.php:154 +#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27 +#: ../../mod/viewsrc.php:12 ../../mod/mail.php:108 ../../mod/manage.php:6 +#: ../../mod/menu.php:44 ../../mod/webpages.php:40 ../../mod/message.php:16 +#: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97 +#: ../../mod/notifications.php:66 ../../mod/appman.php:66 ../../index.php:186 +#: ../../index.php:361 +msgid "Permission denied." +msgstr "Toegang geweigerd" -#: ../../include/text.php:898 -msgid "pinged" -msgstr "gepingd" +#: ../../include/photos.php:104 +#, php-format +msgid "Image exceeds website size limit of %lu bytes" +msgstr "Afbeelding is groter dan op deze hub toegestane limiet van %lu bytes" -#: ../../include/text.php:899 -msgid "prod" -msgstr "por" +#: ../../include/photos.php:111 +msgid "Image file is empty." +msgstr "Afbeeldingsbestand is leeg" -#: ../../include/text.php:899 -msgid "prodded" -msgstr "gepord" +#: ../../include/photos.php:140 ../../mod/profile_photo.php:216 +msgid "Unable to process image" +msgstr "Afbeelding kan niet verwerkt worden" -#: ../../include/text.php:900 -msgid "slap" -msgstr "slaan" +#: ../../include/photos.php:212 +msgid "Photo storage failed." +msgstr "Foto kan niet worden opgeslagen" -#: ../../include/text.php:900 -msgid "slapped" -msgstr "sloeg" +#: ../../include/photos.php:339 ../../include/conversation.php:1533 +msgid "Photo Albums" +msgstr "Fotoalbums" -#: ../../include/text.php:901 -msgid "finger" -msgstr "finger" +#: ../../include/photos.php:343 ../../mod/photos.php:697 +#: ../../mod/photos.php:1199 +msgid "Upload New Photos" +msgstr "Nieuwe foto's uploaden" -#: ../../include/text.php:901 -msgid "fingered" -msgstr "gefingerd" +#: ../../include/acl_selectors.php:240 +msgid "Visible to your default audience" +msgstr "Voor iedereen zichtbaar, zoals dit van te voren is ingesteld" -#: ../../include/text.php:902 -msgid "rebuff" -msgstr "afpoeieren" +#: ../../include/acl_selectors.php:241 +msgid "Show" +msgstr "Tonen" -#: ../../include/text.php:902 -msgid "rebuffed" -msgstr "afgepoeierd" +#: ../../include/acl_selectors.php:242 +msgid "Don't show" +msgstr "Niet tonen" -#: ../../include/text.php:911 -msgid "happy" -msgstr "gelukkig" +#: ../../include/acl_selectors.php:248 ../../mod/chat.php:209 +#: ../../mod/photos.php:604 ../../mod/photos.php:958 +#: ../../mod/filestorage.php:128 +msgid "Permissions" +msgstr "Privacy-rechten" -#: ../../include/text.php:912 -msgid "sad" -msgstr "bedroefd" +#: ../../include/acl_selectors.php:249 ../../include/ItemObject.php:289 +msgid "Close" +msgstr "Sluiten" -#: ../../include/text.php:913 -msgid "mellow" -msgstr "mellow" +#: ../../include/activities.php:39 +msgid " and " +msgstr " en " -#: ../../include/text.php:914 -msgid "tired" -msgstr "moe" +#: ../../include/activities.php:47 +msgid "public profile" +msgstr "openbaar profiel" -#: ../../include/text.php:915 -msgid "perky" -msgstr "parmantig" +#: ../../include/activities.php:52 +#, php-format +msgid "%1$s changed %2$s to “%3$s”" +msgstr "%1$s veranderde %2$s naar “%3$s”" -#: ../../include/text.php:916 -msgid "angry" -msgstr "boos" +#: ../../include/activities.php:53 +#, php-format +msgid "Visit %1$s's %2$s" +msgstr "Bezoek het %2$s van %1$s" -#: ../../include/text.php:917 -msgid "stupified" -msgstr "beteuterd" +#: ../../include/activities.php:56 +#, php-format +msgid "%1$s has an updated %2$s, changing %3$s." +msgstr "%1$s heeft een aangepaste %2$s, %3$s veranderd." -#: ../../include/text.php:918 -msgid "puzzled" -msgstr "verward" +#: ../../include/api.php:1036 +msgid "Public Timeline" +msgstr "Openbare tijdlijn" -#: ../../include/text.php:919 -msgid "interested" -msgstr "geïnteresseerd" +#: ../../include/attach.php:224 ../../include/attach.php:278 +msgid "Item was not found." +msgstr "Item niet gevonden" -#: ../../include/text.php:920 -msgid "bitter" -msgstr "verbitterd" +#: ../../include/attach.php:335 +msgid "No source file." +msgstr "Geen bronbestand." -#: ../../include/text.php:921 -msgid "cheerful" -msgstr "vrolijk" - -#: ../../include/text.php:922 -msgid "alive" -msgstr "levendig" - -#: ../../include/text.php:923 -msgid "annoyed" -msgstr "geërgerd" - -#: ../../include/text.php:924 -msgid "anxious" -msgstr "bezorgd" - -#: ../../include/text.php:925 -msgid "cranky" -msgstr "humeurig" - -#: ../../include/text.php:926 -msgid "disturbed" -msgstr "verontrust" - -#: ../../include/text.php:927 -msgid "frustrated" -msgstr "gefrustreerd " - -#: ../../include/text.php:928 -msgid "depressed" -msgstr "gedeprimeerd" - -#: ../../include/text.php:929 -msgid "motivated" -msgstr "gemotiveerd" - -#: ../../include/text.php:930 -msgid "relaxed" -msgstr "ontspannen" - -#: ../../include/text.php:931 -msgid "surprised" -msgstr "verrast" - -#: ../../include/text.php:1094 -msgid "Monday" -msgstr "maandag" +#: ../../include/attach.php:352 +msgid "Cannot locate file to replace" +msgstr "Kan het te vervangen bestand niet vinden" -#: ../../include/text.php:1094 -msgid "Tuesday" -msgstr "dinsdag" +#: ../../include/attach.php:370 +msgid "Cannot locate file to revise/update" +msgstr "Kan het bestand wat aangepast moet worden niet vinden" -#: ../../include/text.php:1094 -msgid "Wednesday" -msgstr "woensdag" +#: ../../include/attach.php:381 +#, php-format +msgid "File exceeds size limit of %d" +msgstr "Bestand is groter dan de toegelaten %d" -#: ../../include/text.php:1094 -msgid "Thursday" -msgstr "donderdag" +#: ../../include/attach.php:393 +#, php-format +msgid "You have reached your limit of %1$.0f Mbytes attachment storage." +msgstr "Je hebt jouw limiet van %1$.0f MB opslagruimte voor bijlagen bereikt." -#: ../../include/text.php:1094 -msgid "Friday" -msgstr "vrijdag" +#: ../../include/attach.php:475 +msgid "File upload failed. Possible system limit or action terminated." +msgstr "Uploaden van bestand mislukt. Mogelijk systeemlimiet bereikt of actie afgebroken." -#: ../../include/text.php:1094 -msgid "Saturday" -msgstr "zaterdag" +#: ../../include/attach.php:487 +msgid "Stored file could not be verified. Upload failed." +msgstr "Opgeslagen bestand kon niet worden geverifieerd. Uploaden mislukt." -#: ../../include/text.php:1094 -msgid "Sunday" -msgstr "zondag" +#: ../../include/attach.php:528 ../../include/attach.php:545 +msgid "Path not available." +msgstr "Pad niet beschikbaar." -#: ../../include/text.php:1098 -msgid "January" -msgstr "januari" +#: ../../include/attach.php:590 +msgid "Empty pathname" +msgstr "Padnaam leeg" -#: ../../include/text.php:1098 -msgid "February" -msgstr "februari" +#: ../../include/attach.php:606 +msgid "duplicate filename or path" +msgstr "dubbele bestandsnaam of pad" -#: ../../include/text.php:1098 -msgid "March" -msgstr "maart" +#: ../../include/attach.php:630 +msgid "Path not found." +msgstr "Pad niet gevonden" -#: ../../include/text.php:1098 -msgid "April" -msgstr "april" +#: ../../include/attach.php:681 +msgid "mkdir failed." +msgstr "directory aanmaken (mkdir) mislukt." -#: ../../include/text.php:1098 -msgid "May" -msgstr "mei" +#: ../../include/attach.php:685 +msgid "database storage failed." +msgstr "opslag in database mislukt." -#: ../../include/text.php:1098 -msgid "June" -msgstr "juni" +#: ../../include/plugin.php:504 ../../include/plugin.php:506 +msgid "Click here to upgrade." +msgstr "Klik hier om te upgraden." -#: ../../include/text.php:1098 -msgid "July" -msgstr "juli" +#: ../../include/plugin.php:512 +msgid "This action exceeds the limits set by your subscription plan." +msgstr "Deze handeling overschrijdt de beperkingen die voor jouw abonnement gelden." -#: ../../include/text.php:1098 -msgid "August" -msgstr "augustus" +#: ../../include/plugin.php:517 +msgid "This action is not available under your subscription plan." +msgstr "Deze handeling is niet mogelijk met jouw abonnement." -#: ../../include/text.php:1098 -msgid "September" -msgstr "september" +#: ../../include/bb2diaspora.php:463 ../../include/event.php:11 +msgid "l F d, Y \\@ g:i A" +msgstr "l d F Y \\@ G:i" -#: ../../include/text.php:1098 -msgid "October" -msgstr "oktober" +#: ../../include/bb2diaspora.php:469 ../../include/event.php:20 +msgid "Starts:" +msgstr "Start:" -#: ../../include/text.php:1098 -msgid "November" -msgstr "november" +#: ../../include/bb2diaspora.php:477 ../../include/event.php:30 +msgid "Finishes:" +msgstr "Einde:" -#: ../../include/text.php:1098 -msgid "December" -msgstr "december" +#: ../../include/bb2diaspora.php:485 ../../include/event.php:40 +#: ../../include/identity.php:757 ../../mod/directory.php:156 +#: ../../mod/dirprofile.php:105 ../../mod/events.php:504 +msgid "Location:" +msgstr "Plaats:" -#: ../../include/text.php:1176 -msgid "unknown.???" -msgstr "onbekend.???" +#: ../../include/nav.php:94 ../../include/nav.php:121 ../../boot.php:1492 +msgid "Logout" +msgstr "Uitloggen" -#: ../../include/text.php:1177 -msgid "bytes" -msgstr "bytes" +#: ../../include/nav.php:94 ../../include/nav.php:121 +msgid "End this session" +msgstr "Beëindig deze sessie" -#: ../../include/text.php:1212 -msgid "remove category" -msgstr "categorie verwijderen" +#: ../../include/nav.php:97 ../../include/nav.php:155 +msgid "Home" +msgstr "Home" -#: ../../include/text.php:1282 -msgid "remove from file" -msgstr "uit map verwijderen" +#: ../../include/nav.php:97 +msgid "Your posts and conversations" +msgstr "Jouw berichten en conversaties" -#: ../../include/text.php:1347 ../../include/text.php:1359 -msgid "Click to open/close" -msgstr "Klik om te openen of te sluiten" +#: ../../include/nav.php:98 ../../include/conversation.php:957 +#: ../../mod/connedit.php:393 ../../mod/connedit.php:507 +msgid "View Profile" +msgstr "Profiel weergeven" -#: ../../include/text.php:1514 ../../mod/events.php:374 -msgid "Link to Source" -msgstr "Originele locatie" +#: ../../include/nav.php:98 +msgid "Your profile page" +msgstr "Jouw profielpagina" -#: ../../include/text.php:1533 -msgid "Select a page layout: " -msgstr "Kies een paginalayout: " +#: ../../include/nav.php:100 +msgid "Edit Profiles" +msgstr "Bewerk profielen" -#: ../../include/text.php:1536 ../../include/text.php:1601 -msgid "default" -msgstr "standaard" +#: ../../include/nav.php:100 +msgid "Manage/Edit profiles" +msgstr "Beheer/wijzig profielen" -#: ../../include/text.php:1572 -msgid "Page content type: " -msgstr "Opmaakcode pagina" +#: ../../include/nav.php:102 ../../include/identity.php:730 +msgid "Edit Profile" +msgstr "Profiel bewerken" -#: ../../include/text.php:1613 -msgid "Select an alternate language" -msgstr "Kies een andere taal" +#: ../../include/nav.php:102 +msgid "Edit your profile" +msgstr "Jouw profiel bewerken" -#: ../../include/text.php:1737 ../../include/conversation.php:123 -#: ../../mod/tagger.php:49 -msgid "event" -msgstr "gebeurtenis" +#: ../../include/nav.php:104 +msgid "Your photos" +msgstr "Jouw foto's" -#: ../../include/text.php:1742 ../../include/conversation.php:150 -#: ../../mod/tagger.php:55 -msgid "comment" -msgstr "reactie" +#: ../../include/nav.php:105 +msgid "Your files" +msgstr "Jouw bestanden" -#: ../../include/text.php:1747 -msgid "activity" -msgstr "activiteit" +#: ../../include/nav.php:110 +msgid "Your chatrooms" +msgstr "Jouw chatkanalen" -#: ../../include/text.php:2006 -msgid "Design" -msgstr "Ontwerp" +#: ../../include/nav.php:113 +msgid "Your bookmarks" +msgstr "Jouw bladwijzers" -#: ../../include/text.php:2008 -msgid "Blocks" -msgstr "Blokken" +#: ../../include/nav.php:115 +msgid "Your webpages" +msgstr "Jouw webpagina's" -#: ../../include/text.php:2009 -msgid "Menus" -msgstr "Menu's" +#: ../../include/nav.php:119 +msgid "Sign in" +msgstr "Inloggen" -#: ../../include/text.php:2010 -msgid "Layouts" -msgstr "Layouts" +#: ../../include/nav.php:136 +#, php-format +msgid "%s - click to logout" +msgstr "%s - klik om uit te loggen" -#: ../../include/text.php:2011 -msgid "Pages" -msgstr "Pagina's" +#: ../../include/nav.php:141 +msgid "Click to authenticate to your home hub" +msgstr "Klik om jezelf te authenticeren via jouw eigen RedMatrix-hub" -#: ../../include/page_widgets.php:6 -msgid "New Page" -msgstr "Nieuwe pagina" +#: ../../include/nav.php:155 +msgid "Home Page" +msgstr "Homepage" -#: ../../include/page_widgets.php:39 ../../mod/blocks.php:97 -#: ../../mod/layouts.php:116 ../../mod/webpages.php:123 -msgid "View" -msgstr "Weergeven" +#: ../../include/nav.php:159 ../../mod/register.php:221 ../../boot.php:1469 +msgid "Register" +msgstr "Registreren " -#: ../../include/page_widgets.php:40 ../../include/conversation.php:1096 -#: ../../include/ItemObject.php:592 ../../mod/editblock.php:141 -#: ../../mod/editlayout.php:135 ../../mod/editpost.php:140 -#: ../../mod/editwebpage.php:174 ../../mod/photos.php:1003 -#: ../../mod/webpages.php:124 -msgid "Preview" -msgstr "Voorvertoning" +#: ../../include/nav.php:159 +msgid "Create an account" +msgstr "Maak een account aan" -#: ../../include/page_widgets.php:41 ../../mod/webpages.php:125 -msgid "Actions" -msgstr "Acties" +#: ../../include/nav.php:164 +msgid "Help and documentation" +msgstr "Hulp en documentatie" -#: ../../include/page_widgets.php:42 ../../mod/webpages.php:126 -msgid "Page Link" -msgstr "Paginalink" +#: ../../include/nav.php:167 ../../include/widgets.php:86 +#: ../../mod/apps.php:33 +msgid "Apps" +msgstr "Apps" -#: ../../include/page_widgets.php:43 ../../mod/webpages.php:127 -msgid "Title" -msgstr "Titel" +#: ../../include/nav.php:167 +msgid "Applications, utilities, links, games" +msgstr "Apps" -#: ../../include/page_widgets.php:44 ../../mod/webpages.php:128 -msgid "Created" -msgstr "Aangemaakt" +#: ../../include/nav.php:169 +msgid "Search site content" +msgstr "Inhoud van deze RedMatrix-hub doorzoeken" -#: ../../include/page_widgets.php:45 ../../mod/webpages.php:129 -msgid "Edited" -msgstr "Bewerkt" +#: ../../include/nav.php:172 +msgid "Channel Locator" +msgstr "Kanalengids" -#: ../../include/security.php:301 -msgid "" -"The form security token was not correct. This probably happened because the " -"form has been opened for too long (>3 hours) before submitting it." -msgstr "De beveiligings-token van het tekstvak was ongeldig. Dit is mogelijk het gevolg van dat er te lang (meer dan 3 uur) gewacht is om de tekst op te slaan. " +#: ../../include/nav.php:183 +msgid "Your matrix" +msgstr "Jouw matrix" -#: ../../include/account.php:23 -msgid "Not a valid email address" -msgstr "Geen geldig e-mailadres" +#: ../../include/nav.php:184 +msgid "Mark all matrix notifications seen" +msgstr "Markeer alle matrixnotificaties als bekeken" -#: ../../include/account.php:25 -msgid "Your email domain is not among those allowed on this site" -msgstr "Jouw e-maildomein is op deze RedMatrix-hub niet toegestaan" +#: ../../include/nav.php:186 +msgid "Channel home" +msgstr "Tijdlijn kanaal" -#: ../../include/account.php:31 -msgid "Your email address is already registered at this site." -msgstr "Jouw e-mailadres is al op deze RedMatrix-hub geregistreerd ." +#: ../../include/nav.php:187 +msgid "Mark all channel notifications seen" +msgstr "Alle kanaalnotificaties als gelezen markeren" -#: ../../include/account.php:64 -msgid "An invitation is required." -msgstr "Een uitnodiging is vereist" +#: ../../include/nav.php:190 ../../mod/connections.php:389 +msgid "Connections" +msgstr "Connecties" -#: ../../include/account.php:68 -msgid "Invitation could not be verified." -msgstr "Uitnodiging kon niet geverifieerd worden" +#: ../../include/nav.php:193 +msgid "Notices" +msgstr "Notificaties" -#: ../../include/account.php:119 -msgid "Please enter the required information." -msgstr "Vul de vereiste informatie in." +#: ../../include/nav.php:193 +msgid "Notifications" +msgstr "Notificaties" -#: ../../include/account.php:187 -msgid "Failed to store account information." -msgstr "Account-informatie kon niet opgeslagen worden." +#: ../../include/nav.php:194 +msgid "See all notifications" +msgstr "Alle notificaties weergeven" -#: ../../include/account.php:245 -#, php-format -msgid "Registration confirmation for %s" -msgstr "Registratiebevestiging voor %s" +#: ../../include/nav.php:195 ../../mod/notifications.php:99 +msgid "Mark all system notifications seen" +msgstr "Markeer alle systeemnotificaties als bekeken" -#: ../../include/account.php:313 -#, php-format -msgid "Registration request at %s" -msgstr "Registratieverzoek op %s" +#: ../../include/nav.php:197 +msgid "Private mail" +msgstr "Privéberichten" -#: ../../include/account.php:315 ../../include/account.php:342 -#: ../../include/account.php:399 -msgid "Administrator" -msgstr "Beheerder" +#: ../../include/nav.php:198 +msgid "See all private messages" +msgstr "Alle privéberichten weergeven" -#: ../../include/account.php:337 -msgid "your registration password" -msgstr "jouw registratiewachtwoord" +#: ../../include/nav.php:199 +msgid "Mark all private messages seen" +msgstr "Markeer alle privéberichten als bekeken" -#: ../../include/account.php:340 ../../include/account.php:397 -#, php-format -msgid "Registration details for %s" -msgstr "Registratiedetails voor %s" +#: ../../include/nav.php:200 +msgid "Inbox" +msgstr "Postvak IN" -#: ../../include/account.php:406 -msgid "Account approved." -msgstr "Account goedgekeurd" +#: ../../include/nav.php:201 +msgid "Outbox" +msgstr "Postvak UIT" -#: ../../include/account.php:440 -#, php-format -msgid "Registration revoked for %s" -msgstr "Registratie ingetrokken voor %s" +#: ../../include/nav.php:202 ../../include/widgets.php:543 +msgid "New Message" +msgstr "Nieuw bericht" -#: ../../include/account.php:486 -msgid "Account verified. Please login." -msgstr "Account is geverifieerd. Je kan inloggen." +#: ../../include/nav.php:205 +msgid "Event Calendar" +msgstr "Agenda" -#: ../../include/photos.php:15 ../../include/attach.php:119 -#: ../../include/attach.php:166 ../../include/attach.php:229 -#: ../../include/attach.php:243 ../../include/attach.php:283 -#: ../../include/attach.php:297 ../../include/attach.php:322 -#: ../../include/attach.php:513 ../../include/attach.php:585 -#: ../../include/chat.php:116 ../../include/items.php:3635 -#: ../../mod/mood.php:112 ../../mod/mitem.php:73 ../../mod/achievements.php:27 -#: ../../mod/settings.php:494 ../../mod/poke.php:128 ../../mod/api.php:26 -#: ../../mod/api.php:31 ../../mod/authtest.php:13 ../../mod/profile.php:64 -#: ../../mod/profile.php:72 ../../mod/block.php:22 ../../mod/block.php:72 -#: ../../mod/profile_photo.php:263 ../../mod/profile_photo.php:276 -#: ../../mod/blocks.php:29 ../../mod/blocks.php:44 ../../mod/profiles.php:179 -#: ../../mod/profiles.php:524 ../../mod/bookmarks.php:46 -#: ../../mod/channel.php:89 ../../mod/channel.php:193 -#: ../../mod/channel.php:236 ../../mod/chat.php:90 ../../mod/chat.php:95 -#: ../../mod/register.php:71 ../../mod/regmod.php:18 ../../mod/common.php:35 -#: ../../mod/network.php:12 ../../mod/connections.php:169 -#: ../../mod/connedit.php:254 ../../mod/delegate.php:6 ../../mod/page.php:30 -#: ../../mod/page.php:80 ../../mod/setup.php:203 ../../mod/editblock.php:34 -#: ../../mod/pdledit.php:21 ../../mod/editlayout.php:48 -#: ../../mod/editpost.php:13 ../../mod/editwebpage.php:44 -#: ../../mod/editwebpage.php:83 ../../mod/photos.php:68 -#: ../../mod/photos.php:526 ../../mod/sources.php:66 ../../mod/events.php:160 -#: ../../mod/filestorage.php:10 ../../mod/filestorage.php:59 -#: ../../mod/filestorage.php:75 ../../mod/filestorage.php:98 -#: ../../mod/fsuggest.php:78 ../../mod/suggest.php:26 ../../mod/group.php:9 -#: ../../mod/thing.php:249 ../../mod/thing.php:266 ../../mod/thing.php:301 -#: ../../mod/invite.php:13 ../../mod/invite.php:104 ../../mod/item.php:178 -#: ../../mod/item.php:186 ../../mod/item.php:915 ../../mod/layouts.php:27 -#: ../../mod/layouts.php:39 ../../mod/like.php:154 -#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27 -#: ../../mod/viewsrc.php:12 ../../mod/mail.php:108 ../../mod/manage.php:6 -#: ../../mod/menu.php:44 ../../mod/webpages.php:40 ../../mod/message.php:16 -#: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97 -#: ../../mod/notifications.php:66 ../../mod/appman.php:66 ../../index.php:186 -#: ../../index.php:361 -msgid "Permission denied." -msgstr "Toegang geweigerd" +#: ../../include/nav.php:206 +msgid "See all events" +msgstr "Alle gebeurtenissen weergeven" -#: ../../include/photos.php:104 -#, php-format -msgid "Image exceeds website size limit of %lu bytes" -msgstr "Afbeelding is groter dan op deze hub toegestane limiet van %lu bytes" +#: ../../include/nav.php:207 +msgid "Mark all events seen" +msgstr "Markeer alle gebeurtenissen als bekeken" -#: ../../include/photos.php:111 -msgid "Image file is empty." -msgstr "Afbeeldingsbestand is leeg" +#: ../../include/nav.php:209 +msgid "Manage Your Channels" +msgstr "Beheer je kanalen" -#: ../../include/photos.php:140 ../../mod/profile_photo.php:216 -msgid "Unable to process image" -msgstr "Afbeelding kan niet verwerkt worden" +#: ../../include/nav.php:211 +msgid "Account/Channel Settings" +msgstr "Account-/kanaal-instellingen" -#: ../../include/photos.php:212 -msgid "Photo storage failed." -msgstr "Foto kan niet worden opgeslagen" +#: ../../include/nav.php:219 ../../mod/admin.php:123 +msgid "Admin" +msgstr "Beheer" -#: ../../include/photos.php:339 ../../include/conversation.php:1520 -msgid "Photo Albums" -msgstr "Fotoalbums" +#: ../../include/nav.php:219 +msgid "Site Setup and Configuration" +msgstr "Hub instellen en beheren" -#: ../../include/photos.php:343 ../../mod/photos.php:697 -#: ../../mod/photos.php:1199 -msgid "Upload New Photos" -msgstr "Nieuwe foto's uploaden" +#: ../../include/nav.php:244 +msgid "Nothing new here" +msgstr "Niets nieuw hier" -#: ../../include/acl_selectors.php:240 -msgid "Visible to your default audience" -msgstr "Voor iedereen zichtbaar, zoals dit van te voren is ingesteld" +#: ../../include/nav.php:248 +msgid "Please wait..." +msgstr "Wachten aub..." -#: ../../include/acl_selectors.php:241 -msgid "Show" -msgstr "Tonen" +#: ../../include/bookmarks.php:35 +#, php-format +msgid "%1$s's bookmarks" +msgstr "Bladwijzers van %1$s" -#: ../../include/acl_selectors.php:242 -msgid "Don't show" -msgstr "Niet tonen" +#: ../../include/text.php:321 +msgid "prev" +msgstr "vorige" -#: ../../include/acl_selectors.php:248 ../../mod/chat.php:209 -#: ../../mod/photos.php:604 ../../mod/photos.php:958 -#: ../../mod/filestorage.php:128 -msgid "Permissions" -msgstr "Privacy-rechten" +#: ../../include/text.php:323 +msgid "first" +msgstr "eerste" -#: ../../include/acl_selectors.php:249 ../../include/ItemObject.php:289 -msgid "Close" -msgstr "Sluiten" +#: ../../include/text.php:352 +msgid "last" +msgstr "laatste" -#: ../../include/activities.php:39 -msgid " and " -msgstr " en " +#: ../../include/text.php:355 +msgid "next" +msgstr "volgende" -#: ../../include/activities.php:47 -msgid "public profile" -msgstr "openbaar profiel" +#: ../../include/text.php:367 +msgid "older" +msgstr "ouder" -#: ../../include/activities.php:52 -#, php-format -msgid "%1$s changed %2$s to “%3$s”" -msgstr "%1$s veranderde %2$s naar “%3$s”" +#: ../../include/text.php:369 +msgid "newer" +msgstr "nieuwer" -#: ../../include/activities.php:53 -#, php-format -msgid "Visit %1$s's %2$s" -msgstr "Bezoek het %2$s van %1$s" +#: ../../include/text.php:730 +msgid "No connections" +msgstr "Geen connecties" -#: ../../include/activities.php:56 +#: ../../include/text.php:743 #, php-format -msgid "%1$s has an updated %2$s, changing %3$s." -msgstr "%1$s heeft een aangepaste %2$s, %3$s veranderd." - -#: ../../include/api.php:1036 -msgid "Public Timeline" -msgstr "Openbare tijdlijn" +msgid "%d Connection" +msgid_plural "%d Connections" +msgstr[0] "%d connectie" +msgstr[1] "%d connecties" -#: ../../include/attach.php:224 ../../include/attach.php:278 -msgid "Item was not found." -msgstr "Item niet gevonden" +#: ../../include/text.php:756 +msgid "View Connections" +msgstr "Connecties weergeven" -#: ../../include/attach.php:335 -msgid "No source file." -msgstr "Geen bronbestand." +#: ../../include/text.php:817 ../../include/text.php:831 +#: ../../include/widgets.php:193 ../../mod/rbmark.php:28 +#: ../../mod/rbmark.php:98 ../../mod/filer.php:50 ../../mod/admin.php:1338 +#: ../../mod/admin.php:1359 +msgid "Save" +msgstr "Opslaan" -#: ../../include/attach.php:352 -msgid "Cannot locate file to replace" -msgstr "Kan het te vervangen bestand niet vinden" +#: ../../include/text.php:897 +msgid "poke" +msgstr "aanstoten" -#: ../../include/attach.php:370 -msgid "Cannot locate file to revise/update" -msgstr "Kan het bestand wat aangepast moet worden niet vinden" +#: ../../include/text.php:897 ../../include/conversation.php:243 +msgid "poked" +msgstr "aangestoten" -#: ../../include/attach.php:381 -#, php-format -msgid "File exceeds size limit of %d" -msgstr "Bestand is groter dan de toegelaten %d" +#: ../../include/text.php:898 +msgid "ping" +msgstr "ping" -#: ../../include/attach.php:393 -#, php-format -msgid "You have reached your limit of %1$.0f Mbytes attachment storage." -msgstr "Je hebt jouw limiet van %1$.0f MB opslagruimte voor bijlagen bereikt." +#: ../../include/text.php:898 +msgid "pinged" +msgstr "gepingd" -#: ../../include/attach.php:475 -msgid "File upload failed. Possible system limit or action terminated." -msgstr "Uploaden van bestand mislukt. Mogelijk systeemlimiet bereikt of actie afgebroken." +#: ../../include/text.php:899 +msgid "prod" +msgstr "por" -#: ../../include/attach.php:487 -msgid "Stored file could not be verified. Upload failed." -msgstr "Opgeslagen bestand kon niet worden geverifieerd. Uploaden mislukt." +#: ../../include/text.php:899 +msgid "prodded" +msgstr "gepord" -#: ../../include/attach.php:528 ../../include/attach.php:545 -msgid "Path not available." -msgstr "Pad niet beschikbaar." +#: ../../include/text.php:900 +msgid "slap" +msgstr "slaan" -#: ../../include/attach.php:590 -msgid "Empty pathname" -msgstr "Padnaam leeg" +#: ../../include/text.php:900 +msgid "slapped" +msgstr "sloeg" -#: ../../include/attach.php:606 -msgid "duplicate filename or path" -msgstr "dubbele bestandsnaam of pad" +#: ../../include/text.php:901 +msgid "finger" +msgstr "finger" -#: ../../include/attach.php:630 -msgid "Path not found." -msgstr "Pad niet gevonden" +#: ../../include/text.php:901 +msgid "fingered" +msgstr "gefingerd" -#: ../../include/attach.php:681 -msgid "mkdir failed." -msgstr "directory aanmaken (mkdir) mislukt." +#: ../../include/text.php:902 +msgid "rebuff" +msgstr "afpoeieren" -#: ../../include/attach.php:685 -msgid "database storage failed." -msgstr "opslag in database mislukt." +#: ../../include/text.php:902 +msgid "rebuffed" +msgstr "afgepoeierd" -#: ../../include/plugin.php:504 ../../include/plugin.php:506 -msgid "Click here to upgrade." -msgstr "Klik hier om te upgraden." +#: ../../include/text.php:911 +msgid "happy" +msgstr "gelukkig" -#: ../../include/plugin.php:512 -msgid "This action exceeds the limits set by your subscription plan." -msgstr "Deze handeling overschrijdt de beperkingen die voor jouw abonnement gelden." +#: ../../include/text.php:912 +msgid "sad" +msgstr "bedroefd" -#: ../../include/plugin.php:517 -msgid "This action is not available under your subscription plan." -msgstr "Deze handeling is niet mogelijk met jouw abonnement." +#: ../../include/text.php:913 +msgid "mellow" +msgstr "mellow" -#: ../../include/bb2diaspora.php:463 ../../include/event.php:11 -msgid "l F d, Y \\@ g:i A" -msgstr "l d F Y \\@ G:i" +#: ../../include/text.php:914 +msgid "tired" +msgstr "moe" -#: ../../include/bb2diaspora.php:469 ../../include/event.php:20 -msgid "Starts:" -msgstr "Start:" +#: ../../include/text.php:915 +msgid "perky" +msgstr "parmantig" -#: ../../include/bb2diaspora.php:477 ../../include/event.php:30 -msgid "Finishes:" -msgstr "Einde:" +#: ../../include/text.php:916 +msgid "angry" +msgstr "boos" -#: ../../include/bb2diaspora.php:485 ../../include/event.php:40 -#: ../../include/identity.php:757 ../../mod/directory.php:156 -#: ../../mod/dirprofile.php:105 ../../mod/events.php:504 -msgid "Location:" -msgstr "Plaats:" +#: ../../include/text.php:917 +msgid "stupified" +msgstr "beteuterd" -#: ../../include/nav.php:94 ../../include/nav.php:121 ../../boot.php:1492 -msgid "Logout" -msgstr "Uitloggen" +#: ../../include/text.php:918 +msgid "puzzled" +msgstr "verward" -#: ../../include/nav.php:94 ../../include/nav.php:121 -msgid "End this session" -msgstr "Beëindig deze sessie" +#: ../../include/text.php:919 +msgid "interested" +msgstr "geïnteresseerd" -#: ../../include/nav.php:97 ../../include/nav.php:155 -msgid "Home" -msgstr "Home" +#: ../../include/text.php:920 +msgid "bitter" +msgstr "verbitterd" -#: ../../include/nav.php:97 -msgid "Your posts and conversations" -msgstr "Jouw berichten en conversaties" +#: ../../include/text.php:921 +msgid "cheerful" +msgstr "vrolijk" -#: ../../include/nav.php:98 ../../include/conversation.php:944 -#: ../../mod/connedit.php:393 ../../mod/connedit.php:507 -msgid "View Profile" -msgstr "Profiel weergeven" +#: ../../include/text.php:922 +msgid "alive" +msgstr "levendig" -#: ../../include/nav.php:98 -msgid "Your profile page" -msgstr "Jouw profielpagina" +#: ../../include/text.php:923 +msgid "annoyed" +msgstr "geërgerd" -#: ../../include/nav.php:100 -msgid "Edit Profiles" -msgstr "Bewerk profielen" +#: ../../include/text.php:924 +msgid "anxious" +msgstr "bezorgd" -#: ../../include/nav.php:100 -msgid "Manage/Edit profiles" -msgstr "Beheer/wijzig profielen" +#: ../../include/text.php:925 +msgid "cranky" +msgstr "humeurig" -#: ../../include/nav.php:102 ../../include/identity.php:730 -msgid "Edit Profile" -msgstr "Profiel bewerken" +#: ../../include/text.php:926 +msgid "disturbed" +msgstr "verontrust" -#: ../../include/nav.php:102 -msgid "Edit your profile" -msgstr "Jouw profiel bewerken" +#: ../../include/text.php:927 +msgid "frustrated" +msgstr "gefrustreerd " -#: ../../include/nav.php:104 -msgid "Your photos" -msgstr "Jouw foto's" +#: ../../include/text.php:928 +msgid "depressed" +msgstr "gedeprimeerd" -#: ../../include/nav.php:105 -msgid "Your files" -msgstr "Jouw bestanden" +#: ../../include/text.php:929 +msgid "motivated" +msgstr "gemotiveerd" -#: ../../include/nav.php:110 -msgid "Your chatrooms" -msgstr "Jouw chatkanalen" +#: ../../include/text.php:930 +msgid "relaxed" +msgstr "ontspannen" -#: ../../include/nav.php:113 -msgid "Your bookmarks" -msgstr "Jouw bladwijzers" +#: ../../include/text.php:931 +msgid "surprised" +msgstr "verrast" -#: ../../include/nav.php:115 -msgid "Your webpages" -msgstr "Jouw webpagina's" +#: ../../include/text.php:1094 +msgid "Monday" +msgstr "maandag" -#: ../../include/nav.php:119 -msgid "Sign in" -msgstr "Inloggen" +#: ../../include/text.php:1094 +msgid "Tuesday" +msgstr "dinsdag" -#: ../../include/nav.php:136 -#, php-format -msgid "%s - click to logout" -msgstr "%s - klik om uit te loggen" +#: ../../include/text.php:1094 +msgid "Wednesday" +msgstr "woensdag" -#: ../../include/nav.php:141 -msgid "Click to authenticate to your home hub" -msgstr "Klik om jezelf te authenticeren via jouw eigen RedMatrix-hub" +#: ../../include/text.php:1094 +msgid "Thursday" +msgstr "donderdag" -#: ../../include/nav.php:155 -msgid "Home Page" -msgstr "Homepage" +#: ../../include/text.php:1094 +msgid "Friday" +msgstr "vrijdag" -#: ../../include/nav.php:159 ../../mod/register.php:221 ../../boot.php:1469 -msgid "Register" -msgstr "Registreren " +#: ../../include/text.php:1094 +msgid "Saturday" +msgstr "zaterdag" -#: ../../include/nav.php:159 -msgid "Create an account" -msgstr "Maak een account aan" +#: ../../include/text.php:1094 +msgid "Sunday" +msgstr "zondag" -#: ../../include/nav.php:164 -msgid "Help and documentation" -msgstr "Hulp en documentatie" +#: ../../include/text.php:1098 +msgid "January" +msgstr "januari" -#: ../../include/nav.php:167 ../../include/widgets.php:86 -#: ../../mod/apps.php:33 -msgid "Apps" -msgstr "Apps" +#: ../../include/text.php:1098 +msgid "February" +msgstr "februari" -#: ../../include/nav.php:167 -msgid "Applications, utilities, links, games" -msgstr "Apps" +#: ../../include/text.php:1098 +msgid "March" +msgstr "maart" -#: ../../include/nav.php:169 -msgid "Search site content" -msgstr "Inhoud van deze RedMatrix-hub doorzoeken" +#: ../../include/text.php:1098 +msgid "April" +msgstr "april" -#: ../../include/nav.php:172 -msgid "Channel Locator" -msgstr "Kanalengids" +#: ../../include/text.php:1098 +msgid "May" +msgstr "mei" -#: ../../include/nav.php:183 -msgid "Your matrix" -msgstr "Jouw matrix" +#: ../../include/text.php:1098 +msgid "June" +msgstr "juni" -#: ../../include/nav.php:184 -msgid "Mark all matrix notifications seen" -msgstr "Markeer alle matrixnotificaties als bekeken" +#: ../../include/text.php:1098 +msgid "July" +msgstr "juli" -#: ../../include/nav.php:186 -msgid "Channel home" -msgstr "Tijdlijn kanaal" +#: ../../include/text.php:1098 +msgid "August" +msgstr "augustus" -#: ../../include/nav.php:187 -msgid "Mark all channel notifications seen" -msgstr "Alle kanaalnotificaties als gelezen markeren" +#: ../../include/text.php:1098 +msgid "September" +msgstr "september" -#: ../../include/nav.php:190 ../../mod/connections.php:389 -msgid "Connections" -msgstr "Connecties" +#: ../../include/text.php:1098 +msgid "October" +msgstr "oktober" -#: ../../include/nav.php:193 -msgid "Notices" -msgstr "Notificaties" +#: ../../include/text.php:1098 +msgid "November" +msgstr "november" -#: ../../include/nav.php:193 -msgid "Notifications" -msgstr "Notificaties" +#: ../../include/text.php:1098 +msgid "December" +msgstr "december" -#: ../../include/nav.php:194 -msgid "See all notifications" -msgstr "Alle notificaties weergeven" +#: ../../include/text.php:1176 +msgid "unknown.???" +msgstr "onbekend.???" -#: ../../include/nav.php:195 ../../mod/notifications.php:99 -msgid "Mark all system notifications seen" -msgstr "Markeer alle systeemnotificaties als bekeken" +#: ../../include/text.php:1177 +msgid "bytes" +msgstr "bytes" -#: ../../include/nav.php:197 -msgid "Private mail" -msgstr "Privéberichten" +#: ../../include/text.php:1212 +msgid "remove category" +msgstr "categorie verwijderen" -#: ../../include/nav.php:198 -msgid "See all private messages" -msgstr "Alle privéberichten weergeven" +#: ../../include/text.php:1282 +msgid "remove from file" +msgstr "uit map verwijderen" -#: ../../include/nav.php:199 -msgid "Mark all private messages seen" -msgstr "Markeer alle privéberichten als bekeken" +#: ../../include/text.php:1347 ../../include/text.php:1359 +msgid "Click to open/close" +msgstr "Klik om te openen of te sluiten" -#: ../../include/nav.php:200 -msgid "Inbox" -msgstr "Postvak IN" +#: ../../include/text.php:1514 ../../mod/events.php:374 +msgid "Link to Source" +msgstr "Originele locatie" -#: ../../include/nav.php:201 -msgid "Outbox" -msgstr "Postvak UIT" +#: ../../include/text.php:1533 +msgid "Select a page layout: " +msgstr "Kies een paginalayout: " -#: ../../include/nav.php:202 ../../include/widgets.php:543 -msgid "New Message" -msgstr "Nieuw bericht" +#: ../../include/text.php:1536 ../../include/text.php:1601 +msgid "default" +msgstr "standaard" -#: ../../include/nav.php:205 -msgid "Event Calendar" -msgstr "Agenda" +#: ../../include/text.php:1572 +msgid "Page content type: " +msgstr "Opmaakcode pagina" -#: ../../include/nav.php:206 -msgid "See all events" -msgstr "Alle gebeurtenissen weergeven" +#: ../../include/text.php:1613 +msgid "Select an alternate language" +msgstr "Kies een andere taal" -#: ../../include/nav.php:207 -msgid "Mark all events seen" -msgstr "Markeer alle gebeurtenissen als bekeken" +#: ../../include/text.php:1734 ../../include/diaspora.php:1852 +#: ../../include/conversation.php:120 ../../mod/subthread.php:72 +#: ../../mod/subthread.php:174 ../../mod/tagger.php:45 ../../mod/like.php:294 +msgid "photo" +msgstr "foto" -#: ../../include/nav.php:209 ../../mod/manage.php:148 -msgid "Channel Manager" -msgstr "Kanaalbeheerder" +#: ../../include/text.php:1737 ../../include/conversation.php:123 +#: ../../mod/tagger.php:49 +msgid "event" +msgstr "gebeurtenis" -#: ../../include/nav.php:209 -msgid "Manage Your Channels" -msgstr "Beheer je kanalen" +#: ../../include/text.php:1740 ../../include/diaspora.php:1852 +#: ../../include/conversation.php:148 ../../mod/subthread.php:72 +#: ../../mod/subthread.php:174 ../../mod/tagger.php:53 ../../mod/like.php:294 +msgid "status" +msgstr "bericht" -#: ../../include/nav.php:211 -msgid "Account/Channel Settings" -msgstr "Account-/kanaal-instellingen" +#: ../../include/text.php:1742 ../../include/conversation.php:150 +#: ../../mod/tagger.php:55 +msgid "comment" +msgstr "reactie" -#: ../../include/nav.php:219 ../../mod/admin.php:123 -msgid "Admin" -msgstr "Beheer" +#: ../../include/text.php:1747 +msgid "activity" +msgstr "activiteit" -#: ../../include/nav.php:219 -msgid "Site Setup and Configuration" -msgstr "Hub instellen en beheren" +#: ../../include/text.php:2006 +msgid "Design" +msgstr "Ontwerp" -#: ../../include/nav.php:244 -msgid "Nothing new here" -msgstr "Niets nieuw hier" +#: ../../include/text.php:2008 +msgid "Blocks" +msgstr "Blokken" -#: ../../include/nav.php:248 -msgid "Please wait..." -msgstr "Wachten aub..." +#: ../../include/text.php:2009 +msgid "Menus" +msgstr "Menu's" -#: ../../include/bookmarks.php:35 -#, php-format -msgid "%1$s's bookmarks" -msgstr "Bladwijzers van %1$s" +#: ../../include/text.php:2010 +msgid "Layouts" +msgstr "Layouts" + +#: ../../include/text.php:2011 +msgid "Pages" +msgstr "Pagina's" #: ../../include/taxonomy.php:210 msgid "Tags" @@ -1168,8 +1109,8 @@ msgstr "OStatus" msgid "RSS/Atom" msgstr "RSS/Atom" -#: ../../include/contact_selectors.php:79 ../../mod/admin.php:723 -#: ../../mod/admin.php:732 ../../boot.php:1495 +#: ../../include/contact_selectors.php:79 ../../mod/admin.php:726 +#: ../../mod/admin.php:735 ../../boot.php:1495 msgid "Email" msgstr "E-mail" @@ -1204,7 +1145,7 @@ msgid_plural "%d invitations available" msgstr[0] "%d uitnodiging beschikbaar" msgstr[1] "%d uitnodigingen beschikbaar" -#: ../../include/contact_widgets.php:19 ../../mod/admin.php:415 +#: ../../include/contact_widgets.php:19 ../../mod/admin.php:417 msgid "Advanced" msgstr "Geavanceerd" @@ -1278,18 +1219,80 @@ msgstr "meer connecties weergeven" msgid "This event has been added to your calendar." msgstr "Dit evenement is aan jouw agenda toegevoegd." -#: ../../include/zot.php:640 -msgid "Invalid data packet" -msgstr "Datapakket ongeldig" +#: ../../include/account.php:23 +msgid "Not a valid email address" +msgstr "Geen geldig e-mailadres" -#: ../../include/zot.php:654 -msgid "Unable to verify channel signature" -msgstr "Kanaal-kenmerk (channel signature) kon niet worden geverifieerd. " +#: ../../include/account.php:25 +msgid "Your email domain is not among those allowed on this site" +msgstr "Jouw e-maildomein is op deze RedMatrix-hub niet toegestaan" + +#: ../../include/account.php:31 +msgid "Your email address is already registered at this site." +msgstr "Jouw e-mailadres is al op deze RedMatrix-hub geregistreerd ." + +#: ../../include/account.php:64 +msgid "An invitation is required." +msgstr "Een uitnodiging is vereist" + +#: ../../include/account.php:68 +msgid "Invitation could not be verified." +msgstr "Uitnodiging kon niet geverifieerd worden" + +#: ../../include/account.php:119 +msgid "Please enter the required information." +msgstr "Vul de vereiste informatie in." + +#: ../../include/account.php:187 +msgid "Failed to store account information." +msgstr "Account-informatie kon niet opgeslagen worden." -#: ../../include/zot.php:851 +#: ../../include/account.php:245 #, php-format -msgid "Unable to verify site signature for %s" -msgstr "Hub-kenmerk (site signature) voor %s kon niet worden geverifieerd" +msgid "Registration confirmation for %s" +msgstr "Registratiebevestiging voor %s" + +#: ../../include/account.php:313 +#, php-format +msgid "Registration request at %s" +msgstr "Registratieverzoek op %s" + +#: ../../include/account.php:315 ../../include/account.php:342 +#: ../../include/account.php:399 +msgid "Administrator" +msgstr "Beheerder" + +#: ../../include/account.php:337 +msgid "your registration password" +msgstr "jouw registratiewachtwoord" + +#: ../../include/account.php:340 ../../include/account.php:397 +#, php-format +msgid "Registration details for %s" +msgstr "Registratiedetails voor %s" + +#: ../../include/account.php:406 +msgid "Account approved." +msgstr "Account goedgekeurd" + +#: ../../include/account.php:440 +#, php-format +msgid "Registration revoked for %s" +msgstr "Registratie ingetrokken voor %s" + +#: ../../include/account.php:486 +msgid "Account verified. Please login." +msgstr "Account is geverifieerd. Je kan inloggen." + +#: ../../include/diaspora.php:1868 ../../include/conversation.php:164 +#: ../../mod/like.php:331 +#, php-format +msgid "%1$s likes %2$s's %3$s" +msgstr "%1$s vindt %3$s van %2$s leuk" + +#: ../../include/diaspora.php:2278 +msgid "Attachments:" +msgstr "Bijlagen:" #: ../../include/datetime.php:43 ../../include/datetime.php:45 msgid "Miscellaneous" @@ -1637,7 +1640,7 @@ msgid "%1$s used of %2$s (%3$s%)" msgstr "%1$s van %2$s gebruikt (%3$s%)" #: ../../include/reddav.php:1284 ../../mod/settings.php:519 -#: ../../mod/settings.php:545 ../../mod/admin.php:862 +#: ../../mod/settings.php:545 ../../mod/admin.php:865 msgid "Name" msgstr "Naam" @@ -1699,52 +1702,52 @@ msgctxt "mood" msgid "%1$s is %2$s" msgstr "%1$s is %2$s" -#: ../../include/conversation.php:634 ../../include/ItemObject.php:114 +#: ../../include/conversation.php:647 ../../include/ItemObject.php:114 msgid "Select" msgstr "Kies" -#: ../../include/conversation.php:642 ../../include/ItemObject.php:89 +#: ../../include/conversation.php:655 ../../include/ItemObject.php:89 #: ../../mod/photos.php:850 msgid "Private Message" msgstr "Privébericht" -#: ../../include/conversation.php:649 ../../include/ItemObject.php:182 +#: ../../include/conversation.php:662 ../../include/ItemObject.php:182 msgid "Message is verified" msgstr "Bericht is geverifieerd" -#: ../../include/conversation.php:669 +#: ../../include/conversation.php:682 #, php-format msgid "View %s's profile @ %s" msgstr "Bekijk het profiel van %s @ %s" -#: ../../include/conversation.php:683 +#: ../../include/conversation.php:696 msgid "Categories:" msgstr "Categorieën:" -#: ../../include/conversation.php:684 +#: ../../include/conversation.php:697 msgid "Filed under:" msgstr "Bewaard onder:" -#: ../../include/conversation.php:693 ../../include/ItemObject.php:250 +#: ../../include/conversation.php:706 ../../include/ItemObject.php:250 #, php-format msgid " from %s" msgstr " van %s" -#: ../../include/conversation.php:696 ../../include/ItemObject.php:253 +#: ../../include/conversation.php:709 ../../include/ItemObject.php:253 #, php-format msgid "last edited: %s" msgstr "laatst bewerkt: %s" -#: ../../include/conversation.php:697 ../../include/ItemObject.php:254 +#: ../../include/conversation.php:710 ../../include/ItemObject.php:254 #, php-format msgid "Expires: %s" msgstr "Verloopt: %s" -#: ../../include/conversation.php:712 +#: ../../include/conversation.php:725 msgid "View in context" msgstr "In context bekijken" -#: ../../include/conversation.php:714 ../../include/conversation.php:1135 +#: ../../include/conversation.php:727 ../../include/conversation.php:1148 #: ../../include/ItemObject.php:294 ../../mod/editblock.php:120 #: ../../mod/editlayout.php:115 ../../mod/editpost.php:121 #: ../../mod/editwebpage.php:152 ../../mod/photos.php:983 @@ -1752,39 +1755,39 @@ msgstr "In context bekijken" msgid "Please wait" msgstr "Even wachten" -#: ../../include/conversation.php:841 +#: ../../include/conversation.php:854 msgid "remove" msgstr "verwijderen" -#: ../../include/conversation.php:845 +#: ../../include/conversation.php:858 msgid "Loading..." msgstr "Aan het laden..." -#: ../../include/conversation.php:846 +#: ../../include/conversation.php:859 msgid "Delete Selected Items" msgstr "Verwijder de geselecteerde items" -#: ../../include/conversation.php:941 +#: ../../include/conversation.php:954 msgid "View Source" msgstr "Bron weergeven" -#: ../../include/conversation.php:942 +#: ../../include/conversation.php:955 msgid "Follow Thread" msgstr "Conversatie volgen" -#: ../../include/conversation.php:943 +#: ../../include/conversation.php:956 msgid "View Status" msgstr "Status weergeven" -#: ../../include/conversation.php:945 +#: ../../include/conversation.php:958 msgid "View Photos" msgstr "Foto's weergeven" -#: ../../include/conversation.php:946 +#: ../../include/conversation.php:959 msgid "Matrix Activity" -msgstr "Activiteit in de Matrix" +msgstr "Activiteit in de RedMatrix" -#: ../../include/conversation.php:947 ../../include/identity.php:706 +#: ../../include/conversation.php:960 ../../include/identity.php:706 #: ../../include/widgets.php:135 ../../include/widgets.php:175 #: ../../include/Contact.php:107 ../../mod/directory.php:183 #: ../../mod/dirprofile.php:164 ../../mod/suggest.php:51 @@ -1792,314 +1795,314 @@ msgstr "Activiteit in de Matrix" msgid "Connect" msgstr "Verbinden" -#: ../../include/conversation.php:948 +#: ../../include/conversation.php:961 msgid "Edit Contact" msgstr "Contact bewerken" -#: ../../include/conversation.php:949 +#: ../../include/conversation.php:962 msgid "Send PM" msgstr "Privébericht verzenden" -#: ../../include/conversation.php:1006 +#: ../../include/conversation.php:1019 #, php-format msgid "%s likes this." msgstr "%s vindt dit leuk." -#: ../../include/conversation.php:1006 +#: ../../include/conversation.php:1019 #, php-format msgid "%s doesn't like this." msgstr "%s vindt dit niet leuk." -#: ../../include/conversation.php:1010 +#: ../../include/conversation.php:1023 #, php-format msgid "%2$d people like this." msgid_plural "%2$d people like this." msgstr[0] "%2$d persoon vindt dit leuk." msgstr[1] "%2$d personen vinden dit leuk." -#: ../../include/conversation.php:1012 +#: ../../include/conversation.php:1025 #, php-format msgid "%2$d people don't like this." msgid_plural "%2$d people don't like this." msgstr[0] "%2$d persoon vindt dit niet leuk." msgstr[1] "%2$d personen vinden dit niet leuk." -#: ../../include/conversation.php:1018 +#: ../../include/conversation.php:1031 msgid "and" msgstr "en" -#: ../../include/conversation.php:1021 +#: ../../include/conversation.php:1034 #, php-format msgid ", and %d other people" msgid_plural ", and %d other people" msgstr[0] ", en %d ander persoon" msgstr[1] ", en %d andere personen" -#: ../../include/conversation.php:1022 +#: ../../include/conversation.php:1035 #, php-format msgid "%s like this." msgstr "%s vinden dit leuk." -#: ../../include/conversation.php:1022 +#: ../../include/conversation.php:1035 #, php-format msgid "%s don't like this." msgstr "%s vinden dit niet leuk." -#: ../../include/conversation.php:1079 +#: ../../include/conversation.php:1092 msgid "Visible to everybody" msgstr "Voor iedereen zichtbaar" -#: ../../include/conversation.php:1080 ../../mod/mail.php:167 +#: ../../include/conversation.php:1093 ../../mod/mail.php:167 #: ../../mod/mail.php:279 msgid "Please enter a link URL:" msgstr "Vul een internetadres/URL in:" -#: ../../include/conversation.php:1081 +#: ../../include/conversation.php:1094 msgid "Please enter a video link/URL:" msgstr "Vul een videolink/URL in:" -#: ../../include/conversation.php:1082 +#: ../../include/conversation.php:1095 msgid "Please enter an audio link/URL:" msgstr "Vul een audiolink/URL in:" -#: ../../include/conversation.php:1083 +#: ../../include/conversation.php:1096 msgid "Tag term:" msgstr "Label:" -#: ../../include/conversation.php:1084 ../../mod/filer.php:49 +#: ../../include/conversation.php:1097 ../../mod/filer.php:49 msgid "Save to Folder:" msgstr "Bewaar in map: " -#: ../../include/conversation.php:1085 +#: ../../include/conversation.php:1098 msgid "Where are you right now?" msgstr "Waar bevind je je op dit moment?" -#: ../../include/conversation.php:1086 ../../mod/editpost.php:52 +#: ../../include/conversation.php:1099 ../../mod/editpost.php:52 #: ../../mod/mail.php:168 ../../mod/mail.php:280 msgid "Expires YYYY-MM-DD HH:MM" msgstr "Verloopt op DD-MM-YYYY om HH:MM" -#: ../../include/conversation.php:1110 ../../mod/photos.php:982 -#: ../../mod/layouts.php:113 +#: ../../include/conversation.php:1123 ../../mod/photos.php:982 +#: ../../mod/layouts.php:122 msgid "Share" msgstr "Delen" -#: ../../include/conversation.php:1112 ../../mod/editwebpage.php:139 +#: ../../include/conversation.php:1125 ../../mod/editwebpage.php:139 msgid "Page link title" msgstr "Titel van paginalink" -#: ../../include/conversation.php:1115 +#: ../../include/conversation.php:1128 msgid "Post as" msgstr "Bericht plaatsen als" -#: ../../include/conversation.php:1116 ../../mod/editblock.php:112 +#: ../../include/conversation.php:1129 ../../mod/editblock.php:112 #: ../../mod/editlayout.php:107 ../../mod/editpost.php:113 #: ../../mod/editwebpage.php:144 ../../mod/mail.php:228 ../../mod/mail.php:342 msgid "Upload photo" msgstr "Foto uploaden" -#: ../../include/conversation.php:1117 +#: ../../include/conversation.php:1130 msgid "upload photo" msgstr "foto uploaden" -#: ../../include/conversation.php:1118 ../../mod/editblock.php:113 +#: ../../include/conversation.php:1131 ../../mod/editblock.php:113 #: ../../mod/editlayout.php:108 ../../mod/editpost.php:114 #: ../../mod/editwebpage.php:145 ../../mod/mail.php:229 ../../mod/mail.php:343 msgid "Attach file" msgstr "Bestand toevoegen" -#: ../../include/conversation.php:1119 +#: ../../include/conversation.php:1132 msgid "attach file" msgstr "bestand toevoegen" -#: ../../include/conversation.php:1120 ../../mod/editblock.php:114 +#: ../../include/conversation.php:1133 ../../mod/editblock.php:114 #: ../../mod/editlayout.php:109 ../../mod/editpost.php:115 #: ../../mod/editwebpage.php:146 ../../mod/mail.php:230 ../../mod/mail.php:344 msgid "Insert web link" msgstr "Weblink invoegen" -#: ../../include/conversation.php:1121 +#: ../../include/conversation.php:1134 msgid "web link" msgstr "Weblink" -#: ../../include/conversation.php:1122 +#: ../../include/conversation.php:1135 msgid "Insert video link" msgstr "Videolink invoegen" -#: ../../include/conversation.php:1123 +#: ../../include/conversation.php:1136 msgid "video link" msgstr "videolink" -#: ../../include/conversation.php:1124 +#: ../../include/conversation.php:1137 msgid "Insert audio link" msgstr "Audiolink invoegen" -#: ../../include/conversation.php:1125 +#: ../../include/conversation.php:1138 msgid "audio link" msgstr "audiolink" -#: ../../include/conversation.php:1126 ../../mod/editblock.php:118 +#: ../../include/conversation.php:1139 ../../mod/editblock.php:118 #: ../../mod/editlayout.php:113 ../../mod/editpost.php:119 #: ../../mod/editwebpage.php:150 msgid "Set your location" msgstr "Locatie instellen" -#: ../../include/conversation.php:1127 +#: ../../include/conversation.php:1140 msgid "set location" msgstr "locatie instellen" -#: ../../include/conversation.php:1128 ../../mod/editblock.php:119 +#: ../../include/conversation.php:1141 ../../mod/editblock.php:119 #: ../../mod/editlayout.php:114 ../../mod/editpost.php:120 #: ../../mod/editwebpage.php:151 msgid "Clear browser location" msgstr "Locatie van webbrowser wissen" -#: ../../include/conversation.php:1129 +#: ../../include/conversation.php:1142 msgid "clear location" msgstr "locatie wissen" -#: ../../include/conversation.php:1131 ../../mod/editblock.php:132 +#: ../../include/conversation.php:1144 ../../mod/editblock.php:132 #: ../../mod/editlayout.php:126 ../../mod/editpost.php:132 #: ../../mod/editwebpage.php:167 msgid "Set title" msgstr "Titel instellen" -#: ../../include/conversation.php:1134 ../../mod/editblock.php:135 +#: ../../include/conversation.php:1147 ../../mod/editblock.php:135 #: ../../mod/editlayout.php:129 ../../mod/editpost.php:134 #: ../../mod/editwebpage.php:169 msgid "Categories (comma-separated list)" msgstr "Categorieën (door komma's gescheiden lijst)" -#: ../../include/conversation.php:1136 ../../mod/editblock.php:121 +#: ../../include/conversation.php:1149 ../../mod/editblock.php:121 #: ../../mod/editlayout.php:116 ../../mod/editpost.php:122 #: ../../mod/editwebpage.php:153 msgid "Permission settings" msgstr "Privacy-rechten" -#: ../../include/conversation.php:1137 +#: ../../include/conversation.php:1150 msgid "permissions" msgstr "privacy-rechten" -#: ../../include/conversation.php:1144 ../../mod/editblock.php:129 +#: ../../include/conversation.php:1157 ../../mod/editblock.php:129 #: ../../mod/editlayout.php:123 ../../mod/editpost.php:129 #: ../../mod/editwebpage.php:162 msgid "Public post" msgstr "Openbaar bericht" -#: ../../include/conversation.php:1146 ../../mod/editblock.php:136 +#: ../../include/conversation.php:1159 ../../mod/editblock.php:136 #: ../../mod/editlayout.php:130 ../../mod/editpost.php:135 #: ../../mod/editwebpage.php:170 msgid "Example: bob@example.com, mary@example.com" msgstr "Voorbeeld: bob@voorbeeld.nl, mary@voorbeeld.be" -#: ../../include/conversation.php:1159 ../../mod/editblock.php:146 +#: ../../include/conversation.php:1172 ../../mod/editblock.php:146 #: ../../mod/editlayout.php:140 ../../mod/editpost.php:146 #: ../../mod/editwebpage.php:179 ../../mod/mail.php:235 ../../mod/mail.php:349 msgid "Set expiration date" msgstr "Verloopdatum instellen" -#: ../../include/conversation.php:1161 ../../include/ItemObject.php:595 +#: ../../include/conversation.php:1174 ../../include/ItemObject.php:595 #: ../../mod/editpost.php:148 ../../mod/mail.php:237 ../../mod/mail.php:351 msgid "Encrypt text" msgstr "Tekst versleutelen" -#: ../../include/conversation.php:1163 ../../mod/editpost.php:150 +#: ../../include/conversation.php:1176 ../../mod/editpost.php:150 msgid "OK" msgstr "OK" -#: ../../include/conversation.php:1164 ../../mod/settings.php:518 +#: ../../include/conversation.php:1177 ../../mod/settings.php:518 #: ../../mod/settings.php:544 ../../mod/editpost.php:151 #: ../../mod/fbrowser.php:82 ../../mod/fbrowser.php:117 ../../mod/tagrm.php:11 #: ../../mod/tagrm.php:94 msgid "Cancel" msgstr "Annuleren" -#: ../../include/conversation.php:1406 +#: ../../include/conversation.php:1419 msgid "Discover" msgstr "Ontdekken" -#: ../../include/conversation.php:1409 +#: ../../include/conversation.php:1422 msgid "Imported public streams" msgstr "Openbare streams importeren" -#: ../../include/conversation.php:1414 +#: ../../include/conversation.php:1427 msgid "Commented Order" msgstr "Nieuwe reacties bovenaan" -#: ../../include/conversation.php:1417 +#: ../../include/conversation.php:1430 msgid "Sort by Comment Date" msgstr "Berichten met nieuwe reacties bovenaan" -#: ../../include/conversation.php:1421 +#: ../../include/conversation.php:1434 msgid "Posted Order" msgstr "Nieuwe berichten bovenaan" -#: ../../include/conversation.php:1424 +#: ../../include/conversation.php:1437 msgid "Sort by Post Date" msgstr "Nieuwe berichten bovenaan" -#: ../../include/conversation.php:1429 ../../include/widgets.php:89 +#: ../../include/conversation.php:1442 ../../include/widgets.php:89 msgid "Personal" msgstr "Persoonlijk" -#: ../../include/conversation.php:1432 +#: ../../include/conversation.php:1445 msgid "Posts that mention or involve you" msgstr "Alleen berichten die jou vermelden of waar je op een andere manier bij betrokken bent" -#: ../../include/conversation.php:1438 ../../mod/connections.php:211 +#: ../../include/conversation.php:1451 ../../mod/connections.php:211 #: ../../mod/connections.php:224 ../../mod/menu.php:61 msgid "New" msgstr "Nieuw" -#: ../../include/conversation.php:1441 +#: ../../include/conversation.php:1454 msgid "Activity Stream - by date" msgstr "Activiteitenstroom - volgens datum" -#: ../../include/conversation.php:1447 +#: ../../include/conversation.php:1460 msgid "Starred" msgstr "Met ster" -#: ../../include/conversation.php:1450 +#: ../../include/conversation.php:1463 msgid "Favourite Posts" msgstr "Favoriete berichten" -#: ../../include/conversation.php:1457 +#: ../../include/conversation.php:1470 msgid "Spam" msgstr "Spam" -#: ../../include/conversation.php:1460 +#: ../../include/conversation.php:1473 msgid "Posts flagged as SPAM" msgstr "Berichten gemarkeerd als SPAM" -#: ../../include/conversation.php:1496 ../../mod/admin.php:861 +#: ../../include/conversation.php:1509 ../../mod/admin.php:864 msgid "Channel" msgstr "Kanaal" -#: ../../include/conversation.php:1499 +#: ../../include/conversation.php:1512 msgid "Status Messages and Posts" msgstr "Berichten in dit kanaal" -#: ../../include/conversation.php:1508 +#: ../../include/conversation.php:1521 msgid "About" msgstr "Over" -#: ../../include/conversation.php:1511 +#: ../../include/conversation.php:1524 msgid "Profile Details" msgstr "Profiel" -#: ../../include/conversation.php:1529 +#: ../../include/conversation.php:1542 msgid "Files and Storage" msgstr "Bestanden en opslagruimte" -#: ../../include/conversation.php:1538 ../../include/conversation.php:1541 +#: ../../include/conversation.php:1551 ../../include/conversation.php:1554 msgid "Chatrooms" msgstr "Chatkanalen" -#: ../../include/conversation.php:1551 +#: ../../include/conversation.php:1564 msgid "Saved Bookmarks" msgstr "Opgeslagen bladwijzers" -#: ../../include/conversation.php:1562 +#: ../../include/conversation.php:1575 msgid "Manage Webpages" msgstr "Webpagina's beheren" @@ -2361,15 +2364,15 @@ msgstr "Antwoord van het kanaal op afstand was niet volledig." msgid "Channel was deleted and no longer exists." msgstr "Kanaal is verwijderd en bestaat niet meer." -#: ../../include/follow.php:132 +#: ../../include/follow.php:143 msgid "Channel discovery failed." msgstr "Kanaal ontdekken mislukt." -#: ../../include/follow.php:149 +#: ../../include/follow.php:160 msgid "local account not found." msgstr "lokale account niet gevonden." -#: ../../include/follow.php:158 +#: ../../include/follow.php:169 msgid "Cannot connect to yourself." msgstr "Kan niet met jezelf verbinden" @@ -2393,71 +2396,75 @@ msgstr "Chatkanaal niet gevonden" msgid "Room is full" msgstr "Chatkanaal is vol" -#: ../../include/items.php:295 ../../mod/profperm.php:23 +#: ../../include/items.php:315 ../../mod/profperm.php:23 #: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/like.php:242 #: ../../index.php:360 msgid "Permission denied" msgstr "Toegang geweigerd" -#: ../../include/items.php:830 +#: ../../include/items.php:858 msgid "(Unknown)" msgstr "(Onbekend)" -#: ../../include/items.php:959 +#: ../../include/items.php:990 msgid "Visible to anybody on the internet." msgstr "Voor iedereen op het internet zichtbaar." -#: ../../include/items.php:961 +#: ../../include/items.php:992 msgid "Visible to you only." msgstr "Alleen voor jou zichtbaar." -#: ../../include/items.php:963 +#: ../../include/items.php:994 msgid "Visible to anybody in this network." msgstr "Voor iedereen in dit netwerk zichtbaar." -#: ../../include/items.php:965 +#: ../../include/items.php:996 msgid "Visible to anybody authenticated." msgstr "Voor iedereen die geauthenticeerd is zichtbaar." -#: ../../include/items.php:967 +#: ../../include/items.php:998 #, php-format msgid "Visible to anybody on %s." msgstr "Voor iedereen op %s zichtbaar." -#: ../../include/items.php:969 +#: ../../include/items.php:1000 msgid "Visible to all connections." msgstr "Voor alle connecties zichtbaar." -#: ../../include/items.php:971 +#: ../../include/items.php:1002 msgid "Visible to approved connections." msgstr "Voor alle goedgekeurde connecties zichtbaar." -#: ../../include/items.php:3573 ../../mod/home.php:67 ../../mod/display.php:32 +#: ../../include/items.php:1004 +msgid "Visible to specific connections." +msgstr "Voor specifieke connecties zichtbaar." + +#: ../../include/items.php:3630 ../../mod/home.php:67 ../../mod/display.php:32 #: ../../mod/filestorage.php:18 ../../mod/admin.php:168 -#: ../../mod/admin.php:892 ../../mod/admin.php:1095 ../../mod/thing.php:78 +#: ../../mod/admin.php:895 ../../mod/admin.php:1098 ../../mod/thing.php:78 #: ../../mod/viewsrc.php:18 msgid "Item not found." msgstr "Item niet gevonden." -#: ../../include/items.php:4006 ../../mod/group.php:38 ../../mod/group.php:140 +#: ../../include/items.php:4063 ../../mod/group.php:38 ../../mod/group.php:140 msgid "Collection not found." msgstr "Collectie niet gevonden." -#: ../../include/items.php:4021 +#: ../../include/items.php:4078 msgid "Collection is empty." msgstr "Collectie is leeg" -#: ../../include/items.php:4028 +#: ../../include/items.php:4085 #, php-format msgid "Collection: %s" msgstr "Collectie: %s" -#: ../../include/items.php:4039 +#: ../../include/items.php:4096 #, php-format msgid "Connection: %s" msgstr "Connectie: %s" -#: ../../include/items.php:4042 +#: ../../include/items.php:4099 msgid "Connection not found." msgstr "Connectie niet gevonden." @@ -2472,7 +2479,7 @@ msgstr "Een verwijderde collectie met deze naam is gereactiveerd. Bestaande item msgid "Default privacy group for new contacts" msgstr "Standaard privacy-collectie voor nieuwe kanalen" -#: ../../include/group.php:253 ../../mod/admin.php:732 +#: ../../include/group.php:253 ../../mod/admin.php:735 msgid "All Channels" msgstr "Alle kanalen" @@ -2553,7 +2560,7 @@ msgstr "Opgevraagd kanaal is niet beschikbaar." msgid "Requested profile is not available." msgstr "Opgevraagd profiel is niet beschikbaar" -#: ../../include/identity.php:720 ../../mod/profiles.php:714 +#: ../../include/identity.php:720 ../../mod/profiles.php:750 msgid "Change profile photo" msgstr "Profielfoto veranderen" @@ -2565,11 +2572,11 @@ msgstr "Profielen" msgid "Manage/edit profiles" msgstr "Profielen beheren/bewerken" -#: ../../include/identity.php:727 ../../mod/profiles.php:715 +#: ../../include/identity.php:727 ../../mod/profiles.php:751 msgid "Create New Profile" msgstr "Nieuw profiel aanmaken" -#: ../../include/identity.php:741 ../../mod/profiles.php:726 +#: ../../include/identity.php:741 ../../mod/profiles.php:762 msgid "Profile Image" msgstr "Profielfoto" @@ -2577,8 +2584,8 @@ msgstr "Profielfoto" msgid "visible to everybody" msgstr "Voor iedereen zichtbaar" -#: ../../include/identity.php:745 ../../mod/profiles.php:609 -#: ../../mod/profiles.php:730 +#: ../../include/identity.php:745 ../../mod/profiles.php:645 +#: ../../mod/profiles.php:766 msgid "Edit visibility" msgstr "Zichtbaarheid bewerken" @@ -2664,11 +2671,11 @@ msgstr "Leeftijd:" msgid "for %1$d %2$s" msgstr "voor %1$d %2$s" -#: ../../include/identity.php:1054 ../../mod/profiles.php:631 +#: ../../include/identity.php:1054 ../../mod/profiles.php:667 msgid "Sexual Preference:" msgstr "Seksuele voorkeur:" -#: ../../include/identity.php:1058 ../../mod/profiles.php:633 +#: ../../include/identity.php:1058 ../../mod/profiles.php:669 msgid "Hometown:" msgstr "Oorspronkelijk uit:" @@ -2676,7 +2683,7 @@ msgstr "Oorspronkelijk uit:" msgid "Tags:" msgstr "Trefwoorden:" -#: ../../include/identity.php:1062 ../../mod/profiles.php:634 +#: ../../include/identity.php:1062 ../../mod/profiles.php:670 msgid "Political Views:" msgstr "Politieke overtuigingen:" @@ -2692,11 +2699,11 @@ msgstr "Over:" msgid "Hobbies/Interests:" msgstr "Hobby's/interesses:" -#: ../../include/identity.php:1070 ../../mod/profiles.php:637 +#: ../../include/identity.php:1070 ../../mod/profiles.php:673 msgid "Likes:" msgstr "Houdt van:" -#: ../../include/identity.php:1072 ../../mod/profiles.php:638 +#: ../../include/identity.php:1072 ../../mod/profiles.php:674 msgid "Dislikes:" msgstr "Houdt niet van:" @@ -2740,10 +2747,6 @@ msgstr "School/opleiding:" msgid "Like this thing" msgstr "Vind dit ding leuk" -#: ../../include/network.php:557 -msgid "view full size" -msgstr "volledige grootte tonen" - #: ../../include/bbcode.php:112 ../../include/bbcode.php:645 #: ../../include/bbcode.php:648 ../../include/bbcode.php:653 #: ../../include/bbcode.php:656 ../../include/bbcode.php:659 @@ -3039,17 +3042,17 @@ msgstr "Reactie" #: ../../mod/settings.php:517 ../../mod/settings.php:629 #: ../../mod/settings.php:658 ../../mod/settings.php:682 #: ../../mod/settings.php:755 ../../mod/settings.php:935 -#: ../../mod/poke.php:166 ../../mod/profiles.php:607 ../../mod/chat.php:177 +#: ../../mod/poke.php:166 ../../mod/profiles.php:643 ../../mod/chat.php:177 #: ../../mod/chat.php:211 ../../mod/connect.php:92 ../../mod/connedit.php:518 #: ../../mod/setup.php:307 ../../mod/setup.php:350 ../../mod/pdledit.php:58 #: ../../mod/photos.php:563 ../../mod/photos.php:674 ../../mod/photos.php:962 #: ../../mod/photos.php:1002 ../../mod/photos.php:1089 #: ../../mod/sources.php:104 ../../mod/sources.php:138 #: ../../mod/events.php:511 ../../mod/filestorage.php:137 -#: ../../mod/fsuggest.php:108 ../../mod/group.php:81 ../../mod/admin.php:411 -#: ../../mod/admin.php:720 ../../mod/admin.php:855 ../../mod/admin.php:988 -#: ../../mod/admin.php:1187 ../../mod/admin.php:1274 ../../mod/thing.php:286 -#: ../../mod/thing.php:329 ../../mod/import.php:393 ../../mod/invite.php:142 +#: ../../mod/fsuggest.php:108 ../../mod/group.php:81 ../../mod/admin.php:413 +#: ../../mod/admin.php:723 ../../mod/admin.php:858 ../../mod/admin.php:991 +#: ../../mod/admin.php:1190 ../../mod/admin.php:1277 ../../mod/thing.php:286 +#: ../../mod/thing.php:329 ../../mod/import.php:394 ../../mod/invite.php:142 #: ../../mod/mail.php:345 ../../mod/appman.php:99 ../../mod/poll.php:68 #: ../../view/theme/apw/php/config.php:256 #: ../../view/theme/blogga/php/config.php:67 @@ -3215,7 +3218,7 @@ msgstr "Nieuw venster" msgid "Open the selected location in a different window or browser tab" msgstr "Open de geselecteerde locatie in een ander venster of tab" -#: ../../include/Contact.php:211 ../../mod/admin.php:646 +#: ../../include/Contact.php:211 ../../mod/admin.php:649 #, php-format msgid "User '%s' deleted" msgstr "Account '%s' verwijderd" @@ -3860,7 +3863,7 @@ msgstr "Extra functies" msgid "Connector Settings" msgstr "Instellingen externe koppelingen" -#: ../../mod/settings.php:711 ../../mod/admin.php:359 +#: ../../mod/settings.php:711 ../../mod/admin.php:361 msgid "No special theme for mobile devices" msgstr "Geen speciaal thema voor mobiele apparaten" @@ -3946,14 +3949,14 @@ msgid "Publish your default profile in the network directory" msgstr "Publiceer je standaardprofiel in de kanalengids" #: ../../mod/settings.php:885 ../../mod/settings.php:890 -#: ../../mod/settings.php:961 ../../mod/api.php:106 ../../mod/profiles.php:566 -#: ../../mod/admin.php:389 +#: ../../mod/settings.php:961 ../../mod/api.php:106 ../../mod/profiles.php:602 +#: ../../mod/admin.php:391 msgid "No" msgstr "Nee" #: ../../mod/settings.php:885 ../../mod/settings.php:890 -#: ../../mod/settings.php:961 ../../mod/api.php:105 ../../mod/profiles.php:565 -#: ../../mod/admin.php:391 +#: ../../mod/settings.php:961 ../../mod/api.php:105 ../../mod/profiles.php:601 +#: ../../mod/admin.php:393 msgid "Yes" msgstr "Ja" @@ -4305,12 +4308,12 @@ msgstr "Uploaden afbeelding mislukt" msgid "Image size reduction [%s] failed." msgstr "Verkleinen [%s] van afbeelding mislukt." -#: ../../mod/blocks.php:66 +#: ../../mod/blocks.php:62 msgid "Block Name" msgstr "Bloknaam" #: ../../mod/profiles.php:18 ../../mod/profiles.php:165 -#: ../../mod/profiles.php:222 ../../mod/profiles.php:539 +#: ../../mod/profiles.php:222 ../../mod/profiles.php:575 msgid "Profile not found." msgstr "Profiel niet gevonden." @@ -4338,237 +4341,237 @@ msgstr "Geen profiel beschikbaar om te exporteren" msgid "Profile Name is required." msgstr "Profielnaam is vereist" -#: ../../mod/profiles.php:354 +#: ../../mod/profiles.php:390 msgid "Marital Status" msgstr "Huwelijke status" -#: ../../mod/profiles.php:358 +#: ../../mod/profiles.php:394 msgid "Romantic Partner" msgstr "Romantische partner" -#: ../../mod/profiles.php:362 +#: ../../mod/profiles.php:398 msgid "Likes" msgstr "Houdt van" -#: ../../mod/profiles.php:366 +#: ../../mod/profiles.php:402 msgid "Dislikes" msgstr "Houdt niet van" -#: ../../mod/profiles.php:370 +#: ../../mod/profiles.php:406 msgid "Work/Employment" msgstr "Werk/arbeid" -#: ../../mod/profiles.php:373 +#: ../../mod/profiles.php:409 msgid "Religion" msgstr "Religie" -#: ../../mod/profiles.php:377 +#: ../../mod/profiles.php:413 msgid "Political Views" msgstr "Politieke overtuigingen" -#: ../../mod/profiles.php:381 +#: ../../mod/profiles.php:417 msgid "Gender" msgstr "Geslacht" -#: ../../mod/profiles.php:385 +#: ../../mod/profiles.php:421 msgid "Sexual Preference" msgstr "Seksuele voorkeur" -#: ../../mod/profiles.php:389 +#: ../../mod/profiles.php:425 msgid "Homepage" msgstr "Homepage" -#: ../../mod/profiles.php:393 +#: ../../mod/profiles.php:429 msgid "Interests" msgstr "Interesses" -#: ../../mod/profiles.php:397 ../../mod/admin.php:862 +#: ../../mod/profiles.php:433 ../../mod/admin.php:865 msgid "Address" msgstr "Kanaaladres" -#: ../../mod/profiles.php:404 ../../mod/pubsites.php:25 +#: ../../mod/profiles.php:440 ../../mod/pubsites.php:25 msgid "Location" msgstr "Locatie" -#: ../../mod/profiles.php:487 +#: ../../mod/profiles.php:523 msgid "Profile updated." msgstr "Profiel bijgewerkt" -#: ../../mod/profiles.php:564 +#: ../../mod/profiles.php:600 msgid "Hide your contact/friend list from viewers of this profile?" msgstr "Laat de lijst met connecties niet aan bezoekers van dit profiel zien." -#: ../../mod/profiles.php:606 +#: ../../mod/profiles.php:642 msgid "Edit Profile Details" msgstr "Profiel bewerken" -#: ../../mod/profiles.php:608 +#: ../../mod/profiles.php:644 msgid "View this profile" msgstr "Profiel weergeven" -#: ../../mod/profiles.php:610 +#: ../../mod/profiles.php:646 msgid "Change Profile Photo" msgstr "Profielfoto wijzigen" -#: ../../mod/profiles.php:611 +#: ../../mod/profiles.php:647 msgid "Create a new profile using these settings" msgstr "Een nieuw profiel aanmaken met dit profiel als basis" -#: ../../mod/profiles.php:612 +#: ../../mod/profiles.php:648 msgid "Clone this profile" msgstr "Dit profiel klonen" -#: ../../mod/profiles.php:613 +#: ../../mod/profiles.php:649 msgid "Delete this profile" msgstr "Dit profiel verwijderen" -#: ../../mod/profiles.php:615 +#: ../../mod/profiles.php:651 msgid "Import profile from file" msgstr "Profiel vanuit bestand importeren" -#: ../../mod/profiles.php:616 +#: ../../mod/profiles.php:652 msgid "Export profile to file" msgstr "Profiel naar bestand exporteren" -#: ../../mod/profiles.php:617 +#: ../../mod/profiles.php:653 msgid "Profile Name:" msgstr "Profielnaam:" -#: ../../mod/profiles.php:618 +#: ../../mod/profiles.php:654 msgid "Your Full Name:" msgstr "Jouw volledige naam:" -#: ../../mod/profiles.php:619 +#: ../../mod/profiles.php:655 msgid "Title/Description:" msgstr "Titel/omschrijving:" -#: ../../mod/profiles.php:620 +#: ../../mod/profiles.php:656 msgid "Your Gender:" msgstr "Jouw geslacht" -#: ../../mod/profiles.php:621 +#: ../../mod/profiles.php:657 #, php-format msgid "Birthday (%s):" msgstr "Geboortedag (%s)" -#: ../../mod/profiles.php:622 +#: ../../mod/profiles.php:658 msgid "Street Address:" msgstr "Straat en huisnummer:" -#: ../../mod/profiles.php:623 +#: ../../mod/profiles.php:659 msgid "Locality/City:" msgstr "Woonplaats:" -#: ../../mod/profiles.php:624 +#: ../../mod/profiles.php:660 msgid "Postal/Zip Code:" msgstr "Postcode:" -#: ../../mod/profiles.php:625 +#: ../../mod/profiles.php:661 msgid "Country:" msgstr "Land:" -#: ../../mod/profiles.php:626 +#: ../../mod/profiles.php:662 msgid "Region/State:" msgstr "Provincie/gewest/deelstaat:" -#: ../../mod/profiles.php:627 +#: ../../mod/profiles.php:663 msgid " Marital Status:" msgstr " Huwelijkse staat:" -#: ../../mod/profiles.php:628 +#: ../../mod/profiles.php:664 msgid "Who: (if applicable)" msgstr "Wie (wanneer toepasselijk):" -#: ../../mod/profiles.php:629 +#: ../../mod/profiles.php:665 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "Voorbeelden: karin123, Karin Jansen, cathy@voorbeeld.nl" -#: ../../mod/profiles.php:630 +#: ../../mod/profiles.php:666 msgid "Since [date]:" msgstr "Sinds [datum]:" -#: ../../mod/profiles.php:632 +#: ../../mod/profiles.php:668 msgid "Homepage URL:" msgstr "Adres homepage:" -#: ../../mod/profiles.php:635 +#: ../../mod/profiles.php:671 msgid "Religious Views:" msgstr "Religieuze overtuigingen" -#: ../../mod/profiles.php:636 +#: ../../mod/profiles.php:672 msgid "Keywords:" msgstr "Trefwoorden" -#: ../../mod/profiles.php:639 +#: ../../mod/profiles.php:675 msgid "Example: fishing photography software" msgstr "Voorbeeld: muziek, fotografie, software" -#: ../../mod/profiles.php:640 +#: ../../mod/profiles.php:676 msgid "Used in directory listings" msgstr "Wordt in de kanalengids gebruikt" -#: ../../mod/profiles.php:641 +#: ../../mod/profiles.php:677 msgid "Tell us about yourself..." msgstr "Vertel ons iets over jezelf..." -#: ../../mod/profiles.php:642 +#: ../../mod/profiles.php:678 msgid "Hobbies/Interests" msgstr "Hobby's/interesses" -#: ../../mod/profiles.php:643 +#: ../../mod/profiles.php:679 msgid "Contact information and Social Networks" msgstr "Contactinformatie en sociale netwerken" -#: ../../mod/profiles.php:644 +#: ../../mod/profiles.php:680 msgid "My other channels" msgstr "Mijn andere kanalen" -#: ../../mod/profiles.php:645 +#: ../../mod/profiles.php:681 msgid "Musical interests" msgstr "Muzikale interesses" -#: ../../mod/profiles.php:646 +#: ../../mod/profiles.php:682 msgid "Books, literature" msgstr "Boeken/literatuur" -#: ../../mod/profiles.php:647 +#: ../../mod/profiles.php:683 msgid "Television" msgstr "Televisie" -#: ../../mod/profiles.php:648 +#: ../../mod/profiles.php:684 msgid "Film/dance/culture/entertainment" msgstr "Film/dans/cultuur/entertainment" -#: ../../mod/profiles.php:649 +#: ../../mod/profiles.php:685 msgid "Love/romance" msgstr "Liefde/romantiek" -#: ../../mod/profiles.php:650 +#: ../../mod/profiles.php:686 msgid "Work/employment" msgstr "Werk/arbeid" -#: ../../mod/profiles.php:651 +#: ../../mod/profiles.php:687 msgid "School/education" msgstr "School/onderwijs" -#: ../../mod/profiles.php:657 +#: ../../mod/profiles.php:693 msgid "This is your default profile." msgstr "Dit is jouw standaardprofiel" -#: ../../mod/profiles.php:668 ../../mod/directory.php:143 +#: ../../mod/profiles.php:704 ../../mod/directory.php:143 #: ../../mod/dirprofile.php:92 msgid "Age: " msgstr "Leeftijd:" -#: ../../mod/profiles.php:711 +#: ../../mod/profiles.php:747 msgid "Edit/Manage Profiles" msgstr "Profielen bewerken/beheren" -#: ../../mod/profiles.php:712 +#: ../../mod/profiles.php:748 msgid "Add profile things" msgstr "Dingen aan je profiel toevoegen" -#: ../../mod/profiles.php:713 +#: ../../mod/profiles.php:749 msgid "Include desirable objects in your profile" msgstr "Voeg door jou gewenste dingen aan jouw profiel toe" @@ -4749,7 +4752,7 @@ msgstr "Ik accepteer de %s van deze RedMatrix-hub" msgid "I am over 13 years of age and accept the %s for this website" msgstr "Ik accepteer de %s van deze RedMatrix-hub" -#: ../../mod/register.php:204 ../../mod/admin.php:412 +#: ../../mod/register.php:204 ../../mod/admin.php:414 msgid "Registration" msgstr "Registratie" @@ -5109,12 +5112,12 @@ msgid "View recent posts and comments" msgstr "Recente berichten en reacties weergeven" #: ../../mod/connedit.php:414 ../../mod/connedit.php:557 -#: ../../mod/admin.php:729 +#: ../../mod/admin.php:732 msgid "Unblock" msgstr "Deblokkeren" #: ../../mod/connedit.php:414 ../../mod/connedit.php:557 -#: ../../mod/admin.php:728 +#: ../../mod/admin.php:731 msgid "Block" msgstr "Blokkeren" @@ -5391,7 +5394,7 @@ msgstr "Geslacht:" msgid "Finding:" msgstr "Gezocht naar:" -#: ../../mod/directory.php:239 +#: ../../mod/directory.php:244 msgid "No entries (some entries may be hidden)." msgstr "Niets gevonden (sommige kanalen kunnen verborgen zijn)." @@ -6357,7 +6360,7 @@ msgstr "Kies een label om te verwijderen" msgid "Theme settings updated." msgstr "Thema-instellingen bijgewerkt." -#: ../../mod/admin.php:97 ../../mod/admin.php:410 +#: ../../mod/admin.php:97 ../../mod/admin.php:412 msgid "Site" msgstr "Hub-instellingen" @@ -6365,19 +6368,19 @@ msgstr "Hub-instellingen" msgid "Accounts" msgstr "Accounts" -#: ../../mod/admin.php:99 ../../mod/admin.php:854 +#: ../../mod/admin.php:99 ../../mod/admin.php:857 msgid "Channels" msgstr "Kanalen" -#: ../../mod/admin.php:100 ../../mod/admin.php:945 ../../mod/admin.php:987 +#: ../../mod/admin.php:100 ../../mod/admin.php:948 ../../mod/admin.php:990 msgid "Plugins" msgstr "Plug-ins" -#: ../../mod/admin.php:101 ../../mod/admin.php:1150 ../../mod/admin.php:1186 +#: ../../mod/admin.php:101 ../../mod/admin.php:1153 ../../mod/admin.php:1189 msgid "Themes" msgstr "Thema's" -#: ../../mod/admin.php:102 ../../mod/admin.php:510 +#: ../../mod/admin.php:102 ../../mod/admin.php:513 msgid "Server" msgstr "Hubbeheer" @@ -6389,7 +6392,7 @@ msgstr "Profielconfiguratie" msgid "DB updates" msgstr "Database-updates" -#: ../../mod/admin.php:118 ../../mod/admin.php:125 ../../mod/admin.php:1273 +#: ../../mod/admin.php:118 ../../mod/admin.php:125 ../../mod/admin.php:1276 msgid "Logs" msgstr "Logboeken" @@ -6405,10 +6408,10 @@ msgstr "Accountregistraties die op goedkeuring wachten" msgid "Message queues" msgstr "Berichtenwachtrij" -#: ../../mod/admin.php:211 ../../mod/admin.php:409 ../../mod/admin.php:509 -#: ../../mod/admin.php:718 ../../mod/admin.php:853 ../../mod/admin.php:944 -#: ../../mod/admin.php:986 ../../mod/admin.php:1149 ../../mod/admin.php:1185 -#: ../../mod/admin.php:1272 +#: ../../mod/admin.php:211 ../../mod/admin.php:411 ../../mod/admin.php:512 +#: ../../mod/admin.php:721 ../../mod/admin.php:856 ../../mod/admin.php:947 +#: ../../mod/admin.php:989 ../../mod/admin.php:1152 ../../mod/admin.php:1188 +#: ../../mod/admin.php:1275 msgid "Administration" msgstr "Beheer" @@ -6420,7 +6423,7 @@ msgstr "Samenvatting" msgid "Registered users" msgstr "Geregistreerde gebruikers" -#: ../../mod/admin.php:216 ../../mod/admin.php:513 +#: ../../mod/admin.php:216 ../../mod/admin.php:516 msgid "Pending registrations" msgstr "Accounts die op goedkeuring wachten" @@ -6428,526 +6431,574 @@ msgstr "Accounts die op goedkeuring wachten" msgid "Version" msgstr "Versie" -#: ../../mod/admin.php:219 ../../mod/admin.php:514 +#: ../../mod/admin.php:219 ../../mod/admin.php:517 msgid "Active plugins" msgstr "Ingeschakelde plug-ins" -#: ../../mod/admin.php:330 +#: ../../mod/admin.php:332 msgid "Site settings updated." msgstr "Hub-instellingen bijgewerkt." -#: ../../mod/admin.php:361 +#: ../../mod/admin.php:363 msgid "No special theme for accessibility" msgstr "Geen speciaal thema voor universele toegang" -#: ../../mod/admin.php:390 +#: ../../mod/admin.php:392 msgid "Yes - with approval" msgstr "Ja - met goedkeuring" -#: ../../mod/admin.php:396 +#: ../../mod/admin.php:398 msgid "My site is not a public server" msgstr "Mijn RedMatrix-hub is niet openbaar" -#: ../../mod/admin.php:397 +#: ../../mod/admin.php:399 msgid "My site has paid access only" msgstr "Mijn RedMatrix-hub kent alleen betaalde toegang" -#: ../../mod/admin.php:398 +#: ../../mod/admin.php:400 msgid "My site has free access only" msgstr "Mijn RedMatrix-hub kent alleen gratis toegang" -#: ../../mod/admin.php:399 +#: ../../mod/admin.php:401 msgid "My site offers free accounts with optional paid upgrades" msgstr "Mijn RedMatrix-hub biedt gratis accounts aan met betaalde uitbreidingen als optie" -#: ../../mod/admin.php:413 +#: ../../mod/admin.php:415 msgid "File upload" msgstr "Bestand uploaden" -#: ../../mod/admin.php:414 +#: ../../mod/admin.php:416 msgid "Policies" msgstr "Beleid" -#: ../../mod/admin.php:419 +#: ../../mod/admin.php:421 msgid "Site name" msgstr "Naam van deze RedMatrix-hub" -#: ../../mod/admin.php:420 +#: ../../mod/admin.php:422 msgid "Banner/Logo" msgstr "Banner/logo" -#: ../../mod/admin.php:421 +#: ../../mod/admin.php:423 msgid "Administrator Information" msgstr "Informatie over de beheerder van deze hub" -#: ../../mod/admin.php:421 +#: ../../mod/admin.php:423 msgid "" "Contact information for site administrators. Displayed on siteinfo page. " "BBCode can be used here" msgstr "Contactinformatie voor hub-beheerders. Getoond op pagina met hub-informatie. Er kan hier bbcode gebruikt worden." -#: ../../mod/admin.php:422 +#: ../../mod/admin.php:424 msgid "System language" msgstr "Standaardtaal" -#: ../../mod/admin.php:423 +#: ../../mod/admin.php:425 msgid "System theme" msgstr "Standaardthema" -#: ../../mod/admin.php:423 +#: ../../mod/admin.php:425 msgid "" "Default system theme - may be over-ridden by user profiles - change theme settings" msgstr "Standaardthema voor RedMatrix-hub (kan door gebruiker veranderd worden) - verander thema-instellingen" -#: ../../mod/admin.php:424 +#: ../../mod/admin.php:426 msgid "Mobile system theme" msgstr "Standaardthema voor mobiel" -#: ../../mod/admin.php:424 +#: ../../mod/admin.php:426 msgid "Theme for mobile devices" msgstr "Thema voor mobiele apparaten" -#: ../../mod/admin.php:425 +#: ../../mod/admin.php:427 msgid "Accessibility system theme" msgstr "Standaardthema voor universele toegang" -#: ../../mod/admin.php:425 +#: ../../mod/admin.php:427 msgid "Accessibility theme" msgstr "Thema voor universele toegang" -#: ../../mod/admin.php:426 +#: ../../mod/admin.php:428 msgid "Channel to use for this website's static pages" msgstr "Kanaal die op deze hub als statische pagina op de homepage gebruikt moet worden" -#: ../../mod/admin.php:426 +#: ../../mod/admin.php:428 msgid "Site Channel" msgstr "Kanaal op deze RedMatrix-hub" -#: ../../mod/admin.php:427 +#: ../../mod/admin.php:429 +msgid "Enable Diaspora Protocol" +msgstr "Diaspora-protocol inschakkelen" + +#: ../../mod/admin.php:429 +msgid "Communicate with Diaspora and Friendica - experimental" +msgstr "Communiceer met Diaspora en Friendica (experimenteel)" + +#: ../../mod/admin.php:430 msgid "Allow Feeds as Connections" msgstr "Sta feeds toe als connecties" -#: ../../mod/admin.php:427 +#: ../../mod/admin.php:430 msgid "(Heavy system resource usage)" msgstr "(sterk negatieve invloed op systeembronnen hub)" -#: ../../mod/admin.php:428 +#: ../../mod/admin.php:431 msgid "Maximum image size" msgstr "Maximale grootte van afbeeldingen" -#: ../../mod/admin.php:428 +#: ../../mod/admin.php:431 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "Maximale grootte in bytes voor afbeeldingen die worden geüpload. Standaard is 0, wat geen limiet betekend." -#: ../../mod/admin.php:429 +#: ../../mod/admin.php:432 msgid "Does this site allow new member registration?" msgstr "Staat deze hub registratie van nieuwe accounts toe?" -#: ../../mod/admin.php:430 +#: ../../mod/admin.php:433 msgid "Which best describes the types of account offered by this hub?" msgstr "Wat voor soort accounts biedt deze RedMatrix-hub aan? Kies wat het meest in de buurt komt." -#: ../../mod/admin.php:431 +#: ../../mod/admin.php:434 msgid "Register text" msgstr "Registratietekst" -#: ../../mod/admin.php:431 +#: ../../mod/admin.php:434 msgid "Will be displayed prominently on the registration page." msgstr "Wordt prominent op de registratiepagina getoond." -#: ../../mod/admin.php:432 +#: ../../mod/admin.php:435 msgid "Accounts abandoned after x days" msgstr "Accounts als verlaten beschouwen na zoveel aantal dagen:" -#: ../../mod/admin.php:432 +#: ../../mod/admin.php:435 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "Zal geen systeembronnen verspillen door polling van externe hubs voor verlaten accounts. Vul 0 in voor geen tijdslimiet." -#: ../../mod/admin.php:433 +#: ../../mod/admin.php:436 msgid "Allowed friend domains" msgstr "Toegestane domeinen" -#: ../../mod/admin.php:433 +#: ../../mod/admin.php:436 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "Komma-gescheiden lijst van domeinen waarvan kanalen connecties kunnen aangaan met kanalen op deze RedMatrix-hub. Wildcards zijn toegestaan.\nLaat leeg om alle domeinen toe te laten." -#: ../../mod/admin.php:434 +#: ../../mod/admin.php:437 msgid "Allowed email domains" msgstr "Toegestane e-maildomeinen" -#: ../../mod/admin.php:434 +#: ../../mod/admin.php:437 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 "Door komma's gescheiden lijst met e-maildomeinen die op deze hub mogen registeren. Wildcards zijn toegestaan.\nLaat leeg om alle domeinen toe te laten." -#: ../../mod/admin.php:435 +#: ../../mod/admin.php:438 msgid "Block public" msgstr "Openbare toegang blokkeren" -#: ../../mod/admin.php:435 +#: ../../mod/admin.php:438 msgid "" "Check to block public access to all otherwise public personal pages on this " "site unless you are currently logged in." msgstr "Vink dit aan om alle normaliter openbare persoonlijke pagina's op deze hub alleen toegankelijk te maken voor ingelogde gebruikers." -#: ../../mod/admin.php:436 +#: ../../mod/admin.php:439 msgid "Force publish" msgstr "Dwing kanaalvermelding af" -#: ../../mod/admin.php:436 +#: ../../mod/admin.php:439 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "Vink dit aan om af te dwingen dat alle kanalen op deze hub in de kanalengids worden vermeld." -#: ../../mod/admin.php:437 +#: ../../mod/admin.php:440 msgid "Disable discovery tab" msgstr "Ontdekkingstab" -#: ../../mod/admin.php:437 +#: ../../mod/admin.php:440 msgid "" "Remove the tab in the network view with public content pulled from sources " "chosen for this site." msgstr "Verwijder de tab in de matrix-weergave waarin zich een selectie aan openbare berichten bevindt, die automatisch voor deze hub zijn uitgekozen." -#: ../../mod/admin.php:438 +#: ../../mod/admin.php:441 msgid "No login on Homepage" msgstr "Geen inlogformulier op de homepage" -#: ../../mod/admin.php:438 +#: ../../mod/admin.php:441 msgid "" "Check to hide the login form from your sites homepage when visitors arrive " "who are not logged in (e.g. when you put the content of the homepage in via " "the site channel)." msgstr "Vink dit aan om het inlogformulier op de homepage van deze hub, die niet-ingelogde gebruikers te zien krijgen, te verbergen. (bijvoorbeeld wanneer je een kanaal op deze RedMatrix-hub als homepage gebruikt)" -#: ../../mod/admin.php:440 +#: ../../mod/admin.php:443 msgid "Proxy user" msgstr "Proxy-gebruiker" -#: ../../mod/admin.php:441 +#: ../../mod/admin.php:444 msgid "Proxy URL" msgstr "Proxy-URL" -#: ../../mod/admin.php:442 +#: ../../mod/admin.php:445 msgid "Network timeout" msgstr "Netwerktimeout" -#: ../../mod/admin.php:442 +#: ../../mod/admin.php:445 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "Waarde is in seconden. Zet op 0 voor onbeperkt (niet aanbevolen)" -#: ../../mod/admin.php:443 +#: ../../mod/admin.php:446 msgid "Delivery interval" msgstr "Afleveringsinterval" -#: ../../mod/admin.php:443 +#: ../../mod/admin.php:446 msgid "" "Delay background delivery processes by this many seconds to reduce system " "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " "for large dedicated servers." msgstr "Vertraag de achtergrondprocessen voor het afleveren met een aantal seconden om de systeembelasting te verminderen. Aanbevolen: 4-5 voor shared hosts, 2-3 voor virtual private servers (VPS) en 0-1 voor grote dedicated servers." -#: ../../mod/admin.php:444 +#: ../../mod/admin.php:447 msgid "Poll interval" msgstr "Poll-interval" -#: ../../mod/admin.php:444 +#: ../../mod/admin.php:447 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "De achtergrondprocessen voor het afleveren met zoveel seconden vertragen om de systeembelasting te verminderen. 0 om de afleveringsinterval te gebruiken." -#: ../../mod/admin.php:445 +#: ../../mod/admin.php:448 msgid "Maximum Load Average" msgstr "Maximaal gemiddelde systeembelasting" -#: ../../mod/admin.php:445 +#: ../../mod/admin.php:448 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "Maximale systeembelasting voordat de afleverings- en polllingsprocessen worden uitgesteld. Standaard is 50." -#: ../../mod/admin.php:501 +#: ../../mod/admin.php:504 msgid "No server found" msgstr "Geen hub gevonden" -#: ../../mod/admin.php:508 ../../mod/admin.php:732 +#: ../../mod/admin.php:511 ../../mod/admin.php:735 msgid "ID" msgstr "ID" -#: ../../mod/admin.php:508 +#: ../../mod/admin.php:511 msgid "for channel" msgstr "voor kanaal" -#: ../../mod/admin.php:508 +#: ../../mod/admin.php:511 msgid "on server" msgstr "op hub" -#: ../../mod/admin.php:508 +#: ../../mod/admin.php:511 msgid "Status" msgstr "Status" -#: ../../mod/admin.php:529 +#: ../../mod/admin.php:532 msgid "Update has been marked successful" msgstr "Update is als succesvol gemarkeerd" -#: ../../mod/admin.php:539 +#: ../../mod/admin.php:542 #, php-format msgid "Executing %s failed. Check system logs." msgstr "Uitvoeren van %s is mislukt. Controleer systeemlogboek." -#: ../../mod/admin.php:542 +#: ../../mod/admin.php:545 #, php-format msgid "Update %s was successfully applied." msgstr "Update %s was geslaagd." -#: ../../mod/admin.php:546 +#: ../../mod/admin.php:549 #, php-format msgid "Update %s did not return a status. Unknown if it succeeded." msgstr "Update %s gaf geen melding. Het is daarom niet bekend of deze geslaagd is." -#: ../../mod/admin.php:549 +#: ../../mod/admin.php:552 #, php-format msgid "Update function %s could not be found." msgstr "Update-functie %s kon niet gevonden worden." -#: ../../mod/admin.php:564 +#: ../../mod/admin.php:567 msgid "No failed updates." msgstr "Geen mislukte updates." -#: ../../mod/admin.php:568 +#: ../../mod/admin.php:571 msgid "Failed Updates" msgstr "Mislukte updates" -#: ../../mod/admin.php:570 +#: ../../mod/admin.php:573 msgid "Mark success (if update was manually applied)" msgstr "Markeer als geslaagd (wanneer de update handmatig was uitgevoerd)" -#: ../../mod/admin.php:571 +#: ../../mod/admin.php:574 msgid "Attempt to execute this update step automatically" msgstr "Poging om deze stap van de update automatisch uit te voeren." -#: ../../mod/admin.php:597 +#: ../../mod/admin.php:600 #, php-format msgid "%s user blocked/unblocked" msgid_plural "%s users blocked/unblocked" msgstr[0] "%s account geblokkeerd/gedeblokkeerd" msgstr[1] "%s accounts geblokkeerd/gedeblokkeerd" -#: ../../mod/admin.php:604 +#: ../../mod/admin.php:607 #, php-format msgid "%s user deleted" msgid_plural "%s users deleted" msgstr[0] "%s account verwijderd" msgstr[1] "%s accounts verwijderd" -#: ../../mod/admin.php:635 +#: ../../mod/admin.php:638 msgid "Account not found" msgstr "Account niet gevonden" -#: ../../mod/admin.php:655 +#: ../../mod/admin.php:658 #, php-format msgid "User '%s' unblocked" msgstr "Account '%s' gedeblokkeerd" -#: ../../mod/admin.php:655 +#: ../../mod/admin.php:658 #, php-format msgid "User '%s' blocked" msgstr "Gebruiker '%s' geblokkeerd" -#: ../../mod/admin.php:719 ../../mod/admin.php:731 +#: ../../mod/admin.php:722 ../../mod/admin.php:734 msgid "Users" msgstr "Accounts" -#: ../../mod/admin.php:721 ../../mod/admin.php:856 +#: ../../mod/admin.php:724 ../../mod/admin.php:859 msgid "select all" msgstr "alles selecteren" -#: ../../mod/admin.php:722 +#: ../../mod/admin.php:725 msgid "User registrations waiting for confirm" msgstr "Accounts die op goedkeuring wachten" -#: ../../mod/admin.php:723 +#: ../../mod/admin.php:726 msgid "Request date" msgstr "Tijd/datum verzoek" -#: ../../mod/admin.php:724 +#: ../../mod/admin.php:727 msgid "No registrations." msgstr "Geen verzoeken." -#: ../../mod/admin.php:725 +#: ../../mod/admin.php:728 msgid "Approve" msgstr "Goedkeuren" -#: ../../mod/admin.php:726 +#: ../../mod/admin.php:729 msgid "Deny" msgstr "Afkeuren" -#: ../../mod/admin.php:732 +#: ../../mod/admin.php:735 msgid "Register date" msgstr "Geregistreerd" -#: ../../mod/admin.php:732 +#: ../../mod/admin.php:735 msgid "Last login" msgstr "Laatste keer ingelogd" -#: ../../mod/admin.php:732 +#: ../../mod/admin.php:735 msgid "Expires" msgstr "Verloopt" -#: ../../mod/admin.php:732 +#: ../../mod/admin.php:735 msgid "Service Class" msgstr "Abonnementen" -#: ../../mod/admin.php:734 +#: ../../mod/admin.php:737 msgid "" "Selected users will be deleted!\\n\\nEverything these users had posted on " "this site will be permanently deleted!\\n\\nAre you sure?" msgstr "Geselecteerde accounts (met bijbehorende kanalen) worden verwijderd!\\n\\nAlles wat deze accounts op deze hub hebben gepubliceerd wordt definitief verwijderd!\\n\\Weet je het zeker?" -#: ../../mod/admin.php:735 +#: ../../mod/admin.php:738 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 "Account {0} (met bijbehorende kanalen) wordt verwijderd !\\n\\nAlles wat dit account op deze hub heeft gepubliceerd wordt definitief verwijderd!\\n\\nWeet je het zeker?" -#: ../../mod/admin.php:768 +#: ../../mod/admin.php:771 #, php-format msgid "%s channel censored/uncensored" msgid_plural "%s channelss censored/uncensored" msgstr[0] "%s kanalen gecensureerd/ongecensureerd" msgstr[1] "%s kanaal gecensureerd/ongecensureerd" -#: ../../mod/admin.php:775 +#: ../../mod/admin.php:778 #, php-format msgid "%s channel deleted" msgid_plural "%s channels deleted" msgstr[0] "%s kanaal verwijderd" msgstr[1] "%s kanalen verwijderd" -#: ../../mod/admin.php:794 +#: ../../mod/admin.php:797 msgid "Channel not found" msgstr "Kanaal niet gevonden" -#: ../../mod/admin.php:805 +#: ../../mod/admin.php:808 #, php-format msgid "Channel '%s' deleted" msgstr "Kanaal '%s' verwijderd" -#: ../../mod/admin.php:815 +#: ../../mod/admin.php:818 #, php-format msgid "Channel '%s' uncensored" msgstr "Kanaal '%s' ongecensureerd" -#: ../../mod/admin.php:815 +#: ../../mod/admin.php:818 #, php-format msgid "Channel '%s' censored" msgstr "Kanaal '%s' gecensureerd" -#: ../../mod/admin.php:858 +#: ../../mod/admin.php:861 msgid "Censor" msgstr "Censureren" -#: ../../mod/admin.php:859 +#: ../../mod/admin.php:862 msgid "Uncensor" msgstr "Niet censureren" -#: ../../mod/admin.php:862 +#: ../../mod/admin.php:865 msgid "UID" msgstr "UID" -#: ../../mod/admin.php:864 +#: ../../mod/admin.php:867 msgid "" "Selected channels will be deleted!\\n\\nEverything that was posted in these " "channels on this site will be permanently deleted!\\n\\nAre you sure?" msgstr "Geselecteerde kanalen worden verwijderd!\\n\\nAlles wat in deze kanalen op deze hub werd gepubliceerd wordt definitief verwijderd!\\n\\nWeet je het zeker?" -#: ../../mod/admin.php:865 +#: ../../mod/admin.php:868 msgid "" "The channel {0} will be deleted!\\n\\nEverything that was posted in this " "channel on this site will be permanently deleted!\\n\\nAre you sure?" msgstr "Kanaal {0} wordt verwijderd!\\n\\nAlles wat in dit kanaal op deze hub werd gepubliceerd wordt definitief verwijderd!\\n\\nWeet je het zeker?" -#: ../../mod/admin.php:904 +#: ../../mod/admin.php:907 #, php-format msgid "Plugin %s disabled." msgstr "Plug-in %s uitgeschakeld." -#: ../../mod/admin.php:908 +#: ../../mod/admin.php:911 #, php-format msgid "Plugin %s enabled." msgstr "Plug-in %s ingeschakeld" -#: ../../mod/admin.php:918 ../../mod/admin.php:1120 +#: ../../mod/admin.php:921 ../../mod/admin.php:1123 msgid "Disable" msgstr "Uitschakelen" -#: ../../mod/admin.php:920 ../../mod/admin.php:1122 +#: ../../mod/admin.php:923 ../../mod/admin.php:1125 msgid "Enable" msgstr "Inschakelen" -#: ../../mod/admin.php:946 ../../mod/admin.php:1151 +#: ../../mod/admin.php:949 ../../mod/admin.php:1154 msgid "Toggle" msgstr "Omschakelen" -#: ../../mod/admin.php:954 ../../mod/admin.php:1161 +#: ../../mod/admin.php:957 ../../mod/admin.php:1164 msgid "Author: " msgstr "Auteur: " -#: ../../mod/admin.php:955 ../../mod/admin.php:1162 +#: ../../mod/admin.php:958 ../../mod/admin.php:1165 msgid "Maintainer: " msgstr "Beheerder: " -#: ../../mod/admin.php:1084 +#: ../../mod/admin.php:1087 msgid "No themes found." msgstr "Geen thema's gevonden" -#: ../../mod/admin.php:1143 +#: ../../mod/admin.php:1146 msgid "Screenshot" msgstr "Schermafdruk" -#: ../../mod/admin.php:1191 +#: ../../mod/admin.php:1194 msgid "[Experimental]" msgstr "[Experimenteel]" -#: ../../mod/admin.php:1192 +#: ../../mod/admin.php:1195 msgid "[Unsupported]" msgstr "[Niet ondersteund]" -#: ../../mod/admin.php:1219 +#: ../../mod/admin.php:1222 msgid "Log settings updated." msgstr "Logboek-instellingen bijgewerkt." -#: ../../mod/admin.php:1275 +#: ../../mod/admin.php:1278 msgid "Clear" msgstr "Leegmaken" -#: ../../mod/admin.php:1281 +#: ../../mod/admin.php:1284 msgid "Debugging" msgstr "Debuggen" -#: ../../mod/admin.php:1282 +#: ../../mod/admin.php:1285 msgid "Log file" msgstr "Logbestand" -#: ../../mod/admin.php:1282 +#: ../../mod/admin.php:1285 msgid "" "Must be writable by web server. Relative to your Red top-level directory." msgstr "Moet door de webserver beschrijfbaar zijn. Relatief ten opzichte van de bovenste map van je RedMatrix-installatie." -#: ../../mod/admin.php:1283 +#: ../../mod/admin.php:1286 msgid "Log level" msgstr "Logniveau" +#: ../../mod/admin.php:1333 +msgid "New Profile Field" +msgstr "Nieuw profielveld" + +#: ../../mod/admin.php:1334 ../../mod/admin.php:1355 +msgid "Field nickname" +msgstr "Bijnaam voor veld" + +#: ../../mod/admin.php:1334 ../../mod/admin.php:1355 +msgid "System name of field" +msgstr "Systeemnaam voor veld" + +#: ../../mod/admin.php:1335 ../../mod/admin.php:1356 +msgid "Input type" +msgstr "Invoertype" + +#: ../../mod/admin.php:1336 ../../mod/admin.php:1357 +msgid "Field Name" +msgstr "Veldnaam" + +#: ../../mod/admin.php:1336 ../../mod/admin.php:1357 +msgid "Label on profile pages" +msgstr "Tekstlabel voor op profielpagina's" + +#: ../../mod/admin.php:1337 ../../mod/admin.php:1358 +msgid "Help text" +msgstr "Helptekst" + +#: ../../mod/admin.php:1337 ../../mod/admin.php:1358 +msgid "Additional info (optional)" +msgstr "Extra informatie (optioneel)" + +#: ../../mod/admin.php:1348 +msgid "Field definition not found" +msgstr "Velddefinitie niet gevonden" + +#: ../../mod/admin.php:1354 +msgid "Edit Profile Field" +msgstr "Profielveld bewerken" + #: ../../mod/thing.php:98 msgid "Thing updated" msgstr "Ding bijgewerkt" @@ -7030,19 +7081,19 @@ msgstr "Het klonen van het kanaal is mislukt. Importeren mislukt." msgid "Cloned channel not found. Import failed." msgstr "Gekloond kanaal niet gevonden. Importeren mislukt." -#: ../../mod/import.php:364 +#: ../../mod/import.php:365 msgid "Import completed." msgstr "Import voltooid." -#: ../../mod/import.php:377 +#: ../../mod/import.php:378 msgid "You must be logged in to use this feature." msgstr "Je moet ingelogd zijn om dit onderdeel te kunnen gebruiken." -#: ../../mod/import.php:382 +#: ../../mod/import.php:383 msgid "Import Channel" msgstr "Kanaal importeren" -#: ../../mod/import.php:383 +#: ../../mod/import.php:384 msgid "" "Use this form to import an existing channel from a different server/hub. You" " may retrieve the channel identity from the old server/hub via the network " @@ -7050,27 +7101,27 @@ msgid "" "be imported. Importation of content is not yet available." msgstr "Gebruik dit formulier om een bestaand kanaal te importeren van een andere hub. Je kan de kanaal-identiteit van de oude hub via het netwerk ontvangen of een exportbestand verstrekken. Alleen de identiteit en de connecties zullen geïmporteerd worden. Het importeren van inhoud is nog niet beschikbaar." -#: ../../mod/import.php:384 +#: ../../mod/import.php:385 msgid "File to Upload" msgstr "Bestand om te uploaden" -#: ../../mod/import.php:385 +#: ../../mod/import.php:386 msgid "Or provide the old server/hub details" msgstr "Of vul de gegevens van de oude hub in" -#: ../../mod/import.php:386 +#: ../../mod/import.php:387 msgid "Your old identity address (xyz@example.com)" msgstr "Jouw oude kanaaladres (xyz@example.com)" -#: ../../mod/import.php:387 +#: ../../mod/import.php:388 msgid "Your old login email address" msgstr "Het e-mailadres van je oude account" -#: ../../mod/import.php:388 +#: ../../mod/import.php:389 msgid "Your old login password" msgstr "Wachtwoord van jouw oude account" -#: ../../mod/import.php:389 +#: ../../mod/import.php:390 msgid "" "For either option, please choose whether to make this hub your new primary " "address, or whether your old location should continue this role. You will be" @@ -7078,7 +7129,7 @@ msgid "" "primary location for files, photos, and media." msgstr "Voor elke optie geldt dat je moet kiezen of je jouw primaire kanaaladres op deze hub wil instellen of dat jouw oude hub deze rol blijft vervullen." -#: ../../mod/import.php:390 +#: ../../mod/import.php:391 msgid "Make this hub my primary location" msgstr "Stel deze hub als mijn primaire locatie in" @@ -7186,7 +7237,7 @@ msgstr "[Ingesloten inhoud - ververs pagina om te bekijken] " msgid "Help with this feature" msgstr "Hulp voor dit onderdeel" -#: ../../mod/layouts.php:84 +#: ../../mod/layouts.php:85 msgid "Layout Name" msgstr "Naam layout" @@ -7228,11 +7279,11 @@ msgstr "Actie voltooid" msgid "Thank you." msgstr "Bedankt" -#: ../../mod/lockview.php:30 +#: ../../mod/lockview.php:31 msgid "Remote privacy information not available." msgstr "Privacy-informatie op afstand niet beschikbaar." -#: ../../mod/lockview.php:51 +#: ../../mod/lockview.php:52 msgid "Visible to:" msgstr "Zichtbaar voor:" diff --git a/view/nl/strings.php b/view/nl/strings.php index 99996210d..7fa5b7f5e 100644 --- a/view/nl/strings.php +++ b/view/nl/strings.php @@ -7,10 +7,7 @@ function string_plural_select_nl($n){ ; $a->strings["Cannot locate DNS info for database server '%s'"] = "Kan DNS-informatie voor databaseserver '%s' niet vinden"; $a->strings["Profile Photos"] = "Profielfoto's"; -$a->strings["photo"] = "foto"; -$a->strings["status"] = "bericht"; -$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s vindt %3\$s van %2\$s leuk"; -$a->strings["Attachments:"] = "Bijlagen:"; +$a->strings["view full size"] = "volledige grootte tonen"; $a->strings["Embedded content"] = "Ingesloten inhoud"; $a->strings["Embedding disabled"] = "Insluiten uitgeschakeld"; $a->strings["created a new post"] = "maakte een nieuw bericht aan"; @@ -19,7 +16,7 @@ $a->strings["Site Admin"] = "Hubbeheerder"; $a->strings["Bookmarks"] = "Bladwijzers"; $a->strings["Address Book"] = "Connecties"; $a->strings["Login"] = "Inloggen"; -$a->strings["Channel Select"] = "Kanaalkiezer"; +$a->strings["Channel Manager"] = "Kanaalbeheer"; $a->strings["Matrix"] = "Matrix"; $a->strings["Settings"] = "Instellingen"; $a->strings["Files"] = "Bestanden"; @@ -49,89 +46,6 @@ $a->strings["Purchase"] = "Aanschaffen"; $a->strings["Edit"] = "Bewerken"; $a->strings["Delete"] = "Verwijderen"; $a->strings["Unknown"] = "Onbekend"; -$a->strings["prev"] = "vorige"; -$a->strings["first"] = "eerste"; -$a->strings["last"] = "laatste"; -$a->strings["next"] = "volgende"; -$a->strings["older"] = "ouder"; -$a->strings["newer"] = "nieuwer"; -$a->strings["No connections"] = "Geen connecties"; -$a->strings["%d Connection"] = array( - 0 => "%d connectie", - 1 => "%d connecties", -); -$a->strings["View Connections"] = "Connecties weergeven"; -$a->strings["Save"] = "Opslaan"; -$a->strings["poke"] = "aanstoten"; -$a->strings["poked"] = "aangestoten"; -$a->strings["ping"] = "ping"; -$a->strings["pinged"] = "gepingd"; -$a->strings["prod"] = "por"; -$a->strings["prodded"] = "gepord"; -$a->strings["slap"] = "slaan"; -$a->strings["slapped"] = "sloeg"; -$a->strings["finger"] = "finger"; -$a->strings["fingered"] = "gefingerd"; -$a->strings["rebuff"] = "afpoeieren"; -$a->strings["rebuffed"] = "afgepoeierd"; -$a->strings["happy"] = "gelukkig"; -$a->strings["sad"] = "bedroefd"; -$a->strings["mellow"] = "mellow"; -$a->strings["tired"] = "moe"; -$a->strings["perky"] = "parmantig"; -$a->strings["angry"] = "boos"; -$a->strings["stupified"] = "beteuterd"; -$a->strings["puzzled"] = "verward"; -$a->strings["interested"] = "geïnteresseerd"; -$a->strings["bitter"] = "verbitterd"; -$a->strings["cheerful"] = "vrolijk"; -$a->strings["alive"] = "levendig"; -$a->strings["annoyed"] = "geërgerd"; -$a->strings["anxious"] = "bezorgd"; -$a->strings["cranky"] = "humeurig"; -$a->strings["disturbed"] = "verontrust"; -$a->strings["frustrated"] = "gefrustreerd "; -$a->strings["depressed"] = "gedeprimeerd"; -$a->strings["motivated"] = "gemotiveerd"; -$a->strings["relaxed"] = "ontspannen"; -$a->strings["surprised"] = "verrast"; -$a->strings["Monday"] = "maandag"; -$a->strings["Tuesday"] = "dinsdag"; -$a->strings["Wednesday"] = "woensdag"; -$a->strings["Thursday"] = "donderdag"; -$a->strings["Friday"] = "vrijdag"; -$a->strings["Saturday"] = "zaterdag"; -$a->strings["Sunday"] = "zondag"; -$a->strings["January"] = "januari"; -$a->strings["February"] = "februari"; -$a->strings["March"] = "maart"; -$a->strings["April"] = "april"; -$a->strings["May"] = "mei"; -$a->strings["June"] = "juni"; -$a->strings["July"] = "juli"; -$a->strings["August"] = "augustus"; -$a->strings["September"] = "september"; -$a->strings["October"] = "oktober"; -$a->strings["November"] = "november"; -$a->strings["December"] = "december"; -$a->strings["unknown.???"] = "onbekend.???"; -$a->strings["bytes"] = "bytes"; -$a->strings["remove category"] = "categorie verwijderen"; -$a->strings["remove from file"] = "uit map verwijderen"; -$a->strings["Click to open/close"] = "Klik om te openen of te sluiten"; -$a->strings["Link to Source"] = "Originele locatie"; -$a->strings["Select a page layout: "] = "Kies een paginalayout: "; -$a->strings["default"] = "standaard"; -$a->strings["Page content type: "] = "Opmaakcode pagina"; -$a->strings["Select an alternate language"] = "Kies een andere taal"; -$a->strings["event"] = "gebeurtenis"; -$a->strings["comment"] = "reactie"; -$a->strings["activity"] = "activiteit"; -$a->strings["Design"] = "Ontwerp"; -$a->strings["Blocks"] = "Blokken"; -$a->strings["Menus"] = "Menu's"; -$a->strings["Layouts"] = "Layouts"; -$a->strings["Pages"] = "Pagina's"; $a->strings["New Page"] = "Nieuwe pagina"; $a->strings["View"] = "Weergeven"; $a->strings["Preview"] = "Voorvertoning"; @@ -141,21 +55,9 @@ $a->strings["Title"] = "Titel"; $a->strings["Created"] = "Aangemaakt"; $a->strings["Edited"] = "Bewerkt"; $a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "De beveiligings-token van het tekstvak was ongeldig. Dit is mogelijk het gevolg van dat er te lang (meer dan 3 uur) gewacht is om de tekst op te slaan. "; -$a->strings["Not a valid email address"] = "Geen geldig e-mailadres"; -$a->strings["Your email domain is not among those allowed on this site"] = "Jouw e-maildomein is op deze RedMatrix-hub niet toegestaan"; -$a->strings["Your email address is already registered at this site."] = "Jouw e-mailadres is al op deze RedMatrix-hub geregistreerd ."; -$a->strings["An invitation is required."] = "Een uitnodiging is vereist"; -$a->strings["Invitation could not be verified."] = "Uitnodiging kon niet geverifieerd worden"; -$a->strings["Please enter the required information."] = "Vul de vereiste informatie in."; -$a->strings["Failed to store account information."] = "Account-informatie kon niet opgeslagen worden."; -$a->strings["Registration confirmation for %s"] = "Registratiebevestiging voor %s"; -$a->strings["Registration request at %s"] = "Registratieverzoek op %s"; -$a->strings["Administrator"] = "Beheerder"; -$a->strings["your registration password"] = "jouw registratiewachtwoord"; -$a->strings["Registration details for %s"] = "Registratiedetails voor %s"; -$a->strings["Account approved."] = "Account goedgekeurd"; -$a->strings["Registration revoked for %s"] = "Registratie ingetrokken voor %s"; -$a->strings["Account verified. Please login."] = "Account is geverifieerd. Je kan inloggen."; +$a->strings["Invalid data packet"] = "Datapakket ongeldig"; +$a->strings["Unable to verify channel signature"] = "Kanaal-kenmerk (channel signature) kon niet worden geverifieerd. "; +$a->strings["Unable to verify site signature for %s"] = "Hub-kenmerk (site signature) voor %s kon niet worden geverifieerd"; $a->strings["Permission denied."] = "Toegang geweigerd"; $a->strings["Image exceeds website size limit of %lu bytes"] = "Afbeelding is groter dan op deze hub toegestane limiet van %lu bytes"; $a->strings["Image file is empty."] = "Afbeeldingsbestand is leeg"; @@ -239,7 +141,6 @@ $a->strings["New Message"] = "Nieuw bericht"; $a->strings["Event Calendar"] = "Agenda"; $a->strings["See all events"] = "Alle gebeurtenissen weergeven"; $a->strings["Mark all events seen"] = "Markeer alle gebeurtenissen als bekeken"; -$a->strings["Channel Manager"] = "Kanaalbeheerder"; $a->strings["Manage Your Channels"] = "Beheer je kanalen"; $a->strings["Account/Channel Settings"] = "Account-/kanaal-instellingen"; $a->strings["Admin"] = "Beheer"; @@ -247,6 +148,91 @@ $a->strings["Site Setup and Configuration"] = "Hub instellen en beheren"; $a->strings["Nothing new here"] = "Niets nieuw hier"; $a->strings["Please wait..."] = "Wachten aub..."; $a->strings["%1\$s's bookmarks"] = "Bladwijzers van %1\$s"; +$a->strings["prev"] = "vorige"; +$a->strings["first"] = "eerste"; +$a->strings["last"] = "laatste"; +$a->strings["next"] = "volgende"; +$a->strings["older"] = "ouder"; +$a->strings["newer"] = "nieuwer"; +$a->strings["No connections"] = "Geen connecties"; +$a->strings["%d Connection"] = array( + 0 => "%d connectie", + 1 => "%d connecties", +); +$a->strings["View Connections"] = "Connecties weergeven"; +$a->strings["Save"] = "Opslaan"; +$a->strings["poke"] = "aanstoten"; +$a->strings["poked"] = "aangestoten"; +$a->strings["ping"] = "ping"; +$a->strings["pinged"] = "gepingd"; +$a->strings["prod"] = "por"; +$a->strings["prodded"] = "gepord"; +$a->strings["slap"] = "slaan"; +$a->strings["slapped"] = "sloeg"; +$a->strings["finger"] = "finger"; +$a->strings["fingered"] = "gefingerd"; +$a->strings["rebuff"] = "afpoeieren"; +$a->strings["rebuffed"] = "afgepoeierd"; +$a->strings["happy"] = "gelukkig"; +$a->strings["sad"] = "bedroefd"; +$a->strings["mellow"] = "mellow"; +$a->strings["tired"] = "moe"; +$a->strings["perky"] = "parmantig"; +$a->strings["angry"] = "boos"; +$a->strings["stupified"] = "beteuterd"; +$a->strings["puzzled"] = "verward"; +$a->strings["interested"] = "geïnteresseerd"; +$a->strings["bitter"] = "verbitterd"; +$a->strings["cheerful"] = "vrolijk"; +$a->strings["alive"] = "levendig"; +$a->strings["annoyed"] = "geërgerd"; +$a->strings["anxious"] = "bezorgd"; +$a->strings["cranky"] = "humeurig"; +$a->strings["disturbed"] = "verontrust"; +$a->strings["frustrated"] = "gefrustreerd "; +$a->strings["depressed"] = "gedeprimeerd"; +$a->strings["motivated"] = "gemotiveerd"; +$a->strings["relaxed"] = "ontspannen"; +$a->strings["surprised"] = "verrast"; +$a->strings["Monday"] = "maandag"; +$a->strings["Tuesday"] = "dinsdag"; +$a->strings["Wednesday"] = "woensdag"; +$a->strings["Thursday"] = "donderdag"; +$a->strings["Friday"] = "vrijdag"; +$a->strings["Saturday"] = "zaterdag"; +$a->strings["Sunday"] = "zondag"; +$a->strings["January"] = "januari"; +$a->strings["February"] = "februari"; +$a->strings["March"] = "maart"; +$a->strings["April"] = "april"; +$a->strings["May"] = "mei"; +$a->strings["June"] = "juni"; +$a->strings["July"] = "juli"; +$a->strings["August"] = "augustus"; +$a->strings["September"] = "september"; +$a->strings["October"] = "oktober"; +$a->strings["November"] = "november"; +$a->strings["December"] = "december"; +$a->strings["unknown.???"] = "onbekend.???"; +$a->strings["bytes"] = "bytes"; +$a->strings["remove category"] = "categorie verwijderen"; +$a->strings["remove from file"] = "uit map verwijderen"; +$a->strings["Click to open/close"] = "Klik om te openen of te sluiten"; +$a->strings["Link to Source"] = "Originele locatie"; +$a->strings["Select a page layout: "] = "Kies een paginalayout: "; +$a->strings["default"] = "standaard"; +$a->strings["Page content type: "] = "Opmaakcode pagina"; +$a->strings["Select an alternate language"] = "Kies een andere taal"; +$a->strings["photo"] = "foto"; +$a->strings["event"] = "gebeurtenis"; +$a->strings["status"] = "bericht"; +$a->strings["comment"] = "reactie"; +$a->strings["activity"] = "activiteit"; +$a->strings["Design"] = "Ontwerp"; +$a->strings["Blocks"] = "Blokken"; +$a->strings["Menus"] = "Menu's"; +$a->strings["Layouts"] = "Layouts"; +$a->strings["Pages"] = "Pagina's"; $a->strings["Tags"] = "Labels"; $a->strings["Keywords"] = "Trefwoorden"; $a->strings["have"] = "heb"; @@ -302,9 +288,23 @@ $a->strings["%d connection in common"] = array( ); $a->strings["show more"] = "meer connecties weergeven"; $a->strings["This event has been added to your calendar."] = "Dit evenement is aan jouw agenda toegevoegd."; -$a->strings["Invalid data packet"] = "Datapakket ongeldig"; -$a->strings["Unable to verify channel signature"] = "Kanaal-kenmerk (channel signature) kon niet worden geverifieerd. "; -$a->strings["Unable to verify site signature for %s"] = "Hub-kenmerk (site signature) voor %s kon niet worden geverifieerd"; +$a->strings["Not a valid email address"] = "Geen geldig e-mailadres"; +$a->strings["Your email domain is not among those allowed on this site"] = "Jouw e-maildomein is op deze RedMatrix-hub niet toegestaan"; +$a->strings["Your email address is already registered at this site."] = "Jouw e-mailadres is al op deze RedMatrix-hub geregistreerd ."; +$a->strings["An invitation is required."] = "Een uitnodiging is vereist"; +$a->strings["Invitation could not be verified."] = "Uitnodiging kon niet geverifieerd worden"; +$a->strings["Please enter the required information."] = "Vul de vereiste informatie in."; +$a->strings["Failed to store account information."] = "Account-informatie kon niet opgeslagen worden."; +$a->strings["Registration confirmation for %s"] = "Registratiebevestiging voor %s"; +$a->strings["Registration request at %s"] = "Registratieverzoek op %s"; +$a->strings["Administrator"] = "Beheerder"; +$a->strings["your registration password"] = "jouw registratiewachtwoord"; +$a->strings["Registration details for %s"] = "Registratiedetails voor %s"; +$a->strings["Account approved."] = "Account goedgekeurd"; +$a->strings["Registration revoked for %s"] = "Registratie ingetrokken voor %s"; +$a->strings["Account verified. Please login."] = "Account is geverifieerd. Je kan inloggen."; +$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s vindt %3\$s van %2\$s leuk"; +$a->strings["Attachments:"] = "Bijlagen:"; $a->strings["Miscellaneous"] = "Diversen"; $a->strings["year"] = "jaar"; $a->strings["month"] = "maand"; @@ -413,7 +413,7 @@ $a->strings["View Source"] = "Bron weergeven"; $a->strings["Follow Thread"] = "Conversatie volgen"; $a->strings["View Status"] = "Status weergeven"; $a->strings["View Photos"] = "Foto's weergeven"; -$a->strings["Matrix Activity"] = "Activiteit in de Matrix"; +$a->strings["Matrix Activity"] = "Activiteit in de RedMatrix"; $a->strings["Connect"] = "Verbinden"; $a->strings["Edit Contact"] = "Contact bewerken"; $a->strings["Send PM"] = "Privébericht verzenden"; @@ -571,6 +571,7 @@ $a->strings["Visible to anybody authenticated."] = "Voor iedereen die geauthenti $a->strings["Visible to anybody on %s."] = "Voor iedereen op %s zichtbaar."; $a->strings["Visible to all connections."] = "Voor alle connecties zichtbaar."; $a->strings["Visible to approved connections."] = "Voor alle goedgekeurde connecties zichtbaar."; +$a->strings["Visible to specific connections."] = "Voor specifieke connecties zichtbaar."; $a->strings["Item not found."] = "Item niet gevonden."; $a->strings["Collection not found."] = "Collectie niet gevonden."; $a->strings["Collection is empty."] = "Collectie is leeg"; @@ -643,7 +644,6 @@ $a->strings["Love/Romance:"] = "Liefde/romantiek:"; $a->strings["Work/employment:"] = "Werk/beroep:"; $a->strings["School/education:"] = "School/opleiding:"; $a->strings["Like this thing"] = "Vind dit ding leuk"; -$a->strings["view full size"] = "volledige grootte tonen"; $a->strings["Image/photo"] = "Afbeelding/foto"; $a->strings["Encrypted content"] = "Versleutelde inhoud"; $a->strings["QR code"] = "QR-code"; @@ -1533,6 +1533,8 @@ $a->strings["Accessibility system theme"] = "Standaardthema voor universele toeg $a->strings["Accessibility theme"] = "Thema voor universele toegang"; $a->strings["Channel to use for this website's static pages"] = "Kanaal die op deze hub als statische pagina op de homepage gebruikt moet worden"; $a->strings["Site Channel"] = "Kanaal op deze RedMatrix-hub"; +$a->strings["Enable Diaspora Protocol"] = "Diaspora-protocol inschakkelen"; +$a->strings["Communicate with Diaspora and Friendica - experimental"] = "Communiceer met Diaspora en Friendica (experimenteel)"; $a->strings["Allow Feeds as Connections"] = "Sta feeds toe als connecties"; $a->strings["(Heavy system resource usage)"] = "(sterk negatieve invloed op systeembronnen hub)"; $a->strings["Maximum image size"] = "Maximale grootte van afbeeldingen"; @@ -1637,6 +1639,16 @@ $a->strings["Debugging"] = "Debuggen"; $a->strings["Log file"] = "Logbestand"; $a->strings["Must be writable by web server. Relative to your Red top-level directory."] = "Moet door de webserver beschrijfbaar zijn. Relatief ten opzichte van de bovenste map van je RedMatrix-installatie."; $a->strings["Log level"] = "Logniveau"; +$a->strings["New Profile Field"] = "Nieuw profielveld"; +$a->strings["Field nickname"] = "Bijnaam voor veld"; +$a->strings["System name of field"] = "Systeemnaam voor veld"; +$a->strings["Input type"] = "Invoertype"; +$a->strings["Field Name"] = "Veldnaam"; +$a->strings["Label on profile pages"] = "Tekstlabel voor op profielpagina's"; +$a->strings["Help text"] = "Helptekst"; +$a->strings["Additional info (optional)"] = "Extra informatie (optioneel)"; +$a->strings["Field definition not found"] = "Velddefinitie niet gevonden"; +$a->strings["Edit Profile Field"] = "Profielveld bewerken"; $a->strings["Thing updated"] = "Ding bijgewerkt"; $a->strings["Object store: failed"] = "Opslaan van ding mislukt"; $a->strings["Thing added"] = "Ding toegevoegd"; -- cgit v1.2.3 From e9bf742cc7c0d54dd48a4ba4e0eddd620d8b6857 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 30 Aug 2014 17:03:26 -0700 Subject: insecure network filter --- include/items.php | 41 ++++++++++++++++++++++++++++++++++++++++- version.inc | 2 +- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/include/items.php b/include/items.php index c0ff2ac81..1a4363975 100755 --- a/include/items.php +++ b/include/items.php @@ -19,7 +19,9 @@ function collect_recipients($item,&$private_envelope) { // it is private $allow_people = expand_acl($item['allow_cid']); + $allow_groups = expand_groups(expand_acl($item['allow_gid'])); + $allow_groups = filter_insecure($item['uid'],$allow_groups); $recipients = array_unique(array_merge($allow_people,$allow_groups)); @@ -44,7 +46,13 @@ function collect_recipients($item,&$private_envelope) { $deny_groups = expand_groups(expand_acl($item['deny_gid'])); $deny = array_unique(array_merge($deny_people,$deny_groups)); - $recipients = array_diff($recipients,$deny); + + // Don't deny anybody if nobody was allowed (e.g. they were all filtered out) + // That would lead to array_diff doing the wrong thing. + // This will result in a private post that won't be delivered to anybody. + + if($recipients && $deny) + $recipients = array_diff($recipients,$deny); $private_envelope = true; } else { @@ -100,6 +108,37 @@ function collect_recipients($item,&$private_envelope) { } +/** + * If channel is configured to filter insecure members of privacy groups + * (those whose networks leak privacy via email notifications or other criteria) + * remove them from any privacy groups (collections) that were included in a post. + * They can still be addressed individually. + * Networks may need to be added or removed from this list as circumstances change. + */ + +function filter_insecure($channel_id,$arr) { + $insecure_nets = " and not xchan_network in ('diaspora', 'friendica-over-diaspora') "; + + $ret = array(); + + if((! intval(get_config($channel_id,'system','filter_insecure_collections'))) || (! $arr)) + return $arr; + + $str = ''; + foreach($arr as $rr) { + if(strlen($str)) + $str .= ','; + $str .= "'" . dbesc($rr) . "'"; + } + $r = q("select xchan_hash from xchan where xchan_hash in ($str) $insecure_nets "); + if($r) { + foreach($r as $rr) { + $ret[] = $rr['xchan_hash']; + } + } + return $ret; +} + function comments_are_now_closed($item) { if($item['comments_closed'] !== '0000-00-00 00:00:00') { diff --git a/version.inc b/version.inc index 642d6ea4c..309a291d2 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-08-29.782 +2014-08-30.783 -- cgit v1.2.3 From 45c35d97b8ce627cb90efa320b7daca4097aef75 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 30 Aug 2014 22:53:21 -0700 Subject: doc change - read it. --- include/items.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/items.php b/include/items.php index 1a4363975..4614aa642 100755 --- a/include/items.php +++ b/include/items.php @@ -114,6 +114,9 @@ function collect_recipients($item,&$private_envelope) { * remove them from any privacy groups (collections) that were included in a post. * They can still be addressed individually. * Networks may need to be added or removed from this list as circumstances change. + * + * Update: this may need to be the default, which will force people to opt-in to sending stuff + * privately to insecure platforms. */ function filter_insecure($channel_id,$arr) { -- cgit v1.2.3 From 473e582d1f3e5067c1aecee9c9f2f579864db3ef Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sun, 31 Aug 2014 16:58:17 +0100 Subject: Add check_upstream_directory() to check that your directory is still a directory, and if it isn't, let find_upstream_directory() find you a new one. --- include/dir_fns.php | 20 ++++++++++++++++++++ include/poller.php | 3 +++ 2 files changed, 23 insertions(+) diff --git a/include/dir_fns.php b/include/dir_fns.php index 815b6a197..5fad6567e 100644 --- a/include/dir_fns.php +++ b/include/dir_fns.php @@ -30,6 +30,26 @@ function find_upstream_directory($dirmode) { return array('url' => $preferred); } +function check_upstream_directory() { + /** + * Directories may come and go over time. We will need to check that our + * directory server is still valid occasionally, and reset to something that + * is if our directory has gone offline for any reason + */ + $directory = get_config('system','directory_server'); + if ($directory) { + $r = q("select * from site where site_url = '%s' and (site_flags & %d) ", + dbesc($directory), + intval(DIRECTORY_MODE_PRIMARY|DIRECTORY_MODE_SECONDARY|DIRECTORY_MODE_STANDALONE) + ); + } + // If we've got something, it's still a directory. If we haven't, we need to reset and let find_upstream_directory() fix it + if (! $r) { + set_config('system','directory_server',''); + } + return; +} + function dir_sort_links() { $o = replace_macros(get_markup_template('dir_sort_links.tpl'), array( diff --git a/include/poller.php b/include/poller.php index 546a2d6d1..b9d728e8d 100644 --- a/include/poller.php +++ b/include/poller.php @@ -111,6 +111,9 @@ function poller_run($argv, $argc){ if(($d2 != $d1) && ($h1 == $h2)) { + require_once('include/dir_fns.php'); + check_upstream_directory(); + call_hooks('cron_daily',datetime_convert()); -- cgit v1.2.3 From 888c5dc84930c29ffab5d6f1ce1f4b0d5e7e3dad Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Sun, 31 Aug 2014 21:25:33 +0200 Subject: missing ' --- doc/Plugins.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Plugins.md b/doc/Plugins.md index c3eaea348..0db7c9ebc 100644 --- a/doc/Plugins.md +++ b/doc/Plugins.md @@ -180,7 +180,7 @@ Now let's add our functions to create and store preference settings. /* Add our stylesheet to the page so we can make our settings look nice */ - head_add_css(/addon/randplace/randplace.css'); + head_add_css('/addon/randplace/randplace.css'); /* Get the current state of our config variable */ -- cgit v1.2.3 From 2d0ad0625a1bc8bc54ad21d1a5ebb057b0afa357 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 31 Aug 2014 16:24:05 -0700 Subject: sql error in profile_activity --- include/activities.php | 2 +- include/zot.php | 6 ++---- version.inc | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/include/activities.php b/include/activities.php index 4502b758e..d978ebcd6 100644 --- a/include/activities.php +++ b/include/activities.php @@ -25,7 +25,7 @@ function profile_activity($changed, $value) { $arr['verb'] = ACTIVITY_UPDATE; $arr['obj_type'] = ACTIVITY_OBJ_PROFILE; - $arr['$plink'] = z_root() . '/channel/' . $self['channel_address'] . '/?f=&mid=' . $arr['mid']; + $arr['plink'] = z_root() . '/channel/' . $self['channel_address'] . '/?f=&mid=' . $arr['mid']; $A = '[url=' . z_root() . '/channel/' . $self['channel_address'] . ']' . $self['channel_name'] . '[/url]'; diff --git a/include/zot.php b/include/zot.php index 8627656c2..6ccee8c39 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1791,8 +1791,6 @@ function process_mail_delivery($sender,$arr,$deliveries) { function process_profile_delivery($sender,$arr,$deliveries) { - // deliveries is irrelevant, what to do about birthday notification....? - logger('process_profile_delivery', LOGGER_DEBUG); $r = q("select xchan_addr from xchan where xchan_hash = '%s' limit 1", @@ -1864,7 +1862,7 @@ function import_directory_profile($hash,$profile,$addr,$ud_flags = UPDATE_FLAGS_ $update = false; foreach($r[0] as $k => $v) { if((array_key_exists($k,$arr)) && ($arr[$k] != $v)) { - logger('import_directory_profile: update' . $k . ' => ' . $arr[$k]); + logger('import_directory_profile: update ' . $k . ' => ' . $arr[$k]); $update = true; break; } @@ -1906,7 +1904,7 @@ function import_directory_profile($hash,$profile,$addr,$ud_flags = UPDATE_FLAGS_ } else { $update = true; - logger('import_directory_profile: new profile'); + logger('import_directory_profile: new profile '); $x = q("insert into xprof (xprof_hash, xprof_desc, xprof_dob, xprof_age, xprof_gender, xprof_marital, xprof_sexual, xprof_locale, xprof_region, xprof_postcode, xprof_country, xprof_about, xprof_homepage, xprof_hometown, xprof_keywords) values ('%s', '%s', '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s') ", dbesc($arr['xprof_hash']), dbesc($arr['xprof_desc']), diff --git a/version.inc b/version.inc index 309a291d2..29de108fb 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-08-30.783 +2014-08-31.784 -- cgit v1.2.3 From e721220340010793ee8ebf3f55ac68e8799c2887 Mon Sep 17 00:00:00 2001 From: Jeroen Date: Sun, 31 Aug 2014 23:26:17 +0000 Subject: Finally updated/re-translated the Dutch introduction text --- assets/home.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/home.html b/assets/home.html index 329a27901..a0d048682 100644 --- a/assets/home.html +++ b/assets/home.html @@ -293,19 +293,19 @@ La Matrice Rouge est un outil idéal